From: Glenn Morris <rgm@gnu.org>
Date: Tue, 20 Aug 2019 16:04:53 +0000 (-0700)
Subject: Merge from origin/emacs-26
X-Git-Tag: emacs-27.0.90~1558
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=af103ef3c9d6df07475e2b3a2f846246d7fd2a8b;p=emacs.git

Merge from origin/emacs-26

615cff4 (origin/emacs-26) Fix process filter documentation (Bug#13400)
beb1d22 Fix query-replace-regexp undo feature

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

af103ef3c9d6df07475e2b3a2f846246d7fd2a8b
diff --cc test/lisp/replace-tests.el
index c908d4e2a71,cd08a522e39..f7bf2d93658
--- a/test/lisp/replace-tests.el
+++ b/test/lisp/replace-tests.el
@@@ -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)