From: Juri Linkov <juri@linkov.net>
Date: Fri, 12 Jul 2019 19:00:56 +0000 (+0300)
Subject: * test/lisp/replace-tests.el (replace-tests-with-undo): Override
X-Git-Tag: emacs-27.0.90~1983
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=38e420af451c61dd0e77c7d73adf6fd1f6a021a9;p=emacs.git

* test/lisp/replace-tests.el (replace-tests-with-undo): Override

replace-highlight to emulate clobbering match-data (bug#36328).
---

diff --git a/test/lisp/replace-tests.el b/test/lisp/replace-tests.el
index ed948ad8554..c908d4e2a71 100644
--- a/test/lisp/replace-tests.el
+++ b/test/lisp/replace-tests.el
@@ -441,7 +441,7 @@ Return the last evalled form in BODY."
          ;; If `replace-tests-bind-read-string' is non-nil, then
          ;; bind `read-string' as well.
          (cl-letf (((symbol-function 'read-event)
-                    (lambda (&rest args)
+                    (lambda (&rest _args)
                       (cl-incf ,count)
                       (pcase ,count ; Build the clauses from CHAR-NUMS
                         ,@(append
@@ -456,8 +456,13 @@ 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))
          ,@body))))