From: John Wiegley Date: Sat, 10 Sep 2022 00:25:57 +0000 (-0700) Subject: Merge pull request from CeleritasCelery/master X-Git-Tag: emacs-29.0.90~1306^2~15^2~19 X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=c12deb31fe;p=emacs.git Merge pull request from CeleritasCelery/master GitHub-reference: https://github.com/jwiegley/use-package/issues/743 --- c12deb31fe3e9e9ad3d28c04c136a03afec4c5ca diff --cc test/lisp/use-package/use-package-tests.el index 3ef56a09b89,b8063a046f5..9510fffb01c --- a/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))))