2 files changed, 13 insertions, 7 deletions

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index c2014ac2fd9..e98d6f93852 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2008-05-20  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+        * icomplete.el (icomplete-completions): Don't use `predicate' with
+        a table of a different type than `candidates'.
+
 2008-05-20  Roland Winkler  <Roland.Winkler@physik.uni-erlangen.de>
 
         * proced.el (proced-goal-header-re): Renamed from
diff --git a/lisp/icomplete.el b/lisp/icomplete.el
index 38fbf8f42e7..369342e4d91 100644
--- a/lisp/icomplete.el
+++ b/lisp/icomplete.el
@@ -291,13 +291,14 @@ are exhibited within the square braces.)"
     ;; `icomplete-prospects-length', there is no need for `catch'/`throw'.
     (if (null comps)
         (format " %sNo matches%s" open-bracket close-bracket)
-      (let* ((most-try (completion-try-completion
-                        name
-                        ;; If the `comps' are 0-based, the result should be
-                        ;; the same with `comps'.
-                        (if base-size candidates comps)
-                        predicate
-                        (length name)))
+      (let* ((most-try
+              (if (and base-size (> base-size 0))
+                  (completion-try-completion
+                   name candidates predicate (length name))
+                ;; If the `comps' are 0-based, the result should be
+                ;; the same with `comps'.
+                (completion-try-completion
+                 name comps nil (length name))))
              (most (if (consp most-try) (car most-try) (car comps)))
              ;; Compare name and most, so we can determine if name is
              ;; a prefix of most, or something else.