Updated runtime files.

diff --git a/runtime/doc/repeat.txt b/runtime/doc/repeat.txt
index 01be75accd14e6f9c573a888c8d5710663fd1dad..af3a5182ae843e690c9e53b210202021efbd92fe 100644 (file)
--- a/runtime/doc/repeat.txt
+++ b/runtime/doc/repeat.txt
@@ -1,4 +1,4 @@
-*repeat.txt*    For Vim version 7.4.  Last change: 2015 Jan 07
+*repeat.txt*    For Vim version 7.4.  Last change: 2015 Apr 13
 
 
                  VIM REFERENCE MANUAL    by Bram Moolenaar
@@ -600,6 +600,7 @@ For example, to profile the one_script.vim script file: >
 
 :prof[ile] start {fname}                       *:prof* *:profile* *E750*
                Start profiling, write the output in {fname} upon exit.
+               "~/" and environment variables in {fname} will be expanded.
                If {fname} already exists it will be silently overwritten.
                The variable |v:profiling| is set to one.
 

diff --git a/runtime/doc/todo.txt b/runtime/doc/todo.txt
index acf8c33fc408889dcf513668adc1056cf464a9dc..4a441d7894031c542a40f6ce65e18851aba1b9b2 100644 (file)
--- a/runtime/doc/todo.txt
+++ b/runtime/doc/todo.txt
@@ -1,4 +1,4 @@
-*todo.txt*      For Vim version 7.4.  Last change: 2015 Apr 13
+*todo.txt*      For Vim version 7.4.  Last change: 2015 Apr 15
 
 
                  VIM REFERENCE MANUAL    by Bram Moolenaar
@@ -68,22 +68,9 @@ Regexp problems:
 - this doesn't work: "syntax match ErrorMsg /.\%9l\%>20c\&\%<28c/".  Leaving
   out the \& works.  Seems any column check after \& fails.
 
-Check out neovim bug reports that apply to Vim:
-https://github.com/neovim/neovim/issues?q=label%3Abug-vim
-Specifically:
-https://github.com/neovim/neovim/commit/cf8e175cf54281bcad5e704308e92ebb3e6381d3
-https://github.com/neovim/neovim/commit/d7038127ca6b356ad33fdec08aa3b23ac6a817af
-https://github.com/neovim/neovim/commit/77ace65bdce379f2d9b13ee81ab3fc01951f92dc
-https://patch-diff.githubusercontent.com/raw/neovim/neovim/pull/2390.patch
-And also:
-https://github.com/neovim/neovim/pull/2157/commits
-
 Still using freed memory after using setloclist(). (lcd, 2014 Jul 23)
 More info Jul 24.  Not clear why.
 
-Patch to fix issues with locked and fixed variables.
-(Ola Dabrunz, 2015 Apr 11, update Apr 12)
-
 Better .ico file for Windows. (Pat Suwalski, 2015 Feb 13)
 Waiting for response on remark from Edward Fox.
 
@@ -368,7 +355,7 @@ Editing an ascii file as ucs-2 or ucs-4 causes display errors.
 ":Next 1 some-arg" does not complain about trailing argument.  Also for
 various other commands.  (ZyX, 2014 Mar 30)
 
-patch to skip sort if no line matches the expression.
+Patch to skip sort if no line matches the expression.
 (Christian Brabandt, 2014 Jun 25)
 
 Patch to add sortuniq(). (Cade Forester, 2014 Mar 19)
@@ -459,9 +446,6 @@ When evaluating expression in backticks, autoload doesn't work.
 Using <nr>ifoobar<esc> can slow down Vim.  Patch by Christian Brabandt, 2013
 Dec 13.
 
-Fold can't be opened after ":move". (Ein Brown)
-Patch from Christian Brabandt doesn't fix it completely.
-
 Patch from Christian Brabandt to preserve upper case marks when wiping out a
 buffer. (2013 Dec 9)
 

diff --git a/runtime/syntax/groovy.vim b/runtime/syntax/groovy.vim
index 2056bd16d0c839c38dfb19a9039e9b3cfa90325d..fb788c9397ddeac811a95fbec03e3fb327a868ed 100644 (file)
--- a/runtime/syntax/groovy.vim
+++ b/runtime/syntax/groovy.vim
@@ -4,7 +4,7 @@
 " Maintainer:  Tobias Rapp <yahuxo@gmx.de>
 " Version:     0.1.13
 " URL:   http://www.vim.org/scripts/script.php?script_id=945
-" Last Change: 2013 Apr 24
+" Last Change: 2015 Apr 13
 
 " THE ORIGINAL AUTHOR'S NOTES:
 "
@@ -220,7 +220,6 @@ syn region  groovyComment          start="/\*"  end="\*/" contains=@groovyCommen
 syn match   groovyCommentStar      contained "^\s*\*[^/]"me=e-1
 syn match   groovyCommentStar      contained "^\s*\*$"
 syn match   groovyLineComment      "//.*" contains=@groovyCommentSpecial2,groovyTodo,@Spell
-syn match   groovyLineComment      "#.*" contains=@groovyCommentSpecial2,groovyTodo,@Spell
 GroovyHiLink groovyCommentString groovyString
 GroovyHiLink groovyComment2String groovyString
 GroovyHiLink groovyCommentCharacter groovyCharacter

diff --git a/runtime/syntax/sh.vim b/runtime/syntax/sh.vim
index 1aa579481a409d86729bc62b70c0c8b745b08d97..ad0df1f117b4d591f8f732ec8a6bc3d2424c6026 100644 (file)
--- a/runtime/syntax/sh.vim
+++ b/runtime/syntax/sh.vim
@@ -2,8 +2,8 @@
 " Language:            shell (sh) Korn shell (ksh) bash (sh)
 " Maintainer:          Charles E. Campbell  <NdrOchipS@PcampbellAfamily.Mbiz>
 " Previous Maintainer: Lennart Schultz <Lennart.Schultz@ecmwf.int>
-" Last Change:         Apr 02, 2015
-" Version:             135
+" Last Change:         Apr 10, 2015
+" Version:             136
 " URL:         http://www.drchip.org/astronaut/vim/index.html#SYNTAX_SH
 " For options and settings, please use:      :help ft-sh-syntax
 " This file includes many ideas from ?ric Brunet (eric.brunet@ens.fr)
@@ -127,7 +127,7 @@ syn cluster shHereList      contains=shBeginHere,shHerePayload
 syn cluster shHereListDQ       contains=shBeginHere,@shDblQuoteList,shHerePayload
 syn cluster shIdList   contains=shCommandSub,shWrapLineOperator,shSetOption,shDeref,shDerefSimple,shRedir,shExSingleQuote,shExDoubleQuote,shSingleQuote,shDoubleQuote,shExpr,shCtrlSeq,shStringSpecial,shAtExpr
 syn cluster shIfList   contains=@shLoopList,shDblBrace,shDblParen,shFunctionKey,shFunctionOne,shFunctionTwo
-syn cluster shLoopList contains=@shCaseLis,t@shErrorList,shCaseEsac,shConditional,shDblBrace,shExpr,shFor,shForPP,shIf,shOption,shSet,shTest,shTestOpr
+syn cluster shLoopList contains=@shCaseList,@shErrorList,shCaseEsac,shConditional,shDblBrace,shExpr,shFor,shForPP,shIf,shOption,shSet,shTest,shTestOpr
 syn cluster shSubShList        contains=@shCommandSubList,shCaseEsac,shColon,shCommandSub,shComment,shDo,shEcho,shExpr,shFor,shIf,shRedir,shSetList,shSource,shStatement,shVariable,shCtrlSeq,shOperator
 syn cluster shTestList contains=shCharClass,shCommandSub,shComment,shCtrlSeq,shDeref,shDerefSimple,shDoubleQuote,shExDoubleQuote,shExpr,shExSingleQuote,shNumber,shOperator,shSingleQuote,shTest,shTestOpr
 " Echo: {{{1