diff options
| author | Tino Calancha <tino.calancha@gmail.com> | 2018-06-03 23:28:14 +0900 |
|---|---|---|
| committer | Tino Calancha <tino.calancha@gmail.com> | 2018-06-03 23:28:14 +0900 |
| commit | 50c0624b2aecb9668505eb2cea3f30aecbf6d1ec (patch) | |
| tree | 2fd3af2490d590854f206b7b33f55f7d7f76ca00 | |
| parent | defd53a56c709b8b8c736f0ab3b594490216d300 (diff) | |
| download | emacs-50c0624b2aecb9668505eb2cea3f30aecbf6d1ec.tar.gz | |
Backport: 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.
(cherry picked from commit 32dc0cb1b5ae895d237c7118ccaeb084715934fd)
| -rw-r--r-- | lisp/replace.el | 1 | ||||
| -rw-r--r-- | test/lisp/replace-tests.el | 20 |
2 files changed, 21 insertions, 0 deletions
diff --git a/lisp/replace.el b/lisp/replace.el index 6cee2253746..d1eabb035d3 100644 --- a/lisp/replace.el +++ b/lisp/replace.el @@ -2576,6 +2576,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 66c68426607..40a1a31cf7c 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 |