[gnus git] branch master updated: n0-12-15-gf76be6e

       via  f76be6ec74434185fee0831c9c163c92d09ee000 (commit)
       via  d7925de009d5e3047e07e52657d7312d9f97979c (commit)
      from  b1bd45c45d95b14ac041e82fdb8e23d3b0386564 (commit)


- Log -----------------------------------------------------------------
commit f76be6ec74434185fee0831c9c163c92d09ee000
Author: Lars Ingebrigtsen <[email protected]>
Date:   Mon Feb 21 15:58:56 2011 -0800

    Revert last change, since auth-source now accepts numbers.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index ef81f60..bec462c 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,5 +1,8 @@
 2011-02-21  Lars Ingebrigtsen  <[email protected]>
 
+	* nnimap.el (nnimap-open-connection-1): Revert last change, since
+	auth-source now accepts numbers.
+
 	* auth-source.el (auth-source-netrc-parse): Accept a number as the port
 	spec, too.
 	(auth-source-ensure-strings): New function.
diff --git a/lisp/nnimap.el b/lisp/nnimap.el
index af25dfb..138875b 100644
--- a/lisp/nnimap.el
+++ b/lisp/nnimap.el
@@ -351,7 +351,7 @@ textual parts.")
 	   (proto-stream-always-use-starttls t)
            login-result credentials)
       (when nnimap-server-port
-	(setq ports (append ports (list (format "%s" nnimap-server-port)))))
+	(setq ports (append ports (list nnimap-server-port))))
       (destructuring-bind (stream greeting capabilities stream-type)
 	  (open-protocol-stream
 	   "*nnimap*" (current-buffer) nnimap-address (car (last ports))

commit d7925de009d5e3047e07e52657d7312d9f97979c
Author: Lars Ingebrigtsen <[email protected]>
Date:   Mon Feb 21 15:58:25 2011 -0800

    (auth-source-netrc-parse): Accept a number as the port spec, too.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 0b890be..ef81f60 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,5 +1,9 @@
 2011-02-21  Lars Ingebrigtsen  <[email protected]>
 
+	* auth-source.el (auth-source-netrc-parse): Accept a number as the port
+	spec, too.
+	(auth-source-ensure-strings): New function.
+
 	* gnus-art.el (gnus-article-update-date-headers): Doc fix.
 	(gnus-article-setup-buffer): Always restart the date timer so that user
 	changes to the frequency is respected.
diff --git a/lisp/auth-source.el b/lisp/auth-source.el
index 3fe31b5..d53ffe6 100644
--- a/lisp/auth-source.el
+++ b/lisp/auth-source.el
@@ -690,6 +690,15 @@ while \(:host t) would find all host entries."
 
 ;;; Backend specific parsing: netrc/authinfo backend
 
+(defun auth-source-ensure-strings (values)
+  (unless (listp values)
+    (setq values (list values)))
+  (mapcar (lambda (value)
+	    (if (numberp value)
+		(format "%s" value)
+	      port))
+	  values))
+
 (defvar auth-source-netrc-cache nil)
 
 ;;; (auth-source-netrc-parse "~/.authinfo.gpg")
@@ -703,6 +712,7 @@ Note that the MAX parameter is used so we can exit the parse early."
       ;; We got already parsed contents; just return it.
       file
     (when (file-exists-p file)
+      (setq port (auth-source-ensure-strings port))
       (with-temp-buffer
         (let ((tokens '("machine" "host" "default" "login" "user"
                         "password" "account" "macdef" "force"

-----------------------------------------------------------------------
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we listed those
revisions in full, above.

Summary of changes:
 lisp/ChangeLog      |    7 +++++++
 lisp/auth-source.el |   10 ++++++++++
 lisp/nnimap.el      |    2 +-
 3 files changed, 18 insertions(+), 1 deletions(-)

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "Gnus Project".

The branch, master has been updated


hooks/post-receive
-- 
Gnus Project