Introduce <s/>s/=s as option toggle alternative

tpope · Oct 18, 2021 · 4910e20 · zeertzjq · Oct 18, 2021 · tpope
1 parent 39f195d
commit 4910e20
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 1 deletion.
diff --git a/doc/unimpaired.txt b/doc/unimpaired.txt
@@ -84,15 +84,18 @@ On	Off	Toggle	Option
 *[oi*	*]oi*	*yoi*	'ignorecase'
 *[ol*	*]ol*	*yol*	'list'
 *[on*	*]on*	*yon*	'number'
+*[op*	*]op*	*yop*	'spell'
 *[or*	*]or*	*yor*	'relativenumber'
-*[os*	*]os*	*yos*	'spell'
 *[ou*	*]ou*	*you*	'cursorcolumn'
 *[ov*	*]ov*	*yov*	'virtualedit'
 *[ow*	*]ow*	*yow*	'wrap'
 *[ox*	*]ox*	*yox*	'cursorline' 'cursorcolumn' (x as in crosshairs)
 
 The mnemonic for y is that if you tilt it a bit it looks like a switch.
 
+                                                *<s* *>s* *=s*
+Alternative prefixes for on/off/toggle: <s, >s, =s.
+
 PASTING                                         *unimpaired-pasting*
 
 These are experimental:

diff --git a/plugin/unimpaired.vim b/plugin/unimpaired.vim
@@ -330,6 +330,7 @@ call s:option_map('h', 'hlsearch', 'set')
 call s:option_map('i', 'ignorecase', 'set')
 call s:option_map('l', 'list', 'setlocal')
 call s:option_map('n', 'number', 'setlocal')
+call s:option_map('p', 'spell', 'setlocal')
 call s:option_map('r', 'relativenumber', 'setlocal')
 call s:option_map('s', 'spell', 'setlocal')
 call s:option_map('w', 'wrap', 'setlocal')
@@ -349,6 +350,12 @@ exe s:Map('n', ']o', '<Plug>(unimpaired-disable)')
 exe s:Map('n', 'yo<Esc>', '<Nop>')
 exe s:Map('n', '[o<Esc>', '<Nop>')
 exe s:Map('n', ']o<Esc>', '<Nop>')
+exe s:Map('n', '=s', '<Plug>(unimpaired-toggle)')
+exe s:Map('n', '<s', '<Plug>(unimpaired-enable)')
+exe s:Map('n', '>s', '<Plug>(unimpaired-disable)')
+exe s:Map('n', '=s<Esc>', '<Nop>')
+exe s:Map('n', '<s<Esc>', '<Nop>')
+exe s:Map('n', '>s<Esc>', '<Nop>')
 
 function! s:SetupPaste() abort
   let s:paste = &paste