(enlarge_buffer_text): Fix int -> EMACS_INT.

[gnu-emacs] / src / charset.h

diff --git a/src/charset.h b/src/charset.h
index 25ccaf9d324a8e1f6af6d39c250028d669987cd3..4b8bee4520d93f5cbef59c93d0225e69b0961c16 100644 (file)
--- a/src/charset.h
+++ b/src/charset.h
@@ -1,9 +1,11 @@
 /* Header for charset handler.
    Copyright (C) 2001, 2002, 2003, 2004, 2005,
 /* Header for charset handler.
    Copyright (C) 2001, 2002, 2003, 2004, 2005,

-                2006 Free Software Foundation, Inc.
-   Copyright (C) 1995, 1997, 1998, 2003
+                 2006, 2007, 2008 Free Software Foundation, Inc.
+   Copyright (C) 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
+     2005, 2006, 2007, 2008

      National Institute of Advanced Industrial Science and Technology (AIST)
      Registration Number H14PRO021
      National Institute of Advanced Industrial Science and Technology (AIST)
      Registration Number H14PRO021

+

    Copyright (C) 2003
      National Institute of Advanced Industrial Science and Technology (AIST)
      Registration Number H13PRO009
    Copyright (C) 2003
      National Institute of Advanced Industrial Science and Technology (AIST)
      Registration Number H13PRO009


@@ -12,7 +14,7 @@ This file is part of GNU Emacs.
 
 GNU Emacs is free software; you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by
 
 GNU Emacs is free software; you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by

-the Free Software Foundation; either version 2, or (at your option)
+the Free Software Foundation; either version 3, or (at your option)

 any later version.
 
 GNU Emacs is distributed in the hope that it will be useful,
 any later version.
 
 GNU Emacs is distributed in the hope that it will be useful,


@@ -190,13 +192,13 @@ struct charset
      version.  Otherwise, -1.  */
   int emacs_mule_id;
 
      version.  Otherwise, -1.  */
   int emacs_mule_id;
 

-  /* Nonzero iff the charset is compatible with ASCII.  */
+  /* Nonzero if the charset is compatible with ASCII.  */

   int ascii_compatible_p;
 
   int ascii_compatible_p;
 

-  /* Nonzero iff the charset is supplementary.  */
+  /* Nonzero if the charset is supplementary.  */

   int supplementary_p;
 
   int supplementary_p;
 

-  /* Nonzero iff all the code points are representable by Lisp_Int.  */
+  /* Nonzero if all the code points are representable by Lisp_Int.  */

   int compact_codes_p;
 
   /* The method for encoding/decoding characters of the charset.  */
   int compact_codes_p;
 
   /* The method for encoding/decoding characters of the charset.  */


@@ -330,14 +332,14 @@ extern struct charset *emacs_mule_charset[256];
   (CHARSET_ATTR_DEUNIFIER (CHARSET_ATTRIBUTES (charset)))
 
 
   (CHARSET_ATTR_DEUNIFIER (CHARSET_ATTRIBUTES (charset)))
 
 

-/* Nonzero iff OBJ is a valid charset symbol.  */
+/* Nonzero if OBJ is a valid charset symbol.  */

 #define CHARSETP(obj) (CHARSET_SYMBOL_HASH_INDEX (obj) >= 0)
 
 /* Check if X is a valid charset symbol.  If not, signal an error.  */
 #define CHECK_CHARSET(x)                                       \
   do {                                                         \
     if (! SYMBOLP (x) || CHARSET_SYMBOL_HASH_INDEX (x) < 0)    \
 #define CHARSETP(obj) (CHARSET_SYMBOL_HASH_INDEX (obj) >= 0)
 
 /* Check if X is a valid charset symbol.  If not, signal an error.  */
 #define CHECK_CHARSET(x)                                       \
   do {                                                         \
     if (! SYMBOLP (x) || CHARSET_SYMBOL_HASH_INDEX (x) < 0)    \

-      x = wrong_type_argument (Qcharsetp, (x));                        \
+      wrong_type_argument (Qcharsetp, (x));                    \

   } while (0)
 
 
   } while (0)
 
 


@@ -348,7 +350,7 @@ extern struct charset *emacs_mule_charset[256];
     int idx;                                                           \
                                                                        \
     if (! SYMBOLP (x) || (idx = CHARSET_SYMBOL_HASH_INDEX (x)) < 0)    \
     int idx;                                                           \
                                                                        \
     if (! SYMBOLP (x) || (idx = CHARSET_SYMBOL_HASH_INDEX (x)) < 0)    \

-      x = wrong_type_argument (Qcharsetp, (x));                                \
+      wrong_type_argument (Qcharsetp, (x));                            \

     id = XINT (AREF (HASH_VALUE (XHASH_TABLE (Vcharset_hash_table), idx), \
                     charset_id));                                      \
   } while (0)
     id = XINT (AREF (HASH_VALUE (XHASH_TABLE (Vcharset_hash_table), idx), \
                     charset_id));                                      \
   } while (0)


@@ -359,7 +361,7 @@ extern struct charset *emacs_mule_charset[256];
 #define CHECK_CHARSET_GET_ATTR(x, attr)                                \
   do {                                                                 \
     if (!SYMBOLP (x) || NILP (attr = CHARSET_SYMBOL_ATTRIBUTES (x)))   \
 #define CHECK_CHARSET_GET_ATTR(x, attr)                                \
   do {                                                                 \
     if (!SYMBOLP (x) || NILP (attr = CHARSET_SYMBOL_ATTRIBUTES (x)))   \

-      x = wrong_type_argument (Qcharsetp, (x));                                \
+      wrong_type_argument (Qcharsetp, (x));                            \

   } while (0)
 
 
   } while (0)
 
 


@@ -477,7 +479,7 @@ extern int iso_charset_table[ISO_MAX_DIMENSION][ISO_MAX_CHARS][ISO_MAX_FINAL];
 #define ISO_CHARSET_TABLE(dimension, chars_96, final)  \
   iso_charset_table[(dimension) - 1][(chars_96)][(final)]
 
 #define ISO_CHARSET_TABLE(dimension, chars_96, final)  \
   iso_charset_table[(dimension) - 1][(chars_96)][(final)]
 

-/* Nonzero iff the charset who has FAST_MAP may contain C.  */
+/* Nonzero if the charset who has FAST_MAP may contain C.  */

 #define CHARSET_FAST_MAP_REF(c, fast_map)              \
   ((c) < 0x10000                                       \
    ? fast_map[(c) >> 10] & (1 << (((c) >> 7) & 7))     \
 #define CHARSET_FAST_MAP_REF(c, fast_map)              \
   ((c) < 0x10000                                       \
    ? fast_map[(c) >> 10] & (1 << (((c) >> 7) & 7))     \


@@ -493,7 +495,7 @@ extern int iso_charset_table[ISO_MAX_DIMENSION][ISO_MAX_CHARS][ISO_MAX_FINAL];
 
 
 
 
 
 

-/* 1 iff CHARSET may contain the character C.  */
+/* 1 if CHARSET may contain the character C.  */

 #define CHAR_CHARSET_P(c, charset)                                      \
   ((ASCII_CHAR_P (c) && (charset)->ascii_compatible_p)                  \
    || ((CHARSET_UNIFIED_P (charset)                                     \
 #define CHAR_CHARSET_P(c, charset)                                      \
   ((ASCII_CHAR_P (c) && (charset)->ascii_compatible_p)                  \
    || ((CHARSET_UNIFIED_P (charset)                                     \