emacs-diffs
[Top][All Lists]
Advanced

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

[Emacs-diffs] /srv/bzr/emacs/trunk r111057: Fix use of buffer-file-truen


From: Chong Yidong
Subject: [Emacs-diffs] /srv/bzr/emacs/trunk r111057: Fix use of buffer-file-truename in vc-find-file-hook (tiny change).
Date: Sat, 01 Dec 2012 21:25:13 +0800
User-agent: Bazaar (2.5.0)

------------------------------------------------------------
revno: 111057
fixes bug: http://debbugs.gnu.org/5297
author: Yuya Nishihara <address@hidden>
committer: Chong Yidong <address@hidden>
branch nick: trunk
timestamp: Sat 2012-12-01 21:25:13 +0800
message:
  Fix use of buffer-file-truename in vc-find-file-hook (tiny change).
  
  * lisp/vc/vc-hooks.el (vc-find-file-hook): Expand buffer-file-truename
  before using it for comparison.
modified:
  lisp/ChangeLog
  lisp/vc/vc-hooks.el
=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog    2012-12-01 05:51:33 +0000
+++ b/lisp/ChangeLog    2012-12-01 13:25:13 +0000
@@ -1,3 +1,8 @@
+2012-12-01  Yuya Nishihara  <address@hidden>  (tiny change)
+
+       * vc/vc-hooks.el (vc-find-file-hook): Expand buffer-file-truename
+       before using it for comparison (Bug#5297).
+
 2012-12-01  Jari Aalto  <address@hidden>
 
        * textmodes/css-mode.el (css-current-defun-name): New function.

=== modified file 'lisp/vc/vc-hooks.el'
--- a/lisp/vc/vc-hooks.el       2012-11-26 23:50:12 +0000
+++ b/lisp/vc/vc-hooks.el       2012-12-01 13:25:13 +0000
@@ -858,8 +858,9 @@
          (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


reply via email to

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