diff options
| author | Stefan Monnier <monnier@iro.umontreal.ca> | 2013-01-14 23:26:28 -0500 |
|---|---|---|
| committer | Stefan Monnier <monnier@iro.umontreal.ca> | 2013-01-14 23:26:28 -0500 |
| commit | ef8214345ba7b46de9837fbe9461e19f18e6d660 (patch) | |
| tree | 741c599e4484ec035312f4eae8c13f1a870e714f | |
| parent | 6e8cd0aecac332675ea1a700c7e3db3d48f62c15 (diff) | |
| download | emacs-ef8214345ba7b46de9837fbe9461e19f18e6d660.tar.gz | |
* lisp/gnus/nnimap.el (nnimap-keepalive): Don't throw an error if there's no
more imap process running.
| -rw-r--r-- | lisp/gnus/ChangeLog | 17 | ||||
| -rw-r--r-- | lisp/gnus/nnimap.el | 5 |
2 files changed, 14 insertions, 8 deletions
diff --git a/lisp/gnus/ChangeLog b/lisp/gnus/ChangeLog index 2b09a1f456c..733f1d26510 100644 --- a/lisp/gnus/ChangeLog +++ b/lisp/gnus/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> @@ -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 <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/gnus/nnimap.el b/lisp/gnus/nnimap.el index ea579fa3a2b..9c18bc2cff0 100644 --- a/lisp/gnus/nnimap.el +++ b/lisp/gnus/nnimap.el @@ -339,7 +339,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 @@ -367,7 +368,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) |