(report-emacs-bug): Remove the last number of `emacs-version', use the

topic prefix ``version; ''.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 974b1a62f631d6e7d6d5a8ed11518f5f873c3468..b169be42fb110d9d52130a4908df43f599d41074 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2007-08-17  Micha\e,Ak\e(Bl Cadilhac  <michael@cadilhac.name>
+
+       * mail/emacsbug.el (report-emacs-bug): Remove the last number of
+       `emacs-version', use the topic prefix ``version; ''.
+
 2007-08-17  T. V. Raman  <raman@users.sf.net>  (tiny change)
 
        * completion.el (symbol-under-point, symbol-before-point)

diff --git a/lisp/mail/emacsbug.el b/lisp/mail/emacsbug.el
index 8a11dc90cc43ccf739e64a100ce47ce2e5c5dde0..89ac6dea0bb7180c655d7847791124e2e1e0e023 100644 (file)
--- a/lisp/mail/emacsbug.el
+++ b/lisp/mail/emacsbug.el
@@ -75,7 +75,8 @@ Prompts for bug subject.  Leaves you in a mail buffer."
   (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))
+  (when (string-match "^\\(\\([.0-9]+\\)*\\)\\.[0-9]+$" emacs-version)
+    (setq topic (concat (match-string 1 emacs-version) "; " topic)))
   ;; If there are four numbers in emacs-version, this is a pretest
   ;; version.
   (let* ((pretest-p (string-match "\\..*\\..*\\." emacs-version))