# HG changeset patch
# User michaels
# Date 1164307132 0
# Node ID ec0171167c5d0e0e3683ca49d0fc466ef665be2d
# Parent  42e4605ef1de79802cd1e4c4dcaca32eaaa73ea8
[xemacs-hg @ 2006-11-23 18:38:50 by michaels]
2006-11-18  Mike Sperber  <mike@xemacs.org>

	* redisplay-x.c (separate_textual_runs): Don't try to call
	ichar_to_unicode on non-MULE.

diff -r 42e4605ef1de -r ec0171167c5d src/ChangeLog
--- a/src/ChangeLog	Thu Nov 23 13:43:29 2006 +0000
+++ b/src/ChangeLog	Thu Nov 23 18:38:52 2006 +0000
@@ -22,6 +22,11 @@
 
 2006-11-18  Mike Sperber  <mike@xemacs.org>
 
+	* redisplay-x.c (separate_textual_runs): Don't try to call
+	ichar_to_unicode on non-MULE.
+
+2006-11-18  Mike Sperber  <mike@xemacs.org>
+
 	* window.c (window_pixel_height_to_char_height): Cater to the
 	possibility that defheight may be 0.
 
diff -r 42e4605ef1de -r ec0171167c5d src/redisplay-x.c
--- a/src/redisplay-x.c	Thu Nov 23 13:43:29 2006 +0000
+++ b/src/redisplay-x.c	Thu Nov 23 18:38:52 2006 +0000
@@ -245,8 +245,11 @@
       if (translate_to_ucs_2)
 	{
 	  UINT_16_BIT ucs2;
+#ifdef MULE
 	  int ucs = ichar_to_unicode(ch);
-
+#else
+	  int ucs = ch;
+#endif
 	  /* If UCS is less than zero or greater than 0xFFFF, set ucs2 to
 	     REPLACMENT CHARACTER. */
 	  ucs2 = (ucs & ~0xFFFF) ? 0xFFFD : ucs;