aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTom Ryder <tom@sanctum.geek.nz>2019-06-16 03:40:34 +1200
committerTom Ryder <tom@sanctum.geek.nz>2019-06-16 03:40:34 +1200
commit30b47c9d046a7bda6f72f984d0488afefe8f2123 (patch)
tree2285d46557c97f8df4d4e3028204a7c8a0097a9c
parentMerge branch 'release/v6.11.0' (diff)
parentBump VERSION (diff)
downloaddotfiles-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--VERSION4
-rw-r--r--vim/vimrc24
2 files changed, 15 insertions, 13 deletions
diff --git a/VERSION b/VERSION
index 587f6a86..88a788ca 100644
--- a/VERSION
+++ b/VERSION
@@ -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
diff --git a/vim/vimrc b/vim/vimrc
index df805727..2175f114 100644
--- a/vim/vimrc
+++ b/vim/vimrc
@@ -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>