diff options
| author | Ken Raeburn | 2017-07-31 01:13:53 -0400 |
|---|---|---|
| committer | Ken Raeburn | 2017-07-31 01:13:53 -0400 |
| commit | 13f3370400031e2ac1c9be0932f411370fc6984e (patch) | |
| tree | 06f349b2b0f1cda9e36f7c4390d9d2d9bf49303c /src/regex.c | |
| parent | cd0966b33c1fe975520e85e0e7af82c09e4754dc (diff) | |
| parent | dcfcaf40d577808d640016c886d4fae7280a7fd5 (diff) | |
| download | emacs-13f3370400031e2ac1c9be0932f411370fc6984e.tar.gz emacs-13f3370400031e2ac1c9be0932f411370fc6984e.zip | |
; Merge from branch 'master'scratch/raeburn-startup
Diffstat (limited to 'src/regex.c')
| -rw-r--r-- | src/regex.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/regex.c b/src/regex.c index fb48765c96c..0dbb47309e4 100644 --- a/src/regex.c +++ b/src/regex.c | |||
| @@ -1942,7 +1942,7 @@ struct range_table_work_area | |||
| 1942 | returned. If name is not a valid character class name zero, or RECC_ERROR, | 1942 | returned. If name is not a valid character class name zero, or RECC_ERROR, |
| 1943 | is returned. | 1943 | is returned. |
| 1944 | 1944 | ||
| 1945 | Otherwise, if *strp doesn’t begin with "[:name:]", -1 is returned. | 1945 | Otherwise, if *strp doesn't begin with "[:name:]", -1 is returned. |
| 1946 | 1946 | ||
| 1947 | The function can be used on ASCII and multibyte (UTF-8-encoded) strings. | 1947 | The function can be used on ASCII and multibyte (UTF-8-encoded) strings. |
| 1948 | */ | 1948 | */ |
| @@ -1954,8 +1954,8 @@ re_wctype_parse (const unsigned char **strp, unsigned limit) | |||
| 1954 | if (limit < 4 || beg[0] != '[' || beg[1] != ':') | 1954 | if (limit < 4 || beg[0] != '[' || beg[1] != ':') |
| 1955 | return -1; | 1955 | return -1; |
| 1956 | 1956 | ||
| 1957 | beg += 2; /* skip opening ‘[:’ */ | 1957 | beg += 2; /* skip opening "[:" */ |
| 1958 | limit -= 3; /* opening ‘[:’ and half of closing ‘:]’; --limit handles rest */ | 1958 | limit -= 3; /* opening "[:" and half of closing ":]"; --limit handles rest */ |
| 1959 | for (it = beg; it[0] != ':' || it[1] != ']'; ++it) | 1959 | for (it = beg; it[0] != ':' || it[1] != ']'; ++it) |
| 1960 | if (!--limit) | 1960 | if (!--limit) |
| 1961 | return -1; | 1961 | return -1; |
| @@ -1985,7 +1985,7 @@ re_wctype_parse (const unsigned char **strp, unsigned limit) | |||
| 1985 | 2 [:cntrl:] | 1985 | 2 [:cntrl:] |
| 1986 | 1 [:ff:] | 1986 | 1 [:ff:] |
| 1987 | 1987 | ||
| 1988 | If you update this list, consider also updating chain of or’ed conditions | 1988 | If you update this list, consider also updating chain of or'ed conditions |
| 1989 | in execute_charset function. | 1989 | in execute_charset function. |
| 1990 | */ | 1990 | */ |
| 1991 | 1991 | ||