[Emacs-diffs] emacs/src xdisp.c [EMACS_23_1_RC]

[Kenichi Handa]

CVSROOT:        /cvsroot/emacs
Module name:    emacs
Branch:         EMACS_23_1_RC
Changes by:     Kenichi Handa <handa>   09/07/07 01:41:58

Modified files:
        src            : xdisp.c 

Log message:
        (get_next_display_element): Use DECODE_BYTE.
        (x_produce_glyphs): Likewise.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/emacs/src/xdisp.c?cvsroot=emacs&only_with_tag=EMACS_23_1_RC&r1=1.1288&r2=1.1288.2.1

Patches:
Index: xdisp.c
===================================================================
RCS file: /cvsroot/emacs/emacs/src/xdisp.c,v
retrieving revision 1.1288
retrieving revision 1.1288.2.1
diff -u -b -r1.1288 -r1.1288.2.1
--- xdisp.c     18 Jun 2009 09:49:07 -0000      1.1288
+++ xdisp.c     7 Jul 2009 01:41:57 -0000       1.1288.2.1
@@ -5743,7 +5743,7 @@
                                  || it->c == 0xAD /* SOFT HYPHEN */)))
                       : (it->c >= 127
                          && (! unibyte_display_via_language_environment
-                             || (UNIBYTE_CHAR_HAS_MULTIBYTE_P (it->c)))))))
+                             || (DECODE_UNIBYTE (it->c) <= 0xA0))))))
            {
              /* IT->c is a control character which must be displayed
                 either as '\003' or as `^C' where the '\\' and '^'
@@ -21196,9 +21196,8 @@
        {
          if (SINGLE_BYTE_CHAR_P (it->c)
              && unibyte_display_via_language_environment)
-           it->char_to_display = unibyte_char_to_multibyte (it->c);
-         if (! SINGLE_BYTE_CHAR_P (it->char_to_display))
            {
+             it->char_to_display = DECODE_UNIBYTE (it->c);
              it->multibyte_p = 1;
              it->face_id = FACE_FOR_CHAR (it->f, face, it->char_to_display,
                                           -1, Qnil);