Merge changes made in Gnus trunk.

gnus-msg.el (gnus-bug): Don't insert user variables.  It usually isn't very interesting any more, and it leaks potentially secret data.
 (gnus-debug): Removed.
gnus-art.el (gnus-ignored-headers): Removed obsolete and non-working use of :custom-show.

3 files changed, 12 insertions, 73 deletions

diff --git a/lisp/gnus/ChangeLog b/lisp/gnus/ChangeLog
index f8f52417ac2..8b6d00e8e1d 100644
--- a/lisp/gnus/ChangeLog
+++ b/lisp/gnus/ChangeLog
@@ -1,3 +1,12 @@
+2011-07-07  Lars Magne Ingebrigtsen  <larsi@gnus.org>
+
+        * gnus-msg.el (gnus-bug): Don't insert user variables.  It usually
+        isn't very interesting any more, and it leaks potentially secret data.
+        (gnus-debug): Removed.
+
+        * gnus-art.el (gnus-ignored-headers): Removed obsolete and non-working
+        use of :custom-show.
+
 2011-07-07  Daiki Ueno  <ueno@unixuser.org>
 
         * plstore.el: Add documentation.
diff --git a/lisp/gnus/gnus-art.el b/lisp/gnus/gnus-art.el
index 7e2d213d20c..7255be416eb 100644
--- a/lisp/gnus/gnus-art.el
+++ b/lisp/gnus/gnus-art.el
@@ -163,8 +163,7 @@
   "*All headers that start with this regexp will be hidden.
 This variable can also be a list of regexps of headers to be ignored.
 If `gnus-visible-headers' is non-nil, this variable will be ignored."
-  :type '(choice :custom-show nil
-                 regexp
+  :type '(choice regexp
                  (repeat regexp))
   :group 'gnus-article-hiding)
 
diff --git a/lisp/gnus/gnus-msg.el b/lisp/gnus/gnus-msg.el
index bad474b4057..9d3ec25c03a 100644
--- a/lisp/gnus/gnus-msg.el
+++ b/lisp/gnus/gnus-msg.el
@@ -1464,26 +1464,13 @@ If YANK is non-nil, include the original article."
     (when gnus-bug-create-help-buffer
       (push `(gnus-bug-kill-buffer) message-send-actions))
     (goto-char (point-min))
-    (re-search-forward (concat "^" (regexp-quote mail-header-separator) "$"))
-    (forward-line 1)
-    (insert (format "Package: %s\n" gnus-bug-package))
-    (insert (format "Version: %s\n" (gnus-continuum-version)))
-    (insert "\n")
+    (message-goto-body)
+    (insert "\n\n\n\n\n")
     (insert (gnus-version) "\n"
             (emacs-version) "\n")
     (when (and (boundp 'nntp-server-type)
                (stringp nntp-server-type))
       (insert nntp-server-type))
-    (insert "\n\n\n\n\n")
-    (let (text)
-      (with-current-buffer (gnus-get-buffer-create " *gnus environment info*")
-        (erase-buffer)
-        (gnus-debug)
-        (setq text (buffer-string)))
-      (insert "<#part type=application/emacs-lisp "
-              "disposition=inline description=\"User settings\">\n"
-              text
-              "\n<#/part>"))
     (goto-char (point-min))
     (search-forward "Subject: " nil t)
     (message "")))
@@ -1503,62 +1490,6 @@ If YANK is non-nil, include the original article."
     (with-current-buffer buffer
       (message-yank-buffer gnus-article-buffer))))
 
-(defun gnus-debug ()
-  "Attempts to go through the Gnus source file and report what variables have been changed.
-The source file has to be in the Emacs load path."
-  (interactive)
-  (let ((files gnus-debug-files)
-        (point (point))
-        file expr olist sym)
-    (gnus-message 4 "Please wait while we snoop your variables...")
-    (sit-for 0)
-    ;; Go through all the files looking for non-default values for variables.
-    (with-current-buffer (gnus-get-buffer-create " *gnus bug info*")
-      (while files
-        (erase-buffer)
-        (when (and (setq file (locate-library (pop files)))
-                   (file-exists-p file))
-          (insert-file-contents file)
-          (goto-char (point-min))
-          (if (not (re-search-forward "^;;* *Internal variables" nil t))
-              (gnus-message 4 "Malformed sources in file %s" file)
-            (narrow-to-region (point-min) (point))
-            (goto-char (point-min))
-            (while (setq expr (ignore-errors (read (current-buffer))))
-              (ignore-errors
-                (and (or (eq (car expr) 'defvar)
-                         (eq (car expr) 'defcustom))
-                     (stringp (nth 3 expr))
-                     (not (memq (nth 1 expr) gnus-debug-exclude-variables))
-                     (or (not (boundp (nth 1 expr)))
-                         (not (equal (eval (nth 2 expr))
-                                     (symbol-value (nth 1 expr)))))
-                     (push (nth 1 expr) olist)))))))
-      (kill-buffer (current-buffer)))
-    (when (setq olist (nreverse olist))
-      (insert "------------------ Environment follows ------------------\n\n"))
-    (while olist
-      (if (boundp (car olist))
-          (ignore-errors
-           (gnus-pp
-            `(setq ,(car olist)
-                   ,(if (or (consp (setq sym (symbol-value (car olist))))
-                            (and (symbolp sym)
-                                 (not (or (eq sym nil)
-                                          (eq sym t)))))
-                        (list 'quote (symbol-value (car olist)))
-                      (symbol-value (car olist))))))
-        (insert ";; (makeunbound '" (symbol-name (car olist)) ")\n"))
-      (setq olist (cdr olist)))
-    (insert "\n\n")
-    ;; Remove any control chars - they seem to cause trouble for some
-    ;; mailers.  (Byte-compiled output from the stuff above.)
-    (goto-char point)
-    (while (re-search-forward (mm-string-to-multibyte
-                               "[\000-\010\013-\037\200-\237]") nil t)
-      (replace-match (format "\\%03o" (string-to-char (match-string 0)))
-                     t t))))
-
 ;;; Treatment of rejected articles.
 ;;; Bounced mail.