From: Richard M. Stallman <rms@gnu.org>
Date: Thu, 16 Nov 1995 22:04:24 +0000 (+0000)
Subject: (vc-locking-user): In CVS case, convert user number to a string.
X-Git-Tag: emacs-19.34~2289
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=10aa933d49e7ae123e1b28c438f55e6aa084bc6f;p=emacs.git

(vc-locking-user): In CVS case, convert user number to a string.
---

diff --git a/lisp/vc-hooks.el b/lisp/vc-hooks.el
index 4b7bcbcf7af..ff22fd58698 100644
--- a/lisp/vc-hooks.el
+++ b/lisp/vc-hooks.el
@@ -608,7 +608,10 @@ For CVS, the full name of CVS/Entries is returned."
 	    (and (equal (vc-file-getprop file 'vc-checkout-time)
 			(nth 5 (file-attributes file)))
 		 (vc-file-setprop file 'vc-locking-user 'none))
-	    (vc-file-setprop file 'vc-locking-user (vc-file-owner file))))
+	    (let ((locker (vc-file-owner file)))
+	      (vc-file-setprop file 'vc-locking-user
+			       (if (stringp locker) locker
+				 (format "%d" locker))))))
 
        ((eq (vc-backend file) 'RCS)
 	(let (p-lock)