* vc-hooks.el (vc-file-clearprops): Check, that FILE is a string.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 3a1b8ade9c8bd1aeb2b523868496ad5110cac477..1ab3018a9948220c45db94334f2529e0dbe59c04 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,7 @@
+2008-09-29  Michael Albinus  <michael.albinus@gmx.de>
+
+       * vc-hooks.el (vc-file-clearprops): Check, that FILE is a string.
+
 2008-09-29  Eli Zaretskii  <eliz@gnu.org>
 
        * files.el (locate-dominating-file): Take file-attributes of
@@ -9,7 +13,7 @@
        also be `localname'.
 
        * net/ange-ftp.el (ange-ftp-file-remote-p): Handle `localname' as
-       identification.
+       IDENTIFICATION.
 
 2008-09-28  Glenn Morris  <rgm@gnu.org>
 

diff --git a/lisp/vc-hooks.el b/lisp/vc-hooks.el
index 8d17eeac6998c5b5070c3b0f1ff634e1ccfa3bb2..78814726365db27835e3e600a6d626b72e59bdca 100644 (file)
--- a/lisp/vc-hooks.el
+++ b/lisp/vc-hooks.el
@@ -238,7 +238,10 @@ VC commands are globally reachable under the prefix `\\[vc-prefix-map]':
 
 (defun vc-file-clearprops (file)
   "Clear all VC properties of FILE."
-  (setplist (intern file vc-file-prop-obarray) nil))
+  ;; 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)))
 
 \f
 ;; We keep properties on each symbol naming a backend as follows: