Merge pull request from CeleritasCelery/master

GitHub-reference: https://github.com/jwiegley/use-package/issues/743

diff --cc lisp/use-package/use-package-core.el
Simple merge

diff --cc test/lisp/use-package/use-package-tests.el
index 3ef56a09b89d285f85d0b26d9ed3e76d98620b6b,b8063a046f5a382c270f1e15317b124c751d8867..9510fffb01cbf63f1c27dd2e826388d2a69d4f0a
--- 1/test/lisp/use-package/use-package-tests.el
--- 2/test/lisp/use-package/use-package-tests.el
+++ b/test/lisp/use-package/use-package-tests.el
@@@ -979,11 -993,13 +979,13 @@@
                                   (load "foo" nil t))))))))
  
  (ert-deftest use-package-test-normalize/:hook ()
 -  (flet ((norm (&rest args)
 -               (apply #'use-package-normalize/:hook
 -                      'foopkg :hook args)))
 +  (cl-flet ((norm (&rest args)
 +                  (apply #'use-package-normalize/:hook
 +                         'foopkg :hook args)))
      (should-error (norm nil))
      (should (equal (norm '(bar))
+                    '((bar . foopkg-mode))))
+     (should (equal (norm '((bar . foopkg)))
                     '((bar . foopkg))))
      (should (equal (norm '((bar . baz)))
                     '((bar . baz))))