emacsbug: explanation text

emacsbug: explanation text

[David Reitter]

When the destination e-mail addresses for bug reports are changed  
from the defaults, the explanation texts are wrong - they indicate  
that the bug report is sent to the FSF all the time. The patch below  
fixes that.




*** ../../../emacs.p/lisp/mail/emacsbug.el	Sat Aug  6 19:54:04 2005
--- emacsbug.el	Tue Dec  6 11:00:59 2005
***************
*** 78,92 ****
     (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))
   	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)
   		  topic)
       ;; The rest of this does not execute
       ;; if the user was asked to confirm and said no.
--- 78,93 ----
     (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))
   	user-point prompt-beg-point message-end-point)
       (setq message-end-point
   	  (with-current-buffer (get-buffer-create "*Messages*")
   	    (point-max-marker)))
!     (compose-mail reporting-address
   		  topic)
       ;; The rest of this does not execute
       ;; if the user was asked to confirm and said no.
***************
*** 100,119 ****
       (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 ")
         (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)))
         (if pretest-p
   	  (insert ".\n\n")
   	(insert ",\nand to the gnu.emacs.bug news group.\n\n")))
--- 101,119 ----
       (setq prompt-beg-point (point))
       (unless report-emacs-bug-no-explanations
         ;; 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")
! 	(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"
! 		      reporting-address))
         (if pretest-p
   	  (insert ".\n\n")
   	(insert ",\nand to the gnu.emacs.bug news group.\n\n")))