Moved god-mode's definitions after helm's
This commit is contained in:
parent
26f6d3b418
commit
1e94ed2b46
34
init.el
34
init.el
|
@ -202,23 +202,6 @@
|
|||
;;;; chicken.el
|
||||
(require 'chicken)
|
||||
|
||||
;;;; God Mode
|
||||
(require 'god-mode)
|
||||
(global-set-key (kbd "<escape>") 'god-mode-all)
|
||||
(god-mode-all)
|
||||
|
||||
(setq god-exempt-major-modes nil)
|
||||
(setq god-exempt-predicates nil)
|
||||
(define-key helm-map (kbd "<escape>") 'god-local-mode)
|
||||
|
||||
(defun my-update-cursor ()
|
||||
(setq cursor-type (if (or god-local-mode buffer-read-only)
|
||||
'box
|
||||
'bar)))
|
||||
|
||||
(add-hook 'god-mode-enabled-hook 'my-update-cursor)
|
||||
(add-hook 'god-mode-disabled-hook 'my-update-cursor)
|
||||
|
||||
;;;; Evil mode
|
||||
(require 'evil)
|
||||
;(evil-mode 1)
|
||||
|
@ -345,6 +328,23 @@
|
|||
(add-to-list 'helm-mode-no-completion-in-region-in-modes 'erc-mode)
|
||||
(setq helm-mode-handle-completion-in-region 'nil)
|
||||
|
||||
;;;; God Mode
|
||||
(require 'god-mode)
|
||||
(global-set-key (kbd "<escape>") 'god-mode-all)
|
||||
(god-mode-all)
|
||||
|
||||
(setq god-exempt-major-modes nil)
|
||||
(setq god-exempt-predicates nil)
|
||||
(define-key helm-map (kbd "<escape>") 'god-local-mode)
|
||||
|
||||
(defun my-update-cursor ()
|
||||
(setq cursor-type (if (or god-local-mode buffer-read-only)
|
||||
'box
|
||||
'bar)))
|
||||
|
||||
(add-hook 'god-mode-enabled-hook 'my-update-cursor)
|
||||
(add-hook 'god-mode-disabled-hook 'my-update-cursor)
|
||||
|
||||
;;;; Ediff stuff
|
||||
(setq ediff-window-setup-function 'ediff-setup-windows-plain)
|
||||
|
||||
|
|
Loading…
Reference in New Issue