aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTom Ryder <tom@sanctum.geek.nz>2018-05-18 16:25:59 +1200
committerTom Ryder <tom@sanctum.geek.nz>2018-05-18 16:25:59 +1200
commit05cfd270075de2c7cc8e6337c4e9195b574a18f1 (patch)
tree4c78f1b224c29ad58f850352c679bf1cbd697463
parent3abbd26593748f465f653a14d90d96ffdabf88bc (diff)
parentb35916327c3c2fa33ace23c7071e97b3958112e4 (diff)
downloaddotfiles-0.32.0.tar.gz (sig)
dotfiles-0.32.0.zip
Merge branch 'release/v0.32.0'v0.32.0
* release/v0.32.0: Bump VERSION Toggle Vim 'list', 'number' and 'wrap' globally Rebind Space in Vim normal mode to scroll
-rw-r--r--VERSION4
-rw-r--r--vim/config/display.vim4
-rw-r--r--vim/config/scroll.vim3
-rw-r--r--vim/config/wrap.vim2
4 files changed, 8 insertions, 5 deletions
diff --git a/VERSION b/VERSION
index 7f581842..cb9525db 100644
--- a/VERSION
+++ b/VERSION
@@ -1,2 +1,2 @@
-tejr dotfiles v0.31.0
-Wed Mar 21 20:23:37 UTC 2018
+tejr dotfiles v0.32.0
+Fri May 18 04:25:16 UTC 2018
diff --git a/vim/config/display.vim b/vim/config/display.vim
index 43889c1a..8b3bcf24 100644
--- a/vim/config/display.vim
+++ b/vim/config/display.vim
@@ -32,10 +32,10 @@ set shortmess+=x
set nolist
nnoremap <silent>
\ <Leader>l
- \ :<C-U>setlocal list! list?<CR>
+ \ :<C-U>set list! list?<CR>
" Don't show line numbers by default, but \n toggles them
set nonumber
nnoremap <silent>
\ <Leader>n
- \ :<C-U>setlocal number! number?<CR>
+ \ :<C-U>set number! number?<CR>
diff --git a/vim/config/scroll.vim b/vim/config/scroll.vim
index 62bc4ee8..73c3dcec 100644
--- a/vim/config/scroll.vim
+++ b/vim/config/scroll.vim
@@ -3,3 +3,6 @@
" particular reason, just suits me better
set scrolloff=0
set sidescrolloff=16
+
+" Rebind <Space> in normal mode as a lazy scroll
+nnoremap <Space> <C-f>
diff --git a/vim/config/wrap.vim b/vim/config/wrap.vim
index a90c2765..a2d442fa 100644
--- a/vim/config/wrap.vim
+++ b/vim/config/wrap.vim
@@ -2,7 +2,7 @@
set nowrap
nnoremap <silent>
\ <Leader>w
- \ :<C-U>setlocal wrap! wrap?<CR>
+ \ :<C-U>set wrap! wrap?<CR>
" When wrapping text, if a line is so long that not all of it can be shown on
" the screen, show as much as possible anyway; by default Vim fills the left