[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] Changes to emacs/lisp/vc.el
From: |
André Spiegel |
Subject: |
[Emacs-diffs] Changes to emacs/lisp/vc.el |
Date: |
Wed, 25 Jan 2006 18:55:41 +0000 |
Index: emacs/lisp/vc.el
diff -u emacs/lisp/vc.el:1.411 emacs/lisp/vc.el:1.412
--- emacs/lisp/vc.el:1.411 Wed Dec 28 20:13:47 2005
+++ emacs/lisp/vc.el Wed Jan 25 18:55:41 2006
@@ -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
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Emacs-diffs] Changes to emacs/lisp/vc.el,
André Spiegel <=