* automated/tramp-tests.el (tramp-test29-vc-registered):

Fallback for changed `vc-register' argument list.

diff --git a/test/ChangeLog b/test/ChangeLog
index fea40786ba0bf775e46a854716af633712d94d50..cc62818fecf3b1726f373ec02fcb3c9f220764b9 100644 (file)
--- a/test/ChangeLog
+++ b/test/ChangeLog
@@ -1,3 +1,8 @@
+2014-12-03  Michael Albinus  <michael.albinus@gmx.de>
+
+       * automated/tramp-tests.el (tramp-test29-vc-registered):
+       Fallback for changed `vc-register' argument list.
+
 2014-12-03  Glenn Morris  <rgm@gnu.org>
 
        * automated/tramp-tests.el (tramp-test29-vc-registered):

diff --git a/test/automated/tramp-tests.el b/test/automated/tramp-tests.el
index 2b2074c78ed3b868a7361c1e92046bb69295341c..c03b7464b4fba1a25ce6ae97f31c3b7dba856288 100644 (file)
--- a/test/automated/tramp-tests.el
+++ b/test/automated/tramp-tests.el
@@ -1469,9 +1469,15 @@ This tests also `make-symbolic-link', `file-truename' and `add-name-to-file'."
            (vc-create-repo (car vc-handled-backends))
            ;; The structure of VC-FILESET is not documented.  Let's
            ;; hope it won't change.
-           (vc-register
-            (list (car vc-handled-backends)
-                  (list (file-name-nondirectory tmp-name2)))))
+           (condition-case nil
+               (vc-register
+                (list (car vc-handled-backends)
+                      (list (file-name-nondirectory tmp-name2))))
+             ;; `vc-register' has changed its arguments in Emacs 25.1.
+             (error
+              (vc-register
+               nil (list (car vc-handled-backends)
+                         (list (file-name-nondirectory tmp-name2)))))))
          (should (vc-registered tmp-name2)))
 
        (ignore-errors (delete-directory tmp-name1 'recursive)))))