aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTom Ryder <tom@sanctum.geek.nz>2019-06-07 10:13:24 +1200
committerTom Ryder <tom@sanctum.geek.nz>2019-06-07 10:13:24 +1200
commitaf4fc020c39bd72f2759de10b5dc5b6808c19824 (patch)
treeb9c51952e56a21416d2213ac4f75ad16ea6b2adb
parentMerge branch 'release/v5.20.0' (diff)
parentBump VERSION (diff)
downloaddotfiles-af4fc020c39bd72f2759de10b5dc5b6808c19824.tar.gz
dotfiles-af4fc020c39bd72f2759de10b5dc5b6808c19824.zip
Merge branch 'release/v5.21.0'v5.21.0
* release/v5.21.0: Remove HTML completion blocking Remove error suppression on variable unset Correct a path in a comment Break a long line
-rw-r--r--VERSION4
-rw-r--r--vim/after/plugin/dist.vim18
-rw-r--r--vim/after/syntax/bindzone.vim4
-rw-r--r--vim/autoload/htmlcomplete.vim5
4 files changed, 14 insertions, 17 deletions
diff --git a/VERSION b/VERSION
index 188eb26d..e25d1fd9 100644
--- a/VERSION
+++ b/VERSION
@@ -1,2 +1,2 @@
-tejr dotfiles v5.20.0
-Thu Jun 6 13:19:11 UTC 2019
+tejr dotfiles v5.21.0
+Thu Jun 6 22:13:24 UTC 2019
diff --git a/vim/after/plugin/dist.vim b/vim/after/plugin/dist.vim
index 70747f8c..98574de8 100644
--- a/vim/after/plugin/dist.vim
+++ b/vim/after/plugin/dist.vim
@@ -1,9 +1,9 @@
-" Clean up the short-circuiting variables from config/plugins.vim
-unlet! loaded_getscriptPlugin
-unlet! loaded_vimballPlugin
-unlet! loaded_logiPat
-unlet! loaded_netrwPlugin
-unlet! loaded_rrhelper
-unlet! loaded_spellfile_plugin
-unlet! loaded_tarPlugin
-unlet! loaded_zipPlugin
+" Clean up the short-circuiting variables from $MYVIM/plugin/dist.vim
+unlet loaded_getscriptPlugin
+unlet loaded_vimballPlugin
+unlet loaded_logiPat
+unlet loaded_netrwPlugin
+unlet loaded_rrhelper
+unlet loaded_spellfile_plugin
+unlet loaded_tarPlugin
+unlet loaded_zipPlugin
diff --git a/vim/after/syntax/bindzone.vim b/vim/after/syntax/bindzone.vim
index 19989995..29d5f4b8 100644
--- a/vim/after/syntax/bindzone.vim
+++ b/vim/after/syntax/bindzone.vim
@@ -1,3 +1,5 @@
" Highlight TLSA and SSHFP records correctly
" <https://github.com/vim/vim/issues/220>
-syn keyword zoneRRType contained TLSA SSHFP nextgroup=zoneRData skipwhite
+syn keyword zoneRRType
+ \ contained TLSA SSHFP
+ \ nextgroup=zoneRData skipwhite
diff --git a/vim/autoload/htmlcomplete.vim b/vim/autoload/htmlcomplete.vim
deleted file mode 100644
index 37ffa288..00000000
--- a/vim/autoload/htmlcomplete.vim
+++ /dev/null
@@ -1,5 +0,0 @@
-" Override expensive HTML version detection for 'omnifunc', that I don't use
-" and can't otherwise disable
-function! htmlcomplete#DetectOmniFlavor() abort
- return
-endfunction