* vc/vc-hooks.el (vc-find-file-hook): `buffer-file-truename' can

be nil.  Handle this.  (Bug#13636)

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index a0e88362c4b94c75a16821874b3c5b4d43b95bbf..4211901d64f9c684c097fbfe02badd43f78e94b6 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2013-02-07  Michael Albinus  <michael.albinus@gmx.de>
+
+       * vc/vc-hooks.el (vc-find-file-hook): `buffer-file-truename' can
+       be nil.  Handle this.  (Bug#13636)
+
 2013-02-07  Richard Stallman  <rms@gnu.org>
 
        * mail/rmail.el (rmail-variables): Specify `no-conversion' for

diff --git a/lisp/vc/vc-hooks.el b/lisp/vc/vc-hooks.el
index 818b37b3c3430c5fe3f602b43cbc804ed7ec20b2..5c8a4515b7ea5e9b2cacbbb90bd47153299c78ca 100644 (file)
--- 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."
          (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* ((truename (expand-file-name buffer-file-truename))
-              (link-type (and (not (equal buffer-file-name truename))
+       ((let* ((truename (and buffer-file-truename
+                             (expand-file-name buffer-file-truename)))
+              (link-type (and truename
+                              (not (equal buffer-file-name truename))
                               (vc-backend truename))))
          (cond ((not link-type) nil)   ;Nothing to do.
                ((eq vc-follow-symlinks nil)