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 @@
+2008-05-29  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+        * minibuffer.el (completion-pcm-all-completions): Add the base-size.
+
 2008-05-29  Juanma Barranquero  <lekktu@gmail.com>
 
         * 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'."
 (defun completion-pcm-all-completions (string table pred point)
   (destructuring-bind (pattern all &optional prefix suffix)
       (completion-pcm--find-all-completions string table pred point)
-    (completion-pcm--hilit-commonality pattern all)))
+    (when all
+      (nconc (completion-pcm--hilit-commonality pattern all)
+             (length prefix)))))
 
 (defun completion-pcm--merge-completions (strs pattern)
   "Extract the commonality in STRS, with the help of PATTERN."