From: Eli Zaretskii <eliz@gnu.org>
Date: Thu, 17 Dec 2015 22:58:38 +0000 (+0000)
Subject: auth-source.el (auth-source-ensure-strings): Don't make a list out of 't' (Bug#22188)
X-Git-Url: http://cgit.sxemacs.org/?p=gnus;a=commitdiff_plain;h=386e4d3ea54d4898bd5c7447991a116a1ef2c11f;ds=sidebyside

auth-source.el (auth-source-ensure-strings): Don't make a list out of 't' (Bug#22188)

Synch with the emacs-25 branch.
The changes having not been merged to the Emacs trunk are in:
http://www.jpl.org/ftp/pub/tmp/MaGnus-to-Emacs-trunk-unfinished.patch

* auth-source.el (auth-source-ensure-strings):
Don't make a list out of 't'.  (Bug#22188)
---

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 4e1430e10..aab4aeccd 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2015-12-17  Eli Zaretskii  <eliz@gnu.org>
+
+	* auth-source.el (auth-source-ensure-strings):
+	Don't make a list out of 't'.  (Bug#22188)
+
 2015-12-16  Katsumi Yamaoka  <yamaoka@jpl.org>
 
 	* dgnushack.el (byte-optimize-apply): Make the use-mapcan advice work
diff --git a/lisp/auth-source.el b/lisp/auth-source.el
index d263f780f..45ff3b7a1 100644
--- a/lisp/auth-source.el
+++ b/lisp/auth-source.el
@@ -929,13 +929,15 @@ while \(:host t) would find all host entries."
   prompt)
 
 (defun auth-source-ensure-strings (values)
-  (unless (listp values)
-    (setq values (list values)))
-  (mapcar (lambda (value)
-            (if (numberp value)
-                (format "%s" value)
-              value))
-          values))
+  (if (eq values t)
+      values
+    (unless (listp values)
+      (setq values (list values)))
+    (mapcar (lambda (value)
+	      (if (numberp value)
+		  (format "%s" value)
+		value))
+	    values)))
 
 ;;; Backend specific parsing: netrc/authinfo backend