[Emacs-diffs] /srv/bzr/emacs/trunk r111528: * lisp/gnus/nnimap.el (nnimap-keepalive): Don't throw an error if there's no

[Stefan Monnier]

------------------------------------------------------------
revno: 111528
committer: Stefan Monnier <address@hidden>
branch nick: trunk
timestamp: Mon 2013-01-14 23:26:28 -0500
message:
  * lisp/gnus/nnimap.el (nnimap-keepalive): Don't throw an error if there's no
  more imap process running.
modified:
  lisp/gnus/ChangeLog
  lisp/gnus/nnimap.el

=== modified file 'lisp/gnus/ChangeLog'
--- a/lisp/gnus/ChangeLog       2013-01-14 22:09:16 +0000
+++ b/lisp/gnus/ChangeLog       2013-01-15 04:26:28 +0000
@@ -1,7 +1,12 @@
+2013-01-15  Stefan Monnier  <address@hidden>
+
+       * nnimap.el (nnimap-keepalive): Don't throw an error if there's no more
+       imap process running.
+
 2013-01-14  Julien Danjou  <address@hidden>
 
-       * gnus-sum.el (gnus-summary-from-or-to-or-newsgroups): Compare
-       addresses against addresses, not against the full From field.
+       * gnus-sum.el (gnus-summary-from-or-to-or-newsgroups):
+       Compare addresses against addresses, not against the full From field.
 
 2013-01-13  Richard Stallman  <address@hidden>
 
@@ -178,8 +183,8 @@
        the `face' property with a list whose car is the face specified in the
        format string and whose cdr is (nil).
        * lisp/gnus-util.el
-       (gnus-put-text-property-excluding-characters-with-faces): Change
-       accordingly.
+       (gnus-put-text-property-excluding-characters-with-faces):
+       Change accordingly.
        (gnus-get-text-property-excluding-characters-with-faces): New function.
        * lisp/gnus-sum.el (gnus-summary-highlight-line):
        * lisp/gnus-salt.el (gnus-tree-highlight-node):
@@ -227,8 +232,8 @@
 
 2012-12-22  Philipp Haselwarter  <address@hidden>
 
-       * gnus-sync.el (gnus-sync-file-encrypt-to, gnus-sync-save): Set
-       epa-file-encrypt-to from variable to avoid querying.
+       * gnus-sync.el (gnus-sync-file-encrypt-to, gnus-sync-save):
+       Set epa-file-encrypt-to from variable to avoid querying.
 
 2012-12-14  Akinori MUSHA  <address@hidden>  (tiny change)
 

=== modified file 'lisp/gnus/nnimap.el'
--- a/lisp/gnus/nnimap.el       2013-01-02 16:13:04 +0000
+++ b/lisp/gnus/nnimap.el       2013-01-15 04:26:28 +0000
@@ -339,7 +339,8 @@
                          (nnimap-last-command-time nnimap-object)))
                        ;; More than five minutes since the last command.
                        (* 5 60)))
-           (nnimap-send-command "NOOP")))))))
+            (ignore-errors              ;E.g. "buffer foo has no process".
+              (nnimap-send-command "NOOP"))))))))
 
 (defun nnimap-open-connection (buffer)
   ;; Be backwards-compatible -- the earlier value of nnimap-stream was
@@ -367,7 +368,7 @@
 (defun nnimap-open-connection-1 (buffer)
   (unless nnimap-keepalive-timer
     (setq nnimap-keepalive-timer (run-at-time (* 60 15) (* 60 15)
-                                             'nnimap-keepalive)))
+                                             #'nnimap-keepalive)))
   (with-current-buffer (nnimap-make-process-buffer buffer)
     (let* ((coding-system-for-read 'binary)
           (coding-system-for-write 'binary)