emacs-devel
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

Bugfix for vc-rcs.el


From: Sascha Wilde
Subject: Bugfix for vc-rcs.el
Date: Fri, 27 Jan 2006 13:12:26 +0100
User-agent: Gnus/5.11 (Gnus v5.11) Emacs/22.0.50 (gnu/linux)

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.

*** 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
cheers
sascha
-- 
Sascha Wilde

Programmer - A red-eyed, mumbling mammal capable of conversing with
             inanimate objects.

reply via email to

[Prev in Thread] Current Thread [Next in Thread]