nnimap.el (nnimap-keepalive): Don't throw an error if there's no more imap process...

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 54c6a8d..eb6b91c 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,7 +1,12 @@
+2013-01-15  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+       * nnimap.el (nnimap-keepalive): Don't throw an error if there's no more
+       imap process running.
+
 2013-01-14  Julien Danjou  <julien@danjou.info>
 
-       * 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  <rms@gnu.org>
 
@@ -181,8 +186,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):
@@ -230,8 +235,8 @@
 
 2012-12-22  Philipp Haselwarter  <philipp@haselwarter.org>
 
-       * 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  <knu@iDaemons.org>  (tiny change)
 

diff --git a/lisp/nnimap.el b/lisp/nnimap.el
index 41d61f7..4d9320b 100644 (file)
--- a/lisp/nnimap.el
+++ b/lisp/nnimap.el
@@ -350,7 +350,8 @@ textual parts.")
                          (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
@@ -378,7 +379,7 @@ textual parts.")
 (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)