From 0ebe2678002ffb82a25311c56cbc4b8ba3bd5fa1 Mon Sep 17 00:00:00 2001 From: Juri Linkov Date: Mon, 7 Sep 2020 21:33:13 +0300 Subject: [PATCH] * lisp/char-fold.el (char-fold-to-regexp): Handle lax-whitespace (bug#38539) --- lisp/char-fold.el | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/lisp/char-fold.el b/lisp/char-fold.el index 5a3c20c7832..34561a2efe6 100644 --- a/lisp/char-fold.el +++ b/lisp/char-fold.el @@ -324,6 +324,13 @@ from which to start." (while (< i end) (pcase (aref string i) (?\s (setq spaces (1+ spaces))) + ((pred (lambda (c) (and char-fold-symmetric + (if isearch-regexp + isearch-regexp-lax-whitespace + isearch-lax-whitespace) + (stringp search-whitespace-regexp) + (string-match-p search-whitespace-regexp (char-to-string c))))) + (setq spaces (1+ spaces))) (c (when (> spaces 0) (push (char-fold--make-space-string spaces) out) (setq spaces 0)) -- 2.39.5