Mercurial > hg > xemacs-beta

changeset 4359:df1f1f49ef70

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Automated merge with file:/Sources/xemacs-21.5-checked-out
author Aidan Kehoe <kehoea@parhasard.net>
date Mon, 24 Dec 2007 15:04:01 +0100
parents 63c25d1cbecf (diff) cc293ef846d2 (current diff)
children b545430be2eb
files src/ChangeLog tests/reproduce-bugs.el
diffstat 2 files changed, 16 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/src/ChangeLog	Mon Dec 24 14:00:51 2007 +0100
+++ b/src/ChangeLog	Mon Dec 24 15:04:01 2007 +0100
@@ -1,3 +1,10 @@
+2007-12-24  Aidan Kehoe  <kehoea@parhasard.net>
+
+	* event-xlike-inc.c (x_keysym_to_character): 
+	* event-xlike-inc.c (gtk_keysym_to_character):
+	Unify the typed character if possible, following the current value
+	for the unicode precedence list. 
+
 2007-12-24  Aidan Kehoe  <kehoea@parhasard.net>
 
 	* symbols.c (Fintern_soft): 
--- a/src/event-xlike-inc.c	Mon Dec 24 14:00:51 2007 +0100
+++ b/src/event-xlike-inc.c	Mon Dec 24 15:04:01 2007 +0100
@@ -708,7 +708,15 @@
     return Qnil;
 
 #ifdef MULE
-  return make_char (make_ichar (charset, code, 0));
+  {
+    Lisp_Object unified = Funicode_to_char
+      (Fchar_to_unicode (make_char (make_ichar (charset, code, 0))), Qnil);
+    if (!NILP (unified))
+      {
+        return unified;
+      }
+    return make_char (make_ichar (charset, code, 0));
+  }
 #else
   return make_char (code + 0x80);
 #endif