1
0
mirror of https://git.savannah.gnu.org/git/emacs.git synced 2025-02-03 20:24:29 +00:00

Merge changes made in Gnus trunk.

message.el (message-point-in-header-p): Tweak the function to default to saying that we're not in the headers if there is no separator at all.  This makes it possible to use the Message version of `M-q' in buffers with no headers (bug#7987).
 (message-point-in-header-p): Fix last checkin to work with an empty mail-header-separator, too.
auth-source.el (auth-source-netrc-saver): If the user says "don't ask again, save the choice via customize.
message.el (message-send-mail-function): Add `sendmail-query-once'.
nnimap.el (nnimap-finish-retrieve-group-infos): If the server has ended the connection, bail out before waiting infinitely on a new connection.
This commit is contained in:
Lars Magne Ingebrigtsen 2011-06-30 01:02:47 +00:00 committed by Katsumi Yamaoka
parent 2f31f37ab7
commit 3451795ca1
4 changed files with 35 additions and 5 deletions

View File

@ -1,3 +1,23 @@
2011-06-30 Lars Magne Ingebrigtsen <larsi@gnus.org>
* message.el (message-point-in-header-p): Tweak the function to default
to saying that we're not in the headers if there is no separator at
all. This makes it possible to use the Message version of `M-q' in
buffers with no headers (bug#7987).
(message-point-in-header-p): Fix last checkin to work with an empty
mail-header-separator, too.
* auth-source.el (auth-source-netrc-saver): If the user says "don't ask
again, save the choice via customize.
2011-06-29 Lars Magne Ingebrigtsen <larsi@gnus.org>
* message.el (message-send-mail-function): Add `sendmail-query-once'.
* nnimap.el (nnimap-finish-retrieve-group-infos): If the server has
ended the connection, bail out before waiting infinitely on a new
connection.
2011-06-28 Teodor Zlatanov <tzz@lifelogs.com>
* gnus-msg.el (gnus-bug): Add Package and Version pseudo-headers to bug

View File

@ -1363,9 +1363,10 @@ Respects `auth-source-save-behavior'. Uses
(help-mode))))
(?n (setq add ""
done t))
(?N (setq add ""
done t
auth-source-save-behavior nil))
(?N
(setq add ""
done t)
(customize-save-variable 'auth-source-save-behavior nil))
(?e (setq add (read-string "Line to add: " add)))
(t nil)))

View File

@ -659,6 +659,7 @@ Done before generating the new subject of a forward."
(defcustom message-send-mail-function
(cond ((eq send-mail-function 'smtpmail-send-it) 'message-smtpmail-send-it)
((eq send-mail-function 'feedmail-send-it) 'feedmail-send-it)
((eq send-mail-function 'sendmail-query-once) 'sendmail-query-once)
((eq send-mail-function 'mailclient-send-it)
'message-send-mail-with-mailclient)
(t (message-send-mail-function)))
@ -3424,8 +3425,12 @@ Message buffers and is not meant to be called directly."
(defun message-point-in-header-p ()
"Return t if point is in the header."
(save-excursion
(not (re-search-backward
(concat "^" (regexp-quote mail-header-separator) "\n") nil t))))
(and
(not
(re-search-backward
(concat "^" (regexp-quote mail-header-separator) "\n") nil t))
(re-search-forward
(concat "^" (regexp-quote mail-header-separator) "\n") nil t))))
(defun message-do-auto-fill ()
"Like `do-auto-fill', but don't fill in message header."

View File

@ -1227,6 +1227,10 @@ textual parts.")
(deffoo nnimap-finish-retrieve-group-infos (server infos sequences)
(when (and sequences
;; Check that the process is still alive.
(get-buffer-process (nnimap-buffer))
(memq (process-status (get-buffer-process (nnimap-buffer)))
'(open run))
(nnimap-possibly-change-group nil server))
(with-current-buffer (nnimap-buffer)
;; Wait for the final data to trickle in.