Stylistic changes in tramp-cache.el

* test/lisp/net/tramp-cache.el (tramp-get-file-property)
(tramp-set-file-property): Use `bound-and-true-p'.  Add
counter variables to `tramp-cache-unload-hook'.

diff --git a/lisp/net/tramp-cache.el b/lisp/net/tramp-cache.el
index 7227c9bf7cc9efeafa5bc62cdb2e0fe58d1c859d..a162ab00a561c86cedf933f5d48f2070f1115496 100644 (file)
--- a/lisp/net/tramp-cache.el
+++ b/lisp/net/tramp-cache.el
@@ -136,9 +136,9 @@ Returns DEFAULT if not set."
     (tramp-message key 8 "%s %s %s" file property value)
     (when (>= tramp-verbose 10)
       (let* ((var (intern (concat "tramp-cache-get-count-" property)))
-            (val (or (and (boundp var) (symbol-value var))
+            (val (or (bound-and-true-p var)
                      (progn
-                       (add-hook 'tramp-unload-hook
+                       (add-hook 'tramp-cache-unload-hook
                                  (lambda () (makunbound var)))
                        0))))
        (set var (1+ val))))
@@ -160,9 +160,9 @@ Returns 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 (and (boundp var) (symbol-value var))
+            (val (or (bound-and-true-p var)
                      (progn
-                       (add-hook 'tramp-unload-hook
+                       (add-hook 'tramp-cache-unload-hook
                                  (lambda () (makunbound var)))
                        0))))
        (set var (1+ val))))