Module Name: src
Committed By: christos
Date: Thu Nov 4 13:53:12 UTC 2010
Modified Files:
src/lib/libedit: eln.c
Log Message:
PR/43998, PR/44021: In narrow history emulation, don't treat UTF-8 character
sets specially as far as history goes since we always need to do the conversion
from narrow [history] to wide [editline].
To generate a diff of this commit:
cvs rdiff -u -r1.8 -r1.9 src/lib/libedit/eln.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/lib/libedit/eln.c
diff -u src/lib/libedit/eln.c:1.8 src/lib/libedit/eln.c:1.9
--- src/lib/libedit/eln.c:1.8 Sat Aug 28 11:44:59 2010
+++ src/lib/libedit/eln.c Thu Nov 4 09:53:12 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: eln.c,v 1.8 2010/08/28 15:44:59 christos Exp $ */
+/* $NetBSD: eln.c,v 1.9 2010/11/04 13:53:12 christos Exp $ */
/*-
* Copyright (c) 2009 The NetBSD Foundation, Inc.
@@ -34,7 +34,7 @@
*/
#include "config.h"
#if !defined(lint) && !defined(SCCSID)
-__RCSID("$NetBSD: eln.c,v 1.8 2010/08/28 15:44:59 christos Exp $");
+__RCSID("$NetBSD: eln.c,v 1.9 2010/11/04 13:53:12 christos Exp $");
#endif /* not lint && not SCCSID */
#include "histedit.h"
@@ -217,8 +217,7 @@
hist_fun_t fun = va_arg(ap, hist_fun_t);
ptr_t ptr = va_arg(ap, ptr_t);
ret = hist_set(el, fun, ptr);
- if (!(el->el_flags & CHARSET_IS_UTF8))
- el->el_flags |= NARROW_HISTORY;
+ el->el_flags |= NARROW_HISTORY;
break;
}
/* XXX: do we need to change el_rfunc_t? */
