From: Juri Linkov <juri@linkov.net>
Date: Mon, 7 Sep 2020 18:33:13 +0000 (+0300)
Subject: * lisp/char-fold.el (char-fold-to-regexp): Handle lax-whitespace (bug#38539)
X-Git-Tag: emacs-28.0.90~6196
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=0ebe2678002ffb82a25311c56cbc4b8ba3bd5fa1;p=emacs.git

* lisp/char-fold.el (char-fold-to-regexp): Handle lax-whitespace (bug#38539)
---

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))