Merge changes from emacs-23 branch

1 files changed, 4 insertions, 4 deletions

diff --git a/src/lread.c b/src/lread.c
index 18d4ba8360e..bfe3755cc51 100644
--- a/src/lread.c
+++ b/src/lread.c
@@ -582,7 +582,7 @@ read_emacs_mule_char (int c, int (*readbyte) (int, Lisp_Object), Lisp_Object rea
 
   if (len == 2)
     {
-      charset = emacs_mule_charset[buf[0]];
+      charset = CHARSET_FROM_ID (emacs_mule_charset[buf[0]]);
       code = buf[1] & 0x7F;
     }
   else if (len == 3)
@@ -590,18 +590,18 @@ read_emacs_mule_char (int c, int (*readbyte) (int, Lisp_Object), Lisp_Object rea
       if (buf[0] == EMACS_MULE_LEADING_CODE_PRIVATE_11
           || buf[0] == EMACS_MULE_LEADING_CODE_PRIVATE_12)
         {
-          charset = emacs_mule_charset[buf[1]];
+          charset = CHARSET_FROM_ID (emacs_mule_charset[buf[1]]);
           code = buf[2] & 0x7F;
         }
       else
         {
-          charset = emacs_mule_charset[buf[0]];
+          charset = CHARSET_FROM_ID (emacs_mule_charset[buf[0]]);
           code = ((buf[1] << 8) | buf[2]) & 0x7F7F;
         }
     }
   else
     {
-      charset = emacs_mule_charset[buf[1]];
+      charset = CHARSET_FROM_ID (emacs_mule_charset[buf[1]]);
       code = ((buf[2] << 8) | buf[3]) & 0x7F7F;
     }
   c = DECODE_CHAR (charset, code);