summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBram Moolenaar <Bram@vim.org>2011-10-20 18:12:32 +0200
committerBram Moolenaar <Bram@vim.org>2011-10-20 18:12:32 +0200
commitf34dc6537d840944f8ac541843ed3ecbae50e576 (patch)
tree492482ca34a4f1fd1b55f1def7779baa58f8951f
parenta4594f6b8271a6b638ec03f2701183f82cb18d8c (diff)
downloadvim-f34dc6537d840944f8ac541843ed3ecbae50e576.zip
updated for version 7.3.340
Problem: When 'verbosefile' is set ftplugof.vim can give an error. Solution: Only remove filetypeplugin autocommands when they exist. (Yasuhiro Matsumoto)
-rw-r--r--runtime/ftplugof.vim8
-rw-r--r--src/version.c2
2 files changed, 7 insertions, 3 deletions
diff --git a/runtime/ftplugof.vim b/runtime/ftplugof.vim
index cd99ce05a..7828ff2c1 100644
--- a/runtime/ftplugof.vim
+++ b/runtime/ftplugof.vim
@@ -1,11 +1,13 @@
" Vim support file to switch off loading plugins for file types
"
" Maintainer: Bram Moolenaar <Bram@vim.org>
-" Last Change: 2002 Apr 04
+" Last Change: 2011 Oct 20
if exists("did_load_ftplugin")
unlet did_load_ftplugin
endif
-" Remove all autocommands in the filetypeplugin group
-silent! au! filetypeplugin *
+" Remove all autocommands in the filetypeplugin group, if any exist.
+if exists("#filetypeplugin")
+ silent! au! filetypeplugin *
+endif
diff --git a/src/version.c b/src/version.c
index 28bf34239..69e29b265 100644
--- a/src/version.c
+++ b/src/version.c
@@ -710,6 +710,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 340,
+/**/
339,
/**/
338,