aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTom Ryder <tom@sanctum.geek.nz>2018-07-14 19:27:40 +1200
committerTom Ryder <tom@sanctum.geek.nz>2018-07-14 19:27:40 +1200
commitd59aa03c88a4b4dadf8f8b4f233d58a9684e8b61 (patch)
tree7dc558e3a4f5070a855fa3e70f861d486b684434
parent7c7e86850b43d8e990c005b0bc80e684c3ea341b (diff)
parentff38a95ca53a1ed6e314439f6118149ed284c891 (diff)
downloaddotfiles-d59aa03c88a4b4dadf8f8b4f233d58a9684e8b61.tar.gz
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
-rw-r--r--.gitmodules3
-rw-r--r--VERSION4
m---------vim/bundle/digraph_search0
m---------vim/bundle/insert_cancel0
-rw-r--r--vim/vimrc12
5 files changed, 15 insertions, 4 deletions
diff --git a/.gitmodules b/.gitmodules
index af225c02..e52d990e 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -68,3 +68,6 @@
[submodule "vim/bundle/surround"]
path = vim/bundle/surround
url = https://sanctum.geek.nz/clone/vim-surround.git
+[submodule "vim/bundle/digraph_search"]
+ path = vim/bundle/digraph_search
+ url = https://sanctum.geek.nz/code/vim-digraph-search.git
diff --git a/VERSION b/VERSION
index 28d99f01..6e27dfbc 100644
--- a/VERSION
+++ b/VERSION
@@ -1,2 +1,2 @@
-tejr dotfiles v1.28.0
-Fri Jul 13 13:15:52 UTC 2018
+tejr dotfiles v1.29.0
+Sat Jul 14 07:27:12 UTC 2018
diff --git a/vim/bundle/digraph_search b/vim/bundle/digraph_search
new file mode 160000
+Subproject ee33e50228cedbcf973728baa4c5d46c83aee1c
diff --git a/vim/bundle/insert_cancel b/vim/bundle/insert_cancel
-Subproject a2308ef31dcfad2bc01cac0b9d98571230a1b10
+Subproject af423a79c9689531ec71658c2dc51804ed91a8a
diff --git a/vim/vimrc b/vim/vimrc
index 5ae5421e..e76fe85e 100644
--- a/vim/vimrc
+++ b/vim/vimrc
@@ -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>