aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLeo Liu2012-11-10 22:55:09 +0800
committerLeo Liu2012-11-10 22:55:09 +0800
commite4e46889223296e8875548d278340b21db449a4a (patch)
treede4b6c10b49e1185d5258b683509748154cbc456
parentaf8bf5b3c098bddb985af4a073e9251d6bd91fbc (diff)
downloademacs-e4e46889223296e8875548d278340b21db449a4a.tar.gz
emacs-e4e46889223296e8875548d278340b21db449a4a.zip
Backport: * lisp/ido.el (ido-set-matches-1): Fix split-string args to
avoid performance issue. Fixes: debbugs:12796
-rw-r--r--lisp/ChangeLog5
-rw-r--r--lisp/ido.el2
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 @@
12012-11-10 Leo Liu <sdl.web@gmail.com>
2
3 * ido.el (ido-set-matches-1): Fix split-string args to avoid
4 performance issue. (Bug#12796)
5
12012-11-10 Glenn Morris <rgm@gnu.org> 62012-11-10 Glenn Morris <rgm@gnu.org>
2 7
3 * term.el (term-default-fg-color, term-default-bg-color): 8 * 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\"."
3764 ido-enable-flex-matching 3764 ido-enable-flex-matching
3765 (> (length ido-text) 1) 3765 (> (length ido-text) 1)
3766 (not ido-enable-regexp)) 3766 (not ido-enable-regexp))
3767 (setq re (mapconcat #'regexp-quote (split-string ido-text "") ".*")) 3767 (setq re (mapconcat #'regexp-quote (split-string ido-text "" t) ".*"))
3768 (if ido-enable-prefix 3768 (if ido-enable-prefix
3769 (setq re (concat "\\`" re))) 3769 (setq re (concat "\\`" re)))
3770 (mapc 3770 (mapc