Mercurial > emacs
diff src/regex.c @ 108881:5582106cddf0
Remove obsolete pre-unicode2 macros.
* character.h (MULTIBYTE_FORM_LENGTH, PARSE_MULTIBYTE_SEQ): Remove.
* composite.c (composition_reseat_it):
* data.c (Faset):
* fns.c (Ffillarray):
* regex.c (re_search_2): Use BYTES_BY_CHAR_HEAD.
[!emacs] (BYTES_BY_CHAR_HEAD): Define instead of MULTIBYTE_FORM_LENGTH.
| author | Juanma Barranquero <lekktu@gmail.com> |
|---|---|
| date | Thu, 03 Jun 2010 21:02:32 +0200 |
| parents | 14ff9accfbd3 |
| children | d9257436d2b1 |
line wrap: on
line diff
--- a/src/regex.c Thu Jun 03 21:50:00 2010 +0300 +++ b/src/regex.c Thu Jun 03 21:02:32 2010 +0200 @@ -300,7 +300,7 @@ # define CHAR_HEAD_P(p) (1) # define SINGLE_BYTE_CHAR_P(c) (1) # define SAME_CHARSET_P(c1, c2) (1) -# define MULTIBYTE_FORM_LENGTH(p, s) (1) +# define BYTES_BY_CHAR_HEAD(p) (1) # define PREV_CHAR_BOUNDARY(p, limit) ((p)--) # define STRING_CHAR(p) (*(p)) # define RE_STRING_CHAR(p, multibyte) STRING_CHAR (p) @@ -4643,7 +4643,7 @@ { re_char *p = POS_ADDR_VSTRING (startpos); re_char *pend = STOP_ADDR_VSTRING (startpos); - int len = MULTIBYTE_FORM_LENGTH (p, pend - p); + int len = BYTES_BY_CHAR_HEAD (*p); range -= len; if (range < 0)