From 8a4438b672731fe8fd434a85878ab7731052803b Mon Sep 17 00:00:00 2001 From: Michael Albinus Date: Sun, 9 Sep 2007 08:31:27 +0000 Subject: * net/tramp.el (top): Remove declarations of `tramp-gw-*' symbols, they are useless with the byte compiler. (tramp-make-temp-file, tramp-make-tramp-temp-file): Move up. (tramp-do-copy-or-rename-file-directly): Rearrange let-bindings. (tramp-compute-multi-hops): Mask `tramp-gw-*' symbols. (tramp-file-name-real-host, tramp-file-name-port) (tramp-find-method, tramp-find-user, tramp-find-host): Make them defuns. * net/tramp-cache.el (top): Improve error message when `tramp-persistency-file-name' is corrupted. --- lisp/net/tramp-cache.el | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'lisp/net/tramp-cache.el') diff --git a/lisp/net/tramp-cache.el b/lisp/net/tramp-cache.el index db08fe3b6df..894cf56d3e2 100644 --- a/lisp/net/tramp-cache.el +++ b/lisp/net/tramp-cache.el @@ -291,7 +291,8 @@ history." res)) ;; Read persistent connection history. -(when (zerop (hash-table-count tramp-cache-data)) +(when (and (stringp tramp-persistency-file-name) + (zerop (hash-table-count tramp-cache-data))) (condition-case err (with-temp-buffer (insert-file-contents tramp-persistency-file-name) @@ -306,7 +307,8 @@ history." (clrhash tramp-cache-data)) (error ;; File is corrupted. - (message "%s" (error-message-string err)) + (message "Tramp persistency file '%s' is corrupted: %s" + tramp-persistency-file-name (error-message-string err)) (clrhash tramp-cache-data)))) (provide 'tramp-cache) -- cgit v1.2.1