mirror of
https://github.com/vim/vim.git
synced 2025-07-04 23:07:33 -04:00
Updated runtime files.
This commit is contained in:
Bram Moolenaar
parent
10315b1201
commit
14b6945e27
@ -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)
|
||||
|
||||
44
runtime/compiler/ocaml.vim
Normal file
44
runtime/compiler/ocaml.vim
Normal file
@ -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
|
||||
@ -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
|
||||
|
||||
@ -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-<buffer>|) 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 <buffer> \a :echo "Local \a"<CR>
|
||||
:map \abc :echo "Global \abc"<CR>
|
||||
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 <nowait>, even if a longer mapping
|
||||
has the same prefix. For example, given the following two mappings: >
|
||||
:map <buffer> <nowait> \a :echo "Local \a"<CR>
|
||||
:map \abc :echo "Global \abc"<CR>
|
||||
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:
|
||||
|
||||
@ -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 (<Space> or <Tab>)
|
||||
{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 (<Space> or <Tab>)
|
||||
{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.
|
||||
|
||||
@ -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
|
||||
|
||||
@ -2420,6 +2420,7 @@ $VIMRUNTIME starting.txt /*$VIMRUNTIME*
|
||||
:map! map.txt /*:map!*
|
||||
:map-<buffer> map.txt /*:map-<buffer>*
|
||||
:map-<expr> map.txt /*:map-<expr>*
|
||||
:map-<nowait> map.txt /*:map-<nowait>*
|
||||
:map-<script> map.txt /*:map-<script>*
|
||||
:map-<silent> map.txt /*:map-<silent>*
|
||||
:map-<special> map.txt /*:map-<special>*
|
||||
@ -2430,6 +2431,7 @@ $VIMRUNTIME starting.txt /*$VIMRUNTIME*
|
||||
:map-expression map.txt /*:map-expression*
|
||||
:map-local map.txt /*:map-local*
|
||||
:map-modes map.txt /*:map-modes*
|
||||
:map-nowait map.txt /*:map-nowait*
|
||||
:map-operator map.txt /*:map-operator*
|
||||
:map-script map.txt /*:map-script*
|
||||
:map-silent map.txt /*:map-silent*
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
*todo.txt* For Vim version 7.3. Last change: 2013 Jun 27
|
||||
*todo.txt* For Vim version 7.3. Last change: 2013 Jun 29
|
||||
|
||||
|
||||
VIM REFERENCE MANUAL by Bram Moolenaar
|
||||
@ -36,57 +36,40 @@ not be repeated below, unless there is extra information.
|
||||
|
||||
--- Python interface ---
|
||||
|
||||
Breaks the tests
|
||||
Problem: Python SystemExit exception is not handled properly.
|
||||
Solution: Catch the exception and give an error. (Yasuhiro Matsumoto)
|
||||
Files: runtime/doc/if_pyth.txt, src/if_py_both.h, src/if_python.c,
|
||||
src/if_python3.c
|
||||
|
||||
Python: ":py raw_input('prompt')" doesn't work. (Manu Hack)
|
||||
|
||||
Win32: The Python interface only works with one version of Python, selected at
|
||||
compile time. Can this be made to work with version 2.1 and 2.2 dynamically?
|
||||
|
||||
Python: Be able to define a Python function that can be called directly from
|
||||
Vim script. Requires converting the arguments and return value, like with
|
||||
vim.bindeval().
|
||||
|
||||
--- bug fixes ---
|
||||
|
||||
Suggestion to remove __QNXNTO__ in gui.c. (Sean Boudreau, 2013 Jun 7)
|
||||
9. Patch to fix "gn" on single character matches. (Christian Brabandt, 2013
|
||||
Jun 2)
|
||||
|
||||
Combining characters are not used when executing a register with :@w.
|
||||
(William Fugh, 2013 Apr 5, more info from Ben Fritz)
|
||||
Patch by Christian Brabandt, 2013 Apr 6. Second one.
|
||||
8. Patch for cscope connection (Narendran, 2013 Jun 10)
|
||||
|
||||
MS-Windows ACL support doesn't work well. Patch from Ken Takata, 2012 Aug 29.
|
||||
Update Aug 31.
|
||||
Another patch for MingW, 2012 Dec 29.
|
||||
|
||||
Bug in completion menu. (Olivier Teuliere, 2013 Feb 15)
|
||||
Patch by Christian Brabandt, Feb 16.
|
||||
|
||||
Issue 134: pasting in visual selection in empty buffer.
|
||||
Patch by Christian Brabandt, 2013 May 22.
|
||||
|
||||
Patch to fix "gn" on single character matches. (Christian Brabandt, 2013 Jun
|
||||
2)
|
||||
|
||||
Patch for cscope connection (Narendran, 2013 Jun 10)
|
||||
|
||||
'cursorline' is drawn incorrectly in diff mode. Patch by Christian Brabandt,
|
||||
7. 'cursorline' is drawn incorrectly in diff mode. Patch by Christian Brabandt,
|
||||
2012 Apr 2.
|
||||
|
||||
When someone does a silly thing such as setting rows and columns to 65535,
|
||||
6. When someone does a silly thing such as setting rows and columns to 65535,
|
||||
handle the out-of-memory and set them to sane values? (jimmywang, 2013 May 17)
|
||||
|
||||
InsertEnter doesn't prevent the cursor from moving when it goes to another
|
||||
5. InsertEnter doesn't prevent the cursor from moving when it goes to another
|
||||
line.
|
||||
|
||||
":diffoff" does not restore options from before starting diff mode.
|
||||
4. ":diffoff" does not restore options from before starting diff mode.
|
||||
Patch by Christian Brabandt, 2013 May 26.
|
||||
|
||||
Can't use multi-byte fill character in custom status line.
|
||||
3. Can't use multi-byte fill character in custom status line.
|
||||
Patch by Christian Wellenbrock, 2013 Jun 2. Update Jun 3 (second one).
|
||||
|
||||
Patch to fix glob() and globpath() with escaped special characters.
|
||||
2. Patch to fix glob() and globpath() with escaped special characters.
|
||||
(Adnan Zafar, 2013 Jun 2, tests Jun 3)
|
||||
|
||||
Bug in findfile() directory matching. (Markus Braun Ben Fritz, 2013 Jun 20)
|
||||
1. Bug in findfile() directory matching. (Markus Braun Ben Fritz, 2013 Jun 20)
|
||||
Patch by Christian Brabandt (2013 Jun 22)
|
||||
|
||||
---- Fixes to be included before 7.4 above, less important stuff below ----
|
||||
@ -216,6 +199,13 @@ Problem with refresh:always in completion. (Tyler Wade, 2013 Mar 17)
|
||||
b:undo_ftplugin cannot call a script-local function. (Boris Danilov, 2013 Jan
|
||||
7)
|
||||
|
||||
Win32: The Python interface only works with one version of Python, selected at
|
||||
compile time. Can this be made to work with version 2.1 and 2.2 dynamically?
|
||||
|
||||
Python: Be able to define a Python function that can be called directly from
|
||||
Vim script. Requires converting the arguments and return value, like with
|
||||
vim.bindeval().
|
||||
|
||||
Patch for :tabcloseleft, after closing a tab go to left tab. (William Bowers,
|
||||
2012 Aug 4)
|
||||
|
||||
|
||||
@ -13,6 +13,11 @@
|
||||
" (Pierre Vittet)
|
||||
" 2010 Jul 10 - Bugfix, thanks to Pat Rondon
|
||||
" 2008 Jul 17 - Bugfix related to fnameescape (VA)
|
||||
" 2013 Jul - moving errorformat into compiler/ocaml.vim Marc Weber
|
||||
"
|
||||
" Marc Weber's comment: This file may contain a lot of (very custom) stuff
|
||||
" which eventually should be moved somewhere else ..
|
||||
"
|
||||
|
||||
if exists("b:did_ftplugin")
|
||||
finish
|
||||
@ -33,19 +38,6 @@ endif
|
||||
" Error handling -- helps moving where the compiler wants you to go
|
||||
let s:cposet=&cpoptions
|
||||
set cpo&vim
|
||||
setlocal efm=
|
||||
\%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
|
||||
|
||||
" Add mappings, unless the user didn't want this.
|
||||
if !exists("no_plugin_maps") && !exists("no_ocaml_maps")
|
||||
|
||||
@ -4,9 +4,13 @@
|
||||
" Mike Leary <leary@nwlink.com>
|
||||
" Markus Mottl <markus.mottl@gmail.com>
|
||||
" URL: http://www.ocaml.info/vim/indent/ocaml.vim
|
||||
" Last Change: 2010 Sep 04 - Added an indentation improvement by Mark Weber
|
||||
" Last Change: 2013 Jun 29
|
||||
" 2005 Jun 25 - Fixed multiple bugs due to 'else\nreturn ind' working
|
||||
" 2005 May 09 - Added an option to not indent OCaml-indents specially (MM)
|
||||
" 2013 June - commented textwidth (Marc Weber)
|
||||
"
|
||||
" Marc Weber's comment: This file may contain a lot of (very custom) stuff
|
||||
" which eventually should be moved somewhere else ..
|
||||
|
||||
" Only load this indent file when no other was loaded.
|
||||
if exists("b:did_indent")
|
||||
@ -19,7 +23,9 @@ setlocal indentexpr=GetOCamlIndent()
|
||||
setlocal indentkeys+=0=and,0=class,0=constraint,0=done,0=else,0=end,0=exception,0=external,0=if,0=in,0=include,0=inherit,0=initializer,0=let,0=method,0=open,0=then,0=type,0=val,0=with,0;;,0>\],0\|\],0>},0\|,0},0\],0)
|
||||
setlocal nolisp
|
||||
setlocal nosmartindent
|
||||
setlocal textwidth=80
|
||||
|
||||
" At least Marc Weber and Markus Mottl do not like this:
|
||||
" setlocal textwidth=80
|
||||
|
||||
" Comment formatting
|
||||
if !exists("no_ocaml_comments")
|
||||
|
||||
@ -1,7 +1,7 @@
|
||||
" These commands create the option window.
|
||||
"
|
||||
" Maintainer: Bram Moolenaar <Bram@vim.org>
|
||||
" Last Change: 2013 May 20
|
||||
" Last Change: 2013 Jun 29
|
||||
|
||||
" If there already is an option window, jump to that one.
|
||||
if bufwinnr("option-window") > 0
|
||||
@ -1198,6 +1198,10 @@ call <SID>OptionL("ims")
|
||||
if has("xim")
|
||||
call append("$", "imcmdline\twhen set always use IM when starting to edit a command line")
|
||||
call <SID>BinOptionG("imc", &imc)
|
||||
call append("$", "imstatusfunc\tfunction to obtain IME status")
|
||||
call <SID>OptionG("imsf", &imsf)
|
||||
call append("$", "imactivatefunc\tfunction to enable/disable IME")
|
||||
call <SID>OptionG("imaf", &imaf)
|
||||
endif
|
||||
|
||||
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user