Change all references of micro-state in codebase to transient-state

This commit is contained in:
Balaji Sivaraman 2016-01-30 17:02:53 +05:30 committed by syl20bnr
parent 62337a3e3a
commit 2b1ed603dc
26 changed files with 185 additions and 185 deletions

View File

@ -180,8 +180,8 @@ auto-save the file in-place, `cache' to auto-save the file to another
file stored in the cache directory and `nil' to disable auto-saving. file stored in the cache directory and `nil' to disable auto-saving.
Default value is `cache'.") Default value is `cache'.")
(defvar dotspacemacs-enable-paste-micro-state t (defvar dotspacemacs-enable-paste-transient-state t
"If non nil the paste micro-state is enabled. While enabled pressing `p` "If non nil the paste transient-state is enabled. While enabled pressing `p`
several times cycle between the kill ring content.'") several times cycle between the kill ring content.'")
(defvar dotspacemacs-which-key-delay 0.4 (defvar dotspacemacs-which-key-delay 0.4

View File

@ -10,7 +10,7 @@
- [[Reserved prefix][Reserved prefix]] - [[Reserved prefix][Reserved prefix]]
- [[User prefix][User prefix]] - [[User prefix][User prefix]]
- [[Major mode prefix][Major mode prefix]] - [[Major mode prefix][Major mode prefix]]
- [[Micro-state][Micro-state]] - [[Transient-state][Transient-state]]
- [[Evilified buffers][Evilified buffers]] - [[Evilified buffers][Evilified buffers]]
- [[Navigation][Navigation]] - [[Navigation][Navigation]]
- [[n and N][n and N]] - [[n and N][n and N]]
@ -54,7 +54,7 @@ Variables follow these conventions:
A package is initialized in a function with name =<layer>/init-xxx= where: A package is initialized in a function with name =<layer>/init-xxx= where:
- =<layer>= is the layer name - =<layer>= is the layer name
- =xxx= is the package name - =xxx= is the package name
** Use-package ** Use-package
- Always use =progn= when a code block requires multiple lines for =:init= or - Always use =progn= when a code block requires multiple lines for =:init= or
=:config= keywords. =:config= keywords.
@ -73,14 +73,14 @@ user.
~SPC m~ is reserved for the current major mode. Three keys bindings are not an ~SPC m~ is reserved for the current major mode. Three keys bindings are not an
issue (ie. ~SPC m h d~) since ~SPC m~ can be accessed via ~,~. issue (ie. ~SPC m h d~) since ~SPC m~ can be accessed via ~,~.
*** Micro-state *** Transient-state
Whenever possible a micro-state should be enabled with ~M-SPC~ and ~s-M-SPC~. We Whenever possible a transient-state should be enabled with ~M-SPC~ and ~s-M-SPC~. We
need the latter bindings on OS X since ~M-SPC~ is used by the OS for spotlight. need the latter bindings on OS X since ~M-SPC~ is used by the OS for spotlight.
For instance micro-states dedicated to special buffers like =helm= or =ido= For instance transient-states dedicated to special buffers like =helm= or =ido=
buffers are good candidates to be put on ~M-SPC~ and ~s-M-SPC~. buffers are good candidates to be put on ~M-SPC~ and ~s-M-SPC~.
It is recommended to add ~q~ to leave the micro-state. It is recommended to add ~q~ to leave the transient-state.
** Evilified buffers ** Evilified buffers
/Evilifying/ a buffer is to set the =evilified state= as the default /Evilifying/ a buffer is to set the =evilified state= as the default
@ -89,7 +89,7 @@ state for the major mode of the buffer.
The =evilified state= is derived from the =emacs state= and modify the The =evilified state= is derived from the =emacs state= and modify the
map to: map to:
- add ~hjkl~ navigation - add ~hjkl~ navigation
- add scrolling feature on ~C-f~, ~C-b~, ~C-d~ and ~C-u~ - add scrolling feature on ~C-f~, ~C-b~, ~C-d~ and ~C-u~
- ~G~ and ~gg~ to go to the end and beginning of the buffer - ~G~ and ~gg~ to go to the end and beginning of the buffer
- add incremental search with ~/~, ~n~ and ~N~ - add incremental search with ~/~, ~n~ and ~N~
- enabling =evil-ex= on ~:~ - enabling =evil-ex= on ~:~
@ -116,10 +116,10 @@ is displayed in =*Messages*=.
To be consistent with the Vim way, ~n~ and ~N~ are favored over Emacs ~n~ and To be consistent with the Vim way, ~n~ and ~N~ are favored over Emacs ~n~ and
~p~. ~p~.
Ideally a micro-state should be provided to smooth the navigation Ideally a transient-state should be provided to smooth the navigation
experience. A micro-state allows to repeat key bindings without entering experience. A transient-state allows to repeat key bindings without entering
each time the prefix commands. More info on micro-states in the each time the prefix commands. More info on transient-states in the
[[file:DOCUMENTATION.org::Micro-states][documentation]]. [[file:DOCUMENTATION.org::Transient-states][documentation]].
*** Code Navigation *** Code Navigation
The prefix for going to something is ~SPC m g~. The prefix for going to something is ~SPC m g~.
@ -231,7 +231,7 @@ The base prefix for debugging commands is ~SPC d~.
| ~m d s~ | step | | ~m d s~ | step |
Notes: Notes:
- Ideally a micro-state for breakpoint navigation should be provided. - Ideally a transient-state for breakpoint navigation should be provided.
- If there is no toggle breakpoint function, then it should be implemented at - If there is no toggle breakpoint function, then it should be implemented at
the spacemacs level and ideally the function should be proposed as a patch the spacemacs level and ideally the function should be proposed as a patch
upstream (major mode repository). upstream (major mode repository).
@ -361,6 +361,6 @@ Spacemacs provides an example layer =README.org= file in
- At the end of each header node, there should be an empty line - At the end of each header node, there should be an empty line
- Note: Many layer =READMEs= do not follow this convention yet. Please fix - Note: Many layer =READMEs= do not follow this convention yet. Please fix
them if you can. them if you can.
- To keep things readable only mention the prefix ~SPC~ when documenting - To keep things readable only mention the prefix ~SPC~ when documenting
key bindings, you don't need to mention ~M-m~. key bindings, you don't need to mention ~M-m~.

View File

@ -55,7 +55,7 @@
- [[States][States]] - [[States][States]]
- [[Evil leader][Evil leader]] - [[Evil leader][Evil leader]]
- [[Universal argument][Universal argument]] - [[Universal argument][Universal argument]]
- [[Micro-states][Micro-states]] - [[Transient-states][Transient-states]]
- [[Differences between Vim, Evil and Spacemacs][Differences between Vim, Evil and Spacemacs]] - [[Differences between Vim, Evil and Spacemacs][Differences between Vim, Evil and Spacemacs]]
- [[The vim-surround case][The vim-surround case]] - [[The vim-surround case][The vim-surround case]]
- [[Evil plugins][Evil plugins]] - [[Evil plugins][Evil plugins]]
@ -84,7 +84,7 @@
- [[Helm][Helm]] - [[Helm][Helm]]
- [[C-z and Tab switch][C-z and Tab switch]] - [[C-z and Tab switch][C-z and Tab switch]]
- [[Helm focus][Helm focus]] - [[Helm focus][Helm focus]]
- [[Helm micro-state][Helm micro-state]] - [[Helm transient-state][Helm transient-state]]
- [[Discovering][Discovering]] - [[Discovering][Discovering]]
- [[Key bindings][Key bindings]] - [[Key bindings][Key bindings]]
- [[Which-key][Which-key]] - [[Which-key][Which-key]]
@ -105,17 +105,17 @@
- [[Joining and splitting][Joining and splitting]] - [[Joining and splitting][Joining and splitting]]
- [[Window manipulation][Window manipulation]] - [[Window manipulation][Window manipulation]]
- [[Window manipulation key bindings][Window manipulation key bindings]] - [[Window manipulation key bindings][Window manipulation key bindings]]
- [[Window manipulation micro-state][Window manipulation micro-state]] - [[Window manipulation transient-state][Window manipulation transient-state]]
- [[Golden ratio][Golden ratio]] - [[Golden ratio][Golden ratio]]
- [[Buffers and Files][Buffers and Files]] - [[Buffers and Files][Buffers and Files]]
- [[Buffers manipulation key bindings][Buffers manipulation key bindings]] - [[Buffers manipulation key bindings][Buffers manipulation key bindings]]
- [[Buffers manipulation micro-state][Buffers manipulation micro-state]] - [[Buffers manipulation transient-state][Buffers manipulation transient-state]]
- [[Special Buffers][Special Buffers]] - [[Special Buffers][Special Buffers]]
- [[Files manipulations key bindings][Files manipulations key bindings]] - [[Files manipulations key bindings][Files manipulations key bindings]]
- [[Emacs and Spacemacs files][Emacs and Spacemacs files]] - [[Emacs and Spacemacs files][Emacs and Spacemacs files]]
- [[Browsing files with Helm][Browsing files with Helm]] - [[Browsing files with Helm][Browsing files with Helm]]
- [[Ido][Ido]] - [[Ido][Ido]]
- [[Ido micro-state][Ido micro-state]] - [[Ido transient-state][Ido transient-state]]
- [[NeoTree file tree][NeoTree file tree]] - [[NeoTree file tree][NeoTree file tree]]
- [[NeoTree navigation][NeoTree navigation]] - [[NeoTree navigation][NeoTree navigation]]
- [[Opening files with NeoTree][Opening files with NeoTree]] - [[Opening files with NeoTree][Opening files with NeoTree]]
@ -144,7 +144,7 @@
- [[Helm-swoop][Helm-swoop]] - [[Helm-swoop][Helm-swoop]]
- [[Editing][Editing]] - [[Editing][Editing]]
- [[Paste text][Paste text]] - [[Paste text][Paste text]]
- [[Paste Micro-state][Paste Micro-state]] - [[Paste Transient-state][Paste Transient-state]]
- [[Auto-indent pasted text][Auto-indent pasted text]] - [[Auto-indent pasted text][Auto-indent pasted text]]
- [[Text manipulation commands][Text manipulation commands]] - [[Text manipulation commands][Text manipulation commands]]
- [[Text insertion commands][Text insertion commands]] - [[Text insertion commands][Text insertion commands]]
@ -723,19 +723,19 @@ to ~SPC u~.
=helm-M-x= first, select the command you want to run, and press ~C-u~ before =helm-M-x= first, select the command you want to run, and press ~C-u~ before
pressing ~RETURN~. For instance: ~SPC : org-reload C-u RET~ pressing ~RETURN~. For instance: ~SPC : org-reload C-u RET~
** Micro-states ** Transient-states
Spacemacs defines a wide variety of =micro-states= (temporary overlay maps) Spacemacs defines a wide variety of =transient-states= (temporary overlay maps)
where it makes sense. This prevents one from doing repetitive and tedious where it makes sense. This prevents one from doing repetitive and tedious
presses on the ~SPC~ key. presses on the ~SPC~ key.
When a =micro-state= is active, a documentation is displayed in the minibuffer. When a =transient-state= is active, a documentation is displayed in the minibuffer.
Additional information may as well be displayed in the minibuffer. Additional information may as well be displayed in the minibuffer.
Auto-highlight-symbol micro-state: Auto-highlight-symbol transient-state:
[[file:img/spacemacs-ahs-micro-state.png]] [[file:img/spacemacs-ahs-transient-state.png]]
[[Text][Text scale micro-state]]: [[Text][Text scale transient-state]]:
[[file:img/spacemacs-scale-micro-state.png]] [[file:img/spacemacs-scale-transient-state.png]]
* Differences between Vim, Evil and Spacemacs * Differences between Vim, Evil and Spacemacs
- The ~,~ key does "repeat last ~f~, ~t~, ~F~, or ~T~ command in - The ~,~ key does "repeat last ~f~, ~t~, ~F~, or ~T~ command in
@ -929,7 +929,7 @@ and ~T~):
| ~SPC T m~ | toggle menu bar | | ~SPC T m~ | toggle menu bar |
| ~SPC T M~ | toggle frame maximize | | ~SPC T M~ | toggle frame maximize |
| ~SPC T t~ | toggle tool bar | | ~SPC T t~ | toggle tool bar |
| ~SPC T T~ | toggle frame transparency and enter transparency micro-state | | ~SPC T T~ | toggle frame transparency and enter transparency transient-state |
*Note*: These toggles are all available via the =helm-spacemacs-help= interface *Note*: These toggles are all available via the =helm-spacemacs-help= interface
(press ~SPC h SPC~ to display the =helm-spacemacs-help= buffer). (press ~SPC h SPC~ to display the =helm-spacemacs-help= buffer).
@ -1214,17 +1214,17 @@ makes sense to swap them. It's also recommended [[http://tuhdo.github.io/helm-in
If you find yourself unable to return focus to Helm (after a careless If you find yourself unable to return focus to Helm (after a careless
mouse-click for example), use ~SPC w b~ to return focus to the minibuffer. mouse-click for example), use ~SPC w b~ to return focus to the minibuffer.
*** Helm micro-state *** Helm transient-state
Spacemacs defines a [[Micro-states][micro-state]] for =Helm= to make it work like [[https://github.com/Shougo/unite.vim][Vim's Unite]] Spacemacs defines a [[Transient-states][transient-state]] for =Helm= to make it work like [[https://github.com/Shougo/unite.vim][Vim's Unite]]
plugin. plugin.
Initiate the micro-state with ~M-SPC~ or ~s-M-SPC~ while in a =Helm= buffer. Initiate the transient-state with ~M-SPC~ or ~s-M-SPC~ while in a =Helm= buffer.
| Key Binding | Description | | Key Binding | Description |
|----------------------+--------------------------------------------------| |----------------------+--------------------------------------------------|
| ~M-SPC~ or ~s-M-SPC~ | initiate the micro-state | | ~M-SPC~ or ~s-M-SPC~ | initiate the transient-state |
| ~q~ | quit micro-state | | ~q~ | quit transient-state |
| ~TAB~ | switch to actions page and leave the micro-state | | ~TAB~ | switch to actions page and leave the transient-state |
| ~1~ | execute action 0 | | ~1~ | execute action 0 |
| ~2~ | execute action 1 | | ~2~ | execute action 1 |
| ~3~ | execute action 2 | | ~3~ | execute action 2 |
@ -1373,7 +1373,7 @@ Spacemacs.
*** Toggles *** Toggles
=helm-spacemacs-help= is also a central place to discover the available toggles. =helm-spacemacs-help= is also a central place to discover the available toggles.
To display only the toggles source press ~C-l~ (or in [[Helm micro-state][Helm micro-state]] you can To display only the toggles source press ~C-l~ (or in [[Helm transient-state][Helm transient-state]] you can
press just ~l~). press just ~l~).
The following helm actions are available on packages: The following helm actions are available on packages:
@ -1546,14 +1546,14 @@ Windows manipulation commands (start with ~w~):
| ~SPC w w~ | cycle and focus between windows | | ~SPC w w~ | cycle and focus between windows |
| ~SPC w SPC~ | select window using [[https://github.com/abo-abo/ace-window][ace-window]] | | ~SPC w SPC~ | select window using [[https://github.com/abo-abo/ace-window][ace-window]] |
**** Window manipulation micro-state **** Window manipulation transient-state
A convenient window manipulation micro-state allows to perform most of the A convenient window manipulation transient-state allows to perform most of the
actions listed above. The micro-state allows additional actions as well like actions listed above. The transient-state allows additional actions as well like
window resizing. window resizing.
| Key Binding | Description | | Key Binding | Description |
|---------------+---------------------------------------------------------------| |---------------+---------------------------------------------------------------|
| ~SPC w .~ | initiate micro-state | | ~SPC w .~ | initiate transient-state |
| ~?~ | display the full documentation in minibuffer | | ~?~ | display the full documentation in minibuffer |
| ~0~ | go to window number 0 | | ~0~ | go to window number 0 |
| ~1~ | go to window number 1 | | ~1~ | go to window number 1 |
@ -1591,7 +1591,7 @@ window resizing.
| ~v~ | vertical split | | ~v~ | vertical split |
| ~V~ | horizontal split and focus new window | | ~V~ | horizontal split and focus new window |
| ~w~ | focus other window | | ~w~ | focus other window |
| Any other key | leave the micro-state | | Any other key | leave the transient-state |
**** Golden ratio **** Golden ratio
If you resize windows like crazy you may want to give a try to [[https://github.com/roman/golden-ratio.el][golden-ratio]]. If you resize windows like crazy you may want to give a try to [[https://github.com/roman/golden-ratio.el][golden-ratio]].
@ -1637,17 +1637,17 @@ Buffer manipulation commands (start with ~b~):
| ~SPC b Y~ | copy whole buffer to clipboard (useful when copying to a browser) | | ~SPC b Y~ | copy whole buffer to clipboard (useful when copying to a browser) |
| ~z f~ | Make current function or comments visible in buffer as much as possible | | ~z f~ | Make current function or comments visible in buffer as much as possible |
**** Buffers manipulation micro-state **** Buffers manipulation transient-state
A convenient buffer manipulation micro-state allows to quickly cycles through A convenient buffer manipulation transient-state allows to quickly cycles through
the opened buffer and kill them. the opened buffer and kill them.
| Key Binding | Description | | Key Binding | Description |
|---------------+-----------------------------------------------| |---------------+-----------------------------------------------|
| ~SPC b .~ | initiate micro-state | | ~SPC b .~ | initiate transient-state |
| ~K~ | kill current buffer | | ~K~ | kill current buffer |
| ~n~ | go to next buffer (avoid special buffers) | | ~n~ | go to next buffer (avoid special buffers) |
| ~N~ | go to previous buffer (avoid special buffers) | | ~N~ | go to previous buffer (avoid special buffers) |
| Any other key | leave the micro-state | | Any other key | leave the transient-state |
**** Special Buffers **** Special Buffers
Unlike vim, emacs creates many buffers that most people do not need to see. Some Unlike vim, emacs creates many buffers that most people do not need to see. Some
@ -1737,14 +1737,14 @@ Basic =ido= operations can be done with ~Ctrl~ key:
| ~C-S-k~ or ~C-S-p~ | previous history element | | ~C-S-k~ or ~C-S-p~ | previous history element |
| ~C-S-l~ | go to next directory | | ~C-S-l~ | go to next directory |
*** Ido micro-state *** Ido transient-state
Spacemacs defines a [[Micro-states][micro-state]] for =ido=. Spacemacs defines a [[Transient-states][transient-state]] for =ido=.
Initiate the micro-state with ~M-SPC~ or ~s-M-SPC~ while in an =ido= buffer. Initiate the transient-state with ~M-SPC~ or ~s-M-SPC~ while in an =ido= buffer.
| Key Binding | Description | | Key Binding | Description |
|----------------------+-------------------------------------| |----------------------+-------------------------------------|
| ~M-SPC~ or ~s-M-SPC~ | initiate or leave the micro-state | | ~M-SPC~ or ~s-M-SPC~ | initiate or leave the transient-state |
| ~?~ | display help | | ~?~ | display help |
| ~e~ | open dired | | ~e~ | open dired |
| ~h~ | delete backward or parent directory | | ~h~ | delete backward or parent directory |
@ -1756,7 +1756,7 @@ Initiate the micro-state with ~M-SPC~ or ~s-M-SPC~ while in an =ido= buffer.
| ~n~ | next directory in history | | ~n~ | next directory in history |
| ~o~ | open in other window | | ~o~ | open in other window |
| ~p~ | previous directory in history | | ~p~ | previous directory in history |
| ~q~ | quit micro-state | | ~q~ | quit transient-state |
| ~s~ | open in a new horizontal split | | ~s~ | open in a new horizontal split |
| ~t~ | open in other frame | | ~t~ | open in other frame |
| ~v~ | open in a new vertical split | | ~v~ | open in a new vertical split |
@ -2069,7 +2069,7 @@ by pressing ~SPC s c~ or executing the ex command =:noh=.
*** Highlight current symbol *** Highlight current symbol
Spacemacs supports highlighting of the current symbol on demand (provided by Spacemacs supports highlighting of the current symbol on demand (provided by
[[https://github.com/emacsmirror/auto-highlight-symbol][auto-highlight-symbol]] mode) and adds a micro-state to easily navigate and rename [[https://github.com/emacsmirror/auto-highlight-symbol][auto-highlight-symbol]] mode) and adds a transient-state to easily navigate and rename
this symbol. this symbol.
It is also possible to change the range of the navigation on the fly to: It is also possible to change the range of the navigation on the fly to:
@ -2083,14 +2083,14 @@ Navigation between the highlighted symbols can be done with the commands:
| Key Binding | Description | | Key Binding | Description |
|-------------+------------------------------------------------------------------------------------| |-------------+------------------------------------------------------------------------------------|
| ~/~ | initiate navigation micro-state on current symbol and jump forwards | | ~/~ | initiate navigation transient-state on current symbol and jump forwards |
| ~#~ | initiate navigation micro-state on current symbol and jump backwards | | ~#~ | initiate navigation transient-state on current symbol and jump backwards |
| ~SPC s e~ | edit all occurrences of the current symbol(/) | | ~SPC s e~ | edit all occurrences of the current symbol(/) |
| ~SPC s h~ | highlight the current symbol and all its occurrence within the current range | | ~SPC s h~ | highlight the current symbol and all its occurrence within the current range |
| ~SPC s H~ | go to the last searched occurrence of the last highlighted symbol | | ~SPC s H~ | go to the last searched occurrence of the last highlighted symbol |
| ~SPC t h a~ | toggle automatic highlight of symbol under point after =ahs-idle-interval= seconds | | ~SPC t h a~ | toggle automatic highlight of symbol under point after =ahs-idle-interval= seconds |
In 'Spacemacs' highlight symbol micro-state: In 'Spacemacs' highlight symbol transient-state:
| Key Binding | Description | | Key Binding | Description |
|---------------+---------------------------------------------------------------| |---------------+---------------------------------------------------------------|
@ -2101,12 +2101,12 @@ In 'Spacemacs' highlight symbol micro-state:
| ~D~ | go to previous definition occurrence | | ~D~ | go to previous definition occurrence |
| ~r~ | change range (=function=, =display area=, =whole buffer=) | | ~r~ | change range (=function=, =display area=, =whole buffer=) |
| ~R~ | go to home occurrence (reset position to starting occurrence) | | ~R~ | go to home occurrence (reset position to starting occurrence) |
| Any other key | leave the navigation micro-state | | Any other key | leave the navigation transient-state |
(*) using [[https://github.com/tsdh/iedit][iedit]] or the default implementation (*) using [[https://github.com/tsdh/iedit][iedit]] or the default implementation
of =auto-highlight-symbol= of =auto-highlight-symbol=
The micro-state text in minibuffer display the following information: The transient-state text in minibuffer display the following information:
#+BEGIN_EXAMPLE #+BEGIN_EXAMPLE
<M> [6/11]* press (n/N) to navigate, (e) to edit, (r) to change range or (R) <M> [6/11]* press (n/N) to navigate, (e) to edit, (r) to change range or (R)
@ -2129,7 +2129,7 @@ selection.
It is pretty useful combined with the [[Region selection][expand-region]] bindings. It is pretty useful combined with the [[Region selection][expand-region]] bindings.
*Note*: If the current state is not the =visual state= then pressing ~*~ uses *Note*: If the current state is not the =visual state= then pressing ~*~ uses
auto-highlight-symbol and its micro-state. auto-highlight-symbol and its transient-state.
*** Listing symbols by semantic *** Listing symbols by semantic
Use =helm-semantic-or-imenu= command from =Helm= to quickly navigate between the Use =helm-semantic-or-imenu= command from =Helm= to quickly navigate between the
@ -2153,23 +2153,23 @@ modifications to the buffer.
** Editing ** Editing
*** Paste text *** Paste text
**** Paste Micro-state **** Paste Transient-state
The paste micro-state can be enabled by settings the variable The paste transient-state can be enabled by settings the variable
=dotspacemacs-enable-paste-micro-state= to =t=. By default it is disabled. =dotspacemacs-enable-paste-transient-state= to =t=. By default it is disabled.
When the micro-state is enabled, pressing ~p~ again will replace the pasted text When the transient-state is enabled, pressing ~p~ again will replace the pasted text
with the previous yanked (copied) text on the kill ring. with the previous yanked (copied) text on the kill ring.
For example if you copy =foo= and =bar= then press ~p~ the text =bar= will For example if you copy =foo= and =bar= then press ~p~ the text =bar= will
be pasted, pressing ~p~ again will replace =bar= with =foo=. be pasted, pressing ~p~ again will replace =bar= with =foo=.
| Key Binding | Description | | Key Binding | Description |
|---------------+---------------------------------------------------------------------------| |---------------+-------------------------------------------------------------------------------|
| ~p~ or ~P~ | paste the text before or after point and initiate the =paste= micro-state | | ~p~ or ~P~ | paste the text before or after point and initiate the =paste= transient-state |
| ~p~ | in micro-state: replace paste text with the previously copied one | | ~p~ | in transient-state: replace paste text with the previously copied one |
| ~P~ | in micro-state: replace paste text with the next copied one | | ~P~ | in transient-state: replace paste text with the next copied one |
| ~.~ | paste the same text and leave the micro-state | | ~.~ | paste the same text and leave the transient-state |
| Any other key | leave the micro-state | | Any other key | leave the transient-state |
**** Auto-indent pasted text **** Auto-indent pasted text
By default any pasted text will be auto-indented. To paste text un-indented use By default any pasted text will be auto-indented. To paste text un-indented use
@ -2206,8 +2206,8 @@ Text related commands (start with ~x~):
| ~SPC x j l~ | set the justification to left | | ~SPC x j l~ | set the justification to left |
| ~SPC x j n~ | set the justification to none | | ~SPC x j n~ | set the justification to none |
| ~SPC x j r~ | set the justification to right | | ~SPC x j r~ | set the justification to right |
| ~SPC x J~ | move down a line of text (enter micro-state) | | ~SPC x J~ | move down a line of text (enter transient-state) |
| ~SPC x K~ | move up a line of text (enter micro-state) | | ~SPC x K~ | move up a line of text (enter transient-state) |
| ~SPC x l s~ | sort lines | | ~SPC x l s~ | sort lines |
| ~SPC x l u~ | uniquify lines | | ~SPC x l u~ | uniquify lines |
| ~SPC x t c~ | swap (transpose) the current character with the previous one | | ~SPC x t c~ | swap (transpose) the current character with the previous one |
@ -2246,15 +2246,15 @@ The font size of the current buffer can be adjusted with the commands:
| Key Binding | Description | | Key Binding | Description |
|---------------+----------------------------------------------------------------------------| |---------------+----------------------------------------------------------------------------|
| ~SPC z x +~ | scale up the font and initiate the font scaling micro-state | | ~SPC z x +~ | scale up the font and initiate the font scaling transient-state |
| ~SPC z x =~ | scale up the font and initiate the font scaling micro-state | | ~SPC z x =~ | scale up the font and initiate the font scaling transient-state |
| ~SPC z x -~ | scale down the font and initiate the font scaling micro-state | | ~SPC z x -~ | scale down the font and initiate the font scaling transient-state |
| ~SPC z x 0~ | reset the font size (no scaling) and initiate the font scaling micro-state | | ~SPC z x 0~ | reset the font size (no scaling) and initiate the font scaling transient-state |
| ~+~ | increase the font size | | ~+~ | increase the font size |
| ~=~ | increase the font size | | ~=~ | increase the font size |
| ~-~ | decrease the font size | | ~-~ | decrease the font size |
| ~0~ | reset the font size | | ~0~ | reset the font size |
| Any other key | leave the font scaling micro-state | | Any other key | leave the font scaling transient-state |
Note that /only/ the text of the current buffer is scaled, the other buffers, Note that /only/ the text of the current buffer is scaled, the other buffers,
the mode-line and the minibuffer are not affected. To zoom the whole content of the mode-line and the minibuffer are not affected. To zoom the whole content of
@ -2265,31 +2265,31 @@ You can zoom in and out the whole content of the frame with the commands:
| Key Binding | Description | | Key Binding | Description |
|---------------+-------------------------------------------------------------------------| |---------------+-------------------------------------------------------------------------|
| ~SPC z f +~ | zoom in the frame content and initiate the frame scaling micro-state | | ~SPC z f +~ | zoom in the frame content and initiate the frame scaling transient-state |
| ~SPC z f =~ | zoom in the frame content and initiate the frame scaling micro-state | | ~SPC z f =~ | zoom in the frame content and initiate the frame scaling transient-state |
| ~SPC z f -~ | zoom out the frame content and initiate the frame scaling micro-state | | ~SPC z f -~ | zoom out the frame content and initiate the frame scaling transient-state |
| ~SPC z f 0~ | reset the frame content size and initiate the frame scaling micro-state | | ~SPC z f 0~ | reset the frame content size and initiate the frame scaling transient-state |
| ~+~ | zoom in | | ~+~ | zoom in |
| ~=~ | zoom in | | ~=~ | zoom in |
| ~-~ | zoom out | | ~-~ | zoom out |
| ~0~ | reset zoom | | ~0~ | reset zoom |
| Any other key | leave the zoom frame micro-state | | Any other key | leave the zoom frame transient-state |
*** Increase/Decrease numbers *** Increase/Decrease numbers
Spacemacs uses [[https://github.com/cofi/evil-numbers][evil-numbers]] to easily increase or increase numbers. Spacemacs uses [[https://github.com/cofi/evil-numbers][evil-numbers]] to easily increase or increase numbers.
| Key Binding | Description | | Key Binding | Description |
|-------------+-----------------------------------------------------------------| |-------------+-----------------------------------------------------------------|
| ~SPC n +~ | increase the number under point by one and initiate micro-state | | ~SPC n +~ | increase the number under point by one and initiate transient-state |
| ~SPC n -~ | decrease the number under point by one and initiate micro-state | | ~SPC n -~ | decrease the number under point by one and initiate transient-state |
In micro-state: In transient-state:
| Key Binding | Description | | Key Binding | Description |
|---------------+----------------------------------------| |---------------+----------------------------------------|
| ~+~ | increase the number under point by one | | ~+~ | increase the number under point by one |
| ~-~ | decrease the number under point by one | | ~-~ | decrease the number under point by one |
| Any other key | leave the micro-state | | Any other key | leave the transient-state |
*Tips:* you can increase or decrease a value by more that once by using a prefix *Tips:* you can increase or decrease a value by more that once by using a prefix
argument (ie. ~10 SPC n +~ will add 10 to the number under point). argument (ie. ~10 SPC n +~ will add 10 to the number under point).

View File

@ -8,7 +8,7 @@
- [[Terms][Terms]] - [[Terms][Terms]]
- [[Modes vs. States][Modes vs. States]] - [[Modes vs. States][Modes vs. States]]
- [[Layers][Layers]] - [[Layers][Layers]]
- [[Micro-states][Micro-states]] - [[Transient-states][Transient-states]]
- [[Keybinding conventions][Keybinding conventions]] - [[Keybinding conventions][Keybinding conventions]]
- [[Running commands][Running commands]] - [[Running commands][Running commands]]
- [[Buffer and window management][Buffer and window management]] - [[Buffer and window management][Buffer and window management]]
@ -83,17 +83,17 @@ about what packages to install, and instead worry about what features you want.
More information on layers can be found in the [[./VIMUSERS.org#customization][customization]] section and in the More information on layers can be found in the [[./VIMUSERS.org#customization][customization]] section and in the
[[./DOCUMENTATION.org#configuration-layers][documentation]]. There is also a more in-depth guide on writing layers [[file:LAYERS.org][here]]. [[./DOCUMENTATION.org#configuration-layers][documentation]]. There is also a more in-depth guide on writing layers [[file:LAYERS.org][here]].
*** Micro-states *** Transient-states
Spacemacs provides a special functionality called micro-states. Micro-states Spacemacs provides a special functionality called transient-states. Transient-states
allow similar commands to be run in succession without repeatedly pressing the allow similar commands to be run in succession without repeatedly pressing the
~<Leader>~ key. Micro-states are usually triggered by using a keybinding with the ~<Leader>~ key. Transient-states are usually triggered by using a keybinding with the
following pattern: ~<Leader> <group> .~ where group is the category the following pattern: ~<Leader> <group> .~ where group is the category the
micro-state falls under. When in a micro-state you will see documentation at the transient-state falls under. When in a transient-state you will see documentation at the
bottom of your window. To exit a micro-state press ~q~. bottom of your window. To exit a transient-state press ~q~.
#+CAPTION: Micro-state documentation window #+CAPTION: Transient-state documentation window
[[file:img/spacemacs-scale-micro-state.png]] [[file:img/spacemacs-scale-transient-state.png]]
** Keybinding conventions ** Keybinding conventions
Spacemacs uses ~SPC~ as its ~<Leader>~ key. This document will use ~SPC~ to refer to Spacemacs uses ~SPC~ as its ~<Leader>~ key. This document will use ~SPC~ to refer to
@ -130,7 +130,7 @@ are located under the ~SPC b~ prefix.
| ~SPC b d~ or ~:bdelete~ | Kill current buffer. | | ~SPC b d~ or ~:bdelete~ | Kill current buffer. |
| ~SPC b k~ | Search for a buffer to kill. | | ~SPC b k~ | Search for a buffer to kill. |
| ~SPC b K~ | Kill all buffers except the current buffer. | | ~SPC b K~ | Kill all buffers except the current buffer. |
| ~SPC b .~ | Buffer micro-state. | | ~SPC b .~ | Buffer transient-state. |
**** Special buffers **** Special buffers
By default Emacs creates a lot of buffers that most people will never need, like By default Emacs creates a lot of buffers that most people will never need, like
@ -147,7 +147,7 @@ once. All window keybindings are under the ~SPC w~ prefix.
| ~SPC w s~ or ~:split~ | Opens a horizontal split below. | | ~SPC w s~ or ~:split~ | Opens a horizontal split below. |
| ~SPC w h/j/k/l~ | Navigate among windows. | | ~SPC w h/j/k/l~ | Navigate among windows. |
| ~SPC w H/J/K/L~ | Move the current window. | | ~SPC w H/J/K/L~ | Move the current window. |
| ~SPC w .~ | Window micro-state. | | ~SPC w .~ | Window transient-state. |
** Files ** Files
All file commands in Spacemacs are available under the ~SPC f~ prefix. All file commands in Spacemacs are available under the ~SPC f~ prefix.

View File

Before

Width:  |  Height:  |  Size: 24 KiB

After

Width:  |  Height:  |  Size: 24 KiB

View File

Before

Width:  |  Height:  |  Size: 36 KiB

After

Width:  |  Height:  |  Size: 36 KiB

View File

Before

Width:  |  Height:  |  Size: 33 KiB

After

Width:  |  Height:  |  Size: 33 KiB

View File

@ -287,14 +287,14 @@
(defun spacemacs//helm-cleanup () (defun spacemacs//helm-cleanup ()
"Cleanup some helm related states when quitting." "Cleanup some helm related states when quitting."
;; deactivate any running transient map (micro-state) ;; deactivate any running transient map (transient-state)
(setq overriding-terminal-local-map nil)) (setq overriding-terminal-local-map nil))
(add-hook 'helm-cleanup-hook 'spacemacs//helm-cleanup) (add-hook 'helm-cleanup-hook 'spacemacs//helm-cleanup)
(defface spacemacs-helm-navigation-ms-face (defface spacemacs-helm-navigation-ms-face
`((t :background ,(face-attribute 'error :foreground) `((t :background ,(face-attribute 'error :foreground)
:foreground "black")) :foreground "black"))
"Face for helm heder when helm micro-state is activated." "Face for helm heder when helm transient-state is activated."
:group 'spacemacs)) :group 'spacemacs))
:config :config
@ -419,7 +419,7 @@ ARG non nil means Vim like movements."
(helm-ag-edit)))) (helm-ag-edit))))
(defun spacemacs//helm-navigation-ms-on-enter () (defun spacemacs//helm-navigation-ms-on-enter ()
"Initialization of helm micro-state." "Initialization of helm transient-state."
;; faces ;; faces
(spacemacs//helm-navigation-ms-set-face) (spacemacs//helm-navigation-ms-set-face)
(setq spacemacs--helm-navigation-ms-face-cookie-minibuffer (setq spacemacs--helm-navigation-ms-face-cookie-minibuffer
@ -428,7 +428,7 @@ ARG non nil means Vim like movements."
'spacemacs-helm-navigation-ms-face))) 'spacemacs-helm-navigation-ms-face)))
(defun spacemacs//helm-navigation-ms-set-face () (defun spacemacs//helm-navigation-ms-set-face ()
"Set the face for helm header in helm navigation micro-state" "Set the face for helm header in helm navigation transient-state"
(with-helm-window (with-helm-window
(setq spacemacs--helm-navigation-ms-face-cookie-header (setq spacemacs--helm-navigation-ms-face-cookie-header
(face-remap-add-relative (face-remap-add-relative
@ -436,7 +436,7 @@ ARG non nil means Vim like movements."
'spacemacs-helm-navigation-ms-face)))) 'spacemacs-helm-navigation-ms-face))))
(defun spacemacs//helm-navigation-ms-on-exit () (defun spacemacs//helm-navigation-ms-on-exit ()
"Action to perform when exiting helm micro-state." "Action to perform when exiting helm transient-state."
(with-helm-window (with-helm-window
(face-remap-remove-relative (face-remap-remove-relative
spacemacs--helm-navigation-ms-face-cookie-header)) spacemacs--helm-navigation-ms-face-cookie-header))
@ -452,7 +452,7 @@ ARG non nil means Vim like movements."
(intern) (intern)
(helm-select-nth-action ,(1- n)))))) (helm-select-nth-action ,(1- n))))))
(defun spacemacs/helm-micro-state-select-action () (defun spacemacs/helm-transient-state-select-action ()
(interactive) (interactive)
(call-interactively 'helm-select-action) (call-interactively 'helm-select-action)
(spacemacs//helm-navigation-ms-set-face)) (spacemacs//helm-navigation-ms-set-face))
@ -481,7 +481,7 @@ ARG non nil means Vim like movements."
("TAB" helm-select-action :exit t) ("TAB" helm-select-action :exit t)
("<RET>" helm-maybe-exit-minibuffer :exit t) ("<RET>" helm-maybe-exit-minibuffer :exit t)
;; ("?" nil :doc (spacemacs//helm-navigation-ms-full-doc)) ;; ("?" nil :doc (spacemacs//helm-navigation-ms-full-doc))
("a" spacemacs/helm-micro-state-select-action) ("a" spacemacs/helm-transient-state-select-action)
("e" spacemacs/helm-edit) ("e" spacemacs/helm-edit)
("g" helm-beginning-of-buffer) ("g" helm-beginning-of-buffer)
("G" helm-end-of-buffer) ("G" helm-end-of-buffer)

View File

@ -367,10 +367,10 @@
(evil-define-key 'insert comint-mode-map [down] 'comint-next-input)) (evil-define-key 'insert comint-mode-map [down] 'comint-next-input))
;; --------------------------------------------------------------------------- ;; ---------------------------------------------------------------------------
;; Micro-states ;; Transient-states
;; --------------------------------------------------------------------------- ;; ---------------------------------------------------------------------------
;; Buffer micro state ;; Buffer transient state
(spacemacs|define-transient-state buffer (spacemacs|define-transient-state buffer
:title "Buffer Selection Transient State" :title "Buffer Selection Transient State"
@ -382,9 +382,9 @@
("q" nil "quit" :exit t)) ("q" nil "quit" :exit t))
(spacemacs/set-leader-keys "b." 'spacemacs/buffer-transient-state/body) (spacemacs/set-leader-keys "b." 'spacemacs/buffer-transient-state/body)
;; end of Buffer micro state ;; end of Buffer transient state
;; Window Manipulation Micro State ;; Window Manipulation Transient State
(defun spacemacs/shrink-window-horizontally (delta) (defun spacemacs/shrink-window-horizontally (delta)
"Wrap `spacemacs/shrink-window-horizontally'." "Wrap `spacemacs/shrink-window-horizontally'."
@ -468,9 +468,9 @@ Select^^^^ Move^^^^ Split^^ Resize^^
(spacemacs/set-leader-keys "w." (spacemacs/set-leader-keys "w."
'spacemacs/window-manipulation-transient-state/body) 'spacemacs/window-manipulation-transient-state/body)
;; end of Window Manipulation Micro State ;; end of Window Manipulation Transient State
;; text Manipulation Micro State ;; text Manipulation Transient State
(defun spacemacs/scale-up-or-down-font-size (direction) (defun spacemacs/scale-up-or-down-font-size (direction)
"Scale the font. If DIRECTION is positive or zero the font is scaled up, "Scale the font. If DIRECTION is positive or zero the font is scaled up,
@ -509,9 +509,9 @@ otherwise it is scaled down."
("q" nil :exit t)) ("q" nil :exit t))
(spacemacs/set-leader-keys "zx" 'spacemacs/scale-font-transient-state/body) (spacemacs/set-leader-keys "zx" 'spacemacs/scale-font-transient-state/body)
;; end of Text Manipulation Micro State ;; end of Text Manipulation Transient State
;; Transparency micro-state ;; Transparency transient-state
(defun spacemacs/toggle-transparency () (defun spacemacs/toggle-transparency ()
"Toggle between transparent or opaque display." "Toggle between transparent or opaque display."
@ -554,4 +554,4 @@ otherwise it is scaled down."
(spacemacs/set-leader-keys "TT" (spacemacs/set-leader-keys "TT"
'spacemacs/scale-transparency-transient-state/spacemacs/toggle-transparency) 'spacemacs/scale-transparency-transient-state/spacemacs/toggle-transparency)
;; end of Transparency Micro State ;; end of Transparency Transient State

View File

@ -311,7 +311,7 @@ Example: (evil-map visual \"<\" \"<gv\")"
(define-key evil-normal-state-map (define-key evil-normal-state-map
(kbd "gd") 'spacemacs/evil-smart-goto-definition) (kbd "gd") 'spacemacs/evil-smart-goto-definition)
;; scrolling micro state ;; scrolling transient state
(defun spacemacs/scroll-half-page-up () (defun spacemacs/scroll-half-page-up ()
"Scroll half a page up while keeping cursor in middle of page." "Scroll half a page up while keeping cursor in middle of page."
(interactive) (interactive)
@ -340,7 +340,7 @@ Example: (evil-map visual \"<\" \"<gv\")"
"n<" 'spacemacs/scroll-transient-state/spacemacs/scroll-half-page-up "n<" 'spacemacs/scroll-transient-state/spacemacs/scroll-half-page-up
"n>" 'spacemacs/scroll-transient-state/spacemacs/scroll-half-page-down) "n>" 'spacemacs/scroll-transient-state/spacemacs/scroll-half-page-down)
;; pasting micro-state ;; pasting transient-state
(spacemacs|define-transient-state paste (spacemacs|define-transient-state paste
:title "Pasting Transient State" :title "Pasting Transient State"
:doc "\n[%s(length kill-ring-yank-pointer)/%s(length kill-ring)] \ :doc "\n[%s(length kill-ring-yank-pointer)/%s(length kill-ring)] \
@ -351,7 +351,7 @@ below. Anything else exits."
("K" evil-paste-pop-next) ("K" evil-paste-pop-next)
("p" evil-paste-after) ("p" evil-paste-after)
("P" evil-paste-before)) ("P" evil-paste-before))
(when dotspacemacs-enable-paste-micro-state (when dotspacemacs-enable-paste-transient-state
(define-key evil-normal-state-map "p" 'spacemacs/paste-transient-state/evil-paste-after) (define-key evil-normal-state-map "p" 'spacemacs/paste-transient-state/evil-paste-after)
(define-key evil-normal-state-map "P" 'spacemacs/paste-transient-state/evil-paste-before)) (define-key evil-normal-state-map "P" 'spacemacs/paste-transient-state/evil-paste-before))
@ -554,7 +554,7 @@ below. Anything else exits."
"Setup the minibuffer." "Setup the minibuffer."
;; Since ido is implemented in a while loop where each ;; Since ido is implemented in a while loop where each
;; iteration setup a whole new minibuffer, we have to keep ;; iteration setup a whole new minibuffer, we have to keep
;; track of any activated ido navigation micro-state and force ;; track of any activated ido navigation transient-state and force
;; the reactivation at each iteration. ;; the reactivation at each iteration.
(when spacemacs--ido-navigation-ms-enabled (when spacemacs--ido-navigation-ms-enabled
(spacemacs/ido-navigation-micro-state))) (spacemacs/ido-navigation-micro-state)))
@ -564,7 +564,7 @@ below. Anything else exits."
(when spacemacs--ido-navigation-ms-face-cookie-minibuffer (when spacemacs--ido-navigation-ms-face-cookie-minibuffer
(face-remap-remove-relative (face-remap-remove-relative
spacemacs--ido-navigation-ms-face-cookie-minibuffer)) spacemacs--ido-navigation-ms-face-cookie-minibuffer))
;; be sure to wipe any previous micro-state flag ;; be sure to wipe any previous transient-state flag
(setq spacemacs--ido-navigation-ms-enabled nil) (setq spacemacs--ido-navigation-ms-enabled nil)
;; overwrite the key bindings for ido vertical mode only ;; overwrite the key bindings for ido vertical mode only
(define-key ido-completion-map (kbd "C-<return>") 'ido-select-text) (define-key ido-completion-map (kbd "C-<return>") 'ido-select-text)
@ -594,7 +594,7 @@ below. Anything else exits."
(define-key ido-completion-map (kbd "<down>") 'ido-next-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 "<left>") 'ido-delete-backward-updir)
(define-key ido-completion-map (kbd "<right>") 'ido-exit-minibuffer) (define-key ido-completion-map (kbd "<right>") 'ido-exit-minibuffer)
;; initiate micro-state ;; initiate transient-state
(define-key ido-completion-map (kbd "M-SPC") 'spacemacs/ido-navigation-micro-state) (define-key ido-completion-map (kbd "M-SPC") 'spacemacs/ido-navigation-micro-state)
(define-key ido-completion-map (kbd "s-M-SPC") 'spacemacs/ido-navigation-micro-state) (define-key ido-completion-map (kbd "s-M-SPC") 'spacemacs/ido-navigation-micro-state)
) )
@ -647,7 +647,7 @@ below. Anything else exits."
result)) result))
(defvar spacemacs--ido-navigation-ms-enabled nil (defvar spacemacs--ido-navigation-ms-enabled nil
"Flag which is non nil when ido navigation micro-state is enabled.") "Flag which is non nil when ido navigation transient-state is enabled.")
(defvar spacemacs--ido-navigation-ms-face-cookie-minibuffer nil (defvar spacemacs--ido-navigation-ms-face-cookie-minibuffer nil
"Cookie pointing to the local face remapping.") "Cookie pointing to the local face remapping.")
@ -656,28 +656,28 @@ below. Anything else exits."
`((t :background ,(face-attribute 'error :foreground) `((t :background ,(face-attribute 'error :foreground)
:foreground "black" :foreground "black"
:weight bold)) :weight bold))
"Face for ido minibuffer prompt when ido micro-state is activated." "Face for ido minibuffer prompt when ido transient-state is activated."
:group 'spacemacs) :group 'spacemacs)
(defun spacemacs//ido-navigation-ms-set-face () (defun spacemacs//ido-navigation-ms-set-face ()
"Set faces for ido navigation micro-state." "Set faces for ido navigation transient-state."
(setq spacemacs--ido-navigation-ms-face-cookie-minibuffer (setq spacemacs--ido-navigation-ms-face-cookie-minibuffer
(face-remap-add-relative (face-remap-add-relative
'minibuffer-prompt 'minibuffer-prompt
'spacemacs-ido-navigation-ms-face))) 'spacemacs-ido-navigation-ms-face)))
(defun spacemacs//ido-navigation-ms-on-enter () (defun spacemacs//ido-navigation-ms-on-enter ()
"Initialization of ido micro-state." "Initialization of ido transient-state."
(setq spacemacs--ido-navigation-ms-enabled t) (setq spacemacs--ido-navigation-ms-enabled t)
(spacemacs//ido-navigation-ms-set-face)) (spacemacs//ido-navigation-ms-set-face))
(defun spacemacs//ido-navigation-ms-on-exit () (defun spacemacs//ido-navigation-ms-on-exit ()
"Action to perform when exiting ido micro-state." "Action to perform when exiting ido transient-state."
(face-remap-remove-relative (face-remap-remove-relative
spacemacs--ido-navigation-ms-face-cookie-minibuffer)) spacemacs--ido-navigation-ms-face-cookie-minibuffer))
(defun spacemacs//ido-navigation-ms-full-doc () (defun spacemacs//ido-navigation-ms-full-doc ()
"Full documentation for ido navigation micro-state." "Full documentation for ido navigation transient-state."
" "
[?] display this help [?] display this help
[e] enter dired [e] enter dired

View File

@ -320,7 +320,7 @@
"sh" 'spacemacs/symbol-highlight "sh" 'spacemacs/symbol-highlight
"sH" 'spacemacs/goto-last-searched-ahs-symbol) "sH" 'spacemacs/goto-last-searched-ahs-symbol)
;; micro-state to easily jump from a highlighted symbol to the others ;; transient-state to easily jump from a highlighted symbol to the others
(dolist (sym '(ahs-forward (dolist (sym '(ahs-forward
ahs-forward-definition ahs-forward-definition
ahs-backward ahs-backward

View File

@ -50,11 +50,11 @@ All Agda specific bindings are prefixed with the major-mode leader
| ~SPC m ,~ | Shows the type of the goal at point and the currect context. | | ~SPC m ,~ | Shows the type of the goal at point and the currect context. |
| ~SPC m .~ | Shows the context, the goal and the given expression's inferred type. | | ~SPC m .~ | Shows the context, the goal and the given expression's inferred type. |
| ~SPC m a~ | Simple proof search. | | ~SPC m a~ | Simple proof search. |
| ~SPC m b~ | Go to the previous goal, if any and activate goal-navigation micro-state. | | ~SPC m b~ | Go to the previous goal, if any and activate goal-navigation transient-state. |
| ~SPC m c~ | Refine the pattern variables given in the goal. | | ~SPC m c~ | Refine the pattern variables given in the goal. |
| ~SPC m d~ | Infers the type of the given expression. | | ~SPC m d~ | Infers the type of the given expression. |
| ~SPC m e~ | Show the context of the goal at point. | | ~SPC m e~ | Show the context of the goal at point. |
| ~SPC m f~ | Go to the next goal, if any and activate goal-navigation micro-state. | | ~SPC m f~ | Go to the next goal, if any and activate goal-navigation transient-state. |
| ~SPC m h~ | Compute the type of a hypothetical helper function. | | ~SPC m h~ | Compute the type of a hypothetical helper function. |
| ~SPC m l~ | Load current buffer. | | ~SPC m l~ | Load current buffer. |
| ~SPC m n~ | Computes the normal form of the given expression, using the scope of the current goal or, if point is not in a goal, the top-level scope. | | ~SPC m n~ | Computes the normal form of the given expression, using the scope of the current goal or, if point is not in a goal, the top-level scope. |

View File

@ -61,7 +61,7 @@ As this state works the same for all files, the documentation is in global
| ~SPC m ,~ | toggle =lisp state= | | ~SPC m ,~ | toggle =lisp state= |
| ~SPC m t b~ | run tests of current buffer | | ~SPC m t b~ | run tests of current buffer |
| ~SPC m t q~ | run =ert= | | ~SPC m t q~ | run =ert= |
| ~SPC m d m~ | open [[https://github.com/joddie/macrostep][macrostep]] micro-state | | ~SPC m d m~ | open [[https://github.com/joddie/macrostep][macrostep]] transient-state |
** srefactor ** srefactor
The [[file:../../semantic/README.org][semantic]] layer should be installed for these key bindings to become active. The [[file:../../semantic/README.org][semantic]] layer should be installed for these key bindings to become active.

View File

@ -44,7 +44,7 @@ file.
| ~SPC m z~ | fold/unfold current element | | ~SPC m z~ | fold/unfold current element |
| ~%~ | evil-matchit keybinding to jump to closing tag | | ~%~ | evil-matchit keybinding to jump to closing tag |
A micro-state is also defined, start it with ~SPC m .~ or ~, .~ A transient-state is also defined, start it with ~SPC m .~ or ~, .~
| Key Binding | Description | | Key Binding | Description |
|-------------+----------------------------------------------------------------| |-------------+----------------------------------------------------------------|
@ -59,7 +59,7 @@ A micro-state is also defined, start it with ~SPC m .~ or ~, .~
| ~K~ / ~gk~ | previous sibling element | | ~K~ / ~gk~ | previous sibling element |
| ~l~ | first child element | | ~l~ | first child element |
| ~p~ | show xpath of current element | | ~p~ | show xpath of current element |
| ~q~ | leave the micro-state | | ~q~ | leave the transient-state |
| ~r~ | rename current element | | ~r~ | rename current element |
| ~w~ | wrap current element | | ~w~ | wrap current element |

View File

@ -15,7 +15,7 @@
- [[Using the IPython notebook][Using the IPython notebook]] - [[Using the IPython notebook][Using the IPython notebook]]
- [[Open Notebook List][Open Notebook List]] - [[Open Notebook List][Open Notebook List]]
- [[Key Bindings][Key Bindings]] - [[Key Bindings][Key Bindings]]
- [[Micro-state: =ipython-notebook=][Micro-state: =ipython-notebook=]] - [[Transient-state: =ipython-notebook=][Transient-state: =ipython-notebook=]]
- [[Normal mode][Normal mode]] - [[Normal mode][Normal mode]]
- [[Insert mode][Insert mode]] - [[Insert mode][Insert mode]]
- [[Traceback mode][Traceback mode]] - [[Traceback mode][Traceback mode]]
@ -31,7 +31,7 @@ Do not hesitate to check the original package README [[https://github.com/millej
lots of informative stuff. lots of informative stuff.
* Features * Features
- Keybindings available through micro-State or leader key - Keybindings available through transient-state or leader key
- Lazy-loading - Lazy-loading
* List of TODOS * List of TODOS
@ -58,16 +58,16 @@ Have an IPython notebook running
* Using the IPython notebook * Using the IPython notebook
** Open Notebook List ** Open Notebook List
This layer is lazy loaded so the micro-state will only work after you summon the This layer is lazy loaded so the transient-state will only work after you summon the
command =ein:notebooklist-open= which is bound to ~SPC a i n~ command =ein:notebooklist-open= which is bound to ~SPC a i n~
** Key Bindings ** Key Bindings
The key bindings can be used through a micro state or the usual evil-leader. The key bindings can be used through a transient state or the usual evil-leader.
*** Micro-state: =ipython-notebook= *** Transient-state: =ipython-notebook=
Once you are in the ipython notebook you can activate the micro-state with Once you are in the ipython notebook you can activate the transient-state with
~SPC e i n~ ~SPC e i n~
The following table lists the keys. Use them as listed in the micro-state or The following table lists the keys. Use them as listed in the transient-state or
prefix with ~SPC m~ to use with your evil-leader. prefix with ~SPC m~ to use with your evil-leader.
| Key | Function | | Key | Function |

View File

@ -105,7 +105,7 @@ Operations on Cells^^^^^^ On Worksheets^^^^ Other
[_C-k_/_C-j_]^^ merge above/below [_1_.._9_] open [1st..last] [_C-o_]^^ open console [_C-k_/_C-j_]^^ merge above/below [_1_.._9_] open [1st..last] [_C-o_]^^ open console
[_O_/_o_]^^ insert above/below [_+_/_-_] create/delete [_C-s_/_C-r_] save/rename notebook [_O_/_o_]^^ insert above/below [_+_/_-_] create/delete [_C-s_/_C-r_] save/rename notebook
[_y_/_p_/_d_] copy/paste ^^^^ [_x_]^^ close notebook [_y_/_p_/_d_] copy/paste ^^^^ [_x_]^^ close notebook
[_u_]^^^^ change type ^^^^ [_q_]^^ quit micro-state [_u_]^^^^ change type ^^^^ [_q_]^^ quit transient-state
[_RET_]^^^^ execute" [_RET_]^^^^ execute"
:bindings :bindings
("q" nil :exit t) ("q" nil :exit t)

View File

@ -150,7 +150,7 @@ To insert a leading asterisk in multiline comments automatically, set the variab
| ~SPC m d s~ | step | | ~SPC m d s~ | step |
| ~SPC m d t~ | backtrace | | ~SPC m d t~ | backtrace |
*Note:* These key bindings need a micro-state, PR welcome :-) *Note:* These key bindings need a transient-state, PR welcome :-)
*** Errors *** Errors

View File

@ -257,14 +257,14 @@ will discard the commit message.
[[https://github.com/pidu/git-timemachine][git-timemachine]] allows to quickly browse the commits of the current buffer. [[https://github.com/pidu/git-timemachine][git-timemachine]] allows to quickly browse the commits of the current buffer.
| Key Binding | Description | | Key Binding | Description |
|-------------+------------------------------------------------| |-------------+----------------------------------------------------|
| ~SPC g t~ | start git timemachine and initiate micro-state | | ~SPC g t~ | start git timemachine and initiate transient-state |
| ~c~ | show current commit | | ~c~ | show current commit |
| ~n~ | show next commit | | ~n~ | show next commit |
| ~N~ | show previous commit | | ~N~ | show previous commit |
| ~p~ | show previous commit | | ~p~ | show previous commit |
| ~q~ | leave micro-state and git timemachine | | ~q~ | leave transient-state and git timemachine |
| ~Y~ | copy current commit hash | | ~Y~ | copy current commit hash |
# LocalWords: unpulled # LocalWords: unpulled

View File

@ -9,7 +9,7 @@
- [[Configuration][Configuration]] - [[Configuration][Configuration]]
- [[Differences between margin programs][Differences between margin programs]] - [[Differences between margin programs][Differences between margin programs]]
- [[Key Bindings][Key Bindings]] - [[Key Bindings][Key Bindings]]
- [[Version Control Micro-state][Version Control Micro-state]] - [[Version Control Transient-state][Version Control Transient-state]]
* Description * Description
This layers adds general configuration for [[http://www.gnu.org/software/emacs/manual/html_node/emacs/Version-Control.html][Emacs VC]]. This layers adds general configuration for [[http://www.gnu.org/software/emacs/manual/html_node/emacs/Version-Control.html][Emacs VC]].
@ -18,7 +18,7 @@ It should work with all VC backends such as Git, Mercurial, Bazaar, SVN, etc...
** Features ** Features
- highlights uncommitted changes in the fringe or margin with [[https://github.com/dgutov/diff-hl][diff-hl]], - highlights uncommitted changes in the fringe or margin with [[https://github.com/dgutov/diff-hl][diff-hl]],
git-gutter, or git-gutter+ git-gutter, or git-gutter+
- adds vcs micro-state ~SPC g.~ to allow quick navigation and modification of - adds vcs transient-state ~SPC g.~ to allow quick navigation and modification of
buffer hunks. buffer hunks.
* Install * Install
@ -28,7 +28,7 @@ add =version-control= to the existing =dotspacemacs-configuration-layers= list i
file. file.
* Configuration * Configuration
You can choose the package to facilitate the diff micro-state and show margins You can choose the package to facilitate the diff transient-state and show margins
by setting =version-control-diff-tool= by setting =version-control-diff-tool=
#+BEGIN_SRC emacs-lisp #+BEGIN_SRC emacs-lisp
@ -62,11 +62,11 @@ one over the other:
| Key Binding | Description | | Key Binding | Description |
|-------------+------------------------------| |-------------+------------------------------|
| ~SPC g .~ | version control micro-state | | ~SPC g .~ | version control transient-state |
| ~SPC T d~ | toggle diff margins | | ~SPC T d~ | toggle diff margins |
| ~SPC T C-d~ | toggle diff margins globally | | ~SPC T C-d~ | toggle diff margins globally |
** Version Control Micro-state ** Version Control Transient-state
| Key Binding | Description | | Key Binding | Description |
|-------------+------------------------------| |-------------+------------------------------|

View File

@ -20,15 +20,15 @@ At startup, the workspace number 1 is active. Switching to a workspace will
create it if it does not exist. For instance at startup you can press create it if it does not exist. For instance at startup you can press
~SPC l w 2~ to create the workspace 2. ~SPC l w 2~ to create the workspace 2.
The key bindings are registered in a micro-state displayed in the minibuffer. The key bindings are registered in a transient-state displayed in the minibuffer.
The docstring of the micro-state displays the existing workspaces and the The docstring of the transient-state displays the existing workspaces and the
currently active workspace has square brackets. Since this is a micro-state it currently active workspace has square brackets. Since this is a transient-state it
is possible to just preview a workspace, for instance press ~SPC l w 2~ to see is possible to just preview a workspace, for instance press ~SPC l w 2~ to see
what's on the workspace 2 then press ~TAB~ to go back to the previously what's on the workspace 2 then press ~TAB~ to go back to the previously
activated workspace. activated workspace.
It is also possible to give a label to a the current workspace by pressing It is also possible to give a label to a the current workspace by pressing
~r~ in the micro-state. ~r~ in the transient-state.
* Install * Install
** Layer ** Layer
@ -38,7 +38,7 @@ file.
** Removing additional help ** Removing additional help
Once you know the key bindings to navigate between the workspaces you Once you know the key bindings to navigate between the workspaces you
may want to disable the exhaustive help in the workspace micro-state. may want to disable the exhaustive help in the workspace transient-state.
Set the variable =eyebrowse-display-help= to =nil= Set the variable =eyebrowse-display-help= to =nil=
#+BEGIN_SRC emacs-lisp #+BEGIN_SRC emacs-lisp

View File

@ -24,7 +24,7 @@
(define-key evil-motion-state-map "gT" 'eyebrowse-prev-window-config) (define-key evil-motion-state-map "gT" 'eyebrowse-prev-window-config)
(defun spacemacs/workspaces-ms-rename () (defun spacemacs/workspaces-ms-rename ()
"Rename a workspace and get back to micro-state." "Rename a workspace and get back to transient-state."
(interactive) (interactive)
(eyebrowse-rename-window-config (eyebrowse--get 'current-slot) nil) (eyebrowse-rename-window-config (eyebrowse--get 'current-slot) nil)
(spacemacs/workspaces-micro-state)) (spacemacs/workspaces-micro-state))
@ -71,7 +71,7 @@
("r" spacemacs/workspaces-ms-rename :exit t) ("r" spacemacs/workspaces-ms-rename :exit t)
("w" eyebrowse-switch-to-window-config :exit t)) ("w" eyebrowse-switch-to-window-config :exit t))
;; The layouts layer defines this keybinding inside a microstate ;; The layouts layer defines this keybinding inside a transient-state
;; thus this is only needed if that layer is not used ;; thus this is only needed if that layer is not used
(unless (configuration-layer/layer-usedp 'spacemacs-layouts) (unless (configuration-layer/layer-usedp 'spacemacs-layouts)
(spacemacs/set-leader-keys "lw" 'spacemacs/workspaces-transient-state/body))))) (spacemacs/set-leader-keys "lw" 'spacemacs/workspaces-transient-state/body)))))

View File

@ -5,11 +5,11 @@
- [[Description][Description]] - [[Description][Description]]
- [[Install][Install]] - [[Install][Install]]
- [[Layer][Layer]] - [[Layer][Layer]]
- [[Features ][Features ]] - [[Features][Features]]
- [[Micro-states][Micro-states]] - [[Transient-states][Transient-states]]
- [[Layouts Micro State][Layouts Micro State]] - [[Layouts Transient State][Layouts Transient State]]
- [[Project Layouts][Project Layouts]] - [[Project Layouts][Project Layouts]]
- [[Custom Layouts Micro State][Custom Layouts Micro State]] - [[Custom Layouts Transient State][Custom Layouts Transient State]]
- [[Usage][Usage]] - [[Usage][Usage]]
- [[Save/Load layouts into a file][Save/Load layouts into a file]] - [[Save/Load layouts into a file][Save/Load layouts into a file]]
- [[Custom Layout Macro][Custom Layout Macro]] - [[Custom Layout Macro][Custom Layout Macro]]
@ -29,11 +29,11 @@ If you use =spacemacs-base= distribution then to use this configuration layer,
add it to your =~/.spacemacs=. You will need to add =spacemacs-layout= to the add it to your =~/.spacemacs=. You will need to add =spacemacs-layout= to the
existing =dotspacemacs-configuration-layers= list in this file. existing =dotspacemacs-configuration-layers= list in this file.
* Features * Features
** Micro-states ** Transient-states
*** Layouts Micro State *** Layouts Transient State
The layouts micro-state is initiated with ~SPC l~. The layouts transient-state is initiated with ~SPC l~.
| Key Binding | Description | | Key Binding | Description |
|-------------+------------------------------------------------------------| |-------------+------------------------------------------------------------|
@ -58,15 +58,15 @@ The layouts micro-state is initiated with ~SPC l~.
| ~R~ | rename current layout | | ~R~ | rename current layout |
| ~s~ | save layouts | | ~s~ | save layouts |
| ~t~ | display a buffer without adding it to the current layout | | ~t~ | display a buffer without adding it to the current layout |
| ~w~ | workspaces micro-state (needs eyebrowse layer enabled) | | ~w~ | workspaces transient-state (needs eyebrowse layer enabled) |
| ~x~ | kill current layout with its buffers | | ~x~ | kill current layout with its buffers |
| ~X~ | kill other layouts with their buffers | | ~X~ | kill other layouts with their buffers |
*** Project Layouts *** Project Layouts
To create a layout for a specific project use ~SPC p l~. To create a layout for a specific project use ~SPC p l~.
*** Custom Layouts Micro State *** Custom Layouts Transient State
The layouts micro-state is initiated with ~SPC l o~. The layouts transient-state is initiated with ~SPC l o~.
Example of default custom layouts that are configured in the corresponding Example of default custom layouts that are configured in the corresponding
layers: layers:

View File

@ -195,8 +195,8 @@ FRAME defaults to the current frame."
(set-persp-parameter (set-persp-parameter
'eyebrowse-last-slot (eyebrowse--get 'last-slot frame) persp))) 'eyebrowse-last-slot (eyebrowse--get 'last-slot frame) persp)))
(defun spacemacs/layout-workspaces-micro-state () (defun spacemacs/layout-workspaces-transient-state ()
"Launches the workspaces micro state, if defined." "Launches the workspaces transient state, if defined."
(interactive) (interactive)
(if (fboundp 'spacemacs/workspaces-transient-state/body) (if (fboundp 'spacemacs/workspaces-transient-state/body)
(call-interactively 'spacemacs/workspaces-transient-state/body) (call-interactively 'spacemacs/workspaces-transient-state/body)

View File

@ -54,10 +54,10 @@
*persp-hash* 'non-existent)) *persp-hash* 'non-existent))
(persp-switch spacemacs--last-selected-layout))) (persp-switch spacemacs--last-selected-layout)))
;; Perspectives micro-state ------------------------------------------- ;; Perspectives transient-state -------------------------------------------
(defun spacemacs//layouts-ms-toggle-doc () (defun spacemacs//layouts-ms-toggle-doc ()
"Toggle the full documenation for the layouts micro-state." "Toggle the full documenation for the layouts transient-state."
(interactive) (interactive)
(setq spacemacs--layouts-ms-doc-toggle (setq spacemacs--layouts-ms-doc-toggle
(logxor spacemacs--layouts-ms-doc-toggle 1))) (logxor spacemacs--layouts-ms-doc-toggle 1)))
@ -96,12 +96,12 @@
[s] save all layouts [s] save all layouts
[S] save layouts by names [S] save layouts by names
[t] show a buffer without adding it to current layout [t] show a buffer without adding it to current layout
[w] workspaces micro-state (needs eyebrowse layer enabled) [w] workspaces transient-state (needs eyebrowse layer enabled)
[x] kill current layout with its buffers [x] kill current layout with its buffers
[X] kill other layouts with their buffers") [X] kill other layouts with their buffers")
(defun spacemacs//layouts-ms-doc () (defun spacemacs//layouts-ms-doc ()
"Return the docstring for the layouts micro-state." "Return the docstring for the layouts transient-state."
(let* ((persp-list (or (persp-names-current-frame-fast-ordered) (let* ((persp-list (or (persp-names-current-frame-fast-ordered)
(list persp-nil-name))) (list persp-nil-name)))
(formatted-persp-list (formatted-persp-list
@ -151,7 +151,7 @@
("s" persp-save-state-to-file :exit t) ("s" persp-save-state-to-file :exit t)
("S" persp-save-to-file-by-names :exit t) ("S" persp-save-to-file-by-names :exit t)
("t" persp-temporarily-display-buffer :exit t) ("t" persp-temporarily-display-buffer :exit t)
("w" spacemacs/layout-workspaces-micro-state :exit t) ("w" spacemacs/layout-workspaces-transient-state :exit t)
("x" spacemacs/layouts-ms-kill) ("x" spacemacs/layouts-ms-kill)
("X" spacemacs/layouts-ms-kill-other :exit t)) ("X" spacemacs/layouts-ms-kill-other :exit t))
(spacemacs/set-leader-keys "l" 'spacemacs/layouts-transient-state/body) (spacemacs/set-leader-keys "l" 'spacemacs/layouts-transient-state/body)
@ -184,7 +184,7 @@
(persp-switch dotspacemacs-default-layout-name))) (persp-switch dotspacemacs-default-layout-name)))
(defun spacemacs/layouts-ms-rename () (defun spacemacs/layouts-ms-rename ()
"Rename a layout and get back to the perspectives micro-state." "Rename a layout and get back to the perspectives transient-state."
(interactive) (interactive)
(call-interactively 'persp-rename) (call-interactively 'persp-rename)
(spacemacs/layouts-transient-state/body)) (spacemacs/layouts-transient-state/body))
@ -214,7 +214,7 @@
(interactive) (interactive)
(persp-switch persp-last-persp-name)) (persp-switch persp-last-persp-name))
;; Custom perspectives micro-state ------------------------------------- ;; Custom perspectives transient-state -------------------------------------
(defun spacemacs//custom-layout-func-name (name) (defun spacemacs//custom-layout-func-name (name)
"Return the name of the custom-perspective function for NAME." "Return the name of the custom-perspective function for NAME."
@ -267,13 +267,13 @@ Available PROPS:
(spacemacs/find-dotfile)) (spacemacs/find-dotfile))
(defun spacemacs/select-custom-layout () (defun spacemacs/select-custom-layout ()
"Update the custom-perspectives microstate and then activate it." "Update the custom-perspectives transient-state and then activate it."
(interactive) (interactive)
(spacemacs//update-custom-layouts) (spacemacs//update-custom-layouts)
(spacemacs/custom-layouts-transient-state/body)) (spacemacs/custom-layouts-transient-state/body))
(defun spacemacs//custom-layouts-ms-documentation () (defun spacemacs//custom-layouts-ms-documentation ()
"Return the docstring for the custom perspectives micro-state." "Return the docstring for the custom perspectives transient-state."
(if spacemacs--custom-layout-alist (if spacemacs--custom-layout-alist
(mapconcat (lambda (custom-persp) (mapconcat (lambda (custom-persp)
(format "[%s] %s" (format "[%s] %s"
@ -282,10 +282,10 @@ Available PROPS:
(spacemacs-buffer/warning (format "`spacemacs--custom-layout-alist' variable is empty" )))) (spacemacs-buffer/warning (format "`spacemacs--custom-layout-alist' variable is empty" ))))
(defun spacemacs//update-custom-layouts () (defun spacemacs//update-custom-layouts ()
"Ensure the custom-perspectives micro-state is updated. "Ensure the custom-perspectives transient-state is updated.
Takes each element in the list `spacemacs--custom-layout-alist' Takes each element in the list `spacemacs--custom-layout-alist'
format so they are supported by the format so they are supported by the
`spacemacs/custom-layouts-micro-state' macro." `spacemacs/custom-layouts-transient-state' macro."
(let (bindings) (let (bindings)
(dolist (custom-persp spacemacs--custom-layout-alist bindings) (dolist (custom-persp spacemacs--custom-layout-alist bindings)
(let* ((binding (car custom-persp)) (let* ((binding (car custom-persp))

View File

@ -81,7 +81,7 @@ The prefix associated with colors is ~C~.
Note that the toggle is local to the current buffer. Note that the toggle is local to the current buffer.
The =saturation= and =lightness= of identifier colors can be adjusted live The =saturation= and =lightness= of identifier colors can be adjusted live
with the micro-state: with the transient-state:
| Key Binding | Description | | Key Binding | Description |
|-----------------+------------------------------------------| |-----------------+------------------------------------------|

View File

@ -334,7 +334,7 @@ is achieved by adding the relevant text properties."
"Send tab in term mode." "Send tab in term mode."
(interactive) (interactive)
(term-send-raw-string "\t")) (term-send-raw-string "\t"))
;; hack to fix pasting issue, the paste micro-state won't ;; hack to fix pasting issue, the paste transient-state won't
;; work in term ;; work in term
(evil-define-key 'normal term-raw-map "p" 'term-paste) (evil-define-key 'normal term-raw-map "p" 'term-paste)
(evil-define-key 'insert term-raw-map (kbd "C-c C-d") 'term-send-eof) (evil-define-key 'insert term-raw-map (kbd "C-c C-d") 'term-send-eof)