From d9aa6b33589b4f4336a66c989b731b0d5a501691 Mon Sep 17 00:00:00 2001 From: Juanma Barranquero Date: Fri, 30 May 2008 19:50:26 +0000 Subject: [PATCH] (completion-table-dynamic): Doc fix. --- lisp/ChangeLog | 11 +++++++---- lisp/minibuffer.el | 4 ++-- 2 files changed, 9 insertions(+), 6 deletions(-) diff --git a/lisp/ChangeLog b/lisp/ChangeLog index a4634a630e6..dad37a47ea4 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,7 @@ +2008-05-30 Juanma Barranquero + + * minibuffer.el (completion-table-dynamic): Doc fix. + 2008-05-30 Stefan Monnier * vc-cvs.el (vc-cvs-state-heuristic, vc-cvs-parse-status): Try and @@ -42,11 +46,10 @@ 2008-05-29 Kenichi Handa - * international/mule-conf.el (utf-8-sig, utf-8-auto): New coding - systems. + * international/mule-conf.el (utf-8-sig, utf-8-auto): + New coding systems. - * international/mule.el (define-coding-system): Accept :bom for - utf-8. + * international/mule.el (define-coding-system): Accept :bom for utf-8. 2008-05-29 Espen Wiborg (tiny change) diff --git a/lisp/minibuffer.el b/lisp/minibuffer.el index 8dd0c776f5f..510fe4b1721 100644 --- a/lisp/minibuffer.el +++ b/lisp/minibuffer.el @@ -131,7 +131,7 @@ the value of its argument. If completion is performed in the minibuffer, FUN will be called in the buffer from which the minibuffer was entered. The result of the `dynamic-completion-table' form is a function -that can be used as the ALIST argument to `try-completion' and +that can be used as the COLLECTION argument to `try-completion' and `all-completions'. See Info node `(elisp)Programmed Completion'." (lexical-let ((fun fun)) (lambda (string pred action) @@ -978,7 +978,7 @@ specified by COMMON-SUBSTRING." (let ((start (length (file-name-directory string))) (end (string-match "/" (cdr action)))) (list* 'boundaries start end))) - + (t (let* ((dir (if (stringp pred) ;; It used to be that `pred' was abused to pass `dir'