[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] Changes to emacs/lisp/vc-bzr.el,v
From: |
Stefan Monnier |
Subject: |
[Emacs-diffs] Changes to emacs/lisp/vc-bzr.el,v |
Date: |
Mon, 21 Apr 2008 20:49:07 +0000 |
CVSROOT: /sources/emacs
Module name: emacs
Changes by: Stefan Monnier <monnier> 08/04/21 20:49:06
Index: vc-bzr.el
===================================================================
RCS file: /sources/emacs/emacs/lisp/vc-bzr.el,v
retrieving revision 1.46
retrieving revision 1.47
diff -u -b -r1.46 -r1.47
--- vc-bzr.el 11 Apr 2008 15:17:57 -0000 1.46
+++ vc-bzr.el 21 Apr 2008 20:49:06 -0000 1.47
@@ -706,12 +706,6 @@
;;; Revision completion
-(defun vc-bzr-complete-with-prefix (prefix action table string pred)
- (let ((comp (complete-with-action action table string pred)))
- (if (stringp comp)
- (concat prefix comp)
- comp)))
-
(defun vc-bzr-revision-completion-table (files)
(lexical-let ((files files))
;; What about using `files'?!? --Stef
@@ -719,19 +713,20 @@
(cond
((string-match "\\`\\(ancestor\\|branch\\|\\(revno:\\)?[-0-9]+:\\):"
string)
- (vc-bzr-complete-with-prefix (substring string 0 (match-end 0))
- action
+ (completion-table-with-context (substring string 0 (match-end 0))
'read-file-name-internal
(substring string (match-end 0))
- ;; Dropping `pred'. Maybe we should just
- ;; stash it in `read-file-name-predicate'?
- nil))
+ ;; Dropping `pred'. Maybe we should
+ ;; just stash it in
+ ;; `read-file-name-predicate'?
+ nil
+ action))
((string-match "\\`\\(before\\):" string)
- (vc-bzr-complete-with-prefix (substring string 0 (match-end 0))
- action
+ (completion-table-with-context (substring string 0 (match-end 0))
(vc-bzr-revision-completion-table files)
(substring string (match-end 0))
- pred))
+ pred
+ action))
((string-match "\\`\\(tag\\):" string)
(let ((prefix (substring string 0 (match-end 0)))
(tag (substring string (match-end 0)))
@@ -744,7 +739,7 @@
(goto-char (point-min))
(while (re-search-forward "^\\(.*[^ \n]\\) +[^ \n]*$" nil t)
(push (match-string-no-properties 1) table)))
- (vc-bzr-complete-with-prefix prefix action table tag pred)))
+ (completion-table-with-context prefix table tag pred action)))
((string-match "\\`\\(revid\\):" string)
;; FIXME: How can I get a list of revision ids?
- [Emacs-diffs] Changes to emacs/lisp/vc-bzr.el,v, Stefan Monnier, 2008/04/02
- [Emacs-diffs] Changes to emacs/lisp/vc-bzr.el,v, Stefan Monnier, 2008/04/03
- [Emacs-diffs] Changes to emacs/lisp/vc-bzr.el,v, Dan Nicolaescu, 2008/04/04
- [Emacs-diffs] Changes to emacs/lisp/vc-bzr.el,v, Miles Bader, 2008/04/05
- [Emacs-diffs] Changes to emacs/lisp/vc-bzr.el,v, Dan Nicolaescu, 2008/04/10
- [Emacs-diffs] Changes to emacs/lisp/vc-bzr.el,v, Stefan Monnier, 2008/04/11
- [Emacs-diffs] Changes to emacs/lisp/vc-bzr.el,v,
Stefan Monnier <=
- [Emacs-diffs] Changes to emacs/lisp/vc-bzr.el,v, Stefan Monnier, 2008/04/29