diff options
Diffstat (limited to 'src/nvim/search.c')
| -rw-r--r-- | src/nvim/search.c | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/src/nvim/search.c b/src/nvim/search.c index 842927e60c..9814822f76 100644 --- a/src/nvim/search.c +++ b/src/nvim/search.c @@ -373,6 +373,10 @@ bool pat_has_uppercase(char_u *pat) FUNC_ATTR_NONNULL_ALL { char_u *p = pat; + magic_T magic_val = MAGIC_ON; + + // get the magicness of the pattern + (void)skip_regexp_ex((char *)pat, NUL, magic_isset(), NULL, NULL, &magic_val); while (*p != NUL) { const int l = utfc_ptr2len((char *)p); @@ -382,7 +386,7 @@ bool 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; } else if (p[1] == '%' && p[2] != NUL) { // skip "\%X" @@ -392,6 +396,10 @@ bool 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 { |