masscollaborationlabs/emacs
2
0
Fork 0
mirror of https://github.com/masscollaborationlabs/emacs.git synced 2025-07-06 12:19:37 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request from CeleritasCelery/master

Browse source 
GitHub-reference: https://github.com/jwiegley/use-package/issues/743
This commit is contained in:
John Wiegley 2022-09-09 17:25:57 -07:00 • committed by GitHub
commit c12deb31fe
2 changed files with 11 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -1295,7 +1295,10 @@ meaning:
(setq every nil))) (setq every nil)))
every)))) every))))
#'use-package-recognize-function #'use-package-recognize-function
name label arg)))) (if (string-suffix-p "-mode" (symbol-name name))
name
(intern (concat (symbol-name name) "-mode")))
label arg))))
(defalias 'use-package-autoloads/:hook 'use-package-autoloads-mode) (defalias 'use-package-autoloads/:hook 'use-package-autoloads-mode)

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

@ -984,15 +984,17 @@
'foopkg :hook args))) 'foopkg :hook args)))
(should-error (norm nil)) (should-error (norm nil))
(should (equal (norm '(bar)) (should (equal (norm '(bar))
'((bar . foopkg-mode))))
(should (equal (norm '((bar . foopkg)))
'((bar . foopkg)))) '((bar . foopkg))))
(should (equal (norm '((bar . baz))) (should (equal (norm '((bar . baz)))
'((bar . baz)))) '((bar . baz))))
(should (equal (norm '(((bar baz) . quux))) (should (equal (norm '(((bar baz) . quux)))
'(((bar baz) . quux)))) '(((bar baz) . quux))))
(should (equal (norm '(bar baz)) (should (equal (norm '(bar baz))
'(((bar baz) . foopkg)))) '(((bar baz) . foopkg-mode))))
(should (equal (norm '((bar baz) (quux bow))) (should (equal (norm '((bar baz) (quux bow)))
'(((bar baz) . foopkg) ((quux bow) . foopkg)))) '(((bar baz) . foopkg-mode) ((quux bow) . foopkg-mode))))
(should (equal (norm '((bar . baz) (quux . bow))) (should (equal (norm '((bar . baz) (quux . bow)))
'((bar . baz) (quux . bow)))) '((bar . baz) (quux . bow))))
(should (equal (norm '(((bar1 bar2) . baz) ((quux1 quux2) . bow))) (should (equal (norm '(((bar1 bar2) . baz) ((quux1 quux2) . bow)))
@ -1945,9 +1947,9 @@
(use-package nonexistent (use-package nonexistent
:hook lisp-mode) :hook lisp-mode)
`(when (locate-library nonexistent) `(when (locate-library nonexistent)
(unless (fboundp 'nonexistent) (unless (fboundp 'nonexistent-mode)
(autoload #'nonexistent "nonexistent" nil t)) (autoload #'nonexistent-mode "nonexistent" nil t))
(add-hook 'lisp-mode-hook #'nonexistent))))) (add-hook 'lisp-mode-hook #'nonexistent-mode)))))
(ert-deftest bind-key/:prefix-map () (ert-deftest bind-key/:prefix-map ()
(match-expansion (match-expansion