mirror/emacs
1
0
Fork 0
mirror of https://git.savannah.gnu.org/git/emacs.git synced 2024-11-23 07:19:15 +00:00
Code Issues Releases Activity

Fix up report-emacs-bug action on invalid From headers

Browse Source 
* lisp/mail/emacsbug.el (report-emacs-bug-hook): Move point to the
From header if the user has to edit the From header.
This commit is contained in:
Lars Ingebrigtsen 2020-09-14 01:23:25 +02:00
parent 9cc992e68f
commit 1749d32d02
1 changed files with 57 additions and 55 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

112
lisp/mail/emacsbug.el
View File

@ -416,67 +416,69 @@ usually do not have translators for other languages.\n\n")))
(defun report-emacs-bug-hook ()
"Do some checking before sending a bug report."
(save-excursion
(goto-char (point-max))
(skip-chars-backward " \t\n")
(and (= (- (point) (point-min))
(length report-emacs-bug-orig-text))
(string-equal (buffer-substring-no-properties (point-min) (point))
report-emacs-bug-orig-text)
(error "No text entered in bug report"))
;; Warning for novice users.
(when (and (string-match "bug-gnu-emacs@gnu\\.org" (mail-fetch-field "to"))
(not report-emacs-bug-no-confirmation)
(not (yes-or-no-p
"Send this bug report to the Emacs maintainers? ")))
(with-output-to-temp-buffer "*Bug Help*"
(princ (substitute-command-keys
(format "\
(goto-char (point-max))
(skip-chars-backward " \t\n")
(and (= (- (point) (point-min))
(length report-emacs-bug-orig-text))
(string-equal (buffer-substring-no-properties (point-min) (point))
report-emacs-bug-orig-text)
(error "No text entered in bug report"))
;; Warning for novice users.
(when (and (string-match "bug-gnu-emacs@gnu\\.org" (mail-fetch-field "to"))
(not report-emacs-bug-no-confirmation)
(not (yes-or-no-p
"Send this bug report to the Emacs maintainers? ")))
(with-output-to-temp-buffer "*Bug Help*"
(princ (substitute-command-keys
(format "\
You invoked the command M-x report-emacs-bug,
but you decided not to mail the bug report to the Emacs maintainers.
If you want to mail it to someone else instead,
please insert the proper e-mail address after \"To: \",
and send the mail again%s."
(if report-emacs-bug-send-command
(format " using \\[%s]"
report-emacs-bug-send-command)
"")))))
(error "M-x report-emacs-bug was canceled, please read *Bug Help* buffer"))
;; Query the user for the SMTP method, so that we can skip
;; questions about From header validity if the user is going to
;; use mailclient, anyway.
(when (or (and (derived-mode-p 'message-mode)
(eq message-send-mail-function 'sendmail-query-once))
(and (not (derived-mode-p 'message-mode))
(eq send-mail-function 'sendmail-query-once)))
(sendmail-query-user-about-smtp)
(when (derived-mode-p 'message-mode)
(setq message-send-mail-function (message-default-send-mail-function))))
(or report-emacs-bug-no-confirmation
;; mailclient.el does not need a valid From
(if (derived-mode-p 'message-mode)
(eq message-send-mail-function 'message-send-mail-with-mailclient)
(eq send-mail-function 'mailclient-send-it))
;; Not narrowing to the headers, but that's OK.
(let ((from (mail-fetch-field "From")))
(and (or (not from)
(message-bogus-recipient-p from)
;; This is the default user-mail-address. On today's
;; systems, it seems more likely to be wrong than right,
;; since most people don't run their own mail server.
(string-match (format "\\<%s@%s\\>"
(regexp-quote (user-login-name))
(regexp-quote (system-name)))
from))
(not (yes-or-no-p
(format-message "Is `%s' really your email address? "
from)))
(error "Please edit the From address and try again"))))
;; Bury the help buffer (if it's shown).
(when-let ((help (get-buffer "*Bug Help*")))
(when (get-buffer-window help)
(quit-window nil (get-buffer-window help))))))
(if report-emacs-bug-send-command
(format " using \\[%s]"
report-emacs-bug-send-command)
"")))))
(error "M-x report-emacs-bug was canceled, please read *Bug Help* buffer"))
;; Query the user for the SMTP method, so that we can skip
;; questions about From header validity if the user is going to
;; use mailclient, anyway.
(when (or (and (derived-mode-p 'message-mode)
(eq message-send-mail-function 'sendmail-query-once))
(and (not (derived-mode-p 'message-mode))
(eq send-mail-function 'sendmail-query-once)))
(sendmail-query-user-about-smtp)
(when (derived-mode-p 'message-mode)
(setq message-send-mail-function (message-default-send-mail-function))))
(or report-emacs-bug-no-confirmation
;; mailclient.el does not need a valid From
(if (derived-mode-p 'message-mode)
(eq message-send-mail-function 'message-send-mail-with-mailclient)
(eq send-mail-function 'mailclient-send-it))
;; Not narrowing to the headers, but that's OK.
(let ((from (mail-fetch-field "From")))
(when (and (or (not from)
(message-bogus-recipient-p from)
;; This is the default user-mail-address. On
;; today's systems, it seems more likely to
;; be wrong than right, since most people
;; don't run their own mail server.
(string-match (format "\\<%s@%s\\>"
(regexp-quote (user-login-name))
(regexp-quote (system-name)))
from))
(not (yes-or-no-p
(format-message "Is `%s' really your email address? "
from))))
(goto-char (point-min))
(re-search-forward "^From: " nil t)
(error "Please edit the From address and try again"))))
;; Bury the help buffer (if it's shown).
(when-let ((help (get-buffer "*Bug Help*")))
(when (get-buffer-window help)
(quit-window nil (get-buffer-window help)))))
;;;###autoload
(defun submit-emacs-patch (subject file)