(vc-arch-complete): Remove.

(vc-arch-revision-completion-table): Use complete-with-action.

2 files changed, 12 insertions, 11 deletions

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 2c0e79bb75f..2123e07d766 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,12 @@
+2007-07-10  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+        * vc-arch.el (vc-arch-complete): Remove.
+        (vc-arch-revision-completion-table): Use complete-with-action.
+
+        * subr.el (condition-case-no-debug, with-demoted-errors): New macros.
+        (complete-with-action): New function.
+        (dynamic-completion-table): Use it.
+
 2007-07-10  Michael Albinus  <michael.albinus@gmx.de>
 
         * comint.el (make-comint, make-comint-in-buffer)
diff --git a/lisp/vc-arch.el b/lisp/vc-arch.el
index e4c13d3039a..c6aaa6c8c0b 100644
--- a/lisp/vc-arch.el
+++ b/lisp/vc-arch.el
@@ -424,13 +424,6 @@ Return non-nil if FILE is unchanged."
 
 ;;; 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 @@ Return non-nil if FILE is unchanged."
   (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.