diff options
author | Bram Moolenaar <Bram@vim.org> | 2006-04-25 22:13:59 +0000 |
---|---|---|
committer | Bram Moolenaar <Bram@vim.org> | 2006-04-25 22:13:59 +0000 |
commit | 551dbcc9b604c2992f908fb475e797fcc116315b (patch) | |
tree | d48db26e4f3470df23fdd8e8593bcf067fab4142 /runtime | |
parent | f9393ef5efde2f425fbd9e19363186f8c9103376 (diff) |
updated for version 7.0f01v7.0f01
Diffstat (limited to 'runtime')
29 files changed, 186 insertions, 127 deletions
diff --git a/runtime/autoload/rubycomplete.vim b/runtime/autoload/rubycomplete.vim index d1c8a26538..53dc869d6b 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 91c57b2eb8..61d5fa662a 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 94d1c06585..12d91bab7d 100644 --- a/runtime/colors/slate.vim +++ b/runtime/colors/slate.vim @@ -1,6 +1,6 @@ "%% SiSU Vim color file " Slate Maintainer: Ralph Amissah <ralph@amissah.com> -" (originally looked at desert Hans Fugal <hans@fugal.net> http://hans.fugal.net/vim/colors/desert.vim (2003/05/06 16:37:49) +" (originally looked at desert Hans Fugal <hans@fugal.net> 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 dddb0e6df7..cf8a457f85 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! * <buffer> " remove buffer-local autotommands for + :au! * <buffer> " remove buffer-local autocommands for " current buffer - :au! * <buffer=33> " remove buffer-local autotommands for + :au! * <buffer=33> " remove buffer-local autocommands for " buffer #33 :dobuf :au! CursorHold <buffer> " remove autocmd for given event for all " buffers diff --git a/runtime/doc/change.txt b/runtime/doc/change.txt index 2420d5df3f..21b98d6dc9 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 0c273ce06a..594d189f40 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 b8ad7a96b8..6b9a6ad305 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('\<CR>') 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 3c5e2eb3c2..384462b3b2 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 a6060a0919..61aaa6f783 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 cef90b4626..2c515c22f6 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 7fd51ae635..fa69b9ee47 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 28a7fe462d..ebcb6c9a2d 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 d7c9a8a47a..77cabaa3c2 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 2fe366c719..6fbdeb5b4c 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 71c9d0603c..282b79a5c4 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 29919d8d95..3dd56c05c3 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 d07fbe869d..a43f024bbe 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 99f4a45c3e..601f17b386 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 c04223de73..06a0aeb2d4 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 99843cb22b..ce8bc49c12 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 5d48a798cc..3a2837e046 100644 --- a/runtime/indent/ruby.vim +++ b/runtime/indent/ruby.vim @@ -1,11 +1,10 @@ " Vim indent file -" Language: Ruby -" Maintainer: Gavin Sinclair <gsinclair at soyabean.com.au> -" Developer: Nikolai Weibull <source at pcppopper.org> -" Info: $Id$ -" URL: http://vim-ruby.rubyforge.org -" Anon CVS: See above site -" ---------------------------------------------------------------------------- +" Language: Ruby +" Maintainer: Nikolai Weibull <now at bitwi.se> +" Info: $Id$ +" URL: http://vim-ruby.rubyforge.org +" Anon CVS: See above site +" Release Coordinator: Doug Kearns <dougkearns@gmail.com> " 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 d11a4b2267..496e2d8e45 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<Tab><F1> 预览(&O)<Tab><F1> +menutrans &Overview<Tab><F1> 纵览(&O)<Tab><F1> 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/lang/menu_zh_cn.gb2312.vim b/runtime/lang/menu_zh_cn.gb2312.vim index 1ec0fbdcd6..daa4d0e8de 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<Tab><F1> 预览(&O)<Tab><F1> +menutrans &Overview<Tab><F1> 纵览(&O)<Tab><F1> 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) |