1
0
mirror of https://git.savannah.gnu.org/git/emacs.git synced 2025-01-04 11:40:22 +00:00

* charset.c (Fmake_char_internal): CHAR_COMPONENTS_VALID_P takes a

charset id (int) argument, not a charset (Lisp_Object).
This commit is contained in:
Ken Raeburn 2000-04-08 19:39:03 +00:00
parent e8413c3b81
commit 87f673176c
2 changed files with 5 additions and 2 deletions

View File

@ -1,5 +1,8 @@
2000-04-08 Ken Raeburn <raeburn@gnu.org>
* charset.c (Fmake_char_internal): CHAR_COMPONENTS_VALID_P takes a
charset id (int) argument, not a charset (Lisp_Object).
* coding.h (code_convert_string): Declare.
* coding.c (code_convert_string_norecord): Pass an int, not a lisp
object, as the fourth argument to code_convert_string.

View File

@ -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));