Commit 613a8346 authored by Eli Zaretskii's avatar Eli Zaretskii
Browse files

(Fmake_char_internal): Print the charset ID when

signalling an error.
parent 59c65f1e
No preview for this file type
...@@ -1080,7 +1080,7 @@ DEFUN ("make-char-internal", Fmake_char_internal, Smake_char_internal, 1, 3, 0, ...@@ -1080,7 +1080,7 @@ DEFUN ("make-char-internal", Fmake_char_internal, Smake_char_internal, 1, 3, 0,
} }
if (c1 < 0 || c1 > 0xFF || c2 < 0 || c2 > 0xFF) if (c1 < 0 || c1 > 0xFF || c2 < 0 || c2 > 0xFF)
error ("Invalid code points: %d %d", c1, c2); error ("Invalid code points for charset ID %d: %d %d", charset_id, c1, c2);
c1 &= 0x7F; c1 &= 0x7F;
c2 &= 0x7F; c2 &= 0x7F;
if (c1 == 0 if (c1 == 0
...@@ -1088,7 +1088,7 @@ DEFUN ("make-char-internal", Fmake_char_internal, Smake_char_internal, 1, 3, 0, ...@@ -1088,7 +1088,7 @@ DEFUN ("make-char-internal", Fmake_char_internal, Smake_char_internal, 1, 3, 0,
: (c2 == 0 : (c2 == 0
? !CHAR_COMPONENTS_VALID_P (charset, c1, 0x20) ? !CHAR_COMPONENTS_VALID_P (charset, c1, 0x20)
: !CHAR_COMPONENTS_VALID_P (charset, c1, c2))) : !CHAR_COMPONENTS_VALID_P (charset, c1, c2)))
error ("Invalid code points: %d %d", 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)); return make_number (MAKE_CHAR (charset_id, c1, c2));
} }
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment