From 81af9250a7655e54e4f744f2e193ecd5655336a4 Mon Sep 17 00:00:00 2001 From: Bram Moolenaar Date: Fri, 10 Dec 2010 20:35:50 +0100 Subject: Update runtime files. --- runtime/doc/cmdline.txt | 30 +++--- runtime/doc/diff.txt | 4 +- runtime/doc/editing.txt | 4 +- runtime/doc/eval.txt | 10 +- runtime/doc/indent.txt | 3 +- runtime/doc/intro.txt | 5 +- runtime/doc/options.txt | 14 ++- runtime/doc/quickref.txt | 3 +- runtime/doc/spell.txt | 5 +- runtime/doc/syntax.txt | 6 +- runtime/doc/tags | 7 ++ runtime/doc/todo.txt | 76 ++++++++++---- runtime/doc/usr_41.txt | 3 +- runtime/ftplugin/man.vim | 6 +- runtime/optwin.vim | 4 +- runtime/plugin/matchparen.vim | 5 +- runtime/syntax/groovy.vim | 16 +-- runtime/syntax/lex.vim | 14 ++- runtime/syntax/lisp.vim | 30 +++--- runtime/syntax/logindefs.vim | 236 ++++++++++++++++++++++++++++-------------- runtime/syntax/rhelp.vim | 48 +++++---- runtime/syntax/tex.vim | 49 +++++---- runtime/syntax/vim.vim | 22 ++-- runtime/syntax/yacc.vim | 22 +++- 24 files changed, 397 insertions(+), 225 deletions(-) (limited to 'runtime') diff --git a/runtime/doc/cmdline.txt b/runtime/doc/cmdline.txt index 6e42025d28..1368dbfcbe 100644 --- a/runtime/doc/cmdline.txt +++ b/runtime/doc/cmdline.txt @@ -1,4 +1,4 @@ -*cmdline.txt* For Vim version 7.3. Last change: 2010 Sep 18 +*cmdline.txt* For Vim version 7.3. Last change: 2010 Nov 28 VIM REFERENCE MANUAL by Bram Moolenaar @@ -372,10 +372,10 @@ word before the cursor. This is available for: - Mappings: Only after a ":map" or similar command. - Variable and function names: Only after a ":if", ":call" or similar command. -When Vim was compiled with the |+cmdline_compl| feature disabled, only file -names, directories and help items can be completed. The number of help item -matches is limited (currently to 300) to avoid a long delay when there are -very many matches. +When Vim was compiled without the |+cmdline_compl| feature only file names, +directories and help items can be completed. The number of help item matches +is limited (currently to 300) to avoid a long delay when there are very many +matches. These are the commands that can be used: @@ -782,30 +782,34 @@ it, no matter how many backslashes. *:* *:* *:* ** *:* ** *:* ** *:* ** *:* ** - *E495* *E496* *E497* *E498* *E499* *E500* + *E495* *E496* *E497* *E499* *E500* Note: these are typed literally, they are not special keys! is replaced with the word under the cursor (like |star|) is replaced with the WORD under the cursor (see |WORD|) is replaced with the path name under the cursor (like what |gf| uses) - when executing autocommands, is replaced with the file name - for a file read or write - when executing autocommands, is replaced with the currently + When executing autocommands, is replaced with the file name + for a file read or write. + When executing autocommands, is replaced with the currently effective buffer number (for ":r file" and ":so file" it is the current buffer, the file being read/sourced is not in a buffer). - when executing autocommands, is replaced with the match for + When executing autocommands, is replaced with the match for which this autocommand was executed. It differs from only when the file name isn't used to match with (for FileType, Syntax and SpellFileMissing events). - when executing a ":source" command, is replaced with the - file name of the sourced file; - when executing a function, is replaced with + When executing a ":source" command, is replaced with the + file name of the sourced file. *E498* + When executing a function, is replaced with "function {function-name}"; function call nesting is indicated like this: "function {function-name1}..{function-name2}". Note that filename-modifiers are useless when is used inside a function. + When executing a ":source" command, is replaced with the + line number. *E842* + When executing a function it's the line number relative to + the start of the function. *filename-modifiers* *:_%:* *::8* *::p* *::.* *::~* *::h* *::t* *::r* *::e* *::s* *::gs* diff --git a/runtime/doc/diff.txt b/runtime/doc/diff.txt index d9dc24d520..01767f905e 100644 --- a/runtime/doc/diff.txt +++ b/runtime/doc/diff.txt @@ -1,4 +1,4 @@ -*diff.txt* For Vim version 7.3. Last change: 2010 Nov 03 +*diff.txt* For Vim version 7.3. Last change: 2010 Dec 08 VIM REFERENCE MANUAL by Bram Moolenaar @@ -375,7 +375,7 @@ to see more messages. The self-installing Vim for MS-Windows includes a diff program. If you don't have it you might want to download a diff.exe. For example from -http://jlb.twu.net/code/unixkit.php. +http://gnuwin32.sourceforge.net/packages/diffutils.htm. USING PATCHES *diff-patchexpr* diff --git a/runtime/doc/editing.txt b/runtime/doc/editing.txt index 4a651d3dd2..b03487d62e 100644 --- a/runtime/doc/editing.txt +++ b/runtime/doc/editing.txt @@ -1,4 +1,4 @@ -*editing.txt* For Vim version 7.3. Last change: 2010 Sep 18 +*editing.txt* For Vim version 7.3. Last change: 2010 Dec 08 VIM REFERENCE MANUAL by Bram Moolenaar @@ -1340,7 +1340,7 @@ Vim is able to write files encrypted, and read them back. The encrypted text cannot be read without the right key. {only available when compiled with the |+cryptv| feature} *E833* -The text in the swap file and the undo file is also encrypted. +The text in the swap file and the undo file is also encrypted. *E843* Note: The text in memory is not encrypted. A system administrator may be able to see your text while you are editing it. When filtering text with diff --git a/runtime/doc/eval.txt b/runtime/doc/eval.txt index 4f4092b8d4..43ff985aa5 100644 --- a/runtime/doc/eval.txt +++ b/runtime/doc/eval.txt @@ -1,4 +1,4 @@ -*eval.txt* For Vim version 7.3. Last change: 2010 Nov 13 +*eval.txt* For Vim version 7.3. Last change: 2010 Dec 01 VIM REFERENCE MANUAL by Bram Moolenaar @@ -2720,7 +2720,7 @@ exp({expr}) *exp()* expand({expr} [, {flag}]) *expand()* Expand wildcards and the following special keywords in {expr}. - The result is a String. + The result is a String. 'wildignorecase' applies. When there are several matches, they are separated by characters. [Note: in version 5.0 a space was used, which @@ -2741,6 +2741,7 @@ expand({expr} [, {flag}]) *expand()* autocmd buffer number (as a String!) autocmd matched name sourced script file name + sourced script file line number word under the cursor WORD under the cursor the {clientid} of the last received @@ -3434,6 +3435,7 @@ glob({expr} [, {flag}]) *glob()* 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. A name for a non-existing file is not included. @@ -5454,8 +5456,8 @@ stridx({haystack}, {needle} [, {start}]) *stridx()* {haystack} of the first occurrence of the String {needle}. If {start} is specified, the search starts at index {start}. This can be used to find a second match: > - :let comma1 = stridx(line, ",") - :let comma2 = stridx(line, ",", comma1 + 1) + :let colon1 = stridx(line, ":") + :let colon2 = stridx(line, ":", colon1 + 1) < The search is done case-sensitive. For pattern searches use |match()|. -1 is returned if the {needle} does not occur in {haystack}. diff --git a/runtime/doc/indent.txt b/runtime/doc/indent.txt index 85370f9e21..85704869a6 100644 --- a/runtime/doc/indent.txt +++ b/runtime/doc/indent.txt @@ -1,4 +1,4 @@ -*indent.txt* For Vim version 7.3. Last change: 2010 Jul 30 +*indent.txt* For Vim version 7.3. Last change: 2010 Nov 27 VIM REFERENCE MANUAL by Bram Moolenaar @@ -258,6 +258,7 @@ assume a 'shiftwidth' of 4. < bN If N != 0 Vim will align a final "break" with the case label, so that case..break looks like a sort of block. (default: 0). + When using 1, consider adding "0=break" to 'cinkeys'. cino= cino=b1 > switch (x) switch(x) diff --git a/runtime/doc/intro.txt b/runtime/doc/intro.txt index c8a32c3acb..33eab763d1 100644 --- a/runtime/doc/intro.txt +++ b/runtime/doc/intro.txt @@ -1,4 +1,4 @@ -*intro.txt* For Vim version 7.3. Last change: 2010 Nov 03 +*intro.txt* For Vim version 7.3. Last change: 2010 Dec 08 VIM REFERENCE MANUAL by Bram Moolenaar @@ -616,7 +616,6 @@ Replace -- -- -- -- Command-line *3 -- -- :start -- -- Ex :vi -- -- -- -- -- -- NA -- not possible *1 Go from Normal mode to Insert mode by giving the command "i", "I", "a", @@ -730,7 +729,7 @@ window. When the "lastline" flag is present in the 'display' option, you will not see '@' characters at the left side of window. If the last line doesn't fit completely, only the part that fits is shown, and the last three characters of -the last line are replaced with "@@@", like this: > +the last line are replaced with "@@@", like this: +-----------------------+ |first line | diff --git a/runtime/doc/options.txt b/runtime/doc/options.txt index 49149ccf22..25f6c97a77 100644 --- a/runtime/doc/options.txt +++ b/runtime/doc/options.txt @@ -1,4 +1,4 @@ -*options.txt* For Vim version 7.3. Last change: 2010 Nov 16 +*options.txt* For Vim version 7.3. Last change: 2010 Dec 08 VIM REFERENCE MANUAL by Bram Moolenaar @@ -1439,7 +1439,7 @@ A jump table for the options with a short description can be found at |Q_op|. all operations except yank. Yank shall copy the text into register '+' and also into '*' when "unnamed" is included. - Only available with the |+x11| feature. + Only available with the |+X11| feature. Availability can be checked with: > if has('unnamedplus') < @@ -2861,6 +2861,9 @@ A jump table for the options with a short description can be found at |Q_op|. file only, the option is not changed. When 'binary' is set, the value of 'fileformats' is not used. + Note that when Vim starts up with an empty buffer this option is not + use. Set 'fileformat' in your .vimrc instead. + For systems with a Dos-like (), when reading files that are ":source"ed and for vimrc files, automatic detection may be done: @@ -3218,7 +3221,8 @@ A jump table for the options with a short description can be found at |Q_op|. the internal format mechanism. The expression may be evaluated in the |sandbox|, see - |sandbox-option|. + |sandbox-option|. That stops the option from working, since changing + the buffer text is not allowed. *'fsync'* *'fs'* 'fsync' 'fs' boolean (default on) @@ -6241,7 +6245,7 @@ A jump table for the options with a short description can be found at |Q_op|. Do smart autoindenting when starting a new line. Works for C-like programs, but can also be used for other languages. 'cindent' does something like this, works better in most cases, but is more strict, - see |C-indenting|. When 'cindent' is on or 'smartindent' is set, + see |C-indenting|. When 'cindent' is on or 'indentexpr' is set, setting 'si' has no effect. 'indentexpr' is a more advanced alternative. Normally 'autoindent' should also be on when using 'smartindent'. @@ -7762,7 +7766,7 @@ A jump table for the options with a short description can be found at |Q_op|. uses another default. - *'wildignorecase* *'wic'* *'nowildignorecase* *'nowic'* + *'wildignorecase'* *'wic'* *'nowildignorecase'* *'nowic'* 'wildignorecase' 'wic' boolean (default off) global {not in Vi} diff --git a/runtime/doc/quickref.txt b/runtime/doc/quickref.txt index a3e1149738..5bf410ec1a 100644 --- a/runtime/doc/quickref.txt +++ b/runtime/doc/quickref.txt @@ -1,4 +1,4 @@ -*quickref.txt* For Vim version 7.3. Last change: 2010 Sep 14 +*quickref.txt* For Vim version 7.3. Last change: 2010 Dec 02 VIM REFERENCE MANUAL by Bram Moolenaar @@ -934,6 +934,7 @@ Short explanation of each option: *option-list* 'wildchar' 'wc' command-line character for wildcard expansion 'wildcharm' 'wcm' like 'wildchar' but also works when mapped 'wildignore' 'wig' files matching these patterns are not completed +'wildignorecase' 'wic' ignore case when completing file names 'wildmenu' 'wmnu' use menu for command line completion 'wildmode' 'wim' mode for 'wildchar' command-line expansion 'wildoptions' 'wop' specifies how command line completion is done diff --git a/runtime/doc/spell.txt b/runtime/doc/spell.txt index 3533005a0b..74aee81f4d 100644 --- a/runtime/doc/spell.txt +++ b/runtime/doc/spell.txt @@ -1,4 +1,4 @@ -*spell.txt* For Vim version 7.3. Last change: 2010 Apr 11 +*spell.txt* For Vim version 7.3. Last change: 2010 Dec 08 VIM REFERENCE MANUAL by Bram Moolenaar @@ -335,6 +335,9 @@ A spell file might not be available in the current 'encoding'. See |spell-mkspell| about how to create a spell file. Converting a spell file with "iconv" will NOT work! +Note: on VMS ".{enc}.spl" is changed to "_{enc}.spl" to avoid trouble with +filenames. + *spell-sug-file* *E781* If there is a file with exactly the same name as the ".spl" file but ending in ".sug", that file will be used for giving better suggestions. It isn't loaded diff --git a/runtime/doc/syntax.txt b/runtime/doc/syntax.txt index ae1e08def5..40a0f02363 100644 --- a/runtime/doc/syntax.txt +++ b/runtime/doc/syntax.txt @@ -1,4 +1,4 @@ -*syntax.txt* For Vim version 7.3. Last change: 2010 Oct 7 +*syntax.txt* For Vim version 7.3. Last change: 2010 Dec 08 VIM REFERENCE MANUAL by Bram Moolenaar @@ -901,8 +901,8 @@ line to your startup file: > DOCBOOK *docbk.vim* *ft-docbk-syntax* *docbook* -DOCBOOK XML *docbkxml.vim* *ft-docbkxml-syntax* -DOCBOOK SGML *docbksgml.vim* *ft-docbksgml-syntax* +DOCBOOK XML *docbkxml.vim* *ft-docbkxml-syntax* +DOCBOOK SGML *docbksgml.vim* *ft-docbksgml-syntax* There are two types of DocBook files: SGML and XML. To specify what type you are using the "b:docbk_type" variable should be set. Vim does this for you diff --git a/runtime/doc/tags b/runtime/doc/tags index c64874c70d..e5a50334aa 100644 --- a/runtime/doc/tags +++ b/runtime/doc/tags @@ -659,6 +659,8 @@ $VIMRUNTIME starting.txt /*$VIMRUNTIME* 'noweirdinvert' options.txt /*'noweirdinvert'* 'nowfh' options.txt /*'nowfh'* 'nowfw' options.txt /*'nowfw'* +'nowic' options.txt /*'nowic'* +'nowildignorecase' options.txt /*'nowildignorecase'* 'nowildmenu' options.txt /*'nowildmenu'* 'nowinfixheight' options.txt /*'nowinfixheight'* 'nowinfixwidth' options.txt /*'nowinfixwidth'* @@ -1064,10 +1066,12 @@ $VIMRUNTIME starting.txt /*$VIMRUNTIME* 'wh' options.txt /*'wh'* 'whichwrap' options.txt /*'whichwrap'* 'wi' options.txt /*'wi'* +'wic' options.txt /*'wic'* 'wig' options.txt /*'wig'* 'wildchar' options.txt /*'wildchar'* 'wildcharm' options.txt /*'wildcharm'* 'wildignore' options.txt /*'wildignore'* +'wildignorecase' options.txt /*'wildignorecase'* 'wildmenu' options.txt /*'wildmenu'* 'wildmode' options.txt /*'wildmode'* 'wildoptions' options.txt /*'wildoptions'* @@ -4219,6 +4223,9 @@ E838 netbeans.txt /*E838* E839 insert.txt /*E839* E84 windows.txt /*E84* E840 insert.txt /*E840* +E841 map.txt /*E841* +E842 cmdline.txt /*E842* +E843 editing.txt /*E843* E85 options.txt /*E85* E86 windows.txt /*E86* E87 windows.txt /*E87* diff --git a/runtime/doc/todo.txt b/runtime/doc/todo.txt index caa2fddbf1..10d144016d 100644 --- a/runtime/doc/todo.txt +++ b/runtime/doc/todo.txt @@ -1,4 +1,4 @@ -*todo.txt* For Vim version 7.3. Last change: 2010 Nov 16 +*todo.txt* For Vim version 7.3. Last change: 2010 Dec 08 VIM REFERENCE MANUAL by Bram Moolenaar @@ -30,12 +30,6 @@ be worked on, but only if you sponsor Vim development. See |sponsor|. *known-bugs* -------------------- Known bugs and current work ----------------------- -Crash when using vimgrep with an ftp file. (Christian Brabandt, 2010 Nov 5) -Crash with dragn-n-drop of file combined with netrw (Marius Gedminas, 2008 Jun -11) I can't reproduce it. It's probably caused by a handle_drop() call -in combination with autocommands that invoke a ":redraw" command. -Another valgrind output Jun 30. - 'cursorline' is displayed too short when there are concealed characters and 'list' is set, 'listchars' at default value. (Dennis Preiser, 2010 Aug 15) @@ -58,19 +52,27 @@ call append(line, "INFO ....12....18....24....30....36....42....48....54....60. Building the MingW version without clipboard but with multi-byte doesn't work. (Bill Lam, 2010 Sep 18) +When reading from stdin, don't enable signals before finishing reading? +Otherwise the program producing the text may get killed by SIGWINCH. +(Benjamin R. Haskell) Xavier: It's because reading from stdin returns -1. +Patch from Xavier de Gaye, 2010 Dec 7. More generic solution? + Bug: E685 error for func_unref(). (ZyX, 2010 Aug 5) Using ":break" or something else that stops executing commands inside a ":finally" does not rethrow a previously uncaught exception. (ZyX, 2010 Oct 15) +Vim using lots of memory when joining lines. (John Little, 2010 Dec 3) + string() can't parse back "inf" and "nan". Fix documentation or fix code? (ZyX, 2010 Aug 23) -maparg() does not show the