From: Stefan Monnier Date: Tue, 1 Jun 2010 02:06:09 +0000 (-0400) Subject: * lisp/vc-bzr.el (vc-bzr-revision-completion-table): Apply X-Git-Tag: emacs-pretest-23.2.90~139^2~154 X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=feceda26100f1b5712a85aadf0c428a1507b538d;p=emacs.git * lisp/vc-bzr.el (vc-bzr-revision-completion-table): Apply `file-directory-p' to the filename part rather than to the whole text. --- diff --git a/lisp/ChangeLog b/lisp/ChangeLog index d0525c61e6c..e7ee293f4ba 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,8 @@ +2010-06-01 Stefan Monnier + + * vc-bzr.el (vc-bzr-revision-completion-table): Apply + `file-directory-p' to the filename part rather than to the whole text. + 2010-05-31 Jonathan Marchand (tiny change) * cedet/ede/cpp-root.el (ede-set-project-variables): Fix feature name diff --git a/lisp/vc-bzr.el b/lisp/vc-bzr.el index b0dbb8ec192..8396547bdcb 100644 --- a/lisp/vc-bzr.el +++ b/lisp/vc-bzr.el @@ -945,10 +945,12 @@ stream. Standard error output is discarded." ((string-match "\\`\\(ancestor\\|branch\\|\\(revno:\\)?[-0-9]+:\\):" string) (completion-table-with-context (substring string 0 (match-end 0)) - 'completion-file-name-table + (apply-partially + 'completion-table-with-predicate + 'completion-file-name-table + 'file-directory-p t) (substring string (match-end 0)) - ;; Dropping `pred' for no good reason. - 'file-directory-p + pred action)) ((string-match "\\`\\(before\\):" string) (completion-table-with-context (substring string 0 (match-end 0))