emenel/doomemacs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Clean up bindings

Browse source
This commit is contained in:
Henrik Lissner 2016-06-04 23:39:03 -04:00
parent bf34bf5dfb
commit 285e9a900c
2 changed files with 16 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

7
core/defuns/defuns-evil.el
View file

@ -163,5 +163,12 @@
(require 'evil-easymotion) (require 'evil-easymotion)
(call-interactively doom--evil-snipe-repeat-fn)) (call-interactively doom--evil-snipe-repeat-fn))
;;;###autoload
(defun doom/evil-matchit ()
(interactive)
(if (ignore-errors (hs-already-hidden-p))
(hs-toggle-hiding)
(call-interactively 'evilmi-jump-items)))
(provide 'defuns-evil) (provide 'defuns-evil)
;;; defuns-evil.el ends here ;;; defuns-evil.el ends here

20
private/my-bindings.el
View file

@ -37,8 +37,8 @@
"A-h" 'doom/evil-window-resize-l "A-h" 'doom/evil-window-resize-l
"A-l" 'doom/evil-window-resize-r "A-l" 'doom/evil-window-resize-r
;; Temporary escape into emacs mode ;; Temporary escape into emacs mode
"C-<escape>" 'evil-emacs-state "<C-escape>" 'evil-emacs-state
:e "C-<escape>" 'evil-normal-state :e "<C-escape>" 'evil-normal-state
;; Switching tabs (workgroups) ;; Switching tabs (workgroups)
:m "M-1" (λ! (doom:switch-to-tab 0)) :m "M-1" (λ! (doom:switch-to-tab 0))
:m "M-2" (λ! (doom:switch-to-tab 1)) :m "M-2" (λ! (doom:switch-to-tab 1))
@ -254,9 +254,7 @@
:m "%" 'evilmi-jump-items :m "%" 'evilmi-jump-items
;; hide-show/evil-matchit ;; hide-show/evil-matchit
:m [tab] (λ! (if (ignore-errors (hs-already-hidden-p)) :m "<tab>" 'doom/evil-matchit
(hs-toggle-hiding)
(call-interactively 'evilmi-jump-items)))
;; rotate-text ;; rotate-text
:n "!" 'rotate-text :n "!" 'rotate-text
@ -266,8 +264,8 @@
;; yasnippet ;; yasnippet
(:map yas-minor-mode-map (:map yas-minor-mode-map
:i [(tab)] 'yas-expand :i [tab] 'yas-expand
:v [(tab)] 'doom/yas-insert-snippet) :v [tab] 'doom/yas-insert-snippet)
;; company-mode and vim-like omni-complete ;; company-mode and vim-like omni-complete
:i "C-SPC" 'doom/company-complete :i "C-SPC" 'doom/company-complete
@ -295,7 +293,7 @@
"C-s" 'company-filter-candidates "C-s" 'company-filter-candidates
"C-SPC" 'company-complete-common-or-cycle "C-SPC" 'company-complete-common-or-cycle
[tab] 'doom/company-complete-common-or-complete-full [tab] 'doom/company-complete-common-or-complete-full
"<backtab>" 'company-select-previous [backtab] 'company-select-previous
[escape] (λ! (company-abort) (evil-normal-state 1)) [escape] (λ! (company-abort) (evil-normal-state 1))
[C-return] 'counsel-company) [C-return] 'counsel-company)
(:map company-search-map (:map company-search-map
@ -314,9 +312,9 @@
;;; Insert mode hacks ;;; Insert mode hacks
;; Textmate-esque newlines ;; Textmate-esque newlines
:i "<backspace>" 'delete-backward-char :i [backspace] 'delete-backward-char
:i "<M-backspace>" 'doom/backward-kill-to-bol-and-indent :i [M-backspace] 'doom/backward-kill-to-bol-and-indent
:i "<C-return>" 'evil-ret-and-indent :i [C-return] (λ! (evil-open-below 1))
;; Emacsien motions for insert mode ;; Emacsien motions for insert mode
:i "C-b" 'backward-word :i "C-b" 'backward-word
:i "C-f" 'forward-word :i "C-f" 'forward-word