From 19a12cd5338d7864aa6105625ccdef81bd37cb16 Mon Sep 17 00:00:00 2001 From: vimboss Date: Tue, 25 Apr 2006 22:13:59 +0000 Subject: updated for version 7.0f01 --- runtime/autoload/rubycomplete.vim | 27 ++++++-- runtime/autoload/vimball.vim | 32 +++++++++- runtime/colors/slate.vim | 4 +- runtime/doc/autocmd.txt | 12 ++-- runtime/doc/change.txt | 6 +- runtime/doc/digraph.txt | 4 +- runtime/doc/eval.txt | 23 +++---- runtime/doc/indent.txt | 4 +- runtime/doc/insert.txt | 15 +++-- runtime/doc/map.txt | 4 +- runtime/doc/motion.txt | 4 +- runtime/doc/options.txt | 4 +- runtime/doc/starting.txt | 8 +-- runtime/doc/tabpage.txt | 6 +- runtime/doc/tags | 5 +- runtime/doc/todo.txt | 4 +- runtime/doc/usr_21.txt | 4 +- runtime/doc/various.txt | 4 +- runtime/doc/version7.txt | 10 ++- runtime/doc/vimball.txt | 6 +- runtime/indent/ruby.vim | 15 ++--- runtime/lang/menu_chinese_gb.936.vim | 4 +- runtime/lang/menu_zh_cn.gb2312.vim | 4 +- runtime/lang/menu_zh_cn.utf-8.vim | 4 +- runtime/plugin/vimballPlugin.vim | 1 + runtime/syntax/cs.vim | 12 ++-- runtime/syntax/rnoweb.vim | 5 +- runtime/syntax/sisu.vim | 70 +++++++++++---------- runtime/syntax/vim.vim | 12 ++-- src/Make_mvc.mak | 12 +++- src/gui.c | 6 +- src/gui.h | 5 ++ src/gui_motif.c | 2 + src/gui_w32.c | 115 ++++++++++++++++++++++++----------- src/gui_w48.c | 10 +-- src/hardcopy.c | 4 +- src/os_mswin.c | 10 +-- src/proto/os_mswin.pro | 4 +- src/version.h | 6 +- 39 files changed, 302 insertions(+), 185 deletions(-) diff --git a/runtime/autoload/rubycomplete.vim b/runtime/autoload/rubycomplete.vim index d1c8a265..53dc869d 100644 --- a/runtime/autoload/rubycomplete.vim +++ b/runtime/autoload/rubycomplete.vim @@ -90,9 +90,15 @@ function! GetRubyVarType(v) return vtp endif call setpos('.',pos) - let [lnum,lcol] = searchpos(''.a:v.'\>\s*[+\-*/]*=\s*\([^ \t]\+.\(now\|new\|open\|get_instance\)\>\|[\[{"''/]\|%r{\)','nb',stopline) + if g:rubycomplete_rails == 1 && g:rubycomplete_rails_loaded == 1 + let ctors = '\(now\|new\|open\|get_instance\|find\|create\)' + else + let ctors = '\(now\|new\|open\|get_instance\)' + endif + + let [lnum,lcol] = searchpos(''.a:v.'\>\s*[+\-*/]*=\s*\([^ \t]\+.' . ctors .'\>\|[\[{"''/]\|%r{\)','nb',stopline) if lnum != 0 && lcol != 0 - let str = matchstr(getline(lnum),'=\s*\([^ \t]\+.\(now\|new\|open\|get_instance\)\>\|[\[{"''/]\|%r{\)',lcol) + let str = matchstr(getline(lnum),'=\s*\([^ \t]\+.' . ctors . '\>\|[\[{"''/]\|%r{\)',lcol) let str = substitute(str,'^=\s*','','') call setpos('.',pos) if str == '"' || str == '''' @@ -255,7 +261,7 @@ def load_rails() file_name = VIM::evaluate('expand("%:t")') path = buf_path.gsub( file_name, '' ) path.gsub!( /\\/, "/" ) - pup = [ "../", "../../", "../../../", "../../../../" ] + pup = [ "./", "../", "../../", "../../../", "../../../../" ] pok = nil pup.each do |sup| @@ -267,10 +273,19 @@ def load_rails() end return if pok == nil + bootfile = pok + "/boot.rb" - if File.exists?( bootfile ) - require bootfile - VIM::evaluate('let g:rubycomplete_rails_loaded = 1') + envfile = pok + "/environment.rb" + if File.exists?( bootfile ) && File.exists?( envfile ) + begin + require bootfile + require envfile + require 'console_app' + require 'console_with_helpers' + VIM::command('let g:rubycomplete_rails_loaded = 1') + rescue + print "Error loading rails environment" + end end end diff --git a/runtime/autoload/vimball.vim b/runtime/autoload/vimball.vim index 91c57b2e..61d5fa66 100644 --- a/runtime/autoload/vimball.vim +++ b/runtime/autoload/vimball.vim @@ -1,7 +1,7 @@ " vimball : construct a file containing both paths and files " Author: Charles E. Campbell, Jr. -" Date: Apr 24, 2006 -" Version: 7 +" Date: Apr 25, 2006 +" Version: 8 " GetLatestVimScripts: 1502 1 :AutoInstall: vimball.vim " Copyright: (c) 2004-2006 by Charles E. Campbell, Jr. " The VIM LICENSE applies to Vimball.vim, and Vimball.txt @@ -15,7 +15,7 @@ if &cp || exists("g:loaded_vimball") finish endif let s:keepcpo = &cpo -let g:loaded_vimball = "v7" +let g:loaded_vimball = "v8" set cpo&vim " ===================================================================== @@ -255,6 +255,32 @@ fun! vimball#Vimball(really) " call Dret("Vimball") endfun +" --------------------------------------------------------------------- +" vimball#Decompress: attempts to automatically decompress vimballs {{{2 +fun! vimball#Decompress(fname) +" call Dfunc("Decompress(fname<".a:fname.">)") + + " decompression: + if expand("%") =~ '.*\.gz' && executable("gunzip") + exe "!gunzip ".a:fname + let fname= substitute(a:fname,'\.gz$','','') + exe "e ".fname + echohl WarningMsg | echo "Source this file to extract it! (:so ".fname.")" | echohl None + elseif expand("%") =~ '.*\.bz2' && executable("bunzip2") + exe "!bunzip2 ".a:fname + let fname= substitute(a:fname,'\.bz2$','','') + exe "e ".fname + echohl WarningMsg | echo "Source this file to extract it! (:so ".fname.")" | echohl None + elseif expand("%") =~ '.*\.zip' && executable("unzip") + exe "!unzip ".a:fname + let fname= substitute(a:fname,'\.zip$','','') + exe "e ".fname + echohl WarningMsg | echo "Source this file to extract it! (:so ".fname.")" | echohl None + endif + +" call Dret("Decompress") +endfun + let &cpo= s:keepcpo unlet s:keepcpo " ===================================================================== diff --git a/runtime/colors/slate.vim b/runtime/colors/slate.vim index 94d1c065..12d91bab 100644 --- a/runtime/colors/slate.vim +++ b/runtime/colors/slate.vim @@ -1,6 +1,6 @@ "%% SiSU Vim color file " Slate Maintainer: Ralph Amissah -" (originally looked at desert Hans Fugal http://hans.fugal.net/vim/colors/desert.vim (2003/05/06 16:37:49) +" (originally looked at desert Hans Fugal http://hans.fugal.net/vim/colors/desert.vim (2003/05/06) :set background=dark :highlight clear if version > 580 @@ -35,10 +35,8 @@ endif :hi Include guifg=red ctermfg=red :hi PreProc guifg=red guibg=white ctermfg=red :hi Operator guifg=Red ctermfg=Red -":hi Operator guifg=CornflowerBlue ctermfg=darkcyan :hi Define guifg=gold gui=bold ctermfg=yellow :hi Type guifg=CornflowerBlue ctermfg=2 -":hi Type guifg=darkkhaki ctermfg=2 :hi Function guifg=navajowhite ctermfg=brown :hi Structure guifg=green ctermfg=green :hi LineNr guifg=grey50 ctermfg=3 diff --git a/runtime/doc/autocmd.txt b/runtime/doc/autocmd.txt index dddb0e6d..cf8a457f 100644 --- a/runtime/doc/autocmd.txt +++ b/runtime/doc/autocmd.txt @@ -1,4 +1,4 @@ -*autocmd.txt* For Vim version 7.0f. Last change: 2006 Apr 24 +*autocmd.txt* For Vim version 7.0f. Last change: 2006 Apr 25 VIM REFERENCE MANUAL by Bram Moolenaar @@ -196,7 +196,7 @@ Vim recognizes the following events. Vim ignores the case of event names (e.g., you can use "BUFread" or "bufread" instead of "BufRead"). First an overview by function with a short explanation. Then the list -alpabetically with full explanations |autocmd-events-abc|. +alphabetically with full explanations |autocmd-events-abc|. Name triggered by ~ @@ -209,7 +209,7 @@ Name triggered by ~ |FileReadPre| before reading a file with a ":read" command |FileReadPost| after reading a file with a ":read" command -|FileReadCmd| before reading a file with a ":read" comman |Cmd-event| +|FileReadCmd| before reading a file with a ":read" command |Cmd-event| |FilterReadPre| before reading a file from a filter command |FilterReadPost| after reading a file from a filter command @@ -651,7 +651,7 @@ MenuPopup Just before showing the popup menu (under the v Visual o Operator-pending i Insert - c Commmand line + c Command line *QuickFixCmdPre* QuickFixCmdPre Before a quickfix command is run (|:make|, |:lmake|, |:grep|, |:lgrep|, |:grepadd|, @@ -904,9 +904,9 @@ Examples: > All the commands for autocommands also work with buffer-local autocommands, simply use the special string instead of the pattern. Examples: > - :au! * " remove buffer-local autotommands for + :au! * " remove buffer-local autocommands for " current buffer - :au! * " remove buffer-local autotommands for + :au! * " remove buffer-local autocommands for " buffer #33 :dobuf :au! CursorHold " remove autocmd for given event for all " buffers diff --git a/runtime/doc/change.txt b/runtime/doc/change.txt index 2420d5df..21b98d6d 100644 --- a/runtime/doc/change.txt +++ b/runtime/doc/change.txt @@ -1,4 +1,4 @@ -*change.txt* For Vim version 7.0f. Last change: 2006 Apr 11 +*change.txt* For Vim version 7.0f. Last change: 2006 Apr 25 VIM REFERENCE MANUAL by Bram Moolenaar @@ -687,7 +687,7 @@ When the {string} starts with "\=" it is evaluated as an expression, see |sub-replace-expression|. You can use that for any special characters. Otherwise these characters in {string} have a special meaning: *:s%* -When {string} is equal to "%" and '/' is included with the 'cpotions' option, +When {string} is equal to "%" and '/' is included with the 'cpoptions' option, then the {string} of the previous substitute command is used. |cpo-/| magic nomagic action ~ @@ -1178,7 +1178,7 @@ gq{motion} Format the lines that {motion} moves over. evaluated. This can differ for each buffer. 2. If 'formatprg' is not empty an external program is used. - 3. Otherise formatting is done internally. + 3. Otherwise formatting is done internally. In the third case the 'textwidth' option controls the length of each formatted line (see below). diff --git a/runtime/doc/digraph.txt b/runtime/doc/digraph.txt index 0c273ce0..594d189f 100644 --- a/runtime/doc/digraph.txt +++ b/runtime/doc/digraph.txt @@ -1,4 +1,4 @@ -*digraph.txt* For Vim version 7.0f. Last change: 2005 Sep 11 +*digraph.txt* For Vim version 7.0f. Last change: 2006 Apr 25 VIM REFERENCE MANUAL by Bram Moolenaar @@ -193,7 +193,7 @@ char digraph hex dec official name ~ ^S D3 0x13 19 DEVICE CONTROL THREE (DC3) ^T D4 0x14 20 DEVICE CONTROL FOUR (DC4) ^U NK 0x15 21 NEGATIVE ACKNOWLEDGE (NAK) -^V SY 0x16 22 SYNCRONOUS IDLE (SYN) +^V SY 0x16 22 SYNCHRONOUS IDLE (SYN) ^W EB 0x17 23 END OF TRANSMISSION BLOCK (ETB) ^X CN 0x18 24 CANCEL (CAN) ^Y EM 0x19 25 END OF MEDIUM (EM) diff --git a/runtime/doc/eval.txt b/runtime/doc/eval.txt index b8ad7a96..6b9a6ad3 100644 --- a/runtime/doc/eval.txt +++ b/runtime/doc/eval.txt @@ -1,4 +1,4 @@ -*eval.txt* For Vim version 7.0f. Last change: 2006 Apr 24 +*eval.txt* For Vim version 7.0f. Last change: 2006 Apr 25 VIM REFERENCE MANUAL by Bram Moolenaar @@ -2457,7 +2457,7 @@ extend({expr1}, {expr2} [, {expr3}]) *extend()* feedkeys({string} [, {mode}]) *feedkeys()* Characters in {string} are queued for processing as if they - come from a mapping or where typed by user. They are added to + come from a mapping or were typed by user. They are added to the end of the typeahead buffer, thus if a mapping is still being executed these characters come after them. The function does not wait for processing of keys contained in @@ -2468,10 +2468,11 @@ feedkeys({string} [, {mode}]) *feedkeys()* feedkeys('\') pushes 5 characters. If {mode} is absent, keys are remapped. {mode} is a String, which can contain these character flags: - 'm' remap keys. This is default. - 'n' do not remap keys - 't' handle keys as if typed; otherwise they are handled as - if coming from a mapping + 'm' Remap keys. This is default. + 'n' Do not remap keys. + 't' Handle keys as if typed; otherwise they are handled as + if coming from a mapping. This matters for undo, + opening folds, etc. Return value is always 0. filereadable({file}) *filereadable()* @@ -3259,7 +3260,7 @@ islocked({expr}) *islocked()* *E786* :echo islocked('alist[1]') " 0 < When {expr} is a variable that does not exist you get an error - message. Use |exists()| to check for existance. + message. Use |exists()| to check for existence. items({dict}) *items()* Return a |List| with all the key-value pairs of {dict}. Each @@ -3597,7 +3598,7 @@ min({list}) Return the minumum value of all items in {list}. be used as a Number this results in an error. An empty |List| results in zero. - *mkdir()* *E749* + *mkdir()* *E739* mkdir({name} [, {path} [, {prot}]]) Create directory {name}. If {path} is "p" then intermediate directories are created as @@ -3872,7 +3873,7 @@ reltime([{start} [, {end}]]) *reltime()* Without an argument it returns the current time. With one argument is returns the time passed since the time specified in the argument. - With two arguments it returns the time passed betweein {start} + With two arguments it returns the time passed between {start} and {end}. The {start} and {end} arguments must be values returned by reltime(). @@ -3997,7 +3998,7 @@ rename({from}, {to}) *rename()* repeat({expr}, {count}) *repeat()* Repeat {expr} {count} times and return the concatenated result. Example: > - :let seperator = repeat('-', 80) + :let separator = repeat('-', 80) < When {count} is zero or negative the result is empty. When {expr} is a |List| the result is {expr} concatenated {count} times. Example: > @@ -7287,7 +7288,7 @@ A few options contain an expression. When this expression is evaluated it may have to be done in the sandbox to avoid a security risk. But the sandbox is restrictive, thus this only happens when the option was set from an insecure location. Insecure in this context are: -- sourcing a .vimrc or .exrc in the current directlry +- sourcing a .vimrc or .exrc in the current directory - while executing in the sandbox - value coming from a modeline diff --git a/runtime/doc/indent.txt b/runtime/doc/indent.txt index 3c5e2eb3..384462b3 100644 --- a/runtime/doc/indent.txt +++ b/runtime/doc/indent.txt @@ -1,4 +1,4 @@ -*indent.txt* For Vim version 7.0f. Last change: 2006 Apr 16 +*indent.txt* For Vim version 7.0f. Last change: 2006 Apr 25 VIM REFERENCE MANUAL by Bram Moolenaar @@ -288,7 +288,7 @@ assume a 'shiftwidth' of 4. int int int func() func() func() < - iN Indent C++ base class declarations and contructor + iN Indent C++ base class declarations and constructor initializations, if they start in a new line (otherwise they are aligned at the right side of the ':'). (default 'shiftwidth'). diff --git a/runtime/doc/insert.txt b/runtime/doc/insert.txt index a6060a09..61aaa6f7 100644 --- a/runtime/doc/insert.txt +++ b/runtime/doc/insert.txt @@ -1,4 +1,4 @@ -*insert.txt* For Vim version 7.0f. Last change: 2006 Apr 23 +*insert.txt* For Vim version 7.0f. Last change: 2006 Apr 25 VIM REFERENCE MANUAL by Bram Moolenaar @@ -594,7 +594,7 @@ Also see the 'infercase' option if you want to adjust the case of the match. *complete_CTRL-E* When completion is active you can use CTRL-E to stop it and go back to the -orignally typed text. The CTRL-E will not be inserted. +originally typed text. The CTRL-E will not be inserted. *complete_CTRL-Y* When the popup menu is displayed you can use CTRL-Y to stop completion and @@ -1353,7 +1353,7 @@ Script completes: < Still, to find myClass contents tags file is required. -- function names with additonal info: +- function names with additional info: - in case of built-in functions list of possible arguments and after | type data returned by function - in case of user function arguments and name of file were function was @@ -1396,13 +1396,18 @@ The completions provided by CTRL-X CTRL-O are sensitive to the context: Notes: - Vim will load/evaluate code in order to provide completions. This may cause some code execution, which may be a concern. + - In context 1 above, Vim can parse the entire buffer to add a list of + classes to the completion results. This feature is turned off by default, + to enable it add > + let g:rubycomplete_classes_in_global = 1 +< to your vimrc - In context 2 above, anonymous classes are not supported. - In context 3 above, Vim will attempt to determine the methods supported by the object. - Vim can detect and load the Rails environment for files within a rails project. The feature is disabled by default, to enable it add > - let g:rubycomplete_rails = 1 -< to your vimrc. + let g:rubycomplete_rails = 1 +< to your vimrc SYNTAX *ft-syntax-omni* diff --git a/runtime/doc/map.txt b/runtime/doc/map.txt index cef90b46..2c515c22 100644 --- a/runtime/doc/map.txt +++ b/runtime/doc/map.txt @@ -1,4 +1,4 @@ -*map.txt* For Vim version 7.0f. Last change: 2006 Apr 20 +*map.txt* For Vim version 7.0f. Last change: 2006 Apr 25 VIM REFERENCE MANUAL by Bram Moolenaar @@ -219,7 +219,7 @@ text before the cursor and start omni completion when some condition is met. Be very careful about side effects! The expression is evaluated while obtaining characters, if you change buffer text, move the cursor, edit another -file, etc. you may very well make command disfunctional. +file, etc. you may very well make command dysfunctional. Here is an example that inserts a list number that increases: > let counter = 0 diff --git a/runtime/doc/motion.txt b/runtime/doc/motion.txt index 7fd51ae6..fa69b9ee 100644 --- a/runtime/doc/motion.txt +++ b/runtime/doc/motion.txt @@ -1,4 +1,4 @@ -*motion.txt* For Vim version 7.0f. Last change: 2006 Apr 22 +*motion.txt* For Vim version 7.0f. Last change: 2006 Apr 25 VIM REFERENCE MANUAL by Bram Moolenaar @@ -769,7 +769,7 @@ g'{mark} g`{mark} *:marks* :marks List all the current marks (not a motion command). The |'(|, |')|, |'{| and |'}| marks are not listed. - The first column is number zero. + The first column has number zero. {not in Vi} *E283* :marks {arg} List the marks that are mentioned in {arg} (not a diff --git a/runtime/doc/options.txt b/runtime/doc/options.txt index 28a7fe46..ebcb6c9a 100644 --- a/runtime/doc/options.txt +++ b/runtime/doc/options.txt @@ -1,4 +1,4 @@ -*options.txt* For Vim version 7.0f. Last change: 2006 Apr 24 +*options.txt* For Vim version 7.0f. Last change: 2006 Apr 25 VIM REFERENCE MANUAL by Bram Moolenaar @@ -1465,7 +1465,7 @@ A jump table for the options with a short description can be found at |Q_op|. to use the size for the GUI, put the command in your |gvimrc| file. When you set this option and Vim is unable to change the physical number of columns of the display, the display may be messed up. - Mimimum value is 12, maximum value is 10000. + Minimum value is 12, maximum value is 10000. *'comments'* *'com'* *E524* *E525* 'comments' 'com' string (default diff --git a/runtime/doc/starting.txt b/runtime/doc/starting.txt index d7c9a8a4..77cabaa3 100644 --- a/runtime/doc/starting.txt +++ b/runtime/doc/starting.txt @@ -1,4 +1,4 @@ -*starting.txt* For Vim version 7.0f. Last change: 2006 Apr 24 +*starting.txt* For Vim version 7.0f. Last change: 2006 Apr 25 VIM REFERENCE MANUAL by Bram Moolenaar @@ -1233,9 +1233,9 @@ triggered. current window. When [!] is included an existing file is overwritten. When [file] is omitted or is a number from 1 to 9, a - name is generated and 'viewdir' prepended. When last - directory name in 'viewdir' does not exist, this - directory is created. *E739* + name is generated and 'viewdir' prepended. When the + last directory name in 'viewdir' does not exist, this + directory is created. An existing file is always overwritten then. Use |:loadview| to load this view again. When [file] is the name of a file ('viewdir' is not diff --git a/runtime/doc/tabpage.txt b/runtime/doc/tabpage.txt index 2fe366c7..6fbdeb5b 100644 --- a/runtime/doc/tabpage.txt +++ b/runtime/doc/tabpage.txt @@ -1,4 +1,4 @@ -*tabpage.txt* For Vim version 7.0f. Last change: 2006 Apr 24 +*tabpage.txt* For Vim version 7.0f. Last change: 2006 Apr 25 VIM REFERENCE MANUAL by Bram Moolenaar @@ -162,8 +162,8 @@ Other commands: REORDERING TAB PAGES: - *:tabm* *:tabmove* -:tabmove N Move the current tab page to after tab page N. Use zero to +:tabm[ove] [N] *:tabm* *:tabmove* + Move the current tab page to after tab page N. Use zero to make the current tab page the first one. Without N the tab page is made the last one. diff --git a/runtime/doc/tags b/runtime/doc/tags index 71c9d060..282b79a5 100644 --- a/runtime/doc/tags +++ b/runtime/doc/tags @@ -3954,7 +3954,7 @@ E735 eval.txt /*E735* E736 eval.txt /*E736* E737 eval.txt /*E737* E738 eval.txt /*E738* -E739 starting.txt /*E739* +E739 eval.txt /*E739* E74 message.txt /*E74* E740 eval.txt /*E740* E741 eval.txt /*E741* @@ -3965,7 +3965,7 @@ E745 eval.txt /*E745* E746 eval.txt /*E746* E747 editing.txt /*E747* E748 repeat.txt /*E748* -E749 eval.txt /*E749* +E749 various.txt /*E749* E75 vi_diff.txt /*E75* E750 repeat.txt /*E750* E751 spell.txt /*E751* @@ -5627,6 +5627,7 @@ hebrew hebrew.txt /*hebrew* hebrew.txt hebrew.txt /*hebrew.txt* help various.txt /*help* help-context help.txt /*help-context* +help-tags tags 1 help-translated various.txt /*help-translated* help-xterm-window various.txt /*help-xterm-window* help.txt help.txt /*help.txt* diff --git a/runtime/doc/todo.txt b/runtime/doc/todo.txt index 29919d8d..3dd56c05 100644 --- a/runtime/doc/todo.txt +++ b/runtime/doc/todo.txt @@ -1,4 +1,4 @@ -*todo.txt* For Vim version 7.0f. Last change: 2006 Apr 24 +*todo.txt* For Vim version 7.0f. Last change: 2006 Apr 25 VIM REFERENCE MANUAL by Bram Moolenaar @@ -30,6 +30,8 @@ be worked on, but only if you sponsor Vim development. See |sponsor|. *known-bugs* -------------------- Known bugs and current work ----------------------- +GTK: when executing shell disable tab page labels. (Sean) + Add more tests for all new functionality in Vim 7. Especially new functions. Darren Hiebert is including the patch for omni completion in ctags. A new diff --git a/runtime/doc/usr_21.txt b/runtime/doc/usr_21.txt index d07fbe86..a43f024b 100644 --- a/runtime/doc/usr_21.txt +++ b/runtime/doc/usr_21.txt @@ -1,4 +1,4 @@ -*usr_21.txt* For Vim version 7.0f. Last change: 2006 Apr 24 +*usr_21.txt* For Vim version 7.0f. Last change: 2006 Apr 25 VIM USER MANUAL - by Bram Moolenaar @@ -165,7 +165,7 @@ And you are right back where you left Vim. So you can get on with your work. Vim creates a mark each time you exit Vim. The last one is '0. The position that '0 pointed to is made '1. And '1 is made to '2, and so forth. Mark '9 is lost. - The ":marks" command is useful to find out where '0 to '9 will take you. + The |:marks| command is useful to find out where '0 to '9 will take you. MOVE INFO FROM ONE VIM TO ANOTHER diff --git a/runtime/doc/various.txt b/runtime/doc/various.txt index 99f4a45c..601f17b3 100644 --- a/runtime/doc/various.txt +++ b/runtime/doc/various.txt @@ -1,4 +1,4 @@ -*various.txt* For Vim version 7.0f. Last change: 2006 Apr 24 +*various.txt* For Vim version 7.0f. Last change: 2006 Apr 25 VIM REFERENCE MANUAL by Bram Moolenaar @@ -85,7 +85,7 @@ g8 Print the hex values of the bytes used in the {not in Vi} {only when compiled with the |+multi_byte| feature} - *:p* *:pr* *:print* + *:p* *:pr* *:print* *E749* :[range]p[rint] [flags] Print [range] lines (default current line). Note: If you are looking for a way to print your text diff --git a/runtime/doc/version7.txt b/runtime/doc/version7.txt index c04223de..06a0aeb2 100644 --- a/runtime/doc/version7.txt +++ b/runtime/doc/version7.txt @@ -1,4 +1,4 @@ -*version7.txt* For Vim version 7.0f. Last change: 2006 Apr 24 +*version7.txt* For Vim version 7.0f. Last change: 2006 Apr 25 VIM REFERENCE MANUAL by Bram Moolenaar @@ -1104,7 +1104,7 @@ IMPROVEMENTS *improvements-7* Move the help for printing to a separate help file. It's quite a lot now. When doing completion for ":!cmd", ":r !cmd" or ":w !cmd" executable files are -found in $PATH instead of looking for ordinary files in the current directlry. +found in $PATH instead of looking for ordinary files in the current directory. When ":silent" is used and a backwards range is given for an Ex command the range is swapped automatically instead of asking if that is OK. @@ -2609,5 +2609,11 @@ problems. Line completion on "/**" gave error messages when scanning an unloaded buffer. +--- fixes and changes since Vim 7.0f --- + +Win32: The height of the tab page labels is now adjusted to the font height. +(Yegappan Lakshmanan) + +Win32: selecting the tab label was off by one. (Yegappan Lakshmanan) vim:tw=78:ts=8:ft=help:norl: diff --git a/runtime/doc/vimball.txt b/runtime/doc/vimball.txt index 99843cb2..ce8bc49c 100644 --- a/runtime/doc/vimball.txt +++ b/runtime/doc/vimball.txt @@ -1,4 +1,4 @@ -*vimball.txt* For Vim version 7.0f. Last change: 2006 Apr 24 +*vimball.txt* For Vim version 7.0f. Last change: 2006 Apr 25 Vimball Archiver @@ -56,6 +56,10 @@ Copyright: (c) 2004-2006 by Charles E. Campbell, Jr. *Vimball-copyright* ============================================================================== 3. Vimball History *vimball-history* + 7 : Apr 25, 2006 * bypasses foldenable + * uses more exe and less norm! (:yank :put etc) + * does better at insuring a "Press ENTER" prompt + appears to keep its messages visible 4 : Mar 31, 2006 * BufReadPost seems to fire twice; BufReadEnter only fires once, so the "Source this file..." message is now issued only once. diff --git a/runtime/indent/ruby.vim b/runtime/indent/ruby.vim index 5d48a798..3a2837e0 100644 --- a/runtime/indent/ruby.vim +++ b/runtime/indent/ruby.vim @@ -1,11 +1,10 @@ " Vim indent file -" Language: Ruby -" Maintainer: Gavin Sinclair -" Developer: Nikolai Weibull -" Info: $Id$ -" URL: http://vim-ruby.rubyforge.org -" Anon CVS: See above site -" ---------------------------------------------------------------------------- +" Language: Ruby +" Maintainer: Nikolai Weibull +" Info: $Id$ +" URL: http://vim-ruby.rubyforge.org +" Anon CVS: See above site +" Release Coordinator: Doug Kearns " 0. Initialization {{{1 " ================= @@ -16,6 +15,8 @@ if exists("b:did_indent") endif let b:did_indent = 1 +setlocal nosmartindent + " Now, set up our indentation expression and keys that trigger it. setlocal indentexpr=GetRubyIndent() setlocal indentkeys=0{,0},0),0],!^F,o,O,e diff --git a/runtime/lang/menu_chinese_gb.936.vim b/runtime/lang/menu_chinese_gb.936.vim index d11a4b22..496e2d8e 100644 --- a/runtime/lang/menu_chinese_gb.936.vim +++ b/runtime/lang/menu_chinese_gb.936.vim @@ -14,7 +14,7 @@ scriptencoding cp936 " Help menu menutrans &Help 帮助(&H) -menutrans &Overview 预览(&O) +menutrans &Overview 纵览(&O) menutrans &User\ Manual 用户手册(&U) menutrans &How-to\ links How-to\ 连接(&H) menutrans &Find\.\.\. 查找(&F)\.\.\. @@ -80,7 +80,7 @@ menutrans Search\ &Path\.\.\. menutrans Ta&g\ Files\.\.\. Tag\ 文件(&T)\.\.\. " GUI options -menutrans Toggle\ &Toolbar 开/关工具条(&T) +menutrans Toggle\ &Toolbar 开/关工具栏(&T) menutrans Toggle\ &Bottom\ Scrollbar 开/关底部滚动条(&B) menutrans Toggle\ &Left\ Scrollbar 开/关左端滚动条(&L) menutrans Toggle\ &Right\ Scrollbar 开/关右端滚动条(&R) diff --git a/runtime/lang/menu_zh_cn.gb2312.vim b/runtime/lang/menu_zh_cn.gb2312.vim index 1ec0fbdc..daa4d0e8 100644 --- a/runtime/lang/menu_zh_cn.gb2312.vim +++ b/runtime/lang/menu_zh_cn.gb2312.vim @@ -14,7 +14,7 @@ scriptencoding gb2312 " Help menu menutrans &Help 帮助(&H) -menutrans &Overview 预览(&O) +menutrans &Overview 纵览(&O) menutrans &User\ Manual 用户手册(&U) menutrans &How-to\ links How-to\ 连接(&H) menutrans &Find\.\.\. 查找(&F)\.\.\. @@ -80,7 +80,7 @@ menutrans Search\ &Path\.\.\. menutrans Ta&g\ Files\.\.\. Tag\ 文件(&T)\.\.\. " GUI options -menutrans Toggle\ &Toolbar 开/关工具条(&T) +menutrans Toggle\ &Toolbar 开/关工具栏(&T) menutrans Toggle\ &Bottom\ Scrollbar 开/关底部滚动条(&B) menutrans Toggle\ &Left\ Scrollbar 开/关左端滚动条(&L) menutrans Toggle\ &Right\ Scrollbar 开/关右端滚动条(&R) diff --git a/runtime/lang/menu_zh_cn.utf-8.vim b/runtime/lang/menu_zh_cn.utf-8.vim index d3edd58e..c8eb1aca 100644 --- a/runtime/lang/menu_zh_cn.utf-8.vim +++ b/runtime/lang/menu_zh_cn.utf-8.vim @@ -14,7 +14,7 @@ scriptencoding utf-8 " Help menu menutrans &Help 甯姪(&H) -menutrans &Overview 棰勮(&O) +menutrans &Overview 绾佃(&O) menutrans &User\ Manual 鐢ㄦ埛鎵嬪唽(&U) menutrans &How-to\ links How-to\ 杩炴帴(&H) menutrans &Find\.\.\. 鏌ユ壘(&F)\.\.\. @@ -80,7 +80,7 @@ menutrans Search\ &Path\.\.\. 鏌ユ壘璺緞(&P)\.\.\. menutrans Ta&g\ Files\.\.\. Tag\ 鏂囦欢(&T)\.\.\. " GUI options -menutrans Toggle\ &Toolbar 寮/鍏冲伐鍏锋潯(&T) +menutrans Toggle\ &Toolbar 寮/鍏冲伐鍏锋爮(&T) menutrans Toggle\ &Bottom\ Scrollbar 寮/鍏冲簳閮ㄦ粴鍔ㄦ潯(&B) menutrans Toggle\ &Left\ Scrollbar 寮/鍏冲乏绔粴鍔ㄦ潯(&L) menutrans Toggle\ &Right\ Scrollbar 寮/鍏冲彸绔粴鍔ㄦ潯(&R) diff --git a/runtime/plugin/vimballPlugin.vim b/runtime/plugin/vimballPlugin.vim index 35158893..e1ea57e2 100644 --- a/runtime/plugin/vimballPlugin.vim +++ b/runtime/plugin/vimballPlugin.vim @@ -21,6 +21,7 @@ set cpo&vim com! -ra -na=+ -bang MkVimball call vimball#MkVimball(,,0,) com! -na=0 UseVimball call vimball#Vimball(1) com! -na=0 VimballList call vimball#Vimball(0) +au BufEnter *.vba.gz,*.vba.bz2,*.vba.zip call vimball#Decompress(expand("")) au BufEnter *.vba echohl WarningMsg | echo "Source this file to extract it! (:so %)" | echohl None let &cpo= s:keepcpo diff --git a/runtime/syntax/cs.vim b/runtime/syntax/cs.vim index 948b1255..6a61ed26 100644 --- a/runtime/syntax/cs.vim +++ b/runtime/syntax/cs.vim @@ -1,7 +1,7 @@ " Vim syntax file " Language: C# " Maintainer: Johannes Zellner -" Last Change: Mi, 13 Apr 2005 22:52:57 CEST +" Last Change: Mo, 24 Apr 2006 10:11:07 CEST " Filenames: *.cs " $Id$ " @@ -20,7 +20,7 @@ set cpo&vim syn keyword csType bool byte char decimal double float int long object sbyte short string uint ulong ushort void " storage syn keyword csStorage class delegate enum interface namespace struct -" repeate / condition / label +" repeat / condition / label syn keyword csRepeat break continue do for foreach goto return while syn keyword csConditional else if switch syn keyword csLabel case default @@ -51,8 +51,8 @@ syn keyword csUnspecifiedKeyword explicit implicit " TODO: include strings ? " syn keyword csTodo contained TODO FIXME XXX NOTE -syn region csComment start="/\*" end="\*/" contains=@csCommentHook,csTodo -syn match csComment "//.*$" contains=@csCommentHook,csTodo +syn region csComment start="/\*" end="\*/" contains=@csCommentHook,csTodo,@Spell +syn match csComment "//.*$" contains=@csCommentHook,csTodo,@Spell " xml markup inside '///' comments syn cluster xmlRegionHook add=csXmlCommentLeader @@ -92,9 +92,9 @@ syn match csSpecialChar contained +\\["\\'0abfnrtvx]+ " unicode characters syn match csUnicodeNumber +\\\(u\x\{4}\|U\x\{8}\)+ contained contains=csUnicodeSpecifier syn match csUnicodeSpecifier +\\[uU]+ contained -syn region csVerbatimString start=+@"+ end=+"+ end=+$+ skip=+""+ contains=csVerbatimSpec +syn region csVerbatimString start=+@"+ end=+"+ end=+$+ skip=+""+ contains=csVerbatimSpec,@Spell syn match csVerbatimSpec +@"+he=s+1 contained -syn region csString start=+"+ end=+"+ end=+$+ contains=csSpecialChar,csSpecialError,csUnicodeNumber +syn region csString start=+"+ end=+"+ end=+$+ contains=csSpecialChar,csSpecialError,csUnicodeNumber,@Spell syn match csCharacter "'[^']*'" contains=csSpecialChar,csSpecialCharError syn match csCharacter "'\\''" contains=csSpecialChar syn match csCharacter "'[^\\]'" diff --git a/runtime/syntax/rnoweb.vim b/runtime/syntax/rnoweb.vim index 7a106ecb..9805f677 100644 --- a/runtime/syntax/rnoweb.vim +++ b/runtime/syntax/rnoweb.vim @@ -1,8 +1,8 @@ " Vim syntax file " Language: R noweb Files " Maintainer: Johannes Ranke -" Last Change: 2006 Apr 18 -" Version: 0.5 +" Last Change: 2006 Apr 25 +" Version: 0.6 " SVN: $Id$ " Remarks: - This file is inspired by the proposal of " Fernando Henrique Ferraz Pereira da Rosa @@ -50,6 +50,7 @@ syn cluster rnoweb contains=rnowebChunk,rnowebChunkReference,rnowebDelimiter,rno " Highlighting {{{1 hi def link rnowebDelimiter Delimiter hi def link rnowebSweaveOpts Statement +hi def link rnowebChunkReference Delimiter let b:current_syntax = "rnoweb" " vim: foldmethod=marker: diff --git a/runtime/syntax/sisu.vim b/runtime/syntax/sisu.vim index d56b41cb..399b7a4e 100644 --- a/runtime/syntax/sisu.vim +++ b/runtime/syntax/sisu.vim @@ -5,12 +5,11 @@ if version < 600 syntax clear elseif exists("b:current_syntax") -" :colorscheme green finish else endif "% 11 Errors? -syn match sisu_error contains=sisu_contain,sisu_control,sisu_markpara,sisu_mark,sisu_content_alt,sisu_error_wspace "" +syn match sisu_error contains=sisu_link,sisu_error_wspace "" "% 10 Markers: Endnote Identifiers, Pagebreaks etc.: if !exists("sisu_no_identifiers") syn match sisu_mark_endnote "\~^" @@ -33,63 +32,64 @@ if !exists("sisu_no_identifiers") endif "% 9 URLs Numbers: and ASCII Codes syn match sisu_number "\<\(0x\x\+\|0b[01]\+\|0\o\+\|0\.\d\+\|0\|[1-9][\.0-9_]*\)\>" -syn match sisu_link "\(http://\|\.\./\)\S\+" syn match sisu_number "?\(\\M-\\C-\|\\c\|\\C-\|\\M-\)\=\(\\\o\{3}\|\\x\x\{2}\|\\\=\w\)" "% 8 Tuned Error - is error if not already matched syn match sisu_error "[\~/\*!_]{\|}[\~/\*!_]" contains=sisu_error syn match sisu_error "]" contains=sisu_error "% 7 Simple Enclosed Markup: " Simple Markup: +"% url/link +syn region sisu_link contains=sisu_error,@NoSpell matchgroup=sisu_link start="\(http://\|\.\.\/\)" end="\(\s\|$\)" +syn region sisu_link contains=sisu_error,sisu_error_wspace matchgroup=sisu_action start="^<<\s*|[a-zA-Z0-9^._-]\+|@|[a-zA-Z0-9^._-]\+|"rs=s+2 end="$" "% header syn region sisu_header_content contains=sisu_error,sisu_error_wspace,sisu_content_alt,sisu_link,sisu_linked,sisu_break matchgroup=sisu_header start="^0\~\(\S\+\|[^-]\)" end="$" syn region sisu_header_content contains=sisu_error,sisu_error_wspace,sisu_content_alt,sisu_link,sisu_linked,sisu_break matchgroup=sisu_header start="^0\~\(tags\?\|date\)\s\+"rs=e-1 end="\n$" syn region sisu_header_content contains=sisu_error,sisu_error_wspace,sisu_content_alt,sisu_link,sisu_linked,sisu_break matchgroup=sisu_header start="^@\S\+:[+-]\?\s"rs=e-1 end="$" syn region sisu_header_content contains=sisu_error,sisu_error_wspace,sisu_content_alt,sisu_link,sisu_linked,sisu_break matchgroup=sisu_header start="^@\(tags\?\|date\):\s\+"rs=e-1 end="\n$" "% headings -syn region sisu_heading contains=sisu_mark_endnote,sisu_content_endnote,sisu_marktail,sisu_strikeout,sisu_number,sisu_control,sisu_identifier,sisu_ocn,sisu_error,sisu_error_wspace,sisu_error_spell,@Spell matchgroup=sisu_structure start="^\([1-8]\|:\?[A-C]\)\~\(\S\+\|[^-]\)" end="$" +syn region sisu_heading contains=sisu_mark_endnote,sisu_content_endnote,sisu_marktail,sisu_strikeout,sisu_number,sisu_control,sisu_identifier,sisu_ocn,sisu_error,sisu_error_wspace,@Spell matchgroup=sisu_structure start="^\([1-8]\|:\?[A-C]\)\~\(\S\+\|[^-]\)" end="$" "% grouped text -syn region sisu_content_alt contains=sisu_strikeout,sisu_number,sisu_control,sisu_identifier,sisu_error,sisu_error_spell,@Spell matchgroup=sisu_contain start="table{.\+" end="}table" -syn region sisu_content_alt contains=sisu_strikeout,sisu_number,sisu_control,sisu_identifier,sisu_error,sisu_error_spell,@Spell matchgroup=sisu_contain start="{t\~h}" end="$$" -syn region sisu_content_alt contains=sisu_mark_endnote,sisu_content_endnote,sisu_link,sisu_mark,sisu_strikeout,sisu_number,sisu_control,sisu_identifier,sisu_error,sisu_error_spell,@Spell matchgroup=sisu_contain start="^\(alt\|group\|poem\){" end="^}\(alt\|group\|poem\)" +syn region sisu_content_alt contains=sisu_strikeout,sisu_number,sisu_control,sisu_identifier,sisu_error,@Spell matchgroup=sisu_contain start="table{.\+" end="}table" +syn region sisu_content_alt contains=sisu_strikeout,sisu_number,sisu_control,sisu_identifier,sisu_error,@Spell matchgroup=sisu_contain start="{t\~h}" end="$$" +syn region sisu_content_alt contains=sisu_mark_endnote,sisu_content_endnote,sisu_link,sisu_mark,sisu_strikeout,sisu_number,sisu_control,sisu_identifier,sisu_error,@Spell matchgroup=sisu_contain start="^\(alt\|group\|poem\){" end="^}\(alt\|group\|poem\)" syn region sisu_content_alt contains=sisu_error matchgroup=sisu_contain start="^code{" end="^}code" "% endnotes -syn region sisu_content_endnote contains=sisu_link,sisu_strikeout,sisu_underline,sisu_number,sisu_control,sisu_identifier,sisu_error,sisu_error_wspace,sisu_error_spell,@Spell,sisu_mark,sisu_break matchgroup=sisu_mark_endnote start="\~{" end="}\~" skip="\n" -syn region sisu_content_endnote contains=sisu_strikeout,sisu_number,sisu_control,sisu_link,sisu_identifier,sisu_error,sisu_error_wspace,sisu_error_spell,@Spell,sisu_mark,sisu_break matchgroup=sisu_mark_endnote start="\^\~" end="\n\n" +syn region sisu_content_endnote contains=@Spell,sisu_link,sisu_strikeout,sisu_underline,sisu_number,sisu_control,sisu_identifier,sisu_error,sisu_error_wspace,sisu_mark,sisu_break matchgroup=sisu_mark_endnote start="\~{" end="}\~" skip="\n" +syn region sisu_content_endnote contains=sisu_strikeout,sisu_number,sisu_control,sisu_link,sisu_identifier,sisu_error,sisu_error_wspace,@Spell,sisu_mark,sisu_break matchgroup=sisu_mark_endnote start="\^\~" end="\n\n" "% images -syn region sisu_linked contains=sisu_fontface,sisu_strikeout,sisu_number,sisu_control,sisu_identifier,sisu_error,sisu_error_spell,@Spell matchgroup=sisu_link start="{" end="}\(\(http://\|\.\./\)\S\+\|image\)" oneline -"% line operations -syn region sisu_link contains=sisu_error,sisu_error_wspace,sisu_error_spell,@Spell matchgroup=sisu_action start="^<<\s*|[a-zA-Z0-9^._-]\+|@|[a-zA-Z0-9^._-]\+|"rs=s+2 end="$" -syn region sisu_control contains=sisu_strikeout,sisu_identifier,sisu_content_endnote,sisu_mark_endnote,sisu_error,sisu_error_wspace,sisu_error_spell,@Spell matchgroup=sisu_control start="\(\(^\| \)!_ \|<:b>\)" end="$" -syn region sisu_normal contains=sisu_strikeout,sisu_identifier,sisu_content_endnote,sisu_mark_endnote,sisu_link,sisu_linked,sisu_error,sisu_error_wspace,sisu_error_spell,@Spell matchgroup=sisu_markpara start="^_\([12*]\|[12]\*\) " end="$" -syn region sisu_normal contains=sisu_strikeout,sisu_identifier,sisu_content_endnote,sisu_mark_endnote,sisu_link,sisu_linked,sisu_error,sisu_error_wspace,sisu_error_spell,@Spell matchgroup=sisu_markpara start="^\(#[ 1]\|_# \)" end="$" -syn region sisu_comment contains=sisu_error_spell,@Spell matchgroup=sisu_comment start="^%\{1,2\} " end="$" +syn region sisu_linked contains=sisu_fontface,sisu_strikeout,sisu_number,sisu_control,sisu_identifier,sisu_error,@Spell matchgroup=sisu_link start="{" end="}\(\(http://\|\.\./\)\S\+\|image\)" oneline +"% some line operations +syn region sisu_control contains=sisu_strikeout,sisu_identifier,sisu_content_endnote,sisu_mark_endnote,sisu_error,sisu_error_wspace,@Spell matchgroup=sisu_control start="\(\(^\| \)!_ \|<:b>\)" end="$" +syn region sisu_normal contains=sisu_strikeout,sisu_identifier,sisu_content_endnote,sisu_mark_endnote,sisu_link,sisu_linked,sisu_error,sisu_error_wspace,@Spell matchgroup=sisu_markpara start="^_\([12*]\|[12]\*\) " end="$" +syn region sisu_normal contains=sisu_strikeout,sisu_identifier,sisu_content_endnote,sisu_mark_endnote,sisu_link,sisu_linked,sisu_error,sisu_error_wspace,@Spell matchgroup=sisu_markpara start="^\(#[ 1]\|_# \)" end="$" +syn region sisu_comment contains=@Spell matchgroup=sisu_comment start="^%\{1,2\} " end="$" "% font face curly brackets -syn region sisu_control contains=sisu_strikeout,sisu_number,sisu_control,sisu_identifier,sisu_error,sisu_error_spell,@Spell matchgroup=sisu_fontface start="\*{" end="}\*" -syn region sisu_control contains=sisu_strikeout,sisu_number,sisu_control,sisu_identifier,sisu_error,sisu_error_spell,@Spell matchgroup=sisu_fontface start="!{" end="}!" -syn region sisu_underline contains=sisu_strikeout,sisu_number,sisu_control,sisu_identifier,sisu_error,sisu_error_spell,@Spell matchgroup=sisu_fontface start="_{" end="}_" -syn region sisu_identifier contains=sisu_strikeout,sisu_number,sisu_control,sisu_identifier,sisu_error,sisu_error_spell,@Spell matchgroup=sisu_fontface start="/{" end="}/" -syn region sisu_underline contains=sisu_strikeout,sisu_number,sisu_control,sisu_identifier,sisu_error,sisu_error_spell,@Spell matchgroup=sisu_fontface start="+{" end="}+" -syn region sisu_identifier contains=sisu_strikeout,sisu_number,sisu_control,sisu_identifier,sisu_error,sisu_error_spell,@Spell matchgroup=sisu_fontface start="\^{" end="}\^" -syn region sisu_identifier contains=sisu_strikeout,sisu_number,sisu_control,sisu_identifier,sisu_error,sisu_error_spell,@Spell matchgroup=sisu_fontface start=",{" end="}," +syn region sisu_control contains=sisu_strikeout,sisu_number,sisu_control,sisu_identifier,sisu_error,@Spell matchgroup=sisu_fontface start="\*{" end="}\*" +syn region sisu_control contains=sisu_strikeout,sisu_number,sisu_control,sisu_identifier,sisu_error,@Spell matchgroup=sisu_fontface start="!{" end="}!" +syn region sisu_underline contains=sisu_strikeout,sisu_number,sisu_control,sisu_identifier,sisu_error,@Spell matchgroup=sisu_fontface start="_{" end="}_" +syn region sisu_identifier contains=sisu_strikeout,sisu_number,sisu_control,sisu_identifier,sisu_error,@Spell matchgroup=sisu_fontface start="/{" end="}/" +syn region sisu_underline contains=sisu_strikeout,sisu_number,sisu_control,sisu_identifier,sisu_error,@Spell matchgroup=sisu_fontface start="+{" end="}+" +syn region sisu_identifier contains=sisu_strikeout,sisu_number,sisu_control,sisu_identifier,sisu_error,@Spell matchgroup=sisu_fontface start="\^{" end="}\^" +syn region sisu_identifier contains=sisu_strikeout,sisu_number,sisu_control,sisu_identifier,sisu_error,@Spell matchgroup=sisu_fontface start=",{" end="}," syn region sisu_strikeout contains=sisu_error matchgroup=sisu_fontface start="-{" end="}-" syn region sisu_html contains=sisu_error contains=sisu_strikeout matchgroup=sisu_contain start="" end="" oneline "% single words bold italicise etc. "workon syn region sisu_control contains=sisu_error matchgroup=sisu_control start="\([ (]\|^\)\*[^\|{\n\~\\]"hs=e-1 end="\*"he=e-0 skip="[a-zA-Z0-9']" oneline syn region sisu_identifier contains=sisu_error matchgroup=sisu_content_alt start="\([ ]\|^\)/[^{ \|\n\\]"hs=e-1 end="/\[ \.\]" skip="[a-zA-Z0-9']" oneline -"% html -syn region sisu_number contains=sisu_strikeout,sisu_number,sisu_control,sisu_identifier,sisu_error,sisu_error_spell,@Spell,sisu_mark matchgroup=sisu_html start="" end="" skip="\n" oneline -syn region sisu_number contains=sisu_strikeout,sisu_number,sisu_control,sisu_identifier,sisu_error,sisu_error_spell,@Spell,sisu_mark matchgroup=sisu_html start="" end="" oneline -syn region sisu_content_alt contains=sisu_strikeout,sisu_number,sisu_control,sisu_identifier,sisu_error,sisu_error_spell,@Spell,sisu_mark matchgroup=sisu_html start="" end="" skip="\n" oneline -syn region sisu_content_alt contains=sisu_strikeout,sisu_number,sisu_control,sisu_identifier,sisu_error,sisu_error_spell,@Spell,sisu_mark matchgroup=sisu_html start="" end="" skip="\n" oneline -syn region sisu_identifier contains=sisu_strikeout,sisu_number,sisu_control,sisu_identifier,sisu_error,sisu_error_spell,@Spell,sisu_mark matchgroup=sisu_html start="" end="" skip="\\\\\|\\'" oneline -syn region sisu_identifier contains=sisu_error matchgroup=sisu_html start="" end="" oneline "% misc syn region sisu_identifier contains=sisu_error matchgroup=sisu_fontface start="\^[^ {\|\n\\]"rs=s+1 end="\^[ ,.;:'})\\\n]" skip="[a-zA-Z0-9']" oneline -"% metaverse -syn region sisu_content_alt contains=sisu_strikeout,sisu_number,sisu_control,sisu_identifier,sisu_error,sisu_error_spell,@Spell matchgroup=sisu_contain start="<:Table.\{-}>" end="<:Table[-_]end>" +"% metaverse html +syn region sisu_number contains=sisu_strikeout,sisu_number,sisu_control,sisu_identifier,sisu_error,@Spell,sisu_mark matchgroup=sisu_html start="" end="" skip="\n" oneline +syn region sisu_number contains=sisu_strikeout,sisu_number,sisu_control,sisu_identifier,sisu_error,@Spell,sisu_mark matchgroup=sisu_html start="" end="" oneline +syn region sisu_content_alt contains=sisu_strikeout,sisu_number,sisu_control,sisu_identifier,sisu_error,@Spell,sisu_mark matchgroup=sisu_html start="" end="" skip="\n" oneline +syn region sisu_content_alt contains=sisu_strikeout,sisu_number,sisu_control,sisu_identifier,sisu_error,@Spell,sisu_mark matchgroup=sisu_html start="" end="" skip="\n" oneline +syn region sisu_identifier contains=sisu_strikeout,sisu_number,sisu_control,sisu_identifier,sisu_error,@Spell,sisu_mark matchgroup=sisu_html start="" end="" skip="\\\\\|\\'" oneline +syn region sisu_identifier contains=sisu_error matchgroup=sisu_html start="" end="" oneline +"% metaverse <:> +syn region sisu_content_alt contains=sisu_strikeout,sisu_number,sisu_control,sisu_identifier,sisu_error,@Spell matchgroup=sisu_contain start="<:Table.\{-}>" end="<:Table[-_]end>" syn region sisu_content_alt contains=sisu_error matchgroup=sisu_contain start="<:code>" end="<:code[-_]end>" -syn region sisu_content_alt contains=sisu_mark_endnote,sisu_content_endnote,sisu_link,sisu_mark,sisu_strikeout,sisu_number,sisu_control,sisu_identifier,sisu_error,sisu_error_spell,@Spell matchgroup=sisu_contain start="<:alt>" end="<:alt[-_]end>" -syn region sisu_content_alt contains=sisu_mark_endnote,sisu_content_endnote,sisu_link,sisu_mark,sisu_strikeout,sisu_number,sisu_control,sisu_identifier,sisu_error,sisu_error_spell,@Spell matchgroup=sisu_contain start="<:poem>" end="<:poem[-_]end>" +syn region sisu_content_alt contains=sisu_mark_endnote,sisu_content_endnote,sisu_link,sisu_mark,sisu_strikeout,sisu_number,sisu_control,sisu_identifier,sisu_error,@Spell matchgroup=sisu_contain start="<:alt>" end="<:alt[-_]end>" +syn region sisu_content_alt contains=sisu_mark_endnote,sisu_content_endnote,sisu_link,sisu_mark,sisu_strikeout,sisu_number,sisu_control,sisu_identifier,sisu_error,@Spell matchgroup=sisu_contain start="<:poem>" end="<:poem[-_]end>" "% 6 Expensive Mode " Expensive Mode: if !exists("sisu_no_expensive") @@ -160,8 +160,6 @@ if version >= 508 || !exists("did_sisu_syntax_inits") HiLink sisu_html Type HiLink sisu_action Identifier HiLink sisu_comment Comment - HiLink sisu_error_spell SpellErrors "line does nothing -" HiLink sisu_error_spell ErrorMsg HiLink sisu_error_wspace Error HiLink sisu_error Error delcommand HiLink diff --git a/runtime/syntax/vim.vim b/runtime/syntax/vim.vim index 099d8e4c..fcc8f721 100644 --- a/runtime/syntax/vim.vim +++ b/runtime/syntax/vim.vim @@ -1,8 +1,8 @@ " Vim syntax file " Language: Vim 7.0 script " Maintainer: Dr. Charles E. Campbell, Jr. -" Last Change: April 19, 2006 -" Version: 7.0-45 +" Last Change: April 25, 2006 +" Version: 7.0-46 " Automatically generated keyword lists: {{{1 " Quit when a syntax file was already loaded {{{2 @@ -20,13 +20,13 @@ syn keyword vimCommand contained ab[breviate] abc[lear] abo[veleft] al[l] arga[d syn match vimCommand contained "\