Skip to content

Commit b59b4dc

Browse files
authored
Merge pull request jwiegley#1047 from jwiegley/johnw/revert
2 parents 77945e0 + 343c40d commit b59b4dc

File tree

2 files changed

+7
-10
lines changed

2 files changed

+7
-10
lines changed

use-package-core.el

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1305,10 +1305,7 @@ meaning:
13051305
(setq every nil)))
13061306
every))))
13071307
#'use-package-recognize-function
1308-
(if (string-suffix-p "-mode" (symbol-name name))
1309-
name
1310-
(intern (concat (symbol-name name) "-mode")))
1311-
label arg))))
1308+
name label arg))))
13121309

13131310
(defalias 'use-package-autoloads/:hook 'use-package-autoloads-mode)
13141311

use-package-tests.el

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -987,17 +987,17 @@
987987
'foopkg :hook args)))
988988
(should-error (norm nil))
989989
(should (equal (norm '(bar))
990-
'((bar . foopkg-mode))))
990+
'((bar . foopkg))))
991991
(should (equal (norm '((bar . foopkg)))
992992
'((bar . foopkg))))
993993
(should (equal (norm '((bar . baz)))
994994
'((bar . baz))))
995995
(should (equal (norm '(((bar baz) . quux)))
996996
'(((bar baz) . quux))))
997997
(should (equal (norm '(bar baz))
998-
'(((bar baz) . foopkg-mode))))
998+
'(((bar baz) . foopkg))))
999999
(should (equal (norm '((bar baz) (quux bow)))
1000-
'(((bar baz) . foopkg-mode) ((quux bow) . foopkg-mode))))
1000+
'(((bar baz) . foopkg) ((quux bow) . foopkg))))
10011001
(should (equal (norm '((bar . baz) (quux . bow)))
10021002
'((bar . baz) (quux . bow))))
10031003
(should (equal (norm '(((bar1 bar2) . baz) ((quux1 quux2) . bow)))
@@ -1926,9 +1926,9 @@
19261926
(use-package nonexistent
19271927
:hook lisp-mode)
19281928
`(when (locate-library nonexistent)
1929-
(unless (fboundp 'nonexistent-mode)
1930-
(autoload #'nonexistent-mode "nonexistent" nil t))
1931-
(add-hook 'lisp-mode-hook #'nonexistent-mode)))))
1929+
(unless (fboundp 'nonexistent)
1930+
(autoload #'nonexistent "nonexistent" nil t))
1931+
(add-hook 'lisp-mode-hook #'nonexistent)))))
19321932

19331933
(ert-deftest bind-key/:prefix-map ()
19341934
(match-expansion

0 commit comments

Comments
 (0)