* lisp/mh-e/mh-comp.el (mh-regexp-in-field-p): Fix previous change.

[gnu-emacs] / lisp / gnus / auth-source.el

diff --git a/lisp/gnus/auth-source.el b/lisp/gnus/auth-source.el
index 6e6c74509f09c93dce1a6d9b4d4b1c4c1cda8f8c..e94904bf175019820ad889972f5312884829edb1 100644 (file)
--- a/lisp/gnus/auth-source.el
+++ b/lisp/gnus/auth-source.el
@@ -913,7 +913,7 @@ while \(:host t) would find all host entries."
       (when (and c v)
         (setq prompt (replace-regexp-in-string (format "%%%c" c)
                                                (format "%s" v)
-                                               prompt)))))
+                                               prompt nil t)))))
   prompt)
 
 (defun auth-source-ensure-strings (values)
@@ -1008,7 +1008,7 @@ Note that the MAX parameter is used so we can exit the parse early."
                     (while (and (zerop (forward-line 1))
                                 (looking-at "$")))
                     (narrow-to-region (point) (point)))
-                   ((member elem tokens)
+                   ((and (member elem tokens) (null pair))
                     ;; Tokens that don't have a following value are ignored,
                     ;; except "default".
                     (when (and pair (or (cdr pair)