(report-emacs-bug): Make MS-DOS a special case (there's no build number).

2 files changed, 12 insertions, 6 deletions

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 838aa3709f5..c9452fde9db 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -7,7 +7,8 @@
 2007-08-17  Micha,Ak(Bl Cadilhac  <michael@cadilhac.name>
 
         * mail/emacsbug.el (report-emacs-bug): Remove the last number of
-        `emacs-version', use the topic prefix ``version; ''.
+        `emacs-version', use the topic prefix ``version; ''.  Make MS-DOS
+        a special case (there's no build number).
 
 2007-08-17  T. V. Raman  <raman@users.sf.net>  (tiny change)
 
diff --git a/lisp/mail/emacsbug.el b/lisp/mail/emacsbug.el
index 89ac6dea0bb..70c976a154d 100644
--- a/lisp/mail/emacsbug.el
+++ b/lisp/mail/emacsbug.el
@@ -75,11 +75,16 @@ 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.
-  (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))
+  (if (eq system-type 'ms-dos)
+      (setq topic (concat 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 (three for MS-DOS),
+  ;; this is a pretest version.
+  (let* ((pretest-p (string-match (if (eq system-type 'ms-dos)
+                                      "\\..*\\."
+                                    "\\..*\\..*\\.")
+                                  emacs-version))
          (from-buffer (current-buffer))
          (reporting-address (if pretest-p
                                 report-emacs-bug-pretest-address