Merged from miles@gnu.org--gnu-2005 (patch 187, 704)

Patches applied:

 * emacs@sv.gnu.org/emacs--devo--0--base-0
   tag of miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-704

 * emacs@sv.gnu.org/emacs--devo--0--patch-1
   Update from CVS

 * emacs@sv.gnu.org/emacs--devo--0--patch-2
   Update from CVS

 * emacs@sv.gnu.org/emacs--devo--0--patch-3
   Update from CVS

 * emacs@sv.gnu.org/emacs--devo--0--patch-4
   Update from CVS

 * emacs@sv.gnu.org/emacs--devo--0--patch-5
   Merge from gnus--rel--5.10

 * emacs@sv.gnu.org/emacs--devo--0--patch-6
   Update from CVS

 * emacs@sv.gnu.org/emacs--devo--0--patch-7
   Update from CVS

 * emacs@sv.gnu.org/emacs--devo--0--patch-8
   Update from CVS

 * emacs@sv.gnu.org/emacs--devo--0--patch-9
   Update from CVS

 * emacs@sv.gnu.org/emacs--devo--0--patch-10
   Update from CVS

 * emacs@sv.gnu.org/emacs--devo--0--patch-11
   Update from CVS

 * emacs@sv.gnu.org/emacs--devo--0--patch-12
   Update from CVS

 * emacs@sv.gnu.org/emacs--devo--0--patch-13
   Update from CVS

 * emacs@sv.gnu.org/emacs--devo--0--patch-14
   Merge from gnus--rel--5.10

 * emacs@sv.gnu.org/emacs--devo--0--patch-15
   Update from CVS

 * emacs@sv.gnu.org/emacs--devo--0--patch-16
   Update from CVS

 * emacs@sv.gnu.org/emacs--devo--0--patch-17
   Update from CVS

 * emacs@sv.gnu.org/emacs--devo--0--patch-18
   Update from CVS

 * emacs@sv.gnu.org/emacs--devo--0--patch-19
   Update from CVS

 * emacs@sv.gnu.org/emacs--devo--0--patch-20
   Update from CVS

 * emacs@sv.gnu.org/emacs--devo--0--patch-21
   Update from CVS

 * emacs@sv.gnu.org/emacs--devo--0--patch-22
   Install ERC.

 * emacs@sv.gnu.org/emacs--devo--0--patch-23
   Update from CVS

 * emacs@sv.gnu.org/emacs--devo--0--patch-24
   Fix ERC compiler warnings.

 * emacs@sv.gnu.org/emacs--devo--0--patch-25
   Use utf-8 encoding in ERC ChangeLogs.

 * emacs@sv.gnu.org/emacs--devo--0--patch-26
   Update from CVS

 * emacs@sv.gnu.org/emacs--devo--0--patch-27
   Merge ERC-related Viper hacks into Viper.

 * emacs@sv.gnu.org/emacs--devo--0--patch-28
   Update from CVS

 * emacs@sv.gnu.org/emacs--devo--0--patch-29
   Update from CVS

 * emacs@sv.gnu.org/emacs--devo--0--patch-30
   Merge from erc--main--0

 * emacs@sv.gnu.org/gnus--rel--5.10--base-0
   tag of miles@gnu.org--gnu-2005/gnus--rel--5.10--patch-187

 * emacs@sv.gnu.org/gnus--rel--5.10--patch-1
   Update from CVS

 * emacs@sv.gnu.org/gnus--rel--5.10--patch-2
   Merge from emacs--devo--0

 * emacs@sv.gnu.org/gnus--rel--5.10--patch-3
   Update from CVS

 * emacs@sv.gnu.org/gnus--rel--5.10--patch-4
   Update from CVS

 * emacs@sv.gnu.org/gnus--rel--5.10--patch-5
   Update from CVS

 * emacs@sv.gnu.org/gnus--rel--5.10--patch-6
   Update from CVS

 * emacs@sv.gnu.org/gnus--rel--5.10--patch-7
   Update from CVS

 * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-704
   Update from CVS

 * miles@gnu.org--gnu-2005/gnus--rel--5.10--patch-187
   Update from CVS

git-archimport-id: lorentey@elte.hu--2004/emacs--multi-tty--0--patch-501

1 files changed, 16 insertions, 8 deletions

diff --git a/lisp/vc-hooks.el b/lisp/vc-hooks.el
index 5872e2f1990..1c1f0844303 100644
--- a/lisp/vc-hooks.el
+++ b/lisp/vc-hooks.el
@@ -410,14 +410,22 @@ For registered files, the possible values are:
           (vc-file-setprop file 'vc-checkout-model
                            (vc-call checkout-model file)))))
 
-(defun vc-user-login-name (&optional uid)
-  "Return the name under which the user is logged in, as a string.
-\(With optional argument UID, return the name of that user.)
-This function does the same as function `user-login-name', but unlike
-that, it never returns nil.  If a UID cannot be resolved, that
-UID is returned as a string."
-  (or (user-login-name uid)
-      (number-to-string (or uid (user-uid)))))
+(defun vc-user-login-name (file)
+  "Return the name under which the user accesses the given FILE."
+  (or (and (eq (string-match tramp-file-name-regexp file) 0)
+           ;; tramp case: execute "whoami" via tramp
+           (let ((default-directory (file-name-directory file)))
+             (with-temp-buffer
+               (if (not (zerop (process-file "whoami" nil t)))
+                   ;; fall through if "whoami" didn't work
+                   nil
+                 ;; remove trailing newline
+                 (delete-region (1- (point-max)) (point-max))
+                 (buffer-string)))))
+      ;; normal case
+      (user-login-name)
+      ;; if user-login-name is nil, return the UID as a string
+      (number-to-string (user-uid))))
 
 (defun vc-state (file)
   "Return the version control state of FILE.