From: Bram Moolenaar Date: Sat, 29 Jun 2013 21:05:20 +0000 (+0200) Subject: Updated runtime files. X-Git-Tag: v7.3.1271~1 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=14b6945e27ca175a42550a6a887874303313c19e;p=vim Updated runtime files. --- diff --git a/runtime/autoload/xmlcomplete.vim b/runtime/autoload/xmlcomplete.vim index 37f9bb413..4c1ac4f6b 100644 --- a/runtime/autoload/xmlcomplete.vim +++ b/runtime/autoload/xmlcomplete.vim @@ -1,7 +1,7 @@ " Vim completion script " Language: XML " Maintainer: Mikolaj Machowski ( mikmach AT wp DOT pl ) -" Last Change: 2006 Aug 15 +" Last Change: 2013 Jun 29 " Version: 1.9 " " Changelog: @@ -475,12 +475,12 @@ function! s:InCommentAt(line, col) endfunction function! s:SetKeywords() - let g:IsKeywordBak=&iskeyword - let &iskeyword='33-255' + let s:IsKeywordBak=&l:iskeyword + let &l:iskeyword='33-255' endfunction function! s:RestoreKeywords() - let &iskeyword=g:IsKeywordBak + let &l:iskeyword=s:IsKeywordBak endfunction function! s:Push(el, sname) diff --git a/runtime/compiler/ocaml.vim b/runtime/compiler/ocaml.vim new file mode 100644 index 000000000..da15bce8f --- /dev/null +++ b/runtime/compiler/ocaml.vim @@ -0,0 +1,44 @@ +" Vim Compiler File +" Compiler: ocaml +" Maintainer: See ftplugin/ocaml.vim (?) +" Last Change: June 2013 by Marc Weber +" +" Marc Weber's comments: +" Setting makeprg doesn't make sense, because there is ocamlc, ocamlopt, +" ocamake and whatnot. So which one to use? +" +" This error format was moved from ftplugin/ocaml.vim to this file, +" because ftplugin is the wrong file to set an error format +" and the error format itself is annoying because it joins many lines in this +" error case: +" +" Error: The implementation foo.ml does not match the interface foo.cmi: +" Modules do not match case. +" +" So having it here makes people opt-in + + +if exists("current_compiler") + finish +endif +let current_compiler = "ocaml" + +let s:cpo_save = &cpo +set cpo&vim + +CompilerSet errorformat = + \%EFile\ \"%f\"\\,\ line\ %l\\,\ characters\ %c-%*\\d:, + \%EFile\ \"%f\"\\,\ line\ %l\\,\ character\ %c:%m, + \%+EReference\ to\ unbound\ regexp\ name\ %m, + \%Eocamlyacc:\ e\ -\ line\ %l\ of\ \"%f\"\\,\ %m, + \%Wocamlyacc:\ w\ -\ %m, + \%-Zmake%.%#, + \%C%m, + \%D%*\\a[%*\\d]:\ Entering\ directory\ `%f', + \%X%*\\a[%*\\d]:\ Leaving\ directory\ `%f', + \%D%*\\a:\ Entering\ directory\ `%f', + \%X%*\\a:\ Leaving\ directory\ `%f', + \%DMaking\ %*\\a\ in\ %f + +let &cpo = s:cpo_save +unlet s:cpo_save diff --git a/runtime/doc/if_pyth.txt b/runtime/doc/if_pyth.txt index 53203311c..055a5372d 100644 --- a/runtime/doc/if_pyth.txt +++ b/runtime/doc/if_pyth.txt @@ -1,4 +1,4 @@ -*if_pyth.txt* For Vim version 7.3. Last change: 2013 Jun 02 +*if_pyth.txt* For Vim version 7.3. Last change: 2013 Jun 28 VIM REFERENCE MANUAL by Paul Moore diff --git a/runtime/doc/map.txt b/runtime/doc/map.txt index c08ecd951..b7abdba5f 100644 --- a/runtime/doc/map.txt +++ b/runtime/doc/map.txt @@ -1,4 +1,4 @@ -*map.txt* For Vim version 7.3. Last change: 2013 Jun 12 +*map.txt* For Vim version 7.3. Last change: 2013 Jun 29 VIM REFERENCE MANUAL by Bram Moolenaar @@ -669,13 +669,12 @@ might want to set the 'ttimeout' option. Buffer-local mappings (defined using |:map-|) take precedence over global mappings. When a buffer-local mapping is the same as a global mapping, Vim will use the buffer-local mapping. In addition, Vim will use a complete -buffer-local mapping immediately, even if a longer global mapping has the -buffer-local mapping as a prefix. For example, given the following two -mappings: > - :map \a :echo "Local \a" - :map \abc :echo "Global \abc" -The buffer-local mapping \a will be used immediately. Vim will not wait for -more characters to see if the user might be typing \abc. +mapping immediately if it was defined with , even if a longer mapping +has the same prefix. For example, given the following two mappings: > + :map \a :echo "Local \a" + :map \abc :echo "Global \abc" +When typing \a the buffer-local mapping will be used immediately. Vim will +not wait for more characters to see if the user might be typing \abc. *map-keys-fails* There are situations where key codes might not be recognized: diff --git a/runtime/doc/options.txt b/runtime/doc/options.txt index 535f51842..03a29a425 100644 --- a/runtime/doc/options.txt +++ b/runtime/doc/options.txt @@ -1,4 +1,4 @@ -*options.txt* For Vim version 7.3. Last change: 2013 Jun 26 +*options.txt* For Vim version 7.3. Last change: 2013 Jun 29 VIM REFERENCE MANUAL by Bram Moolenaar @@ -480,18 +480,19 @@ to set options automatically for one or more files: *modeline* *vim:* *vi:* *ex:* *E520* There are two forms of modelines. The first form: - [text]{white}{vi:|vim:|Vim:|ex:}[white]{options} + [text]{white}{vi:|vim:|ex:}[white]{options} [text] any text or empty {white} at least one blank character ( or ) -{vi:|vim:|Vim:|ex:} the string "vi:", "vim:", "Vim:" or "ex:" +{vi:|vim:|ex:} the string "vi:", "vim:" or "ex:" [white] optional white space {options} a list of option settings, separated with white space or ':', where each part between ':' is the argument for a ":set" command (can be empty) -Example: +Examples: vi:noai:sw=3 ts=6 ~ + vim: tw=77 ~ The second form (this is compatible with some versions of Vi): @@ -501,14 +502,16 @@ The second form (this is compatible with some versions of Vi): {white} at least one blank character ( or ) {vi:|vim:|Vim:|ex:} the string "vi:", "vim:", "Vim:" or "ex:" [white] optional white space -se[t] the string "set " or "se " (note the space) +se[t] the string "set " or "se " (note the space); When + "Vim" is used it must be "set". {options} a list of options, separated with white space, which is the argument for a ":set" command : a colon [text] any text or empty -Example: +Examples: /* vim: set ai tw=75: */ ~ + /* Vim: set ai tw=75: */ ~ The white space before {vi:|vim:|Vim:|ex:} is required. This minimizes the chance that a normal word like "lex:" is caught. There is one exception: @@ -6751,7 +6754,8 @@ A jump table for the options with a short description can be found at |Q_op|. V N Virtual column number as -{num}. Not displayed if equal to 'c'. p N Percentage through file in lines as in |CTRL-G|. P S Percentage through file of displayed window. This is like the - percentage described for 'ruler'. Always 3 in length. + percentage described for 'ruler'. Always 3 in length, unless + translated. a S Argument list status as in default title. ({current} of {max}) Empty if the argument file count is zero or one. { NF Evaluate expression between '%{' and '}' and substitute result. diff --git a/runtime/doc/quickref.txt b/runtime/doc/quickref.txt index ebb87cd9c..8dcf3298f 100644 --- a/runtime/doc/quickref.txt +++ b/runtime/doc/quickref.txt @@ -1,4 +1,4 @@ -*quickref.txt* For Vim version 7.3. Last change: 2013 May 20 +*quickref.txt* For Vim version 7.3. Last change: 2013 Jun 29 VIM REFERENCE MANUAL by Bram Moolenaar @@ -738,10 +738,12 @@ Short explanation of each option: *option-list* 'iconstring' string to use for the Vim icon text 'ignorecase' 'ic' ignore case in search patterns 'imactivatekey' 'imak' key that activates the X input method +'imactivatefunc' 'imaf' function to enable/disable the X input method 'imcmdline' 'imc' use IM when starting to edit a command line 'imdisable' 'imd' do not use the IM in any mode 'iminsert' 'imi' use :lmap or IM in Insert mode 'imsearch' 'ims' use :lmap or IM when typing a search pattern +'imstatusfunc' 'imsf' function to obtain X input method status 'include' 'inc' pattern to be used to find an include file 'includeexpr' 'inex' expression used to process an include line 'incsearch' 'is' highlight match while typing search pattern diff --git a/runtime/doc/tags b/runtime/doc/tags index eafb33154..16def1b8e 100644 --- a/runtime/doc/tags +++ b/runtime/doc/tags @@ -2420,6 +2420,7 @@ $VIMRUNTIME starting.txt /*$VIMRUNTIME* :map! map.txt /*:map!* :map- map.txt /*:map-* :map- map.txt /*:map-* +:map- map.txt /*:map-* :map-