Remove key-chord mode !! Not needed anymore (great news).

This commit is contained in:
syl20bnr 2013-05-06 20:59:13 -04:00
parent 9e90303328
commit 3420ffde71
6 changed files with 11 additions and 16 deletions

View File

@ -6,7 +6,8 @@
(setq evil-insert-state-cursor '("green3" box))
(setq evil-motion-state-cursor '("purple" box))
;; from https://github.com/roman/emacs.d/blob/master/zoo/zoo-evil.el
;; inspired from:
;; https://github.com/roman/emacs.d/blob/master/zoo/zoo-evil.el
(evil-define-command fd-to-normal-mode ()
"Allows to get into 'normal' mode using 'fd'."
:repeat change
@ -22,7 +23,7 @@
;; remove the f character
(delete-char -1)
(set-buffer-modified-p modified)
(push 'escape unread-command-events))
(evil-normal-state))
(t ; otherwise
(setq unread-command-events (append unread-command-events
(list evt))))))))

View File

@ -1,2 +0,0 @@
(key-chord-mode 1)
(setq key-chord-two-keys-delay 0.05)

View File

@ -48,5 +48,4 @@
(require 'packages)
(require 'post-extensions)
(require 'my-keybindings)
(require 'my-keychords)

View File

@ -1,13 +1,15 @@
;; Regular shortcuts ==========================================================
;; evil -----------------------------------------------------------------------
;; returns to normal mode
(define-key evil-insert-state-map "f" #'fd-to-normal-mode)
(define-key evil-visual-state-map "f" #'fd-to-normal-mode)
(define-key evil-emacs-state-map "f" #'fd-to-normal-mode)
(define-key evil-motion-state-map "f" #'fd-to-normal-mode)
;;Make evil-mode up/down operate in screen lines instead of logical lines
(define-key evil-normal-state-map (kbd "j") 'evil-next-visual-line)
(define-key evil-normal-state-map (kbd "k") 'evil-previous-visual-line)
(define-key evil-insert-state-map (kbd "ESC") 'evil-normal-state)
;; insert blank lines ---------------------------------------------------------
(define-key evil-normal-state-map (kbd "M-j") 'evil-insert-line-below)
(define-key evil-normal-state-map (kbd "M-k") 'evil-insert-line-above)
;; close parens ---------------------------------------------------------------
(global-set-key (kbd ")") 'close-open-paren)
;; mu4e -----------------------------------------------------------------------
@ -67,6 +69,9 @@
(evil-leader/set-key "hh" 'auto-highlight-symbol-mode)
(evil-leader/set-key "hn" 'ahs-forward)
(evil-leader/set-key "hp" 'ahs-backward)
;; insert stuff ---------------------------------------------------------------
(evil-leader/set-key "ij" 'evil-insert-line-below)
(evil-leader/set-key "ik" 'evil-insert-line-above)
;; jump -----------------------------------------------------------------------
(evil-leader/set-key "jk" 'evil-join)
(evil-leader/set-key "jj" 'paredit-newline)

View File

@ -1,7 +0,0 @@
;; evil -----------------------------------------------------------------------
(key-chord-define evil-insert-state-map "fd" 'evil-normal-state)
(key-chord-define evil-visual-state-map "fd" 'evil-normal-state)
(key-chord-define evil-emacs-state-map "fd" 'evil-normal-state)
(key-chord-define evil-motion-state-map "fd" 'evil-normal-state)
(provide 'my-keychords)

View File

@ -46,7 +46,6 @@
htmlize
jedi
json-mode
key-chord
less-css-mode
magit
markdown-mode