diff src/character.h @ 88873:7d441bc35e9b

(TRAILING_CODE_P): New macro. (MAYBE_UNIFY_CHAR): Adjusted for the change of Funify_charset. (string_char_with_unification): Fix prototype. (Vscript_alist): Extern it.

--- a/src/character.h	Mon Jul 22 06:27:09 2002 +0000
+++ b/src/character.h	Mon Jul 22 06:30:30 2002 +0000
@@ -157,6 +157,10 @@
    form.  */
 #define LEADING_CODE_P(byte) (((byte) & 0xC0) == 0xC0)
 
+/* Nonzero iff BYTE is a trailing code of a non-ASCII character in a
+   multibyte form.  */
+#define TRAILING_CODE_P(byte) (((byte) & 0xC0) == 0x80)
+
 /* Nonzero iff BYTE starts a character in a multibyte form.
    This is equivalent to:
 	(ASCII_BYTE_P (byte) || LEADING_CODE_P (byte))  */
@@ -459,7 +463,7 @@
 	{							\
 	  if (SYMBOLP (val))					\
 	    {							\
-	      Funify_charset (val, Qnil);			\
+	      Funify_charset (val, Qnil, Qnil);			\
 	      val = CHAR_TABLE_REF (Vchar_unify_table, c);	\
 	    }							\
 	  if ((unified = XINT (val)) >= 0)			\
@@ -492,8 +496,8 @@
    : XINT (CHAR_TABLE_REF (Vchar_width_table, c)))
 
 extern int char_string_with_unification P_ ((int, unsigned char *));
-extern int string_char_with_unification P_ ((unsigned char *,
-					     unsigned char **, int *));
+extern int string_char_with_unification P_ ((const unsigned char *,
+					     const unsigned char **, int *));
 
 extern int translate_char P_ ((Lisp_Object, int c));
 extern int char_printable_p P_ ((int c));
@@ -523,6 +527,8 @@
 /* A char-table for characters which may invoke auto-filling.  */
 extern Lisp_Object Vauto_fill_chars;
 
+extern Lisp_Object Vscript_alist;
+
 /* Copy LEN bytes from FROM to TO.  This macro should be used only
    when a caller knows that LEN is short and the obvious copy loop is
    faster than calling bcopy which has some overhead.  Copying a