From aaee1faea49ddcf53305f94b6701abcb02cb69aa Mon Sep 17 00:00:00 2001 From: Martin Polden Date: Sun, 3 Jul 2022 16:23:10 +0200 Subject: git: avoid direct dependency on markdown-mode --- lisp/init-git.el | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/lisp/init-git.el b/lisp/init-git.el index 71e1a26..a24708a 100644 --- a/lisp/init-git.el +++ b/lisp/init-git.el @@ -16,6 +16,12 @@ If NOSELECT is non-nil, do not select the window." (interactive) (mpolden/magit-visit-file-other-window t)) +(defun mpolden/gfm-or-text-mode () + "Enable `gfm-mode' if available, otherwise enable `text-mode'." + (if (fboundp 'gfm-mode) + (gfm-mode) + (text-mode))) + (use-package magit :ensure t :init @@ -46,10 +52,9 @@ If NOSELECT is non-nil, do not select the window." (use-package git-commit :ensure t - :after markdown-mode :init ;; use gfm-mode as major mode - (setq git-commit-major-mode 'gfm-mode)) + (setq git-commit-major-mode 'mpolden/gfm-or-text-mode)) (use-package smerge-mode ;; vc-git-find-file-hook calls this command -- cgit v1.2.3