From 2b1ed603dc076331b0ae7188bf67cb84db256c8f Mon Sep 17 00:00:00 2001 From: Balaji Sivaraman Date: Sat, 30 Jan 2016 17:02:53 +0530 Subject: [PATCH] Change all references of micro-state in codebase to transient-state --- core/core-dotspacemacs.el | 4 +- doc/CONVENTIONS.org | 28 ++-- doc/DOCUMENTATION.org | 138 +++++++++--------- doc/VIMUSERS.org | 20 +-- ....png => spacemacs-ahs-transient-state.png} | Bin ...png => spacemacs-lisp-transient-state.png} | Bin ...ng => spacemacs-scale-transient-state.png} | Bin layers/+completion/spacemacs-helm/packages.el | 14 +- .../spacemacs-base/keybindings.el | 18 +-- .../+distribution/spacemacs-base/packages.el | 24 +-- .../spacemacs/packages-backup.el | 2 +- layers/+lang/agda/README.org | 4 +- layers/+lang/emacs-lisp/README.org | 2 +- layers/+lang/html/README.org | 4 +- layers/+lang/ipython-notebook/README.org | 14 +- layers/+lang/ipython-notebook/packages.el | 2 +- layers/+lang/scala/README.org | 2 +- layers/+source-control/git/README.org | 18 +-- .../version-control/README.org | 10 +- .../+window-management/eyebrowse/README.org | 10 +- .../+window-management/eyebrowse/packages.el | 4 +- .../spacemacs-layouts/README.org | 22 +-- .../spacemacs-layouts/funcs.el | 4 +- .../spacemacs-layouts/packages.el | 22 +-- layers/colors/README.org | 2 +- layers/shell/packages.el | 2 +- 26 files changed, 185 insertions(+), 185 deletions(-) rename doc/img/{spacemacs-ahs-micro-state.png => spacemacs-ahs-transient-state.png} (100%) rename doc/img/{spacemacs-lisp-micro-state.png => spacemacs-lisp-transient-state.png} (100%) rename doc/img/{spacemacs-scale-micro-state.png => spacemacs-scale-transient-state.png} (100%) diff --git a/core/core-dotspacemacs.el b/core/core-dotspacemacs.el index c4c39547f..bc1a51054 100644 --- a/core/core-dotspacemacs.el +++ b/core/core-dotspacemacs.el @@ -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. Default value is `cache'.") -(defvar dotspacemacs-enable-paste-micro-state t - "If non nil the paste micro-state is enabled. While enabled pressing `p` +(defvar dotspacemacs-enable-paste-transient-state t + "If non nil the paste transient-state is enabled. While enabled pressing `p` several times cycle between the kill ring content.'") (defvar dotspacemacs-which-key-delay 0.4 diff --git a/doc/CONVENTIONS.org b/doc/CONVENTIONS.org index 1d1e50f05..a2020da65 100644 --- a/doc/CONVENTIONS.org +++ b/doc/CONVENTIONS.org @@ -10,7 +10,7 @@ - [[Reserved prefix][Reserved prefix]] - [[User prefix][User prefix]] - [[Major mode prefix][Major mode prefix]] - - [[Micro-state][Micro-state]] + - [[Transient-state][Transient-state]] - [[Evilified buffers][Evilified buffers]] - [[Navigation][Navigation]] - [[n and N][n and N]] @@ -54,7 +54,7 @@ Variables follow these conventions: A package is initialized in a function with name =/init-xxx= where: - == is the layer name - =xxx= is the package name - + ** Use-package - Always use =progn= when a code block requires multiple lines for =:init= or =:config= keywords. @@ -73,14 +73,14 @@ user. ~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 ~,~. -*** Micro-state -Whenever possible a micro-state should be enabled with ~M-SPC~ and ~s-M-SPC~. We +*** Transient-state +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. -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~. -It is recommended to add ~q~ to leave the micro-state. +It is recommended to add ~q~ to leave the transient-state. ** Evilified buffers /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 map to: - 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 - add incremental search with ~/~, ~n~ and ~N~ - 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 ~p~. -Ideally a micro-state should be provided to smooth the navigation -experience. A micro-state allows to repeat key bindings without entering -each time the prefix commands. More info on micro-states in the -[[file:DOCUMENTATION.org::Micro-states][documentation]]. +Ideally a transient-state should be provided to smooth the navigation +experience. A transient-state allows to repeat key bindings without entering +each time the prefix commands. More info on transient-states in the +[[file:DOCUMENTATION.org::Transient-states][documentation]]. *** Code Navigation 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 | 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 the spacemacs level and ideally the function should be proposed as a patch 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 - Note: Many layer =READMEs= do not follow this convention yet. Please fix them if you can. - + - 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~. diff --git a/doc/DOCUMENTATION.org b/doc/DOCUMENTATION.org index 022a9092f..0bdce3432 100644 --- a/doc/DOCUMENTATION.org +++ b/doc/DOCUMENTATION.org @@ -55,7 +55,7 @@ - [[States][States]] - [[Evil leader][Evil leader]] - [[Universal argument][Universal argument]] - - [[Micro-states][Micro-states]] + - [[Transient-states][Transient-states]] - [[Differences between Vim, Evil and Spacemacs][Differences between Vim, Evil and Spacemacs]] - [[The vim-surround case][The vim-surround case]] - [[Evil plugins][Evil plugins]] @@ -84,7 +84,7 @@ - [[Helm][Helm]] - [[C-z and Tab switch][C-z and Tab switch]] - [[Helm focus][Helm focus]] - - [[Helm micro-state][Helm micro-state]] + - [[Helm transient-state][Helm transient-state]] - [[Discovering][Discovering]] - [[Key bindings][Key bindings]] - [[Which-key][Which-key]] @@ -105,17 +105,17 @@ - [[Joining and splitting][Joining and splitting]] - [[Window manipulation][Window manipulation]] - [[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]] - [[Buffers and Files][Buffers and Files]] - [[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]] - [[Files manipulations key bindings][Files manipulations key bindings]] - [[Emacs and Spacemacs files][Emacs and Spacemacs files]] - [[Browsing files with Helm][Browsing files with Helm]] - [[Ido][Ido]] - - [[Ido micro-state][Ido micro-state]] + - [[Ido transient-state][Ido transient-state]] - [[NeoTree file tree][NeoTree file tree]] - [[NeoTree navigation][NeoTree navigation]] - [[Opening files with NeoTree][Opening files with NeoTree]] @@ -144,7 +144,7 @@ - [[Helm-swoop][Helm-swoop]] - [[Editing][Editing]] - [[Paste text][Paste text]] - - [[Paste Micro-state][Paste Micro-state]] + - [[Paste Transient-state][Paste Transient-state]] - [[Auto-indent pasted text][Auto-indent pasted text]] - [[Text manipulation commands][Text manipulation 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 pressing ~RETURN~. For instance: ~SPC : org-reload C-u RET~ -** Micro-states -Spacemacs defines a wide variety of =micro-states= (temporary overlay maps) +** Transient-states +Spacemacs defines a wide variety of =transient-states= (temporary overlay maps) where it makes sense. This prevents one from doing repetitive and tedious 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. -Auto-highlight-symbol micro-state: -[[file:img/spacemacs-ahs-micro-state.png]] +Auto-highlight-symbol transient-state: +[[file:img/spacemacs-ahs-transient-state.png]] -[[Text][Text scale micro-state]]: -[[file:img/spacemacs-scale-micro-state.png]] +[[Text][Text scale transient-state]]: +[[file:img/spacemacs-scale-transient-state.png]] * Differences between Vim, Evil and Spacemacs - 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 frame maximize | | ~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 (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 mouse-click for example), use ~SPC w b~ to return focus to the minibuffer. -*** Helm micro-state -Spacemacs defines a [[Micro-states][micro-state]] for =Helm= to make it work like [[https://github.com/Shougo/unite.vim][Vim's Unite]] +*** Helm transient-state +Spacemacs defines a [[Transient-states][transient-state]] for =Helm= to make it work like [[https://github.com/Shougo/unite.vim][Vim's Unite]] 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 | |----------------------+--------------------------------------------------| -| ~M-SPC~ or ~s-M-SPC~ | initiate the micro-state | -| ~q~ | quit micro-state | -| ~TAB~ | switch to actions page and leave the micro-state | +| ~M-SPC~ or ~s-M-SPC~ | initiate the transient-state | +| ~q~ | quit transient-state | +| ~TAB~ | switch to actions page and leave the transient-state | | ~1~ | execute action 0 | | ~2~ | execute action 1 | | ~3~ | execute action 2 | @@ -1373,7 +1373,7 @@ Spacemacs. *** 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~). 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 SPC~ | select window using [[https://github.com/abo-abo/ace-window][ace-window]] | -**** Window manipulation micro-state -A convenient window manipulation micro-state allows to perform most of the -actions listed above. The micro-state allows additional actions as well like +**** Window manipulation transient-state +A convenient window manipulation transient-state allows to perform most of the +actions listed above. The transient-state allows additional actions as well like window resizing. | Key Binding | Description | |---------------+---------------------------------------------------------------| -| ~SPC w .~ | initiate micro-state | +| ~SPC w .~ | initiate transient-state | | ~?~ | display the full documentation in minibuffer | | ~0~ | go to window number 0 | | ~1~ | go to window number 1 | @@ -1591,7 +1591,7 @@ window resizing. | ~v~ | vertical split | | ~V~ | horizontal split and focus new window | | ~w~ | focus other window | -| Any other key | leave the micro-state | +| Any other key | leave the transient-state | **** 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) | | ~z f~ | Make current function or comments visible in buffer as much as possible | -**** Buffers manipulation micro-state -A convenient buffer manipulation micro-state allows to quickly cycles through +**** Buffers manipulation transient-state +A convenient buffer manipulation transient-state allows to quickly cycles through the opened buffer and kill them. | Key Binding | Description | |---------------+-----------------------------------------------| -| ~SPC b .~ | initiate micro-state | +| ~SPC b .~ | initiate transient-state | | ~K~ | kill current buffer | | ~n~ | go to next 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 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-l~ | go to next directory | -*** Ido micro-state -Spacemacs defines a [[Micro-states][micro-state]] for =ido=. +*** Ido transient-state +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 | |----------------------+-------------------------------------| -| ~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 | | ~e~ | open dired | | ~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 | | ~o~ | open in other window | | ~p~ | previous directory in history | -| ~q~ | quit micro-state | +| ~q~ | quit transient-state | | ~s~ | open in a new horizontal split | | ~t~ | open in other frame | | ~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 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. 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 | |-------------+------------------------------------------------------------------------------------| -| ~/~ | initiate navigation micro-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 forwards | +| ~#~ | initiate navigation transient-state on current symbol and jump backwards | | ~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~ | 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 | -In 'Spacemacs' highlight symbol micro-state: +In 'Spacemacs' highlight symbol transient-state: | Key Binding | Description | |---------------+---------------------------------------------------------------| @@ -2101,12 +2101,12 @@ In 'Spacemacs' highlight symbol micro-state: | ~D~ | go to previous definition occurrence | | ~r~ | change range (=function=, =display area=, =whole buffer=) | | ~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 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 [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. *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 Use =helm-semantic-or-imenu= command from =Helm= to quickly navigate between the @@ -2153,23 +2153,23 @@ modifications to the buffer. ** Editing *** Paste text -**** Paste Micro-state -The paste micro-state can be enabled by settings the variable -=dotspacemacs-enable-paste-micro-state= to =t=. By default it is disabled. +**** Paste Transient-state +The paste transient-state can be enabled by settings the variable +=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. 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=. -| Key Binding | Description | -|---------------+---------------------------------------------------------------------------| -| ~p~ or ~P~ | paste the text before or after point and initiate the =paste= micro-state | -| ~p~ | in micro-state: replace paste text with the previously copied one | -| ~P~ | in micro-state: replace paste text with the next copied one | -| ~.~ | paste the same text and leave the micro-state | -| Any other key | leave the micro-state | +| Key Binding | Description | +|---------------+-------------------------------------------------------------------------------| +| ~p~ or ~P~ | paste the text before or after point and initiate the =paste= transient-state | +| ~p~ | in transient-state: replace paste text with the previously copied one | +| ~P~ | in transient-state: replace paste text with the next copied one | +| ~.~ | paste the same text and leave the transient-state | +| Any other key | leave the transient-state | **** Auto-indent pasted text 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 n~ | set the justification to none | | ~SPC x j r~ | set the justification to right | - | ~SPC x J~ | move down a line of text (enter micro-state) | - | ~SPC x K~ | move up 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 transient-state) | | ~SPC x l s~ | sort lines | | ~SPC x l u~ | uniquify lines | | ~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 | |---------------+----------------------------------------------------------------------------| -| ~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 micro-state | -| ~SPC z x -~ | scale down the font and initiate the font scaling micro-state | -| ~SPC z x 0~ | reset the font size (no scaling) 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 transient-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 transient-state | | ~+~ | increase the font size | | ~=~ | increase the font size | | ~-~ | decrease 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, 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 | |---------------+-------------------------------------------------------------------------| -| ~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 micro-state | -| ~SPC z f -~ | zoom out the frame content and initiate the frame scaling micro-state | -| ~SPC z f 0~ | reset the frame content size 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 transient-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 transient-state | | ~+~ | zoom in | | ~=~ | zoom in | | ~-~ | zoom out | | ~0~ | reset zoom | -| Any other key | leave the zoom frame micro-state | +| Any other key | leave the zoom frame transient-state | *** Increase/Decrease numbers Spacemacs uses [[https://github.com/cofi/evil-numbers][evil-numbers]] to easily increase or increase numbers. | Key Binding | Description | |-------------+-----------------------------------------------------------------| -| ~SPC n +~ | increase the number under point by one and initiate micro-state | -| ~SPC n -~ | decrease 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 transient-state | -In micro-state: +In transient-state: | Key Binding | Description | |---------------+----------------------------------------| | ~+~ | increase 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 argument (ie. ~10 SPC n +~ will add 10 to the number under point). diff --git a/doc/VIMUSERS.org b/doc/VIMUSERS.org index 13e61cb50..058e38e3d 100644 --- a/doc/VIMUSERS.org +++ b/doc/VIMUSERS.org @@ -8,7 +8,7 @@ - [[Terms][Terms]] - [[Modes vs. States][Modes vs. States]] - [[Layers][Layers]] - - [[Micro-states][Micro-states]] + - [[Transient-states][Transient-states]] - [[Keybinding conventions][Keybinding conventions]] - [[Running commands][Running commands]] - [[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 [[./DOCUMENTATION.org#configuration-layers][documentation]]. There is also a more in-depth guide on writing layers [[file:LAYERS.org][here]]. -*** Micro-states -Spacemacs provides a special functionality called micro-states. Micro-states +*** Transient-states +Spacemacs provides a special functionality called transient-states. Transient-states allow similar commands to be run in succession without repeatedly pressing the -~~ key. Micro-states are usually triggered by using a keybinding with the +~~ key. Transient-states are usually triggered by using a keybinding with the following pattern: ~ .~ where group is the category the -micro-state falls under. When in a micro-state you will see documentation at the -bottom of your window. To exit a micro-state press ~q~. +transient-state falls under. When in a transient-state you will see documentation at the +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 Spacemacs uses ~SPC~ as its ~~ 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 k~ | Search for a buffer to kill. | | ~SPC b K~ | Kill all buffers except the current buffer. | -| ~SPC b .~ | Buffer micro-state. | +| ~SPC b .~ | Buffer transient-state. | **** Special buffers 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 h/j/k/l~ | Navigate among windows. | | ~SPC w H/J/K/L~ | Move the current window. | -| ~SPC w .~ | Window micro-state. | +| ~SPC w .~ | Window transient-state. | ** Files All file commands in Spacemacs are available under the ~SPC f~ prefix. diff --git a/doc/img/spacemacs-ahs-micro-state.png b/doc/img/spacemacs-ahs-transient-state.png similarity index 100% rename from doc/img/spacemacs-ahs-micro-state.png rename to doc/img/spacemacs-ahs-transient-state.png diff --git a/doc/img/spacemacs-lisp-micro-state.png b/doc/img/spacemacs-lisp-transient-state.png similarity index 100% rename from doc/img/spacemacs-lisp-micro-state.png rename to doc/img/spacemacs-lisp-transient-state.png diff --git a/doc/img/spacemacs-scale-micro-state.png b/doc/img/spacemacs-scale-transient-state.png similarity index 100% rename from doc/img/spacemacs-scale-micro-state.png rename to doc/img/spacemacs-scale-transient-state.png diff --git a/layers/+completion/spacemacs-helm/packages.el b/layers/+completion/spacemacs-helm/packages.el index 96b57caa9..791c73c47 100644 --- a/layers/+completion/spacemacs-helm/packages.el +++ b/layers/+completion/spacemacs-helm/packages.el @@ -287,14 +287,14 @@ (defun spacemacs//helm-cleanup () "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)) (add-hook 'helm-cleanup-hook 'spacemacs//helm-cleanup) (defface spacemacs-helm-navigation-ms-face `((t :background ,(face-attribute 'error :foreground) :foreground "black")) - "Face for helm heder when helm micro-state is activated." + "Face for helm heder when helm transient-state is activated." :group 'spacemacs)) :config @@ -419,7 +419,7 @@ ARG non nil means Vim like movements." (helm-ag-edit)))) (defun spacemacs//helm-navigation-ms-on-enter () - "Initialization of helm micro-state." + "Initialization of helm transient-state." ;; faces (spacemacs//helm-navigation-ms-set-face) (setq spacemacs--helm-navigation-ms-face-cookie-minibuffer @@ -428,7 +428,7 @@ ARG non nil means Vim like movements." 'spacemacs-helm-navigation-ms-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 (setq spacemacs--helm-navigation-ms-face-cookie-header (face-remap-add-relative @@ -436,7 +436,7 @@ ARG non nil means Vim like movements." 'spacemacs-helm-navigation-ms-face)))) (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 (face-remap-remove-relative spacemacs--helm-navigation-ms-face-cookie-header)) @@ -452,7 +452,7 @@ ARG non nil means Vim like movements." (intern) (helm-select-nth-action ,(1- n)))))) - (defun spacemacs/helm-micro-state-select-action () + (defun spacemacs/helm-transient-state-select-action () (interactive) (call-interactively 'helm-select-action) (spacemacs//helm-navigation-ms-set-face)) @@ -481,7 +481,7 @@ ARG non nil means Vim like movements." ("TAB" helm-select-action :exit t) ("" helm-maybe-exit-minibuffer :exit t) ;; ("?" 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) ("g" helm-beginning-of-buffer) ("G" helm-end-of-buffer) diff --git a/layers/+distribution/spacemacs-base/keybindings.el b/layers/+distribution/spacemacs-base/keybindings.el index b5e50c445..2e7cc78b2 100644 --- a/layers/+distribution/spacemacs-base/keybindings.el +++ b/layers/+distribution/spacemacs-base/keybindings.el @@ -367,10 +367,10 @@ (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 :title "Buffer Selection Transient State" @@ -382,9 +382,9 @@ ("q" nil "quit" :exit t)) (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) "Wrap `spacemacs/shrink-window-horizontally'." @@ -468,9 +468,9 @@ Select^^^^ Move^^^^ Split^^ Resize^^ (spacemacs/set-leader-keys "w." '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) "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)) (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 () "Toggle between transparent or opaque display." @@ -554,4 +554,4 @@ otherwise it is scaled down." (spacemacs/set-leader-keys "TT" 'spacemacs/scale-transparency-transient-state/spacemacs/toggle-transparency) -;; end of Transparency Micro State +;; end of Transparency Transient State diff --git a/layers/+distribution/spacemacs-base/packages.el b/layers/+distribution/spacemacs-base/packages.el index 18137bec9..2d72bb4d7 100644 --- a/layers/+distribution/spacemacs-base/packages.el +++ b/layers/+distribution/spacemacs-base/packages.el @@ -311,7 +311,7 @@ Example: (evil-map visual \"<\" \"" 'spacemacs/scroll-transient-state/spacemacs/scroll-half-page-down) - ;; pasting micro-state + ;; pasting transient-state (spacemacs|define-transient-state paste :title "Pasting Transient State" :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) ("p" evil-paste-after) ("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-before)) @@ -554,7 +554,7 @@ below. Anything else exits." "Setup the minibuffer." ;; Since ido is implemented in a while loop where each ;; 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. (when spacemacs--ido-navigation-ms-enabled (spacemacs/ido-navigation-micro-state))) @@ -564,7 +564,7 @@ below. Anything else exits." (when spacemacs--ido-navigation-ms-face-cookie-minibuffer (face-remap-remove-relative 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) ;; overwrite the key bindings for ido vertical mode only (define-key ido-completion-map (kbd "C-") 'ido-select-text) @@ -594,7 +594,7 @@ below. Anything else exits." (define-key ido-completion-map (kbd "") 'ido-next-match) (define-key ido-completion-map (kbd "") 'ido-delete-backward-updir) (define-key ido-completion-map (kbd "") '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 "s-M-SPC") 'spacemacs/ido-navigation-micro-state) ) @@ -647,7 +647,7 @@ below. Anything else exits." result)) (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 "Cookie pointing to the local face remapping.") @@ -656,28 +656,28 @@ below. Anything else exits." `((t :background ,(face-attribute 'error :foreground) :foreground "black" :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) (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 (face-remap-add-relative 'minibuffer-prompt 'spacemacs-ido-navigation-ms-face))) (defun spacemacs//ido-navigation-ms-on-enter () - "Initialization of ido micro-state." + "Initialization of ido transient-state." (setq spacemacs--ido-navigation-ms-enabled t) (spacemacs//ido-navigation-ms-set-face)) (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 spacemacs--ido-navigation-ms-face-cookie-minibuffer)) (defun spacemacs//ido-navigation-ms-full-doc () - "Full documentation for ido navigation micro-state." + "Full documentation for ido navigation transient-state." " [?] display this help [e] enter dired diff --git a/layers/+distribution/spacemacs/packages-backup.el b/layers/+distribution/spacemacs/packages-backup.el index e71c39d83..e6ed3d0ec 100644 --- a/layers/+distribution/spacemacs/packages-backup.el +++ b/layers/+distribution/spacemacs/packages-backup.el @@ -320,7 +320,7 @@ "sh" 'spacemacs/symbol-highlight "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 ahs-forward-definition ahs-backward diff --git a/layers/+lang/agda/README.org b/layers/+lang/agda/README.org index faff1891e..0f93a9de3 100644 --- a/layers/+lang/agda/README.org +++ b/layers/+lang/agda/README.org @@ -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 context, the goal and the given expression's inferred type. | | ~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 d~ | Infers the type of the given expression. | | ~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 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. | diff --git a/layers/+lang/emacs-lisp/README.org b/layers/+lang/emacs-lisp/README.org index 8dfd9ec4c..15e9d1943 100644 --- a/layers/+lang/emacs-lisp/README.org +++ b/layers/+lang/emacs-lisp/README.org @@ -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 t b~ | run tests of current buffer | | ~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 The [[file:../../semantic/README.org][semantic]] layer should be installed for these key bindings to become active. diff --git a/layers/+lang/html/README.org b/layers/+lang/html/README.org index 23cb12d3f..50804cb34 100644 --- a/layers/+lang/html/README.org +++ b/layers/+lang/html/README.org @@ -44,7 +44,7 @@ file. | ~SPC m z~ | fold/unfold current element | | ~%~ | 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 | |-------------+----------------------------------------------------------------| @@ -59,7 +59,7 @@ A micro-state is also defined, start it with ~SPC m .~ or ~, .~ | ~K~ / ~gk~ | previous sibling element | | ~l~ | first child element | | ~p~ | show xpath of current element | -| ~q~ | leave the micro-state | +| ~q~ | leave the transient-state | | ~r~ | rename current element | | ~w~ | wrap current element | diff --git a/layers/+lang/ipython-notebook/README.org b/layers/+lang/ipython-notebook/README.org index 9d5a281e0..d6b8fefba 100644 --- a/layers/+lang/ipython-notebook/README.org +++ b/layers/+lang/ipython-notebook/README.org @@ -15,7 +15,7 @@ - [[Using the IPython notebook][Using the IPython notebook]] - [[Open Notebook List][Open Notebook List]] - [[Key Bindings][Key Bindings]] - - [[Micro-state: =ipython-notebook=][Micro-state: =ipython-notebook=]] + - [[Transient-state: =ipython-notebook=][Transient-state: =ipython-notebook=]] - [[Normal mode][Normal mode]] - [[Insert mode][Insert 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. * Features -- Keybindings available through micro-State or leader key +- Keybindings available through transient-state or leader key - Lazy-loading * List of TODOS @@ -58,16 +58,16 @@ Have an IPython notebook running * Using the IPython notebook ** 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~ ** 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= -Once you are in the ipython notebook you can activate the micro-state with +*** Transient-state: =ipython-notebook= +Once you are in the ipython notebook you can activate the transient-state with ~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. | Key | Function | diff --git a/layers/+lang/ipython-notebook/packages.el b/layers/+lang/ipython-notebook/packages.el index 7e6a6a087..209d2a74d 100644 --- a/layers/+lang/ipython-notebook/packages.el +++ b/layers/+lang/ipython-notebook/packages.el @@ -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 [_O_/_o_]^^ insert above/below [_+_/_-_] create/delete [_C-s_/_C-r_] save/rename 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" :bindings ("q" nil :exit t) diff --git a/layers/+lang/scala/README.org b/layers/+lang/scala/README.org index 2b136b053..301673fbb 100644 --- a/layers/+lang/scala/README.org +++ b/layers/+lang/scala/README.org @@ -150,7 +150,7 @@ To insert a leading asterisk in multiline comments automatically, set the variab | ~SPC m d s~ | step | | ~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 diff --git a/layers/+source-control/git/README.org b/layers/+source-control/git/README.org index 54755e3e3..c6ea586a7 100644 --- a/layers/+source-control/git/README.org +++ b/layers/+source-control/git/README.org @@ -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. -| Key Binding | Description | -|-------------+------------------------------------------------| -| ~SPC g t~ | start git timemachine and initiate micro-state | -| ~c~ | show current commit | -| ~n~ | show next commit | -| ~N~ | show previous commit | -| ~p~ | show previous commit | -| ~q~ | leave micro-state and git timemachine | -| ~Y~ | copy current commit hash | +| Key Binding | Description | +|-------------+----------------------------------------------------| +| ~SPC g t~ | start git timemachine and initiate transient-state | +| ~c~ | show current commit | +| ~n~ | show next commit | +| ~N~ | show previous commit | +| ~p~ | show previous commit | +| ~q~ | leave transient-state and git timemachine | +| ~Y~ | copy current commit hash | # LocalWords: unpulled diff --git a/layers/+source-control/version-control/README.org b/layers/+source-control/version-control/README.org index 55771a233..7d8228eb5 100644 --- a/layers/+source-control/version-control/README.org +++ b/layers/+source-control/version-control/README.org @@ -9,7 +9,7 @@ - [[Configuration][Configuration]] - [[Differences between margin programs][Differences between margin programs]] - [[Key Bindings][Key Bindings]] - - [[Version Control Micro-state][Version Control Micro-state]] + - [[Version Control Transient-state][Version Control Transient-state]] * Description 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 - highlights uncommitted changes in the fringe or margin with [[https://github.com/dgutov/diff-hl][diff-hl]], 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. * Install @@ -28,7 +28,7 @@ add =version-control= to the existing =dotspacemacs-configuration-layers= list i file. * 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= #+BEGIN_SRC emacs-lisp @@ -62,11 +62,11 @@ one over the other: | Key Binding | Description | |-------------+------------------------------| -| ~SPC g .~ | version control micro-state | +| ~SPC g .~ | version control transient-state | | ~SPC T d~ | toggle diff margins | | ~SPC T C-d~ | toggle diff margins globally | -** Version Control Micro-state +** Version Control Transient-state | Key Binding | Description | |-------------+------------------------------| diff --git a/layers/+window-management/eyebrowse/README.org b/layers/+window-management/eyebrowse/README.org index 501930fa5..84ca2eee2 100644 --- a/layers/+window-management/eyebrowse/README.org +++ b/layers/+window-management/eyebrowse/README.org @@ -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 ~SPC l w 2~ to create the workspace 2. -The key bindings are registered in a micro-state displayed in the minibuffer. -The docstring of the micro-state displays the existing workspaces and the -currently active workspace has square brackets. Since this is a micro-state it +The key bindings are registered in a transient-state displayed in the minibuffer. +The docstring of the transient-state displays the existing workspaces and the +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 what's on the workspace 2 then press ~TAB~ to go back to the previously activated workspace. 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 ** Layer @@ -38,7 +38,7 @@ file. ** Removing additional help 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= #+BEGIN_SRC emacs-lisp diff --git a/layers/+window-management/eyebrowse/packages.el b/layers/+window-management/eyebrowse/packages.el index 93af9ec6d..306e6fa26 100644 --- a/layers/+window-management/eyebrowse/packages.el +++ b/layers/+window-management/eyebrowse/packages.el @@ -24,7 +24,7 @@ (define-key evil-motion-state-map "gT" 'eyebrowse-prev-window-config) (defun spacemacs/workspaces-ms-rename () - "Rename a workspace and get back to micro-state." + "Rename a workspace and get back to transient-state." (interactive) (eyebrowse-rename-window-config (eyebrowse--get 'current-slot) nil) (spacemacs/workspaces-micro-state)) @@ -71,7 +71,7 @@ ("r" spacemacs/workspaces-ms-rename :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 (unless (configuration-layer/layer-usedp 'spacemacs-layouts) (spacemacs/set-leader-keys "lw" 'spacemacs/workspaces-transient-state/body))))) diff --git a/layers/+window-management/spacemacs-layouts/README.org b/layers/+window-management/spacemacs-layouts/README.org index 4950c2b61..5fede6d9b 100644 --- a/layers/+window-management/spacemacs-layouts/README.org +++ b/layers/+window-management/spacemacs-layouts/README.org @@ -5,11 +5,11 @@ - [[Description][Description]] - [[Install][Install]] - [[Layer][Layer]] - - [[Features ][Features ]] - - [[Micro-states][Micro-states]] - - [[Layouts Micro State][Layouts Micro State]] + - [[Features][Features]] + - [[Transient-states][Transient-states]] + - [[Layouts Transient State][Layouts Transient State]] - [[Project Layouts][Project Layouts]] - - [[Custom Layouts Micro State][Custom Layouts Micro State]] + - [[Custom Layouts Transient State][Custom Layouts Transient State]] - [[Usage][Usage]] - [[Save/Load layouts into a file][Save/Load layouts into a file]] - [[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 existing =dotspacemacs-configuration-layers= list in this file. -* Features +* Features -** Micro-states -*** Layouts Micro State -The layouts micro-state is initiated with ~SPC l~. +** Transient-states +*** Layouts Transient State +The layouts transient-state is initiated with ~SPC l~. | Key Binding | Description | |-------------+------------------------------------------------------------| @@ -58,15 +58,15 @@ The layouts micro-state is initiated with ~SPC l~. | ~R~ | rename current layout | | ~s~ | save layouts | | ~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 other layouts with their buffers | *** Project Layouts To create a layout for a specific project use ~SPC p l~. -*** Custom Layouts Micro State -The layouts micro-state is initiated with ~SPC l o~. +*** Custom Layouts Transient State +The layouts transient-state is initiated with ~SPC l o~. Example of default custom layouts that are configured in the corresponding layers: diff --git a/layers/+window-management/spacemacs-layouts/funcs.el b/layers/+window-management/spacemacs-layouts/funcs.el index 22c54a776..196fe3320 100644 --- a/layers/+window-management/spacemacs-layouts/funcs.el +++ b/layers/+window-management/spacemacs-layouts/funcs.el @@ -195,8 +195,8 @@ FRAME defaults to the current frame." (set-persp-parameter 'eyebrowse-last-slot (eyebrowse--get 'last-slot frame) persp))) -(defun spacemacs/layout-workspaces-micro-state () - "Launches the workspaces micro state, if defined." +(defun spacemacs/layout-workspaces-transient-state () + "Launches the workspaces transient state, if defined." (interactive) (if (fboundp 'spacemacs/workspaces-transient-state/body) (call-interactively 'spacemacs/workspaces-transient-state/body) diff --git a/layers/+window-management/spacemacs-layouts/packages.el b/layers/+window-management/spacemacs-layouts/packages.el index 91f37d24f..7856c99e3 100644 --- a/layers/+window-management/spacemacs-layouts/packages.el +++ b/layers/+window-management/spacemacs-layouts/packages.el @@ -54,10 +54,10 @@ *persp-hash* 'non-existent)) (persp-switch spacemacs--last-selected-layout))) - ;; Perspectives micro-state ------------------------------------------- + ;; Perspectives transient-state ------------------------------------------- (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) (setq spacemacs--layouts-ms-doc-toggle (logxor spacemacs--layouts-ms-doc-toggle 1))) @@ -96,12 +96,12 @@ [s] save all layouts [S] save layouts by names [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 other layouts with their buffers") (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) (list persp-nil-name))) (formatted-persp-list @@ -151,7 +151,7 @@ ("s" persp-save-state-to-file :exit t) ("S" persp-save-to-file-by-names :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-other :exit t)) (spacemacs/set-leader-keys "l" 'spacemacs/layouts-transient-state/body) @@ -184,7 +184,7 @@ (persp-switch dotspacemacs-default-layout-name))) (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) (call-interactively 'persp-rename) (spacemacs/layouts-transient-state/body)) @@ -214,7 +214,7 @@ (interactive) (persp-switch persp-last-persp-name)) - ;; Custom perspectives micro-state ------------------------------------- + ;; Custom perspectives transient-state ------------------------------------- (defun spacemacs//custom-layout-func-name (name) "Return the name of the custom-perspective function for NAME." @@ -267,13 +267,13 @@ Available PROPS: (spacemacs/find-dotfile)) (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) (spacemacs//update-custom-layouts) (spacemacs/custom-layouts-transient-state/body)) (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 (mapconcat (lambda (custom-persp) (format "[%s] %s" @@ -282,10 +282,10 @@ Available PROPS: (spacemacs-buffer/warning (format "`spacemacs--custom-layout-alist' variable is empty" )))) (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' format so they are supported by the -`spacemacs/custom-layouts-micro-state' macro." +`spacemacs/custom-layouts-transient-state' macro." (let (bindings) (dolist (custom-persp spacemacs--custom-layout-alist bindings) (let* ((binding (car custom-persp)) diff --git a/layers/colors/README.org b/layers/colors/README.org index 3fb51ada5..beb4e6207 100644 --- a/layers/colors/README.org +++ b/layers/colors/README.org @@ -81,7 +81,7 @@ The prefix associated with colors is ~C~. Note that the toggle is local to the current buffer. The =saturation= and =lightness= of identifier colors can be adjusted live -with the micro-state: +with the transient-state: | Key Binding | Description | |-----------------+------------------------------------------| diff --git a/layers/shell/packages.el b/layers/shell/packages.el index 7195f9218..aad2b1962 100644 --- a/layers/shell/packages.el +++ b/layers/shell/packages.el @@ -334,7 +334,7 @@ is achieved by adding the relevant text properties." "Send tab in term mode." (interactive) (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 (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)