CVS update by michaels xemacs/src ...

[xemacs-cvs at xemacs.org]

  User: michaels
  Date: 06/11/23 19:38:55

  Modified:    xemacs/src ChangeLog redisplay-x.c
Log:
2006-11-18  Mike Sperber  <mike at xemacs.org>

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

Revision  Changes    Path
1.1018    +5 -0      XEmacs/xemacs/src/ChangeLog

Index: ChangeLog
===================================================================
RCS file: /pack/xemacscvs/XEmacs/xemacs/src/ChangeLog,v
retrieving revision 1.1017
retrieving revision 1.1018
diff -u -p -r1.1017 -r1.1018
--- ChangeLog	2006/11/23 13:43:17	1.1017
+++ ChangeLog	2006/11/23 18:38:50	1.1018
@@ -22,6 +22,11 @@
 
 2006-11-18  Mike Sperber  <mike at 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 at xemacs.org>
+
 	* window.c (window_pixel_height_to_char_height): Cater to the
 	possibility that defheight may be 0.
 



1.45      +4 -1      XEmacs/xemacs/src/redisplay-x.c

Index: redisplay-x.c
===================================================================
RCS file: /pack/xemacscvs/XEmacs/xemacs/src/redisplay-x.c,v
retrieving revision 1.44
retrieving revision 1.45
diff -u -p -r1.44 -r1.45
--- redisplay-x.c	2006/11/05 22:31:45	1.44
+++ redisplay-x.c	2006/11/23 18:38:52	1.45
@@ -245,8 +245,11 @@ separate_textual_runs (unsigned char *te
       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;