[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] Changes to emacs/lisp/vc-hooks.el,v
From: |
Michael Albinus |
Subject: |
[Emacs-diffs] Changes to emacs/lisp/vc-hooks.el,v |
Date: |
Tue, 30 Sep 2008 19:11:07 +0000 |
CVSROOT: /sources/emacs
Module name: emacs
Changes by: Michael Albinus <albinus> 08/09/30 19:11:07
Index: vc-hooks.el
===================================================================
RCS file: /sources/emacs/emacs/lisp/vc-hooks.el,v
retrieving revision 1.266
retrieving revision 1.267
diff -u -b -r1.266 -r1.267
--- vc-hooks.el 29 Sep 2008 18:57:08 -0000 1.266
+++ vc-hooks.el 30 Sep 2008 19:11:07 -0000 1.267
@@ -238,10 +238,7 @@
(defun vc-file-clearprops (file)
"Clear all VC properties of FILE."
- ;; Sometimes, Tramp runs into trouble, FILE is nil then. We shall
- ;; avoid an error in this case.
- (when (stringp file)
- (setplist (intern file vc-file-prop-obarray) nil)))
+ (setplist (intern file vc-file-prop-obarray) nil))
;; We keep properties on each symbol naming a backend as follows:
@@ -943,9 +940,12 @@
Used in `find-file-not-found-functions'."
;; When a file does not exist, ignore cached info about it
;; from a previous visit.
+ ;; We check that `buffer-file-name' is non-nil. It should be always
+ ;; the case, but in conjunction with Tramp, it might be nil. M. Albinus.
+ (when buffer-file-name
(vc-file-clearprops buffer-file-name)
(let ((backend (vc-backend buffer-file-name)))
- (when backend (vc-call-backend backend 'find-file-not-found-hook))))
+ (when backend (vc-call-backend backend 'find-file-not-found-hook)))))
(defun vc-default-find-file-not-found-hook (backend)
;; This used to do what vc-rcs-find-file-not-found-hook does, but it only