From: Charles A. Roelli <charles@aurox.ch>
Date: Tue, 26 Dec 2017 11:46:39 +0000 (+0100)
Subject: Fix highlighting in query-replace with non-nil replace-char-fold
X-Git-Tag: emacs-27.0.90~5956
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=9f9b56b7da323bc91cdde0bcc1e1863c523e7ee3;p=emacs.git

Fix highlighting in query-replace with non-nil replace-char-fold

* lisp/replace.el (replace-highlight): Bind
'isearch-regexp-function' in the same way that function
'replace-search' does, so as to respect the value of
'replace-char-fold'.  (Bug#24356)
---

diff --git a/lisp/replace.el b/lisp/replace.el
index 80e584517ce..396428f6f28 100644
--- a/lisp/replace.el
+++ b/lisp/replace.el
@@ -2212,7 +2212,10 @@ It is called with three arguments, as if it were
   (if query-replace-lazy-highlight
       (let ((isearch-string search-string)
 	    (isearch-regexp regexp-flag)
-	    (isearch-regexp-function delimited-flag)
+	    (isearch-regexp-function (or delimited-flag
+					 (and replace-char-fold
+					      (not regexp-flag)
+					      #'char-fold-to-regexp)))
 	    (isearch-lax-whitespace
 	     replace-lax-whitespace)
 	    (isearch-regexp-lax-whitespace