Commit 510f6466 authored by André Spiegel's avatar André Spiegel
Browse files

(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.
parent 8d2b9c1a
...@@ -2119,7 +2119,7 @@ There is a special command, `*l', to mark all files currently locked." ...@@ -2119,7 +2119,7 @@ There is a special command, `*l', to mark all files currently locked."
(let ((state (vc-state file))) (let ((state (vc-state file)))
(cond (cond
((stringp state) (concat "(" state ")")) ((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-merge) "(merge)")
((eq state 'needs-patch) "(patch)") ((eq state 'needs-patch) "(patch)")
((eq state 'unlocked-changes) "(stale)")))) ((eq state 'unlocked-changes) "(stale)"))))
...@@ -2852,6 +2852,8 @@ Uses `rcs2log' which only works for RCS and CVS." ...@@ -2852,6 +2852,8 @@ Uses `rcs2log' which only works for RCS and CVS."
(expand-file-name "vc" (expand-file-name "vc"
(or small-temporary-file-directory (or small-temporary-file-directory
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 (full-name (or add-log-full-name
(user-full-name) (user-full-name)
(user-login-name) (user-login-name)
...@@ -2874,7 +2876,7 @@ Uses `rcs2log' which only works for RCS and CVS." ...@@ -2874,7 +2876,7 @@ Uses `rcs2log' which only works for RCS and CVS."
exec-directory) exec-directory)
nil (list t tempfile) nil nil (list t tempfile) nil
"-c" changelog "-c" changelog
"-u" (concat (vc-user-login-name) "-u" (concat login-name
"\t" full-name "\t" full-name
"\t" mailing-address) "\t" mailing-address)
(mapcar (mapcar
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment