Merge pull request jwiegley#743 from CeleritasCelery/master

Author: jwiegley

README.md

@@ -387,37 +387,37 @@ The `:hook` keyword allows adding functions onto package hooks. Thus,
 all of the following are equivalent:
 
 ``` elisp
-(use-package ace-jump-mode
+(use-package company
   :hook prog-mode)
 
-(use-package ace-jump-mode
-  :hook (prog-mode . ace-jump-mode))
+(use-package company
+  :hook (prog-mode . company-mode))
 
-(use-package ace-jump-mode
-  :commands ace-jump-mode
+(use-package company
+  :commands company-mode
   :init
-  (add-hook 'prog-mode-hook #'ace-jump-mode))
+  (add-hook 'prog-mode-hook #'company-mode))
 ```
 
 And likewise, when multiple hooks should be applied, the following are also
 equivalent:
 
 ``` elisp
-(use-package ace-jump-mode
+(use-package company
   :hook (prog-mode text-mode))
 
-(use-package ace-jump-mode
-  :hook ((prog-mode text-mode) . ace-jump-mode))
+(use-package company
+  :hook ((prog-mode text-mode) . company-mode))
 
-(use-package ace-jump-mode
-  :hook ((prog-mode . ace-jump-mode)
-         (text-mode . ace-jump-mode)))
+(use-package company
+  :hook ((prog-mode . company-mode)
+         (text-mode . company-mode)))
 
-(use-package ace-jump-mode
-  :commands ace-jump-mode
+(use-package company
+  :commands company-mode
   :init
-  (add-hook 'prog-mode-hook #'ace-jump-mode)
-  (add-hook 'text-mode-hook #'ace-jump-mode))
+  (add-hook 'prog-mode-hook #'company-mode)
+  (add-hook 'text-mode-hook #'company-mode))
 ```
 
 When using `:hook` omit the "-hook" suffix if you specify the hook

use-package-core.el

@@ -1295,7 +1295,10 @@ meaning:
                               (setq every nil)))
                           every))))
          #'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)
 

use-package-tests.el

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