diff options
| author | Juanma Barranquero | 2010-06-05 02:41:32 +0200 |
|---|---|---|
| committer | Juanma Barranquero | 2010-06-05 02:41:32 +0200 |
| commit | 409f29191382c875a05516cc69bf3cc4e3cd4592 (patch) | |
| tree | e95e30a281267b22136c827ebcfc59f9d3994517 /src/indent.c | |
| parent | 0665f66133e1991559c58ab57112becf1c9fb70e (diff) | |
| download | emacs-409f29191382c875a05516cc69bf3cc4e3cd4592.tar.gz emacs-409f29191382c875a05516cc69bf3cc4e3cd4592.zip | |
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.
Diffstat (limited to 'src/indent.c')
| -rw-r--r-- | src/indent.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/indent.c b/src/indent.c index a7f41f7e8e4..b64eae1c429 100644 --- a/src/indent.c +++ b/src/indent.c | |||
| @@ -506,7 +506,7 @@ check_display_width (EMACS_INT pos, EMACS_INT col, EMACS_INT *endpos) | |||
| 506 | width = XINT (prop) - col; | 506 | width = XINT (prop) - col; |
| 507 | else if (FLOATP (prop)) | 507 | else if (FLOATP (prop)) |
| 508 | width = (int)(XFLOAT_DATA (prop) + 0.5) - col; | 508 | width = (int)(XFLOAT_DATA (prop) + 0.5) - col; |
| 509 | 509 | ||
| 510 | if (width >= 0) | 510 | if (width >= 0) |
| 511 | { | 511 | { |
| 512 | EMACS_INT start; | 512 | EMACS_INT start; |
| @@ -628,7 +628,7 @@ scan_for_column (EMACS_INT *endpos, EMACS_INT *goalcol, EMACS_INT *prevcol) | |||
| 628 | to this character. */ | 628 | to this character. */ |
| 629 | 629 | ||
| 630 | if (dp != 0 | 630 | if (dp != 0 |
| 631 | && ! (multibyte && BASE_LEADING_CODE_P (c)) | 631 | && ! (multibyte && LEADING_CODE_P (c)) |
| 632 | && VECTORP (DISP_CHAR_VECTOR (dp, c))) | 632 | && VECTORP (DISP_CHAR_VECTOR (dp, c))) |
| 633 | { | 633 | { |
| 634 | Lisp_Object charvec; | 634 | Lisp_Object charvec; |
| @@ -679,7 +679,7 @@ scan_for_column (EMACS_INT *endpos, EMACS_INT *goalcol, EMACS_INT *prevcol) | |||
| 679 | col += tab_width; | 679 | col += tab_width; |
| 680 | col = col / tab_width * tab_width; | 680 | col = col / tab_width * tab_width; |
| 681 | } | 681 | } |
| 682 | else if (multibyte && BASE_LEADING_CODE_P (c)) | 682 | else if (multibyte && LEADING_CODE_P (c)) |
| 683 | { | 683 | { |
| 684 | /* Start of multi-byte form. */ | 684 | /* Start of multi-byte form. */ |
| 685 | unsigned char *ptr; | 685 | unsigned char *ptr; |
| @@ -1577,7 +1577,7 @@ compute_motion (from, fromvpos, fromhpos, did_motion, to, tovpos, tohpos, width, | |||
| 1577 | } | 1577 | } |
| 1578 | 1578 | ||
| 1579 | if (dp != 0 | 1579 | if (dp != 0 |
| 1580 | && ! (multibyte && BASE_LEADING_CODE_P (c)) | 1580 | && ! (multibyte && LEADING_CODE_P (c)) |
| 1581 | && VECTORP (DISP_CHAR_VECTOR (dp, c))) | 1581 | && VECTORP (DISP_CHAR_VECTOR (dp, c))) |
| 1582 | { | 1582 | { |
| 1583 | charvec = DISP_CHAR_VECTOR (dp, c); | 1583 | charvec = DISP_CHAR_VECTOR (dp, c); |
| @@ -1683,7 +1683,7 @@ compute_motion (from, fromvpos, fromhpos, did_motion, to, tovpos, tohpos, width, | |||
| 1683 | hpos = width; | 1683 | hpos = width; |
| 1684 | } | 1684 | } |
| 1685 | } | 1685 | } |
| 1686 | else if (multibyte && BASE_LEADING_CODE_P (c)) | 1686 | else if (multibyte && LEADING_CODE_P (c)) |
| 1687 | { | 1687 | { |
| 1688 | /* Start of multi-byte form. */ | 1688 | /* Start of multi-byte form. */ |
| 1689 | unsigned char *ptr; | 1689 | unsigned char *ptr; |