[Emacs-diffs] Changes to emacs/lisp/vc-arch.el,v

[Stefan Monnier]

CVSROOT:        /sources/emacs
Module name:    emacs
Changes by:     Stefan Monnier <monnier>        07/07/10 19:55:13

Index: vc-arch.el
===================================================================
RCS file: /sources/emacs/emacs/lisp/vc-arch.el,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -b -r1.27 -r1.28
--- vc-arch.el  26 Jun 2007 17:59:15 -0000      1.27
+++ vc-arch.el  10 Jul 2007 19:55:11 -0000      1.28
@@ -424,13 +424,6 @@
 
 ;;; Completion of versions and revisions.
 
-(defun vc-arch-complete (table string pred action)
-  (assert (not (functionp table)))
-  (cond
-   ((null action) (try-completion string table pred))
-   ((eq action t) (all-completions string table pred))
-   (t (test-completion string table pred))))
-
 (defun vc-arch--version-completion-table (root string)
   (delq nil
        (mapcar
@@ -450,10 +443,9 @@
   (lexical-let ((file file))
     (lambda (string pred action)
       ;; FIXME: complete revision patches as well.
-      (let ((root (expand-file-name "{arch}" (vc-arch-root file))))
-       (vc-arch-complete
-        (vc-arch--version-completion-table root string)
-        string pred action)))))
+      (let* ((root (expand-file-name "{arch}" (vc-arch-root file)))
+             (table (vc-arch--version-completion-table root string)))
+       (complete-with-action action table string pred)))))
 
 ;;; Trimming revision libraries.