Mercurial > emacs
comparison lisp/vc-bzr.el @ 108681:1b1048318854
* lisp/vc-bzr.el (vc-bzr-revision-completion-table): Apply
`file-directory-p' to the filename part rather than to the whole text.
author | Stefan Monnier <monnier@iro.umontreal.ca> |
---|---|
date | Mon, 31 May 2010 22:06:09 -0400 |
parents | 6e6072f0c0a2 |
children | bace4ba4c137 8027e412df98 |
comparison
equal
deleted
inserted
replaced
108680:2e9f223012e8 | 108681:1b1048318854 |
---|---|
943 (lambda (string pred action) | 943 (lambda (string pred action) |
944 (cond | 944 (cond |
945 ((string-match "\\`\\(ancestor\\|branch\\|\\(revno:\\)?[-0-9]+:\\):" | 945 ((string-match "\\`\\(ancestor\\|branch\\|\\(revno:\\)?[-0-9]+:\\):" |
946 string) | 946 string) |
947 (completion-table-with-context (substring string 0 (match-end 0)) | 947 (completion-table-with-context (substring string 0 (match-end 0)) |
948 'completion-file-name-table | 948 (apply-partially |
949 'completion-table-with-predicate | |
950 'completion-file-name-table | |
951 'file-directory-p t) | |
949 (substring string (match-end 0)) | 952 (substring string (match-end 0)) |
950 ;; Dropping `pred' for no good reason. | 953 pred |
951 'file-directory-p | |
952 action)) | 954 action)) |
953 ((string-match "\\`\\(before\\):" string) | 955 ((string-match "\\`\\(before\\):" string) |
954 (completion-table-with-context (substring string 0 (match-end 0)) | 956 (completion-table-with-context (substring string 0 (match-end 0)) |
955 (vc-bzr-revision-completion-table files) | 957 (vc-bzr-revision-completion-table files) |
956 (substring string (match-end 0)) | 958 (substring string (match-end 0)) |