aboutsummaryrefslogtreecommitdiff
path: root/runtime/syntax
diff options
context:
space:
mode:
authorJustin M. Keyes <justinkz@gmail.com>2016-04-19 00:29:09 -0400
committerJustin M. Keyes <justinkz@gmail.com>2016-04-19 00:29:09 -0400
commitf3d6c443d98e06adcb3bfb7e7edd4d9be9588092 (patch)
tree39faca31e1e2fce05d448387beeab078a93e4d3f /runtime/syntax
parent1b1b920ba8f40a47e7fe7ce4968c7017878635d4 (diff)
parentbf6351022818c90654b0152c449fd7a2dee81271 (diff)
downloadrneovim-f3d6c443d98e06adcb3bfb7e7edd4d9be9588092.tar.gz
rneovim-f3d6c443d98e06adcb3bfb7e7edd4d9be9588092.tar.bz2
rneovim-f3d6c443d98e06adcb3bfb7e7edd4d9be9588092.zip
Merge pull request #4602 from dbarnett/vim-12969c0
vim-patch:12969c0
Diffstat (limited to 'runtime/syntax')
-rw-r--r--runtime/syntax/gnuplot.vim33
-rw-r--r--runtime/syntax/rst.vim4
2 files changed, 19 insertions, 18 deletions
diff --git a/runtime/syntax/gnuplot.vim b/runtime/syntax/gnuplot.vim
index 03d813c99f..d85932d401 100644
--- a/runtime/syntax/gnuplot.vim
+++ b/runtime/syntax/gnuplot.vim
@@ -1,8 +1,9 @@
" Vim syntax file
" Language: gnuplot 4.7.0
-" Maintainer: Andrew Rasmussen andyras@users.sourceforge.net
+" Maintainer: Josh Wainwright <wainwright DOT ja AT gmail DOT com>
+" Last Maintainer: Andrew Rasmussen andyras@users.sourceforge.net
" Original Maintainer: John Hoelzel johnh51@users.sourceforge.net
-" Last Change: 2014-02-24
+" Last Change: 2015-08-25
" Filenames: *.gnu *.plt *.gpi *.gih *.gp *.gnuplot scripts: #!*gnuplot
" URL: http://www.vim.org/scripts/script.php?script_id=4873
" Original URL: http://johnh51.get.to/vim/syntax/gnuplot.vim
@@ -364,18 +365,18 @@ syn keyword gnuplotKeyword samples
" set size
syn keyword gnuplotKeyword size square nosquare ratio noratio
" set style
-syn keyword gnuplotKeyword style function data noborder rectangle arrow
-syn keyword gnuplotKeyword default nohead head heads size filled empty
-syn keyword gnuplotKeyword nofilled front back boxplot range fraction
-syn keyword gnuplotKeyword outliers nooutliers pointtype candlesticks
-syn keyword gnuplotKeyword separation labels off auto x x2 sorted unsorted
-syn keyword gnuplotKeyword fill empty transparent solid pattern border
-syn keyword gnuplotKeyword increment userstyles financebars line default
-syn keyword gnuplotKeyword linetype lt linecolor lc linewidth lw pointtype
-syn keyword gnuplotKeyword pt pointsize ps pointinterval pi palette circle
-syn keyword gnuplotKeyword radius graph screen wedge nowedge ellipse size
-syn keyword gnuplotKeyword units xx xy yy histogram line textbox opaque
-syn keyword gnuplotKeyword border noborder
+syn keyword gnuplotKeyword style arrow auto back border boxplot
+syn keyword gnuplotKeyword candlesticks circle clustered columnstacked data
+syn keyword gnuplotKeyword default ellipse empty fill[ed] financebars
+syn keyword gnuplotKeyword fraction front function gap graph head[s]
+syn keyword gnuplotKeyword histogram increment labels lc line linecolor
+syn keyword gnuplotKeyword linetype linewidth lt lw noborder nofilled
+syn keyword gnuplotKeyword nohead nooutliers nowedge off opaque outliers
+syn keyword gnuplotKeyword palette pattern pi pointinterval pointsize
+syn keyword gnuplotKeyword pointtype ps pt radius range rectangle
+syn keyword gnuplotKeyword rowstacked screen separation size solid sorted
+syn keyword gnuplotKeyword textbox transparent units unsorted userstyles
+syn keyword gnuplotKeyword wedge x x2 xx xy yy
" set surface
syn keyword gnuplotKeyword surface implicit explicit
" set table
@@ -496,8 +497,8 @@ syn keyword gnuplotTodo contained TODO FIXME XXX
syn keyword gnuplotStatement cd call clear evaluate exit fit help history
syn keyword gnuplotStatement load lower pause plot p print pwd quit raise
syn keyword gnuplotStatement refresh replot rep reread reset save set show
-syn keyword gnuplotStatement shell splot spstats system test undefine unset
-syn keyword gnuplotStatement update
+syn keyword gnuplotStatement shell splot spstats stats system test undefine
+syn keyword gnuplotStatement unset update
" ---- Define the default highlighting ---- "
" For version 5.7 and earlier: only when not done already
diff --git a/runtime/syntax/rst.vim b/runtime/syntax/rst.vim
index c1f25699e7..8b17104be4 100644
--- a/runtime/syntax/rst.vim
+++ b/runtime/syntax/rst.vim
@@ -2,7 +2,7 @@
" Language: reStructuredText documentation format
" Maintainer: Marshall Ward <marshall.ward@gmail.com>
" Previous Maintainer: Nikolai Weibull <now@bitwi.se>
-" Latest Revision: 2014-10-03
+" Latest Revision: 2015-09-07
if exists("b:current_syntax")
finish
@@ -81,7 +81,7 @@ syn region rstHyperlinkTarget matchgroup=rstDirective
execute 'syn region rstExDirective contained matchgroup=rstDirective' .
\ ' start=+' . s:ReferenceName . '::\_s+' .
\ ' skip=+^$+' .
- \ ' end=+^\s\@!+ contains=@rstCruft'
+ \ ' end=+^\s\@!+ contains=@rstCruft,rstLiteralBlock'
execute 'syn match rstSubstitutionDefinition contained' .
\ ' /|' . s:ReferenceName . '|\_s\+/ nextgroup=@rstDirectives'