aboutsummaryrefslogtreecommitdiff
path: root/vim/after/ftplugin/vim.vim
diff options
context:
space:
mode:
authorTom Ryder <tom@sanctum.geek.nz>2019-05-10 10:38:50 +1200
committerTom Ryder <tom@sanctum.geek.nz>2019-05-10 10:38:50 +1200
commited2dfe06b1ad22d09af7fe7efc36555812c24aa5 (patch)
treeffc37ddaaf7ae67f2e7f81acc92f56493020a9b2 /vim/after/ftplugin/vim.vim
parentMerge branch 'release/v4.19.0' (diff)
parentBump VERSION (diff)
downloaddotfiles-ed2dfe06b1ad22d09af7fe7efc36555812c24aa5.tar.gz
dotfiles-ed2dfe06b1ad22d09af7fe7efc36555812c24aa5.zip
Merge branch 'release/v4.20.0'v4.20.0
* release/v4.20.0: Bump VERSION Update vim-juvenile to v0.4.0 Update vim-insert-suspend-hlsearch to v0.7.0 Update vim-insert-cancel to v3.3.0 Update vim-foldlevelstart-stdin to v0.2.0 Update vim-equalalways-resized to v0.2.0 Update vim-digraph-search to v0.2.0 Update vim-diff-prune to v1.3.0 Update vim-cursorline-current to v0.4.0 Update vim-copy-linebreak to v0.7.0 Update vim-colon-operator to v0.4.0 Update vim-cmdwin-ctrlc to v0.3.0 Update vim-big-file-options to v1.1.0 Remove unnecessary l: prefixes to Vim variables Remove unnecessary g: prefixes to Vim variables Remap g& to preserve substitution flags Bind \S in Vim to run :scriptnames
Diffstat (limited to 'vim/after/ftplugin/vim.vim')
-rw-r--r--vim/after/ftplugin/vim.vim4
1 files changed, 2 insertions, 2 deletions
diff --git a/vim/after/ftplugin/vim.vim b/vim/after/ftplugin/vim.vim
index 790dd38e..76608691 100644
--- a/vim/after/ftplugin/vim.vim
+++ b/vim/after/ftplugin/vim.vim
@@ -19,7 +19,7 @@ endif
" Adjust the match words for the matchit plugin; the default filetype plugin
" matches e.g. an opening "function" with the first "return" within, which I
" don't like
-if exists('g:loaded_matchit')
+if exists('loaded_matchit')
let b:match_words =
\ '\<fu\%[nction]\>:\<endf\%[unction]\>,' .
\ '\<\(wh\%[ile]\|for\)\>:\<end\(w\%[hile]\|fo\%[r]\)\>,' .
@@ -29,7 +29,7 @@ if exists('g:loaded_matchit')
endif
" Stop here if the user doesn't want ftplugin mappings
-if exists('g:no_plugin_maps') || exists('g:no_vim_maps')
+if exists('no_plugin_maps') || exists('no_vim_maps')
finish
endif