Move sp-splice commands on e and E in evil-lisp-state

This commit is contained in:
syl20bnr 2015-02-16 23:59:26 -05:00
parent 80e7d0e356
commit e156aa9dfc
2 changed files with 8 additions and 8 deletions

View file

@ -1941,6 +1941,8 @@ Key Binding | Function
<kbd>SPC k Dw</kbd> | backward delete word
<kbd>SPC k dx</kbd> | delete expression
<kbd>SPC k Dx</kbd> | backward delete expression
<kbd>SPC k e</kbd> | unwrap current expression and kill all symbols after point
<kbd>SPC k E</kbd> | unwrap current expression and kill all symbols before point
<kbd>SPC k h</kbd> | previous symbol
<kbd>SPC k i</kbd> | switch to `insert state`
<kbd>SPC k I</kbd> | go to beginning of current expression and switch to `insert state`
@ -1953,8 +1955,6 @@ Key Binding | Function
<kbd>SPC k r</kbd> | raise expression (replace parent expression by current one)
<kbd>SPC k s</kbd> | forwared slurp expression
<kbd>SPC k S</kbd> | backward slurp expression
<kbd>SPC k C-s</kbd> | unwrap current expression and kill all symbols after point
<kbd>SPC k C-S</kbd> | unwrap current expression and kill all symbols before point
<kbd>SPC k t</kbd> | transpose expression
<kbd>SPC k u</kbd> | undo
<kbd>SPC k C-r</kbd> | redo

View file

@ -57,6 +57,8 @@
;; `leader m ds' | delete symbol
;; `leader m dw' | delete word
;; `leader m dx' | delete expression
;; `leader m e' | (splice) unwrap current expression and kill all symbols after point
;; `leader m E' | (splice) unwrap current expression and kill all symbols before point
;; `leader m h' | previous symbol
;; `leader m i' | switch to `insert state`
;; `leader m I' | go to beginning of current expression and switch to `insert state`
@ -70,8 +72,6 @@
;; `leader m s' | forwared slurp expression
;; `leader m S' | backward slurp expression
;; `leader m t' | transpose expression
;; `leader m C-s' | (splice) unwrap current expression and kill all symbols after point
;; `leader m C-S' | (splice) unwrap current expression and kill all symbols before point
;; `leader m u' | undo
;; `leader m C-r' | redo
;; `leader m v' | switch to `visual state`
@ -194,6 +194,8 @@ If `evil-lisp-state-global' is non nil then this variable has no effect."
("Dw" . sp-backward-kill-word)
("dx" . sp-kill-sexp)
("Dx" . sp-backward-kill-sexp)
("e" . sp-splice-sexp-killing-forward)
("E" . sp-splice-sexp-killing-backward)
("h" . sp-backward-symbol)
("i" . evil-insert-state)
("I" . evil-insert-line)
@ -206,8 +208,6 @@ If `evil-lisp-state-global' is non nil then this variable has no effect."
("r" . sp-raise-sexp)
("s" . sp-forward-slurp-sexp)
("S" . sp-backward-slurp-sexp)
("C-s" . sp-splice-sexp-killing-forward)
("C-S" . sp-splice-sexp-killing-backward)
("t" . sp-transpose-sexp)
("u" . undo-tree-undo)
("C-r" . undo-tree-redo)
@ -226,11 +226,11 @@ If `evil-lisp-state-global' is non nil then this variable has no effect."
(define-key evil-lisp-state-map ,(kbd key) ',cmd)
(if evil-lisp-state-global
(evil-leader/set-key
,(kbd (concat evil-lisp-state-leader-prefix key))
,(kbd (concat evil-lisp-state-leader-prefix " "key))
(evil-lisp-state-enter-command ,cmd))
(dolist (mm evil-lisp-state-major-modes)
(evil-leader/set-key-for-mode mm
,(kbd (concat evil-lisp-state-leader-prefix key))
,(kbd (concat evil-lisp-state-leader-prefix " " key))
(evil-lisp-state-enter-command ,cmd))))))))
(defun lisp-state-toggle-lisp-state ()