diff options
48 files changed, 8331 insertions, 77 deletions
diff --git a/runtime/doc/autocmd.txt b/runtime/doc/autocmd.txt index 44d2d62c46..7811cfe18c 100644 --- a/runtime/doc/autocmd.txt +++ b/runtime/doc/autocmd.txt @@ -700,7 +700,9 @@ QuickFixCmdPre Before a quickfix command is run (|:make|, |:lmake|, |:grep|, |:lgrep|, |:grepadd|, |:lgrepadd|, |:vimgrep|, |:lvimgrep|, |:vimgrepadd|, |:lvimgrepadd|, |:cscope|, - |:helpgrep|, |:lhelpgrep|). + |:cfile|, |:cgetfile|, |:caddfile|, |:lfile|, + |:lgetfile|, |:laddfile|, |:helpgrep|, + |:lhelpgrep|). The pattern is matched against the command being run. When |:grep| is used but 'grepprg' is set to "internal" it still matches "grep". diff --git a/runtime/doc/eval.txt b/runtime/doc/eval.txt index 7de0e9a311..ce4c41b7ee 100644 --- a/runtime/doc/eval.txt +++ b/runtime/doc/eval.txt @@ -1,4 +1,4 @@ -*eval.txt* For Vim version 7.3. Last change: 2012 Jan 28 +*eval.txt* For Vim version 7.3. Last change: 2012 Mar 07 VIM REFERENCE MANUAL by Bram Moolenaar @@ -2744,13 +2744,15 @@ exp({expr}) *exp()* {only available when compiled with the |+float| feature} -expand({expr} [, {flag}]) *expand()* +expand({expr} [, {nosuf} [, {list}]]) *expand()* Expand wildcards and the following special keywords in {expr}. - The result is a String. 'wildignorecase' applies. + 'wildignorecase' applies. - When there are several matches, they are separated by <NL> - characters. [Note: in version 5.0 a space was used, which - caused problems when a file name contains a space] + If {list} is given and it is non-zero, a List will be returned. + Otherwise the result is a String and when there are several + matches, they are separated by <NL> characters. [Note: in + version 5.0 a space was used, which caused problems when a + file name contains a space] If the expansion fails, the result is an empty string. A name for a non-existing file is not included. @@ -3454,18 +3456,23 @@ getwinvar({winnr}, {varname}) *getwinvar()* :let list_is_on = getwinvar(2, '&list') :echo "myvar = " . getwinvar(1, 'myvar') < -glob({expr} [, {flag}]) *glob()* +glob({expr} [, {nosuf} [, {list}]]) *glob()* Expand the file wildcards in {expr}. See |wildcards| for the use of special characters. - The result is a String. - When there are several matches, they are separated by <NL> - characters. - Unless the optional {flag} argument is given and is non-zero, + + Unless the optional {nosuf} argument is given and is non-zero, the 'suffixes' and 'wildignore' options apply: Names matching one of the patterns in 'wildignore' will be skipped and 'suffixes' affect the ordering of matches. 'wildignorecase' always applies. - If the expansion fails, the result is an empty string. + + When {list} is present and it is non-zero the result is a List + with all matching files. The advantage of using a List is, + you also get filenames containing newlines correctly. + Otherwise the result is a String and when there are several + matches, they are separated by <NL> characters. + + If the expansion fails, the result is an empty String or List. A name for a non-existing file is not included. For most systems backticks can be used to get files names from @@ -6678,9 +6685,9 @@ Hint: If you distribute a bunch of scripts you can pack them together with the ============================================================================== 6. Curly braces names *curly-braces-names* -Wherever you can use a variable, you can use a "curly braces name" variable. -This is a regular variable name with one or more expressions wrapped in braces -{} like this: > +In most places where you can use a variable, you can use a "curly braces name" +variable. This is a regular variable name with one or more expressions +wrapped in braces {} like this: > my_{adjective}_variable When Vim encounters this, it evaluates the expression inside the braces, puts @@ -6716,6 +6723,11 @@ Example: > This would call the function "my_func_whizz(parameter)". +This does NOT work: > + :let i = 3 + :let @{i} = '' " error + :echo @{i} " error + ============================================================================== 7. Commands *expression-commands* diff --git a/runtime/doc/mbyte.txt b/runtime/doc/mbyte.txt index e8d0676001..c4ea4e87da 100644 --- a/runtime/doc/mbyte.txt +++ b/runtime/doc/mbyte.txt @@ -1,4 +1,4 @@ -*mbyte.txt* For Vim version 7.3. Last change: 2011 Oct 15 +*mbyte.txt* For Vim version 7.3. Last change: 2012 Feb 29 VIM REFERENCE MANUAL by Bram Moolenaar et al. @@ -857,7 +857,7 @@ Use the RPM or port for your system. USING XIM *multibyte-input* *E284* *E286* *E287* *E288* - *E285* *E291* *E292* *E290* *E289* + *E285* *E289* Note that Display and Input are independent. It is possible to see your language even though you have no input method for it. But when your Display diff --git a/runtime/doc/todo.txt b/runtime/doc/todo.txt index 74585d7c32..4b8ff6e034 100644 --- a/runtime/doc/todo.txt +++ b/runtime/doc/todo.txt @@ -1,4 +1,4 @@ -*todo.txt* For Vim version 7.3. Last change: 2012 Feb 22 +*todo.txt* For Vim version 7.3. Last change: 2012 Mar 07 VIM REFERENCE MANUAL by Bram Moolenaar @@ -44,9 +44,6 @@ Stack trace of crash: http://vpaste.net/GBt9S Once syntax and other runtime files have been fixed: add "set cp" to check.vim. Use a function to run both with 'cp' and 'nocp'. -Undo broken when pasting close to the last line. (Andrey Radev, 2012 Feb 14) -Patch by Christian Brabandt, 2012 Feb 14. - GTK: problem with 'L' in 'guioptions' changing the window width. (Aaron Cornelius, 2012 Feb 6) @@ -54,24 +51,14 @@ Win32: When a directory name contains an exclamation mark, completion doesn't complete the contents of the directory. No escaping for the "!"? (Jan Stocker, 2012 Jan 5) -Patch to speed up ga_grow(). (Dominique Pelle, 2012 Feb 13) - -Patch for "tab drop hoge" moving current window. (Higashi, 2012 Jan 31) -":tab drop buffer.c" always opens a new tab, also if buffer.c is already in an -open window. (Herb Sitz, 2011 Nov 17) -":tab drop filename" doesn't work nicely when "filename" is open in a window -in another tab. (Tony Mechelynck, 2009 Feb 13) - -Patch to make InsertCharPre work better. (Yasuhiro Matsumoto, 2011 Oct 21) +Issue 54: document behavior of -complete, also expands arg. -Patch to fix closed folds with "loadview". (Xavier de Gaye, 2011 Nov 25) +Syntax update problem in one buffer opened in two windows, bottom window is +not correctly updated. (Paul Harris, 2012 Feb 27) Patch to add getsid(). (Tyru, 2011 Oct 2) Do we want this? Update Oct 4. Or use expand('<sid>')? -Patch for glob() returning a list. (Christian Brabandt, 2011 Aug 24, second -one) - Win32: When the taskbar is at the top of the screen creating the tabbar causes the window to move unnecessarily. (William E. Skeith III, 2012 Jan 12) Patch: 2012 Jan 13 Needs more work (2012 Feb 2) @@ -84,12 +71,6 @@ URXVT: - Use urxvt mouse support also in xterm. Explanations: http://www.midnight-commander.org/ticket/2662 -Patch for using QuickFixCmdPre for more commands. (Marcin Szamotulski, 2012 -Feb 1, update Feb 2) - -Patch for pasting in the Ex command line is slow. (Dominique Pelle, 2012 Feb -19) - When running Vim in silent ex mode, an existing swapfile causes Vim to wait for a user action without a prompt. (Maarten Billemont, 2012 Feb 3) Do give the prompt? Quit with an error? @@ -107,6 +88,9 @@ Recognize objcpp. (Austin Ziegler, 2012 Feb 15) side effect. Patch by Kana Natsuno, 2011 Nov 12. +Using Ctrl-] in a mapping does not expand abbreviations. Patch by Christian +Brabandt, 2012 Mar 2. + Patch to fix member confusion in Lua interface. (Taro Muraoka, 2012 Jan 8) Update Jan 9. Carvalho merged the patch: New version 2012 Jan 19. @@ -137,6 +121,8 @@ Name it "CompleteFuncDone". Patch for Make_mvc.mak and Make_ming.mak for Ruby support. (Yasuhiro Matsumoto, 2012 Jan 30) +Patch to add completion for :history command. (Dominique Pelle, 2012 Feb 26) + Use a count before "v" and "V" to select that many characters or lines? (Kikyous) @@ -197,6 +183,9 @@ Syntax region with 'concealends' and a 'cchar' value, 'conceallevel' set to 2, only one of the two ends gets the cchar displayed. (Brett Stahlman, 2010 Aug 21, Ben Fritz, 2010 Sep 14) +Win32: Does building a 64 bit version with VC9 give warnings for int +conversions? (Mike Williams) + Win32: Patch to use task dialogs when available. (Sergiu Dotenco, 2011 Sep 17) New feature, requires testing. Made some remarks. @@ -251,6 +240,10 @@ Bug: Windows 7 64 bit system freezes when 'clipboard' set to "unnamed" and doing ":g/test/d". Putting every delete on the clipboard? (Robert Chan, 2011 Jun 17) +When there is a ">" in a line that "gq" wraps to the start of the next line, +then the following line will pick it up as a leader. Should get the leader +from the first line, not a wrapped line. (Matt Ackeret, 2012 Feb 27) + Using ":break" or something else that stops executing commands inside a ":finally" does not rethrow a previously uncaught exception. (ZyX, 2010 Oct 15) diff --git a/runtime/doc/undo.txt b/runtime/doc/undo.txt index b1652374cc..33eb71a91d 100644 --- a/runtime/doc/undo.txt +++ b/runtime/doc/undo.txt @@ -1,4 +1,4 @@ -*undo.txt* For Vim version 7.3. Last change: 2012 Jan 28 +*undo.txt* For Vim version 7.3. Last change: 2012 Mar 04 VIM REFERENCE MANUAL by Bram Moolenaar @@ -250,7 +250,7 @@ detect if an undo file is no longer synchronized with the file it was written for (with a hash of the file contents) and ignore it when the file was changed after the undo file was written, to prevent corruption. An undo file is also ignored if its owner differs from the owner of the edited file. Set 'verbose' -to get a message about that. +to get a message about that when opening a file. Undo files are normally saved in the same directory as the file. This can be changed with the 'undodir' option. diff --git a/runtime/filetype.vim b/runtime/filetype.vim index 6f8e2c69d6..b9773b7148 100644 --- a/runtime/filetype.vim +++ b/runtime/filetype.vim @@ -1,7 +1,7 @@ " Vim support file to detect file types " " Maintainer: Bram Moolenaar <Bram@vim.org> -" Last Change: 2012 Feb 05 +" Last Change: 2012 Feb 24 " Listen very carefully, I will say this only once if exists("did_load_filetypes") @@ -2317,6 +2317,9 @@ au BufNewFile,BufRead fglrxrc setf xml au BufNewFile,BufRead *.xlf setf xml au BufNewFile,BufRead *.xliff setf xml +" XML User Interface Language +au BufNewFile,BufRead *.xul setf xml + " X11 xmodmap (also see below) au BufNewFile,BufRead *Xmodmap setf xmodmap diff --git a/runtime/ftplugin/abaqus.vim b/runtime/ftplugin/abaqus.vim index 873b9bfaee..cbebcbfa48 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 648fca1be9..5905858896 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 2b841efcff..660dab4685 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 df607b1b1e..7fde42ebf5 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 ac02088105..3a09c3bf8b 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 3f89c72c20..4ae09f91be 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 eed5ca6ac4..6c08f6691d 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 af4e910b25..2bbc345b43 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 7c19a09aa3..870f45e07d 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 b2c1eca3fc..05be7f8b76 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 ddb40f9286..c23adc4232 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 5f1384b3e4..418da06a67 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 4f35d04c74..0ee3e8d899 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 6c7b3671ce..292cb6b166 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 9c0eb9687b..fbba863b32 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 589a600b56..dcc248c9ce 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 fc581db7c6..3454a4d694 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 242a7712c7..eadabf8831 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 1800dc8a64..6bfb3d7618 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 ed2c4f4ea3..9806318ef3 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 1d948535aa..fbfc0e5f81 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 14ab1e9ca3..77238ed001 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 f59cf122f4..93de5b90f4 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 5862d00bb7..9e0e402680 100644 --- a/runtime/ftplugin/plaintex.vim +++ b/runtime/ftplugin/plaintex.vim @@ -32,5 +32,6 @@ if exists("loaded_matchit") |