From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: Yuya Nishihara Newsgroups: gmane.emacs.bugs Subject: bug#5297: [PATCH] vc: fixed test of symlinks on abbreviatable path Date: Sun, 3 Jan 2010 23:05:06 +0900 Message-ID: <201001032305.07014.yuya@tcha.org> References: <201001031533.43703.yuya@tcha.org> Reply-To: Yuya Nishihara , 5297@debbugs.gnu.org NNTP-Posting-Host: lo.gmane.org Mime-Version: 1.0 Content-Type: Text/Plain; charset="iso-8859-1" Content-Transfer-Encoding: 7bit X-Trace: ger.gmane.org 1262701556 22605 80.91.229.12 (5 Jan 2010 14:25:56 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Tue, 5 Jan 2010 14:25:56 +0000 (UTC) Cc: Yuya Nishihara To: 5297@debbugs.gnu.org Original-X-From: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane.org@gnu.org Tue Jan 05 15:25:46 2010 Return-path: Envelope-to: geb-bug-gnu-emacs@m.gmane.org Original-Received: from terminus-est.gnu.org ([66.92.78.210] helo=lists.gnu.org) by lo.gmane.org with esmtp (Exim 4.50) id 1NSAJa-0006ER-DZ for geb-bug-gnu-emacs@m.gmane.org; Tue, 05 Jan 2010 15:23:19 +0100 Original-Received: from localhost ([127.0.0.1]:53571 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1NSAJY-000446-VE for geb-bug-gnu-emacs@m.gmane.org; Tue, 05 Jan 2010 09:23:16 -0500 Original-Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1NSAJT-00041t-H6 for bug-gnu-emacs@gnu.org; Tue, 05 Jan 2010 09:23:11 -0500 Original-Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1NSAJM-0003t2-Nd for bug-gnu-emacs@gnu.org; Tue, 05 Jan 2010 09:23:11 -0500 Original-Received: from [199.232.76.173] (port=45134 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1NSAJM-0003st-HJ for bug-gnu-emacs@gnu.org; Tue, 05 Jan 2010 09:23:04 -0500 Original-Received: from debbugs.gnu.org ([140.186.70.43]:53621) by monty-python.gnu.org with esmtps (TLS-1.0:RSA_AES_256_CBC_SHA1:32) (Exim 4.60) (envelope-from ) id 1NSAJK-0001eC-3R for bug-gnu-emacs@gnu.org; Tue, 05 Jan 2010 09:23:04 -0500 Original-Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.69) (envelope-from ) id 1NSA5v-0003jr-HC; Tue, 05 Jan 2010 09:09:11 -0500 X-Loop: bug-gnu-emacs@gnu.org Mail-Followup-To: Yuya Nishihara , 5297@debbugs.gnu.org Resent-From: Yuya Nishihara Original-Sender: debbugs-submit-bounces@debbugs.gnu.org Resent-To: owner@debbugs.gnu.org Resent-CC: bug-gnu-emacs@gnu.org Resent-Date: Tue, 05 Jan 2010 14:09:11 +0000 Resent-Message-ID: Resent-Sender: bug-gnu-emacs@gnu.org X-Emacs-PR-Message: followup 5297 X-Emacs-PR-Package: emacs X-Emacs-PR-Keywords: Original-Received: via spool by 5297-submit@debbugs.gnu.org id=B5297.126270051414171 (code B ref 5297); Tue, 05 Jan 2010 14:09:11 +0000 Original-Received: (at 5297) by debbugs.gnu.org; 5 Jan 2010 14:08:34 +0000 Original-Received: from localhost ([127.0.0.1] helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.69) (envelope-from ) id 1NSA5E-0003gR-M8 for submit@debbugs.gnu.org; Tue, 05 Jan 2010 09:08:30 -0500 Original-Received: from mx61.ms.so-net.ne.jp ([202.238.83.161]) by debbugs.gnu.org with esmtp (Exim 4.69) (envelope-from ) id 1NRR5t-0006wE-11 for 5297@debbugs.gnu.org; Sun, 03 Jan 2010 09:06:11 -0500 Original-Received: from gimlet.localnet (stnet.adsl.027243.netwave.or.jp [202.67.27.243]) (authenticated) by mx61.ms.so-net.ne.jp with ESMTP id o03E5xjt018064 (using TLSv1/SSLv3 with cipher DHE-RSA-AES256-SHA (256 bits)); Sun, 3 Jan 2010 23:06:00 +0900 (JST) User-Agent: KMail/1.12.4 (Linux/2.6.32-trunk-amd64; KDE/4.3.4; x86_64; ; ) In-Reply-To: <201001031533.43703.yuya@tcha.org> X-Spam-Score: -4.3 (----) X-Mailman-Approved-At: Tue, 05 Jan 2010 09:08:26 -0500 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.11 Precedence: list X-Spam-Score: -3.4 (---) Resent-Date: Tue, 05 Jan 2010 09:09:11 -0500 X-detected-operating-system: by monty-python.gnu.org: GNU/Linux 2.6 (newer, 3) X-BeenThere: bug-gnu-emacs@gnu.org List-Id: "Bug reports for GNU Emacs, the Swiss army knife of text editors" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Original-Sender: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane.org@gnu.org Errors-To: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane.org@gnu.org Xref: news.gmane.org gmane.emacs.bugs:33942 Archived-At: commit 51431c222c24bbe2919d3d98032f73723ebfccea Author: Yuya Nishihara Date: Sun Jan 3 14:12:56 2010 +0900 vc: fixed test of symlinks on abbreviatable path buffer-file-truename is *abbreviated* truename, but buffer-file-name seems not, so we need to expand it. With abbreviated file-name, at least, vc-git and vc-hg are not detected as backend. This means symlinks to git/hg-managed files on HOME directory are not handled by vc-find-file-hook. diff --git a/lisp/vc-hooks.el b/lisp/vc-hooks.el index fabb35f..238fafe 100644 --- a/lisp/vc-hooks.el +++ b/lisp/vc-hooks.el @@ -890,8 +890,9 @@ current, and kill the buffer that visits the link." (set (make-local-variable 'backup-inhibited) t)) ;; Let the backend setup any buffer-local things he needs. (vc-call-backend backend 'find-file-hook)) - ((let ((link-type (and (not (equal buffer-file-name buffer-file-truename)) - (vc-backend buffer-file-truename)))) + ((let* ((truename (expand-file-name buffer-file-truename)) + (link-type (and (not (equal buffer-file-name truename)) + (vc-backend truename)))) (cond ((not link-type) nil) ;Nothing to do. ((eq vc-follow-symlinks nil) (message