Include character unconditionally.

[chise/xemacs-chise.git-] / src / buffer.h

diff --git a/src/buffer.h b/src/buffer.h
index 38a1d87..0f73404 100644 (file)
--- a/src/buffer.h
+++ b/src/buffer.h
@@ -32,8 +32,10 @@ Boston, MA 02111-1307, USA.  */
 #ifndef _XEMACS_BUFFER_H_
 #define _XEMACS_BUFFER_H_
 
-#ifdef MULE
 #include "character.h"
+
+#ifdef UTF2000
+#include "mb-utf-8.h"
 #endif
 
 /************************************************************************/
@@ -539,27 +541,6 @@ charptr_copy_char (CONST Bufbyte *ptr, Bufbyte *ptr2)
 /* (D) For working with Emchars */
 /* ---------------------------- */
 
-#ifdef MULE
-
-#ifdef UTF2000
-#define valid_char_p(ch) 1
-#else
-int non_ascii_valid_char_p (Emchar ch);
-
-INLINE int valid_char_p (Emchar ch);
-INLINE int
-valid_char_p (Emchar ch)
-{
-  return ((unsigned int) (ch) <= 0xff) || non_ascii_valid_char_p (ch);
-}
-#endif
-
-#else /* not MULE */
-
-#define valid_char_p(ch) ((unsigned int) (ch) <= 0xff)
-
-#endif /* not MULE */
-
 #define CHAR_INTP(x) (INTP (x) && valid_char_p (XINT (x)))
 
 #define CHAR_OR_CHAR_INTP(x) (CHARP (x) || CHAR_INTP (x))
@@ -1375,6 +1356,8 @@ Bufbyte *convert_from_external_format (CONST Extbyte *ptr,
 
 #ifndef MULE
 
+typedef int Charset_ID;
+
 #define Vcharset_ascii Qnil
 
 #define CHAR_CHARSET(ch) Vcharset_ascii
@@ -1627,10 +1610,10 @@ int beginning_of_line_p (struct buffer *b, Bufpos pt);
 
 /* from insdel.c */
 void set_buffer_point (struct buffer *buf, Bufpos pos, Bytind bipos);
-void find_charsets_in_bufbyte_string (unsigned char *charsets,
+void find_charsets_in_bufbyte_string (Charset_ID *charsets,
                                      CONST Bufbyte *str,
                                      Bytecount len);
-void find_charsets_in_emchar_string (unsigned char *charsets,
+void find_charsets_in_emchar_string (Charset_ID *charsets,
                                     CONST Emchar *str,
                                     Charcount len);
 int bufbyte_string_displayed_columns (CONST Bufbyte *str, Bytecount len);