(lazy-completion-table): Don't be fooled if the var holds

a "list" (lambda ...) rather than a real completion list.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 1de28aabec71a717c565fa485ac8b1e0f3f3a69b..f131be43db285b92260c8da8f788292e6a88eee7 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,6 +1,14 @@
+2005-12-18  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+       * subr.el (lazy-completion-table): Don't be fooled if the var holds
+       a "list" (lambda ...) rather than a real completion list.
+
+       * emacs-lisp/cl-extra.el (cl-macroexpand-all): Fix code-walk for
+       lexical-let when encountering ((lambda (...) ...) ...).
+
 2005-12-17  Chong Yidong  <cyd@stupidchicken.com>
 
-       * progmodes/sh-script.el (sh-mode): 
+       * progmodes/sh-script.el (sh-mode):
        * language/ethio-util.el (ethio-fidel-to-sera-mail-or-marker):
        * textmodes/picture.el (picture-mode): Update docstrings.
 
@@ -15,8 +23,8 @@
 
 2005-12-17  Chong Yidong  <cyd@stupidchicken.com>
 
-       * emacs-lisp/edebug.el (edebug-safe-prin1-to-string): Capture
-       error from printing circular structures.
+       * emacs-lisp/edebug.el (edebug-safe-prin1-to-string):
+       Capture error from printing circular structures.
 
 2005-12-17  Martin Rudalics  <rudalics@gmx.at>  (tiny change)
 

diff --git a/lisp/subr.el b/lisp/subr.el
index 9dce17911d86470f7182bf429280614595b9bca1..d1dbb850d8e5b5b275f1843195fdc8a5f6934020 100644 (file)
--- a/lisp/subr.el
+++ b/lisp/subr.el
@@ -2268,7 +2268,7 @@ from which the minibuffer was entered.  The return value of
   (let ((str (make-symbol "string")))
     `(dynamic-completion-table
       (lambda (,str)
-        (unless (listp ,var)
+        (when (functionp ,var)
           (setq ,var (,fun ,@args)))
         ,var))))