2 files changed, 6 insertions, 1 deletions

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 9cd1a921440..542c80abeec 100644
--- 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 4ab183b3207..88b84268ff8 100644
--- 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