[Emacs-diffs] /srv/bzr/emacs/trunk r105519: Merge changes made in Gnus trunk.

[Katsumi Yamaoka]

------------------------------------------------------------
revno: 105519
author: Gnus developers <address@hidden>
committer: Katsumi Yamaoka <address@hidden>
branch nick: trunk
timestamp: Sun 2011-08-21 09:39:07 +0000
message:
  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.
modified:
  lisp/gnus/ChangeLog
  lisp/gnus/gnus-agent.el
  lisp/gnus/gnus-util.el
  lisp/gnus/nntp.el
  lisp/gnus/pop3.el

=== modified file 'lisp/gnus/ChangeLog'
--- a/lisp/gnus/ChangeLog       2011-08-20 00:27:04 +0000
+++ b/lisp/gnus/ChangeLog       2011-08-21 09:39:07 +0000
@@ -1,3 +1,23 @@
+2011-08-21  Lars Magne Ingebrigtsen  <address@hidden>
+
+       * 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  <address@hidden>
+
+       * gnus-agent.el (gnus-agent-expire-done-message): Use %.f as format
+       specified to reduce precision.
+
 2011-08-19  Lars Magne Ingebrigtsen  <address@hidden>
 
        * nnimap.el (nnimap-transform-headers): Protect against (NIL ...)

=== modified file 'lisp/gnus/gnus-agent.el'
--- a/lisp/gnus/gnus-agent.el   2011-06-10 00:10:24 +0000
+++ b/lisp/gnus/gnus-agent.el   2011-08-21 09:39:07 +0000
@@ -3560,7 +3560,7 @@
                 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)))

=== modified file 'lisp/gnus/gnus-util.el'
--- a/lisp/gnus/gnus-util.el    2011-08-20 00:20:39 +0000
+++ b/lisp/gnus/gnus-util.el    2011-08-21 09:39:07 +0000
@@ -1249,6 +1249,13 @@
        (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.

=== modified file 'lisp/gnus/nntp.el'
--- a/lisp/gnus/nntp.el 2011-07-01 01:49:43 +0000
+++ b/lisp/gnus/nntp.el 2011-08-21 09:39:07 +0000
@@ -261,6 +261,8 @@
                                          (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 @@
 
 (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)))
 

=== modified file 'lisp/gnus/pop3.el'
--- a/lisp/gnus/pop3.el 2011-07-05 22:27:16 +0000
+++ b/lisp/gnus/pop3.el 2011-08-21 09:39:07 +0000
@@ -178,6 +178,8 @@
 
 (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))