# HG changeset patch
# User Aidan Kehoe <kehoea@parhasard.net>
# Date 1198704105 -3600
# Node ID b545430be2eb1d007008624cb1bce9d4eea9efff
# Parent  df1f1f49ef702d66951ed0833cf160116c2b4e01# Parent  3af63264d32008e05044cc024b6308ee0114d278
Automated merge with file:/Sources/xemacs-21.5-checked-out

diff -r 3af63264d320 -r b545430be2eb src/ChangeLog
--- a/src/ChangeLog	Wed Dec 26 11:29:51 2007 -0800
+++ b/src/ChangeLog	Wed Dec 26 22:21:45 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): 
diff -r 3af63264d320 -r b545430be2eb src/event-xlike-inc.c
--- a/src/event-xlike-inc.c	Wed Dec 26 11:29:51 2007 -0800
+++ b/src/event-xlike-inc.c	Wed Dec 26 22:21:45 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