aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTom Ryder <tom@sanctum.geek.nz>2018-11-30 00:09:51 +1300
committerTom Ryder <tom@sanctum.geek.nz>2018-11-30 00:09:51 +1300
commit94816757caac0120df020ea281a8ab020256de21 (patch)
tree854ae7eb90e67c9d24382018da2594cc9966f840
parentffc11a076b7bb0ce7ac936085a904eb35603fdac (diff)
parent6805bb4d1233fcb7f1ddfb2ff03e12b1f6f0f750 (diff)
downloaddotfiles-94816757caac0120df020ea281a8ab020256de21.tar.gz
Merge branch 'release/v2.0.0'v2.0.0
* release/v2.0.0: Update make_target.vim to v1.2.0 Comment conditional set of <Plug>(InsertCancel) Require Vim 7 for filetype and syntax highlights Simplify a load guard for sh.vim syntax tweaks Clear away a flag after HTML indent load Remove some Vim syntax boilerplate Pare down after/indent scripts a fair bit Remove some overzealous b:undo_* setting Add missing detail to a comment Remove double-key mapping shortcuts Remove boilerplate after/ftplugin load guards Simplify after/ftplugin for C Set b:did_ftplugin flag in Vim ftplugins Adjust a vimrc comment for clarity Simplify ft=sh subtype flag clearing Add dummy function for HTML omnicompletion Clear away stock ft=mail quoting maps Wrap autocmd! clear for ft=mail in :execute Add timestamp augroup clearing to Vim ft=html Abbreviate Vim ft=html autocmd clearing Restore value of 'colorcolumn' after ft=gitcommit Wrap Vim gitcommit autocmd clear in :execute
-rw-r--r--VERSION4
-rw-r--r--vim/after/ftplugin/c.vim11
-rw-r--r--vim/after/ftplugin/cpp.vim18
-rw-r--r--vim/after/ftplugin/diff.vim9
-rw-r--r--vim/after/ftplugin/gitcommit.vim12
-rw-r--r--vim/after/ftplugin/help.vim5
-rw-r--r--vim/after/ftplugin/html.vim7
-rw-r--r--vim/after/ftplugin/mail.vim16
-rw-r--r--vim/after/ftplugin/make.vim5
-rw-r--r--vim/after/ftplugin/markdown.vim9
-rw-r--r--vim/after/ftplugin/perl.vim5
-rw-r--r--vim/after/ftplugin/php.vim11
-rw-r--r--vim/after/ftplugin/sh.vim16
-rw-r--r--vim/after/ftplugin/text.vim5
-rw-r--r--vim/after/ftplugin/vim.vim22
-rw-r--r--vim/after/ftplugin/zsh.vim5
-rw-r--r--vim/after/indent/awk.vim7
-rw-r--r--vim/after/indent/html.vim6
-rw-r--r--vim/after/indent/perl.vim9
-rw-r--r--vim/after/indent/vim.vim20
-rw-r--r--vim/after/syntax/bindzone.vim6
-rw-r--r--vim/after/syntax/gitcommit.vim6
-rw-r--r--vim/after/syntax/messages.vim6
-rw-r--r--vim/after/syntax/sh.vim6
-rw-r--r--vim/autoload/htmlcomplete.vim5
m---------vim/bundle/make_target0
-rw-r--r--vim/filetype.vim9
-rw-r--r--vim/ftplugin/awk.vim1
-rw-r--r--vim/ftplugin/csv.vim1
-rw-r--r--vim/ftplugin/password.vim1
-rw-r--r--vim/ftplugin/sed.vim1
-rw-r--r--vim/ftplugin/tmux.vim1
-rw-r--r--vim/ftplugin/tsv.vim1
-rw-r--r--vim/vimrc12
34 files changed, 50 insertions, 208 deletions
diff --git a/VERSION b/VERSION
index 1f815a05..f8ed3c33 100644
--- a/VERSION
+++ b/VERSION
@@ -1,2 +1,2 @@
-tejr dotfiles v1.78.0
-Wed Nov 28 11:09:16 UTC 2018
+tejr dotfiles v2.0.0
+Thu Nov 29 11:09:35 UTC 2018
diff --git a/vim/after/ftplugin/c.vim b/vim/after/ftplugin/c.vim
index da34d269..ccc5b170 100644
--- a/vim/after/ftplugin/c.vim
+++ b/vim/after/ftplugin/c.vim
@@ -1,18 +1,13 @@
-" Extra configuration for C files
-if &filetype !=# 'c' || v:version < 700
- finish
-endif
-
" Include macros in completion
setlocal complete+=d
-let b:undo_ftplugin .= '|setlocal complete<'
" Set include pattern
setlocal include=^\\s*#\\s*include
-let b:undo_ftplugin .= '|setlocal include<'
" Include headers on UNIX
if has('unix')
setlocal path+=/usr/include
- let b:undo_ftplugin .= '|setlocal path<'
endif
+
+" Undo all of the above
+let b:undo_ftplugin .= '|setlocal complete< include< path<'
diff --git a/vim/after/ftplugin/cpp.vim b/vim/after/ftplugin/cpp.vim
deleted file mode 100644
index 4042fb84..00000000
--- a/vim/after/ftplugin/cpp.vim
+++ /dev/null
@@ -1,18 +0,0 @@
-" Extra configuration for C++ files
-if &filetype !=# 'cpp' || v:version < 700
- finish
-endif
-
-" Include macros in completion
-setlocal complete+=d
-let b:undo_ftplugin .= '|setlocal complete<'
-
-" Set include pattern
-setlocal include=^\\s*#\\s*include
-let b:undo_ftplugin .= '|setlocal include<'
-
-" Include headers on UNIX
-if has('unix')
- setlocal path+=/usr/include
- let b:undo_ftplugin .= '|setlocal path<'
-endif
diff --git a/vim/after/ftplugin/diff.vim b/vim/after/ftplugin/diff.vim
index a52b3fdd..123f0d0a 100644
--- a/vim/after/ftplugin/diff.vim
+++ b/vim/after/ftplugin/diff.vim
@@ -1,8 +1,3 @@
-" Extra configuration for diffs
-if &filetype !=# 'diff' || v:version < 700 || &compatible
- finish
-endif
-
" Stop here if the user doesn't want ftplugin mappings
if exists('g:no_plugin_maps') || exists('g:no_diff_maps')
finish
@@ -28,13 +23,11 @@ let b:undo_ftplugin .= '|nunmap <buffer> <LocalLeader>['
\ . '|xunmap <buffer> <LocalLeader>['
\ . '|xunmap <buffer> <LocalLeader>]'
-" Set mappings
+" Set mappings for diff pruning plugin
nmap <buffer> <LocalLeader>p
\ <Plug>(DiffPrune)
xmap <buffer> <LocalLeader>p
\ <Plug>(DiffPrune)
-nmap <buffer> <LocalLeader>pp
- \ <Plug>(DiffPrune)_
let b:undo_ftplugin .= '|nunmap <buffer> <LocalLeader>p'
\ . '|xunmap <buffer> <LocalLeader>p'
\ . '|nunmap <buffer> <LocalLeader>pp'
diff --git a/vim/after/ftplugin/gitcommit.vim b/vim/after/ftplugin/gitcommit.vim
index 2dc5fa37..1a4c1b1b 100644
--- a/vim/after/ftplugin/gitcommit.vim
+++ b/vim/after/ftplugin/gitcommit.vim
@@ -1,8 +1,3 @@
-" Extra configuration for Git commit messages
-if &filetype !=# 'gitcommit' || v:version < 700
- finish
-endif
-
" Make angle brackets behave like mail quotes
setlocal comments+=n:>
setlocal formatoptions+=coqr
@@ -14,8 +9,9 @@ if has('autocmd') && exists('+cursorcolumn')
autocmd CursorMoved,CursorMovedI <buffer>
\ let &l:colorcolumn = gitcommit#CursorColumn()
augroup END
- let b:undo_ftplugin .= '|autocmd! gitcommit'
+ let b:undo_ftplugin .= '|execute ''autocmd! gitcommit'''
\ . '|augroup! gitcommit'
+ \ . '|setlocal colorcolumn<'
endif
" Stop here if the user doesn't want ftplugin mappings
@@ -26,8 +22,6 @@ endif
" Quote operator
nnoremap <buffer> <expr> <LocalLeader>q
\ quote#Quote()
-nnoremap <buffer> <expr> <LocalLeader>qq
- \ quote#Quote().'_'
xnoremap <buffer> <expr> <LocalLeader>q
\ quote#Quote()
let b:undo_ftplugin .= '|nunmap <buffer> <LocalLeader>q'
@@ -37,8 +31,6 @@ let b:undo_ftplugin .= '|nunmap <buffer> <LocalLeader>q'
" Quote operator with reformatting
nnoremap <buffer> <expr> <LocalLeader>Q
\ quote#QuoteReformat()
-nnoremap <buffer> <expr> <LocalLeader>QQ
- \ quote#QuoteReformat().'_'
xnoremap <buffer> <expr> <LocalLeader>Q
\ quote#QuoteReformat()
let b:undo_ftplugin .= '|nunmap <buffer> <LocalLeader>Q'
diff --git a/vim/after/ftplugin/help.vim b/vim/after/ftplugin/help.vim
index 71ad3a8d..ae032344 100644
--- a/vim/after/ftplugin/help.vim
+++ b/vim/after/ftplugin/help.vim
@@ -1,8 +1,3 @@
-" Extra configuration for Vim help files
-if &filetype !=# 'help' || v:version < 700
- finish
-endif
-
" This variable had the wrong name before Vim 7.1
if v:version == 700 && exists('b:undo_plugin')
let b:undo_ftplugin = b:undo_plugin
diff --git a/vim/after/ftplugin/html.vim b/vim/after/ftplugin/html.vim
index 759d06bf..b5c387fb 100644
--- a/vim/after/ftplugin/html.vim
+++ b/vim/after/ftplugin/html.vim
@@ -1,5 +1,5 @@
-" Extra configuration for HTML files
-if &filetype !=# 'html' || v:version < 700 || &compatible
+" Don't load if the buffer is not actually HTML (e.g. Markdown)
+if &filetype !=# 'html'
finish
endif
@@ -16,7 +16,8 @@ augroup html_timestamp
\| call html#TimestampUpdate()
\|endif
augroup END
-let b:undo_ftplugin .= '|autocmd! html_timestamp BufWritePre <buffer>'
+let b:undo_ftplugin .= '|execute ''autocmd! html_timestamp'''
+ \ . '|augroup! html_timestamp'
" Stop here if the user doesn't want ftplugin mappings
if exists('g:no_plugin_maps') || exists('g:no_html_maps')
diff --git a/vim/after/ftplugin/mail.vim b/vim/after/ftplugin/mail.vim
index 688ca6eb..74ec1699 100644
--- a/vim/after/ftplugin/mail.vim
+++ b/vim/after/ftplugin/mail.vim
@@ -1,8 +1,3 @@
-" Extra configuration for mail messages
-if &filetype !=# 'mail' || &compatible || v:version < 700
- finish
-endif
-
" If something hasn't already moved the cursor, we'll move to an optimal point
" to start writing
if line('.') == 1 && col('.') == 1
@@ -41,6 +36,13 @@ if exists('g:no_plugin_maps') || exists('g:no_mail_maps')
finish
endif
+" Clear away the quoting maps that the stock mail.vim sets; they work fine,
+" but we have nicer ones to define shortly
+nunmap <buffer> <LocalLeader>q
+vunmap <buffer> <LocalLeader>q
+nunmap <buffer> <Plug>MailQuote
+vunmap <buffer> <Plug>MailQuote
+
" Flag messages as important/unimportant
nnoremap <buffer> <LocalLeader>h
\ :<C-U>call mail#FlagImportant()<CR>
@@ -52,8 +54,6 @@ let b:undo_ftplugin .= '|nunmap <buffer> <LocalLeader>l'
" Quote operator
nnoremap <buffer> <expr> <LocalLeader>q
\ quote#Quote()
-nnoremap <buffer> <expr> <LocalLeader>qq
- \ quote#Quote().'_'
xnoremap <buffer> <expr> <LocalLeader>q
\ quote#Quote()
let b:undo_ftplugin .= '|nunmap <buffer> <LocalLeader>q'
@@ -63,8 +63,6 @@ let b:undo_ftplugin .= '|nunmap <buffer> <LocalLeader>q'
" Quote operator with reformatting
nnoremap <buffer> <expr> <LocalLeader>Q
\ quote#QuoteReformat()
-nnoremap <buffer> <expr> <LocalLeader>QQ
- \ quote#QuoteReformat().'_'
xnoremap <buffer> <expr> <LocalLeader>Q
\ quote#QuoteReformat()
let b:undo_ftplugin .= '|nunmap <buffer> <LocalLeader>Q'
diff --git a/vim/after/ftplugin/make.vim b/vim/after/ftplugin/make.vim
index 3018e11b..353a0bbf 100644
--- a/vim/after/ftplugin/make.vim
+++ b/vim/after/ftplugin/make.vim
@@ -1,8 +1,3 @@
-" Extra configuration for Makefiles
-if &filetype !=# 'make' || v:version < 700
- finish
-endif
-
" Stop here if the user doesn't want ftplugin mappings
if exists('g:no_plugin_maps') || exists('g:no_make_maps')
finish
diff --git a/vim/after/ftplugin/markdown.vim b/vim/after/ftplugin/markdown.vim
index cd8873b9..f129deba 100644
--- a/vim/after/ftplugin/markdown.vim
+++ b/vim/after/ftplugin/markdown.vim
@@ -1,8 +1,3 @@
-" Extra configuration for Markdown documents
-if &filetype !=# 'markdown' || v:version < 700
- finish
-endif
-
" Spellchecking features
if has('spell')
@@ -29,8 +24,6 @@ endif
" Quote operator
nnoremap <buffer> <expr> <LocalLeader>q
\ quote#Quote()
-nnoremap <buffer> <expr> <LocalLeader>qq
- \ quote#Quote().'_'
xnoremap <buffer> <expr> <LocalLeader>q
\ quote#Quote()
let b:undo_ftplugin .= '|nunmap <buffer> <LocalLeader>q'
@@ -40,8 +33,6 @@ let b:undo_ftplugin .= '|nunmap <buffer> <LocalLeader>q'
" Quote operator with reformatting
nnoremap <buffer> <expr> <LocalLeader>Q
\ quote#QuoteReformat()
-nnoremap <buffer> <expr> <LocalLeader>QQ
- \ quote#QuoteReformat().'_'
xnoremap <buffer> <expr> <LocalLeader>Q
\ quote#QuoteReformat()
let b:undo_ftplugin .= '|nunmap <buffer> <LocalLeader>Q'
diff --git a/vim/after/ftplugin/perl.vim b/vim/after/ftplugin/perl.vim
index ee8da2a7..5dd2b7bb 100644
--- a/vim/after/ftplugin/perl.vim
+++ b/vim/after/ftplugin/perl.vim
@@ -1,8 +1,3 @@
-" Extra configuration for Perl filetypes
-if &filetype !=# 'perl' || v:version < 700 || &compatible
- finish
-endif
-
" Use Perl itself for checking and Perl::Tidy for tidying
compiler perl
setlocal equalprg=perltidy
diff --git a/vim/after/ftplugin/php.vim b/vim/after/ftplugin/php.vim
index 9b7c2bb0..688166ba 100644
--- a/vim/after/ftplugin/php.vim
+++ b/vim/after/ftplugin/php.vim
@@ -1,8 +1,3 @@
-" Extra configuration for PHP scripts
-if &filetype !=# 'php' || v:version < 700 || &compatible
- finish
-endif
-
" Use PHP itself for syntax checking
compiler php
let b:undo_ftplugin .= '|unlet b:current_compiler'
@@ -21,9 +16,3 @@ let b:undo_ftplugin .= '|setlocal keywordprg<'
if exists('g:no_plugin_maps') || exists('g:no_php_maps')
finish
endif
-
-" Get rid of the core ftplugin's square-bracket maps on unload
-let b:undo_ftplugin .= '|nunmap <buffer> [['
- \ . '|ounmap <buffer> [['
- \ . '|nunmap <buffer> ]]'
- \ . '|ounmap <buffer> ]]'
diff --git a/vim/after/ftplugin/sh.vim b/vim/after/ftplugin/sh.vim
index fdc42ccc..6ee016a5 100644
--- a/vim/after/ftplugin/sh.vim
+++ b/vim/after/ftplugin/sh.vim
@@ -1,8 +1,3 @@
-" Extra configuration for shell script
-if &filetype !=# 'sh' || v:version < 700 || &compatible
- finish
-endif
-
" Set comment formats
setlocal comments=:#
setlocal formatoptions+=or
@@ -34,14 +29,9 @@ if exists('b:is_posix')
endif
" Queue up undo commands to clear the shell language flags that we set for
-" this buffer during filetype detection in filetype.vim
-if exists('b:is_bash')
- let b:undo_ftplugin .= '|unlet b:is_bash'
-elseif exists('b:is_kornshell')
- let b:undo_ftplugin .= '|unlet b:is_kornshell'
-elseif exists('b:is_posix')
- let b:undo_ftplugin .= '|unlet b:is_posix'
-endif
+" this buffer during filetype detection in filetype.vim, or that the stock
+" syntax highlighting chose for us
+let b:undo_ftplugin .= '|unlet! b:is_bash b:is_kornshell b:is_posix'
" Stop here if the user doesn't want ftplugin mappings
if exists('g:no_plugin_maps') || exists('g:no_sh_maps')
diff --git a/vim/after/ftplugin/text.vim b/vim/after/ftplugin/text.vim
index 8341f72d..cda2891c 100644
--- a/vim/after/ftplugin/text.vim
+++ b/vim/after/ftplugin/text.vim
@@ -1,8 +1,3 @@
-" Extra configuration for text files
-if &filetype !=# 'text' || v:version < 700
- finish
-endif
-
" Spellcheck documents we're actually editing (not just viewing)
if has('spell') && &modifiable && !&readonly
setlocal spell
diff --git a/vim/after/ftplugin/vim.vim b/vim/after/ftplugin/vim.vim
index 2fc5bd78..a7a69993 100644
--- a/vim/after/ftplugin/vim.vim
+++ b/vim/after/ftplugin/vim.vim
@@ -1,8 +1,3 @@
-" Extra configuration for Vim scripts
-if &filetype !=# 'vim' || v:version < 700 || &compatible
- finish
-endif
-
" Use Vint as a syntax checker
if bufname('%') !=# 'command-line'
compiler vint
@@ -19,20 +14,3 @@ endif
nnoremap <buffer> <LocalLeader>K
\ :<C-U>helpgrep <cword><CR>
let b:undo_ftplugin .= '|nunmap <buffer> <LocalLeader>K'
-
-" Get rid of the core ftplugin's square-bracket maps on unload
-" 8.1.273 updated the runtime files to include a fix for this
-if v:version < 801 || v:version == 801 && !has('patch273')
- let b:undo_ftplugin .= '|nunmap <buffer> [['
- \ . '|vunmap <buffer> [['
- \ . '|nunmap <buffer> ]]'
- \ . '|vunmap <buffer> ]]'
- \ . '|nunmap <buffer> []'
- \ . '|vunmap <buffer> []'
- \ . '|nunmap <buffer> ]['
- \ . '|vunmap <buffer> ]['
- \ . '|nunmap <buffer> ]"'
- \ . '|vunmap <buffer> ]"'
- \ . '|nunmap <buffer> ["'
- \ . '|vunmap <buffer> ["'
-endif
diff --git a/vim/after/ftplugin/zsh.vim b/vim/after/ftplugin/zsh.vim
index 49736401..5aa2600a 100644
--- a/vim/after/ftplugin/zsh.vim
+++ b/vim/after/ftplugin/zsh.vim
@@ -1,8 +1,3 @@
-" Extra configuration for Z shell scripts
-if &filetype !=# 'zsh' || v:version < 700 || &compatible
- finish
-endif
-
" Use Z shell itself as a syntax checker
compiler zsh
let b:undo_ftplugin .= '|unlet b:current_compiler'
diff --git a/vim/after/indent/awk.vim b/vim/after/indent/awk.vim
deleted file mode 100644
index fc848d2a..00000000
--- a/vim/after/indent/awk.vim
+++ /dev/null
@@ -1,7 +0,0 @@
-" The stock AWK indenting is decent, but doesn't include an undo variable;
-" this adds one, clearing away the sole global function too.
-if !exists('b:undo_indent')
- let b:undo_indent = 'unlet! b:did_indent'
- let b:undo_indent = b:undo_indent . '|setlocal indentexpr< indentkeys<'
- let b:undo_indent = b:undo_indent . '|delfunction! GetAwkIndent'
-endif
diff --git a/vim/after/indent/html.vim b/vim/after/indent/html.vim
index 6eae00ac..0309881c 100644
--- a/vim/after/indent/html.vim
+++ b/vim/after/indent/html.vim
@@ -1,4 +1,6 @@
+" Clear away the flag we set to indent after paragraphs
+unlet g:html_indent_inctags
+
" Don't re-indent lines on right-angle-bracket or enter
-setlocal indentkeys-=<>>
-setlocal indentkeys-=<Return>
+setlocal indentkeys-=<>>,<Return>
let b:undo_ftplugin .= '|setlocal indentkeys<'
diff --git a/vim/after/indent/perl.vim b/vim/after/indent/perl.vim
deleted file mode 100644
index 6f97d979..00000000
--- a/vim/after/indent/perl.vim
+++ /dev/null
@@ -1,9 +0,0 @@
-" The stock Perl indenting is decent, but doesn't include an undo variable;
-" this adds one
-if !exists('b:undo_indent')
- let b:undo_indent = 'unlet! b:did_indent'
- let b:undo_indent = b:undo_indent . '|setlocal indentexpr< indentkeys<'
- let b:undo_indent = b:undo_indent . '|unlet! b:indent_use_syntax'
- let b:undo_indent = b:undo_indent . '|unlet! b:match_skip'
- let b:undo_indent = b:undo_indent . '|unlet! b:match_words'
-endif
diff --git a/vim/after/indent/vim.vim b/vim/after/indent/vim.vim
index 7e36c4cc..548d3e5c 100644
--- a/vim/after/indent/vim.vim
+++ b/vim/after/indent/vim.vim
@@ -1,20 +1,8 @@
" Observe VimL conventions for two-space indents
setlocal shiftwidth=2
-if v:version > 703 || v:version == 703 && has('patch693')
- setlocal softtabstop=-1
-else
- setlocal softtabstop=2
-endif
+setlocal softtabstop=2
+let b:undo_indent .= '|setlocal shiftwidth< softtabstop<'
" Remove inapplicable defaults from 'indentkeys'
-setlocal indentkeys-=0#
-setlocal indentkeys-=0{
-setlocal indentkeys-=0}
-setlocal indentkeys-=0)
-setlocal indentkeys-=:
-
-" Commands to undo the above
-if exists('b:undo_indent')
- let b:undo_indent = b:undo_indent . '|setlocal shiftwidth<'
- let b:undo_indent = b:undo_indent . '|setlocal softtabstop<'
-endif
+setlocal indentkeys-=0#,0{,0},0),:
+let b:undo_indent .= '|setlocal indentkeys<'
diff --git a/vim/after/syntax/bindzone.vim b/vim/after/syntax/bindzone.vim
index cc50638c..19989995 100644
--- a/vim/after/syntax/bindzone.vim
+++ b/vim/after/syntax/bindzone.vim
@@ -1,9 +1,3 @@
-" Don't try to make these corrections if running 'compatible' or if the
-" runtime files are too old
-if &compatible || v:version < 700
- finish
-endif
-
" Highlight TLSA and SSHFP records correctly
" <https://github.com/vim/vim/issues/220>
syn keyword zoneRRType contained TLSA SSHFP nextgroup=zoneRData skipwhite
diff --git a/vim/after/syntax/gitcommit.vim b/vim/after/syntax/gitcommit.vim
index 2232e499..e47091f9 100644
--- a/vim/after/syntax/gitcommit.vim
+++ b/vim/after/syntax/gitcommit.vim
@@ -1,8 +1,2 @@
-" Don't try to make these corrections if running 'compatible' or if the
-" runtime files are too old
-if &compatible || v:version < 700
- finish
-endif
-
" If my commit subject is too long, highlight it as an error.
highlight link gitCommitOverflow Error
diff --git a/vim/after/syntax/messages.vim b/vim/after/syntax/messages.vim
index 75fe89b9..04faa607 100644
--- a/vim/after/syntax/messages.vim
+++ b/vim/after/syntax/messages.vim
@@ -1,9 +1,3 @@
-" Don't try to make these corrections if running 'compatible' or if the
-" runtime files are too old
-if &compatible || v:version < 700
- finish
-endif
-
" The highlighting for errors in syslog/messages files is more often annoying
" than useful, so just turn it off.
syntax clear messagesError
diff --git a/vim/after/syntax/sh.vim b/vim/after/syntax/sh.vim
index f02f30f5..bdedaf65 100644
--- a/vim/after/syntax/sh.vim
+++ b/vim/after/syntax/sh.vim
@@ -1,9 +1,3 @@
-" Don't try to make these corrections if running 'compatible' or if the
-" runtime files are too old
-if &compatible || v:version < 700
- finish
-endif
-
" Remove g:is_posix if we resorted to it in order to get correct POSIX sh
" highlighting with older Vim runtime files
if exists('g:is_posix')
diff --git a/vim/autoload/htmlcomplete.vim b/vim/autoload/htmlcomplete.vim
new file mode 100644
index 00000000..d4e52cd6
--- /dev/null
+++ b/vim/autoload/htmlcomplete.vim
@@ -0,0 +1,5 @@
+" Override expensive HTML version detection for 'omnifunc', that I don't use
+" and can't otherwise disable
+function! htmlcomplete#DetectOmniFlavor()
+ return
+endfunction
diff --git a/vim/bundle/make_target b/vim/bundle/make_target
-Subproject f4fe940526c9351990c9966eb6828f315c83311
+Subproject 71a5fa558b28e081bede012f075233924b0aee7
diff --git a/vim/filetype.vim b/vim/filetype.vim
index 4f3839ef..2e20b744 100644
--- a/vim/filetype.vim
+++ b/vim/filetype.vim
@@ -566,11 +566,8 @@ augroup filetypedetect
\| runtime scripts.vim
\|endif
- " If supported, on leaving insert mode, check whether the first line was
- " changed and looks like a shebang format, and if so, re-run filetype
- " detection
- if v:version > 700
- autocmd InsertLeave * call s:CheckShebang()
- endif
+ " On leaving insert mode, check whether the first line was changed and looks
+ " like a shebang format, and if so, re-run filetype detection
+ autocmd InsertLeave * call s:CheckShebang()
augroup END
diff --git a/vim/ftplugin/awk.vim b/vim/ftplugin/awk.vim
index 350bc976..9627941d 100644
--- a/vim/ftplugin/awk.vim
+++ b/vim/ftplugin/awk.vim
@@ -2,6 +2,7 @@
if exists('b:did_ftplugin')
finish
endif
+let b:did_ftplugin = 1
" Set comment formats
setlocal comments=:#
diff --git a/vim/ftplugin/csv.vim b/vim/ftplugin/csv.vim
index 58edfffe..162da402 100644
--- a/vim/ftplugin/csv.vim
+++ b/vim/ftplugin/csv.vim
@@ -2,6 +2,7 @@
if exists('b:did_ftplugin')
finish
endif
+let b:did_ftplugin = 1
" No autoformatting, literal tabs
setlocal noautoindent
diff --git a/vim/ftplugin/password.vim b/vim/ftplugin/password.vim
index 04658423..28f5a5e9 100644
--- a/vim/ftplugin/password.vim
+++ b/vim/ftplugin/password.vim
@@ -2,6 +2,7 @@
if exists('b:did_ftplugin')
finish
endif
+let b:did_ftplugin = 1
" No autoformatting
setlocal formatoptions=
diff --git a/vim/ftplugin/sed.vim b/vim/ftplugin/sed.vim
index 350bc976..9627941d 100644
--- a/vim/ftplugin/sed.vim
+++ b/vim/ftplugin/sed.vim
@@ -2,6 +2,7 @@
if exists('b:did_ftplugin')
finish
endif
+let b:did_ftplugin = 1
" Set comment formats
setlocal comments=:#
diff --git a/vim/ftplugin/tmux.vim b/vim/ftplugin/tmux.vim
index 350bc976..9627941d 100644
--- a/vim/ftplugin/tmux.vim
+++ b/vim/ftplugin/tmux.vim
@@ -2,6 +2,7 @@
if exists('b:did_ftplugin')
finish
endif
+let b:did_ftplugin = 1
" Set comment formats
setlocal comments=:#
diff --git a/vim/ftplugin/tsv.vim b/vim/ftplugin/tsv.vim
index 58edfffe..162da402 100644
--- a/vim/ftplugin/tsv.vim
+++ b/vim/ftplugin/tsv.vim
@@ -2,6 +2,7 @@
if exists('b:did_ftplugin')
finish
endif
+let b:did_ftplugin = 1
" No autoformatting, literal tabs
setlocal noautoindent
diff --git a/vim/vimrc b/vim/vimrc
index 25fe4e05..d8832fb7 100644
--- a/vim/vimrc
+++ b/vim/vimrc
@@ -8,13 +8,13 @@
runtime system.vim
" Load filetype settings, plugins, and maps
-if has('autocmd')
+if has('autocmd') && v:version >= 700
let g:maplocalleader = ','
filetype plugin indent on
endif
" Options dependent on the syntax feature
-if has('syntax')
+if has('syntax') && v:version >= 700
" Use syntax highlighting
if !exists('g:syntax_on')
@@ -185,9 +185,9 @@ set shortmess+=I
" Prefix wrapped rows with three dots
set showbreak=...
-" New windows go below or to the right of a split
-set splitbelow
-set splitright
+" New window positioning
+set splitbelow " Below the current window, not above
+set splitright " Right of the current window, not left
" Give me a bit longer to complete mappings
set timeoutlen=3000
@@ -223,7 +223,7 @@ nnoremap <silent> <C-L> :<C-U>nohlsearch<CR><C-L>
vnoremap <silent> <C-L> :<C-U>nohlsearch<CR>gv<C-L>
" Remap insert Ctrl-C to undo the escaped insert operation
-if &loadplugins
+if &loadplugins " Don't break the key if we won't be getting the plugin
imap <C-C> <Plug>(InsertCancel)
endif