From 322e6afd55068ce9bf989de8668859087b569aa1 Mon Sep 17 00:00:00 2001 From: Yiming Chen Date: Mon, 15 Jan 2018 16:40:04 +0800 Subject: [PATCH 1/2] feature/evil: fix +evil/matchit-or-toggle-fold in magit modes - this function only worked in magit-status-mode but not other modes like magit-log-mode, magit-process-mode --- modules/feature/evil/autoload/folds.el | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/feature/evil/autoload/folds.el b/modules/feature/evil/autoload/folds.el index b4706abc1..00bd8c6fe 100644 --- a/modules/feature/evil/autoload/folds.el +++ b/modules/feature/evil/autoload/folds.el @@ -88,7 +88,7 @@ (interactive) (ignore-errors (call-interactively - (cond ((eq major-mode 'magit-status-mode) + (cond ((string-prefix-p "magit" (symbol-name major-mode)) #'magit-section-toggle) ((+evil-fold-p) #'+evil:fold-toggle) From abd3bc87fe5c015ed1a09fe5677908ea9f25adb1 Mon Sep 17 00:00:00 2001 From: Yiming Chen Date: Sun, 21 Jan 2018 11:51:29 +0800 Subject: [PATCH 2/2] feature/evil: use magit-section-toggle if mode is derived from magit-mode - Closes #359 - See also https://github.com/hlissner/doom-emacs/pull/359#issuecomment-359220633 --- modules/feature/evil/autoload/folds.el | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/feature/evil/autoload/folds.el b/modules/feature/evil/autoload/folds.el index 00bd8c6fe..e913ca1b6 100644 --- a/modules/feature/evil/autoload/folds.el +++ b/modules/feature/evil/autoload/folds.el @@ -88,7 +88,7 @@ (interactive) (ignore-errors (call-interactively - (cond ((string-prefix-p "magit" (symbol-name major-mode)) + (cond ((derived-mode-p 'magit-mode) #'magit-section-toggle) ((+evil-fold-p) #'+evil:fold-toggle)