Mercurial > emacs
comparison src/charset.c @ 26632:493539fc5bb2
(Fmake_char_internal): Print the charset ID when
signalling an error.
| author | Eli Zaretskii <eliz@gnu.org> |
|---|---|
| date | Sun, 28 Nov 1999 10:20:12 +0000 |
| parents | 74566592a2d6 |
| children | 9e9a0735c824 |
comparison
equal
deleted
inserted
replaced
| 26631:8122fc2dd490 | 26632:493539fc5bb2 |
|---|---|
| 1078 CHECK_NUMBER (code2, 2); | 1078 CHECK_NUMBER (code2, 2); |
| 1079 c2 = XINT (code2); | 1079 c2 = XINT (code2); |
| 1080 } | 1080 } |
| 1081 | 1081 |
| 1082 if (c1 < 0 || c1 > 0xFF || c2 < 0 || c2 > 0xFF) | 1082 if (c1 < 0 || c1 > 0xFF || c2 < 0 || c2 > 0xFF) |
| 1083 error ("Invalid code points: %d %d", c1, c2); | 1083 error ("Invalid code points for charset ID %d: %d %d", charset_id, c1, c2); |
| 1084 c1 &= 0x7F; | 1084 c1 &= 0x7F; |
| 1085 c2 &= 0x7F; | 1085 c2 &= 0x7F; |
| 1086 if (c1 == 0 | 1086 if (c1 == 0 |
| 1087 ? c2 != 0 | 1087 ? c2 != 0 |
| 1088 : (c2 == 0 | 1088 : (c2 == 0 |
| 1089 ? !CHAR_COMPONENTS_VALID_P (charset, c1, 0x20) | 1089 ? !CHAR_COMPONENTS_VALID_P (charset, c1, 0x20) |
| 1090 : !CHAR_COMPONENTS_VALID_P (charset, c1, c2))) | 1090 : !CHAR_COMPONENTS_VALID_P (charset, c1, c2))) |
| 1091 error ("Invalid code points: %d %d", c1, c2); | 1091 error ("Invalid code points for charset ID %d: %d %d", charset_id, c1, c2); |
| 1092 | 1092 |
| 1093 return make_number (MAKE_CHAR (charset_id, c1, c2)); | 1093 return make_number (MAKE_CHAR (charset_id, c1, c2)); |
| 1094 } | 1094 } |
| 1095 | 1095 |
| 1096 DEFUN ("split-char", Fsplit_char, Ssplit_char, 1, 1, 0, | 1096 DEFUN ("split-char", Fsplit_char, Ssplit_char, 1, 1, 0, |