Mercurial > emacs
diff lisp/mail/emacsbug.el @ 83653:2a69b973fae2
Merge from emacs--devo--0
Patches applied:
* emacs--devo--0 (patch 852-856)
- Update from CVS
- Merge from emacs--rel--22
* emacs--rel--22 (patch 93-96)
- Update from CVS
- Merge from gnus--rel--5.10
* gnus--rel--5.10 (patch 245)
- Update from CVS
Revision: emacs@sv.gnu.org/emacs--multi-tty--0--patch-32
author | Miles Bader <miles@gnu.org> |
---|---|
date | Tue, 21 Aug 2007 04:55:30 +0000 |
parents | 65663fcd2caa e460d01bb038 |
children |
line wrap: on
line diff
--- a/lisp/mail/emacsbug.el Mon Aug 13 13:51:08 2007 +0000 +++ b/lisp/mail/emacsbug.el Tue Aug 21 04:55:30 2007 +0000 @@ -73,18 +73,27 @@ ;; 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: ")))) - ;; 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) + ;; The syntax `version;' is preferred to `[version]' because the + ;; latter could be mistakenly stripped by mailing software. + (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 + 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 +115,7 @@ (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 +141,8 @@ (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")