[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] master 32dc0cb: Preserve case in query-replace undo
From: |
Tino Calancha |
Subject: |
[Emacs-diffs] master 32dc0cb: Preserve case in query-replace undo |
Date: |
Sun, 8 Apr 2018 22:51:40 -0400 (EDT) |
branch: master
commit 32dc0cb1b5ae895d237c7118ccaeb084715934fd
Author: Tino Calancha <address@hidden>
Commit: Tino Calancha <address@hidden>
Preserve case in query-replace undo
If the user query and replaces 'foo' with 'BAR', then
undo must comeback to 'foo', not to 'FOO' (Bug#31073).
* lisp/replace.el (perform-replace): Bind nocasify to non-nil
value during undo/undo-all actions.
* test/lisp/replace-tests.el (query-replace-undo-bug31073): Add test.
---
lisp/replace.el | 1 +
test/lisp/replace-tests.el | 20 ++++++++++++++++++++
2 files changed, 21 insertions(+)
diff --git a/lisp/replace.el b/lisp/replace.el
index c28c9b3..4916cb1 100644
--- a/lisp/replace.el
+++ b/lisp/replace.el
@@ -2619,6 +2619,7 @@ It must return a string."
(let ((stack-idx 0)
(stack-len (length stack))
(num-replacements 0)
+ (nocasify t) ; Undo must preserve case
(Bug#31073).
search-string
next-replacement)
(while (and (< stack-idx stack-len)
diff --git a/test/lisp/replace-tests.el b/test/lisp/replace-tests.el
index 66c6842..40a1a31 100644
--- a/test/lisp/replace-tests.el
+++ b/test/lisp/replace-tests.el
@@ -380,4 +380,24 @@ Each element has the format:
(should (string= "211" (replace-tests--query-replace-undo)))
(should (string= "211" (replace-tests--query-replace-undo 'comma))))
+(ert-deftest query-replace-undo-bug31073 ()
+ "Test for https://debbugs.gnu.org/31073 ."
+ (let ((text "aaa aaa")
+ (count 0))
+ (with-temp-buffer
+ (insert text)
+ (goto-char 1)
+ (cl-letf (((symbol-function 'read-event)
+ (lambda (&rest args)
+ (cl-incf count)
+ (let ((val (pcase count
+ ((or 1 2 3) ?\s) ; replace current and go next
+ (4 ?U) ; undo-all
+ (_ ?q)))) ; exit
+ val))))
+ (perform-replace "a" "B" t nil nil))
+ ;; After undo text must be the same.
+ (should (string= text (buffer-string))))))
+
+
;;; replace-tests.el ends here
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Emacs-diffs] master 32dc0cb: Preserve case in query-replace undo,
Tino Calancha <=