use--package: eval-after-load name

instead of name-string. This prevents triggering by config file names
that have the same name as the package.

Reprise of c6d79d2cb40bd141f62eaca6dca47fb2e8e6943f

diff --git a/lisp/use-package/use-package.el b/lisp/use-package/use-package.el
index e4ef0048e5941a1eb9c45bfc6b9d30119462ac0b..36021b4d520bc2a6f917db4adf5fd3828f9680ea 100644 (file)
--- a/lisp/use-package/use-package.el
+++ b/lisp/use-package/use-package.el
@@ -336,7 +336,7 @@ the user specified.")
           (ignore
            (display-warning 'use-package (format ,fmt ,err) :error)))))))
 
-(defun use--package (name-symbol name-string args)
+(defun use--package (name name-symbol name-string args)
   "See docstring for `use-package'."
   (let*
       ((commands (plist-get args :commands))
@@ -431,7 +431,7 @@ the user specified.")
                         ,(format "Configuring package %s"
                                  name-string)
                         ,@config-body)))
-                (list `(eval-after-load ,name-string
+                (list `(eval-after-load ',name
                          ',body)))))
        `((use-package-with-elapsed-timer
            ,(format "Loading package %s" name-string)
@@ -522,7 +522,7 @@ this file.  Usage:
       ;; At this point, we can expand the macro using the helper function.
       ;; `use--package'.
       (let*
-          ((body (use--package name-symbol name-string args*))
+          ((body (use--package name name-symbol name-symbol args*))
            (pred (plist-get args* :if))
            (expansion (if pred
                           `(when ,pred ,@body)