diff options
author | Tom Ryder <tom@sanctum.geek.nz> | 2019-06-16 03:40:34 +1200 |
---|---|---|
committer | Tom Ryder <tom@sanctum.geek.nz> | 2019-06-16 03:40:34 +1200 |
commit | 30b47c9d046a7bda6f72f984d0488afefe8f2123 (patch) | |
tree | 2285d46557c97f8df4d4e3028204a7c8a0097a9c | |
parent | Merge branch 'release/v6.11.0' (diff) | |
parent | Bump VERSION (diff) | |
download | dotfiles-30b47c9d046a7bda6f72f984d0488afefe8f2123.tar.gz dotfiles-30b47c9d046a7bda6f72f984d0488afefe8f2123.zip |
Merge branch 'release/v6.12.0'v6.12.0
* release/v6.12.0:
Reorder some mappings
Adjust mapping formatting
-rw-r--r-- | VERSION | 4 | ||||
-rw-r--r-- | vim/vimrc | 24 |
2 files changed, 15 insertions, 13 deletions
@@ -1,2 +1,2 @@ -tejr dotfiles v6.11.0 -Sat, 15 Jun 2019 15:22:27 +0000 +tejr dotfiles v6.12.0 +Sat, 15 Jun 2019 15:40:34 +0000 @@ -1034,7 +1034,9 @@ endtry " I always wanted you to go into space, man. " nnoremap <expr> <Space> - \ line('w$') < line('$') ? "\<PageDown>" : ":\<C-U>next\<CR>" + \ line('w$') < line('$') + \ ? "\<PageDown>" + \ : ":\<C-U>next\<CR>" " I hate CTRL-C's default insert mode behavior. It ends the insert session " without firing the InsertLeave event for automatic command hooks. Why would @@ -1219,18 +1221,18 @@ let maplocalleader = ',' " 'cursorline' is always off when in any visual mode, including block mode, " where it actually might have been really handy. -"" Leader,TAB toggles automatic indentation based on the previous line -nnoremap <Leader><Tab> - \ :<C-U>setlocal autoindent! autoindent?<CR> -"" Leader,c toggles highlighted cursor row; doesn't work in visual mode -nnoremap <Leader>c - \ :<C-U>setlocal cursorline! cursorline?<CR> "" Leader,h toggles highlighting search results nnoremap <Leader>h \ :<C-U>set hlsearch! hlsearch?<CR> "" Leader,i toggles showing matches as I enter my pattern nnoremap <Leader>i \ :<C-U>set incsearch! incsearch?<CR> +"" Leader,TAB toggles automatic indentation based on the previous line +nnoremap <Leader><Tab> + \ :<C-U>setlocal autoindent! autoindent?<CR> +"" Leader,c toggles highlighted cursor row; doesn't work in visual mode +nnoremap <Leader>c + \ :<C-U>setlocal cursorline! cursorline?<CR> "" Leader,s toggles spell checking nnoremap <Leader>s \ :<C-U>setlocal spell! spell?<CR> @@ -1239,6 +1241,10 @@ nnoremap <Leader>s " group, except they also include analogous maps for visual mode, defined as " recursive maps into normal mode that conclude with re-selecting the text. +"" Leader,N toggles position display in bottom right +nnoremap <Leader>N + \ :<C-U>set ruler! ruler?<CR> +xmap <Leader>N <Esc><Leader>Ngv "" Leader,C toggles highlighted cursor column; works in visual mode nnoremap <Leader>C \ :<C-U>setlocal cursorcolumn! cursorcolumn?<CR> @@ -1251,10 +1257,6 @@ xmap <Leader>l <Esc><Leader>lgv nnoremap <Leader>n \ :<C-U>setlocal number! number?<CR> xmap <Leader>n <Esc><Leader>ngv -"" Leader,N toggles position display in bottom right -nnoremap <Leader>N - \ :<C-U>set ruler! ruler?<CR> -xmap <Leader>N <Esc><Leader>Ngv "" Leader,w toggles soft wrapping nnoremap <Leader>w \ :<C-U>setlocal wrap! wrap?<CR> |