Merge from gnus--devo--0

Revision: emacs@sv.gnu.org/emacs--devo--0--patch-1172

7 files changed, 31 insertions, 4 deletions

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 559a0e4f0c8..cf621f28c84 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,7 @@
+2008-05-22  Teodor Zlatanov  <tzz@lifelogs.com>
+
+        * net/netrc.el (netrc-machine): Always match if the port is not given.
+
 2008-05-22  Stefan Monnier  <monnier@iro.umontreal.ca>
 
         * minibuffer.el (completion-pcm--find-all-completions):
diff --git a/lisp/gnus/ChangeLog b/lisp/gnus/ChangeLog
index 9f4ef735a54..9c25204fed3 100644
--- a/lisp/gnus/ChangeLog
+++ b/lisp/gnus/ChangeLog
@@ -1,3 +1,22 @@
+2008-05-20  Teodor Zlatanov  <tzz@lifelogs.com>
+
+        * auth-source.el: Add more docs.
+
+2008-05-19  Lars Magne Ingebrigtsen  <larsi@gnus.org>
+
+        * nnheader.el (nnheader-read-timeout): Change the default timeout from
+        0.1 seconds to 0.01 seconds.  This will make nntp and pop3 article
+        retrieval faster in some cases, but might make CPU usage larger.  If
+        this has any bad side effects, we might revert this change.
+
+        * pop3.el (pop3-movemail): Change the sit-for from 0.1 to 0.01, which
+        seems to make mail retrieval much, much faster.
+        (pop3-movemail): Use nnheader-accept-process-output instead of sleeping
+        unconditionally. 
+
+        * gnus-draft.el (gnus-group-send-queue): Bind
+        message-send-mail-partially-limit to nil to avoid being prompted.
+
 2008-05-16  Reiner Steib  <Reiner.Steib@gmx.de>
 
         * mml.el (mml-attach-buffer): Prompt for `disposition'.
diff --git a/lisp/gnus/auth-source.el b/lisp/gnus/auth-source.el
index d336d7f4981..cd8a196d983 100644
--- a/lisp/gnus/auth-source.el
+++ b/lisp/gnus/auth-source.el
@@ -36,6 +36,7 @@
 ;; if you want encrypted sources, which is strongly recommended, do
 ;; (require 'epa-file)
 ;; (epa-file-mode)
+;; (setq epa-file-cache-passphrase-for-symmetric-encryption t) ; VERY important
 
 ;; before you put some data in ~/.authinfo.gpg (the default place)
 
diff --git a/lisp/gnus/gnus-draft.el b/lisp/gnus/gnus-draft.el
index 318f0d56bcb..2a5894db843 100644
--- a/lisp/gnus/gnus-draft.el
+++ b/lisp/gnus/gnus-draft.el
@@ -216,6 +216,7 @@ Obeys the standard process/prefix convention."
                                      (gnus-info-marks
                                       (gnus-get-info "nndraft:queue"))))))
              (gnus-posting-styles nil)
+             message-send-mail-partially-limit
              (total (length articles))
              article)
         (while (setq article (pop articles))
diff --git a/lisp/gnus/nnheader.el b/lisp/gnus/nnheader.el
index cad34db1eef..dd0dc4ad360 100644
--- a/lisp/gnus/nnheader.el
+++ b/lisp/gnus/nnheader.el
@@ -86,7 +86,7 @@ Integer values will in effect be rounded up to the nearest multiple of
       ;; what's possible.  Perhaps better, maybe the Windows/DOS primitive
       ;; could round up non-zero timeouts to a minimum of 1.0?
       1.0
-    0.1)
+    0.01)
   "How long nntp should wait between checking for the end of output.
 Shorter values mean quicker response, but are more CPU intensive.")
 
diff --git a/lisp/gnus/pop3.el b/lisp/gnus/pop3.el
index 8206c4d2dc7..8f5132cd673 100644
--- a/lisp/gnus/pop3.el
+++ b/lisp/gnus/pop3.el
@@ -169,7 +169,7 @@ Shorter values mean quicker response, but are more CPU intensive.")
           (unless pop3-leave-mail-on-server
             (pop3-dele process n))
           (setq n (+ 1 n))
-          (if pop3-debug (sit-for 1) (sit-for 0.1))) ; why?
+          (nnheader-accept-process-output process))
       (when (and pop3-leave-mail-on-server
                  (> n 1))
         (message "pop3.el doesn't support UIDL.  Setting `pop3-leave-mail-on-server'
diff --git a/lisp/net/netrc.el b/lisp/net/netrc.el
index acc5ce4665f..ae06af872b9 100644
--- a/lisp/net/netrc.el
+++ b/lisp/net/netrc.el
@@ -137,8 +137,10 @@ Entries without port tokens default to DEFAULTPORT."
       (while (and result
                   (not (netrc-port-equal
                         (or port defaultport "nntp")
+                        ;; when port is not given in the netrc file,
+                        ;; it should mean "any port"
                         (or (netrc-get (car result) "port")
-                            defaultport "nntp"))))
+                            defaultport port))))
         (pop result))
       (car result))))
 
@@ -159,7 +161,7 @@ MODE can be \"login\" or \"password\", suitable for passing to
       (dolist (default defaults)
         (dolist (port ports)
           (let ((alist (netrc-machine authinfo-list machine port default)))
-          (setq info (or (netrc-get alist mode) info))))))
+            (setq info (or (netrc-get alist mode) info))))))
     info))
 
 (defun netrc-get (alist type)