summaryrefslogtreecommitdiffstats
path: root/runtime/syntax
diff options
context:
space:
mode:
authorBram Moolenaar <Bram@vim.org>2006-04-30 18:54:39 +0000
committerBram Moolenaar <Bram@vim.org>2006-04-30 18:54:39 +0000
commitc9b4b05b3544b434730eb218e848a1a441d5ffb2 (patch)
treec1550ddf398d2030ed25ee98e8342fcb41ac1c87 /runtime/syntax
parentaa35dd1667c5903cdcc32ebe10f27bc6683c68a1 (diff)
updated for version 7.0gv7.0g
Diffstat (limited to 'runtime/syntax')
-rw-r--r--runtime/syntax/2html.vim36
-rw-r--r--runtime/syntax/chordpro.vim2
-rw-r--r--runtime/syntax/d.vim4
-rw-r--r--runtime/syntax/eviews.vim4
-rw-r--r--runtime/syntax/gretl.vim6
-rw-r--r--runtime/syntax/java.vim8
-rw-r--r--runtime/syntax/mush.vim2
-rw-r--r--runtime/syntax/r.vim2
-rw-r--r--runtime/syntax/sql.vim4
-rw-r--r--runtime/syntax/synload.vim6
-rw-r--r--runtime/syntax/wsml.vim8
11 files changed, 41 insertions, 41 deletions
diff --git a/runtime/syntax/2html.vim b/runtime/syntax/2html.vim
index 8c5b4cf42d..95891776e6 100644
--- a/runtime/syntax/2html.vim
+++ b/runtime/syntax/2html.vim
@@ -1,6 +1,6 @@
" Vim syntax support file
" Maintainer: Bram Moolenaar <Bram@vim.org>
-" Last Change: 2006 Apr 19
+" Last Change: 2006 Apr 30
" (modified by David Ne\v{c}as (Yeti) <yeti@physics.muni.cz>)
" (XHTML support by Panagiotis Issaris <takis@lumumba.luc.ac.be>)
@@ -111,9 +111,9 @@ function! s:HtmlFormat(text, style_name)
" Replace the reserved html characters
let formatted = substitute(substitute(substitute(substitute(substitute(formatted, '&', '\&amp;', 'g'), '<', '\&lt;', 'g'), '>', '\&gt;', 'g'), '"', '\&quot;', 'g'), "\x0c", '<hr class="PAGE-BREAK">', 'g')
-
+
" Replace double spaces and leading spaces
- if ' ' != s:HtmlSpace
+ if ' ' != s:HtmlSpace
let formatted = substitute(formatted, ' ', s:HtmlSpace . s:HtmlSpace, 'g')
let formatted = substitute(formatted, '^ ', s:HtmlSpace, 'g')
endif
@@ -306,10 +306,10 @@ while s:lnum <= s:end
let s:n = s:filler
while s:n > 0
if s:numblines
- " Indent if line numbering is on
- let s:new = repeat(s:LeadingSpace, strlen(s:end) + 1) . repeat(s:difffillchar, 3)
+ " Indent if line numbering is on
+ let s:new = repeat(s:LeadingSpace, strlen(s:end) + 1) . repeat(s:difffillchar, 3)
else
- let s:new = repeat(s:difffillchar, 3)
+ let s:new = repeat(s:difffillchar, 3)
endif
if s:n > 2 && s:n < s:filler && !exists("html_whole_filler")
@@ -318,8 +318,8 @@ while s:lnum <= s:end
endif
if !exists("html_no_pre")
- " HTML line wrapping is off--go ahead and fill to the margin
- let s:new = s:new . repeat(s:difffillchar, &columns - strlen(s:new))
+ " HTML line wrapping is off--go ahead and fill to the margin
+ let s:new = s:new . repeat(s:difffillchar, &columns - strlen(s:new))
endif
let s:new = s:HtmlFormat(s:new, "DiffDelete")
@@ -349,10 +349,10 @@ while s:lnum <= s:end
" HTML line wrapping is off--go ahead and fill to the margin
let s:new = s:new . repeat(s:foldfillchar, &columns - strlen(s:new))
endif
-
+
let s:new = s:HtmlFormat(s:new, "Folded")
- " Skip to the end of the fold
+ " Skip to the end of the fold
let s:lnum = foldclosedend(s:lnum)
else
@@ -380,11 +380,11 @@ while s:lnum <= s:end
" Speed loop (it's small - that's the trick)
" Go along till we find a change in hlID
while s:col <= s:len && s:id == diff_hlID(s:lnum, s:col) | let s:col = s:col + 1 | endwhile
- if s:len < &columns && !exists("html_no_pre")
+ if s:len < &columns && !exists("html_no_pre")
" Add spaces at the end to mark the changed line.
- let s:line = s:line . repeat(' ', &columns - s:len)
- let s:len = &columns
- endif
+ let s:line = s:line . repeat(' ', &columns - s:len)
+ let s:len = &columns
+ endif
else
let s:id = synID(s:lnum, s:col, 1)
let s:col = s:col + 1
@@ -397,9 +397,9 @@ while s:lnum <= s:end
let s:expandedtab = strpart(s:line, s:startcol - 1, s:col - s:startcol)
let idx = stridx(s:expandedtab, "\t")
while idx >= 0
- let i = &ts - ((idx + s:startcol - 1) % &ts)
- let s:expandedtab = substitute(s:expandedtab, '\t', repeat(' ', i), '')
- let idx = stridx(s:expandedtab, "\t")
+ let i = &ts - ((idx + s:startcol - 1) % &ts)
+ let s:expandedtab = substitute(s:expandedtab, '\t', repeat(' ', i), '')
+ let idx = stridx(s:expandedtab, "\t")
endwhile
" Output the text with the same synID, with class set to {s:id_name}
@@ -512,7 +512,7 @@ if exists("html_use_css")
endif
endif
-if exists("use_xhtml")
+if exists("use_xhtml")
exe "normal! gg/<html/e\na xmlns=\"http://www.w3.org/1999/xhtml\"\e"
endif
diff --git a/runtime/syntax/chordpro.vim b/runtime/syntax/chordpro.vim
index a251a6945f..5ccec26508 100644
--- a/runtime/syntax/chordpro.vim
+++ b/runtime/syntax/chordpro.vim
@@ -1,7 +1,7 @@
" Vim syntax file
" Language: ChordPro (v. 3.6.2)
" Maintainer: Niels Bo Andersen <niels@niboan.dk>
-" Last Change: 2006 Apr 20
+" Last Change: 2006 Apr 30
" Remark: Requires VIM version 6.00 or greater
" Quit when a syntax file was already loaded
diff --git a/runtime/syntax/d.vim b/runtime/syntax/d.vim
index abd72179a0..244e053596 100644
--- a/runtime/syntax/d.vim
+++ b/runtime/syntax/d.vim
@@ -1,10 +1,10 @@
" Vim syntax file for the D programming language (version 0.149).
"
" Language: D
-" Maintainer: Jason Mills<jmills@cs.mun.ca>
+" Maintainer: Jason Mills<jmills@cs.mun.ca>
" When emailing me, please put the word vim somewhere in the subject
" to ensure the email does not get marked as spam.
-" Last Change: 2006 Mar 12
+" Last Change: 2006 Apr 30
" Version: 0.15
"
" Options:
diff --git a/runtime/syntax/eviews.vim b/runtime/syntax/eviews.vim
index 911e1bedfa..aa65fda3ff 100644
--- a/runtime/syntax/eviews.vim
+++ b/runtime/syntax/eviews.vim
@@ -1,9 +1,9 @@
" Vim syntax file
" Language: Eviews (http://www.eviews.com)
" Maintainer: Vaidotas Zemlys <zemlys@gmail.com>
-" Last Change: 2006 Jan 11
+" Last Change: 2006 Apr 30
" Filenames: *.prg
-" URL: http://uosis.mif.vu.lt/~zemlys/vim-syntax/eviews.vim
+" URL: http://uosis.mif.vu.lt/~zemlys/vim-syntax/eviews.vim
" For version 5.x: Clear all syntax items
" For version 6.x: Quit when a syntax file was already loaded
if version < 600
diff --git a/runtime/syntax/gretl.vim b/runtime/syntax/gretl.vim
index 9999ff0f40..37299b894a 100644
--- a/runtime/syntax/gretl.vim
+++ b/runtime/syntax/gretl.vim
@@ -1,9 +1,9 @@
" Vim syntax file
-" Language: gretl (http://gretl.sf.net)
+" Language: gretl (http://gretl.sf.net)
" Maintainer: Vaidotas Zemlys <zemlys@gmail.com>
-" Last Change: 2006 Jan 6
+" Last Change: 2006 Apr 30
" Filenames: *.inp *.gretl
-" URL: http://uosis.mif.vu.lt/~zemlys/vim-syntax/gretl.vim
+" URL: http://uosis.mif.vu.lt/~zemlys/vim-syntax/gretl.vim
" For version 5.x: Clear all syntax items
" For version 6.x: Quit when a syntax file was already loaded
diff --git a/runtime/syntax/java.vim b/runtime/syntax/java.vim
index 0c250c643f..85ea0810ac 100644
--- a/runtime/syntax/java.vim
+++ b/runtime/syntax/java.vim
@@ -2,7 +2,7 @@
" Language: Java
" Maintainer: Claudio Fleiner <claudio@fleiner.com>
" URL: http://www.fleiner.com/vim/syntax/java.vim
-" Last Change: 2006 Jan 15
+" Last Change: 2006 Apr 30
" Please check :help java.vim for comments on some of the options available.
@@ -37,7 +37,7 @@ JavaHiLink javaError2 javaError
" keyword definitions
syn keyword javaExternal native package
-syn match javaExternal "\<import\>\(\s\+static\>\)\?"
+syn match javaExternal "\<import\>\(\s\+static\>\)\?"
syn keyword javaError goto const
syn keyword javaConditional if else switch
syn keyword javaRepeat while for do
@@ -62,13 +62,13 @@ syn match javaAnnotation "@[_$a-zA-Z][_$a-zA-Z0-9_]*\>"
syn match javaClassDecl "@interface\>"
syn keyword javaBranch break continue nextgroup=javaUserLabelRef skipwhite
syn match javaUserLabelRef "\k\+" contained
-syn match javaVarArg "\.\.\."
+syn match javaVarArg "\.\.\."
syn keyword javaScopeDecl public protected private abstract
if exists("java_highlight_java_lang_ids")
let java_highlight_all=1
endif
-if exists("java_highlight_all") || exists("java_highlight_java") || exists("java_highlight_java_lang")
+if exists("java_highlight_all") || exists("java_highlight_java") || exists("java_highlight_java_lang")
" java.lang.*
syn match javaLangClass "\<System\>"
syn keyword javaR_JavaLang NegativeArraySizeException ArrayStoreException IllegalStateException RuntimeException IndexOutOfBoundsException UnsupportedOperationException ArrayIndexOutOfBoundsException ArithmeticException ClassCastException EnumConstantNotPresentException StringIndexOutOfBoundsException IllegalArgumentException IllegalMonitorStateException IllegalThreadStateException NumberFormatException NullPointerException TypeNotPresentException SecurityException
diff --git a/runtime/syntax/mush.vim b/runtime/syntax/mush.vim
index d43740b45e..0645f33565 100644
--- a/runtime/syntax/mush.vim
+++ b/runtime/syntax/mush.vim
@@ -1,5 +1,5 @@
" MUSHcode syntax file
-" Maintainer: Rick Bird <nveid@nveid.com>
+" Maintainer: Rick Bird <nveid@nveid.com>
" Based on vim Syntax file by: Bek Oberin <gossamer@tertius.net.au>
" Last Updated: Fri Nov 04 20:28:15 2005
"
diff --git a/runtime/syntax/r.vim b/runtime/syntax/r.vim
index 8432c208ec..f3e730ef92 100644
--- a/runtime/syntax/r.vim
+++ b/runtime/syntax/r.vim
@@ -1,7 +1,7 @@
" Vim syntax file
" Language: R (GNU S)
" Maintainer: Vaidotas Zemlys <zemlys@gmail.com>
-" Last Change: 2006 January 12
+" Last Change: 2006 Apr 30
" Filenames: *.R *.Rout *.r *.Rhistory *.Rt *.Rout.save *.Rout.fail
" URL: http://uosis.mif.vu.lt/~zemlys/vim-syntax/r.vim
diff --git a/runtime/syntax/sql.vim b/runtime/syntax/sql.vim
index 935dec46da..311d9eeb8d 100644
--- a/runtime/syntax/sql.vim
+++ b/runtime/syntax/sql.vim
@@ -5,8 +5,8 @@
" Version: 1.0
" Description: Checks for a:
-" buffer local variable,
-" global variable,
+" buffer local variable,
+" global variable,
" If the above exist, it will source the type specified.
" If none exist, it will source the default sql.vim file.
"
diff --git a/runtime/syntax/synload.vim b/runtime/syntax/synload.vim
index 57de8128f8..54aecbb988 100644
--- a/runtime/syntax/synload.vim
+++ b/runtime/syntax/synload.vim
@@ -1,6 +1,6 @@
" Vim syntax support file
" Maintainer: Bram Moolenaar <Bram@vim.org>
-" Last Change: 2006 Mar 18
+" Last Change: 2006 Apr 30
" This file sets up for syntax highlighting.
" It is loaded from "syntax.vim" and "manual.vim".
@@ -59,10 +59,10 @@ endfun
" Handle adding doxygen to other languages (C, C++, IDL)
-au Syntax cpp,c,idl
+au Syntax cpp,c,idl
\ if (exists('b:load_doxygen_syntax') && b:load_doxygen_syntax)
\ || (exists('g:load_doxygen_syntax') && g:load_doxygen_syntax)
- \ | runtime! syntax/doxygen.vim
+ \ | runtime! syntax/doxygen.vim
\ | endif
diff --git a/runtime/syntax/wsml.vim b/runtime/syntax/wsml.vim
index 9dc7f95951..2a92a0d548 100644
--- a/runtime/syntax/wsml.vim
+++ b/runtime/syntax/wsml.vim
@@ -2,7 +2,7 @@
" Language: WSML
" Maintainer: Thomas Haselwanter <thomas.haselwanter@deri.org>
" URL: none
-" Last Change: 2006 Mar 13
+" Last Change: 2006 Apr 30
" Quit when a syntax file was already loaded
if version < 600
@@ -13,9 +13,9 @@ endif
" WSML
syn keyword wsmlHeader wsmlVariant
-syn keyword wsmlNamespace namespace
-syn keyword wsmlTopLevel concept instance relationInstance ofType usesMediator usesService relation sharedVariables importsOntology
-syn keyword wsmlOntology hasValue memberOf ofType impliesType subConceptOf
+syn keyword wsmlNamespace namespace
+syn keyword wsmlTopLevel concept instance relationInstance ofType usesMediator usesService relation sharedVariables importsOntology
+syn keyword wsmlOntology hasValue memberOf ofType impliesType subConceptOf
syn keyword wsmlAxiom axiom definedBy
syn keyword wsmlService assumption effect postcondition precondition capability interface
syn keyword wsmlTopLevel ooMediator wwMediator wgMediator ggMediator