diff options
author | Bram Moolenaar <Bram@vim.org> | 2005-10-11 20:32:28 +0000 |
---|---|---|
committer | Bram Moolenaar <Bram@vim.org> | 2005-10-11 20:32:28 +0000 |
commit | 95b28ecc4a2dbda55fee8b7082ab1ed393d87c91 (patch) | |
tree | 1debb13ed779d6d922ca6f5915d187a616185949 | |
parent | 202795bed4e4ab668e033217d68f41fb7f9cf707 (diff) | |
download | vim-git-95b28ecc4a2dbda55fee8b7082ab1ed393d87c91.tar.gz |
updated for version 7.0156
-rw-r--r-- | runtime/doc/tags | 5 | ||||
-rw-r--r-- | runtime/ftplugin/jsp.vim | 4 | ||||
-rw-r--r-- | runtime/indent/ocaml.vim | 447 | ||||
-rwxr-xr-x | src/auto/configure | 2 | ||||
-rw-r--r-- | src/version.h | 4 |
5 files changed, 212 insertions, 250 deletions
diff --git a/runtime/doc/tags b/runtime/doc/tags index b9c16fae9..35f00c387 100644 --- a/runtime/doc/tags +++ b/runtime/doc/tags @@ -4170,6 +4170,7 @@ added-5.8 version5.txt /*added-5.8* added-6.1 version6.txt /*added-6.1* added-6.2 version6.txt /*added-6.2* added-6.3 version6.txt /*added-6.3* +added-6.4 version6.txt /*added-6.4* added-BeOS version5.txt /*added-BeOS* added-Mac version5.txt /*added-Mac* added-VMS version5.txt /*added-VMS* @@ -4405,6 +4406,7 @@ changed-5.8 version5.txt /*changed-5.8* changed-6.1 version6.txt /*changed-6.1* changed-6.2 version6.txt /*changed-6.2* changed-6.3 version6.txt /*changed-6.3* +changed-6.4 version6.txt /*changed-6.4* changelist motion.txt /*changelist* changelog.vim syntax.txt /*changelog.vim* changetick eval.txt /*changetick* @@ -4910,6 +4912,7 @@ fixed-5.8 version5.txt /*fixed-5.8* fixed-6.1 version6.txt /*fixed-6.1* fixed-6.2 version6.txt /*fixed-6.2* fixed-6.3 version6.txt /*fixed-6.3* +fixed-6.4 version6.txt /*fixed-6.4* fname_diff-variable eval.txt /*fname_diff-variable* fname_in-variable eval.txt /*fname_in-variable* fname_new-variable eval.txt /*fname_new-variable* @@ -6275,6 +6278,7 @@ repeat.txt repeat.txt /*repeat.txt* repeating repeat.txt /*repeating* replacing change.txt /*replacing* replacing-ex insert.txt /*replacing-ex* +reselect-Visual visual.txt /*reselect-Visual* resolve() eval.txt /*resolve()* restore-position tips.txt /*restore-position* restricted-mode starting.txt /*restricted-mode* @@ -7088,6 +7092,7 @@ version-5.8 version5.txt /*version-5.8* version-6.1 version6.txt /*version-6.1* version-6.2 version6.txt /*version-6.2* version-6.3 version6.txt /*version-6.3* +version-6.4 version6.txt /*version-6.4* version-variable eval.txt /*version-variable* version4.txt version4.txt /*version4.txt* version5.txt version5.txt /*version5.txt* diff --git a/runtime/ftplugin/jsp.vim b/runtime/ftplugin/jsp.vim index 4968aabd0..4987cc5c5 100644 --- a/runtime/ftplugin/jsp.vim +++ b/runtime/ftplugin/jsp.vim @@ -1,7 +1,7 @@ " Vim filetype plugin file " Language: jsp " Maintainer: Dan Sharp <dwsharp at hotmail dot com> -" Last Changed: 2004 Jul 08 +" Last Changed: 2005 Oct 10 " URL: http://mywebpage.netscape.com/sharppeople/vim/ftplugin if exists("b:did_ftplugin") | finish | endif @@ -46,7 +46,7 @@ if exists ("b:browsefilter") let s:browsefilter = b:browsefilter . s:browsefilter endif if exists("b:match_words") - let s:match_words = b:match_words . ',' . s:matchwords + let s:match_words = b:match_words . ',' . s:match_words endif " Load the combined list of match_words for matchit.vim diff --git a/runtime/indent/ocaml.vim b/runtime/indent/ocaml.vim index 634d69326..818b31bbc 100644 --- a/runtime/indent/ocaml.vim +++ b/runtime/indent/ocaml.vim @@ -1,16 +1,16 @@ " Vim indent file " Language: OCaml -" Maintainers: Jean-Francois Yuen <jfyuen@happycoders.org> -" Mike Leary <leary@nwlink.com> -" Markus Mottl <markus@oefai.at> -" URL: http://www.oefai.at/~markus/vim/indent/ocaml.vim -" Last Change: 2004 Apr 11 - Added indent for 'class' (JY) -" 2003 Sep 16 - Added 'private' as keyword (JY) -" 2003 Mar 29 - Fixed bug with 'if' and 'else' (JY) +" Maintainers: Jean-Francois Yuen <jfyuen@happycoders.org> +" Mike Leary <leary@nwlink.com> +" Markus Mottl <markus.mottl@gmail.com> +" URL: http://www.ocaml.info/vim/indent/ocaml.vim +" Last Change: 2005 Jun 25 - Fixed multiple bugs due to 'else\nreturn ind' working +" 2005 May 09 - Added an option to not indent OCaml-indents specially (MM) +" 2005 Apr 11 - Fixed an indentation bug concerning "let" (MM) " Only load this indent file when no other was loaded. if exists("b:did_indent") - finish + finish endif let b:did_indent = 1 @@ -22,14 +22,16 @@ setlocal nosmartindent setlocal textwidth=80 " Comment formatting -if (has("comments")) - setlocal comments=sr:(*,mb:*,ex:*) - setlocal fo=cqort +if !exists("no_ocaml_comments") + if (has("comments")) + setlocal comments=sr:(*,mb:*,ex:*) + setlocal fo=cqort + endif endif " Only define the function once. if exists("*GetOCamlIndent") - finish + finish endif " Define some patterns: @@ -42,254 +44,209 @@ let s:obj = '^\s*\(constraint\|inherit\|initializer\|method\|val\)\>\|\<\(object let s:type = '^\s*\%(class\|let\|type\)\>.*=' " Skipping pattern, for comments -function s:SkipPattern(lnum, pat) - let def = prevnonblank(a:lnum - 1) - while def > 0 && getline(def) =~ a:pat - let def = prevnonblank(def - 1) - endwhile - return def +function s:GetLineWithoutFullComment(lnum) + let lnum = prevnonblank(a:lnum - 1) + let lline = substitute(getline(lnum), '(\*.*\*)\s*$', '', '') + while lline =~ '^\s*$' && lnum > 0 + let lnum = prevnonblank(lnum - 1) + let lline = substitute(getline(lnum), '(\*.*\*)\s*$', '', '') + endwhile + return lnum endfunction " Indent for ';;' to match multiple 'let' function s:GetInd(lnum, pat, lim) - let llet = search(a:pat, 'bW') - let old = indent(a:lnum) - while llet > 0 - let old = indent(llet) - let nb = s:SkipPattern(llet, '^\s*(\*.*\*)\s*$') - if getline(nb) =~ a:lim - return old - endif - let llet = search(a:pat, 'bW') - endwhile - return old + let llet = search(a:pat, 'bW') + let old = indent(a:lnum) + while llet > 0 + let old = indent(llet) + let nb = s:GetLineWithoutFullComment(llet) + if getline(nb) =~ a:lim + return old + endif + let llet = search(a:pat, 'bW') + endwhile + return old endfunction " Indent pairs function s:FindPair(pstart, pmid, pend) - call search(a:pend, 'bW') - return indent(searchpair(a:pstart, a:pmid, a:pend, 'bWn', 'synIDattr(synID(line("."), col("."), 0), "name") =~? "string\\|comment"')) + call search(a:pend, 'bW') + return indent(searchpair(a:pstart, a:pmid, a:pend, 'bWn', 'synIDattr(synID(line("."), col("."), 0), "name") =~? "string\\|comment"')) endfunction " Indent 'let' function s:FindLet(pstart, pmid, pend) - call search(a:pend, 'bW') - return indent(searchpair(a:pstart, a:pmid, a:pend, 'bWn', 'synIDattr(synID(line("."), col("."), 0), "name") =~? "string\\|comment" || getline(".") =~ "^\\s*let\\>.*=.*\\<in\\s*$" || getline(prevnonblank(".") - 1) =~ s:beflet')) + call search(a:pend, 'bW') + return indent(searchpair(a:pstart, a:pmid, a:pend, 'bWn', 'synIDattr(synID(line("."), col("."), 0), "name") =~? "string\\|comment" || getline(".") =~ "^\\s*let\\>.*=.*\\<in\\s*$" || getline(prevnonblank(".") - 1) =~ s:beflet')) endfunction function GetOCamlIndent() - " Find a non-blank line above the current line. - let lnum = prevnonblank(v:lnum - 1) - - " At the start of the file use zero indent. - if lnum == 0 - return 0 - endif - - let ind = indent(lnum) - let lline = getline(lnum) - - " Return double 'shiftwidth' after lines matching: - if lline =~ '^\s*|.*->\s*$' - return ind + &sw + &sw - endif - - let line = getline(v:lnum) - - " Indent if current line begins with 'end': - if line =~ '^\s*end\>' - return s:FindPair(s:module, '','\<end\>') - - " Indent if current line begins with 'done' for 'do': - elseif line =~ '^\s*done\>' - return s:FindPair('\<do\>', '','\<done\>') - - " Indent if current line begins with '}' or '>}': - elseif line =~ '^\s*\(\|>\)}' - return s:FindPair('{', '','}') - - " Indent if current line begins with ']', '|]' or '>]': - elseif line =~ '^\s*\(\||\|>\)\]' - return s:FindPair('\[', '','\]') - - " Indent if current line begins with ')': - elseif line =~ '^\s*)' - return s:FindPair('(', '',')') - - " Indent if current line begins with 'let': - elseif line =~ '^\s*let\>' - if lline !~ s:lim . '\|' . s:letlim . '\|' . s:beflet - return s:FindLet(s:type, '','\<let\s*$') - else return ind - endif - - " Indent if current line begins with 'class' or 'type': - elseif line =~ '^\s*\(class\|type\)\>' - if lline !~ s:lim . '\|\<and\s*$\|' . s:letlim - return s:FindLet(s:type, '','\<\(class\|type\)\s*$') - else return ind - endif - - " Indent for pattern matching: - elseif line =~ '^\s*|' - if lline !~ '^\s*\(|[^\]]\|\(match\|type\|with\)\>\)\|\<\(function\|parser\|private\|with\)\s*$' - call search('|', 'bW') - return indent(searchpair('^\s*\(match\|type\)\>\|\<\(function\|parser\|private\|with\)\s*$', '', '^\s*|', 'bWn', 'synIDattr(synID(line("."), col("."), 0), "name") =~? "string\\|comment" || getline(".") !~ "^\\s*|.*->"')) - else return ind - endif - - " Indent if current line begins with ';;': - elseif line =~ '^\s*;;' - if lline !~ ';;\s*$' - return s:GetInd(v:lnum, s:letpat, s:letlim) - else return ind - endif - - " Indent if current line begins with 'in': - elseif line =~ '^\s*in\>' - if lline !~ '^\s*\(let\|and\)\>' - return s:FindPair('\<let\>', '', '\<in\>') - else return ind - endif - - " Indent if current line begins with 'else': - elseif line =~ '^\s*else\>' - if lline !~ '^\s*\(if\|then\)\>' - return s:FindPair('\<if\>', '', '\<else\>') - else return ind - endif - - " Indent if current line begins with 'then': - elseif line =~ '^\s*then\>' - if lline !~ '^\s*\(if\|else\)\>' - return s:FindPair('\<if\>', '', '\<then\>') - else return ind - endif - - " Indent if current line begins with 'and': - elseif line =~ '^\s*and\>' - if lline !~ '^\s*\(and\|let\|type\)\>\|\<end\s*$' - return ind - &sw - else return ind - endif - - " Indent if current line begins with 'with': - elseif line =~ '^\s*with\>' - if lline !~ '^\s*\(match\|try\)\>' - return s:FindPair('\<\%(match\|try\)\>', '','\<with\>') - else return ind - endif - - " Indent if current line begins with 'exception': - elseif line =~ '^\s*exception\>' - if lline !~ s:lim . '\|' . s:letlim - return indent(search('^\s*\(\(external\|include\|open\|type\)\>\|val\>.*:\)', 'bW')) - else return ind - endif - - " Indent if current line begins with 'external': - elseif line =~ '^\s*external\>' - if lline !~ s:lim . '\|' . s:letlim - return indent(search('^\s*\(\(exception\|external\|include\|open\|type\)\>\|val\>.*:\)', 'bW')) - else return ind - endif - - " Indent if current line begins with 'include': - elseif line =~ '^\s*include\>' - if lline !~ s:lim . '\|' . s:letlim - return indent(search('^\s*\(\(exception\|external\|open\|type\)\>\|val\>.*:\)', 'bW')) - else return ind - endif - - " Indent if current line begins with 'open': - elseif line =~ '^\s*open\>' - if lline !~ s:lim . '\|' . s:letlim - return indent(search('^\s*\(\(exception\|external\|include\|type\)\>\|val\>.*:\)', 'bW')) - else return ind - endif - - " Indent if current line begins with 'val': - elseif line =~ '^\s*val\>' - if lline !~ '^\s*\(exception\|external\|include\|open\)\>\|' . s:obj . '\|' . s:letlim - return indent(search('^\s*\(\(exception\|include\|initializer\|method\|open\|type\|val\)\>\|external\>.*:\)', 'bW')) - else return ind - endif - - " Indent if current line begins with 'constraint': - elseif line =~ '^\s*constraint\>' - if lline !~ s:obj - return indent(search('^\s*\(inherit\|initializer\|method\|val\)\>', 'bW')) - else return ind - endif - - " Indent if current line begins with 'inherit': - elseif line =~ '^\s*inherit\>' - if lline !~ s:obj - return indent(search('^\s*\(constraint\|initializer\|method\|val\)\>', 'bW')) - else return ind - endif - - " Indent if current line begins with 'inherit': - elseif line =~ '^\s*initializer\>' - if lline !~ s:obj - return indent(search('^\s*\(constraint\|inherit\|method\|val\)\>', 'bW')) - else return ind - endif - - " Indent if current line begins with 'method': - elseif line =~ '^\s*method\>' - if lline !~ s:obj - return indent(search('^\s*\(\(constraint\|inherit\|initializer\|val\)\>\|method\>.*\(:\|=\)\)', 'bW')) - else return ind - endif - - endif - - " Add a 'shiftwidth' after lines ending with: - if lline =~ '\(:\|=\|->\|<-\|(\|\[\|{\|{<\|\[|\|\[<\|\<\(begin\|do\|else\|fun\|function\|functor\|if\|initializer\|object\|parser\|private\|sig\|struct\|then\|try\)\|\<object\s*(.*)\)\s*$' - let ind = ind + &sw - - " Back to normal indent after lines ending with ';;': - elseif lline =~ ';;\s*$' && lline !~ '^\s*;;' - let ind = s:GetInd(v:lnum, s:letpat, s:letlim) - - " Back to normal indent after lines ending with 'end': - elseif lline =~ '\<end\s*$' - let ind = s:FindPair(s:module, '','\<end\>') - - " Back to normal indent after lines ending with 'in': - elseif lline =~ '\<in\s*$' && lline !~ '^\s*in\>' - let ind = s:FindPair('\<let\>', '', '\<in\>') - - " Back to normal indent after lines ending with 'done': - elseif lline =~ '\<done\s*$' - let ind = s:FindPair('\<do\>', '','\<done\>') - - " Back to normal indent after lines ending with '}' or '>}': - elseif lline =~ '\(\|>\)}\s*$' - let ind = s:FindPair('{', '','}') - - " Back to normal indent after lines ending with ']', '|]' or '>]': - elseif lline =~ '\(\||\|>\)\]\s*$' - let ind = s:FindPair('\[', '','\]') - - " Back to normal indent after comments: - elseif lline =~ '\*)\s*$' - call search('\*)', 'bW') - let ind = indent(searchpair('(\*', '', '\*)', 'bWn', 'synIDattr(synID(line("."), col("."), 0), "name") =~? "string"')) - - " Back to normal indent after lines ending with ')': - elseif lline =~ ')\s*$' - let ind = s:FindPair('(', '',')') - - endif - - " Subtract a 'shiftwidth' after lines matching 'match ... with parser': - if lline =~ '^\s*match\>.*\<with\>\s*\<parser\s*$' - let ind = ind - &sw - endif - - return ind + " Find a non-commented line above the current line. + let lnum = s:GetLineWithoutFullComment(v:lnum) + + " At the start of the file use zero indent. + if lnum == 0 + return 0 + endif + + let ind = indent(lnum) + let lline = substitute(getline(lnum), '(\*.*\*)\s*$', '', '') + + " Return double 'shiftwidth' after lines matching: + if lline =~ '^\s*|.*->\s*$' + return ind + &sw + &sw + endif + + let line = getline(v:lnum) + + " Indent if current line begins with 'end': + if line =~ '^\s*end\>' + return s:FindPair(s:module, '','\<end\>') + + " Indent if current line begins with 'done' for 'do': + elseif line =~ '^\s*done\>' + return s:FindPair('\<do\>', '','\<done\>') + + " Indent if current line begins with '}' or '>}': + elseif line =~ '^\s*\(\|>\)}' + return s:FindPair('{', '','}') + + " Indent if current line begins with ']', '|]' or '>]': + elseif line =~ '^\s*\(\||\|>\)\]' + return s:FindPair('\[', '','\]') + + " Indent if current line begins with ')': + elseif line =~ '^\s*)' + return s:FindPair('(', '',')') + + " Indent if current line begins with 'let': + elseif line =~ '^\s*let\>' + if lline !~ s:lim . '\|' . s:letlim . '\|' . s:beflet + return s:FindLet(s:type, '','\<let\s*$') + endif + + " Indent if current line begins with 'class' or 'type': + elseif line =~ '^\s*\(class\|type\)\>' + if lline !~ s:lim . '\|\<and\s*$\|' . s:letlim + return s:FindLet(s:type, '','\<\(class\|type\)\s*$') + endif + + " Indent for pattern matching: + elseif line =~ '^\s*|' + if lline !~ '^\s*\(|[^\]]\|\(match\|type\|with\)\>\)\|\<\(function\|parser\|private\|with\)\s*$' + call search('|', 'bW') + return indent(searchpair('^\s*\(match\|type\)\>\|\<\(function\|parser\|private\|with\)\s*$', '', '^\s*|', 'bWn', 'synIDattr(synID(line("."), col("."), 0), "name") =~? "string\\|comment" || getline(".") !~ "^\\s*|.*->"')) + endif + + " Indent if current line begins with ';;': + elseif line =~ '^\s*;;' + if lline !~ ';;\s*$' + return s:GetInd(v:lnum, s:letpat, s:letlim) + endif + + " Indent if current line begins with 'in': + elseif line =~ '^\s*in\>' + if lline !~ '^\s*\(let\|and\)\>' + return s:FindPair('\<let\>', '', '\<in\>') + endif + + " Indent if current line begins with 'else': + elseif line =~ '^\s*else\>' + if lline !~ '^\s*\(if\|then\)\>' + return s:FindPair('\<if\>', '', '\<else\>') + endif + + " Indent if current line begins with 'then': + elseif line =~ '^\s*then\>' + if lline !~ '^\s*\(if\|else\)\>' + return s:FindPair('\<if\>', '', '\<then\>') + endif + + " Indent if current line begins with 'and': + elseif line =~ '^\s*and\>' + if lline !~ '^\s*\(and\|let\|type\)\>\|\<end\s*$' + return ind - &sw + endif + + " Indent if current line begins with 'with': + elseif line =~ '^\s*with\>' + if lline !~ '^\s*\(match\|try\)\>' + return s:FindPair('\<\%(match\|try\)\>', '','\<with\>') + endif + + " Indent if current line begins with 'exception', 'external', 'include' or + " 'open': + elseif line =~ '^\s*\(exception\|external\|include\|open\)\>' + if lline !~ s:lim . '\|' . s:letlim + call search(line) + return indent(search('^\s*\(\(exception\|external\|include\|open\|type\)\>\|val\>.*:\)', 'bW')) + endif + + " Indent if current line begins with 'val': + elseif line =~ '^\s*val\>' + if lline !~ '^\s*\(exception\|external\|include\|open\)\>\|' . s:obj . '\|' . s:letlim + return indent(search('^\s*\(\(exception\|include\|initializer\|method\|open\|type\|val\)\>\|external\>.*:\)', 'bW')) + endif + + " Indent if current line begins with 'constraint', 'inherit', 'initializer' + " or 'method': + elseif line =~ '^\s*\(constraint\|inherit\|initializer\|method\)\>' + if lline !~ s:obj + return indent(search('\<\(object\|object\s*(.*)\)\s*$', 'bW')) + &sw + endif + + endif + + " Add a 'shiftwidth' after lines ending with: + if lline =~ '\(:\|=\|->\|<-\|(\|\[\|{\|{<\|\[|\|\[<\|\<\(begin\|do\|else\|fun\|function\|functor\|if\|initializer\|object\|parser\|private\|sig\|struct\|then\|try\)\|\<object\s*(.*)\)\s*$' + let ind = ind + &sw + + " Back to normal indent after lines ending with ';;': + elseif lline =~ ';;\s*$' && lline !~ '^\s*;;' + let ind = s:GetInd(v:lnum, s:letpat, s:letlim) + + " Back to normal indent after lines ending with 'end': + elseif lline =~ '\<end\s*$' + let ind = s:FindPair(s:module, '','\<end\>') + + " Back to normal indent after lines ending with 'in': + elseif lline =~ '\<in\s*$' && lline !~ '^\s*in\>' + let ind = s:FindPair('\<let\>', '', '\<in\>') + + " Back to normal indent after lines ending with 'done': + elseif lline =~ '\<done\s*$' + let ind = s:FindPair('\<do\>', '','\<done\>') + + " Back to normal indent after lines ending with '}' or '>}': + elseif lline =~ '\(\|>\)}\s*$' + let ind = s:FindPair('{', '','}') + + " Back to normal indent after lines ending with ']', '|]' or '>]': + elseif lline =~ '\(\||\|>\)\]\s*$' + let ind = s:FindPair('\[', '','\]') + + " Back to normal indent after comments: + elseif lline =~ '\*)\s*$' + call search('\*)', 'bW') + let ind = indent(searchpair('(\*', '', '\*)', 'bWn', 'synIDattr(synID(line("."), col("."), 0), "name") =~? "string"')) + + " Back to normal indent after lines ending with ')': + elseif lline =~ ')\s*$' + let ind = s:FindPair('(', '',')') + + " If this is a multiline comment then align '*': + elseif lline =~ '^\s*(\*' && line =~ '^\s*\*' + let ind = ind + 1 + + endif + + " Subtract a 'shiftwidth' after lines matching 'match ... with parser': + if lline =~ '\<match\>.*\<with\>\s*\<parser\s*$' + let ind = ind - &sw + endif + + return ind endfunction diff --git a/src/auto/configure b/src/auto/configure index 6c294ebc7..1056c0b1b 100755 --- a/src/auto/configure +++ b/src/auto/configure @@ -16051,7 +16051,7 @@ fi DEPEND_CFLAGS_FILTER= if test "$GCC" = yes; then gccmajor=`"$CC" --version | sed -e '2,$d;s/^[^0-9]*\([3-9]\)\.[0-9.]*.*$/\1/g'` - if test "$gccmajor" = ""; then + if test "$gccmajor" != ""; then DEPEND_CFLAGS_FILTER="| sed 's+-I */+-isystem /+g'" fi fi diff --git a/src/version.h b/src/version.h index 9f4e28676..3434c6555 100644 --- a/src/version.h +++ b/src/version.h @@ -36,5 +36,5 @@ #define VIM_VERSION_NODOT "vim70aa" #define VIM_VERSION_SHORT "7.0aa" #define VIM_VERSION_MEDIUM "7.0aa ALPHA" -#define VIM_VERSION_LONG "VIM - Vi IMproved 7.0aa ALPHA (2005 Oct 10)" -#define VIM_VERSION_LONG_DATE "VIM - Vi IMproved 7.0aa ALPHA (2005 Oct 10, compiled " +#define VIM_VERSION_LONG "VIM - Vi IMproved 7.0aa ALPHA (2005 Oct 11)" +#define VIM_VERSION_LONG_DATE "VIM - Vi IMproved 7.0aa ALPHA (2005 Oct 11, compiled " |