auth-source: typo fixes

Signed-off-by: Julien Danjou <julien@danjou.info>

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 80016ed..c1a7adf 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -5,6 +5,8 @@
        (auth-source-plstore-create): Ditto.
        (auth-source-plstore-create, auth-source-netrc-create): Fix default
        value evaluation.
+       (auth-source-netrc-create): Typo fix.
+       (auth-source-plstore-create): Ditto.
 
        * password-cache.el (password-cache-remove): Remove entries even if the
        value is nil, so that password with a nil value (negative caching) is

diff --git a/lisp/auth-source.el b/lisp/auth-source.el
index c7daed8..154d507 100644 (file)
--- a/lisp/auth-source.el
+++ b/lisp/auth-source.el
@@ -1256,7 +1256,7 @@ See `auth-source-search' for details on SPEC."
                                            (setq ret (cdr item))
                                            (setq check nil)))))
                                     (t 'never)))
-                                  (plain (or (eval default) read-passwd prompt)))
+                                  (plain (or (eval default) (read-passwd prompt))))
                              ;; ask if we don't know what to do (in which case
                              ;; auth-source-netrc-use-gpg-tokens must be a list)
                              (unless gpg-encrypt
@@ -1681,12 +1681,12 @@ authentication tokens:
         (setq data (or data
                        (if (eq r 'secret)
                            (or (eval default) (read-passwd prompt))
-                         (if stringp default
-                           (read-string (if (string-match ": *\\'" prompt)
-                                            (concat (substring prompt 0 (match-beginning 0))
-                                                    " (default " default "): ")
-                                          (concat prompt "(default " default ") "))
-                                        nil nil default)
+                         (if (stringp default)
+                             (read-string (if (string-match ": *\\'" prompt)
+                                              (concat (substring prompt 0 (match-beginning 0))
+                                                      " (default " default "): ")
+                                            (concat prompt "(default " default ") "))
+                                          nil nil default)
                            (eval default)))))
 
         (when data