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

[Kenichi Handa]

CVSROOT:        /cvsroot/emacs
Module name:    emacs
Changes by:     Kenichi Handa <handa>   08/11/10 00:45:26

Index: character.c
===================================================================
RCS file: /cvsroot/emacs/emacs/src/character.c,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -b -r1.18 -r1.19
--- character.c 8 Nov 2008 13:02:18 -0000       1.18
+++ character.c 10 Nov 2008 00:45:26 -0000      1.19
@@ -1058,6 +1058,8 @@
          pos = XFASTINT (position);
          p = CHAR_POS_ADDR (pos);
        }
+      if (NILP (current_buffer->enable_multibyte_characters))
+       return make_number (*p);
     }
   else
     {
@@ -1074,6 +1076,8 @@
          pos = XFASTINT (position);
          p = SDATA (string) + string_char_to_byte (string, pos);
        }
+      if (! STRING_MULTIBYTE (string))
+       return make_number (*p);
     }
   c = STRING_CHAR (p, 0);
   if (CHAR_BYTE8_P (c))