1 files changed, 7 insertions, 6 deletions
diff --git a/lisp/auth-source.el b/lisp/auth-source.el
index 14cae8a52c7..69197383982 100644
--- a/lisp/auth-source.el
+++ b/lisp/auth-source.el
@@ -121,12 +121,12 @@ let-binding."
          :initform nil
          :documentation "Internal backend data.")
    (create-function :initarg :create-function
-                    :initform ignore
+                    :initform #'ignore
                     :type function
                     :custom function
                     :documentation "The create function.")
    (search-function :initarg :search-function
-                    :initform ignore
+                    :initform #'ignore
                     :type function
                     :custom function
                     :documentation "The search function.")))
@@ -162,7 +162,7 @@ let-binding."
 (defvar auth-source-creation-prompts nil
   "Default prompts for token values.  Usually let-bound.")
 
-(make-obsolete 'auth-source-hide-passwords nil "Emacs 24.1")
+(make-obsolete 'auth-source-hide-passwords nil "24.1")
 
 (defcustom auth-source-save-behavior 'ask
   "If set, auth-source will respect it for save behavior."
@@ -1270,7 +1270,7 @@ See `auth-source-search' for details on SPEC."
 ;; (auth-source-search :host "nonesuch" :type 'netrc :max 1 :create t :create-extra-keys '((A "default A") (B)))
 
 (cl-defun auth-source-netrc-create (&rest spec
-                                    &key backend host port create
+                                    &key backend host port create user
                                     &allow-other-keys)
   (let* ((base-required '(host user port secret))
          ;; we know (because of an assertion in auth-source-search) that the
@@ -1278,6 +1278,7 @@ See `auth-source-search' for details on SPEC."
          (create-extra (if (eq t create) nil create))
          (current-data (car (auth-source-search :max 1
                                                 :host host
+                                                :user user
                                                 :port port)))
          (required (append base-required create-extra))
          (file (oref backend source))
@@ -2307,9 +2308,9 @@ See `auth-source-search' for details on SPEC."
 
 ;; deprecate the old interface
 (make-obsolete 'auth-source-user-or-password
-               'auth-source-search "Emacs 24.1")
+               'auth-source-search "24.1")
 (make-obsolete 'auth-source-forget-user-or-password
-               'auth-source-forget "Emacs 24.1")
+               'auth-source-forget "24.1")
 
 (defun auth-source-user-or-password
   (mode host port &optional username create-missing delete-existing)