summaryrefslogtreecommitdiff
path: root/runtime/ftplugin
diff options
context:
space:
mode:
authorBram Moolenaar <Bram@vim.org>2012-03-11 15:57:40 +0100
committerBram Moolenaar <Bram@vim.org>2012-03-11 15:57:40 +0100
commit84f7235bdbcc58876869ba8047530ef60443061a (patch)
tree5092ec85f621ee24d84ba29eeebbbc29ce40aac4 /runtime/ftplugin
parent7c578d3c3f501c0dd86c48aad6816a6ce6e3fc77 (diff)
downloadvim-git-84f7235bdbcc58876869ba8047530ef60443061a.tar.gz
Updated runtime files. Add Dutch translations.
Diffstat (limited to 'runtime/ftplugin')
-rw-r--r--runtime/ftplugin/abaqus.vim3
-rw-r--r--runtime/ftplugin/ant.vim1
-rw-r--r--runtime/ftplugin/aspvbs.vim1
-rw-r--r--runtime/ftplugin/config.vim1
-rw-r--r--runtime/ftplugin/csc.vim1
-rw-r--r--runtime/ftplugin/csh.vim1
-rw-r--r--runtime/ftplugin/dtd.vim1
-rw-r--r--runtime/ftplugin/erlang.vim9
-rw-r--r--runtime/ftplugin/eruby.vim3
-rw-r--r--runtime/ftplugin/haml.vim3
-rw-r--r--runtime/ftplugin/hamster.vim5
-rw-r--r--runtime/ftplugin/html.vim1
-rw-r--r--runtime/ftplugin/initex.vim1
-rw-r--r--runtime/ftplugin/java.vim3
-rw-r--r--runtime/ftplugin/jsp.vim1
-rw-r--r--runtime/ftplugin/lisp.vim4
-rw-r--r--runtime/ftplugin/lua.vim4
-rw-r--r--runtime/ftplugin/man.vim4
-rw-r--r--runtime/ftplugin/matlab.vim4
-rw-r--r--runtime/ftplugin/occam.vim5
-rw-r--r--runtime/ftplugin/perl.vim3
-rw-r--r--runtime/ftplugin/perl6.vim3
-rw-r--r--runtime/ftplugin/php.vim1
-rw-r--r--runtime/ftplugin/plaintex.vim1
-rw-r--r--runtime/ftplugin/rpl.vim4
-rw-r--r--runtime/ftplugin/scheme.vim4
-rw-r--r--runtime/ftplugin/sgml.vim1
-rw-r--r--runtime/ftplugin/sh.vim1
-rw-r--r--runtime/ftplugin/spec.vim3
-rw-r--r--runtime/ftplugin/sql.vim3
-rw-r--r--runtime/ftplugin/svg.vim1
-rw-r--r--runtime/ftplugin/tcl.vim1
-rw-r--r--runtime/ftplugin/tcsh.vim1
-rw-r--r--runtime/ftplugin/tex.vim1
-rw-r--r--runtime/ftplugin/xhtml.vim1
-rw-r--r--runtime/ftplugin/xml.vim1
-rw-r--r--runtime/ftplugin/xsd.vim1
37 files changed, 69 insertions, 18 deletions
diff --git a/runtime/ftplugin/abaqus.vim b/runtime/ftplugin/abaqus.vim
index 873b9bfae..cbebcbfa4 100644
--- a/runtime/ftplugin/abaqus.vim
+++ b/runtime/ftplugin/abaqus.vim
@@ -1,7 +1,7 @@
" Vim filetype plugin file
" Language: Abaqus finite element input file (www.abaqus.com)
" Maintainer: Carl Osterwisch <osterwischc@asme.org>
-" Last Change: 2008 Oct 5
+" Last Change: 2012 Mar 11
" Only do this when not done yet for this buffer
if exists("b:did_ftplugin") | finish | endif
@@ -87,3 +87,4 @@ let b:undo_ftplugin .= "|unmap <buffer> [[|unmap <buffer> ]]"
" Restore saved compatibility options
let &cpoptions = s:cpo_save
+unlet s:cpo_save
diff --git a/runtime/ftplugin/ant.vim b/runtime/ftplugin/ant.vim
index 648fca1be..590585889 100644
--- a/runtime/ftplugin/ant.vim
+++ b/runtime/ftplugin/ant.vim
@@ -41,3 +41,4 @@ let b:undo_ftplugin = "unlet! b:browsefilter | " . s:undo_ftplugin
" Restore the saved compatibility options.
let &cpo = s:save_cpo
+unlet s:save_cpo
diff --git a/runtime/ftplugin/aspvbs.vim b/runtime/ftplugin/aspvbs.vim
index 2b841efcf..660dab468 100644
--- a/runtime/ftplugin/aspvbs.vim
+++ b/runtime/ftplugin/aspvbs.vim
@@ -57,3 +57,4 @@ let b:undo_ftplugin = "unlet! b:match_words b:match_ignorecase b:browsefilter |
" Restore the saved compatibility options.
let &cpo = s:save_cpo
+unlet s:save_cpo
diff --git a/runtime/ftplugin/config.vim b/runtime/ftplugin/config.vim
index df607b1b1..7fde42ebf 100644
--- a/runtime/ftplugin/config.vim
+++ b/runtime/ftplugin/config.vim
@@ -39,3 +39,4 @@ let b:undo_ftplugin = "unlet! b:browsefilter | " . b:undo_ftplugin
" Restore the saved compatibility options.
let &cpo = s:save_cpo
+unlet s:save_cpo
diff --git a/runtime/ftplugin/csc.vim b/runtime/ftplugin/csc.vim
index ac0208810..3a09c3bf8 100644
--- a/runtime/ftplugin/csc.vim
+++ b/runtime/ftplugin/csc.vim
@@ -24,3 +24,4 @@ let b:undo_ftplugin = "unlet! b:match_words"
" Restore the saved compatibility options.
let &cpo = s:save_cpo
+unlet s:save_cpo
diff --git a/runtime/ftplugin/csh.vim b/runtime/ftplugin/csh.vim
index 3f89c72c2..4ae09f91b 100644
--- a/runtime/ftplugin/csh.vim
+++ b/runtime/ftplugin/csh.vim
@@ -45,3 +45,4 @@ let b:undo_ftplugin = "setlocal commentstring< formatoptions<" .
" Restore the saved compatibility options.
let &cpo = s:save_cpo
+unlet s:save_cpo
diff --git a/runtime/ftplugin/dtd.vim b/runtime/ftplugin/dtd.vim
index eed5ca6ac..6c08f6691 100644
--- a/runtime/ftplugin/dtd.vim
+++ b/runtime/ftplugin/dtd.vim
@@ -37,3 +37,4 @@ let b:undo_ftplugin = "setlocal commentstring< comments< formatoptions<" .
" Restore the saved compatibility options.
let &cpo = s:save_cpo
+unlet s:save_cpo
diff --git a/runtime/ftplugin/erlang.vim b/runtime/ftplugin/erlang.vim
index af4e910b2..2bbc345b4 100644
--- a/runtime/ftplugin/erlang.vim
+++ b/runtime/ftplugin/erlang.vim
@@ -19,6 +19,9 @@ else
let s:did_function_definitions = 1
endif
+let s:cpo_save = &cpo
+set cpo&vim
+
if !exists('g:erlang_keywordprg')
let g:erlang_keywordprg = 'erl -man'
endif
@@ -76,3 +79,9 @@ function ErlangFoldText()
endfunction
call s:SetErlangOptions()
+
+let b:undo_ftplugin = "setlocal foldmethod< foldexpr< foldtext<"
+ \ . " comments< commentstring< formatoptions<"
+
+let &cpo = s:cpo_save
+unlet s:cpo_save
diff --git a/runtime/ftplugin/eruby.vim b/runtime/ftplugin/eruby.vim
index 7c19a09aa..870f45e07 100644
--- a/runtime/ftplugin/eruby.vim
+++ b/runtime/ftplugin/eruby.vim
@@ -1,7 +1,7 @@
" Vim filetype plugin
" Language: eRuby
" Maintainer: Tim Pope <vimNOSPAM@tpope.org>
-" Last Change: 2010 Apr 15
+" Last Change: 2012 Mar 11
" URL: http://vim-ruby.rubyforge.org
" Anon CVS: See above site
" Release Coordinator: Doug Kearns <dougkearns@gmail.com>
@@ -100,5 +100,6 @@ let b:undo_ftplugin = "setl cms< "
\ " | unlet! b:browsefilter b:match_words | " . s:undo_ftplugin
let &cpo = s:save_cpo
+unlet s:save_cpo
" vim: nowrap sw=2 sts=2 ts=8:
diff --git a/runtime/ftplugin/haml.vim b/runtime/ftplugin/haml.vim
index b2c1eca3f..05be7f8b7 100644
--- a/runtime/ftplugin/haml.vim
+++ b/runtime/ftplugin/haml.vim
@@ -1,7 +1,7 @@
" Vim filetype plugin
" Language: Haml
" Maintainer: Tim Pope <vimNOSPAM@tpope.org>
-" Last Change: 2010 May 21
+" Last Change: 2012 Mar 11
" Only do this when not done yet for this buffer
if exists("b:did_ftplugin")
@@ -63,5 +63,6 @@ let b:undo_ftplugin = "setl cms< com< "
\ " | unlet! b:browsefilter b:match_words | " . s:undo_ftplugin
let &cpo = s:save_cpo
+unlet s:save_cpo
" vim:set sw=2:
diff --git a/runtime/ftplugin/hamster.vim b/runtime/ftplugin/hamster.vim
index ddb40f928..c23adc423 100644
--- a/runtime/ftplugin/hamster.vim
+++ b/runtime/ftplugin/hamster.vim
@@ -12,7 +12,7 @@ endif
" Don't load another plugin for this buffer
let b:did_ftplugin = 1
-let cpo_save = &cpo
+let s:cpo_save = &cpo
set cpo-=C
let b:undo_ftplugin = "setl fo< com< tw< commentstring<"
@@ -57,5 +57,6 @@ if exists("loaded_matchit")
endif
setlocal ignorecase
-let &cpo = cpo_save
+let &cpo = s:cpo_save
+unlet s:cpo_save
setlocal cpo+=M " makes \%( match \)
diff --git a/runtime/ftplugin/html.vim b/runtime/ftplugin/html.vim
index 5f1384b3e..418da06a6 100644
--- a/runtime/ftplugin/html.vim
+++ b/runtime/ftplugin/html.vim
@@ -88,3 +88,4 @@ let b:undo_ftplugin = "setlocal commentstring< matchpairs< omnifunc< comments< f
" Restore the saved compatibility options.
let &cpo = s:save_cpo
+unlet s:save_cpo
diff --git a/runtime/ftplugin/initex.vim b/runtime/ftplugin/initex.vim
index 4f35d04c7..0ee3e8d89 100644
--- a/runtime/ftplugin/initex.vim
+++ b/runtime/ftplugin/initex.vim
@@ -34,5 +34,6 @@ let &l:include = '\\input'
setlocal suffixesadd=.tex
let &cpo = s:save_cpo
+unlet s:save_cpo
" vim:sts=2:sw=2:
diff --git a/runtime/ftplugin/java.vim b/runtime/ftplugin/java.vim
index 6c7b3671c..292cb6b16 100644
--- a/runtime/ftplugin/java.vim
+++ b/runtime/ftplugin/java.vim
@@ -1,7 +1,7 @@
" Vim filetype plugin file
" Language: Java
" Maintainer: Dan Sharp <dwsharp at users dot sourceforge dot net>
-" Last Change: 20 Jan 2009
+" Last Change: 2012 Mar 11
" URL: http://dwsharp.users.sourceforge.net/vim/ftplugin
if exists("b:did_ftplugin") | finish | endif
@@ -48,3 +48,4 @@ let b:undo_ftplugin = "setlocal suffixes< suffixesadd<" .
" Restore the saved compatibility options.
let &cpo = s:save_cpo
+unlet s:save_cpo
diff --git a/runtime/ftplugin/jsp.vim b/runtime/ftplugin/jsp.vim
index 9c0eb9687..fbba863b3 100644
--- a/runtime/ftplugin/jsp.vim
+++ b/runtime/ftplugin/jsp.vim
@@ -64,3 +64,4 @@ let b:undo_ftplugin = "unlet! b:browsefilter b:match_words | " . s:undo_ftplugin
" Restore the saved compatibility options.
let &cpo = s:save_cpo
+unlet s:save_cpo
diff --git a/runtime/ftplugin/lisp.vim b/runtime/ftplugin/lisp.vim
index 589a600b5..dcc248c9c 100644
--- a/runtime/ftplugin/lisp.vim
+++ b/runtime/ftplugin/lisp.vim
@@ -4,7 +4,7 @@
" URL: http://sites.google.com/site/khorser/opensource/vim
" Original author: Dorai Sitaram <ds26@gte.com>
" Original URL: http://www.ccs.neu.edu/~dorai/vimplugins/vimplugins.html
-" Last Change: Jan 9, 2012
+" Last Change: Mar 5, 2012
" Only do this when not done yet for this buffer
if exists("b:did_ftplugin")
@@ -24,3 +24,5 @@ setl lisp
" e.g. insertion of ;;; and ;; on normal "O" or "o" when staying in comment
setl comments^=:;;;,:;;,sr:#\|,mb:\|,ex:\|#
setl formatoptions+=croql
+
+let b:undo_ftplugin = "setlocal comments< define< formatoptions< iskeyword< lisp<"
diff --git a/runtime/ftplugin/lua.vim b/runtime/ftplugin/lua.vim
index fc581db7c..3454a4d69 100644
--- a/runtime/ftplugin/lua.vim
+++ b/runtime/ftplugin/lua.vim
@@ -1,7 +1,7 @@
" Vim filetype plugin file.
" Language: Lua 4.0+
" Maintainer: Max Ischenko <mfi@ukr.net>
-" Last Change: 2011 Dec 10 by Thilo Six
+" Last Change: 2012 Mar 07
" Only do this when not done yet for this buffer
if exists("b:did_ftplugin")
@@ -38,3 +38,5 @@ endif " exists("loaded_matchit")
let &cpo = s:cpo_save
unlet s:cpo_save
+
+let b:undo_ftplugin = "setlocal fo< com< cms< suffixesadd<"
diff --git a/runtime/ftplugin/man.vim b/runtime/ftplugin/man.vim
index 242a7712c..eadabf883 100644
--- a/runtime/ftplugin/man.vim
+++ b/runtime/ftplugin/man.vim
@@ -1,7 +1,7 @@
" Vim filetype plugin file
" Language: man
" Maintainer: SungHyun Nam <goweol@gmail.com>
-" Last Change: 2011 Jul 25
+" Last Change: 2012 Mar 6
" To make the ":Man" command available before editing a manual page, source
" this script from your startup vimrc file.
@@ -35,6 +35,8 @@ if &filetype == "man"
nnoremap <buffer> <c-t> :call <SID>PopPage()<CR>
endif
+ let b:undo_ftplugin = "setlocal iskeyword<"
+
endif
if exists(":Man") != 2
diff --git a/runtime/ftplugin/matlab.vim b/runtime/ftplugin/matlab.vim
index 1800dc8a6..6bfb3d761 100644
--- a/runtime/ftplugin/matlab.vim
+++ b/runtime/ftplugin/matlab.vim
@@ -25,6 +25,4 @@ let b:undo_ftplugin = "setlocal suffixesadd< suffixes< "
\ . "| unlet! b:match_words"
let &cpo = s:save_cpo
-
-
-
+unlet s:save_cpo
diff --git a/runtime/ftplugin/occam.vim b/runtime/ftplugin/occam.vim
index ed2c4f4ea..9806318ef 100644
--- a/runtime/ftplugin/occam.vim
+++ b/runtime/ftplugin/occam.vim
@@ -37,3 +37,8 @@ if has("gui_win32") && !exists("b:browsefilter")
endif
"}}}
+"{{{ Undo settings
+let b:undo_ftplugin = "setlocal shiftwidth< softtabstop< expandtab<"
+ \ . " formatoptions< comments< textwidth<"
+ \ . "| unlet! b:browsefiler"
+"}}}
diff --git a/runtime/ftplugin/perl.vim b/runtime/ftplugin/perl.vim
index 1d948535a..fbfc0e5f8 100644
--- a/runtime/ftplugin/perl.vim
+++ b/runtime/ftplugin/perl.vim
@@ -2,7 +2,7 @@
" Language: Perl
" Maintainer: Andy Lester <andy@petdance.com>
" URL: http://github.com/petdance/vim-perl
-" Last Change: 2009-08-14
+" Last Change: 2012 Mar 11
if exists("b:did_ftplugin") | finish | endif
let b:did_ftplugin = 1
@@ -69,3 +69,4 @@ let b:undo_ftplugin = "setlocal fo< com< cms< inc< inex< def< isf< kp<" .
" Restore the saved compatibility options.
let &cpo = s:save_cpo
+unlet s:save_cpo
diff --git a/runtime/ftplugin/perl6.vim b/runtime/ftplugin/perl6.vim
index 14ab1e9ca..77238ed00 100644
--- a/runtime/ftplugin/perl6.vim
+++ b/runtime/ftplugin/perl6.vim
@@ -2,7 +2,7 @@
" Language: Perl 6
" Maintainer: Andy Lester <andy@petdance.com>
" URL: http://github.com/petdance/vim-perl/tree/master
-" Last Change: 2010-08-10
+" Last Change: 2012 Mar 11
" Contributors: Hinrik Örn Sigurðsson <hinrik.sig@gmail.com>
"
" Based on ftplugin/perl.vim by Dan Sharp <dwsharp at hotmail dot com>
@@ -46,3 +46,4 @@ let b:undo_ftplugin = "setlocal fo< com< cms< inc< inex< def< isk<" .
" Restore the saved compatibility options.
let &cpo = s:save_cpo
+unlet s:save_cpo
diff --git a/runtime/ftplugin/php.vim b/runtime/ftplugin/php.vim
index f59cf122f..93de5b90f 100644
--- a/runtime/ftplugin/php.vim
+++ b/runtime/ftplugin/php.vim
@@ -80,3 +80,4 @@ let b:undo_ftplugin = "setlocal commentstring< include< omnifunc<" .
" Restore the saved compatibility options.
let &cpo = s:save_cpo
+unlet s:save_cpo
diff --git a/runtime/ftplugin/plaintex.vim b/runtime/ftplugin/plaintex.vim
index 5862d00bb..9e0e40268 100644
--- a/runtime/ftplugin/plaintex.vim
+++ b/runtime/ftplugin/plaintex.vim
@@ -32,5 +32,6 @@ if exists("loaded_matchit")
endif " exists("loaded_matchit")
let &cpo = s:save_cpo
+unlet s:save_cpo
" vim:sts=2:sw=2:
diff --git a/runtime/ftplugin/rpl.vim b/runtime/ftplugin/rpl.vim
index 5ddf2c1a0..909e141cc 100644
--- a/runtime/ftplugin/rpl.vim
+++ b/runtime/ftplugin/rpl.vim
@@ -1,7 +1,7 @@
" Vim filetype plugin file
" Language: RPL/2
" Maintainer: Joël BERTRAND <rpl2@free.fr>
-" Last Change: 2005 Mar 28
+" Last Change: 2012 Mar 07
" Version: 0.1
" Only do this when not done yet for this buffer
@@ -18,3 +18,5 @@ setlocal fo-=t fo+=croql
" Set 'comments' to format dashed lists in comments.
setlocal comments=sO:*\ -,mO:*\ \ ,exO:*/,s1:/*,mb:*,ex:*/,://
+
+let b:undo_ftplugin = "setlocal fo< comments<"
diff --git a/runtime/ftplugin/scheme.vim b/runtime/ftplugin/scheme.vim
index 44c776af9..9b271936e 100644
--- a/runtime/ftplugin/scheme.vim
+++ b/runtime/ftplugin/scheme.vim
@@ -4,7 +4,7 @@
" URL: http://sites.google.com/site/khorser/opensource/vim
" Original author: Dorai Sitaram <ds26@gte.com>
" Original URL: http://www.ccs.neu.edu/~dorai/vimplugins/vimplugins.html
-" Last Change: Jan 9, 2012
+" Last Change: Mar 5, 2012
" Only do this when not done yet for this buffer
if exists("b:did_ftplugin")
@@ -43,3 +43,5 @@ if exists("b:is_chicken") || exists("is_chicken")
setl lispwords+=define-values,opt-lambda,case-lambda,syntax-rules,with-syntax,syntax-case
setl lispwords+=cond-expand,and-let*,foreign-lambda,foreign-lambda*
endif
+
+let b:undo_ftplugin = "setlocal comments< define< formatoptions< iskeyword< lispwords< lisp<"
diff --git a/runtime/ftplugin/sgml.vim b/runtime/ftplugin/sgml.vim
index a07d31f08..bf63efbf1 100644
--- a/runtime/ftplugin/sgml.vim
+++ b/runtime/ftplugin/sgml.vim
@@ -37,3 +37,4 @@ let b:undo_ftplugin = "unlet! b:browsefilter | " . s:undo_ftplugin
" Restore the saved compatibility options.
let &cpo = s:save_cpo
+unlet s:save_cpo
diff --git a/runtime/ftplugin/sh.vim b/runtime/ftplugin/sh.vim
index 076b5efda..593fcec92 100644
--- a/runtime/ftplugin/sh.vim
+++ b/runtime/ftplugin/sh.vim
@@ -36,3 +36,4 @@ let b:undo_ftplugin = "setlocal cms< | unlet! b:browsefilter b:match_words"
" Restore the saved compatibility options.
let &cpo = s:save_cpo
+unlet s:save_cpo
diff --git a/runtime/ftplugin/spec.vim b/runtime/ftplugin/spec.vim
index b84ed63fb..9778e1cce 100644
--- a/runtime/ftplugin/spec.vim
+++ b/runtime/ftplugin/spec.vim
@@ -1,7 +1,7 @@
" Plugin to update the %changelog section of RPM spec files
" Filename: spec.vim
" Maintainer: Gustavo Niemeyer <niemeyer@conectiva.com>
-" Last Change: 2011 Dec 25 by Thilo Six
+" Last Change: 2012 Mar 07
if exists("b:did_ftplugin")
finish
@@ -172,3 +172,4 @@ let b:match_words =
let &cpo = s:cpo_save
unlet s:cpo_save
+let b:undo_ftplugin = "unlet! b:match_ignorecase b:match_words"
diff --git a/runtime/ftplugin/sql.vim b/runtime/ftplugin/sql.vim
index 7c6864a0c..f6084b703 100644
--- a/runtime/ftplugin/sql.vim
+++ b/runtime/ftplugin/sql.vim
@@ -2,7 +2,7 @@
" Language: SQL (Common for Oracle, Microsoft SQL Server, Sybase)
" Version: 8.0
" Maintainer: David Fishburn <dfishburn dot vim at gmail dot com>
-" Last Change: 2011 Apr 01
+" Last Change: 2012 Mar 11
" Download: http://vim.sourceforge.net/script.php?script_id=454
" For more details please use:
@@ -490,6 +490,7 @@ if exists('&omnifunc')
endif
let &cpo = s:save_cpo
+unlet s:save_cpo
" vim:sw=4:
diff --git a/runtime/ftplugin/svg.vim b/runtime/ftplugin/svg.vim
index f8a0d6200..8fff6ea32 100644
--- a/runtime/ftplugin/svg.vim
+++ b/runtime/ftplugin/svg.vim
@@ -37,3 +37,4 @@ let b:undo_ftplugin = "unlet! b:browsefilter | " . s:undo_ftplugin
" Restore the saved compatibility options.
let &cpo = s:save_cpo
+unlet s:save_cpo
diff --git a/runtime/ftplugin/tcl.vim b/runtime/ftplugin/tcl.vim
index c5bc3033e..1cc24d341 100644
--- a/runtime/ftplugin/tcl.vim
+++ b/runtime/ftplugin/tcl.vim
@@ -32,5 +32,6 @@ let b:undo_ftplugin = "setlocal fo< com< cms< inc< inex< def< isf< kp<" .
" Restore the saved compatibility options.
let &cpo = s:cpo_save
+unlet s:cpo_save
" vim: set et ts=4 sw=4 tw=78:
diff --git a/runtime/ftplugin/tcsh.vim b/runtime/ftplugin/tcsh.vim
index dacb44e71..7e2d95993 100644
--- a/runtime/ftplugin/tcsh.vim
+++ b/runtime/ftplugin/tcsh.vim
@@ -37,3 +37,4 @@ let b:undo_ftplugin = "unlet! b:browsefilter | " . s:undo_ftplugin
" Restore the saved compatibility options.
let &cpo = s:save_cpo
+unlet s:save_cpo
diff --git a/runtime/ftplugin/tex.vim b/runtime/ftplugin/tex.vim
index 408992743..11470012f 100644
--- a/runtime/ftplugin/tex.vim
+++ b/runtime/ftplugin/tex.vim
@@ -41,5 +41,6 @@ if exists("loaded_matchit")
endif " exists("loaded_matchit")
let &cpo = s:save_cpo
+unlet s:save_cpo
" vim:sts=2:sw=2:
diff --git a/runtime/ftplugin/xhtml.vim b/runtime/ftplugin/xhtml.vim
index a50ed925b..21ed3e110 100644
--- a/runtime/ftplugin/xhtml.vim
+++ b/runtime/ftplugin/xhtml.vim
@@ -64,3 +64,4 @@ let b:undo_ftplugin = "unlet! b:browsefilter b:match_words | " . s:undo_ftplugin
" Restore the saved compatibility options.
let &cpo = s:save_cpo
+unlet s:save_cpo
diff --git a/runtime/ftplugin/xml.vim b/runtime/ftplugin/xml.vim
index 74cd064ee..236e87053 100644
--- a/runtime/ftplugin/xml.vim
+++ b/runtime/ftplugin/xml.vim
@@ -61,3 +61,4 @@ let b:undo_ftplugin = "setlocal commentstring< comments< formatoptions<" .
" Restore the saved compatibility options.
let &cpo = s:save_cpo
+unlet s:save_cpo
diff --git a/runtime/ftplugin/xsd.vim b/runtime/ftplugin/xsd.vim
index b0337603c..6a4a19365 100644
--- a/runtime/ftplugin/xsd.vim
+++ b/runtime/ftplugin/xsd.vim
@@ -36,3 +36,4 @@ let b:undo_ftplugin = "unlet! b:browsefilter | " . s:undo_ftplugin
" Restore the saved compatibility options.
let &cpo = s:save_cpo
+unlet s:save_cpo