aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTom Ryder <tom@sanctum.geek.nz>2018-09-09 14:40:08 +1200
committerTom Ryder <tom@sanctum.geek.nz>2018-09-09 14:40:08 +1200
commit1d60511bc3b2e0d6bbe85b210af0ee652c0dc37b (patch)
treeee06dca1feabab81eb5c3b7eadb8dd5ee4e166f5
parentb19b04fc4ce2403187f307bb11c559274573f7f8 (diff)
parent08967acbba6c294821e0e2ce974653a1171e072d (diff)
downloaddotfiles-1d60511bc3b2e0d6bbe85b210af0ee652c0dc37b.tar.gz
Merge branch 'release/v1.68.0'v1.68.0
* release/v1.68.0: Bump VERSION Update cursorline_current.vim plugin Unset 'laststatus' and 'ruler' only if they're set Specify object type in comments Add "whole buffer" object an experiment Update cursorline_current.vim plugin
-rw-r--r--VERSION4
m---------vim/bundle/cursorline_current0
-rw-r--r--vim/vimrc13
3 files changed, 12 insertions, 5 deletions
diff --git a/VERSION b/VERSION
index 73d06721..118c2510 100644
--- a/VERSION
+++ b/VERSION
@@ -1,2 +1,2 @@
-tejr dotfiles v1.67.0
-Wed Sep 5 00:00:16 UTC 2018
+tejr dotfiles v1.68.0
+Sun Sep 9 02:40:08 UTC 2018
diff --git a/vim/bundle/cursorline_current b/vim/bundle/cursorline_current
-Subproject 70eb3eaaecfce486ce6df4a141d3d4d1bec30e0
+Subproject b48b57b35899796bfbea9a3aab8c584d8eaebfd
diff --git a/vim/vimrc b/vim/vimrc
index 2f60a31b..9f5735c7 100644
--- a/vim/vimrc
+++ b/vim/vimrc
@@ -140,7 +140,9 @@ set nojoinspaces
" Don't show a statusline if there's only one window
" This is the Vim default, but NeoVim changed it
-set laststatus=1
+if &laststatus
+ set laststatus=1
+endif
" Don't redraw the screen during batch execution
set lazyredraw
@@ -167,7 +169,9 @@ set path+=** " Search current directory's whole tree
" Disable command line display of file position
" This is the Vim default, but NeoVim changed it
-set noruler
+if &ruler
+ set noruler
+endif
" Make sessions usable
if exists('+sessionoptions')
@@ -398,9 +402,12 @@ nnoremap <Bslash>. :<C-U>lmake!<CR>
nnoremap <Bslash><lt> :<C-U>'[,']<lt><CR>
nnoremap <Bslash>> :<C-U>'[,']><CR>
-" \_ uses last changed or yanked text as an object
+" \_ uses last changed or yanked text as a characterwise object
onoremap <Bslash>_ :<C-U>normal! `[v`]<CR>
+" \% uses entire buffer as a linewise object
+onoremap <Bslash>% :<C-U>normal! 1GVG<CR>
+
" \{ and \} move to lines with non-space chars before current column
nmap <Bslash>{ <Plug>(VerticalRegionUpNormal)
nmap <Bslash>} <Plug>(VerticalRegionDownNormal)