summaryrefslogtreecommitdiff
path: root/lisp
diff options
context:
space:
mode:
authorRichard M. Stallman <rms@gnu.org>1995-11-16 22:04:24 +0000
committerRichard M. Stallman <rms@gnu.org>1995-11-16 22:04:24 +0000
commit10aa933d49e7ae123e1b28c438f55e6aa084bc6f (patch)
treea35a8649f2d41c7ac287da43a0f0c7c45e8ff8bc /lisp
parent27116657a36553d17e14c30fcbc5f8f8f682eda5 (diff)
downloademacs-10aa933d49e7ae123e1b28c438f55e6aa084bc6f.tar.gz
emacs-10aa933d49e7ae123e1b28c438f55e6aa084bc6f.tar.bz2
emacs-10aa933d49e7ae123e1b28c438f55e6aa084bc6f.zip
(vc-locking-user): In CVS case, convert user number to a string.
Diffstat (limited to 'lisp')
-rw-r--r--lisp/vc-hooks.el5
1 files changed, 4 insertions, 1 deletions
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)