aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael Albinus2013-02-07 09:50:04 +0100
committerMichael Albinus2013-02-07 09:50:04 +0100
commitfed000725c6fc60e3919209779d60ec3adf5cb10 (patch)
tree58eb3156f83e5751d7f2316610ade9ec03ef145a
parent025875980c7fbde1d555bff245053241951e6909 (diff)
downloademacs-fed000725c6fc60e3919209779d60ec3adf5cb10.tar.gz
emacs-fed000725c6fc60e3919209779d60ec3adf5cb10.zip
* vc/vc-hooks.el (vc-find-file-hook): `buffer-file-truename' can
be nil. Handle this. (Bug#13636)
-rw-r--r--lisp/ChangeLog5
-rw-r--r--lisp/vc/vc-hooks.el6
2 files changed, 9 insertions, 2 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index a0e88362c4b..4211901d64f 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
12013-02-07 Michael Albinus <michael.albinus@gmx.de>
2
3 * vc/vc-hooks.el (vc-find-file-hook): `buffer-file-truename' can
4 be nil. Handle this. (Bug#13636)
5
12013-02-07 Richard Stallman <rms@gnu.org> 62013-02-07 Richard Stallman <rms@gnu.org>
2 7
3 * mail/rmail.el (rmail-variables): Specify `no-conversion' for 8 * mail/rmail.el (rmail-variables): Specify `no-conversion' for
diff --git a/lisp/vc/vc-hooks.el b/lisp/vc/vc-hooks.el
index 818b37b3c34..5c8a4515b7e 100644
--- a/lisp/vc/vc-hooks.el
+++ b/lisp/vc/vc-hooks.el
@@ -858,8 +858,10 @@ current, and kill the buffer that visits the link."
858 (set (make-local-variable 'backup-inhibited) t)) 858 (set (make-local-variable 'backup-inhibited) t))
859 ;; Let the backend setup any buffer-local things he needs. 859 ;; Let the backend setup any buffer-local things he needs.
860 (vc-call-backend backend 'find-file-hook)) 860 (vc-call-backend backend 'find-file-hook))
861 ((let* ((truename (expand-file-name buffer-file-truename)) 861 ((let* ((truename (and buffer-file-truename
862 (link-type (and (not (equal buffer-file-name truename)) 862 (expand-file-name buffer-file-truename)))
863 (link-type (and truename
864 (not (equal buffer-file-name truename))
863 (vc-backend truename)))) 865 (vc-backend truename))))
864 (cond ((not link-type) nil) ;Nothing to do. 866 (cond ((not link-type) nil) ;Nothing to do.
865 ((eq vc-follow-symlinks nil) 867 ((eq vc-follow-symlinks nil)