From: Artur Malabarba <bruce.connor.am@gmail.com>
Date: Mon, 30 Nov 2015 15:05:44 +0000 (+0000)
Subject: * lisp/character-fold.el: Comment out branching code
X-Git-Tag: emacs-25.0.90~588
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=0d576434a8fdbe32e0bc984b21fc20403acff812;p=emacs.git

* lisp/character-fold.el: Comment out branching code

(character-fold-to-regexp): Comment out code that uses multi-char
table.  The branching caused by this induces absurdly long regexps,
up to 10k chars for as little as 25 input characters.
---

diff --git a/lisp/character-fold.el b/lisp/character-fold.el
index 88622b32a7d..07537d88ad5 100644
--- a/lisp/character-fold.el
+++ b/lisp/character-fold.el
@@ -180,19 +180,19 @@ from which to start."
                              (regexp-quote (string c))))
                  (alist nil))
              ;; Long string.  The regexp would probably be too long.
-             (unless (> end 50)
-               (setq alist (aref multi-char-table c))
-               (when case-fold-search
-                 (let ((other-c (aref lower-case-table c)))
-                   (when (or (not other-c)
-                             (eq other-c c))
-                     (setq other-c (aref upper-case-table c)))
-                   (when other-c
-                     (setq alist (append alist (aref multi-char-table other-c)))
-                     (setq regexp (concat "\\(?:" regexp "\\|"
-                                          (or (aref character-fold-table other-c)
-                                              (regexp-quote (string other-c)))
-                                          "\\)"))))))
+             ;; (unless (> end 50)
+             ;;   (setq alist (aref multi-char-table c))
+             ;;   (when case-fold-search
+             ;;     (let ((other-c (aref lower-case-table c)))
+             ;;       (when (or (not other-c)
+             ;;                 (eq other-c c))
+             ;;         (setq other-c (aref upper-case-table c)))
+             ;;       (when other-c
+             ;;         (setq alist (append alist (aref multi-char-table other-c)))
+             ;;         (setq regexp (concat "\\(?:" regexp "\\|"
+             ;;                              (or (aref character-fold-table other-c)
+             ;;                                  (regexp-quote (string other-c)))
+             ;;                              "\\)"))))))
              (push (let ((alist-out '("\\)")))
                      (pcase-dolist (`(,suffix . ,out-regexp) alist)
                        (let ((len-suf (length suffix)))
@@ -223,7 +223,7 @@ from which to start."
       (push (character-fold--make-space-string spaces) out))
     (let ((regexp (apply #'concat (nreverse out))))
       ;; Limited by `MAX_BUF_SIZE' in `regex.c'.
-      (if (> (length regexp) 32000)
+      (if (> (length regexp) 10000)
           (regexp-quote string)
         regexp))))