(report-emacs-bug): Put `Bug: emacs-version; ' in the mail title.

Suggested by Reiner Steib.

2 files changed, 21 insertions, 13 deletions

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 5ec2a41c997..9b563da201a 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2007-08-15  Micha,Ak(Bl Cadilhac  <michael@cadilhac.name>
+
+        * mail/emacsbug.el (report-emacs-bug): Put `Bug: emacs-version; '
+        in the mail title.  Suggested by Reiner Steib.
+
 2007-08-14  Chris Hecker  <checker@d6.com> (tiny change)
 
         * calc/calc-aent.el (calc-do-quick-calc): Add binary
@@ -644,7 +649,7 @@
 2007-07-28  Masatake YAMATO  <jet@gyve.org>
 
         * vc.el (vc-dired-mode): Add a menu for VC related operation.
-        Use backend name as the menu label Suggested by David Kastrup.
+        Use backend name as the menu label.  Suggested by David Kastrup.
 
 2007-07-28  Alan Mackenzie  <acm@muc.de>
 
diff --git a/lisp/mail/emacsbug.el b/lisp/mail/emacsbug.el
index df5445da412..8a11dc90cc4 100644
--- a/lisp/mail/emacsbug.el
+++ b/lisp/mail/emacsbug.el
@@ -73,18 +73,21 @@ Prompts for bug subject.  Leaves you in a mail buffer."
   ;; This strange form ensures that (recent-keys) is the value before
   ;; the bug subject string is read.
   (interactive (reverse (list (recent-keys) (read-string "Bug Subject: "))))
+  ;; The syntax `version;' is preferred to `[version]' because the
+  ;; latter could be mistakenly stripped by mailing software.
+  (setq topic (concat "Bug: " emacs-version "; " topic))
   ;; If there are four numbers in emacs-version, this is a pretest
   ;; version.
   (let* ((pretest-p (string-match "\\..*\\..*\\." emacs-version))
-        (from-buffer (current-buffer))
-        (reporting-address (if pretest-p
-                               report-emacs-bug-pretest-address
-                             report-emacs-bug-address))
-        ;; Put these properties on semantically-void text.
-        (prompt-properties '(field emacsbug-prompt
-                                   intangible but-helpful
-                                   rear-nonsticky t))
-        user-point message-end-point)
+         (from-buffer (current-buffer))
+         (reporting-address (if pretest-p
+                                report-emacs-bug-pretest-address
+                              report-emacs-bug-address))
+         ;; Put these properties on semantically-void text.
+         (prompt-properties '(field emacsbug-prompt
+                                    intangible but-helpful
+                                    rear-nonsticky t))
+         user-point message-end-point)
     (setq message-end-point
           (with-current-buffer (get-buffer-create "*Messages*")
             (point-max-marker)))
@@ -106,7 +109,7 @@ Prompts for bug subject.  Leaves you in a mail buffer."
         (let ((pos (point)))
           (insert "not to your local site managers!")
           (put-text-property pos (point) 'face 'highlight)))
-        (insert "\nPlease write in ")
+      (insert "\nPlease write in ")
       (let ((pos (point)))
         (insert "English")
         (put-text-property pos (point) 'face 'highlight))
@@ -132,8 +135,8 @@ usually do not have translators to read other languages for them.\n\n")
 
     (let ((debug-file (expand-file-name "DEBUG" data-directory)))
       (if (file-readable-p debug-file)
-        (insert "If you would like to further debug the crash, please read the file\n"
-                debug-file " for instructions.\n")))
+          (insert "If you would like to further debug the crash, please read the file\n"
+                  debug-file " for instructions.\n")))
     (add-text-properties (1+ user-point) (point) prompt-properties)
 
     (insert "\n\nIn " (emacs-version) "\n")