diff options
| author | Stefan Monnier <monnier@iro.umontreal.ca> | 2010-05-31 22:06:09 -0400 |
|---|---|---|
| committer | Stefan Monnier <monnier@iro.umontreal.ca> | 2010-05-31 22:06:09 -0400 |
| commit | feceda26100f1b5712a85aadf0c428a1507b538d (patch) | |
| tree | c98cc97d68ebc80a5ffd180c9362bb1a51781553 | |
| parent | a44ae268f84e162cdecc516ebbe3193e89fae1d2 (diff) | |
| download | emacs-feceda26100f1b5712a85aadf0c428a1507b538d.tar.gz | |
* lisp/vc-bzr.el (vc-bzr-revision-completion-table): Apply
`file-directory-p' to the filename part rather than to the whole text.
| -rw-r--r-- | lisp/ChangeLog | 5 | ||||
| -rw-r--r-- | lisp/vc-bzr.el | 8 |
2 files changed, 10 insertions, 3 deletions
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 <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 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)) |