[Emacs-diffs] master 9f9b56b: Fix highlighting in query-replace with non-nil replace-char-fold

[Charles A. Roelli]

branch: master
commit 9f9b56b7da323bc91cdde0bcc1e1863c523e7ee3
Author: Charles A. Roelli <address@hidden>
Commit: Charles A. Roelli <address@hidden>

    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)
---
 lisp/replace.el | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/lisp/replace.el b/lisp/replace.el
index 80e5845..396428f 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