Make tramp unloading handle debug counter variables

* lisp/net/tramp-cache.el (tramp-get-file-property)
(tramp-set-file-property): Add counter variables to tramp-unload-hook.

diff --git a/lisp/net/tramp-cache.el b/lisp/net/tramp-cache.el
index ac5a9c45bbd5fb1aa845674644be742848a3e5bd..7227c9bf7cc9efeafa5bc62cdb2e0fe58d1c859d 100644 (file)
--- a/lisp/net/tramp-cache.el
+++ b/lisp/net/tramp-cache.el
@@ -136,7 +136,11 @@ 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)) 0)))
+            (val (or (and (boundp var) (symbol-value var))
+                     (progn
+                       (add-hook 'tramp-unload-hook
+                                 (lambda () (makunbound var)))
+                       0))))
        (set var (1+ val))))
     value))
 
@@ -156,7 +160,11 @@ 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)) 0)))
+            (val (or (and (boundp var) (symbol-value var))
+                     (progn
+                       (add-hook 'tramp-unload-hook
+                                 (lambda () (makunbound var)))
+                       0))))
        (set var (1+ val))))
     value))