Minor improvements in Tramp error reporting

* lisp/net/tramp-cmds.el (tramp-bug):
Handle `tramp-suppress-trace' property.
(tramp-reporter-dump-variable): Improve variable dump.

* lisp/net/tramp.el (tramp--startup-hook, tramp-password-save-function):
Add `tramp-suppress-trace' property.

diff --git a/lisp/net/tramp-cmds.el b/lisp/net/tramp-cmds.el
index 52cc186ecf72ba2492d28bf68ca775342f437a0b..827d5f60a2b0176e5518b2852663ca6d64c0bb6d 100644 (file)
--- a/lisp/net/tramp-cmds.el
+++ b/lisp/net/tramp-cmds.el
@@ -482,9 +482,7 @@ For details, see `tramp-rename-files'."
 (defun tramp-bug ()
   "Submit a bug report to the Tramp developers."
   (interactive)
-  (let ((reporter-prompt-for-summary-p t)
-       ;; In rare cases, it could contain the password.  So we make it nil.
-       tramp-password-save-function)
+  (let ((reporter-prompt-for-summary-p t))
     (reporter-submit-bug-report
      tramp-bug-report-address    ; to-address
      (format "tramp (%s %s/%s)" ; package name and version
@@ -492,10 +490,11 @@ For details, see `tramp-rename-files'."
      (sort
       (delq nil (mapcar
        (lambda (x)
-         (and x (boundp x) (cons x 'tramp-reporter-dump-variable)))
+         (and x (boundp x) (not (get x 'tramp-suppress-trace))
+              (cons x 'tramp-reporter-dump-variable)))
        (append
         (mapcar #'intern (all-completions "tramp-" obarray #'boundp))
-        ;; Non-tramp variables of interest.
+        ;; Non-Tramp variables of interest.
         '(shell-prompt-pattern
           backup-by-copying
           backup-by-copying-when-linked
@@ -552,11 +551,11 @@ buffer in your bug report.
                 (string-match-p
                  (concat "[^" (bound-and-true-p mm-7bit-chars) "]") val))
        (with-current-buffer reporter-eval-buffer
-         (set
-          varsym
-          (format
-           "(decode-coding-string (base64-decode-string \"%s\") 'raw-text)"
-           (base64-encode-string (encode-coding-string val 'raw-text)))))))
+         (set varsym
+              `(decode-coding-string
+                (base64-decode-string
+                 ,(base64-encode-string (encode-coding-string val 'raw-text)))
+                'raw-text)))))
 
     ;; Dump variable.
     (reporter-dump-variable varsym mailbuf)

diff --git a/lisp/net/tramp.el b/lisp/net/tramp.el
index 28067faba30a81e7956f56f6cb63274e098d73c5..96446399dd624f5e75d826dcf59114cc23f63175 100644 (file)
--- a/lisp/net/tramp.el
+++ b/lisp/net/tramp.el
@@ -80,6 +80,7 @@
 (eval-and-compile ;; So it's also available in tramp-loaddefs.el!
   (defvar tramp--startup-hook nil
     "Forms to be executed at the end of tramp.el.")
+  (put 'tramp--startup-hook 'tramp-suppress-trace t)
 
   (defmacro tramp--with-startup (&rest body)
     "Schedule BODY to be executed at the end of tramp.el."
@@ -1241,6 +1242,7 @@ the (optional) timestamp of last activity on this connection.")
   "Password save function.
 Will be called once the password has been verified by successful
 authentication.")
+(put 'tramp-password-save-function 'tramp-suppress-trace t)
 
 (defconst tramp-completion-file-name-handler-alist
   '((file-name-all-completions