Commit 409f2919 authored by Juanma Barranquero's avatar Juanma Barranquero
Browse files

Remove obsolete macro BASE_LEADING_CODE_P.

* character.h (BASE_LEADING_CODE_P): Remove.
* regex.c [!emacs] (BASE_LEADING_CODE_P): Remove.
* buffer.c (Fset_buffer_multibyte):
* indent.c (scan_for_column, compute_motion):
* insdel.c (count_combining_before, count_combining_after):
  Use LEADING_CODE_P instead of BASE_LEADING_CODE_P.
parent 0665f661
2010-06-05 Juanma Barranquero <lekktu@gmail.com>
Remove obsolete macro BASE_LEADING_CODE_P.
* character.h (BASE_LEADING_CODE_P): Remove.
* regex.c [!emacs] (BASE_LEADING_CODE_P): Remove.
* buffer.c (Fset_buffer_multibyte):
* indent.c (scan_for_column, compute_motion):
* insdel.c (count_combining_before, count_combining_after):
Use LEADING_CODE_P instead of BASE_LEADING_CODE_P.
2010-06-04 Juanma Barranquero <lekktu@gmail.com>
Turn `directory-sep-char' into a noop.
......
......@@ -2436,7 +2436,7 @@ current buffer is cleared. */)
unsigned char *p = GPT_ADDR - 1;
while (! CHAR_HEAD_P (*p) && p > BEG_ADDR) p--;
if (BASE_LEADING_CODE_P (*p))
if (LEADING_CODE_P (*p))
{
int new_gpt = GPT_BYTE - (GPT_ADDR - p);
......
......@@ -221,10 +221,6 @@ along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */
(ASCII_BYTE_P (byte) || LEADING_CODE_P (byte)) */
#define CHAR_HEAD_P(byte) (((byte) & 0xC0) != 0x80)
/* 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) \
......
......@@ -628,7 +628,7 @@ scan_for_column (EMACS_INT *endpos, EMACS_INT *goalcol, EMACS_INT *prevcol)
to this character. */
if (dp != 0
&& ! (multibyte && BASE_LEADING_CODE_P (c))
&& ! (multibyte && LEADING_CODE_P (c))
&& VECTORP (DISP_CHAR_VECTOR (dp, c)))
{
Lisp_Object charvec;
......@@ -679,7 +679,7 @@ scan_for_column (EMACS_INT *endpos, EMACS_INT *goalcol, EMACS_INT *prevcol)
col += tab_width;
col = col / tab_width * tab_width;
}
else if (multibyte && BASE_LEADING_CODE_P (c))
else if (multibyte && LEADING_CODE_P (c))
{
/* Start of multi-byte form. */
unsigned char *ptr;
......@@ -1577,7 +1577,7 @@ compute_motion (from, fromvpos, fromhpos, did_motion, to, tovpos, tohpos, width,
}
if (dp != 0
&& ! (multibyte && BASE_LEADING_CODE_P (c))
&& ! (multibyte && LEADING_CODE_P (c))
&& VECTORP (DISP_CHAR_VECTOR (dp, c)))
{
charvec = DISP_CHAR_VECTOR (dp, c);
......@@ -1683,7 +1683,7 @@ compute_motion (from, fromvpos, fromhpos, did_motion, to, tovpos, tohpos, width,
hpos = width;
}
}
else if (multibyte && BASE_LEADING_CODE_P (c))
else if (multibyte && LEADING_CODE_P (c))
{
/* Start of multi-byte form. */
unsigned char *ptr;
......
......@@ -843,7 +843,7 @@ count_combining_before (const unsigned char *string, EMACS_INT length,
len = 1;
p = BYTE_POS_ADDR (pos_byte - 1);
while (! CHAR_HEAD_P (*p)) p--, len++;
if (! BASE_LEADING_CODE_P (*p)) /* case (3) */
if (! LEADING_CODE_P (*p)) /* case (3) */
return 0;
combining_bytes = BYTES_BY_CHAR_HEAD (*p) - len;
......@@ -906,7 +906,7 @@ count_combining_after (const unsigned char *string,
i = pos_byte - 2;
while (i >= 0 && ! CHAR_HEAD_P (p[i]))
i--;
if (i < 0 || !BASE_LEADING_CODE_P (p[i]))
if (i < 0 || !LEADING_CODE_P (p[i]))
return 0;
bytes = BYTES_BY_CHAR_HEAD (p[i]);
......@@ -914,7 +914,7 @@ count_combining_after (const unsigned char *string,
? 0
: bytes - (pos_byte - 1 - i + length));
}
if (!BASE_LEADING_CODE_P (string[i]))
if (!LEADING_CODE_P (string[i]))
return 0;
bytes = BYTES_BY_CHAR_HEAD (string[i]) - (length - i);
......
......@@ -290,7 +290,6 @@ enum syntaxcode { Swhitespace = 0, Sword = 1, Ssymbol = 2 };
# define SWITCH_ENUM_CAST(x) (x)
/* Dummy macros for non-Emacs environments. */
# define BASE_LEADING_CODE_P(c) (0)
# define CHAR_CHARSET(c) 0
# define CHARSET_LEADING_CODE_BASE(c) 0
# define MAX_MULTIBYTE_LENGTH 1
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment