aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTom Ryder <tom@sanctum.geek.nz>2019-06-20 09:06:35 +1200
committerTom Ryder <tom@sanctum.geek.nz>2019-06-20 09:06:35 +1200
commitecd1543af1d4b0989589660ead127d17f6243651 (patch)
tree7795b3f9872e9a9d3eaab441bdb59686d842df9c
parentMerge branch 'release/v6.33.0' (diff)
parentBump VERSION (diff)
downloaddotfiles-ecd1543af1d4b0989589660ead127d17f6243651.tar.gz
dotfiles-ecd1543af1d4b0989589660ead127d17f6243651.zip
Merge branch 'release/v6.34.0'v6.34.0
* release/v6.34.0: Move Vim help indent rules to main indent ftplugin Update vim-paste-insert to v0.2.0 Flip a test
-rw-r--r--VERSION4
-rw-r--r--vim/after/indent/help.vim6
m---------vim/bundle/paste_insert0
-rw-r--r--vim/indent/help.vim12
-rw-r--r--vim/vimrc2
5 files changed, 15 insertions, 9 deletions
diff --git a/VERSION b/VERSION
index 6b758ce6..788f97a4 100644
--- a/VERSION
+++ b/VERSION
@@ -1,2 +1,2 @@
-tejr dotfiles v6.33.0
-Wed, 19 Jun 2019 10:42:51 +0000
+tejr dotfiles v6.34.0
+Wed, 19 Jun 2019 21:06:33 +0000
diff --git a/vim/after/indent/help.vim b/vim/after/indent/help.vim
deleted file mode 100644
index 449e3b4a..00000000
--- a/vim/after/indent/help.vim
+++ /dev/null
@@ -1,6 +0,0 @@
-" Use hard tabs for Vim help
-setlocal noexpandtab shiftwidth=0 tabstop=8
-if &softtabstop != -1
- let &softtabstop = &shiftwidth
-endif
-let b:undo_indent .= '|setlocal expandtab< shiftwidth< softtabstop< tabstop<'
diff --git a/vim/bundle/paste_insert b/vim/bundle/paste_insert
-Subproject d754e506fdfb10688d721935c01d2615d11b2a1
+Subproject 6a8fda5f3dd282bddf4c9353fee08c17aaf6339
diff --git a/vim/indent/help.vim b/vim/indent/help.vim
new file mode 100644
index 00000000..1edf64fb
--- /dev/null
+++ b/vim/indent/help.vim
@@ -0,0 +1,12 @@
+" Only do this when not done yet for this buffer
+if exists('b:did_indent')
+ finish
+endif
+let b:did_indent = 1
+
+" Use hard tabs for editing Vim help files
+setlocal noexpandtab shiftwidth=0 tabstop=8
+if &softtabstop != -1
+ let &softtabstop = &shiftwidth
+endif
+let b:undo_indent = 'setlocal expandtab< shiftwidth< softtabstop< tabstop<'
diff --git a/vim/vimrc b/vim/vimrc
index 5121cce6..977cc05d 100644
--- a/vim/vimrc
+++ b/vim/vimrc
@@ -1153,7 +1153,7 @@ nnoremap <expr> <Space>
" If the plugin isn't available, I just abandon CTRL-C to continue its
" uselessness.
"
-if &loadplugins && globpath(&runtimepath, 'plugin/insert_cancel.vim') ==# ''
+if &loadplugins && globpath(&runtimepath, 'plugin/insert_cancel.vim') !=# ''
imap <C-C> <Plug>(InsertCancel)
endif