Mercurial > vim

diff src/search.c @ 25457:b95f9cc3d1b9 v8.2.3265

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
patch 8.2.3265: smartcase does not work correctly in very magic pattern Commit: https://github.com/vim/vim/commit/78ba933d18439ff1a02f6be4c571e73ddceb3cd4 Author: Christian Brabandt <cb@256bit.org> Date: Sun Aug 1 12:44:37 2021 +0200 patch 8.2.3265: smartcase does not work correctly in very magic pattern 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)
author Bram Moolenaar <Bram@vim.org>
date Sun, 01 Aug 2021 12:45:03 +0200
parents d4a710f06f02
children a6eea433586b
line wrap: on
line diff
--- a/src/search.c
+++ b/src/search.c
@@ -430,6 +430,10 @@ ignorecase_opt(char_u *pat, int ic_in, i
 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