# HG changeset patch
# User Stefan Monnier <monnier@iro.umontreal.ca>
# Date 1184097312 0
# Node ID 0e6cd7deb7463f3790be9337611055bc9225425a
# Parent  f7d2bfbd3abcac28b50a02b239f813022cfb306f
(vc-arch-complete): Remove.
(vc-arch-revision-completion-table): Use complete-with-action.

diff -r f7d2bfbd3abc -r 0e6cd7deb746 lisp/ChangeLog
--- a/lisp/ChangeLog	Tue Jul 10 19:54:43 2007 +0000
+++ b/lisp/ChangeLog	Tue Jul 10 19:55:12 2007 +0000
@@ -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 -r f7d2bfbd3abc -r 0e6cd7deb746 lisp/vc-arch.el
--- a/lisp/vc-arch.el	Tue Jul 10 19:54:43 2007 +0000
+++ b/lisp/vc-arch.el	Tue Jul 10 19:55:12 2007 +0000
@@ -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.