(print_error_message): Print data of `end-of-file'

[gnu-emacs] / src / charset.c

diff --git a/src/charset.c b/src/charset.c
index 04afa7f32379b4054abce88a1c9eb25d4ca173bf..52ba5f28c5f0160e44c8f4fe25fcd4e45471ab9f 100644 (file)
--- a/src/charset.c
+++ b/src/charset.c
@@ -773,7 +773,7 @@ find_charset_in_str (str, len, charsets, table, multibyte)
      Lisp_Object table;
      int multibyte;
 {
-  register int num = 0, c;
+  register int num = 0;
 
   if (! multibyte)
     {
@@ -808,7 +808,7 @@ find_charset_in_str (str, len, charsets, table, multibyte)
        {
          int c1 = translate_char (table, -1, charset, c1, c2);
          if (c1 >= 0)
-           charset = CHAR_CHARSET (c);
+           charset = CHAR_CHARSET (c1);
        }
 
       if (!charsets[charset])
@@ -961,8 +961,8 @@ DEFUN ("make-char-internal", Fmake_char_internal, Smake_char_internal, 1, 3, 0,
   if (c1 == 0
       ? c2 != 0
       : (c2 == 0
-        ? !CHAR_COMPONENTS_VALID_P (charset, c1, 0x20)
-        : !CHAR_COMPONENTS_VALID_P (charset, c1, c2)))
+        ? !CHAR_COMPONENTS_VALID_P (charset_id, c1, 0x20)
+        : !CHAR_COMPONENTS_VALID_P (charset_id, c1, c2)))
     error ("Invalid code points for charset ID %d: %d %d", charset_id, c1, c2);
 
   return make_number (MAKE_CHAR (charset_id, c1, c2));