[Emacs-diffs] /srv/bzr/emacs/trunk r104786: Merge changes made in Gnus trunk.

[Katsumi Yamaoka]

------------------------------------------------------------
revno: 104786
author: Lars Magne Ingebrigtsen <address@hidden>
committer: Katsumi Yamaoka <address@hidden>
branch nick: trunk
timestamp: Thu 2011-06-30 01:02:47 +0000
message:
  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.
modified:
  lisp/gnus/ChangeLog
  lisp/gnus/auth-source.el
  lisp/gnus/message.el
  lisp/gnus/nnimap.el

=== modified file 'lisp/gnus/ChangeLog'
--- a/lisp/gnus/ChangeLog       2011-06-28 22:18:09 +0000
+++ b/lisp/gnus/ChangeLog       2011-06-30 01:02:47 +0000
@@ -1,3 +1,23 @@
+2011-06-30  Lars Magne Ingebrigtsen  <address@hidden>
+
+       * 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  <address@hidden>
+
+       * 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  <address@hidden>
 
        * gnus-msg.el (gnus-bug): Add Package and Version pseudo-headers to bug

=== modified file 'lisp/gnus/auth-source.el'
--- a/lisp/gnus/auth-source.el  2011-06-26 12:41:14 +0000
+++ b/lisp/gnus/auth-source.el  2011-06-30 01:02:47 +0000
@@ -1363,9 +1363,10 @@
                       (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)))
 

=== modified file 'lisp/gnus/message.el'
--- a/lisp/gnus/message.el      2011-05-30 22:11:52 +0000
+++ b/lisp/gnus/message.el      2011-06-30 01:02:47 +0000
@@ -659,6 +659,7 @@
 (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 @@
 (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."

=== modified file 'lisp/gnus/nnimap.el'
--- a/lisp/gnus/nnimap.el       2011-06-23 00:00:38 +0000
+++ b/lisp/gnus/nnimap.el       2011-06-30 01:02:47 +0000
@@ -1227,6 +1227,10 @@
 
 (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.