APPROVE COMMIT 21.5
Index: ChangeLog
===================================================================
RCS file: /pack/xemacscvs/XEmacs/xemacs/src/ChangeLog,v
retrieving revision 1.884
diff -u -U0 -r1.884 ChangeLog
--- ChangeLog 13 Nov 2005 10:48:01 -0000 1.884
+++ ChangeLog 16 Nov 2005 05:39:49 -0000
@@ -0,0 +1,4 @@
+2005-11-16 Stephen J. Turnbull <stephen(a)xemacs.org>
+
+ * event-Xt.c (x_to_emacs_keysym): Initialize len.
+
Index: src/event-Xt.c
===================================================================
RCS file: /pack/xemacscvs/XEmacs/xemacs/src/event-Xt.c,v
retrieving revision 1.87
diff -u -r1.87 event-Xt.c
--- src/event-Xt.c 27 Sep 2005 05:29:44 -0000 1.87
+++ src/event-Xt.c 16 Nov 2005 04:24:19 -0000
@@ -836,7 +836,7 @@
KeySym keysym = 0;
#ifdef HAVE_XIM
- int len;
+ int len = 0;
/* Some implementations of XmbLookupString don't return
XBufferOverflow correctly, so increase the size of the xim input
buffer from 64 to the more reasonable size 513, as Emacs has done.
@@ -893,7 +893,7 @@
stderr_out (" keysym=%s", XKeysymToString (keysym));
if (status == XLookupChars || status == XLookupBoth)
{
- if (len != 1)
+ if (len > 1)
{
int j;
stderr_out (" chars=\"");
--
Graduate School of Systems and Information Engineering University of Tsukuba
http://turnbull.sk.tsukuba.ac.jp/ Tennodai 1-1-1 Tsukuba 305-8573 JAPAN
Economics of Information Communication and Computation Systems
Experimental Economics, Microeconomic Theory, Game Theory