Mercurial > emacs
changeset 68075:d16e53a3e227
(report-emacs-bug): Let explanations correctly reflect the address to which
the report will be sent.
| author | Eli Zaretskii <eliz@gnu.org> |
|---|---|
| date | Fri, 06 Jan 2006 19:40:59 +0000 |
| parents | 0034c3d92000 |
| children | 41a1f70eb5b9 |
| files | lisp/mail/emacsbug.el |
| diffstat | 1 files changed, 12 insertions(+), 12 deletions(-) [+] |
line wrap: on
line diff
--- a/lisp/mail/emacsbug.el Fri Jan 06 17:31:59 2006 +0000 +++ b/lisp/mail/emacsbug.el Fri Jan 06 19:40:59 2006 +0000 @@ -78,15 +78,16 @@ (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)) + (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)) user-point prompt-beg-point message-end-point) (setq message-end-point (with-current-buffer (get-buffer-create "*Messages*") (point-max-marker))) - (compose-mail (if pretest-p - report-emacs-bug-pretest-address - report-emacs-bug-address) + (compose-mail reporting-address topic) ;; The rest of this does not execute ;; if the user was asked to confirm and said no. @@ -100,20 +101,19 @@ (setq prompt-beg-point (point)) (unless report-emacs-bug-no-explanations ;; Insert warnings for novice users. - (insert "This bug report will be sent to the Free Software Foundation,\n") - (let ((pos (point))) - (insert "not to your local site managers!") - (put-text-property pos (point) 'face 'highlight)) - (insert "\nPlease write in ") + (when (string-match "@gnu\\.org^" reporting-address) + (insert "This bug report will be sent to the Free Software Foundation,\n") + (let ((pos (point))) + (insert "not to your local site managers!") + (put-text-property pos (point) 'face 'highlight))) + (insert "\nPlease write in ") (let ((pos (point))) (insert "English") (put-text-property pos (point) 'face 'highlight)) (insert " if possible, because the Emacs maintainers usually do not have translators to read other languages for them.\n\n") (insert (format "Your bug report will be posted to the %s mailing list" - (if pretest-p - report-emacs-bug-pretest-address - report-emacs-bug-address))) + reporting-address)) (if pretest-p (insert ".\n\n") (insert ",\nand to the gnu.emacs.bug news group.\n\n")))