procyberian/emacs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix regression in non-querying about mail addresses in "emacs -Q"

Browse source 
* lisp/mail/emacsbug.el (report-emacs-bug-hook): Don't query about
the mail address if using an external mailer (bug#43386).
This commit is contained in:
Lars Ingebrigtsen 2020-09-15 15:26:55 +02:00
parent d727d3dad6
commit 27bda2e140
1 changed files with 9 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
lisp/mail/emacsbug.el
View file

@ -446,17 +446,20 @@ and send the mail again%s."
;; 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))
(eq (message-default-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)
(setq send-mail-function (sendmail-query-user-about-smtp))
(when (derived-mode-p 'message-mode)
(setq message-send-mail-function (message-default-send-mail-function))))
(setq message-send-mail-function (message-default-send-mail-function))
(add-hook 'message-sent-hook
(lambda ()
(when (y-or-n-p "Save this mail sending choice?")
(customize-save-variable 'send-mail-function
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))
(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)