# HG changeset patch
# User Miles Bader <miles@gnu.org>
# Date 1211432580 0
# Node ID d90ff358ee2722b545faf4da486670b329334482
# Parent  042486c3318cc0d1cb60dcdbffd169973b512ae9
Merge from gnus--devo--0

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

diff -r 042486c3318c -r d90ff358ee27 lisp/ChangeLog
--- a/lisp/ChangeLog	Thu May 22 04:26:41 2008 +0000
+++ b/lisp/ChangeLog	Thu May 22 05:03:00 2008 +0000
@@ -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 -r 042486c3318c -r d90ff358ee27 lisp/gnus/ChangeLog
--- a/lisp/gnus/ChangeLog	Thu May 22 04:26:41 2008 +0000
+++ b/lisp/gnus/ChangeLog	Thu May 22 05:03:00 2008 +0000
@@ -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 -r 042486c3318c -r d90ff358ee27 lisp/gnus/auth-source.el
--- a/lisp/gnus/auth-source.el	Thu May 22 04:26:41 2008 +0000
+++ b/lisp/gnus/auth-source.el	Thu May 22 05:03:00 2008 +0000
@@ -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 -r 042486c3318c -r d90ff358ee27 lisp/gnus/gnus-draft.el
--- a/lisp/gnus/gnus-draft.el	Thu May 22 04:26:41 2008 +0000
+++ b/lisp/gnus/gnus-draft.el	Thu May 22 05:03:00 2008 +0000
@@ -216,6 +216,7 @@
 				     (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 -r 042486c3318c -r d90ff358ee27 lisp/gnus/nnheader.el
--- a/lisp/gnus/nnheader.el	Thu May 22 04:26:41 2008 +0000
+++ b/lisp/gnus/nnheader.el	Thu May 22 05:03:00 2008 +0000
@@ -86,7 +86,7 @@
       ;; 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 -r 042486c3318c -r d90ff358ee27 lisp/gnus/pop3.el
--- a/lisp/gnus/pop3.el	Thu May 22 04:26:41 2008 +0000
+++ b/lisp/gnus/pop3.el	Thu May 22 05:03:00 2008 +0000
@@ -169,7 +169,7 @@
           (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 -r 042486c3318c -r d90ff358ee27 lisp/net/netrc.el
--- a/lisp/net/netrc.el	Thu May 22 04:26:41 2008 +0000
+++ b/lisp/net/netrc.el	Thu May 22 05:03:00 2008 +0000
@@ -137,8 +137,10 @@
       (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 @@
       (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)