summaryrefslogtreecommitdiff
path: root/lisp
diff options
context:
space:
mode:
authorCharles A. Roelli <charles@aurox.ch>2017-12-26 12:46:39 +0100
committerCharles A. Roelli <charles@aurox.ch>2017-12-26 12:46:39 +0100
commit9f9b56b7da323bc91cdde0bcc1e1863c523e7ee3 (patch)
tree1ccf6a78b084bc6919ff685e9d87f1c32ed08661 /lisp
parent23ecd63ba498aa616e2a768090bca360e6d32309 (diff)
downloademacs-9f9b56b7da323bc91cdde0bcc1e1863c523e7ee3.tar.gz
emacs-9f9b56b7da323bc91cdde0bcc1e1863c523e7ee3.tar.bz2
emacs-9f9b56b7da323bc91cdde0bcc1e1863c523e7ee3.zip
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)
Diffstat (limited to 'lisp')
-rw-r--r--lisp/replace.el5
1 files changed, 4 insertions, 1 deletions
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