Commit 53dab082 authored by Eli Zaretskii's avatar Eli Zaretskii
Browse files

(report-emacs-bug): Let explanations correctly reflect the address to which

the report will be sent.
parent cbcc2d49
2006-01-06 David Reitter <david.reitter@gmail.com>
* mail/emacsbug.el (report-emacs-bug): Let explanations correctly
reflect the address to which the report will be sent.
2006-01-06 Eli Zaretskii <eliz@gnu.org> 2006-01-06 Eli Zaretskii <eliz@gnu.org>
   
* progmodes/ld-script.el (auto-mode-alist): Recognize linker * progmodes/ld-script.el (auto-mode-alist): Recognize linker
......
...@@ -78,15 +78,16 @@ Prompts for bug subject. Leaves you in a mail buffer." ...@@ -78,15 +78,16 @@ Prompts for bug subject. Leaves you in a mail buffer."
(interactive (reverse (list (recent-keys) (read-string "Bug Subject: ")))) (interactive (reverse (list (recent-keys) (read-string "Bug Subject: "))))
;; If there are four numbers in emacs-version, this is a pretest ;; If there are four numbers in emacs-version, this is a pretest
;; version. ;; version.
(let ((pretest-p (string-match "\\..*\\..*\\." emacs-version)) (let* ((pretest-p (string-match "\\..*\\..*\\." emacs-version))
(from-buffer (current-buffer)) (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) user-point prompt-beg-point message-end-point)
(setq message-end-point (setq message-end-point
(with-current-buffer (get-buffer-create "*Messages*") (with-current-buffer (get-buffer-create "*Messages*")
(point-max-marker))) (point-max-marker)))
(compose-mail (if pretest-p (compose-mail reporting-address
report-emacs-bug-pretest-address
report-emacs-bug-address)
topic) topic)
;; The rest of this does not execute ;; The rest of this does not execute
;; if the user was asked to confirm and said no. ;; if the user was asked to confirm and said no.
...@@ -100,10 +101,11 @@ Prompts for bug subject. Leaves you in a mail buffer." ...@@ -100,10 +101,11 @@ Prompts for bug subject. Leaves you in a mail buffer."
(setq prompt-beg-point (point)) (setq prompt-beg-point (point))
(unless report-emacs-bug-no-explanations (unless report-emacs-bug-no-explanations
;; Insert warnings for novice users. ;; Insert warnings for novice users.
(when (string-match "@gnu\\.org^" reporting-address)
(insert "This bug report will be sent to the Free Software Foundation,\n") (insert "This bug report will be sent to the Free Software Foundation,\n")
(let ((pos (point))) (let ((pos (point)))
(insert "not to your local site managers!") (insert "not to your local site managers!")
(put-text-property pos (point) 'face 'highlight)) (put-text-property pos (point) 'face 'highlight)))
(insert "\nPlease write in ") (insert "\nPlease write in ")
(let ((pos (point))) (let ((pos (point)))
(insert "English") (insert "English")
...@@ -111,9 +113,7 @@ Prompts for bug subject. Leaves you in a mail buffer." ...@@ -111,9 +113,7 @@ Prompts for bug subject. Leaves you in a mail buffer."
(insert " if possible, because the Emacs maintainers (insert " if possible, because the Emacs maintainers
usually do not have translators to read other languages for them.\n\n") 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" (insert (format "Your bug report will be posted to the %s mailing list"
(if pretest-p reporting-address))
report-emacs-bug-pretest-address
report-emacs-bug-address)))
(if pretest-p (if pretest-p
(insert ".\n\n") (insert ".\n\n")
(insert ",\nand to the gnu.emacs.bug news group.\n\n"))) (insert ",\nand to the gnu.emacs.bug news group.\n\n")))
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment