diff options
author | Kenichi Handa <[email protected]> | 2004-11-04 02:28:51 +0000 |
---|---|---|
committer | Kenichi Handa <[email protected]> | 2004-11-04 02:28:51 +0000 |
commit | b912921c670907a0c62f0f6459fe5f1155eead9a (patch) | |
tree | a978dc25f89c26f4a4dba24a29eb5c30ae364808 | |
parent | 589f233e08f973b96acfc75b3c53157a807495f5 (diff) |
(fontset_pattern_regexp): If '*' is preceded by '\',
treat it as a literal character.
-rw-r--r-- | src/ChangeLog | 5 | ||||
-rw-r--r-- | src/fontset.c | 4 |
2 files changed, 7 insertions, 2 deletions
diff --git a/src/ChangeLog b/src/ChangeLog index 201bbcba66..01d35ba8e9 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,3 +1,8 @@ +2004-11-04 Kenichi Handa <[email protected]> + + * fontset.c (fontset_pattern_regexp): If '*' is preceded by '\', + treat it as a literal character. + 2004-11-03 Kim F. Storm <[email protected]> * .gdbinit (ppt): New function. diff --git a/src/fontset.c b/src/fontset.c index bccbce8bf4..fc4da1305f 100644 --- a/src/fontset.c +++ b/src/fontset.c @@ -796,7 +796,7 @@ fontset_pattern_regexp (pattern) { if (*p0 == '-') ndashes++; - else if (*p0 == '*') + else if (*p0 == '*' && p0 > SDATA (pattern) && p0[-1] != '\\') nstars++; } @@ -811,7 +811,7 @@ fontset_pattern_regexp (pattern) *p1++ = '^'; for (p0 = (char *) SDATA (pattern); *p0; p0++) { - if (*p0 == '*') + if (*p0 == '*' && p0 > SDATA (pattern) && p0[-1] != '\\') { if (ndashes < 14) *p1++ = '.'; |