aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorStefan Monnier2008-05-29 20:46:35 +0000
committerStefan Monnier2008-05-29 20:46:35 +0000
commitd4e88786de7b156e480c898a51add9d4812e4253 (patch)
treeb147da9eb19cd96db4149a5b921d0393381b9b69
parent2926947a670b0679a34f90841fa7abc3f788474e (diff)
downloademacs-d4e88786de7b156e480c898a51add9d4812e4253.tar.gz
emacs-d4e88786de7b156e480c898a51add9d4812e4253.zip
(completion-pcm-all-completions): Add the base-size.
-rw-r--r--lisp/ChangeLog4
-rw-r--r--lisp/minibuffer.el4
2 files changed, 7 insertions, 1 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index eddd41438da..fda00d685d4 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,7 @@
12008-05-29 Stefan Monnier <monnier@iro.umontreal.ca>
2
3 * minibuffer.el (completion-pcm-all-completions): Add the base-size.
4
12008-05-29 Juanma Barranquero <lekktu@gmail.com> 52008-05-29 Juanma Barranquero <lekktu@gmail.com>
2 6
3 * icomplete.el (icomplete-prospects-height): Add :group. 7 * icomplete.el (icomplete-prospects-height): Add :group.
diff --git a/lisp/minibuffer.el b/lisp/minibuffer.el
index f24d1b068be..8dd0c776f5f 100644
--- a/lisp/minibuffer.el
+++ b/lisp/minibuffer.el
@@ -1496,7 +1496,9 @@ PATTERN is as returned by `completion-pcm--string->pattern'."
1496(defun completion-pcm-all-completions (string table pred point) 1496(defun completion-pcm-all-completions (string table pred point)
1497 (destructuring-bind (pattern all &optional prefix suffix) 1497 (destructuring-bind (pattern all &optional prefix suffix)
1498 (completion-pcm--find-all-completions string table pred point) 1498 (completion-pcm--find-all-completions string table pred point)
1499 (completion-pcm--hilit-commonality pattern all))) 1499 (when all
1500 (nconc (completion-pcm--hilit-commonality pattern all)
1501 (length prefix)))))
1500 1502
1501(defun completion-pcm--merge-completions (strs pattern) 1503(defun completion-pcm--merge-completions (strs pattern)
1502 "Extract the commonality in STRS, with the help of PATTERN." 1504 "Extract the commonality in STRS, with the help of PATTERN."