TakeV/spacemacs
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

Remove experimental feature leader on jk

Browse source 
Use `C-o <SPC>` instead
This commit is contained in:
syl20bnr 2015-01-18 23:24:42 -05:00
parent 06be50a841
commit 69e9c81e8f
4 changed files with 8 additions and 119 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
core/dotspacemacs.el
View file

@ -76,10 +76,6 @@ can be toggled through `toggle-transparency'.")
overrides the default behavior of Emacs which recenters the point when
it reaches the top or bottom of the screen.")
(defvar dotspacemacs-feature-toggle-leader-on-jk nil
"If non nil pressing 'jk' in insert state, ido or helm will activate the
evil leader.")
(defvar dotspacemacs-persistent-server nil
"If non nil advises quit functions to keep server open when quitting.")

3
core/templates/.spacemacs.template
View file

@ -61,9 +61,6 @@
;; overrides the default behavior of Emacs which recenters the point when
;; it reaches the top or bottom of the screen
dotspacemacs-smooth-scrolling t
;; If non nil pressing 'jk' in insert state, ido or helm will activate the
;; evil leader.
dotspacemacs-feature-toggle-leader-on-jk nil
;; If non-nil smartparens-strict-mode will be enabled in programming modes.
dotspacemacs-smartparens-strict-mode nil
;; If non nil advises quit functions to keep server open when quitting.

74
doc/DOCUMENTATION.md
View file

@ -60,7 +60,6 @@
- [Navigating](#navigating)
- [Point/Cursor](#pointcursor)
- [Smooth scrolling](#smooth-scrolling)
- [Experimental insert state feature](#experimental-insert-state-feature)
- [Vim motions with ace-jump mode](#vim-motions-with-ace-jump-mode)
- [Window manipulation](#window-manipulation)
- [Resizing windows](#resizing-windows)
@ -69,7 +68,6 @@
- [Buffers and Files](#buffers-and-files)
- [Emacs and Spacemacs files](#emacs-and-spacemacs-files)
- [Ido](#ido)
- [Experimental Ido feature](#experimental-ido-feature)
- [NeoTree file tree](#neotree-file-tree)
- [NeoTree navigation](#neotree-navigation)
- [Opening files with NeoTree](#opening-files-with-neotree)
@ -110,9 +108,7 @@
- [Commenting](#commenting)
- [Deleting files](#deleting-files)
- [Editing Lisp code](#editing-lisp-code)
- [Key bindings maps](#key-bindings-maps)
- [Regular normal state bindings](#regular-normal-state-bindings)
- [Lisp specific bindings](#lisp-specific-bindings)
- [Commands:](#commands)
- [Project management](#project-management)
- [Registers](#registers)
- [Errors handling](#errors-handling)
@ -120,7 +116,6 @@
- [Modes](#modes)
- [Major Mode leader key](#major-mode-leader-key)
- [Helm](#helm)
- [Experimental Helm feature](#experimental-helm-feature)
- [Ledger](#ledger)
- [Org](#org)
- [Python](#python)
@ -135,7 +130,6 @@
- [I have no file ~/.spacemacs](#i-have-no-file-spacemacs)
- [Tips](#tips)
- [evil-lisp-state as default state](#evil-lisp-state-as-default-state)
- ["jk" to trigger evil leader](#jk-to-trigger-evil-leader)
- [Achievements](#achievements)
- [Thank you](#thank-you)
@ -923,12 +917,6 @@ the `dotspacemacs-smooth-scrolling` variable in your `~/.spacemacs` to `nil`:
(setq-default dotspacemacs-smooth-scrolling t)
```
#### Experimental insert state feature
If `dotspacemacs-feature-toggle-leader-on-jk` is non nil, pressing `jk` while
in `insert state` will trigger the evil leader as if you pressed <kbd>SPC</kbd> in
normal mode.
### Vim motions with ace-jump mode
`Spacemacs` uses the `evil` integration of [ace-jump mode][ace-jump] which
@ -1105,20 +1093,6 @@ Key Binding | Description
<kbd>C-t</kbd> | open selected file in a new frame
<kbd>C-v</kbd> | open selected file in a horizontally split window
#### Experimental Ido feature
If `dotspacemacs-feature-toggle-leader-on-jk` is non nil, pressing `jk` while
in `ido` minibuffer will trigger the evil leader.
When evil leader is triggered the following commands are available:
Key Binding | Description
--------------|----------------------------------------------------------------
<kbd>s</kbd> | open selected file in a vertically split window
<kbd>t</kbd> | open selected file in a new frame
<kbd>v</kbd> | open selected file in a horizontally split window
<kbd>x</kbd> | open selected file in other window
### NeoTree file tree
`Spacemacs` provides a quick and simple way to navigate in an unknown project
@ -1201,12 +1175,9 @@ Key Binding | Description
Navigating in shell buffers can be tricky because it is not possible to use the
leader in `insert state`. Switching back and forth between normal and insert
states can be tedious.
There are two solutions for this:
- use <kbd>C-o</kbd> then use the leader key
- enable the [leader on `jk`](#experimental-insert-state-feature)
experimental feature.
states can be tedious. The solution to this is to use <kbd>C-o</kbd> then use
the leader key. <kbd>C-o</kbd> set the next key to be evaluated in
`normal state`.
### Bookmarks
@ -1819,27 +1790,6 @@ setup the key on tabulation:
<kbd>CTRL+k</kbd> | go to next item
<kbd>CTRL+l</kbd> | go to next page
#### Experimental Helm feature
If `dotspacemacs-feature-toggle-leader-on-jk` is non nil, pressing `jk` while
in `helm` buffer will trigger the evil leader.
When evil leader is triggered the following commands are available:
Key Binding | Description
--------------|----------------------------------------------------------------
<kbd>1</kbd> | execute action 0
<kbd>2</kbd> | execute action 1
<kbd>3</kbd> | execute action 2
<kbd>4</kbd> | execute action 3
<kbd>5</kbd> | execute action 4
<kbd>6</kbd> | execute action 5
<kbd>7</kbd> | execute action 6
<kbd>8</kbd> | execute action 7
<kbd>9</kbd> | execute action 8
<kbd>0</kbd> | execute action 9
<kbd>a</kbd> | toggle action selection menu
### Ledger
Key Binding | Description
@ -1971,22 +1921,6 @@ your `~/.spacemacs` the following snippet:
(add-hook 'emacs-lisp-mode-hook 'evil-lisp-state))
```
## "jk" to trigger evil leader
It is possible to activate an experimental feature which allows to trigger the
evil leader in `insert state`, in `ido` minibuffer and in `helm` buffers.
To activate it, set `dotspacemacs-feature-toggle-leader-on-jk` to `t`.
```elisp
(setq-default dotspacemacs-feature-toggle-leader-on-jk t)
```
More info on this feature:
- [insert state](#experimental-insert-state-feature)
- [helm](#experimental-helm-feature)
- [ido](#experimental-ido-feature)
# Achievements
Achievements | Account

46
spacemacs/packages.el
View file

@ -637,17 +637,7 @@ which require an initialization must be listed explicitly in the list.")
(setq evil-iedit-insert-state-cursor `((spacemacs/state-color 'iedit-insert) (bar . 2)))
;; activate leader in iedit and iedit-insert states
(define-key evil-iedit-state-map
(kbd evil-leader/leader) evil-leader--default-map)
;; evil-escape support
;; (when (and (boundp 'evil-escape-mode)
;; (symbol-value evil-escape-mode))
;; (key-chord-define evil-iedit-state-map
;; evil-escape-key-sequence
;; 'evil-iedit-state/quit-iedit-mode)
;; (key-chord-define evil-iedit-insert-state-map
;; evil-escape-key-sequence
;; 'evil-iedit-state/quit-iedit-mode))
)
(kbd evil-leader/leader) evil-leader--default-map))
(evil-leader/set-key "se" 'evil-iedit-state/iedit-mode)
(add-to-hooks 'spacemacs/evil-state-lazy-loading '(prog-mode-hook
@ -687,14 +677,10 @@ which require an initialization must be listed explicitly in the list.")
evil-leader--default-map)
(define-key evil-motion-state-map (kbd dotspacemacs-leader-key)
evil-leader--default-map)
;; experimental: invoke leader with "jk" in insert mode
;; (when dotspacemacs-feature-toggle-leader-on-jk
;; (key-chord-define evil-insert-state-map (kbd "jk")
;; evil-leader--default-map))
;; experimental: map SPC m to ,
(when dotspacemacs-major-mode-leader-key
(add-hook 'after-change-major-mode-hook 'spacemacs/activate-major-mode-leader))
)))
(add-hook 'after-change-major-mode-hook
'spacemacs/activate-major-mode-leader)))))
(defun spacemacs/init-evil-nerd-commenter ()
(use-package evil-nerd-commenter
@ -1185,21 +1171,6 @@ which require an initialization must be listed explicitly in the list.")
(define-key helm-map (kbd "C-k") 'helm-previous-line)
(define-key helm-map (kbd "C-h") 'helm-next-source)
(define-key helm-map (kbd "C-l") 'helm-previous-source)
;; experimental: toggle evil-leader with "jk" with helm specific commands
;; (when dotspacemacs-feature-toggle-leader-on-jk
;; (evil-leader/set-key-for-mode 'helm-mode
;; "1" (lambda () (interactive) (helm-select-nth-action 0))
;; "2" (lambda () (interactive) (helm-select-nth-action 1))
;; "3" (lambda () (interactive) (helm-select-nth-action 2))
;; "4" (lambda () (interactive) (helm-select-nth-action 3))
;; "5" (lambda () (interactive) (helm-select-nth-action 4))
;; "6" (lambda () (interactive) (helm-select-nth-action 5))
;; "7" (lambda () (interactive) (helm-select-nth-action 6))
;; "8" (lambda () (interactive) (helm-select-nth-action 7))
;; "9" (lambda () (interactive) (helm-select-nth-action 8))
;; "0" (lambda () (interactive) (helm-select-nth-action 9))
;; "a" 'helm-select-action)
;; (key-chord-define helm-map (kbd "jk") (cdr (assoc 'helm-mode evil-leader--mode-maps))))
;; eshell
(defun spacemacs/helm-eshell-history ()
@ -1349,16 +1320,7 @@ which require an initialization must be listed explicitly in the list.")
(define-key ido-completion-map (kbd "<up>") 'ido-prev-match)
(define-key ido-completion-map (kbd "<down>") 'ido-next-match)
(define-key ido-completion-map (kbd "<left>") 'ido-delete-backward-updir)
(define-key ido-completion-map (kbd "<right>") 'ido-exit-minibuffer)
;; (when dotspacemacs-feature-toggle-leader-on-jk
;; (evil-leader/set-key-for-mode 'ido-mode
;; "s" 'ido-invoke-in-vertical-split
;; "t" 'ido-invoke-in-new-frame
;; "v" 'ido-invoke-in-horizontal-split
;; "x" 'ido-invoke-in-other-window)
;; (key-chord-define ido-completion-map (kbd "jk")
;; (cdr (assoc 'ido-mode evil-leader--mode-maps))))
)
(define-key ido-completion-map (kbd "<right>") 'ido-exit-minibuffer))
(add-to-list 'ido-setup-hook 'spacemacs//ido-vertical-define-keys))
))