Fix handling of `tramp-cache-{g,s}et-count-*'

* lisp/net/tramp-cache.el (tramp-get-file-property)
(tramp-set-file-property): Fix handling of `tramp-cache-{g,s}et-count-*'.

diff --git a/lisp/net/tramp-cache.el b/lisp/net/tramp-cache.el
index ad8310c5ea52d030e8ee19f2b471f44964aaf817..c79a3a02a3d1fc3604f32b918b652182753448b8 100644 (file)
--- a/lisp/net/tramp-cache.el
+++ b/lisp/net/tramp-cache.el
@@ -164,7 +164,8 @@ Return DEFAULT if not set."
      file property value remote-file-name-inhibit-cache cache-used cached-at)
     (when (>= tramp-verbose 10)
       (let* ((var (intern (concat "tramp-cache-get-count-" property)))
-            (val (or (numberp (and (boundp var) (symbol-value var)))
+            (val (or (and (boundp var) (numberp (symbol-value var))
+                          (symbol-value var))
                      (progn
                        (add-hook 'tramp-cache-unload-hook
                                  (lambda () (makunbound var)))
@@ -188,7 +189,8 @@ Return VALUE."
     (tramp-message key 8 "%s %s %s" file property value)
     (when (>= tramp-verbose 10)
       (let* ((var (intern (concat "tramp-cache-set-count-" property)))
-            (val (or (numberp (and (boundp var) (symbol-value var)))
+            (val (or (and (boundp var) (numberp (symbol-value var))
+                          (symbol-value var))
                      (progn
                        (add-hook 'tramp-cache-unload-hook
                                  (lambda () (makunbound var)))