From 037bae68d5ca6e6e9783c41e4102704b50f1bf62 Mon Sep 17 00:00:00 2001 From: Kyle Meyer Date: Sun, 28 Jun 2015 00:26:48 -0400 Subject: init-god.el: Use predicate for Magit modes --- lisp/init-god.el | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) (limited to 'lisp') diff --git a/lisp/init-god.el b/lisp/init-god.el index 4f3acf7..04c9a8c 100644 --- a/lisp/init-god.el +++ b/lisp/init-god.el @@ -4,17 +4,11 @@ '(gnus-group-mode gnus-summary-mode gnus-article-mode - message-mode - magit-popup-mode - magit-popup-sequence-mode)) + message-mode)) (setq god-exempt-major-modes (append km/god-exempt-major-modes god-exempt-major-modes)) -;; `god-exempt-major-modes' can't be used here because buffer is in -;; `text mode'. -(add-hook 'git-commit-setup-hook (lambda () (god-local-mode -1))) - (add-hook 'view-mode-hook (lambda () (if view-mode (god-local-mode-pause) @@ -38,6 +32,12 @@ (defun km/god-update-cursor () (setq cursor-type (if god-local-mode 'bar 'box))) +(defun km/god-magit-mode-p () + "Return non-nil if a Magit-related mode is enabled." + (or global-git-commit-mode + (god-mode-child-of-p major-mode 'magit-popup-mode) + (god-mode-child-of-p major-mode 'magit-mode))) + (global-set-key (kbd "C-c d") 'god-local-mode) (define-key god-local-mode-map "." 'repeat) -- cgit v1.2.3