summaryrefslogtreecommitdiff
path: root/lisp/gnus/nntp.el
diff options
context:
space:
mode:
authorGnus developers <ding@gnus.org>2011-08-21 09:39:07 +0000
committerKatsumi Yamaoka <yamaoka@jpl.org>2011-08-21 09:39:07 +0000
commit1e91d50696f9d458228039f5d1e346fd4dae41e6 (patch)
treef4ddb48c65e08ab12a2297f06b639efee7438f53 /lisp/gnus/nntp.el
parentf5e3c5984b072553838cb15dfd4ab94a9f6ac436 (diff)
downloademacs-1e91d50696f9d458228039f5d1e346fd4dae41e6.tar.gz
Merge changes made in Gnus trunk.
nntp.el (nntp-authinfo-file): Mark as obsolete -- use auth-source instead. pop3.el (pop3-wait-for-messages): Don't use Gnus functions here. gnus-util.el (gnus-process-live-p): Copy over compat function. pop3.el (pop3-wait-for-messages): If the pop3 process dies, stop processing. nntp.el (nntp-kill-buffer): Kill the process before killing the buffer to avoid warnings. gnus-agent.el (gnus-agent-expire-done-message): Use %.f as format specified to reduce precision.
Diffstat (limited to 'lisp/gnus/nntp.el')
-rw-r--r--lisp/gnus/nntp.el5
1 files changed, 5 insertions, 0 deletions
diff --git a/lisp/gnus/nntp.el b/lisp/gnus/nntp.el
index 986fd51a613..325aa67f80d 100644
--- a/lisp/gnus/nntp.el
+++ b/lisp/gnus/nntp.el
@@ -261,6 +261,8 @@ See `nnml-marks-is-evil' for more information.")
(const :format "" "password")
(string :format "Password: %v")))))))
+(make-obsolete 'nntp-authinfo-file nil "Emacs 24.1")
+
(defvoo nntp-connection-timeout nil
@@ -430,6 +432,9 @@ be restored and the command retried."
(defun nntp-kill-buffer (buffer)
(when (buffer-name buffer)
+ (let ((process (get-buffer-process buffer)))
+ (when process
+ (delete-process process)))
(kill-buffer buffer)
(nnheader-init-server-buffer)))