diff --git a/src/ChangeLog b/src/ChangeLog
index 2870cf3af76..2e2358e0679 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -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.
diff --git a/src/charset.c b/src/charset.c
index c040134f1bb..52ba5f28c5f 100644
--- a/src/charset.c
+++ b/src/charset.c
@@ -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));