From 1f20acfd57e93fd749c536dc24f5dcfdbe43e417 Mon Sep 17 00:00:00 2001 From: Noam Postavsky Date: Sun, 15 Mar 2015 15:14:04 -0400 Subject: [PATCH] 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 --- lisp/use-package/use-package.el | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/lisp/use-package/use-package.el b/lisp/use-package/use-package.el index e4ef0048e59..36021b4d520 100644 --- 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) -- 2.39.2