Merge from emacs-23; up to 2010-06-03T05:41:49Z!rgm@gnu.org.

[bpt/emacs.git] / src / character.h

diff --git a/src/character.h b/src/character.h
index 1e4a120..fb29ced 100644 (file)
--- a/src/character.h
+++ b/src/character.h
@@ -1,16 +1,16 @@
 /* Header for multibyte character handler.
    Copyright (C) 1995, 1997, 1998 Electrotechnical Laboratory, JAPAN.
      Licensed to the Free Software Foundation.
 /* Header for multibyte character handler.
    Copyright (C) 1995, 1997, 1998 Electrotechnical Laboratory, JAPAN.
      Licensed to the Free Software Foundation.

-   Copyright (C) 2003, 2006
+   Copyright (C) 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011

      National Institute of Advanced Industrial Science and Technology (AIST)
      Registration Number H13PRO009
 
 This file is part of GNU Emacs.
 
      National Institute of Advanced Industrial Science and Technology (AIST)
      Registration Number H13PRO009
 
 This file is part of GNU Emacs.
 

-GNU Emacs is free software; you can redistribute it and/or modify
+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
 it under the terms of the GNU General Public License as published by

-the Free Software Foundation; either version 2, or (at your option)
-any later version.
+the Free Software Foundation, either version 3 of the License, or
+(at your option) any later version.

 
 GNU Emacs is distributed in the hope that it will be useful,
 but WITHOUT ANY WARRANTY; without even the implied warranty of
 
 GNU Emacs is distributed in the hope that it will be useful,
 but WITHOUT ANY WARRANTY; without even the implied warranty of


@@ -18,9 +18,7 @@ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 GNU General Public License for more details.
 
 You should have received a copy of the GNU General Public License
 GNU General Public License for more details.
 
 You should have received a copy of the GNU General Public License

-along with GNU Emacs; see the file COPYING.  If not, write to
-the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-Boston, MA 02111-1307, USA.  */
+along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */

 
 #ifndef EMACS_CHARACTER_H
 #define EMACS_CHARACTER_H
 
 #ifndef EMACS_CHARACTER_H
 #define EMACS_CHARACTER_H


@@ -64,30 +62,26 @@ Boston, MA 02111-1307, USA.  */
 /* Return the character code for raw 8-bit byte BYTE.  */
 #define BYTE8_TO_CHAR(byte) ((byte) + 0x3FFF00)
 
 /* Return the character code for raw 8-bit byte BYTE.  */
 #define BYTE8_TO_CHAR(byte) ((byte) + 0x3FFF00)
 

+#define UNIBYTE_TO_CHAR(byte) \
+  (ASCII_BYTE_P (byte) ? (byte) : BYTE8_TO_CHAR (byte))
+

 /* Return the raw 8-bit byte for character C.  */
 #define CHAR_TO_BYTE8(c)       \
   (CHAR_BYTE8_P (c)            \
    ? (c) - 0x3FFF00            \
    : multibyte_char_to_unibyte (c, Qnil))
 
 /* Return the raw 8-bit byte for character C.  */
 #define CHAR_TO_BYTE8(c)       \
   (CHAR_BYTE8_P (c)            \
    ? (c) - 0x3FFF00            \
    : multibyte_char_to_unibyte (c, Qnil))
 

+/* Return the raw 8-bit byte for character C,
+   or -1 if C doesn't correspond to a byte.  */
+#define CHAR_TO_BYTE_SAFE(c)   \
+  (CHAR_BYTE8_P (c)            \
+   ? (c) - 0x3FFF00            \
+   : multibyte_char_to_unibyte_safe (c))
+

 /* Nonzero iff BYTE is the 1st byte of a multibyte form of a character
    that corresponds to a raw 8-bit byte.  */
 #define CHAR_BYTE8_HEAD_P(byte) ((byte) == 0xC0 || (byte) == 0xC1)
 
 /* Nonzero iff BYTE is the 1st byte of a multibyte form of a character
    that corresponds to a raw 8-bit byte.  */
 #define CHAR_BYTE8_HEAD_P(byte) ((byte) == 0xC0 || (byte) == 0xC1)
 

-/* Mapping table from unibyte chars to multibyte chars.  */
-extern int unibyte_to_multibyte_table[256];
-
-/* Convert the unibyte character C to the corresponding multibyte
-   character.  If C can't be converted, return C.  */
-#define unibyte_char_to_multibyte(c)   \
-  ((c) < 256 ? unibyte_to_multibyte_table[(c)] : (c))
-
-/* Nth element is 1 iff unibyte char N can be mapped to a multibyte
-   char.  */
-extern char unibyte_has_multibyte_table[256];
-
-#define UNIBYTE_CHAR_HAS_MULTIBYTE_P(c) (unibyte_has_multibyte_table[(c)])
-

 /* If C is not ASCII, make it unibyte. */
 #define MAKE_CHAR_UNIBYTE(c)   \
   do {                         \
 /* If C is not ASCII, make it unibyte. */
 #define MAKE_CHAR_UNIBYTE(c)   \
   do {                         \


@@ -96,13 +90,14 @@ extern char unibyte_has_multibyte_table[256];
   } while (0)
 
 
   } while (0)
 
 

-/* If C is not ASCII, make it multibyte.  It assumes C < 256.  */
-#define MAKE_CHAR_MULTIBYTE(c) ((c) = unibyte_to_multibyte_table[(c)])
+/* If C is not ASCII, make it multibyte.  Assumes C < 256.  */
+#define MAKE_CHAR_MULTIBYTE(c) \
+  (eassert ((c) >= 0 && (c) < 256), (c) = UNIBYTE_TO_CHAR (c))

 
 /* This is the maximum byte length of multibyte form.  */
 #define MAX_MULTIBYTE_LENGTH 5
 
 
 /* This is the maximum byte length of multibyte form.  */
 #define MAX_MULTIBYTE_LENGTH 5
 

-/* Return a Lisp character whose character code is C.  It assumes C is
+/* Return a Lisp character whose character code is C.  Assumes C is

    a valid character code.  */
 #define make_char(c) make_number (c)
 
    a valid character code.  */
 #define make_char(c) make_number (c)
 


@@ -112,8 +107,7 @@ extern char unibyte_has_multibyte_table[256];
 /* Nonzero iff X is a character.  */
 #define CHARACTERP(x) (NATNUMP (x) && XFASTINT (x) <= MAX_CHAR)
 
 /* Nonzero iff X is a character.  */
 #define CHARACTERP(x) (NATNUMP (x) && XFASTINT (x) <= MAX_CHAR)
 

-/* Nonzero iff C is valid as a character code.  GENERICP is not used
-   now.  */
+/* Nonzero iff C is valid as a character code.  GENERICP is not used.  */

 #define CHAR_VALID_P(c, genericp) ((unsigned) (c) <= MAX_CHAR)
 
 /* Check if Lisp object X is a character or not.  */
 #define CHAR_VALID_P(c, genericp) ((unsigned) (c) <= MAX_CHAR)
 
 /* Check if Lisp object X is a character or not.  */


@@ -142,8 +136,8 @@ extern char unibyte_has_multibyte_table[256];
 
 /* Nonzero if character C has a printable glyph.  */
 #define CHAR_PRINTABLE_P(c)    \
 
 /* Nonzero if character C has a printable glyph.  */
 #define CHAR_PRINTABLE_P(c)    \

-  (((c) >= 32 && ((c) < 127)   \
-    || ! NILP (CHAR_TABLE_REF (Vprintable_chars, (c)))))
+  (((c) >= 32 && (c) < 127)    \
+   || ! NILP (CHAR_TABLE_REF (Vprintable_chars, (c))))

 
 /* Return byte length of multibyte form for character C.  */
 #define CHAR_BYTES(c)                  \
 
 /* Return byte length of multibyte form for character C.  */
 #define CHAR_BYTES(c)                  \


@@ -194,9 +188,9 @@ extern char unibyte_has_multibyte_table[256];
    2)
 
 
    2)
 
 

-/* Store multibyte form of the character C in P.  The caller should
-   allocate at least MAX_MULTIBYTE_LENGTH bytes area at P in advance.
-   And, advance P to the end of the multibyte form.  */
+/* Store multibyte form of the character C in P and advance P to the
+   end of the multibyte form.  The caller should allocate at least
+   MAX_MULTIBYTE_LENGTH bytes area at P in advance.  */

 
 #define CHAR_STRING_ADVANCE(c, p)              \
   do {                                         \
 
 #define CHAR_STRING_ADVANCE(c, p)              \
   do {                                         \


@@ -227,10 +221,6 @@ extern char unibyte_has_multibyte_table[256];
        (ASCII_BYTE_P (byte) || LEADING_CODE_P (byte))  */
 #define CHAR_HEAD_P(byte) (((byte) & 0xC0) != 0x80)
 
        (ASCII_BYTE_P (byte) || LEADING_CODE_P (byte))  */
 #define CHAR_HEAD_P(byte) (((byte) & 0xC0) != 0x80)
 

-/* Just kept for backward compatibility.  This macro will be removed
-   in the future.  */
-#define BASE_LEADING_CODE_P LEADING_CODE_P
-

 /* How many bytes a character that starts with BYTE occupies in a
    multibyte form.  */
 #define BYTES_BY_CHAR_HEAD(byte)       \
 /* How many bytes a character that starts with BYTE occupies in a
    multibyte form.  */
 #define BYTES_BY_CHAR_HEAD(byte)       \


@@ -241,25 +231,8 @@ extern char unibyte_has_multibyte_table[256];
    : 5)
 
 
    : 5)
 
 

-/* Return the length of the multi-byte form at string STR of length
-   LEN while assuming that STR points a valid multi-byte form.  As
-   this macro isn't necessary anymore, all callers will be changed to
-   use BYTES_BY_CHAR_HEAD directly in the future.  */
-
-#define MULTIBYTE_FORM_LENGTH(str, len)                \
-  BYTES_BY_CHAR_HEAD (*(str))
-
-/* Parse multibyte string STR of length LENGTH and set BYTES to the
-   byte length of a character at STR while assuming that STR points a
-   valid multibyte form.  As this macro isn't necessary anymore, all
-   callers will be changed to use BYTES_BY_CHAR_HEAD directly in the
-   future.  */
-
-#define PARSE_MULTIBYTE_SEQ(str, length, bytes)        \
-  (bytes) = BYTES_BY_CHAR_HEAD (*(str))
-

 /* The byte length of multibyte form at unibyte string P ending at
 /* The byte length of multibyte form at unibyte string P ending at

-   PEND.  If STR doesn't point a valid multibyte form, return 0.  */
+   PEND.  If STR doesn't point to a valid multibyte form, return 0.  */

 
 #define MULTIBYTE_LENGTH(p, pend)                              \
   (p >= pend ? 0                                               \
 
 #define MULTIBYTE_LENGTH(p, pend)                              \
   (p >= pend ? 0                                               \


@@ -275,7 +248,7 @@ extern char unibyte_has_multibyte_table[256];
    : 0)
 
 
    : 0)
 
 

-/* Like MULTIBYTE_LENGTH but don't check the ending address.  */
+/* Like MULTIBYTE_LENGTH, but don't check the ending address.  */

 
 #define MULTIBYTE_LENGTH_NO_CHECK(p)                   \
   (!((p)[0] & 0x80) ? 1                                        \
 
 #define MULTIBYTE_LENGTH_NO_CHECK(p)                   \
   (!((p)[0] & 0x80) ? 1                                        \


@@ -289,9 +262,9 @@ extern char unibyte_has_multibyte_table[256];
    : (p)[0] == 0xF8 && ((p)[1] & 0xF0) == 0x80 ? 5     \
    : 0)
 
    : (p)[0] == 0xF8 && ((p)[1] & 0xF0) == 0x80 ? 5     \
    : 0)
 

-/* If P is before LIMIT, advance P to the next character boundary.  It
-   assumes that P is already at a character boundary of the sane
-   mulitbyte form whose end address is LIMIT.  */
+/* If P is before LIMIT, advance P to the next character boundary.
+   Assumes that P is already at a character boundary of the same
+   multibyte form whose end address is LIMIT.  */

 
 #define NEXT_CHAR_BOUNDARY(p, limit)   \
   do {                                 \
 
 #define NEXT_CHAR_BOUNDARY(p, limit)   \
   do {                                 \


@@ -301,8 +274,8 @@ extern char unibyte_has_multibyte_table[256];
 
 
 /* If P is after LIMIT, advance P to the previous character boundary.
 
 
 /* If P is after LIMIT, advance P to the previous character boundary.

-   It assumes that P is already at a character boundary of the sane
-   mulitbyte form whose beginning address is LIMIT.  */
+   Assumes that P is already at a character boundary of the same
+   multibyte form whose beginning address is LIMIT.  */

 
 #define PREV_CHAR_BOUNDARY(p, limit)                                   \
   do {                                                                 \
 
 #define PREV_CHAR_BOUNDARY(p, limit)                                   \
   do {                                                                 \


@@ -317,10 +290,9 @@ extern char unibyte_has_multibyte_table[256];
   } while (0)
 
 /* Return the character code of character whose multibyte form is at
   } while (0)
 
 /* Return the character code of character whose multibyte form is at

-   P.  The argument LEN is ignored.  It will be removed in the
-   future.  */
+   P.  */

 
 

-#define STRING_CHAR(p, len)                                    \
+#define STRING_CHAR(p)                                         \

   (!((p)[0] & 0x80)                                            \
    ? (p)[0]                                                    \
    : ! ((p)[0] & 0x20)                                         \
   (!((p)[0] & 0x80)                                            \
    ? (p)[0]                                                    \
    : ! ((p)[0] & 0x20)                                         \


@@ -334,11 +306,10 @@ extern char unibyte_has_multibyte_table[256];
    : string_char ((p), NULL, NULL))
 
 
    : string_char ((p), NULL, NULL))
 
 

-/* Like STRING_CHAR but set ACTUAL_LEN to the length of multibyte
-   form.  The argument LEN is ignored.  It will be removed in the
-   future.  */
+/* Like STRING_CHAR, but set ACTUAL_LEN to the length of multibyte
+   form.  */

 
 

-#define STRING_CHAR_AND_LENGTH(p, len, actual_len)             \
+#define STRING_CHAR_AND_LENGTH(p, actual_len)                  \

   (!((p)[0] & 0x80)                                            \
    ? ((actual_len) = 1, (p)[0])                                        \
    : ! ((p)[0] & 0x20)                                         \
   (!((p)[0] & 0x80)                                            \
    ? ((actual_len) = 1, (p)[0])                                        \
    : ! ((p)[0] & 0x20)                                         \


@@ -354,7 +325,7 @@ extern char unibyte_has_multibyte_table[256];
    : string_char ((p), NULL, &actual_len))
 
 
    : string_char ((p), NULL, &actual_len))
 
 

-/* Like STRING_CHAR but advance P to the end of multibyte form.  */
+/* Like STRING_CHAR, but advance P to the end of multibyte form.  */

 
 #define STRING_CHAR_ADVANCE(p)                                 \
   (!((p)[0] & 0x80)                                            \
 
 #define STRING_CHAR_ADVANCE(p)                                 \
   (!((p)[0] & 0x80)                                            \


@@ -380,74 +351,78 @@ extern char unibyte_has_multibyte_table[256];
    we increment them past the character fetched.  */
 
 #define FETCH_STRING_CHAR_ADVANCE(OUTPUT, STRING, CHARIDX, BYTEIDX)    \
    we increment them past the character fetched.  */
 
 #define FETCH_STRING_CHAR_ADVANCE(OUTPUT, STRING, CHARIDX, BYTEIDX)    \

-  if (1)                                                               \
+  do                                                                    \

     {                                                                  \
       CHARIDX++;                                                       \
       if (STRING_MULTIBYTE (STRING))                                   \
        {                                                               \
     {                                                                  \
       CHARIDX++;                                                       \
       if (STRING_MULTIBYTE (STRING))                                   \
        {                                                               \

-         unsigned char *ptr = &XSTRING (STRING)->data[BYTEIDX];        \
+         unsigned char *ptr = &SDATA (STRING)[BYTEIDX];                \

          int len;                                                      \
                                                                        \
          int len;                                                      \
                                                                        \

-         OUTPUT = STRING_CHAR_AND_LENGTH (ptr, 0, len);                \
+         OUTPUT = STRING_CHAR_AND_LENGTH (ptr, len);                   \

          BYTEIDX += len;                                               \
        }                                                               \
       else                                                             \
          BYTEIDX += len;                                               \
        }                                                               \
       else                                                             \

-       OUTPUT = XSTRING (STRING)->data[BYTEIDX++];                     \
+       {                                                               \
+         OUTPUT = SREF (STRING, BYTEIDX);                              \
+         BYTEIDX++;                                                    \
+       }                                                               \

     }                                                                  \
     }                                                                  \

-  else
+  while (0)

 
 

-/* Like FETCH_STRING_CHAR_ADVANCE but return a multibyte character eve
-   if STRING is unibyte.  */
+/* Like FETCH_STRING_CHAR_ADVANCE, but return a multibyte character
+   even if STRING is unibyte.  */

 
 #define FETCH_STRING_CHAR_AS_MULTIBYTE_ADVANCE(OUTPUT, STRING, CHARIDX, BYTEIDX) \
 
 #define FETCH_STRING_CHAR_AS_MULTIBYTE_ADVANCE(OUTPUT, STRING, CHARIDX, BYTEIDX) \

-  if (1)                                                                     \
+  do                                                                          \

     {                                                                        \
       CHARIDX++;                                                             \
       if (STRING_MULTIBYTE (STRING))                                         \
        {                                                                     \
     {                                                                        \
       CHARIDX++;                                                             \
       if (STRING_MULTIBYTE (STRING))                                         \
        {                                                                     \

-         unsigned char *ptr = &XSTRING (STRING)->data[BYTEIDX];              \
+         unsigned char *ptr = &SDATA (STRING)[BYTEIDX];                      \

          int len;                                                            \
                                                                              \
          int len;                                                            \
                                                                              \

-         OUTPUT = STRING_CHAR_AND_LENGTH (ptr, 0, len);                      \
+         OUTPUT = STRING_CHAR_AND_LENGTH (ptr, len);                         \

          BYTEIDX += len;                                                     \
        }                                                                     \
       else                                                                   \
        {                                                                     \
          BYTEIDX += len;                                                     \
        }                                                                     \
       else                                                                   \
        {                                                                     \

-         OUTPUT = XSTRING (STRING)->data[BYTEIDX++];                         \
+         OUTPUT = SREF (STRING, BYTEIDX);                                    \
+         BYTEIDX++;                                                          \

          MAKE_CHAR_MULTIBYTE (OUTPUT);                                       \
        }                                                                     \
     }                                                                        \
          MAKE_CHAR_MULTIBYTE (OUTPUT);                                       \
        }                                                                     \
     }                                                                        \

-  else
+  while (0)

 
 
 
 

-/* Like FETCH_STRING_CHAR_ADVANCE but assumes STRING is multibyte.  */
+/* Like FETCH_STRING_CHAR_ADVANCE, but assumes STRING is multibyte.  */

 
 #define FETCH_STRING_CHAR_ADVANCE_NO_CHECK(OUTPUT, STRING, CHARIDX, BYTEIDX) \
 
 #define FETCH_STRING_CHAR_ADVANCE_NO_CHECK(OUTPUT, STRING, CHARIDX, BYTEIDX) \

-  if (1)                                                                    \
+  do                                                                        \

     {                                                                       \
     {                                                                       \

-      unsigned char *ptr = &XSTRING (STRING)->data[BYTEIDX];                \
+      unsigned char *ptr = &SDATA (STRING)[BYTEIDX];                        \

       int len;                                                              \
                                                                             \
       int len;                                                              \
                                                                             \

-      OUTPUT = STRING_CHAR_AND_LENGTH (ptr, 0, len);                        \
+      OUTPUT = STRING_CHAR_AND_LENGTH (ptr, len);                           \

       BYTEIDX += len;                                                       \
       CHARIDX++;                                                            \
     }                                                                       \
       BYTEIDX += len;                                                       \
       CHARIDX++;                                                            \
     }                                                                       \

-  else
+  while (0)

 
 
 
 

-/* Like FETCH_STRING_CHAR_ADVANCE but fetch character from the current
+/* Like FETCH_STRING_CHAR_ADVANCE, but fetch character from the current

    buffer.  */
 
 #define FETCH_CHAR_ADVANCE(OUTPUT, CHARIDX, BYTEIDX)           \
    buffer.  */
 
 #define FETCH_CHAR_ADVANCE(OUTPUT, CHARIDX, BYTEIDX)           \

-  if (1)                                                       \
+  do                                                           \

     {                                                          \
       CHARIDX++;                                               \
     {                                                          \
       CHARIDX++;                                               \

-      if (!NILP (current_buffer->enable_multibyte_characters)) \
+      if (!NILP (BVAR (current_buffer, enable_multibyte_characters)))  \

        {                                                       \
          unsigned char *ptr = BYTE_POS_ADDR (BYTEIDX);         \
          int len;                                              \
                                                                \
        {                                                       \
          unsigned char *ptr = BYTE_POS_ADDR (BYTEIDX);         \
          int len;                                              \
                                                                \

-         OUTPUT= STRING_CHAR_AND_LENGTH (ptr, 0, len);         \
+         OUTPUT= STRING_CHAR_AND_LENGTH (ptr, len);            \

          BYTEIDX += len;                                       \
        }                                                       \
       else                                                     \
          BYTEIDX += len;                                       \
        }                                                       \
       else                                                     \


@@ -456,25 +431,25 @@ extern char unibyte_has_multibyte_table[256];
          BYTEIDX++;                                            \
        }                                                       \
     }                                                          \
          BYTEIDX++;                                            \
        }                                                       \
     }                                                          \

-  else
+  while (0)

 
 
 
 

-/* Like FETCH_CHAR_ADVANCE but assumes the current buffer is multibyte.  */
+/* Like FETCH_CHAR_ADVANCE, but assumes the current buffer is multibyte.  */

 
 #define FETCH_CHAR_ADVANCE_NO_CHECK(OUTPUT, CHARIDX, BYTEIDX)  \
 
 #define FETCH_CHAR_ADVANCE_NO_CHECK(OUTPUT, CHARIDX, BYTEIDX)  \

-  if (1)                                                       \
+  do                                                           \

     {                                                          \
       unsigned char *ptr = BYTE_POS_ADDR (BYTEIDX);            \
       int len;                                                 \
                                                                \
     {                                                          \
       unsigned char *ptr = BYTE_POS_ADDR (BYTEIDX);            \
       int len;                                                 \
                                                                \

-      OUTPUT= STRING_CHAR_AND_LENGTH (ptr, 0, len);            \
+      OUTPUT = STRING_CHAR_AND_LENGTH (ptr, len);              \

       BYTEIDX += len;                                          \
       CHARIDX++;                                               \
     }                                                          \
       BYTEIDX += len;                                          \
       CHARIDX++;                                               \
     }                                                          \

-  else
+  while (0)

 
 
 
 

-/* Increase the buffer byte position POS_BYTE of the current buffer to
+/* Increment the buffer byte position POS_BYTE of the current buffer to

    the next character boundary.  No range checking of POS.  */
 
 #define INC_POS(pos_byte)                              \
    the next character boundary.  No range checking of POS.  */
 
 #define INC_POS(pos_byte)                              \


@@ -484,7 +459,7 @@ extern char unibyte_has_multibyte_table[256];
   } while (0)
 
 
   } while (0)
 
 

-/* Decrease the buffer byte position POS_BYTE of the current buffer to
+/* Decrement the buffer byte position POS_BYTE of the current buffer to

    the previous character boundary.  No range checking of POS.  */
 
 #define DEC_POS(pos_byte)                      \
    the previous character boundary.  No range checking of POS.  */
 
 #define DEC_POS(pos_byte)                      \


@@ -493,9 +468,9 @@ extern char unibyte_has_multibyte_table[256];
                                                \
     pos_byte--;                                        \
     if (pos_byte < GPT_BYTE)                   \
                                                \
     pos_byte--;                                        \
     if (pos_byte < GPT_BYTE)                   \

-      p = BEG_ADDR + pos_byte - 1;             \
+      p = BEG_ADDR + pos_byte - BEG_BYTE;      \

     else                                       \
     else                                       \

-      p = BEG_ADDR + GAP_SIZE + pos_byte - 1;  \
+      p = BEG_ADDR + GAP_SIZE + pos_byte - BEG_BYTE;\

     while (!CHAR_HEAD_P (*p))                  \
       {                                                \
        p--;                                    \
     while (!CHAR_HEAD_P (*p))                  \
       {                                                \
        p--;                                    \


@@ -509,7 +484,7 @@ extern char unibyte_has_multibyte_table[256];
   do                                                           \
     {                                                          \
       (charpos)++;                                             \
   do                                                           \
     {                                                          \
       (charpos)++;                                             \

-      if (NILP (current_buffer->enable_multibyte_characters))  \
+      if (NILP (BVAR (current_buffer, enable_multibyte_characters)))   \

        (bytepos)++;                                            \
       else                                                     \
        INC_POS ((bytepos));                                    \
        (bytepos)++;                                            \
       else                                                     \
        INC_POS ((bytepos));                                    \


@@ -523,7 +498,7 @@ extern char unibyte_has_multibyte_table[256];
   do                                                           \
     {                                                          \
       (charpos)--;                                             \
   do                                                           \
     {                                                          \
       (charpos)--;                                             \

-      if (NILP (current_buffer->enable_multibyte_characters))  \
+      if (NILP (BVAR (current_buffer, enable_multibyte_characters)))   \

        (bytepos)--;                                            \
       else                                                     \
        DEC_POS ((bytepos));                                    \
        (bytepos)--;                                            \
       else                                                     \
        DEC_POS ((bytepos));                                    \


@@ -531,7 +506,7 @@ extern char unibyte_has_multibyte_table[256];
   while (0)
 
 
   while (0)
 
 

-/* Increase the buffer byte position POS_BYTE of the current buffer to
+/* Increment the buffer byte position POS_BYTE of the current buffer to

    the next character boundary.  This macro relies on the fact that
    *GPT_ADDR and *Z_ADDR are always accessible and the values are
    '\0'.  No range checking of POS_BYTE.  */
    the next character boundary.  This macro relies on the fact that
    *GPT_ADDR and *Z_ADDR are always accessible and the values are
    '\0'.  No range checking of POS_BYTE.  */


@@ -543,7 +518,7 @@ extern char unibyte_has_multibyte_table[256];
   } while (0)
 
 
   } while (0)
 
 

-/* Decrease the buffer byte position POS_BYTE of the current buffer to
+/* Decrement the buffer byte position POS_BYTE of the current buffer to

    the previous character boundary.  No range checking of POS_BYTE.  */
 
 #define BUF_DEC_POS(buf, pos_byte)                                     \
    the previous character boundary.  No range checking of POS_BYTE.  */
 
 #define BUF_DEC_POS(buf, pos_byte)                                     \


@@ -551,9 +526,9 @@ extern char unibyte_has_multibyte_table[256];
     unsigned char *p;                                                  \
     pos_byte--;                                                                \
     if (pos_byte < BUF_GPT_BYTE (buf))                                 \
     unsigned char *p;                                                  \
     pos_byte--;                                                                \
     if (pos_byte < BUF_GPT_BYTE (buf))                                 \

-      p = BUF_BEG_ADDR (buf) + pos_byte - 1;                           \
+      p = BUF_BEG_ADDR (buf) + pos_byte - BEG_BYTE;                    \

     else                                                               \
     else                                                               \

-      p = BUF_BEG_ADDR (buf) + BUF_GAP_SIZE (buf) + pos_byte - 1;      \
+      p = BUF_BEG_ADDR (buf) + BUF_GAP_SIZE (buf) + pos_byte - BEG_BYTE;\

     while (!CHAR_HEAD_P (*p))                                          \
       {                                                                        \
        p--;                                                            \
     while (!CHAR_HEAD_P (*p))                                          \
       {                                                                        \
        p--;                                                            \


@@ -565,43 +540,35 @@ extern char unibyte_has_multibyte_table[256];
 /* If C is a character to be unified with a Unicode character, return
    the unified Unicode character.  */
 
 /* If C is a character to be unified with a Unicode character, return
    the unified Unicode character.  */
 

-#define MAYBE_UNIFY_CHAR(c)                                    \
-  if (c > MAX_UNICODE_CHAR                                     \
-      && CHAR_TABLE_P (Vchar_unify_table))                     \
-    {                                                          \
-      Lisp_Object val;                                         \
-      int unified;                                             \
-                                                               \
-      val = CHAR_TABLE_REF (Vchar_unify_table, c);             \
-      if (! NILP (val))                                                \
-       {                                                       \
-         if (SYMBOLP (val))                                    \
-           {                                                   \
-             Funify_charset (val, Qnil, Qnil);                 \
-             val = CHAR_TABLE_REF (Vchar_unify_table, c);      \
-           }                                                   \
-         if ((unified = XINT (val)) >= 0)                      \
-           c = unified;                                        \
-       }                                                       \
-    }                                                          \
-  else
+#define MAYBE_UNIFY_CHAR(c)                            \
+  do {                                                 \
+    if (c > MAX_UNICODE_CHAR && c <= MAX_5_BYTE_CHAR)  \
+      {                                                        \
+       Lisp_Object val;                                \
+       val = CHAR_TABLE_REF (Vchar_unify_table, c);    \
+       if (INTEGERP (val))                             \
+         c = XINT (val);                               \
+       else if (! NILP (val))                          \
+         c = maybe_unify_char (c, val);                \
+      }                                                        \
+  } while (0)

 
 
 /* Return the width of ASCII character C.  The width is measured by
 
 
 /* Return the width of ASCII character C.  The width is measured by

-   how many columns occupied on the screen when displayed in the
+   how many columns C will occupy on the screen when displayed in the

    current buffer.  */
 
 #define ASCII_CHAR_WIDTH(c)                                            \
   (c < 0x20                                                            \
    ? (c == '\t'                                                                \
    current buffer.  */
 
 #define ASCII_CHAR_WIDTH(c)                                            \
   (c < 0x20                                                            \
    ? (c == '\t'                                                                \

-      ? XFASTINT (current_buffer->tab_width)                           \
-      : (c == '\n' ? 0 : (NILP (current_buffer->ctl_arrow) ? 4 : 2)))  \
+      ? XFASTINT (BVAR (current_buffer, tab_width))                            \
+      : (c == '\n' ? 0 : (NILP (BVAR (current_buffer, ctl_arrow)) ? 4 : 2)))   \

    : (c < 0x7f                                                         \
       ? 1                                                              \
    : (c < 0x7f                                                         \
       ? 1                                                              \

-      : ((NILP (current_buffer->ctl_arrow) ? 4 : 2))))
+      : ((NILP (BVAR (current_buffer, ctl_arrow)) ? 4 : 2))))

 
 /* Return the width of character C.  The width is measured by how many
 
 /* Return the width of character C.  The width is measured by how many

-   columns occupied on the screen when displayed in the current
+   columns C will occupy on the screen when displayed in the current

    buffer.  */
 
 #define CHAR_WIDTH(c)          \
    buffer.  */
 
 #define CHAR_WIDTH(c)          \


@@ -609,59 +576,57 @@ extern char unibyte_has_multibyte_table[256];
    ? ASCII_CHAR_WIDTH (c)      \
    : XINT (CHAR_TABLE_REF (Vchar_width_table, c)))
 
    ? ASCII_CHAR_WIDTH (c)      \
    : XINT (CHAR_TABLE_REF (Vchar_width_table, c)))
 

-extern int char_resolve_modifier_mask P_ ((int));
-extern int char_string P_ ((unsigned, unsigned char *));
-extern int string_char 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));
-extern void parse_str_as_multibyte P_ ((const unsigned char *, int, int *,
-                                       int *));
-extern int parse_str_to_multibyte P_ ((unsigned char *, int));
-extern int str_as_multibyte P_ ((unsigned char *, int, int, int *));
-extern int str_to_multibyte P_ ((unsigned char *, int, int));
-extern int str_as_unibyte P_ ((unsigned char *, int));
-extern int strwidth P_ ((unsigned char *, int));
-extern int c_string_width P_ ((const unsigned char *, int, int, int *, int *));
-extern int lisp_string_width P_ ((Lisp_Object, int, int *, int *));
-
-extern Lisp_Object Vprintable_chars;
+/* If C is a variation selector, return the index numnber of the
+   variation selector (1..256).  Otherwise, return 0.  */

 
 

-extern Lisp_Object Qcharacterp, Qauto_fill_chars;
-extern Lisp_Object Vtranslation_table_vector;
-extern Lisp_Object Vchar_width_table;
-extern Lisp_Object Vchar_direction_table;
-extern Lisp_Object Vchar_unify_table;
+#define CHAR_VARIATION_SELECTOR_P(c)           \
+  ((c) < 0xFE00 ? 0                            \
+   : (c) <= 0xFE0F ? (c) - 0xFE00 + 1          \
+   : (c) < 0xE0100 ? 0                         \
+   : (c) <= 0xE01EF ? (c) - 0xE0100 + 17       \
+   : 0)

 
 

-extern Lisp_Object string_escape_byte8 P_ ((Lisp_Object));
+/* If C is a high surrogate, return 1.  If C is a low surrogate,
+   return 0.  Otherwise, return 0.  */

 
 

-/* Return a translation table of id number ID.  */
-#define GET_TRANSLATION_TABLE(id) \
-  (XCDR(XVECTOR(Vtranslation_table_vector)->contents[(id)]))
+#define CHAR_SURROGATE_PAIR_P(c)       \
+  ((c) < 0xD800 ? 0                    \
+   : (c) <= 0xDBFF ? 1                 \
+   : (c) <= 0xDFFF ? 2                 \
+   : 0)

 
 

-/* A char-table for characters which may invoke auto-filling.  */
-extern Lisp_Object Vauto_fill_chars;

 
 

-extern Lisp_Object Vchar_script_table;
-extern Lisp_Object Vscript_representative_chars;
+extern int char_resolve_modifier_mask (int);
+extern int char_string (unsigned, unsigned char *);
+extern int string_char (const unsigned char *,
+                        const unsigned char **, int *);
+
+extern int translate_char (Lisp_Object, int c);
+extern int char_printable_p (int c);
+extern void parse_str_as_multibyte (const unsigned char *,
+                                   EMACS_INT, EMACS_INT *, EMACS_INT *);
+extern EMACS_INT parse_str_to_multibyte (const unsigned char *, EMACS_INT);
+extern EMACS_INT str_as_multibyte (unsigned char *, EMACS_INT, EMACS_INT,
+                            EMACS_INT *);
+extern EMACS_INT str_to_multibyte (unsigned char *, EMACS_INT, EMACS_INT);
+extern EMACS_INT str_as_unibyte (unsigned char *, EMACS_INT);
+extern EMACS_INT str_to_unibyte (const unsigned char *, unsigned char *,
+                                 EMACS_INT, int);
+extern EMACS_INT strwidth (const char *, EMACS_INT);
+extern EMACS_INT c_string_width (const unsigned char *, EMACS_INT, int,
+                                EMACS_INT *, EMACS_INT *);
+extern EMACS_INT lisp_string_width (Lisp_Object, int,
+                                   EMACS_INT *, EMACS_INT *);

 
 

-/* 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
-   multibyte sequence of a character is the typical case.  */
+extern Lisp_Object Qcharacterp, Qauto_fill_chars;
+extern Lisp_Object Vchar_unify_table;
+extern Lisp_Object string_escape_byte8 (Lisp_Object);

 
 

-#define BCOPY_SHORT(from, to, len)             \
-  do {                                         \
-    int i = len;                               \
-    unsigned char *from_p = from, *to_p = to;  \
-    while (i--) *to_p++ = *from_p++;           \
-  } while (0)
+/* Return a translation table of id number ID.  */
+#define GET_TRANSLATION_TABLE(id) \
+  (XCDR(XVECTOR(Vtranslation_table_vector)->contents[(id)]))

 
 #define DEFSYM(sym, name)      \
 
 #define DEFSYM(sym, name)      \

-  do { (sym) = intern ((name)); staticpro (&(sym)); } while (0)
+  do { (sym) = intern_c_string ((name)); staticpro (&(sym)); } while (0)

 
 #endif /* EMACS_CHARACTER_H */
 
 #endif /* EMACS_CHARACTER_H */

-
-/* arch-tag: 4ef86004-2eff-4073-8cea-cfcbcf7188ac
-   (do not change this comment) */