From: tomo <tomo>
Date: Thu, 2 Sep 1999 22:10:55 +0000 (+0000)
Subject: (CHAR_INTP): Moved to character.h
X-Git-Tag: r21-2-19-utf-2000-0_6-0~30
X-Git-Url: http://git.chise.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=0209550b7b3c1e878906cf06705dd99a6999e410;p=chise%2Fxemacs-chise.git

(CHAR_INTP): Moved to character.h
(CHAR_OR_CHAR_INTP): Likewise.
(XCHAR_OR_CHAR_INT): Likewise.
(CHECK_CHAR_COERCE_INT): Likewise.
---

diff --git a/src/buffer.h b/src/buffer.h
index 0f73404..e11d15f 100644
--- a/src/buffer.h
+++ b/src/buffer.h
@@ -541,35 +541,6 @@ charptr_copy_char (CONST Bufbyte *ptr, Bufbyte *ptr2)
 /* (D) For working with Emchars */
 /* ---------------------------- */
 
-#define CHAR_INTP(x) (INTP (x) && valid_char_p (XINT (x)))
-
-#define CHAR_OR_CHAR_INTP(x) (CHARP (x) || CHAR_INTP (x))
-
-#ifdef ERROR_CHECK_TYPECHECK
-
-INLINE Emchar XCHAR_OR_CHAR_INT (Lisp_Object obj);
-INLINE Emchar
-XCHAR_OR_CHAR_INT (Lisp_Object obj)
-{
-  assert (CHAR_OR_CHAR_INTP (obj));
-  return CHARP (obj) ? XCHAR (obj) : XINT (obj);
-}
-
-#else
-
-#define XCHAR_OR_CHAR_INT(obj) (CHARP ((obj)) ? XCHAR ((obj)) : XINT ((obj)))
-
-#endif
-
-#define CHECK_CHAR_COERCE_INT(x) do {		\
-  if (CHARP (x))				\
-     ;						\
-  else if (CHAR_INTP (x))			\
-    x = make_char (XINT (x));			\
-  else						\
-    x = wrong_type_argument (Qcharacterp, x);	\
-} while (0)
-
 #ifdef UTF2000
 # define MAX_EMCHAR_LEN 6
 #else