From 613658d4b2f4b5a48dc5cb3340f17b3520cbe5e8 Mon Sep 17 00:00:00 2001 From: Michael Albinus Date: Mon, 29 Sep 2008 18:58:08 +0000 Subject: [PATCH] * vc-hooks.el (vc-file-clearprops): Check, that FILE is a string. --- lisp/ChangeLog | 6 +++++- lisp/vc-hooks.el | 5 ++++- 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 3a1b8ade9c8..1ab3018a994 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,7 @@ +2008-09-29 Michael Albinus + + * vc-hooks.el (vc-file-clearprops): Check, that FILE is a string. + 2008-09-29 Eli Zaretskii * 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 diff --git a/lisp/vc-hooks.el b/lisp/vc-hooks.el index 8d17eeac699..78814726365 100644 --- 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))) ;; We keep properties on each symbol naming a backend as follows: -- 2.39.5