diff options
| author | Christian Brabandt <cb@256bit.org> | 2021-08-01 12:44:37 +0200 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2021-08-01 12:44:37 +0200 |
| commit | 78ba933d18439ff1a02f6be4c571e73ddceb3cd4 (patch) | |
| tree | 5130bc7ffd4a491ea5b1d4f965a6dca72dc5fb28 /src/search.c | |
| parent | f24f51d03035379cf3e5b2dccf489a40bc4ca92a (diff) | |
patch 8.2.3265: smartcase does not work correctly in very magic patternv8.2.3265
Problem: Smartcase does not work correctly in very magic pattern.
Solution: Take the magicness into account when skipping over regexp items.
(Christian Brabandt, closes #8682, closes #7845)
Diffstat (limited to 'src/search.c')
| -rw-r--r-- | src/search.c | 11 |
1 files changed, 10 insertions, 1 deletions
diff --git a/src/search.c b/src/search.c index 920c68c5aa..43966511b7 100644 --- a/src/search.c +++ b/src/search.c @@ -430,6 +430,10 @@ ignorecase_opt(char_u *pat, int ic_in, int scs) pat_has_uppercase(char_u *pat) { char_u *p = pat; + magic_T magic_val = MAGIC_ON; + + // get the magicness of the pattern + (void)skip_regexp_ex(pat, NUL, magic_isset(), NULL, NULL, &magic_val); while (*p != NUL) { @@ -441,7 +445,7 @@ pat_has_uppercase(char_u *pat) return TRUE; p += l; } - else if (*p == '\\') + else if (*p == '\\' && magic_val == MAGIC_ON) { if (p[1] == '_' && p[2] != NUL) // skip "\_X" p += 3; @@ -452,6 +456,11 @@ pat_has_uppercase(char_u *pat) else p += 1; } + else if ((*p == '%' || *p == '_') && magic_val == MAGIC_ALL) + { + if (p[1] != NUL) // skip "_X" and %X + p += 2; + } else if (MB_ISUPPER(*p)) return TRUE; else |