Load modes depending on git-commit-mode correctly

3 files changed, 12 insertions, 11 deletions

diff --git a/lisp/init-flyspell.el b/lisp/init-flyspell.el
index c6468a1..c72edcd 100644
--- a/lisp/init-flyspell.el
+++ b/lisp/init-flyspell.el
@@ -2,6 +2,10 @@
   ;; package is bundled with emacs
   :ensure nil
 
+  ;; load flyspell automatically for these modes
+  :hook ((git-commit-mode . flyspell-mode)
+         (gfm-mode . flyspell-mode))
+
   :bind (:map flyspell-mode-map
               ("C-c s" . flyspell-correct-word-before-point)))
 
diff --git a/lisp/init-git.el b/lisp/init-git.el
index e54158c..d50f9be 100644
--- a/lisp/init-git.el
+++ b/lisp/init-git.el
@@ -15,12 +15,7 @@
         (lambda ()
           (if (equal (buffer-name) "PULLREQ_EDITMSG")
               (funcall 'gfm-mode)
-            (funcall 'text-mode))))
-
-  :config
-  (add-hook 'git-commit-mode-hook
-            (lambda ()
-              (when (featurep 'flyspell) (flyspell-mode 1)))))
+            (funcall 'text-mode)))))
 
 ;; magit config
 (defun magit-diff-visit-file-other-window (&optional noselect)
diff --git a/lisp/init-markdown-mode.el b/lisp/init-markdown-mode.el
index 2a4fa5f..321d272 100644
--- a/lisp/init-markdown-mode.el
+++ b/lisp/init-markdown-mode.el
@@ -1,14 +1,16 @@
 (use-package markdown-mode
+  :commands gfm-mode
   :mode
-  ;; use markdown mode for .md and .markdown extensions
-  ("\\.\\(md\\|markdown\\)\\'" . gfm-mode)
+  ;; use gfm mode for .md and .markdown extensions
+  (("\\.\\(md\\|markdown\\)\\'" . gfm-mode)
+   ;; use gfm mode for pull request and issue buffers
+   ("PULLREQ_EDITMSG" . gfm-mode)
+   ("ISSUE_EDITMSG" . gfm-mode))
 
   :config
   (add-hook 'markdown-mode-hook
           (lambda ()
             ;; disable electric indent
-            (setq-local electric-indent-mode nil)
-            ;; enable flyspell
-            (when (featurep 'flyspell) (flyspell-mode 1)))))
+            (setq-local electric-indent-mode nil))))
 
 (provide 'init-markdown-mode)