No performant delete if range supplied

Fixes #1858
emacs-evil · Jan 23, 2024 · 9e27bb9 · 9e27bb9
1 parent 59774e3
commit 9e27bb9
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 1 deletion.
diff --git a/evil-commands.el b/evil-commands.el
@@ -4212,7 +4212,7 @@ Use `evil-flush-lines' if INVERT is nil, or `evil-keep-lines' if not."
     (when (and pattern command)
       (when evil-ex-search-vim-style-regexp
         (setq pattern (evil-transform-vim-style-regexp pattern)))
-      (if (and ex-delete (not (nth 3 command-form)))
+      (if (and ex-delete (not (nth 3 command-form)) (not (nth 1 command-form)))
           (evil--ex-performant-global-delete beg end pattern invert)
         (setq isearch-string pattern)
         (isearch-update-ring pattern t)

diff --git a/evil-tests.el b/evil-tests.el
@@ -8668,6 +8668,11 @@ maybe we need one line more with some text\n")
       "[n]o 1\nno 2\nno 3\nyes 4\nno 5\nno 6\nno 7\n"
       (":g/yes/d2" [return])
       "no 1\nno 2\nno 3\n[n]o 6\nno 7\n"))
+  (ert-info ("global delete with range")
+    (evil-test-buffer
+      "alpha\nbravo\ncharlie\ndelta\ncharlie\necho\ngolf\ncharlie\nhotel"
+      (":g/charlie/-1d")
+      "alpha\ncharlie\ncharlie\necho\ncharlie\nhotel"))
   (ert-info ("global substitute")
     (evil-test-buffer
       "[n]o 1\nno 2\nno 3\nyes 4\nno 5\nno 6\nno 7\n"