(smtpmail-queue-counter): New variable.

[gnu-emacs] / lisp / mail / emacsbug.el

diff --git a/lisp/mail/emacsbug.el b/lisp/mail/emacsbug.el
index ccccdddea586bd52aeef6df94d1b99a78b8c2f1b..c1cbc7b98e8ac36e213090422e51a444d9150f7a 100644 (file)
--- a/lisp/mail/emacsbug.el
+++ b/lisp/mail/emacsbug.el
@@ -77,7 +77,7 @@ Prompts for bug subject.  Leaves you in a mail buffer."
   (let ((pretest-p (string-match "\\..*\\..*\\." emacs-version))
        user-point message-end-point)
     (setq message-end-point
-         (with-current-buffer (get-buffer "*Messages*")
+         (with-current-buffer (get-buffer-create "*Messages*")
            (point-max-marker)))
     (compose-mail (if pretest-p
                      report-emacs-bug-pretest-address
@@ -128,7 +128,7 @@ translators to read other languages for them.\n\n")
                    default-enable-multibyte-characters))
     (insert "\n")
     (insert "Please describe exactly what actions triggered the bug\n"
-           "and the precise symptoms of the bug:\n\n") 
+           "and the precise symptoms of the bug:\n\n")
     (setq user-point (point))
     (insert "\n\n\n"
            "Recent input:\n")
@@ -236,7 +236,15 @@ If you want to mail it to someone else instead,
 please insert the proper e-mail address after \"To: \",
 and send the mail again using \\[mail-send-and-exit].")))
       (error "M-x report-emacs-bug was cancelled, please read *Bug Help* buffer"))
-    ))
+
+    ;; Unclutter
+    (mail-text)
+    (let ((p (point)))
+      (re-search-forward (concat "^In " (emacs-version)))
+      (delete-region p (match-beginning 0)))
+    (re-search-forward "Please describe.+\n.+precise symptoms.+bug:\n*"
+                       (point-max) t)
+    (replace-match "Symptoms:\n")))
 
 (provide 'emacsbug)