]> git.eshelyaron.com Git - emacs.git/commitdiff
Merge from origin/emacs-26
authorGlenn Morris <rgm@gnu.org>
Tue, 20 Aug 2019 16:04:53 +0000 (09:04 -0700)
committerGlenn Morris <rgm@gnu.org>
Tue, 20 Aug 2019 16:04:53 +0000 (09:04 -0700)
615cff4 (origin/emacs-26) Fix process filter documentation (Bug#13400)
beb1d22 Fix query-replace-regexp undo feature

# Conflicts:
# test/lisp/replace-tests.el

1  2 
doc/lispref/processes.texi
lisp/replace.el
test/lisp/replace-tests.el

Simple merge
diff --cc lisp/replace.el
Simple merge
index c908d4e2a71dea0a53e1d3d1dc4173096bd70e69,cd08a522e39e0105a5a998caa51cf6800de68100..f7bf2d93658d4e8658f57be000fac6557cfcc5a7
@@@ -456,14 -413,9 +459,14 @@@ Return the last evalled form in BODY.
                             `((_ ,def-chr))))))
                     ((symbol-function 'read-string)
                      (if replace-tests-bind-read-string
 -                        (lambda (&rest args) replace-tests-bind-read-string)
 -                      (symbol-function 'read-string))))
 +                        (lambda (&rest _args) replace-tests-bind-read-string)
 +                      (symbol-function 'read-string)))
 +                   ;; Emulate replace-highlight clobbering match-data via
 +                   ;; isearch-lazy-highlight-new-loop and sit-for (bug#36328)
 +                   ((symbol-function 'replace-highlight)
 +                    (lambda (&rest _args)
 +                      (string-match "[A-Z ]" "ForestGreen"))))
-            (perform-replace ,from ,to t t nil))
+            (perform-replace ,from ,to t replace-tests-perform-replace-regexp-flag nil))
           ,@body))))
  
  (defun replace-tests--query-replace-undo (&optional comma)