From: Radon Rosborough <radon.neon@gmail.com>
Date: Tue, 16 Jul 2019 05:11:13 +0000 (-0700)
Subject: Switch from `require' to `load' + `featurep'
X-Git-Tag: emacs-29.0.90~1306^2~15^2~57^2~1
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=4c8d5f0b21dbbf888aac988c2370c4626458f713;p=emacs.git

Switch from `require' to `load' + `featurep'
---

diff --git a/lisp/use-package/use-package-core.el b/lisp/use-package/use-package-core.el
index b80da77fd81..db5e20f7ddf 100644
--- a/lisp/use-package/use-package-core.el
+++ b/lisp/use-package/use-package-core.el
@@ -651,7 +651,8 @@ extending any keys already present."
                     ,(when (eq use-package-verbose 'debug)
                        `(message ,(format "Compiling package %s" name-string)))
                     ,(unless (plist-get args :no-require)
-                       `(require ',name-symbol)))))))))
+                       `(unless (featurep ',name-symbol)
+                          (load ,name-string nil t))))))))))
 
     ;; Certain keywords imply :defer, if :demand was not specified.
     (when (and (not (plist-member args :demand))