# HG changeset patch
# User Ken Raeburn <raeburn@raeburn.org>
# Date 955222743 0
# Node ID 75bd73426842098d5d0bc414a3a95f2541aa4ec2
# Parent  8696fafd68ae34920e7608ddc2f4d719abd38a5b
* charset.c (Fmake_char_internal): CHAR_COMPONENTS_VALID_P takes a
charset id (int) argument, not a charset (Lisp_Object).

diff -r 8696fafd68ae -r 75bd73426842 src/ChangeLog
Binary file src/ChangeLog has changed
diff -r 8696fafd68ae -r 75bd73426842 src/charset.c
--- a/src/charset.c	Sat Apr 08 19:36:24 2000 +0000
+++ b/src/charset.c	Sat Apr 08 19:39:03 2000 +0000
@@ -961,8 +961,8 @@
   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));