diff options
| author | Stefan Monnier <monnier@iro.umontreal.ca> | 2009-10-21 20:03:57 +0000 |
|---|---|---|
| committer | Stefan Monnier <monnier@iro.umontreal.ca> | 2009-10-21 20:03:57 +0000 |
| commit | 528c56e2d1f1ca98b5195ab9a45c44a46a3ff32a (patch) | |
| tree | 3cdb8887f415421fc14dc908b49f47326b463d38 /lisp/vc-bzr.el | |
| parent | 3132a7ea15ddf8c479a9596fb1736f5c62d5e8d9 (diff) | |
| download | emacs-528c56e2d1f1ca98b5195ab9a45c44a46a3ff32a.tar.gz | |
* minibuffer.el (completion-table-with-terminator): Properly implement
boundaries, in case `terminator' appears in the suffix.
(completion--embedded-envvar-table): Don't return boundaries if
there's no valid completion. Simplify.
(completion-file-name-table): New completion table extracted from
completion--file-name-table.
(completion--file-name-table): Use it.
(read-file-name-predicate): Declare obsolete.
(read-file-name): Use the pred arg i.s.o read-file-name-predicate.
* vc-bzr.el (vc-bzr-revision-completion-table): Use the new
completion-file-name-table, and use the `pred' argument.
* files.el (locate-file-completion-table): Use the `pred' arg rather
than read-file-name-predicate.
(abbreviate-file-name): Use \` rather than ^ for BOS.
Diffstat (limited to 'lisp/vc-bzr.el')
| -rw-r--r-- | lisp/vc-bzr.el | 10 |
1 files changed, 3 insertions, 7 deletions
diff --git a/lisp/vc-bzr.el b/lisp/vc-bzr.el index da9c97f2c17..b5118538cff 100644 --- a/lisp/vc-bzr.el +++ b/lisp/vc-bzr.el @@ -736,14 +736,10 @@ stream. Standard error output is discarded." ((string-match "\\`\\(ancestor\\|branch\\|\\(revno:\\)?[-0-9]+:\\):" string) (completion-table-with-context (substring string 0 (match-end 0)) - ;; FIXME: only allow directories. - ;; FIXME: don't allow envvars. - 'read-file-name-internal + 'completion-file-name-table (substring string (match-end 0)) - ;; Dropping `pred'. Maybe we should - ;; just stash it in - ;; `read-file-name-predicate'? - nil + ;; Dropping `pred' for no good reason. + 'file-directory-p action)) ((string-match "\\`\\(before\\):" string) (completion-table-with-context (substring string 0 (match-end 0)) |