diff options
author | Bram Moolenaar <Bram@vim.org> | 2006-03-01 22:09:21 +0000 |
---|---|---|
committer | Bram Moolenaar <Bram@vim.org> | 2006-03-01 22:09:21 +0000 |
commit | fd2ac767ebb66adcb7ca85955f5fd40704475595 (patch) | |
tree | 16e61ca0dbcc0ffeb10a3fb5072842144ca9f89d /runtime | |
parent | e1438bb8d0b7a48f712458e68755ab8b66d92ace (diff) |
updated for version 7.0211
Diffstat (limited to 'runtime')
-rw-r--r-- | runtime/doc/options.txt | 24 | ||||
-rw-r--r-- | runtime/doc/pattern.txt | 33 | ||||
-rw-r--r-- | runtime/doc/pi_paren.txt | 6 | ||||
-rw-r--r-- | runtime/doc/spell.txt | 47 | ||||
-rw-r--r-- | runtime/doc/starting.txt | 9 | ||||
-rw-r--r-- | runtime/doc/syntax.txt | 8 | ||||
-rw-r--r-- | runtime/doc/tags | 4 | ||||
-rw-r--r-- | runtime/doc/tips.txt | 4 | ||||
-rw-r--r-- | runtime/doc/windows.txt | 9 | ||||
-rw-r--r-- | runtime/filetype.vim | 5 | ||||
-rw-r--r-- | runtime/syntax/tex.vim | 13 |
11 files changed, 91 insertions, 71 deletions
diff --git a/runtime/doc/options.txt b/runtime/doc/options.txt index 72ab3e3d9a..9483f0d717 100644 --- a/runtime/doc/options.txt +++ b/runtime/doc/options.txt @@ -1,4 +1,4 @@ -*options.txt* For Vim version 7.0aa. Last change: 2006 Feb 28 +*options.txt* For Vim version 7.0aa. Last change: 2006 Mar 01 VIM REFERENCE MANUAL by Bram Moolenaar @@ -4012,8 +4012,8 @@ A jump table for the options with a short description can be found at |Q_op|. specified with multi-byte characters (e.g., UTF-8), but only the lower 8 bits of each character will be used. - Example (for Greek): *greek* > - :set langmap=A,B,C,D,E,F,G,H,I,J,K,L,M,N,O,P,QQ,R,S,T,U,V,WW,X,Y,Z,a,b,c,d,e,f,g,h,i,j,k,l,m,n,o,p,qq,r,s,t,u,v,w,x,y,z + Example (for Greek, in UTF-8): *greek* > + :set langmap=ΑA,ΒB,ΨC,ΔD,ΕE,ΦF,ΓG,ΗH,ΙI,ΞJ,ΚK,ΛL,ΜM,ΝN,ΟO,ΠP,QQ,ΡR,ΣS,ΤT,ΘU,ΩV,WW,ΧX,ΥY,ΖZ,αa,βb,ψc,δd,εe,φf,γg,ηh,ιi,ξj,κk,λl,μm,νn,οo,πp,qq,ρr,σs,τt,θu,ωv,ςw,χx,υy,ζz < Example (exchanges meaning of z and y for commands): > :set langmap=zy,yz,ZY,YZ < @@ -5691,7 +5691,9 @@ A jump table for the options with a short description can be found at |Q_op|. The 'matchpairs' option can be used to specify the characters to show matches for. 'rightleft' and 'revins' are used to look for opposite matches. - Note: For the use of the short form parental guidance is advised. + Also see the matchparen plugin for highlighting the match when moving + around |pi_paren.txt|. + Note: Use of the short form is rated PG. *'showmode'* *'smd'* *'noshowmode'* *'nosmd'* 'showmode' 'smd' boolean (Vim default: on, Vi default: off) @@ -6291,7 +6293,7 @@ A jump table for the options with a short description can be found at |Q_op|. 'S' flag in 'cpoptions'. Only normal file name characters can be used, "/\*?[|<>" are illegal. - *'tabline'* *'tal'* + *'tabline'* *'tal'* 'tabline' 'tal' string (default empty) global {not in Vi} @@ -6315,7 +6317,17 @@ A jump table for the options with a short description can be found at |Q_op|. are invisible and you can't jump to their windows. - *'tabstop'* *'ts'* + *'tabpagemax'* *'tpm'* +'tabpagemax' 'tpm' number (default 10) + global + {not in Vi} + {not available when compiled without the +windows + feature} + Maximum number of tab pages to be opened by the |-p| command line + argument or the ":tab all" command. |tabpage| + + + *'tabstop'* *'ts'* 'tabstop' 'ts' number (default 8) local to buffer Number of spaces that a <Tab> in the file counts for. Also see diff --git a/runtime/doc/pattern.txt b/runtime/doc/pattern.txt index 2a19909084..11a988ede6 100644 --- a/runtime/doc/pattern.txt +++ b/runtime/doc/pattern.txt @@ -1,4 +1,4 @@ -*pattern.txt* For Vim version 7.0aa. Last change: 2006 Feb 14 +*pattern.txt* For Vim version 7.0aa. Last change: 2006 Mar 01 VIM REFERENCE MANUAL by Bram Moolenaar @@ -1191,14 +1191,23 @@ Finally, these constructs are unique to Perl: < Instead of // any character can be used to mark the start and end of the {pattern}. Watch out for using special characters, such as '"' and '|'. + {group} must exist at the moment this command is executed. - The match overrides the 'hlsearch' highlighting. - 'ignorecase' does not apply, use |/\c| in the pattern to - ignore case. Otherwise case is not ignored. + + The {group} highlighting still applies when a character is + to be highlighted for 'hlsearch'. + Note that highlighting the last used search pattern with 'hlsearch' is used in all windows, while the pattern defined with ":match" only exists in the current window. It is kept when switching to another buffer. + + The |matchparen| plugin uses match highlighting, thus will + disable your ":match" command as soon as you move to a paren. + + 'ignorecase' does not apply, use |/\c| in the pattern to + ignore case. Otherwise case is not ignored. + Another example, which highlights all characters in virtual column 72 and more: > :highlight rightMargin term=bold ctermfg=blue guifg=blue @@ -1213,4 +1222,20 @@ Finally, these constructs are unique to Perl: :mat[ch] none Clear a previously defined match pattern. + +:2mat[ch] {group} /{pattern}/ +:2mat[ch] +:2mat[ch] none +:3mat[ch] {group} /{pattern}/ +:3mat[ch] +:3mat[ch] none + Just like |:match| above, but set a separate match. Thus + there can be three matches active at the same time. The match + with the lowest number has priority if several match at the + same position. + The ":3match" command is used by the |matchparen| plugin. You + are suggested to use ":match" for manual matching and + ":2match" for another plugin. + + vim:tw=78:ts=8:ft=help:norl: diff --git a/runtime/doc/pi_paren.txt b/runtime/doc/pi_paren.txt index d1733c6c7d..b8cf4dcf7f 100644 --- a/runtime/doc/pi_paren.txt +++ b/runtime/doc/pi_paren.txt @@ -1,4 +1,4 @@ -*pi_paren.txt* For Vim version 7.0aa. Last change: 2006 Feb 27 +*pi_paren.txt* For Vim version 7.0aa. Last change: 2006 Mar 01 VIM REFERENCE MANUAL by Bram Moolenaar @@ -23,10 +23,10 @@ And to enable it again: > :DoMatchParen -The highlighting used is ParenMatch. You can specify different colors with +The highlighting used is MatchParen. You can specify different colors with the ":highlight" command. Example: > - :hi ParenMatch ctermbg=blue guibg=lightblue + :hi MatchParen ctermbg=blue guibg=lightblue The characters to be matched come from the 'matchpairs' option. You can change the value to highlight different matches. Note that not everything is diff --git a/runtime/doc/spell.txt b/runtime/doc/spell.txt index 43d6fe39ac..dc0ded005d 100644 --- a/runtime/doc/spell.txt +++ b/runtime/doc/spell.txt @@ -1,4 +1,4 @@ -*spell.txt* For Vim version 7.0aa. Last change: 2006 Feb 01 +*spell.txt* For Vim version 7.0aa. Last change: 2006 Mar 01 VIM REFERENCE MANUAL by Bram Moolenaar @@ -1254,45 +1254,6 @@ the affix file, without arguments: Vim will try to figure out where one word ends and a next starts. When there are spelling mistakes this may not be quite right. ->>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>><<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<< -NOTE: The following has not been implemented yet, because there are no word -lists that support this. -> *spell-CMP* -> Sometimes it is necessary to change a word when concatenating it to another, -> by removing a few letters, inserting something or both. It can also be useful -> to restrict concatenation to words that match a pattern. For this purpose CMP -> items can be used. They look like this: -> CMP {flag} {flags} {strip} {strip2} {add} {cond} {cond2} -> -> {flag} the flag, as used in COMPOUNDFLAGS for the lead word -> {flags} accepted flags for the following word ('.' to accept -> all) -> {strip} text to remove from the end of the lead word (zero -> for no stripping) -> {strip2} text to remove from the start of the following word -> (zero for no stripping) -> {add} text to insert between the words (zero for no -> addition) -> {cond} condition to match at the end of the lead word -> {cond2} condition to match at the start of the following word -> -> This is the same as what is used for SFX and PFX items, with the extra {flags} -> and {cond2} fields. Example: -> CMP f mrt 0 - . . ~ -> -> When used with the food and dish word list above, this means that a dash is -> inserted after each food item. Thus you get "onion-soup" and -> "onion-tomato-salat". -> -> When there are CMP items for a compound flag the concatenation is only done -> when a CMP item matches. -> -> When there are no CMP items for a compound flag, then all words will be -> concatenated, as if there was an item: -> CMP {flag} . 0 0 . . -> ->>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>><<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<< - *spell-COMMON* Common words can be specified with the COMMON item. This will give better @@ -1305,7 +1266,9 @@ When multiple regions are specified in a ":mkspell" command the common words for all regions are combined and used for all regions. *spell-NOSPLITSUGS* -This item indicates that suggestions for splitting a word will not appear: +This item indicates that splitting a word to make suggestions is not a good +idea. Split-word suggestions will appear only when there are few similar +words. NOSPLITSUGS ~ @@ -1315,8 +1278,6 @@ suggested. Can be used for obscene words. NOSUGGEST % ~ -NOT IMPLEMENTED YET. - REPLACEMENTS *spell-REP* diff --git a/runtime/doc/starting.txt b/runtime/doc/starting.txt index 0b64ca3a19..b36837f75a 100644 --- a/runtime/doc/starting.txt +++ b/runtime/doc/starting.txt @@ -1,4 +1,4 @@ -*starting.txt* For Vim version 7.0aa. Last change: 2006 Feb 18 +*starting.txt* For Vim version 7.0aa. Last change: 2006 Mar 01 VIM REFERENCE MANUAL by Bram Moolenaar @@ -376,9 +376,10 @@ a slash. Thus "-R" means recovery and "-/R" readonly. *-p* -p[N] Open N tab pages. If [N] is not given, one tab page is opened - for every file given as argument. The maximum is 10 tab - pages. If there are more tab pages than arguments, the last - few tab pages will be editing an empty file. + for every file given as argument. The maximum is set with + 'tabpagemax' pages (default 10). If there are more tab pages + than arguments, the last few tab pages will be editing an + empty file. {not in Vi} *-T* diff --git a/runtime/doc/syntax.txt b/runtime/doc/syntax.txt index d839e251cd..a7b25307b1 100644 --- a/runtime/doc/syntax.txt +++ b/runtime/doc/syntax.txt @@ -1,4 +1,4 @@ -*syntax.txt* For Vim version 7.0aa. Last change: 2006 Feb 20 +*syntax.txt* For Vim version 7.0aa. Last change: 2006 Mar 01 VIM REFERENCE MANUAL by Bram Moolenaar @@ -3968,8 +3968,12 @@ SignColumn column where |signs| are displayed IncSearch 'incsearch' highlighting; also used for the text replaced with ":s///c" *hl-LineNr* -LineNr line number for ":number" and ":#" commands, and when 'number' +LineNr Line number for ":number" and ":#" commands, and when 'number' option is set. + *hl-MatchParen* +MatchParen The character under the cursor or just before it, if it + is a paired bracket, and its match. |pi_paren.txt| + *hl-ModeMsg* ModeMsg 'showmode' message (e.g., "-- INSERT --") *hl-MoreMsg* diff --git a/runtime/doc/tags b/runtime/doc/tags index 59f240781e..3f8df8c815 100644 --- a/runtime/doc/tags +++ b/runtime/doc/tags @@ -897,6 +897,7 @@ $VIMRUNTIME starting.txt /*$VIMRUNTIME* 't_xs' term.txt /*'t_xs'* 'ta' options.txt /*'ta'* 'tabline' options.txt /*'tabline'* +'tabpagemax' options.txt /*'tabpagemax'* 'tabstop' options.txt /*'tabstop'* 'tag' options.txt /*'tag'* 'tagbsearch' options.txt /*'tagbsearch'* @@ -934,6 +935,7 @@ $VIMRUNTIME starting.txt /*$VIMRUNTIME* 'toolbar' options.txt /*'toolbar'* 'toolbariconsize' options.txt /*'toolbariconsize'* 'top' options.txt /*'top'* +'tpm' options.txt /*'tpm'* 'tr' options.txt /*'tr'* 'ts' options.txt /*'ts'* 'tsl' options.txt /*'tsl'* @@ -5524,6 +5526,7 @@ hl-FoldColumn syntax.txt /*hl-FoldColumn* hl-Folded syntax.txt /*hl-Folded* hl-IncSearch syntax.txt /*hl-IncSearch* hl-LineNr syntax.txt /*hl-LineNr* +hl-MatchParen syntax.txt /*hl-MatchParen* hl-Menu syntax.txt /*hl-Menu* hl-ModeMsg syntax.txt /*hl-ModeMsg* hl-MoreMsg syntax.txt /*hl-MoreMsg* @@ -6658,7 +6661,6 @@ spell-CHECKCOMPOUNDPATTERN spell.txt /*spell-CHECKCOMPOUNDPATTERN* spell-CHECKCOMPOUNDREP spell.txt /*spell-CHECKCOMPOUNDREP* spell-CHECKCOMPOUNDTRIPLE spell.txt /*spell-CHECKCOMPOUNDTRIPLE* spell-CIRCUMFIX spell.txt /*spell-CIRCUMFIX* -spell-CMP spell.txt /*spell-CMP* spell-COMMON spell.txt /*spell-COMMON* spell-COMPLEXPREFIXES spell.txt /*spell-COMPLEXPREFIXES* spell-COMPOUNDBEGIN spell.txt /*spell-COMPOUNDBEGIN* diff --git a/runtime/doc/tips.txt b/runtime/doc/tips.txt index 30c548d61d..e3a62fba5d 100644 --- a/runtime/doc/tips.txt +++ b/runtime/doc/tips.txt @@ -1,4 +1,4 @@ -*tips.txt* For Vim version 7.0aa. Last change: 2006 Feb 18 +*tips.txt* For Vim version 7.0aa. Last change: 2006 Mar 01 VIM REFERENCE MANUAL by Bram Moolenaar @@ -457,6 +457,8 @@ This example shows the use of a few advanced tricks: This should be put in a Vim script file, since it uses script-local variables. It skips matches in strings or comments, unless the cursor started in string or comment. This requires syntax highlighting. + +A slightly more advanced version is used in the |matchparen| plugin. > let s:paren_hl_on = 0 function s:Highlight_Matching_Paren() diff --git a/runtime/doc/windows.txt b/runtime/doc/windows.txt index 060408abb7..96602c9585 100644 --- a/runtime/doc/windows.txt +++ b/runtime/doc/windows.txt @@ -1,4 +1,4 @@ -*windows.txt* For Vim version 7.0aa. Last change: 2006 Feb 24 +*windows.txt* For Vim version 7.0aa. Last change: 2006 Mar 01 VIM REFERENCE MANUAL by Bram Moolenaar @@ -559,7 +559,9 @@ can also get to them with the buffer list commands, like ":bnext". Rearrange the screen to open one window for each argument. All other windows are closed. When a count is given, this is the maximum number of windows to open. - Only uses the current tab page |tab-page|. + With the |:tab| modifier open a tab page for each argument. + When there are more arguments than 'tabpagemax' further ones + become split windows in the last tab page. When the 'hidden' option is set, all buffers in closed windows become hidden. When 'hidden' is not set, and the 'autowrite' option is set, @@ -1089,7 +1091,8 @@ list of buffers. |unlisted-buffer| of windows opened ('winwidth' if |:vertical| was prepended). Buf/Win Enter/Leave autocommands are not executed for the new windows here, that's only done when they are really entered. - Only uses the current tab page |tab-page|. + When the |:tab| modifier is used new windows are opended in a + new tab, up to 'tabpagemax'. Note: All the commands above that start editing another buffer, keep the 'readonly' flag as it was. This differs from the ":edit" command, which sets diff --git a/runtime/filetype.vim b/runtime/filetype.vim index c25ab53714..18af21a426 100644 --- a/runtime/filetype.vim +++ b/runtime/filetype.vim @@ -1,7 +1,7 @@ " Vim support file to detect file types " " Maintainer: Bram Moolenaar <Bram@vim.org> -" Last Change: 2006 Feb 27 +" Last Change: 2006 Mar 01 " Listen very carefully, I will say this only once if exists("did_load_filetypes") @@ -1297,6 +1297,9 @@ au BufNewFile,BufRead *.rexx,*.rex setf rexx " R (Splus) au BufNewFile,BufRead *.s,*.S setf r +" R Help file +au BufNewFile,BufRead *.rd,*.Rd setf rd + " Rexx, Rebol or R au BufNewFile,BufRead *.r,*.R call s:FTr() diff --git a/runtime/syntax/tex.vim b/runtime/syntax/tex.vim index 57286307a9..2bc6045e9e 100644 --- a/runtime/syntax/tex.vim +++ b/runtime/syntax/tex.vim @@ -1,8 +1,8 @@ " Vim syntax file " Language: TeX " Maintainer: Dr. Charles E. Campbell, Jr. <NdrchipO@ScampbellPfamily.AbizM> -" Last Change: Dec 07, 2005 -" Version: 31 +" Last Change: Feb 28, 2006 +" Version: 32 " URL: http://mysite.verizon.net/astronaut/vim/index.html#vimlinks_syntax " " Notes: {{{1 @@ -372,7 +372,14 @@ if b:extfname == "dtx" syn match texComment "\^\^A.*$" contains=@texCommentGroup syn match texComment "^%\+" contains=@texCommentGroup else - syn match texComment "%.*$" contains=@texCommentGroup + if g:tex_fold_enabled + " allows syntax-folding of 2 or more contiguous comment lines + " single-line comments are not folded + syn match texComment "%.*$" contains=@texCommentGroup + syn region texComment start="^\zs\s*%.*\_s*%" skip="^\s*%" end='^\ze\s*[^%]' fold + else + syn match texComment "%.*$" contains=@texCommentGroup + endif endif " Separate lines used for verb` and verb# so that the end conditions {{{1 |