diff options
author | Bram Moolenaar <Bram@vim.org> | 2012-04-30 15:56:52 +0200 |
---|---|---|
committer | Bram Moolenaar <Bram@vim.org> | 2012-04-30 15:56:52 +0200 |
commit | 9a7224b5a0639c26c843c10afcafa5bf149271fd (patch) | |
tree | 9cafda4f3dd87f3ba177401248d65aa241f63ced /runtime | |
parent | e8938e507e5dbeea25accd3586cd9aca13e5bf64 (diff) |
Fixed compatible mode in most runtime files.
Diffstat (limited to 'runtime')
37 files changed, 226 insertions, 46 deletions
diff --git a/runtime/autoload/ada.vim b/runtime/autoload/ada.vim index 8f525f4866..1f8234a575 100644 --- a/runtime/autoload/ada.vim +++ b/runtime/autoload/ada.vim @@ -29,6 +29,8 @@ if version < 700 finish endif +let s:keepcpo= &cpo +set cpo&vim " Section: Constants {{{1 " @@ -619,6 +621,9 @@ lockvar g:ada#Comment lockvar! g:ada#Keywords lockvar! g:ada#Ctags_Kinds +let &cpo = s:keepcpo +unlet s:keepcpo + finish " 1}}} "------------------------------------------------------------------------------ diff --git a/runtime/compiler/cs.vim b/runtime/compiler/cs.vim index 7ba0b609fc..4cc1784678 100644 --- a/runtime/compiler/cs.vim +++ b/runtime/compiler/cs.vim @@ -2,12 +2,14 @@ " Compiler: Microsoft Visual Studio C# " Maintainer: Zhou YiChao (broken.zhou@gmail.com) " Previous Maintainer: Joseph H. Yao (hyao@sina.com) -" Last Change: 2011 Apr 21 +" Last Change: 2012 Apr 30 if exists("current_compiler") finish endif let current_compiler = "cs" +let s:keepcpo= &cpo +set cpo&vim if exists(":CompilerSet") != 2 " older Vim always used :setlocal command -nargs=* CompilerSet setlocal <args> @@ -19,3 +21,6 @@ CompilerSet errorformat+=%f(%l\\,%v):\ %t%*[^:]:\ %m, \%tarning%*[^:]:\ %m CompilerSet makeprg=csc\ % + +let &cpo = s:keepcpo +unlet s:keepcpo diff --git a/runtime/compiler/decada.vim b/runtime/compiler/decada.vim index 8e267ece13..4670bbd914 100644 --- a/runtime/compiler/decada.vim +++ b/runtime/compiler/decada.vim @@ -15,6 +15,9 @@ " Help Page: compiler-decada "------------------------------------------------------------------------------ +let s:keepcpo= &cpo +set cpo&vim + if (exists("current_compiler") && \ current_compiler == "decada") || \ version < 700 @@ -44,6 +47,9 @@ endif execute "CompilerSet makeprg=" . escape (g:decada.Make_Command, ' ') execute "CompilerSet errorformat=" . escape (g:decada.Error_Format, ' ') +let &cpo = s:keepcpo +unlet s:keepcpo + finish " 1}}} "------------------------------------------------------------------------------ diff --git a/runtime/compiler/g95.vim b/runtime/compiler/g95.vim index af8f05c8a6..ecb3212cbe 100644 --- a/runtime/compiler/g95.vim +++ b/runtime/compiler/g95.vim @@ -1,7 +1,7 @@ " Compiler: G95 " Maintainer: H Xu <xuhdev@gmail.com> " Version: 0.1.3 -" Last Change: 2011 Apr 01 +" Last Change: 2012 Apr 30 " Homepage: http://www.vim.org/scripts/script.php?script_id=3492 " https://bitbucket.org/xuhdev/compiler-g95.vim " License: Same as Vim @@ -10,6 +10,8 @@ if exists('current_compiler') finish endif let current_compiler = 'g95' +let s:keepcpo= &cpo +set cpo&vim if exists(":CompilerSet") != 2 " older Vim always used :setlocal command -nargs=* CompilerSet setlocal <args> @@ -21,3 +23,6 @@ CompilerSet errorformat= \%-Z%trror:\ %m, \%-Z%tarning\ (%n):\ %m, \%-C%.%# + +let &cpo = s:keepcpo +unlet s:keepcpo diff --git a/runtime/compiler/gfortran.vim b/runtime/compiler/gfortran.vim index 898026e358..1e4e5cf4f4 100644 --- a/runtime/compiler/gfortran.vim +++ b/runtime/compiler/gfortran.vim @@ -1,7 +1,7 @@ " Compiler: GNU Fortran Compiler " Maintainer: H Xu <xuhdev@gmail.com> " Version: 0.1.3 -" Last Change: 19 March 2011 +" Last Change: 2012 Apr 30 " Homepage: http://www.vim.org/scripts/script.php?script_id=3496 " https://bitbucket.org/xuhdev/compiler-gfortran.vim " License: Same as Vim @@ -10,6 +10,8 @@ if exists('current_compiler') finish endif let current_compiler = 'gfortran' +let s:keepcpo= &cpo +set cpo&vim if exists(":CompilerSet") != 2 " older Vim always used :setlocal command -nargs=* CompilerSet setlocal <args> @@ -20,3 +22,6 @@ CompilerSet errorformat= \%-Z%trror:\ %m, \%-Z%tarning:\ %m, \%-C%.%# + +let &cpo = s:keepcpo +unlet s:keepcpo diff --git a/runtime/compiler/gnat.vim b/runtime/compiler/gnat.vim index d7ec55b97d..3ad1eb4e3f 100644 --- a/runtime/compiler/gnat.vim +++ b/runtime/compiler/gnat.vim @@ -17,11 +17,11 @@ " Help Page: compiler-gnat "------------------------------------------------------------------------------ -if (exists("current_compiler") && - \ current_compiler == "gnat") || - \ version < 700 +if (exists("current_compiler")&& current_compiler == "gnat") || version < 700 finish endif +let s:keepcpo= &cpo +set cpo&vim let current_compiler = "gnat" @@ -62,6 +62,9 @@ endif execute "CompilerSet makeprg=" . escape (g:gnat.Get_Command('Make'), ' ') execute "CompilerSet errorformat=" . escape (g:gnat.Error_Format, ' ') +let &cpo = s:keepcpo +unlet s:keepcpo + finish " 1}}} "------------------------------------------------------------------------------ diff --git a/runtime/compiler/hp_acc.vim b/runtime/compiler/hp_acc.vim index 685bd5b136..15d5ce5f19 100644 --- a/runtime/compiler/hp_acc.vim +++ b/runtime/compiler/hp_acc.vim @@ -2,7 +2,7 @@ " Compiler: HP aCC " Maintainer: Matthias Ulrich <matthias-ulrich@web.de> " URL: http://www.subhome.de/vim/hp_acc.vim -" Last Change: 2005 Nov 19 +" Last Change: 2012 Apr 30 " " aCC --version says: "HP ANSI C++ B3910B A.03.13" " This compiler has been tested on: @@ -19,6 +19,8 @@ if exists("current_compiler") finish endif let current_compiler = "hp_acc" +let s:keepcpo= &cpo +set cpo&vim if exists(":CompilerSet") != 2 " older Vim always used :setlocal command -nargs=* CompilerSet setlocal <args> @@ -30,4 +32,7 @@ CompilerSet errorformat=%A%trror\ %n\:\ \"%f\"\\,\ line\ %l\ \#\ %m, \%Z\ \ \ \ %p^%.%#, \%-C%.%# +let &cpo = s:keepcpo +unlet s:keepcpo + " vim:ts=8:sw=4:cindent diff --git a/runtime/compiler/ifort.vim b/runtime/compiler/ifort.vim index 04763f9923..3a60d0cd12 100644 --- a/runtime/compiler/ifort.vim +++ b/runtime/compiler/ifort.vim @@ -1,7 +1,7 @@ " Compiler: Intel Fortran Compiler " Maintainer: H Xu <xuhdev@gmail.com> " Version: 0.1.1 -" Last Change: 19 March 2011 +" Last Change: 2012 Apr 30 " Homepage: http://www.vim.org/scripts/script.php?script_id=3497 " https://bitbucket.org/xuhdev/compiler-ifort.vim " License: Same as Vim @@ -10,6 +10,8 @@ if exists('current_compiler') finish endif let current_compiler = 'ifort' +let s:keepcpo= &cpo +set cpo&vim if exists(":CompilerSet") != 2 " older Vim always used :setlocal command -nargs=* CompilerSet setlocal <args> @@ -20,3 +22,6 @@ CompilerSet errorformat= \%A%f(%l):\ %tarning\ \#%n:\ %m, \%-Z%p^, \%-G%.%# + +let &cpo = s:keepcpo +unlet s:keepcpo diff --git a/runtime/compiler/intel.vim b/runtime/compiler/intel.vim index 918382646e..254d13b6d8 100644 --- a/runtime/compiler/intel.vim +++ b/runtime/compiler/intel.vim @@ -1,12 +1,14 @@ " Vim compiler file " Compiler: Intel C++ 7.1 " Maintainer: David Harrison <david_jr@users.sourceforge.net> -" Last Change: 2004 May 16 +" Last Change: 2012 Apr 30 if exists("current_compiler") finish endif let current_compiler = "intel" +let s:keepcpo= &cpo +set cpo&vim if exists(":CompilerSet") != 2 " older Vim always used :setlocal command -nargs=* CompilerSet setlocal <args> @@ -19,3 +21,6 @@ CompilerSet errorformat=%E%f(%l):\ error:\ %m, \%-Z\ \ %p^, \%-G\\s%#, \%-G%.%# + +let &cpo = s:keepcpo +unlet s:keepcpo diff --git a/runtime/compiler/irix5_c.vim b/runtime/compiler/irix5_c.vim index 87bb9e11d9..f440e74f05 100644 --- a/runtime/compiler/irix5_c.vim +++ b/runtime/compiler/irix5_c.vim @@ -1,12 +1,14 @@ " Vim compiler file " Compiler: SGI IRIX 5.3 cc " Maintainer: David Harrison <david_jr@users.sourceforge.net> -" Last Change: 2004 Mar 27 +" Last Change: 2012 Apr 30 if exists("current_compiler") finish endif let current_compiler = "irix5_c" +let s:keepcpo= &cpo +set cpo&vim if exists(":CompilerSet") != 2 " older Vim always used :setlocal command -nargs=* CompilerSet setlocal <args> @@ -19,3 +21,6 @@ CompilerSet errorformat=\%Ecfe:\ Error:\ %f\\,\ line\ %l:\ %m, \%-Z\ %p^, \-G\\s%#, \%-G%.%# + +let &cpo = s:keepcpo +unlet s:keepcpo diff --git a/runtime/compiler/irix5_cpp.vim b/runtime/compiler/irix5_cpp.vim index f5057682c3..0112dc1cbc 100644 --- a/runtime/compiler/irix5_cpp.vim +++ b/runtime/compiler/irix5_cpp.vim @@ -1,12 +1,14 @@ " Vim compiler file " Compiler: SGI IRIX 5.3 CC or NCC " Maintainer: David Harrison <david_jr@users.sourceforge.net> -" Last Change: 2004 Mar 27 +" Last Change: 2012 Apr 30 if exists("current_compiler") finish endif let current_compiler = "irix5_cpp" +let s:keepcpo= &cpo +set cpo&vim if exists(":CompilerSet") != 2 " older Vim always used :setlocal command -nargs=* CompilerSet setlocal <args> @@ -19,3 +21,6 @@ CompilerSet errorformat=%E\"%f\"\\,\ line\ %l:\ error(%n):\ , \%-Z\ \ %p%^, \%+C\ %\\{10}%.%#, \%-G%.%# + +let &cpo = s:keepcpo +unlet s:keepcpo diff --git a/runtime/compiler/mips_c.vim b/runtime/compiler/mips_c.vim index b57eac0234..a0ebfe7ba2 100644 --- a/runtime/compiler/mips_c.vim +++ b/runtime/compiler/mips_c.vim @@ -1,12 +1,14 @@ " Vim compiler file " Compiler: SGI IRIX 6.5 MIPS C (cc) " Maintainer: David Harrison <david_jr@users.sourceforge.net> -" Last Change: 2004 Mar 27 +" Last Change: 2012 Apr 30 if exists("current_compiler") finish endif let current_compiler = "mips_c" +let s:keepcpo= &cpo +set cpo&vim if exists(":CompilerSet") != 2 " older Vim always used :setlocal command -nargs=* CompilerSet setlocal <args> @@ -19,3 +21,6 @@ CompilerSet errorformat=%Ecc\-%n\ %.%#:\ ERROR\ File\ =\ %f\%\\,\ Line\ =\ %l, \%-Z\ \ %p^, \%-G\\s%#, \%-G%.%# + +let &cpo = s:keepcpo +unlet s:keepcpo diff --git a/runtime/compiler/mipspro_c89.vim b/runtime/compiler/mipspro_c89.vim index 258a80043f..20eb70d3fe 100644 --- a/runtime/compiler/mipspro_c89.vim +++ b/runtime/compiler/mipspro_c89.vim @@ -1,12 +1,14 @@ " Vim compiler file " Compiler: SGI IRIX 6.5 MIPSPro C (c89) " Maintainer: David Harrison <david_jr@users.sourceforge.net> -" Last Change: 2004 Mar 27 +" Last Change: 2012 Apr 30 if exists("current_compiler") finish endif let current_compiler = "mipspro_c89" +let s:keepcpo= &cpo +set cpo&vim if exists(":CompilerSet") != 2 " older Vim always used :setlocal command -nargs=* CompilerSet setlocal <args> @@ -20,3 +22,6 @@ CompilerSet errorformat=%Ecc\-%n\ %.%#:\ ERROR\ File\ =\ %f\%\\,\ Line\ =\ %l, \%+C\ \ %m, \%-G\\s%#, \%-G%.%# + +let &cpo = s:keepcpo +unlet s:keepcpo diff --git a/runtime/compiler/mipspro_cpp.vim b/runtime/compiler/mipspro_cpp.vim index 1f6074a103..2f43af8455 100644 --- a/runtime/compiler/mipspro_cpp.vim +++ b/runtime/compiler/mipspro_cpp.vim @@ -1,12 +1,14 @@ " Vim compiler file " Compiler: SGI IRIX 6.5 MIPSPro C++ (CC) " Maintainer: David Harrison <david_jr@users.sourceforge.net> -" Last Change: 2004 Mar 27 +" Last Change: 2012 Apr 30 if exists("current_compiler") finish endif let current_compiler = "mipspro_cpp" +let s:keepcpo= &cpo +set cpo&vim if exists(":CompilerSet") != 2 " older Vim always used :setlocal command -nargs=* CompilerSet setlocal <args> @@ -19,3 +21,6 @@ CompilerSet errorformat=%Ecc\-%n\ %.%#:\ ERROR\ File\ =\ %f\%\\,\ Line\ =\ %l, \%-Z\ \ %p^, \%-G\\s%#, \%-G%.%# + +let &cpo = s:keepcpo +unlet s:keepcpo diff --git a/runtime/compiler/tex.vim b/runtime/compiler/tex.vim index 5828a91ab9..e43be8dbd6 100644 --- a/runtime/compiler/tex.vim +++ b/runtime/compiler/tex.vim @@ -1,11 +1,13 @@ " Vim compiler file " Compiler: TeX " Maintainer: Artem Chuprina <ran@ran.pp.ru> -" Last Change: 2004 Mar 27 +" Last Change: 2012 Apr 30 if exists("current_compiler") finish endif +let s:keepcpo= &cpo +set cpo&vim if exists(":CompilerSet") != 2 " older Vim always used :setlocal command -nargs=* CompilerSet setlocal <args> @@ -30,9 +32,6 @@ else let current_compiler = 'make' endif -let s:cpo_save = &cpo -set cpo-=C - " Value errorformat are taken from vim help, see :help errorformat-LaTeX, with " addition from Srinath Avadhanula <srinath@fastmail.fm> CompilerSet errorformat=%E!\ LaTeX\ %trror:\ %m, @@ -64,5 +63,5 @@ CompilerSet errorformat=%E!\ LaTeX\ %trror:\ %m, \%+Q%*[^()])%r, \%+Q[%\\d%*[^()])%r -let &cpo = s:cpo_save -unlet s:cpo_save +let &cpo = s:keepcpo +unlet s:keepcpo diff --git a/runtime/doc/options.txt b/runtime/doc/options.txt index 1080431c2c..b5360edb33 100644 --- a/runtime/doc/options.txt +++ b/runtime/doc/options.txt @@ -1,4 +1,4 @@ -*options.txt* For Vim version 7.3. Last change: 2012 Apr 26 +*options.txt* For Vim version 7.3. Last change: 2012 Apr 28 VIM REFERENCE MANUAL by Bram Moolenaar @@ -7119,6 +7119,8 @@ A jump table for the options with a short description can be found at |Q_op|. the file should contain words with similar meaning, separated by non-keyword characters (white space is preferred). Maximum line length is 510 bytes. + To obtain a file to be used here, check out this ftp site: + ftp://ftp.ox.ac.uk/pub/wordlists/ First get the README file. To include a comma in a file name precede it with a backslash. Spaces after a comma are ignored, otherwise spaces are included in the file name. See |option-backslash| about using backslashes. diff --git a/runtime/doc/todo.txt b/runtime/doc/todo.txt index cdd74fbc47..d1df4cb277 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 Apr 26 +*todo.txt* For Vim version 7.3. Last change: 2012 Apr 30 VIM REFERENCE MANUAL by Bram Moolenaar @@ -34,8 +34,6 @@ not be repeated below, unless there is extra information. *known-bugs* -------------------- Known bugs and current work ----------------------- -Go through list of maintainers that didn't respond. (Thilo Six, Mar 19) - Go through more coverity reports. Discussion about canonicalization of Hebrew. (Ron Aaron, 2011 April 10) @@ -43,11 +41,6 @@ Discussion about canonicalization of Hebrew. (Ron Aaron, 2011 April 10) Stack trace of crash: http://vpaste.net/GBt9S (Alexandre Provencio) -Patch for IBM z/OS makefile. (Stephen Bovy, 2012 Apr 26) - -Test 77 fails if cksum uses tabs instead of spaces. (Michael Soyka, 2012 Apr -25) - 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'. @@ -63,10 +56,12 @@ Stocker, 2012 Jan 5) Patch for crash involving curwin->w_s. (Christian Brabandt, 2012 Apr 20) What is the cause? Leaks memory? Other solution? -More debug info Apr 26. +More debug info Apr 26. Patch with proper fix Apr 26. Update 28 Apr. Issue 54: document behavior of -complete, also expands arg. +Cursor on wrong line after ":copen". (John Beckett, 2012 Apr 30) + Syntax update problem in one buffer opened in two windows, bottom window is not correctly updated. (Paul Harris, 2012 Feb 27) @@ -86,6 +81,8 @@ 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? +Patch for undofile(). (Christian Brabandt, 2012 Apr 27) + Patch for: (Christian Brabandt, 2011 Aug 22) - Make it possible to enter "r<C-E>" and "r<C-Y>" (get character from line below/above). @@ -94,6 +91,9 @@ Patch for: (Christian Brabandt, 2011 Aug 24, updated patch) 8 ":sign unplace * file={filename}" should work. Also: ":sign unplace * buffer={bufnr}". So one can remove all signs for one file/buffer. +Patch for auto copy selecting to + register. (by Christian Brabant, in email +from Sergey Vakulenko, 2012 Apr 27) + Patch to add "onselected" callback for completion. (Taro Muraoka, 2011 Sep 24) Another for CompleteFuncOk. (Florian Klein, 2012 Jan 31) Name it "CompleteFuncDone". @@ -284,6 +284,10 @@ When setting a local option value from the global value, add a script ID that indicates this, so that ":verbose set" can give a hint. Check with options in the help file. +Patch for IBM z/OS makefile. (Stephen Bovy, 2012 Apr 26) +Patch for configure (Stephen Bovy, 2012 Apr 28) +Updates later. + After patch 7.3.097 still get E15. (Yukihiro Nakadaira, 2011 Jan 18) Also for another example (ZyX, 2011 Jan 24) diff --git a/runtime/ftplugin/abaqus.vim b/runtime/ftplugin/abaqus.vim index cbebcbfa48..b263d0c318 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: 2012 Mar 11 +" Last Change: 2012 Apr 30 " Only do this when not done yet for this buffer if exists("b:did_ftplugin") | finish | endif @@ -51,7 +51,7 @@ if has("gui_win32") && !exists("b:browsefilter") \ "Abaqus Results (*.dat)\t*.dat\n" . \ "Abaqus Messages (*.pre *.msg *.sta)\t*.pre;*.msg;*.sta\n" . \ "All Files (*.*)\t*.*\n" - let b:undo_ftplugin .= "|unlet b:browsefilter" + let b:undo_ftplugin .= "|unlet! b:browsefilter" endif " Define patterns for the matchit plugin @@ -62,7 +62,7 @@ if exists("loaded_matchit") && !exists("b:match_words") \ '\*assembly:\*end\s*assembly,' . \ '\*instance:\*end\s*instance,' . \ '\*step:\*end\s*step' - let b:undo_ftplugin .= "|unlet b:match_ignorecase b:match_words" + let b:undo_ftplugin .= "|unlet! b:match_ignorecase b:match_words" endif " Define keys used to move [count] keywords backward or forward. @@ -85,6 +85,13 @@ endfunction let b:undo_ftplugin .= "|unmap <buffer> [[|unmap <buffer> ]]" \ . "|unmap <buffer> <LocalLeader><LocalLeader>" +" Undo must be done in nocompatible mode for <LocalLeader>. +let b:undo_ftplugin = "let s:cpo_save = &cpoptions|" + \ . "set cpoptions&vim|" + \ . b:undo_ftplugin + \ . "|let &cpoptions = s:cpo_save" + \ . "|unlet s:cpo_save" + " Restore saved compatibility options let &cpoptions = s:cpo_save unlet s:cpo_save diff --git a/runtime/ftplugin/php.vim b/runtime/ftplugin/php.vim index 93de5b90f4..a2f8b4d8d3 100644 --- a/runtime/ftplugin/php.vim +++ b/runtime/ftplugin/php.vim @@ -8,8 +8,8 @@ if exists("b:did_ftplugin") | finish | endif " Make sure the continuation lines below do not cause problems in " compatibility mode. -let s:save_cpo = &cpo -set cpo-=C +let s:keepcpo= &cpo +set cpo&vim " Define some defaults in case the included ftplugins don't set them. let s:undo_ftplugin = "" @@ -79,5 +79,5 @@ let b:undo_ftplugin = "setlocal commentstring< include< omnifunc<" . \ s:undo_ftplugin " Restore the saved compatibility options. -let &cpo = s:save_cpo -unlet s:save_cpo +let &cpo = s:keepcpo +unlet s:keepcpo diff --git a/runtime/ftplugin/python.vim b/runtime/ftplugin/python.vim index e7c6d6b01e..2b091a1745 100644 --- a/runtime/ftplugin/python.vim +++ b/runtime/ftplugin/python.vim @@ -5,6 +5,8 @@ if exists("b:did_ftplugin") | finish | endif let b:did_ftplugin = 1 +let s:keepcpo= &cpo +set cpo&vim setlocal cinkeys-=0# setlocal indentkeys-=0# @@ -41,3 +43,6 @@ if has("gui_win32") && !exists("b:browsefilter") let b:browsefilter = "Python Files (*.py)\t*.py\n" . \ "All Files (*.*)\t*.*\n" endif + +let &cpo = s:keepcpo +unlet s:keepcpo diff --git a/runtime/indent/ada.vim b/runtime/indent/ada.vim index a9b461ccc5..c7f8864362 100644 --- a/runtime/indent/ada.vim +++ b/runtime/indent/ada.vim @@ -28,6 +28,8 @@ if exists("b:did_indent") || version < 700 finish endif +let s:keepcpo= &cpo +set cpo&vim let b:did_indent = 45 @@ -292,6 +294,9 @@ function GetAdaIndent() return ind endfunction GetAdaIndent +let &cpo = s:keepcpo +unlet s:keepcpo + finish " 1}}} "------------------------------------------------------------------------------ diff --git a/runtime/indent/python.vim b/runtime/indent/python.vim index 0c04e81105..838865f87f 100644 --- a/runtime/indent/python.vim +++ b/runtime/indent/python.vim @@ -2,13 +2,15 @@ " Language: Python " Maintainer: Bram Moolenaar <Bram@vim.org> " Original Author: David Bustos <bustos@caltech.edu> -" Last Change: 2006 Jun 18 +" Last Change: 2012 Apr 30 " Only load this indent file when no other was loaded. if exists("b:did_indent") finish endif let b:did_indent = 1 +let s:keepcpo= &cpo +set cpo&vim " Some preliminary settings setlocal nolisp " Make sure lisp indenting doesn't supersede us @@ -190,4 +192,7 @@ function GetPythonIndent(lnum) endfunction +let &cpo = s:keepcpo +unlet s:keepcpo + " vim:sw=2 diff --git a/runtime/lang/menu_af_af.latin1.vim b/runtime/lang/menu_af_af.latin1.vim index b32e8e989d..7b16b0fcfb 100644 --- a/runtime/lang/menu_af_af.latin1.vim +++ b/runtime/lang/menu_af_af.latin1.vim @@ -1,12 +1,14 @@ " Menu Translations: Afrikaas " Maintainer: Danie Roux <droux@tuks.co.za> -" Last Change: 2003 Mar 30 +" Last Change: 2012 Apr 30 " Quit when menu translations have already been done. if exists("did_menu_trans") finish endif let did_menu_trans = 1 +let s:keepcpo= &cpo +set cpo&vim " The translations below are in latin1, but they work for cp1252 and " iso-8859-15 without conversion as well. @@ -150,3 +152,6 @@ menutrans o&ff\ (this\ file) &Af\ (die\ leêr) menutrans Co&lor\ test Toets\ die\ &kleure menutrans &Highlight\ test Toets\ die\ verligting menutrans &Convert\ to\ HTML Verwissel\ na\ HTML + +let s:keepcpo= &cpo +set cpo&vim diff --git a/runtime/syntax/ada.vim b/runtime/syntax/ada.vim index 4f04bd0218..c9d2b06e18 100644 --- a/runtime/syntax/ada.vim +++ b/runtime/syntax/ada.vim @@ -32,6 +32,8 @@ if exists("b:current_syntax") || version < 700 finish endif +let s:keepcpo= &cpo +set cpo&vim let b:current_syntax = "ada" @@ -352,6 +354,9 @@ endif " this speeds things up greatly. syntax sync minlines=1 maxlines=1 +let &cpo = s:keepcpo +unlet s:keepcpo + finish " 1}}} "------------------------------------------------------------------------------ diff --git a/runtime/syntax/autoit.vim b/runtime/syntax/autoit.vim index 47210f55b4..1b9ab7458e 100644 --- a/runtime/syntax/autoit.vim +++ b/runtime/syntax/autoit.vim @@ -6,6 +6,15 @@ " Script URL: http://www.vim.org/scripts/script.php?script_id=1239 " ChangeLog: Please visit the script URL for detailed change information +" Quit when a syntax file was already loaded. +if exists("b:current_syntax") + finish +endif +let s:keepcpo= &cpo +set cpo&vim + +let b:current_syntax = "autoit" + " AutoIt is not case dependent syn case ignore @@ -1108,4 +1117,8 @@ hi def link autoitOption Type hi def link autoitStyle Type hi def link autoitConst Type hi def link autoitSend Type + syn sync minlines=50 + +let &cpo = s:keepcpo +unlet s:keepcpo |