[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] emacs/lisp ChangeLog vc-hooks.el
From: |
Stefan Monnier |
Subject: |
[Emacs-diffs] emacs/lisp ChangeLog vc-hooks.el |
Date: |
Sat, 22 Nov 2008 05:23:45 +0000 |
CVSROOT: /sources/emacs
Module name: emacs
Changes by: Stefan Monnier <monnier> 08/11/22 05:23:44
Modified files:
lisp : ChangeLog vc-hooks.el
Log message:
(vc-follow-link, vc-find-file-hook):
Use buffer-file-truename to handle symlinks in any part of the filename.
CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/emacs/lisp/ChangeLog?cvsroot=emacs&r1=1.14827&r2=1.14828
http://cvs.savannah.gnu.org/viewcvs/emacs/lisp/vc-hooks.el?cvsroot=emacs&r1=1.271&r2=1.272
Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/emacs/emacs/lisp/ChangeLog,v
retrieving revision 1.14827
retrieving revision 1.14828
diff -u -b -r1.14827 -r1.14828
--- ChangeLog 22 Nov 2008 03:34:55 -0000 1.14827
+++ ChangeLog 22 Nov 2008 05:23:42 -0000 1.14828
@@ -1,3 +1,8 @@
+2008-11-22 Stefan Monnier <address@hidden>
+
+ * vc-hooks.el (vc-follow-link, vc-find-file-hook):
+ Use buffer-file-truename to handle symlinks in any part of the filename.
+
2008-11-22 Glenn Morris <address@hidden>
* vc-mtn.el (vc-mtn-diff-switches): New option.
Index: vc-hooks.el
===================================================================
RCS file: /sources/emacs/emacs/lisp/vc-hooks.el,v
retrieving revision 1.271
retrieving revision 1.272
diff -u -b -r1.271 -r1.272
--- vc-hooks.el 29 Oct 2008 02:55:04 -0000 1.271
+++ vc-hooks.el 22 Nov 2008 05:23:44 -0000 1.272
@@ -850,8 +850,7 @@
"If current buffer visits a symbolic link, visit the real file.
If the real file is already visited in another buffer, make that buffer
current, and kill the buffer that visits the link."
- (let* ((truename (abbreviate-file-name (file-chase-links buffer-file-name)))
- (true-buffer (find-buffer-visiting truename))
+ (let* ((true-buffer (find-buffer-visiting buffer-file-truename))
(this-buffer (current-buffer)))
(if (eq true-buffer this-buffer)
(progn
@@ -885,8 +884,8 @@
(set (make-local-variable 'backup-inhibited) t))
;; Let the backend setup any buffer-local things he needs.
(vc-call-backend (vc-backend buffer-file-name) 'find-file-hook))
- ((let ((link-type (and (file-symlink-p buffer-file-name)
- (vc-backend (file-chase-links buffer-file-name)))))
+ ((let ((link-type (and (not (equal buffer-file-name buffer-file-truename))
+ (vc-backend buffer-file-truename))))
(cond ((not link-type) nil) ;Nothing to do.
((eq vc-follow-symlinks nil)
(message
- [Emacs-diffs] emacs/lisp ChangeLog vc-hooks.el,
Stefan Monnier <=