diff options
author | Tom Ryder <tom@sanctum.geek.nz> | 2018-07-14 19:27:40 +1200 |
---|---|---|
committer | Tom Ryder <tom@sanctum.geek.nz> | 2018-07-14 19:27:40 +1200 |
commit | d59aa03c88a4b4dadf8f8b4f233d58a9684e8b61 (patch) | |
tree | 7dc558e3a4f5070a855fa3e70f861d486b684434 /vim/vimrc | |
parent | Merge branch 'release/v1.28.0' (diff) | |
parent | Bump VERSION (diff) | |
download | dotfiles-d59aa03c88a4b4dadf8f8b4f233d58a9684e8b61.tar.gz dotfiles-d59aa03c88a4b4dadf8f8b4f233d58a9684e8b61.zip |
Merge branch 'release/v1.29.0'v1.29.0
* release/v1.29.0:
Bump VERSION
Adjust syntax settings in .vimrc
Adjust mapping comment for consistency
Add and configure digraph_search.vim plugin
Increase Vim mapping 'timeout' to 3 seconds
Diffstat (limited to 'vim/vimrc')
-rw-r--r-- | vim/vimrc | 12 |
1 files changed, 10 insertions, 2 deletions
@@ -14,10 +14,12 @@ if has('autocmd') endif " Options dependent on the syntax feature -if has('syntax') && !exists('g:syntax_on') +if has('syntax') " Use syntax highlighting - syntax enable + if !exists('g:syntax_on') + syntax enable + endif " Use my colorscheme if using the GUI or if we have 256 colors if has('gui_running') || &t_Co >= 256 @@ -100,6 +102,9 @@ set nrformats-=octal " Don't show startup splash screen (I donated) set shortmess+=I +" Give me a bit longer to complete mappings +set timeoutlen=3000 + " Clear default 'comments' value, let the filetype handle it if has('comments') set comments= @@ -167,6 +172,9 @@ vnoremap <silent> <C-L> :<C-U>nohlsearch<CR>gv<C-L> inoremap <Plug>(InsertCancel) <Esc>u imap <C-C> <Plug>(InsertCancel) +" Map double Ctrl-K in insert mode to search digraph names +imap <C-K><C-K> <Plug>(DigraphSearch) + " Remap normal space to scroll down a page, backspace up a page nnoremap <Space> <C-F> nnoremap <BS> <C-B> |