(report-emacs-bug-hook): Remove submitter

directions as the last action.

2 files changed, 22 insertions, 9 deletions

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 04bc4b93bc1..23872fea6b2 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2002-03-21  Thien-Thi Nguyen  <ttn@gnu.org>
+
+        * mail/emacsbug.el (report-emacs-bug-hook): Remove submitter
+        directions as the last action.
+
 2002-03-21  Pavel Jan,Bm(Bk  <Pavel@Janik.cz>
 
         * startup.el (fancy-splash-tail, normal-splash-screen): Update
@@ -18,30 +23,30 @@
         warning free compile.
 
 2002-03-20  Michael Kifer  <kifer@cs.stonybrook.edu>
-        
+
         * ediff-diff.el (ediff-install-fine-diff-if-necessary): take
         the current highlighting style into account.
         (ediff-forward-word-function,ediff-whitespace,ediff-word-1,
         ediff-word-2,ediff-word-3,ediff-word-4): make them buffer local.
-        
+
         * ediff-init.el (ediff-patch-job): new macro.
-        
+
         * ediff-mult.el (ediff-make-new-meta-list-header): new API function.
         (ediff-intersect-directories): use ediff-make-new-meta-list-header.
-        
+
         * ediff-ptch.el (ediff-map-patch-buffer): use
         ediff-make-new-meta-list-header.
         (ediff-fixup-patch-map): use the meta-list API from ediff-mult.el.
-        
+
         * ediff-util.el (ediff-toggle-hilit): fix toggling of highliting.
         (ediff-select-difference): take highlighting style into account.
         (ediff-clone-buffer-for-region-comparison): new function.
         (ediff-inferior-compare-regions): added comparison of current diff
         regions.
-        
+
         * ediff.el (ediff-clone-buffer-for-region-comparison,
         ediff-clone-buffer-for-window-comparison): moved to ediff-util.el.
-        
+
 2002-03-19  pmr-sav  <pmr-sav@hamm.pajato.com>
 
         * mail-utils.el (rmail-dont-reply-to):
diff --git a/lisp/mail/emacsbug.el b/lisp/mail/emacsbug.el
index 8da08494add..c1cbc7b98e8 100644
--- a/lisp/mail/emacsbug.el
+++ b/lisp/mail/emacsbug.el
@@ -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)