updated for version 7.0156

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*

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

runtime/indent/ocaml.vim

@@ -2,11 +2,11 @@
 " Language:     OCaml
 " Maintainers:  Jean-Francois Yuen   <jfyuen@happycoders.org>
 "               Mike Leary           <leary@nwlink.com>
-"               Markus Mottl        <markus@oefai.at>
+"               Markus Mottl         <markus.mottl@gmail.com>
-" URL:          http://www.oefai.at/~markus/vim/indent/ocaml.vim
+" URL:          http://www.ocaml.info/vim/indent/ocaml.vim
-" Last Change:  2004 Apr 11 - Added indent for 'class' (JY)
+" Last Change:  2005 Jun 25 - Fixed multiple bugs due to 'else\nreturn ind' working
-"               2003 Sep 16 - Added 'private' as keyword (JY)
+"               2005 May 09 - Added an option to not indent OCaml-indents specially (MM)
-"               2003 Mar 29 - Fixed bug with 'if' and 'else' (JY)
+"               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")
@@ -22,9 +22,11 @@ setlocal nosmartindent
 setlocal textwidth=80
 
 " Comment formatting
-if (has("comments"))
+if !exists("no_ocaml_comments")
+ if (has("comments"))
    setlocal comments=sr:(*,mb:*,ex:*)
    setlocal fo=cqort
+ endif
 endif
 
 " Only define the function once.
@@ -42,12 +44,14 @@ 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)
+function s:GetLineWithoutFullComment(lnum)
-  let def = prevnonblank(a:lnum - 1)
+ let lnum = prevnonblank(a:lnum - 1)
-  while def > 0 && getline(def) =~ a:pat
+ let lline = substitute(getline(lnum), '(\*.*\*)\s*$', '', '')
-    let def = prevnonblank(def - 1)
+ while lline =~ '^\s*$' && lnum > 0
+   let lnum = prevnonblank(lnum - 1)
+   let lline = substitute(getline(lnum), '(\*.*\*)\s*$', '', '')
  endwhile
-  return def
+ return lnum
 endfunction
 
 " Indent for ';;' to match multiple 'let'
@@ -56,7 +60,7 @@ function s:GetInd(lnum, pat, lim)
  let old = indent(a:lnum)
  while llet > 0
    let old = indent(llet)
-    let nb = s:SkipPattern(llet, '^\s*(\*.*\*)\s*$')
+   let nb = s:GetLineWithoutFullComment(llet)
    if getline(nb) =~ a:lim
      return old
    endif
@@ -78,8 +82,8 @@ function s:FindLet(pstart, pmid, pend)
 endfunction
 
 function GetOCamlIndent()
-  " Find a non-blank line above the current line.
+ " Find a non-commented line above the current line.
-  let lnum = prevnonblank(v:lnum - 1)
+ let lnum = s:GetLineWithoutFullComment(v:lnum)
 
  " At the start of the file use zero indent.
  if lnum == 0
@@ -87,7 +91,7 @@ function GetOCamlIndent()
  endif
 
  let ind = indent(lnum)
-  let lline = getline(lnum)
+ let lline = substitute(getline(lnum), '(\*.*\*)\s*$', '', '')
 
  " Return double 'shiftwidth' after lines matching:
  if lline =~ '^\s*|.*->\s*$'
@@ -120,14 +124,12 @@ function GetOCamlIndent()
  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:
@@ -135,112 +137,63 @@ function GetOCamlIndent()
    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':
+ " Indent if current line begins with 'exception', 'external', 'include' or
-  elseif line =~ '^\s*exception\>'
+ " 'open':
-    if lline !~ s:lim . '\|' . s:letlim
+ elseif line =~ '^\s*\(exception\|external\|include\|open\)\>'
-      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
+     call search(line)
      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':
+ " Indent if current line begins with 'constraint', 'inherit', 'initializer'
-  elseif line =~ '^\s*constraint\>'
+ " or 'method':
+ elseif line =~ '^\s*\(constraint\|inherit\|initializer\|method\)\>'
    if lline !~ s:obj
-      return indent(search('^\s*\(inherit\|initializer\|method\|val\)\>', 'bW'))
+     return indent(search('\<\(object\|object\s*(.*)\)\s*$', 'bW')) + &sw
-    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
@@ -282,10 +235,14 @@ function GetOCamlIndent()
  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 =~ '^\s*match\>.*\<with\>\s*\<parser\s*$'
+ if lline =~ '\<match\>.*\<with\>\s*\<parser\s*$'
    let ind = ind - &sw
  endif
 

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

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	"VIM - Vi IMproved 7.0aa ALPHA (2005 Oct 11)"
-#define VIM_VERSION_LONG_DATE	"VIM - Vi IMproved 7.0aa ALPHA (2005 Oct 10, compiled "
+#define VIM_VERSION_LONG_DATE	"VIM - Vi IMproved 7.0aa ALPHA (2005 Oct 11, compiled "