From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: Sascha Wilde Newsgroups: gmane.emacs.devel Subject: Bugfix for vc-rcs.el Date: Fri, 27 Jan 2006 13:12:26 +0100 Message-ID: NNTP-Posting-Host: main.gmane.org Mime-Version: 1.0 Content-Type: multipart/mixed; boundary="=-=-=" X-Trace: sea.gmane.org 1138387205 32586 80.91.229.2 (27 Jan 2006 18:40:05 GMT) X-Complaints-To: usenet@sea.gmane.org NNTP-Posting-Date: Fri, 27 Jan 2006 18:40:05 +0000 (UTC) Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Fri Jan 27 19:40:03 2006 Return-path: Envelope-to: ged-emacs-devel@m.gmane.org Original-Received: from lists.gnu.org ([199.232.76.165]) by ciao.gmane.org with esmtp (Exim 4.43) id 1F2YVB-0007Px-Gn for ged-emacs-devel@m.gmane.org; Fri, 27 Jan 2006 19:39:18 +0100 Original-Received: from localhost ([127.0.0.1] helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1F2Y1U-00055I-Qs for ged-emacs-devel@m.gmane.org; Fri, 27 Jan 2006 13:08:37 -0500 Original-Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1F2WxS-000724-SR for emacs-devel@gnu.org; Fri, 27 Jan 2006 12:00:23 -0500 Original-Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1F2WRG-0006Rv-QD for emacs-devel@gnu.org; Fri, 27 Jan 2006 11:27:12 -0500 Original-Received: from [199.232.76.173] (helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1F2SVk-00031y-75 for emacs-devel@gnu.org; Fri, 27 Jan 2006 07:15:29 -0500 Original-Received: from [62.141.58.119] (helo=km1136.keymachine.de) by monty-python.gnu.org with esmtps (TLS-1.0:DHE_RSA_AES_256_CBC_SHA:32) (Exim 4.52) id 1F2STT-0006b2-GG for emacs-devel@gnu.org; Fri, 27 Jan 2006 07:13:07 -0500 Original-Received: from kenny.sha-bang.de (xdslac114.osnanet.de [82.149.176.114]) (authenticated bits=0) by km1136.keymachine.de (8.12.11/8.12.10) with ESMTP id k0RCCO9B029206 for ; Fri, 27 Jan 2006 13:12:24 +0100 Original-Received: from wilde by kenny.sha-bang.de with local (Kenny MUA v.0409034.42) ID 1F2SSo-0007dP-8a for emacs-devel@gnu.org; Fri, 27 Jan 2006 13:12:26 +0100 Original-To: emacs-devel@gnu.org User-Agent: Gnus/5.11 (Gnus v5.11) Emacs/22.0.50 (gnu/linux) X-BeenThere: emacs-devel@gnu.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "Emacs development discussions." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Original-Sender: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Errors-To: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Xref: news.gmane.org gmane.emacs.devel:49613 Archived-At: --=-=-= 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. --=-=-= Content-Type: text/x-patch Content-Disposition: inline; filename=vc-rcs.patch Content-Description: cv-rcs 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. --=-=-= Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Content-Disposition: inline _______________________________________________ Emacs-devel mailing list Emacs-devel@gnu.org http://lists.gnu.org/mailman/listinfo/emacs-devel --=-=-=--