Ex-substitute: use last search's case-sensitivity

emacs-evil · Jun 3, 2024 · 3ba76c1 · 3ba76c1
1 parent 9fada78
commit 3ba76c1
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 0 deletions.
diff --git a/evil-search.el b/evil-search.el
@@ -1200,6 +1200,9 @@ is used. It is meant for :substitute commands with arguments."
                   isearch-string
                 (concat isearch-string "\\C")))
             flags (remq ?r flags)))
+    (when (and using-prev-pattern
+               (not (evil-ex-pattern-ignore-case evil-ex-search-pattern)))
+      (setq pattern (concat pattern "\\C")))
     ;; generate pattern
     (when pattern
       ;; Disable vim-style regexp conversion if using a previous pattern, because

diff --git a/evil-tests.el b/evil-tests.el
@@ -8206,6 +8206,14 @@ golf h[o]>tel")))
       "[x]xx AAA bar AAA bar AAA bar\nxxx foo bar foo bar foo bar"
       ("g&")
       "xxx AAA bar AAA bar AAA bar\n[x]xx AAA bar AAA bar AAA bar"))
+  (ert-info ("Substitute with last search, maintaining case sensitivty")
+    (evil-select-search-module 'evil-search-module 'evil-search)
+    (evil-test-buffer
+      "[a]lpha\nbravo\nbravo\ncharlie\nBravo\ndelta"
+      ("/\\Cbravo" [return])
+      "alpha\n[b]ravo\nbravo\ncharlie\nBravo\ndelta"
+      (":%s//zulu" [return])
+      "alpha\nzulu\n[z]ulu\ncharlie\nBravo\ndelta"))
   (ert-info ("Repeat magic multiple times")
     (let ((evil-magic 'very-magic)
           (evil-ex-search-vim-style-regexp t))