* 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 d0525c61e6cc75e44261285f609674a7e72a3f0a..e7ee293f4bafef5d0d644ebe77ba2854fbea79aa 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2010-06-01  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+       * 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  <jonathlela@gmail.com>  (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 b0dbb8ec1929bd7987e0ec7eb9f5043cec5de1ce..8396547bdcbd5b998da94022188fd6ed3d139078 100644 (file)
--- 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))