Mercurial > emacs
diff src/regex.c @ 108900:ff2d80da1816
Merge from mainline.
| author | Katsumi Yamaoka <yamaoka@jpl.org> |
|---|---|
| date | Thu, 03 Jun 2010 22:45:12 +0000 |
| parents | 5582106cddf0 |
| children | d9257436d2b1 |
line wrap: on
line diff
--- a/src/regex.c Wed Jun 02 22:44:58 2010 +0000 +++ b/src/regex.c Thu Jun 03 22:45:12 2010 +0000 @@ -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)