Commit 1e91d506 authored by Gnus developers's avatar Gnus developers Committed by Katsumi Yamaoka
Browse files

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.
parent f5e3c598
2011-08-21 Lars Magne Ingebrigtsen <larsi@gnus.org>
* 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.
2011-08-20 Simon Josefsson <simon@josefsson.org>
* gnus-agent.el (gnus-agent-expire-done-message): Use %.f as format
specified to reduce precision.
2011-08-19 Lars Magne Ingebrigtsen <larsi@gnus.org>
 
* nnimap.el (nnimap-transform-headers): Protect against (NIL ...)
......
......@@ -3560,7 +3560,7 @@ articles in every agentized group? "))
units (cdr units)))
(format "Expiry recovered %d NOV entries, deleted %d files,\
and freed %f %s."
and freed %.f %s."
(nth 0 stats)
(nth 1 stats)
size (car units)))
......
......@@ -1249,6 +1249,13 @@ This function saves the current buffer."
(with-current-buffer gnus-group-buffer
(eq major-mode 'gnus-group-mode))))
(defun gnus-process-live-p (process)
"Returns non-nil if PROCESS is alive.
A process is considered alive if its status is `run', `open',
`listen', `connect' or `stop'."
(memq (process-status process)
'(run open listen connect stop)))
(defun gnus-remove-if (predicate sequence &optional hash-table-p)
"Return a copy of SEQUENCE with all items satisfying PREDICATE removed.
SEQUENCE should be a list, a vector, or a string. Returns always a list.
......
......@@ -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)))
......
......@@ -178,6 +178,8 @@ Use streaming commands."
(defun pop3-wait-for-messages (process count total-size)
(while (< (pop3-number-of-responses total-size) count)
(unless (memq (process-status process) '(open run))
(error "pop3 process died"))
(when total-size
(message "pop3 retrieved %dKB (%d%%)"
(truncate (/ (buffer-size) 1000))
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment