masscollaborationlabs/emacs
2
0
Fork 0
mirror of https://github.com/masscollaborationlabs/emacs.git synced 2025-07-11 22:50:49 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Use require', not load', when byte-compiling ()

Browse source 
Use `require', not `load', when byte-compiling
GitHub-reference: https://github.com/jwiegley/use-package/issues/783
This commit is contained in:
John Wiegley 2019-07-16 11:29:12 -07:00 • committed by GitHub
commit 165f2dd968
2 changed files with 46 additions and 23 deletions
Download patch file Download diff file Expand all files Collapse all files

3
lisp/use-package/use-package-core.el
View file

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

66
test/lisp/use-package/use-package-tests.el
View file

@ -162,7 +162,8 @@
(eval-when-compile (eval-when-compile
(with-demoted-errors (with-demoted-errors
"Cannot load foo: %S" nil "Cannot load foo: %S" nil
(load "foo" nil t))) (unless (featurep 'foo)
(load "foo" nil t))))
(t)) (t))
(require 'foo nil nil))))) (require 'foo nil nil)))))
@ -182,7 +183,8 @@
(eval-when-compile (eval-when-compile
(with-demoted-errors (with-demoted-errors
"Cannot load foo: %S" nil "Cannot load foo: %S" nil
(load "foo" nil t))) (unless (featurep 'foo)
(load "foo" nil t))))
(preface)) (preface))
(init) (init)
(require 'foo nil nil) (require 'foo nil nil)
@ -206,7 +208,8 @@
(eval-when-compile (eval-when-compile
(with-demoted-errors (with-demoted-errors
"Cannot load foo: %S" nil "Cannot load foo: %S" nil
(load "foo" nil t))) (unless (featurep 'foo)
(load "foo" nil t))))
(preface)) (preface))
(init) (init)
(eval-after-load 'foo (eval-after-load 'foo
@ -453,7 +456,8 @@
(eval-when-compile (eval-when-compile
(with-demoted-errors (with-demoted-errors
"Cannot load foo: %S" nil "Cannot load foo: %S" nil
(load "foo" nil t)))) (unless (featurep 'foo)
(load "foo" nil t)))))
(require 'foo nil nil))))) (require 'foo nil nil)))))
(ert-deftest use-package-test/:requires-3 () (ert-deftest use-package-test/:requires-3 ()
@ -470,7 +474,8 @@
(eval-and-compile (eval-and-compile
(eval-when-compile (eval-when-compile
(with-demoted-errors "Cannot load foo: %S" nil (with-demoted-errors "Cannot load foo: %S" nil
(load "foo" nil t)))) (unless (featurep 'foo)
(load "foo" nil t)))))
(require 'foo nil nil))))) (require 'foo nil nil)))))
(ert-deftest use-package-test/:load-path-1 () (ert-deftest use-package-test/:load-path-1 ()
@ -499,7 +504,8 @@
(eval-and-compile (eval-and-compile
(eval-when-compile (eval-when-compile
(with-demoted-errors "Cannot load foo: %S" nil (with-demoted-errors "Cannot load foo: %S" nil
(load "foo" nil t)))) (unless (featurep 'foo)
(load "foo" nil t)))))
(require 'foo nil nil))))) (require 'foo nil nil)))))
(ert-deftest use-package-test/:load-path-3 () (ert-deftest use-package-test/:load-path-3 ()
@ -816,7 +822,8 @@
(eval-and-compile (eval-and-compile
(eval-when-compile (eval-when-compile
(with-demoted-errors "Cannot load foo: %S" nil (with-demoted-errors "Cannot load foo: %S" nil
(load "foo" nil t)))) (unless (featurep 'foo)
(load "foo" nil t)))))
(unless (fboundp 'bar) (unless (fboundp 'bar)
(autoload #'bar "foo" nil t)) (autoload #'bar "foo" nil t))
(eval-when-compile (eval-when-compile
@ -871,7 +878,8 @@
(eval-and-compile (eval-and-compile
(eval-when-compile (eval-when-compile
(with-demoted-errors "Cannot load gnus-harvest: %S" nil (with-demoted-errors "Cannot load gnus-harvest: %S" nil
(load "gnus-harvest" nil t)))) (unless (featurep 'gnus-harvest)
(load "gnus-harvest" nil t)))))
(eval-when-compile (eval-when-compile
(declare-function gnus-harvest-install "gnus-harvest")) (declare-function gnus-harvest-install "gnus-harvest"))
(require 'gnus-harvest nil nil) (require 'gnus-harvest nil nil)
@ -896,7 +904,8 @@
(eval-when-compile (eval-when-compile
(with-demoted-errors (with-demoted-errors
"Cannot load foo: %S" nil "Cannot load foo: %S" nil
(load "foo" nil t)))) (unless (featurep 'foo)
(load "foo" nil t)))))
(require 'foo nil nil))))) (require 'foo nil nil)))))
(ert-deftest use-package-test/:functions-1 () (ert-deftest use-package-test/:functions-1 ()
@ -914,7 +923,8 @@
(eval-when-compile (eval-when-compile
(with-demoted-errors (with-demoted-errors
"Cannot load foo: %S" nil "Cannot load foo: %S" nil
(load "foo" nil t)))) (unless (featurep 'foo)
(load "foo" nil t)))))
(require 'foo nil nil))))) (require 'foo nil nil)))))
(ert-deftest use-package-test/:functions-3 () (ert-deftest use-package-test/:functions-3 ()
@ -930,7 +940,8 @@
(declare-function bar "foo") (declare-function bar "foo")
(eval-when-compile (eval-when-compile
(with-demoted-errors "Cannot load foo: %S" nil (with-demoted-errors "Cannot load foo: %S" nil
(load "foo" nil t))))))) (unless (featurep 'foo)
(load "foo" nil t))))))))
(ert-deftest use-package-test/:functions-5 () (ert-deftest use-package-test/:functions-5 ()
(let ((byte-compile-current-file t)) (let ((byte-compile-current-file t))
@ -942,7 +953,8 @@
(eval-when-compile (eval-when-compile
(with-demoted-errors (with-demoted-errors
"Cannot load foo: %S" nil "Cannot load foo: %S" nil
(load "foo" nil t)))) (unless (featurep 'foo)
(load "foo" nil t)))))
(eval-after-load 'foo (eval-after-load 'foo
'(progn '(progn
(config) (config)
@ -961,7 +973,8 @@
(eval-and-compile (eval-and-compile
(eval-when-compile (eval-when-compile
(with-demoted-errors "Cannot load foo: %S" nil (with-demoted-errors "Cannot load foo: %S" nil
(load "foo" nil t)))) (unless (featurep 'foo)
(load "foo" nil t)))))
(require 'foo nil nil))))) (require 'foo nil nil)))))
(ert-deftest use-package-test/:defer-3 () (ert-deftest use-package-test/:defer-3 ()
@ -976,7 +989,8 @@
`(eval-and-compile `(eval-and-compile
(eval-when-compile (eval-when-compile
(with-demoted-errors "Cannot load foo: %S" nil (with-demoted-errors "Cannot load foo: %S" nil
(load "foo" nil t))))))) (unless (featurep 'foo)
(load "foo" nil t))))))))
(ert-deftest use-package-test-normalize/:hook () (ert-deftest use-package-test-normalize/:hook ()
(flet ((norm (&rest args) (flet ((norm (&rest args)
@ -1009,7 +1023,8 @@
(eval-when-compile (eval-when-compile
(with-demoted-errors (with-demoted-errors
"Cannot load foo: %S" nil "Cannot load foo: %S" nil
(load "foo" nil t)))) (unless (featurep 'foo)
(load "foo" nil t)))))
(unless (unless
(fboundp 'key) (fboundp 'key)
(autoload #'key "foo" nil t)) (autoload #'key "foo" nil t))
@ -1143,7 +1158,8 @@
(eval-and-compile (eval-and-compile
(eval-when-compile (eval-when-compile
(with-demoted-errors "Cannot load foo: %S" nil (with-demoted-errors "Cannot load foo: %S" nil
(load "foo" nil t)))) (unless (featurep 'foo)
(load "foo" nil t)))))
(init) (init)
(require 'foo nil nil))))) (require 'foo nil nil)))))
@ -1190,7 +1206,8 @@
(eval-and-compile (eval-and-compile
(eval-when-compile (eval-when-compile
(with-demoted-errors "Cannot load foo: %S" nil (with-demoted-errors "Cannot load foo: %S" nil
(load "foo" nil t)))) (unless (featurep 'foo)
(load "foo" nil t)))))
(eval-after-load 'bar (eval-after-load 'bar
'(require 'foo nil nil)))))) '(require 'foo nil nil))))))
@ -1333,7 +1350,8 @@
(eval-and-compile (eval-and-compile
(eval-when-compile (eval-when-compile
(with-demoted-errors "Cannot load foo: %S" nil (with-demoted-errors "Cannot load foo: %S" nil
(load "foo" nil t)))) (unless (featurep 'foo)
(load "foo" nil t)))))
(require 'foo nil nil))))) (require 'foo nil nil)))))
(ert-deftest use-package-test/:demand-3 () (ert-deftest use-package-test/:demand-3 ()
@ -1352,7 +1370,8 @@
(eval-and-compile (eval-and-compile
(eval-when-compile (eval-when-compile
(with-demoted-errors "Cannot load foo: %S" nil (with-demoted-errors "Cannot load foo: %S" nil
(load "foo" nil t)))) (unless (featurep 'foo)
(load "foo" nil t)))))
(require 'foo nil nil) (require 'foo nil nil)
(config) (config)
t)))) t))))
@ -1372,7 +1391,8 @@
(eval-and-compile (eval-and-compile
(eval-when-compile (eval-when-compile
(with-demoted-errors "Cannot load foo: %S" nil (with-demoted-errors "Cannot load foo: %S" nil
(load "foo" nil t)))) (unless (featurep 'foo)
(load "foo" nil t)))))
(eval-after-load 'bar (eval-after-load 'bar
'(require 'foo nil nil)))))) '(require 'foo nil nil))))))
@ -1425,7 +1445,8 @@
(eval-and-compile (eval-and-compile
(eval-when-compile (eval-when-compile
(with-demoted-errors "Cannot load foo: %S" nil (with-demoted-errors "Cannot load foo: %S" nil
(load "foo" nil t)))) (unless (featurep 'foo)
(load "foo" nil t)))))
(require 'foo nil nil) (require 'foo nil nil)
(config) (config)
t)))) t))))
@ -1446,7 +1467,8 @@
(eval-and-compile (eval-and-compile
(eval-when-compile (eval-when-compile
(with-demoted-errors "Cannot load foo: %S" nil (with-demoted-errors "Cannot load foo: %S" nil
(load "foo" nil t)))) (unless (featurep 'foo)
(load "foo" nil t)))))
(eval-after-load 'foo (eval-after-load 'foo
'(progn '(progn
(config) (config)