From 483c5d80a708a81edd96f8241c231a29e5c58a2f Mon Sep 17 00:00:00 2001 From: Bram Moolenaar Date: Wed, 20 Oct 2010 18:45:33 +0200 Subject: [PATCH] Updated runtime files and translations. --- runtime/compiler/gcc.vim | 6 +- runtime/doc/eval.txt | 31 +++--- runtime/doc/if_pyth.txt | 4 +- runtime/doc/options.txt | 40 ++++---- runtime/doc/quickfix.txt | 10 +- runtime/doc/sign.txt | 5 +- runtime/doc/todo.txt | 85 +++++++++------- runtime/doc/version7.txt | 4 +- runtime/doc/vi_diff.txt | 4 +- runtime/ftplugin/changelog.vim | 4 +- runtime/ftplugin/docbk.vim | 22 +++++ runtime/syntax/gpg.vim | 4 +- runtime/syntax/r.vim | 176 +++++++++++++++++++-------------- runtime/syntax/yaml.vim | 4 +- src/po/it.po | 2 +- src/po/sv.po | 2 +- 16 files changed, 237 insertions(+), 166 deletions(-) create mode 100644 runtime/ftplugin/docbk.vim diff --git a/runtime/compiler/gcc.vim b/runtime/compiler/gcc.vim index 776bdee292..c6c0e3f985 100644 --- a/runtime/compiler/gcc.vim +++ b/runtime/compiler/gcc.vim @@ -1,7 +1,7 @@ " Vim compiler file " Compiler: GNU C Compiler " Maintainer: Nikolai Weibull -" Latest Revision: 2010-05-30 +" Latest Revision: 2010-10-14 if exists("current_compiler") finish @@ -18,10 +18,10 @@ CompilerSet errorformat= \\"%f\"%*\\D%l:\ %m, \%-G%f:%l:\ %trror:\ (Each\ undeclared\ identifier\ is\ reported\ only\ once, \%-G%f:%l:\ %trror:\ for\ each\ function\ it\ appears\ in.), - \%f:%l:%c:\ %terror:\ %m, + \%f:%l:%c:\ %trror:\ %m, \%f:%l:%c:\ %tarning:\ %m, \%f:%l:%c:\ %m, - \%f:%l:\ %terror:\ %m, + \%f:%l:\ %trror:\ %m, \%f:%l:\ %tarning:\ %m, \%f:%l:\ %m, \\"%f\"\\,\ line\ %l%*\\D%c%*[^\ ]\ %m, diff --git a/runtime/doc/eval.txt b/runtime/doc/eval.txt index 9928f8b543..f8ac2727d5 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 Sep 29 +*eval.txt* For Vim version 7.3. Last change: 2010 Oct 18 VIM REFERENCE MANUAL by Bram Moolenaar @@ -1934,6 +1934,7 @@ synID( {lnum}, {col}, {trans}) Number syntax ID at {lnum} and {col} synIDattr( {synID}, {what} [, {mode}]) String attribute {what} of syntax ID {synID} synIDtrans( {synID}) Number translated syntax ID of {synID} +synconcealed( {lnum}, {col}) List info about concealing synstack( {lnum}, {col}) List stack of syntax IDs at {lnum} and {col} system( {expr} [, {input}]) String output of shell command/filter {expr} tabpagebuflist( [{arg}]) List list of buffer numbers in tab page @@ -5558,20 +5559,6 @@ synID({lnum}, {col}, {trans}) *synID()* :echo synIDattr(synID(line("."), col("."), 1), "name") < -synconcealed({lnum}, {col}) *synconcealed()* - The result is a List. The first item in the list is 0 if the - character at the position {lnum} and {col} is not part of a - concealable region, 1 if it is. The second item in the list is - a string. If the first item is 1, the second item contains the - text which will be displayed in place of the concealed text, - depending on the current setting of 'conceallevel'. The third - and final item in the list is a unique number representing the - specific syntax region matched. This allows detection of the - beginning of a new concealable region if there are two - consecutive regions with the same replacement character. - For an example use see $VIMRUNTIME/syntax/2html.vim . - - synIDattr({synID}, {what} [, {mode}]) *synIDattr()* The result is a String, which is the {what} attribute of syntax ID {synID}. This can be used to obtain information @@ -5612,6 +5599,20 @@ synIDtrans({synID}) *synIDtrans()* highlight the character. Highlight links given with ":highlight link" are followed. +synconcealed({lnum}, {col}) *synconcealed()* + The result is a List. The first item in the list is 0 if the + character at the position {lnum} and {col} is not part of a + concealable region, 1 if it is. The second item in the list is + a string. If the first item is 1, the second item contains the + text which will be displayed in place of the concealed text, + depending on the current setting of 'conceallevel'. The third + and final item in the list is a unique number representing the + specific syntax region matched. This allows detection of the + beginning of a new concealable region if there are two + consecutive regions with the same replacement character. + For an example use see $VIMRUNTIME/syntax/2html.vim . + + synstack({lnum}, {col}) *synstack()* Return a |List|, which is the stack of syntax items at the position {lnum} and {col} in the current window. Each item in diff --git a/runtime/doc/if_pyth.txt b/runtime/doc/if_pyth.txt index d3242399b9..51f936e35d 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: 2010 Aug 13 +*if_pyth.txt* For Vim version 7.3. Last change: 2010 Oct 20 VIM REFERENCE MANUAL by Paul Moore @@ -355,7 +355,7 @@ When Python 2 and Python 3 are both supported they must be loaded dynamically. When doing this on Linux/Unix systems and importing global symbols, this leads to a crash when the second Python version is used. So either global symbols are loaded but only one Python version is activated, or no global symbols are -loaded. The latter makes Python's "import" fail on libaries that expect the +loaded. The latter makes Python's "import" fail on libraries that expect the symbols to be provided by Vim. *E836* *E837* Vim's configuration script makes a guess for all libraries based on one diff --git a/runtime/doc/options.txt b/runtime/doc/options.txt index b5283bb3d3..63375a7a63 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 Sep 21 +*options.txt* For Vim version 7.3. Last change: 2010 Oct 20 VIM REFERENCE MANUAL by Bram Moolenaar @@ -1496,6 +1496,25 @@ A jump table for the options with a short description can be found at |Q_op|. feature} Number of screen lines to use for the command-line window. |cmdwin| + *'colorcolumn'* *'cc'* +'colorcolumn' 'cc' string (default "") + local to window + {not in Vi} + {not available when compiled without the |+syntax| + feature} + 'colorcolumn' is a comma separated list of screen columns that are + highlighted with ColorColumn |hl-ColorColumn|. Useful to align + text. Will make screen redrawing slower. + The screen column can be an absolute number, or a number preceded with + '+' or '-', which is added to or subtracted from 'textwidth'. > + + :set cc=+1 " highlight column after 'textwidth' + :set cc=+1,+2,+3 " highlight three columns after 'textwidth' + :hi ColorColumn ctermbg=lightgrey guibg=lightgrey +< + When 'textwidth' is zero then the items with '-' and '+' are not used. + A maximum of 256 columns are highlighted. + *'columns'* *'co'* *E594* 'columns' 'co' number (default 80 or terminal width) global @@ -4601,25 +4620,6 @@ A jump table for the options with a short description can be found at |Q_op|. < This option cannot be set from a |modeline| or in the |sandbox|, for security reasons. - *'colorcolumn'* *'cc'* -'colorcolumn' 'cc' string (default "") - local to window - {not in Vi} - {not available when compiled without the |+syntax| - feature} - 'colorcolumn' is a comma separated list of screen columns that are - highlighted with ColorColumn |hl-ColorColumn|. Useful to align - text. Will make screen redrawing slower. - The screen column can be an absolute number, or a number preceded with - '+' or '-', which is added to or subtracted from 'textwidth'. > - - :set cc=+1 " highlight column after 'textwidth' - :set cc=+1,+2,+3 " highlight three columns after 'textwidth' - :hi ColorColumn ctermbg=lightgrey guibg=lightgrey -< - When 'textwidth' is zero then the items with '-' and '+' are not used. - A maximum of 256 columns are highlighted. - *'matchpairs'* *'mps'* 'matchpairs' 'mps' string (default "(:),{:},[:]") local to buffer diff --git a/runtime/doc/quickfix.txt b/runtime/doc/quickfix.txt index deb475c4fc..b576c60d86 100644 --- a/runtime/doc/quickfix.txt +++ b/runtime/doc/quickfix.txt @@ -1,4 +1,4 @@ -*quickfix.txt* For Vim version 7.3. Last change: 2010 Jul 20 +*quickfix.txt* For Vim version 7.3. Last change: 2010 Oct 20 VIM REFERENCE MANUAL by Bram Moolenaar @@ -546,6 +546,14 @@ descriptors when searching many files. However, when the |:hide| command modifier is used the buffers are kept loaded. This makes following searches in the same files a lot faster. +Note that |:copen| (or |:lopen| for |:lgrep|) may be used to open a buffer +containing the search results in linked form. The |:silent| command may be +used to suppress the default full screen grep output. The |:grep!| form of +the |:grep| command doesn't jump to the first match automatically. These +commands can be combined to create a NewGrep command: > + + command! -nargs=+ NewGrep execute 'silent grep! ' | copen 42 + 5.1 using Vim's internal grep diff --git a/runtime/doc/sign.txt b/runtime/doc/sign.txt index 4f9fcd2e61..5784c9fb7b 100644 --- a/runtime/doc/sign.txt +++ b/runtime/doc/sign.txt @@ -1,4 +1,4 @@ -*sign.txt* For Vim version 7.3. Last change: 2010 May 07 +*sign.txt* For Vim version 7.3. Last change: 2010 Oct 14 VIM REFERENCE MANUAL by Gordon Prieur @@ -70,7 +70,8 @@ DEFINING A SIGN. *:sign-define* *E255* *E160* *E612* :sign define {name} {argument}... Define a new sign or set attributes for an existing sign. The {name} can either be a number (all digits) or a name - starting with a non-digit. + starting with a non-digit. Leading digits are ignored, thus + "0012", "012" and "12" are considered the same name. About 120 different signs can be defined. Accepted arguments: diff --git a/runtime/doc/todo.txt b/runtime/doc/todo.txt index d1b6c99caa..dcf33c94b2 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 Sep 29 +*todo.txt* For Vim version 7.3. Last change: 2010 Oct 20 VIM REFERENCE MANUAL by Bram Moolenaar @@ -30,21 +30,9 @@ be worked on, but only if you sponsor Vim development. See |sponsor|. *known-bugs* -------------------- Known bugs and current work ----------------------- -Cursor position wrong when 'formatoptions' contains "a". (Moshe Kamensky, 2010 -Sep 7, Gary Johnson, 2010 Sep 14) -Formatoptions cause cursor to jump. (ZyX, 2010 Aug 22) -Caused by revision 2294, "Make joining a range of lines much faster. (Milan -Vancura)" ? -Patch by Carlo Teubner, 2010 Sep 25. Test Sep 26. - 'cursorline' is displayed too short when there are concealed characters and 'list' is set, 'listchars' at default value. (Dennis Preiser, 2010 Aug 15) -Hang on slave PTY on Mac. Patch from Nikola Knezevic, 2010 Aug 29. - -Patch to fix sign type negative and memory not freed. (Xavier de Gaye, 2010 -Aug 20) - Conceal: using Tab for cchar causes problems. Should reject it. (ZyX, 2010 Aug 25) @@ -52,24 +40,14 @@ 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) -Patch for :mksession not escaping file name properly. (Peter Odding, 2010 Sep -19) - -Patch for CTRL-] in help file doing wrong escaping. (Carlo Teubner, 2010 Sep -25) - -Patch to support List and Dict in .viminfo. (Christian Brabandt, 2010 Sep 24) -Sep 26 with a test. - -Patch for :grep docs. (Britton Kerin, 2010 Aug 31) - -Patch for dynamic loading Ruby on Unix. (Jon, 2010 Aug 23) -Included, but also need a change to configure. - -Replacement R syntax file. (Jakson A. Aquino, 2010 Sep 29) - Windows keys not set properly on Windows 7? (cncyber, 2010 Aug 26) +This line hangs Vim, because of syntax HL: +call append(line, "INFO ....12....18....24....30....36....42....48....54....60....66....72....78%$") + +Patch to add v:windowid. (Christian J. Robinson, 2010 Oct 13, update by Lech +Lorens, Oct 14) + maparg() doesn't return the flags, such as ,