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 b80da77fd8174295f98986753e1d6ad268bccb0f..db5e20f7ddf8f263c21276ae354404fbecd5be30 100644 (file)
--- 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))