summaryrefslogtreecommitdiffstats
path: root/runtime/syntax
diff options
context:
space:
mode:
authorBram Moolenaar <Bram@vim.org>2010-02-11 14:19:15 +0100
committerBram Moolenaar <Bram@vim.org>2010-02-11 14:19:15 +0100
commit6dfc28be25dc1e4323b6652fa517e972007ff1bd (patch)
treeff19f5d6d935e56922bafdcab481d25d3ddbf759 /runtime/syntax
parentcee6a352b23c8e444d4e0f4a219c288da1b19f76 (diff)
Updated runtime files.
Diffstat (limited to 'runtime/syntax')
-rw-r--r--runtime/syntax/indent.vim5
-rw-r--r--runtime/syntax/lilo.vim4
-rw-r--r--runtime/syntax/rst.vim4
-rw-r--r--runtime/syntax/zsh.vim4
4 files changed, 9 insertions, 8 deletions
diff --git a/runtime/syntax/indent.vim b/runtime/syntax/indent.vim
index 4070769fc4..389101a522 100644
--- a/runtime/syntax/indent.vim
+++ b/runtime/syntax/indent.vim
@@ -1,7 +1,7 @@
" Vim syntax file
" Language: indent(1) configuration file
" Maintainer: Nikolai Weibull <now@bitwi.se>
-" Latest Revision: 2007-06-17
+" Latest Revision: 2010-01-23
" indent_is_bsd: If exists, will change somewhat to match BSD implementation
"
" TODO: is the deny-all (a la lilo.vim nice or no?)...
@@ -27,7 +27,7 @@ syn region indentComment start='//' skip='\\$' end='$'
\ contains=indentTodo,@Spell
if !exists("indent_is_bsd")
- syn match indentOptions '-i\|--indentation-level'
+ syn match indentOptions '-i\|--indentation-level\|-il\|--indent-level'
\ nextgroup=indentNumber skipwhite skipempty
endif
syn match indentOptions '-\%(bli\|c\%([bl]i\|[dip]\)\=\|di\=\|ip\=\|lc\=\|pp\=i\|sbi\|ts\|-\%(brace-indent\|comment-indentation\|case-brace-indentation\|declaration-comment-column\|continuation-indentation\|case-indentation\|else-endif-column\|line-comments-indentation\|declaration-indentation\|indent-level\|parameter-indentation\|line-length\|comment-line-length\|paren-indentation\|preprocessor-indentation\|struct-brace-indentation\|tab-size\)\)'
@@ -123,6 +123,7 @@ syn keyword indentOptions -bacc --blank-lines-after-ifdefs
\ -ut --use-tabs
\ -v --verbose
\ -version --version
+ \ -linux --linux-style
if exists("indent_is_bsd")
syn keyword indentOptions -ip -ei -nei
diff --git a/runtime/syntax/lilo.vim b/runtime/syntax/lilo.vim
index 14bd940ee5..3e9459267b 100644
--- a/runtime/syntax/lilo.vim
+++ b/runtime/syntax/lilo.vim
@@ -1,8 +1,8 @@
" Vim syntax file
" Language: lilo configuration (lilo.conf)
-" Maintainer: help wanted!
+" Maintainer: Niels Horn <niels.horn@gmail.com>
" Previous Maintainer: David Necas (Yeti) <yeti@physics.muni.cz>
-" Last Change: 2009-01-27
+" Last Change: 2010-02-03
" Setup
if version >= 600
diff --git a/runtime/syntax/rst.vim b/runtime/syntax/rst.vim
index 245c3aedf2..acb56163b3 100644
--- a/runtime/syntax/rst.vim
+++ b/runtime/syntax/rst.vim
@@ -1,7 +1,7 @@
" Vim syntax file
" Language: reStructuredText documentation format
" Maintainer: Nikolai Weibull <now@bitwi.se>
-" Latest Revision: 2009-05-25
+" Latest Revision: 2010-01-23
if exists("b:current_syntax")
finish
@@ -137,7 +137,7 @@ syn match rstStandaloneHyperlink contains=@NoSpell
" TODO: Use better syncing. I don’t know the specifics of syncing well enough,
" though.
-syn sync minlines=50
+syn sync minlines=50 linebreaks=1
hi def link rstTodo Todo
hi def link rstComment Comment
diff --git a/runtime/syntax/zsh.vim b/runtime/syntax/zsh.vim
index ecd6f058b0..79fd017ee8 100644
--- a/runtime/syntax/zsh.vim
+++ b/runtime/syntax/zsh.vim
@@ -1,7 +1,7 @@
" Vim syntax file
" Language: Zsh shell script
" Maintainer: Nikolai Weibull <now@bitwi.se>
-" Latest Revision: 2008-07-17
+" Latest Revision: 2010-01-23
if exists("b:current_syntax")
finish
@@ -14,7 +14,7 @@ setlocal iskeyword+=-
syn keyword zshTodo contained TODO FIXME XXX NOTE
-syn region zshComment display oneline start='\%(^\|\s\)#' end='$'
+syn region zshComment oneline start='\%(^\|\s\)#' end='$'
\ contains=zshTodo,@Spell
syn match zshPreProc '^\%1l#\%(!\|compdef\|autoload\).*$'