procyberian/emacs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix use of buffer-file-truename in vc-find-file-hook (tiny change).

Browse source 
* lisp/vc/vc-hooks.el (vc-find-file-hook): Expand buffer-file-truename
before using it for comparison.

Fixes: debbugs:5297
This commit is contained in:
Yuya Nishihara 2012-12-01 21:25:13 +08:00 • committed by Chong Yidong
parent ae067123d3
commit cb5d51dc07
2 changed files with 8 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
lisp/ChangeLog
View file

@ -1,3 +1,8 @@
2012-12-01 Yuya Nishihara <yuya@tcha.org> (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 <jari.aalto@cante.net>
* textmodes/css-mode.el (css-current-defun-name): New function.

5
lisp/vc/vc-hooks.el
View file

@ -858,8 +858,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