From: Sascha Wilde <wilde@sha-bang.de>
Subject: Bugfix for vc-rcs.el
Date: Fri, 27 Jan 2006 13:12:26 +0100 [thread overview]
Message-ID: <m2vew5x42d.fsf@kenny.sha-bang.de> (raw)
[-- Attachment #1: Type: text/plain, Size: 217 bytes --]
This change by Andre Spiegel:
* vc-hooks.el (vc-user-login-name): Rewritten to handle access via
Tramp.
broke vc-rcs, as it used vs-user-login-name without the now required
argument file.
I attached a fix.
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: cv-rcs fix --]
[-- Type: text/x-patch, Size: 1382 bytes --]
*** vc-rcs.el 23 Jan 2006 03:00:06 +0100 1.46
--- vc-rcs.el 27 Jan 2006 13:02:46 +0100
***************
*** 818,824 ****
'needs-patch))
;; locked by the calling user
((and (stringp locking-user)
! (string= locking-user (vc-user-login-name)))
(if (or (eq (vc-checkout-model file) 'locking)
workfile-is-latest
(vc-rcs-latest-on-branch-p file workfile-version))
--- 818,824 ----
'needs-patch))
;; locked by the calling user
((and (stringp locking-user)
! (string= locking-user (vc-user-login-name file)))
(if (or (eq (vc-checkout-model file) 'locking)
workfile-is-latest
(vc-rcs-latest-on-branch-p file workfile-version))
***************
*** 907,913 ****
(vc-file-setprop file 'vc-state
(cond
((eq locking-user 'none) 'up-to-date)
! ((string= locking-user (vc-user-login-name)) 'edited)
(t locking-user)))
;; If the file has headers, we don't want to query the
;; master file, because that would eliminate all the
--- 907,913 ----
(vc-file-setprop file 'vc-state
(cond
((eq locking-user 'none) 'up-to-date)
! ((string= locking-user (vc-user-login-name file)) 'edited)
(t locking-user)))
;; If the file has headers, we don't want to query the
;; master file, because that would eliminate all the
[-- Attachment #3: Type: text/plain, Size: 133 bytes --]
cheers
sascha
--
Sascha Wilde
Programmer - A red-eyed, mumbling mammal capable of conversing with
inanimate objects.
[-- Attachment #4: Type: text/plain, Size: 142 bytes --]
_______________________________________________
Emacs-devel mailing list
Emacs-devel@gnu.org
http://lists.gnu.org/mailman/listinfo/emacs-devel
next reply other threads:[~2006-01-27 12:12 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2006-01-27 12:12 Sascha Wilde [this message]
2006-01-27 19:14 ` Bugfix for vc-rcs.el Andre Spiegel
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=m2vew5x42d.fsf@kenny.sha-bang.de \
--to=wilde@sha-bang.de \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this external index
https://git.savannah.gnu.org/cgit/emacs.git
https://git.savannah.gnu.org/cgit/emacs/org-mode.git
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.