[Emacs-diffs] Changes to emacs/lisp/net/Attic/tramp-vc.el, v [EMACS_22_BASE]

[Michael Albinus]

CVSROOT:        /sources/emacs
Module name:    emacs
Branch:         EMACS_22_BASE
Changes by:     Michael Albinus <albinus>       07/09/24 05:42:35

Index: net/tramp-vc.el
===================================================================
RCS file: /sources/emacs/emacs/lisp/net/Attic/tramp-vc.el,v
retrieving revision 1.21.2.2
retrieving revision 1.21.2.3
diff -u -b -r1.21.2.2 -r1.21.2.3
--- net/tramp-vc.el     25 Jul 2007 04:25:41 -0000      1.21.2.2
+++ net/tramp-vc.el     24 Sep 2007 05:42:34 -0000      1.21.2.3
@@ -437,7 +437,10 @@
 ;; The following defadvice is no longer necessary after changes in VC
 ;; on 2006-01-25, Andre.
 
-(unless (fboundp 'process-file)
+;; That means either GNU Emacs >= 22 or the "new vc" package from XEmacs
+;; packages collection; as of 2007-09-06, test for availability of
+;; `vc-find-version' works for both of those cases.
+(unless (fboundp 'vc-find-version)
   (defadvice vc-user-login-name
     (around tramp-vc-user-login-name activate)
     "Support for files on remote machines accessed by TRAMP."
@@ -453,7 +456,7 @@
               (tramp-tramp-file-p file)        ; tramp file
               (setq ad-return-value
                     (save-match-data
-                      (tramp-handle-vc-user-login-name uid)))) ; get the owner 
name
+                      (tramp-handle-vc-user-login-name (ad-get-arg 0))))) ; 
get the owner name
          ad-do-it)))                     ; else call the original
 
   (add-hook 'tramp-unload-hook