(binhex): New custom group.

[bpt/emacs.git] / lisp / mail / emacsbug.el

diff --git a/lisp/mail/emacsbug.el b/lisp/mail/emacsbug.el
index 8a11dc9..dab87e0 100644 (file)
--- a/lisp/mail/emacsbug.el
+++ b/lisp/mail/emacsbug.el
@@ -75,10 +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.
-  (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))
+  (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
@@ -152,7 +158,7 @@ usually do not have translators to read other languages for them.\n\n")
        (insert "configured using `configure "
                system-configuration-options "'\n\n"))
     (insert "Important settings:\n")
-    (mapcar
+    (mapc
      '(lambda (var)
        (insert (format "  value of $%s: %s\n" var (getenv var))))
      '("LC_ALL" "LC_COLLATE" "LC_CTYPE" "LC_MESSAGES"
@@ -223,6 +229,9 @@ Type SPC to scroll through this section and its subsections."))))
       (setq report-emacs-bug-orig-text (buffer-substring (point-min) (point))))
     (goto-char user-point)))
 
+(declare-function Info-menu "../info" (menu-item &optional fork))
+(declare-function Info-goto-node "../info" (nodename &optional fork))
+
 (defun report-emacs-bug-info ()
   "Go to the Info node on reporting Emacs bugs."
   (interactive)