aboutsummaryrefslogtreecommitdiff
path: root/vim
diff options
context:
space:
mode:
authorTom Ryder <tom@sanctum.geek.nz>2018-06-11 10:07:43 +1200
committerTom Ryder <tom@sanctum.geek.nz>2018-06-11 10:07:43 +1200
commit7780b9c8702bae19819db1082f7fb6ed7b01a348 (patch)
tree65179d6d9e9961b1d9a119de22575e748a925ad3 /vim
parentMerge branch 'release/v0.50.0' (diff)
parentUpdate VERSION (diff)
downloaddotfiles-7780b9c8702bae19819db1082f7fb6ed7b01a348.tar.gz
dotfiles-7780b9c8702bae19819db1082f7fb6ed7b01a348.zip
Merge branch 'release/v0.51.0'v0.51.0
* release/v0.51.0: Update VERSION Update markdown_autoformat.vim Use uppercase letters in <C-A>, <C-B> consistently Define `self` var for mim(1df) Update strip_trailing_whitespace.vim plugin
Diffstat (limited to 'vim')
m---------vim/bundle/markdown_autoformat0
m---------vim/bundle/strip_trailing_whitespace0
-rw-r--r--vim/vimrc4
3 files changed, 2 insertions, 2 deletions
diff --git a/vim/bundle/markdown_autoformat b/vim/bundle/markdown_autoformat
-Subproject 1b633476c922a16f77714588fe1edf5045353dc
+Subproject 8d152a1be09a229cf3adcd158cb023a04f89cc9
diff --git a/vim/bundle/strip_trailing_whitespace b/vim/bundle/strip_trailing_whitespace
-Subproject d64a7405e3bbfcb10cef99eb2795130504bce3a
+Subproject fb3c25becd1e4a565c4339b000b96ff519544db
diff --git a/vim/vimrc b/vim/vimrc
index f5a2ac85..2919d930 100644
--- a/vim/vimrc
+++ b/vim/vimrc
@@ -203,7 +203,7 @@ set scrolloff=0
set sidescrolloff=16
" Rebind <Space> in normal mode as a lazy scroll
-nnoremap <Space> <C-f>
+nnoremap <Space> <C-F>
" Some special settings for searching, if available
if has('extra_search')
@@ -287,7 +287,7 @@ set ttimeout
set ttimeoutlen=50
" Rebind Ctrl-C in insert mode to undo the current insert operation
-inoremap <C-c> <C-c>u
+inoremap <C-C> <C-C>u
" Keep screeds of undo history
set undolevels=2000