# HG changeset patch # User Andr Spiegel # Date 1138215341 0 # Node ID 1d4de26bcb1f3f4dbe4a8af945cd1ecd6a8920ce # Parent 4e64c3323161d9259c5c001e210a2284b0385d24 (vc-default-dired-state-info): Pass FILE to vc-user-login-name. (vc-default-update-changelog): Don't use vc-user-login-name, we don't need it here. diff -r 4e64c3323161 -r 1d4de26bcb1f lisp/vc.el --- a/lisp/vc.el Wed Jan 25 18:54:26 2006 +0000 +++ b/lisp/vc.el Wed Jan 25 18:55:41 2006 +0000 @@ -2119,7 +2119,7 @@ (let ((state (vc-state file))) (cond ((stringp state) (concat "(" state ")")) - ((eq state 'edited) (concat "(" (vc-user-login-name) ")")) + ((eq state 'edited) (concat "(" (vc-user-login-name file) ")")) ((eq state 'needs-merge) "(merge)") ((eq state 'needs-patch) "(patch)") ((eq state 'unlocked-changes) "(stale)")))) @@ -2852,6 +2852,8 @@ (expand-file-name "vc" (or small-temporary-file-directory temporary-file-directory)))) + (login-name (or user-login-name + (format "uid%d" (number-to-string (user-uid))))) (full-name (or add-log-full-name (user-full-name) (user-login-name) @@ -2874,7 +2876,7 @@ exec-directory) nil (list t tempfile) nil "-c" changelog - "-u" (concat (vc-user-login-name) + "-u" (concat login-name "\t" full-name "\t" mailing-address) (mapcar