diff options
| -rw-r--r-- | runtime/doc/quickref.txt | 4 | ||||
| -rw-r--r-- | runtime/doc/syntax.txt | 4 | ||||
| -rw-r--r-- | runtime/doc/todo.txt | 2 | ||||
| -rw-r--r-- | runtime/ftplugin/fortran.vim | 15 | ||||
| -rw-r--r-- | runtime/optwin.vim | 2 |
5 files changed, 16 insertions, 11 deletions
diff --git a/runtime/doc/quickref.txt b/runtime/doc/quickref.txt index d02c944c2..a68a1748d 100644 --- a/runtime/doc/quickref.txt +++ b/runtime/doc/quickref.txt @@ -1,4 +1,4 @@ -*quickref.txt* For Vim version 7.3b. Last change: 2010 Jul 22 +*quickref.txt* For Vim version 7.3b. Last change: 2010 Jul 24 VIM REFERENCE MANUAL by Bram Moolenaar @@ -918,6 +918,7 @@ Short explanation of each option: *option-list* 'undodir' 'udir' where to store undo files 'undofile' 'udf' save undo information in a file 'undolevels' 'ul' maximum number of changes that can be undone +'undoreload' 'ur' max nr of lines to save for undo on a buffer reload 'updatecount' 'uc' after this many characters flush swap file 'updatetime' 'ut' after this many milliseconds flush swap file 'verbose' 'vbs' give informative messages @@ -937,6 +938,7 @@ Short explanation of each option: *option-list* 'wildmode' 'wim' mode for 'wildchar' command-line expansion 'wildoptions' 'wop' specifies how command line completion is done 'winaltkeys' 'wak' when the windows system handles ALT keys +'window' 'wi' nr of lines to scroll for CTRL-F and CTRL-B 'winheight' 'wh' minimum number of lines for the current window 'winfixheight' 'wfh' keep window height when opening/closing windows 'winfixwidth' 'wfw' keep window width when opening/closing windows diff --git a/runtime/doc/syntax.txt b/runtime/doc/syntax.txt index fb1ddd82c..c5215cc6b 100644 --- a/runtime/doc/syntax.txt +++ b/runtime/doc/syntax.txt @@ -1087,8 +1087,8 @@ FORTRAN *fortran.vim* *ft-fortran-syntax* Default highlighting and dialect ~ Highlighting appropriate for f95 (Fortran 95) is used by default. This choice should be appropriate for most users most of the time because Fortran 95 is a -superset of Fortran 90 and almost a superset of Fortran 77. Preliminary -support for Fortran 2003 and Fortran 2008 features has been introduced and is +superset of Fortran 90 and almost a superset of Fortran 77. Support for +Fortran 2003 and Fortran 2008 features has been introduced and is automatically available in the default (f95) highlighting. Fortran source code form ~ diff --git a/runtime/doc/todo.txt b/runtime/doc/todo.txt index 8327884db..94c0751a9 100644 --- a/runtime/doc/todo.txt +++ b/runtime/doc/todo.txt @@ -30,6 +30,8 @@ be worked on, but only if you sponsor Vim development. See |sponsor|. *known-bugs* -------------------- Known bugs and current work ----------------------- +Diff python and python3 code, some is missing in python3. + Before release 7.3: - Rename vim73 branch to default (hints: Xavier de Gaye, 2010 May 23) diff --git a/runtime/ftplugin/fortran.vim b/runtime/ftplugin/fortran.vim index c817b3b78..741465da1 100644 --- a/runtime/ftplugin/fortran.vim +++ b/runtime/ftplugin/fortran.vim @@ -1,11 +1,11 @@ " Vim settings file " Language: Fortran90 (and Fortran95, Fortran77, F and elf90) -" Version: 0.45 -" Last Change: 2006 Apr. 03 -" URL: http://www.unb.ca/chem/ajit/ftplugin/fortran.vim +" Version: 0.46 +" Last Change: 2010 July 24 " Maintainer: Ajit J. Thakkar <ajit@unb.ca>; <http://www.unb.ca/chem/ajit/> " Usage: Do :help fortran-plugin from Vim -" Credits: Useful suggestions were made by Stefano Zacchiroli +" Credits: +" Useful suggestions were made by Stefano Zacchiroli and Hendrik Merx. " Only do these settings when not done yet for this buffer if exists("b:did_ftplugin") @@ -27,11 +27,11 @@ if !exists("b:fortran_fixed_source") else " f90 and f95 allow both fixed and free source form " assume fixed source form unless signs of free source form - " are detected in the first five columns of the first 250 lines + " are detected in the first five columns of the first s:lmax lines " Detection becomes more accurate and time-consuming if more lines " are checked. Increase the limit below if you keep lots of comments at " the very top of each file and you have a fast computer - let s:lmax = 250 + let s:lmax = 500 if ( s:lmax > line("$") ) let s:lmax = line("$") endif @@ -39,12 +39,13 @@ if !exists("b:fortran_fixed_source") let s:ln=1 while s:ln <= s:lmax let s:test = strpart(getline(s:ln),0,5) - if s:test[0] !~ '[Cc*!#]' && s:test !~ '^ \+[!#]' && s:test =~ '[^ 0-9\t]' + if s:test !~ '^[Cc*]' && s:test !~ '^ *[!#]' && s:test =~ '[^ 0-9\t]' && s:test !~ '^[ 0-9]*\t' let b:fortran_fixed_source = 0 break endif let s:ln = s:ln + 1 endwhile + unlet! s:lmax s:ln s:test endif endif diff --git a/runtime/optwin.vim b/runtime/optwin.vim index 73de9e101..20f4f923a 100644 --- a/runtime/optwin.vim +++ b/runtime/optwin.vim @@ -995,7 +995,7 @@ if !has("msdos") call append("$", "\t(local to buffer)") call <SID>BinOptionL("sn") endif -call append("$", "cryptmethod\encryption method for file writing: zip or blowfish") +call append("$", "cryptmethod\tencryption method for file writing: zip or blowfish") call append("$", "\t(local to buffer)") call <SID>OptionL("cm") |