Backport: * lisp/ido.el (ido-set-matches-1): Fix split-string args to

avoid performance issue.

Fixes: debbugs:12796

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 9cd1a921440ddd75f5613d77559b6d437a134f59..542c80abeec0b7994569bf28af44af13c242c3d3 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2012-11-10  Leo Liu  <sdl.web@gmail.com>
+
+       * ido.el (ido-set-matches-1): Fix split-string args to avoid
+       performance issue.  (Bug#12796)
+
 2012-11-10  Glenn Morris  <rgm@gnu.org>
 
        * term.el (term-default-fg-color, term-default-bg-color):

diff --git a/lisp/ido.el b/lisp/ido.el
index 4ab183b320745bc46855f842ed749850372e3a28..88b84268ff89bd99c937cb2b6daa205786648cae 100644 (file)
--- a/lisp/ido.el
+++ b/lisp/ido.el
@@ -3764,7 +3764,7 @@ This is to make them appear as if they were \"virtual buffers\"."
               ido-enable-flex-matching
               (> (length ido-text) 1)
               (not ido-enable-regexp))
-      (setq re (mapconcat #'regexp-quote (split-string ido-text "") ".*"))
+      (setq re (mapconcat #'regexp-quote (split-string ido-text "" t) ".*"))
       (if ido-enable-prefix
          (setq re (concat "\\`" re)))
       (mapc