[Emacs-diffs] Changes to emacs/src/msdos.c,v

[Eli Zaretskii]

CVSROOT:        /cvsroot/emacs
Module name:    emacs
Changes by:     Eli Zaretskii <eliz>    08/09/06 11:14:04

Index: msdos.c
===================================================================
RCS file: /cvsroot/emacs/emacs/src/msdos.c,v
retrieving revision 1.225
retrieving revision 1.226
diff -u -b -r1.225 -r1.226
--- msdos.c     31 Aug 2008 19:36:51 -0000      1.225
+++ msdos.c     6 Sep 2008 11:14:03 -0000       1.226
@@ -3556,7 +3556,7 @@
 {
   int i, j, face, width,  mx, my, enabled, mousehere, row, col;
   struct glyph *text, *p;
-  char *q;
+  const unsigned char *q;
   struct frame *sf = SELECTED_FRAME();
 
   menu_help_message = NULL;
@@ -3590,18 +3590,19 @@
       p++;
       for (j = 0, q = menu->text[i]; *q; j++)
        {
-         if (*q > 26)
+         unsigned c = STRING_CHAR_ADVANCE (q);
+
+         if (c > 26)
            {
-             BUILD_CHAR_GLYPH (*p, *q++, face, 0);
+             BUILD_CHAR_GLYPH (*p, c, face, 0);
              p++;
            }
          else  /* make '^x' */
            {
-             /* FIXME: need to handle non-ASCII characters!  */
              BUILD_CHAR_GLYPH (*p, '^', face, 0);
              p++;
              j++;
-             BUILD_CHAR_GLYPH (*p, *q++ + 64, face, 0);
+             BUILD_CHAR_GLYPH (*p, c + 64, face, 0);
              p++;
            }
        }
@@ -3614,9 +3615,9 @@
       for (; j < max_width - 2; j++, p++)
        BUILD_CHAR_GLYPH (*p, ' ', face, 0);
 
-      /* FIXME: should use Unicode codepoint for what Emacs 22.x
-        displayed here.  */
-      BUILD_CHAR_GLYPH (*p, menu->submenu[i] ? '>' : ' ', face, 0);
+      /* 16 is the character code of a character that on DOS terminal
+        produces a nice-looking right-pointing arrow glyph.  */
+      BUILD_CHAR_GLYPH (*p, menu->submenu[i] ? 16 : ' ', face, 0);
       p++;
       IT_write_glyphs (sf, text, max_width);
     }