Small bugfix & minor README.md changes

Author: GeneZharov

README.md

@@ -6,14 +6,14 @@ one-hand usage. Forget about `<C-f>`, `<C-d>`, and `G`. You don't need to keep
 holding modifier keys anymore — everything can be done with single-key
 mappings!
 
-New key mappings available in the scroll mode:
+New key mappings available in the Scroll mode:
 
 - `j` / `k` — scroll 5 lines down / up
 - `l` / `h` — scroll page down / up
 - `b` — scroll to the ending of the buffer (bottom)
 - `u` — scroll to the beginning of the buffer (up)
-- `;` — quit the scroll mode
-- `-` — quit the scroll mode and delete the buffer
+- `;` — quit the Scroll mode
+- `-` — quit the Scroll mode and delete the buffer
 
 With these mappings, you can quickly look around, walk through several screens
 of text, and when you are in the right place return back to normal mode for
@@ -22,7 +22,7 @@ more accurate text manipulations.
 ![Demo](https://github.com/GeneZharov/vim-scrollmode/blob/master/demo.gif?raw=true)
 
 For example, compare this scenario of a scrolling session in normal mode and in
-scroll mode.
+Scroll mode.
 
 |     | Normal Mode                     | Scroll Mode              |
 | --- | ------------------------------- | ------------------------ |
@@ -32,28 +32,34 @@ scroll mode.
 | 4.  | `k` `k` `k` `k` `k` `k` `k` `k` | `j` `j`                  |
 |     | 13 keys (including 3 modifiers) | 5 keys, all for one hand |
 
-Since scroll mode is in fact just a wrapper around normal mode, all keys, that
-are not remapped by scroll mode continue to be available: searching (`/`, `?`,
+Since Scroll mode is in fact just a wrapper around normal mode, all keys, that
+are not remapped by Scroll mode continue to be available: searching (`/`, `?`,
 `n`, `N`), window managing (`<C-w>`), etc.
 
+If you enter another mode (Command mode, Insert mode, etc.) while Scroll mode
+is active, then it will be implicitly automatically finished, all Normal mode
+mappings will be restored, and you will be able to proceed in the mode of your
+choice.
+
 ## Installation
 
 | Plugin Manager                                         | Command                                                                                          |
 | ------------------------------------------------------ | ------------------------------------------------------------------------------------------------ |
 | [vim-plug](https://github.com/junegunn/vim-plug)       | `Plug 'GeneZharov/vim-scrollmode'`                                                               |
 | [Vundle](https://github.com/VundleVim/Vundle.vim)      | `Plugin 'GeneZharov/vim-scrollmode'`                                                             |
-| [pathogen.vim](https://github.com/tpope/vim-pathogen/) | `git clone 'git@github.com:GeneZharov/vim-scrollmode.git ~/.vim/bundle/vim-scrollmode'`          |
+| [pathogen.vim](https://github.com/tpope/vim-pathogen/) | `git clone 'git@github.com:GeneZharov/vim-scrollmode.git' ~/.vim/bundle/vim-scrollmode`          |
 | native pack                                            | `git clone 'git@github.com:GeneZharov/vim-scrollmode.git' ~/.vim/pack/dist/start/vim-scrollmode` |
 
-Set a preferred shortcut to enter the scroll mode:
+Set a preferred shortcut to enter the Scroll mode:
 
 ```vim
 nmap <Leader>; <Plug>ScrollMode
 ```
 
-I prefer to use `<Space>` as a `<Leader>` key:
+I prefer to use Scroll mode with a `<Space>` as my `<Leader>` key:
 
 ```vim
+" Place it before all the <Leader> mappings
 map <SPACE> <Nop>
 let mapleader = "\<Space>"
 ```
@@ -64,7 +70,7 @@ let mapleader = "\<Space>"
 
 - **`g:scrollmode_actions`**
 
-  This option allows to configure default scroll mode key mappings. These
+  This option allows to configure default Scroll mode key mappings. These
   key mappings are internally set with the following dictionary.
 
   ```vim
@@ -83,36 +89,36 @@ let mapleader = "\<Space>"
   You can specify any subset of this dictionary as a value for this option in
   order to override default mappings.
 
-  For example, to add `<Esc>` key to the keys that exit the scroll mode:
+  For example, to add `<Esc>` key to the keys that exit the Scroll mode:
 
   ```vim
   let g:scrollmode_actions = {
     \ "exit": [";", "<Esc>"],
     \ }
   ```
 
-  _I didn't make `<Esc>` to quit the scroll mode as default behavior, because
+  _I didn't make `<Esc>` to quit the Scroll mode as default behavior, because
   in the terminal Vim (but not Neovim) it can break some complex keys like
-  `<Up>` and `<Down>` while the scroll mode is active. If you are not going
-  to use these keys in the scroll mode or if you use a different Vim version
+  `<Up>` and `<Down>` while the Scroll mode is active. If you are not going
+  to use these keys in the Scroll mode or if you use a different Vim version
   (GVim, Neovim), then you are welcome to use the config from the example
   above._
 
 - **`g:scrollmode_mappings`**
 
-  With this option, you can specify new mappings available in the scroll
+  With this option, you can specify new mappings available in the Scroll
   mode. This option has precedence over `g:scrollmode_actions`, so you can
   rebind a default action with any custom command.
 
   For example, let's add a custom command for buffer deletion:
 
   ```vim
-  let g:scroll_mode_mappings = {
+  let g:scrollmode_mappings = {
     \ ":Bdelete<CR>": ["-", "c"]
     \ }
   ```
 
-  When the scroll mode is activated, this code will internally result to:
+  When the Scroll mode is activated, this code will internally result to:
 
   ```vim
   nnoremap <silent> <buffer> - :Bdelete<CR>
@@ -130,7 +136,7 @@ let mapleader = "\<Space>"
 
 - **`g:scrollmode_cmdline_indicator`**
 
-  Enables or disables the scroll mode indicator in the command line. The
+  Enables or disables the Scroll mode indicator in the command line. The
   indicator looks similar to other indicators for built-in modes and looks
   like this:
 
@@ -142,14 +148,14 @@ let mapleader = "\<Space>"
 
 - **`g:scrollmode_statusline_highlight`**
 
-  Enables or disables StatusLine highlighting, when the scroll mode is
+  Enables or disables StatusLine highlighting, when the Scroll mode is
   activated. Has no effect with plugins that replace the status line
   ([Airline](https://github.com/vim-airline/vim-airline),
   [Powerline](https://github.com/powerline/powerline),
   [Lightline](https://github.com/itchyny/lightline.vim)).
 
   _I am not fully satisfied with how this feature works, so it is disabled by
-  default. But if you need scroll mode to be more noticeable and colorful,
+  default. But if you need Scroll mode to be more noticeable and colorful,
   then you can enable this option. See the options below for color
   customization._
 
@@ -162,14 +168,14 @@ Options for status line color customization. Only have effect if
 
 - **`g:scrollmode_statusline_group`**
 
-  Highlight group that is used for `StatusLine` when the scroll mode
+  Highlight group that is used for `StatusLine` when the Scroll mode
   is active.
 
   _Default:_ `"DiffAdd"`
 
 - **`g:scrollmode_statusline_group_edge`**
 
-  Highlight group that is used for `StatusLine` when the scroll mode is
+  Highlight group that is used for `StatusLine` when the Scroll mode is
   active and the top/bottom edge of the buffer is reached. The color helps to
   notice that you can't scroll in that direction anymore. Specify `v:null` if
   you don't need this behavior.
@@ -180,7 +186,7 @@ Options for status line color customization. Only have effect if
 
 - **`g:ScrollmodeOnQuit`**
 
-  Funcref that is called after you exit the scroll mode.
+  Funcref that is called after you exit the Scroll mode.
 
   ```vim
   function! s:fn() abort

autoload/scrollmode/enable.vim

@@ -22,7 +22,7 @@ endfunction
 function! s:highlight(new_state) abort
   if a:new_state != w:scrollmode_state
     if a:new_state == g:scrollmode#const#state_middle
-      \ || g:scroll_mode_statusline_group_edge == v:null
+      \ || g:scrollmode_statusline_group_edge == v:null
       exe "highlight! link StatusLine" g:scrollmode_statusline_group
     else
       exe "highlight! link StatusLine" g:scrollmode_statusline_group_edge