Changes committed gnus/lisp (ChangeLog auth-source.el netrc.el)

Modified: ChangeLog auth-source.el netrc.el

* auth-source.el: Add more docs.

* netrc.el (netrc-machine): Always match if the port is not given.


Index: ChangeLog
diff -u gnus/lisp/ChangeLog:7.1863 gnus/lisp/ChangeLog:7.1864
--- ChangeLog:7.1863	Mon May 19 17:34:44 2008
+++ ChangeLog	Tue May 20 20:06:48 2008
@@ -1,3 +1,9 @@
+2008-05-20  Teodor Zlatanov  <[email protected]>
+
+	* auth-source.el: Add more docs.
+
+	* netrc.el (netrc-machine): Always match if the port is not given.
+
 2008-05-19  Lars Magne Ingebrigtsen  <[email protected]>
 
 	* nnheader.el (nnheader-read-timeout): Change the default timeout from
Index: auth-source.el
diff -u gnus/lisp/auth-source.el:7.10 gnus/lisp/auth-source.el:7.11
--- auth-source.el:7.10	Mon May 19 10:47:42 2008
+++ auth-source.el	Tue May 20 20:06:48 2008
@@ -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)
 
Index: netrc.el
diff -u gnus/lisp/netrc.el:7.23 gnus/lisp/netrc.el:7.24
--- netrc.el:7.23	Mon May 19 10:47:42 2008
+++ netrc.el	Tue May 20 20:06:48 2008
@@ -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)