diff options
45 files changed, 6609 insertions, 319 deletions
diff --git a/runtime/autoload/xml/html401t.vim b/runtime/autoload/xml/html401t.vim index 4c53f03bcc..ae6c63f60f 100644 --- a/runtime/autoload/xml/html401t.vim +++ b/runtime/autoload/xml/html401t.vim @@ -458,4 +458,3 @@ let g:xmldata_html401t = { \ 'param': ['/>', ''], \ } \ } -" vim:ft=vim:ff=unix diff --git a/runtime/autoload/xml/html40f.vim b/runtime/autoload/xml/html40f.vim index 2b3ccacfb9..b5ba99f8f6 100644 --- a/runtime/autoload/xml/html40f.vim +++ b/runtime/autoload/xml/html40f.vim @@ -466,4 +466,3 @@ let g:xmldata_html40t = { \ 'param': ['/>', ''], \ } \ } -" vim:ft=vim:ff=unix diff --git a/runtime/colors/README.txt b/runtime/colors/README.txt index 0bd84842db..988e2a048a 100644 --- a/runtime/colors/README.txt +++ b/runtime/colors/README.txt @@ -50,6 +50,9 @@ If you think you have a color scheme that is good enough to be used by others, please check the following items: - Does it work in a color terminal as well as in the GUI? +- Is "g:colors_name" set to a meaningful value? In case of doubt you can do + it this way: + let g:colors_name = expand('<sfile>:t:r') - Is 'background' either used or appropriately set to "light" or "dark"? - Try setting 'hlsearch' and searching for a pattern, is the match easy to spot? diff --git a/runtime/compiler/perl.vim b/runtime/compiler/perl.vim index 1d30472bbe..2b7c94a89a 100644 --- a/runtime/compiler/perl.vim +++ b/runtime/compiler/perl.vim @@ -1,7 +1,7 @@ " Vim Compiler File " Compiler: Perl syntax checks (perl -Wc) " Maintainer: Christian J. Robinson <infynity@onewest.net> -" Last Change: 2004 Mar 27 +" Last Change: 2006 Aug 13 if exists("current_compiler") finish @@ -15,12 +15,20 @@ endif let s:savecpo = &cpo set cpo&vim +if exists('g:perl_compiler_force_warnings') && g:perl_compiler_force_warnings == 0 + let s:warnopt = 'w' +else + let s:warnopt = 'W' +endif + if getline(1) =~# '-[^ ]*T' - CompilerSet makeprg=perl\ -WTc\ % + let s:taintopt = 'T' else - CompilerSet makeprg=perl\ -Wc\ % + let s:taintopt = '' endif +exe 'CompilerSet makeprg=perl\ -' . s:warnopt . s:taintopt . 'c\ %' + CompilerSet errorformat= \%-G%.%#had\ compilation\ errors., \%-G%.%#syntax\ OK, diff --git a/runtime/doc/arabic.txt b/runtime/doc/arabic.txt index 8e0b79644c..9445f2e09a 100644 --- a/runtime/doc/arabic.txt +++ b/runtime/doc/arabic.txt @@ -1,4 +1,4 @@ -*arabic.txt* For Vim version 7.1. Last change: 2005 Mar 29 +*arabic.txt* For Vim version 7.2a. Last change: 2005 Mar 29 VIM REFERENCE MANUAL by Nadim Shaikli diff --git a/runtime/doc/spell.txt b/runtime/doc/spell.txt index 832dee361a..e6c40c83aa 100644 --- a/runtime/doc/spell.txt +++ b/runtime/doc/spell.txt @@ -1,4 +1,4 @@ -*spell.txt* For Vim version 7.1. Last change: 2007 May 07 +*spell.txt* For Vim version 7.2a. Last change: 2008 Jun 21 VIM REFERENCE MANUAL by Bram Moolenaar @@ -21,7 +21,7 @@ vimspell" to find about it. But you will probably want to get rid of the plugin and use the 'spell' option instead, it works better. ============================================================================== -1. Quick start *spell-quickstart* +1. Quick start *spell-quickstart* *E756* This command switches on spell checking: > @@ -46,7 +46,7 @@ won't work. To search for the next misspelled word: - *]s* *E756* + *]s* ]s Move to next misspelled word after the cursor. A count before the command can be used to repeat. 'wrapscan' applies. @@ -619,7 +619,8 @@ SPELL FILE MISSING *spell-SpellFileMissing* *spellfile.vim* If the spell file for the language you are using is not available, you will get an error message. But if the "spellfile.vim" plugin is active it will offer you to download the spell file. Just follow the instructions, it will -ask you where to write the file. +ask you where to write the file (there must be a writable directory in +'runtimepath' for this). The plugin has a default place where to look for spell files, on the Vim ftp server. If you want to use another location or another protocol, set the diff --git a/runtime/doc/usr_01.txt b/runtime/doc/usr_01.txt index 50f3649e25..1e00a110c0 100644 --- a/runtime/doc/usr_01.txt +++ b/runtime/doc/usr_01.txt @@ -1,4 +1,4 @@ -*usr_01.txt* For Vim version 7.1. Last change: 2006 Oct 08 +*usr_01.txt* For Vim version 7.2a. Last change: 2008 May 07 VIM USER MANUAL - by Bram Moolenaar @@ -118,6 +118,9 @@ available, use the two-letter language code. For French: > vimtutor fr +On Unix, if you prefer using the GUI version of Vim, use "gvimtutor" or +"vimtutor -g" instead of "vimtutor". + For OpenVMS, if Vim has been properly installed, you can start vimtutor from a VMS prompt with: > diff --git a/runtime/doc/usr_11.txt b/runtime/doc/usr_11.txt index 88916d9cb1..edb45981f9 100644 --- a/runtime/doc/usr_11.txt +++ b/runtime/doc/usr_11.txt @@ -1,4 +1,4 @@ -*usr_11.txt* For Vim version 7.1. Last change: 2006 Apr 24 +*usr_11.txt* For Vim version 7.2a. Last change: 2006 Apr 24 VIM USER MANUAL - by Bram Moolenaar diff --git a/runtime/doc/usr_27.txt b/runtime/doc/usr_27.txt index 713dd42fc1..71bfdda98d 100644 --- a/runtime/doc/usr_27.txt +++ b/runtime/doc/usr_27.txt @@ -1,4 +1,4 @@ -*usr_27.txt* For Vim version 7.1. Last change: 2006 Apr 24 +*usr_27.txt* For Vim version 7.2a. Last change: 2007 Nov 10 VIM USER MANUAL - by Bram Moolenaar @@ -516,7 +516,7 @@ items mentioned above can be combined. FINDING A CALIFORNIA LICENSE PLATE -A sample license place number is "1MGU103". It has one digit, three uppercase +A sample license plate number is "1MGU103". It has one digit, three uppercase letters and three digits. Directly putting this into a search pattern: > /\d\u\u\u\d\d\d diff --git a/runtime/doc/usr_28.txt b/runtime/doc/usr_28.txt index 9c621d729d..76644bb674 100644 --- a/runtime/doc/usr_28.txt +++ b/runtime/doc/usr_28.txt @@ -1,4 +1,4 @@ -*usr_28.txt* For Vim version 7.1. Last change: 2006 Apr 24 +*usr_28.txt* For Vim version 7.2a. Last change: 2008 Jun 14 VIM USER MANUAL - by Bram Moolenaar @@ -378,7 +378,7 @@ More about folding by expression in the reference manual: |fold-expr| This is useful when you set the 'diff' option in the same window. The |vimdiff| command does this for you. Example: > - setlocal diff foldmethod=diff scrollbind nowrap foldlevel=1 + :setlocal diff foldmethod=diff scrollbind nowrap foldlevel=1 Do this in every window that shows a different version of the same file. You will clearly see the differences between the files, while the text that didn't @@ -389,7 +389,7 @@ For more details see |fold-diff|. ============================================================================== *28.10* Which fold method to use? -All these possibilities makes you wonder which method you should chose. +All these possibilities make you wonder which method you should chose. Unfortunately, there is no golden rule. Here are some hints. If there is a syntax file with folding for the language you are editing, that diff --git a/runtime/doc/usr_40.txt b/runtime/doc/usr_40.txt index a9e48bf720..dd90ba925d 100644 --- a/runtime/doc/usr_40.txt +++ b/runtime/doc/usr_40.txt @@ -1,4 +1,4 @@ -*usr_40.txt* For Vim version 7.1. Last change: 2006 Jun 21 +*usr_40.txt* For Vim version 7.2a. Last change: 2006 Jun 21 VIM USER MANUAL - by Bram Moolenaar diff --git a/runtime/doc/windows.txt b/runtime/doc/windows.txt index f95b2da84c..dc9c20ccb0 100644 --- a/runtime/doc/windows.txt +++ b/runtime/doc/windows.txt @@ -1,4 +1,4 @@ -*windows.txt* For Vim version 7.1. Last change: 2007 Mar 17 +*windows.txt* For Vim version 7.2a. Last change: 2007 Oct 07 VIM REFERENCE MANUAL by Bram Moolenaar @@ -146,7 +146,7 @@ CTRL-W v *CTRL-W_v* 1. a width was not specified, 2. 'equalalways' is set, 3. 'eadirection' isn't "ver", and - 4. one of the other windows are wider than the current or new + 4. one of the other windows is wider than the current or new window. Note: In other places CTRL-Q does the same as CTRL-V, but here it doesn't! @@ -1033,8 +1033,8 @@ list of buffers. |unlisted-buffer| [!]. This will also edit a buffer that is not in the buffer list, without setting the 'buflisted' flag. -:[N]b[uffer][!] {filename} - Edit buffer for {filename} from the buffer list. See +:[N]b[uffer][!] {bufname} + Edit buffer for {bufname} from the buffer list. See |:buffer-!| for [!]. This will also edit a buffer that is not in the buffer list, without setting the 'buflisted' flag. @@ -1045,8 +1045,8 @@ list of buffers. |unlisted-buffer| also edit a buffer that is not in the buffer list, without setting the 'buflisted' flag. -:[N]sb[uffer] {filename} - Split window and edit buffer for {filename} from the buffer +:[N]sb[uffer] {bufname} + Split window and edit buffer for {bufname} from the buffer list. This will also edit a buffer that is not in the buffer list, without setting the 'buflisted' flag. Note: If what you want to do is split the buffer, make a copy diff --git a/runtime/ftplugin/denyhosts.vim b/runtime/ftplugin/denyhosts.vim new file mode 100644 index 0000000000..86796eb8ec --- /dev/null +++ b/runtime/ftplugin/denyhosts.vim @@ -0,0 +1,18 @@ +" Vim filetype plugin file +" Maintainer: Nikolai Weibull <now@bitwi.se> +" Latest Revision: 2007-09-18 + +if exists("b:did_ftplugin") + finish +endif +let b:did_ftplugin = 1 + +let s:cpo_save = &cpo +set cpo&vim + +let b:undo_ftplugin = "setl com< cms< fo<" + +setlocal comments=:# commentstring=#\ %s formatoptions-=t formatoptions+=croql + +let s:cpo_save = &cpo +set cpo&vim diff --git a/runtime/ftplugin/php.vim b/runtime/ftplugin/php.vim index 86cf89c082..c9a0bc72fc 100644 --- a/runtime/ftplugin/php.vim +++ b/runtime/ftplugin/php.vim @@ -1,7 +1,7 @@ " Vim filetype plugin file " Language: php " Maintainer: Dan Sharp <dwsharp at hotmail dot com> -" Last Changed: 2006 Jul 15 +" Last Changed: 2007 Nov 10 " URL: http://mywebpage.netscape.com/sharppeople/vim/ftplugin if exists("b:did_ftplugin") | finish | endif @@ -42,7 +42,9 @@ endif " ### " Provided by Mikolaj Machowski <mikmach at wp dot pl> setlocal include=\\\(require\\\|include\\\)\\\(_once\\\)\\\? -setlocal iskeyword+=$ +" Disabled changing 'iskeyword', it breaks a command such as "*" +" setlocal iskeyword+=$ + if exists("loaded_matchit") let b:match_words = '<?php:?>,\<switch\>:\<endswitch\>,' . \ '\<if\>:\<elseif\>:\<else\>:\<endif\>,' . @@ -55,15 +57,24 @@ if exists("loaded_matchit") endif " ### -if exists('&ofu') - setlocal ofu=phpcomplete#CompletePHP +if exists('&omnifunc') + setlocal omnifunc=phpcomplete#CompletePHP endif +" Section jumping: [[ and ]] provided by Antony Scriven <adscriven at gmail dot com> +let s:function = '\(abstract\s\+\|final\s\+\|private\s\+\|protected\s\+\|public\s\+\|static\s\+\)*function' +let s:class = '\(abstract\s\+\|final\s\+\)*class' +let s:interface = 'interface' +let s:section = '\(.*\%#\)\@!\_^\s*\zs\('.s:function.'\|'.s:class.'\|'.s:interface.'\)' +exe 'nno <buffer> <silent> [[ ?' . escape(s:section, '|') . '?<CR>:nohls<CR>' +exe 'nno <buffer> <silent> ]] /' . escape(s:section, '|') . '/<CR>:nohls<CR>' +exe 'ono <buffer> <silent> [[ ?' . escape(s:section, '|') . '?<CR>:nohls<CR>' +exe 'ono <buffer> <silent> ]] /' . escape(s:section, '|') . '/<CR>:nohls<CR>' setlocal commentstring=/*%s*/ " Undo the stuff we changed. -let b:undo_ftplugin = "setlocal cms< inc< isk<" . +let b:undo_ftplugin = "setlocal commentstring< include< omnifunc<" . \ " | unlet! b:browsefilter b:match_words | " . \ s:undo_ftplugin diff --git a/runtime/ftplugin/vim.vim b/runtime/ftplugin/vim.vim index 78fb6ec3a8..ca66597d8a 100644 --- a/runtime/ftplugin/vim.vim +++ b/runtime/ftplugin/vim.vim @@ -1,7 +1,7 @@ " Vim filetype plugin " Language: Vim " Maintainer: Bram Moolenaar <Bram@vim.org> -" Last Change: 2006 Sep 26 +" Last Change: 2008 Feb 27 " Only do this when not done yet for this buffer if exists("b:did_ftplugin") @@ -33,14 +33,20 @@ endif setlocal commentstring=\"%s " Move around functions. -noremap <silent><buffer> [[ m':call search('^\s*fu\%[nction]\>', "bW")<CR> -noremap <silent><buffer> ]] m':call search('^\s*fu\%[nction]\>', "W")<CR> -noremap <silent><buffer> [] m':call search('^\s*endf*\%[unction]\>', "bW")<CR> -noremap <silent><buffer> ][ m':call search('^\s*endf*\%[unction]\>', "W")<CR> +nnoremap <silent><buffer> [[ m':call search('^\s*fu\%[nction]\>', "bW")<CR> +vnoremap <silent><buffer> [[ m':<C-U>exe "normal! gv"<Bar>call search('^\s*fu\%[nction]\>', "bW")<CR> +nnoremap <silent><buffer> ]] m':call search('^\s*fu\%[nction]\>', "W")<CR> +vnoremap <silent><buffer> ]] m':<C-U>exe "normal! gv"<Bar>call search('^\s*fu\%[nction]\>', "W")<CR> +nnoremap <silent><buffer> [] m':call search('^\s*endf*\%[unction]\>', "bW")<CR> +vnoremap <silent><buffer> [] m':<C-U>exe "normal! gv"<Bar>call search('^\s*endf*\%[unction]\>', "bW")<CR> +nnoremap <silent><buffer> ][ m':call search('^\s*endf*\%[unction]\>', "W")<CR> +vnoremap <silent><buffer> ][ m':<C-U>exe "normal! gv"<Bar>call search('^\s*endf*\%[unction]\>', "W")<CR> " Move around comments -noremap <silent><buffer> ]" :call search('^\(\s*".*\n\)\@<!\(\s*"\)', "W")<CR> -noremap <silent><buffer> [" :call search('\%(^\s*".*\n\)\%(^\s*"\)\@!', "bW")<CR> +nnoremap <silent><buffer> ]" :call search('^\(\s*".*\n\)\@<!\(\s*"\)', "W")<CR> +vnoremap <silent><buffer> ]" :<C-U>exe "normal! gv"<Bar>call search('^\(\s*".*\n\)\@<!\(\s*"\)', "W")<CR> +nnoremap <silent><buffer> [" :call search('\%(^\s*".*\n\)\%(^\s*"\)\@!', "bW")<CR> +vnoremap <silent><buffer> [" :<C-U>exe "normal! gv"<Bar>call search('\%(^\s*".*\n\)\%(^\s*"\)\@!', "bW")<CR> " Let the matchit plugin know what items can be matched. if exists("loaded_matchit") diff --git a/runtime/spell/pt/main.aap b/runtime/spell/pt/main.aap index 78270e96be..17ba24d33a 100644 --- a/runtime/spell/pt/main.aap +++ b/runtime/spell/pt/main.aap @@ -1,19 +1,5 @@ # Aap recipe for Portuguese Vim spell files. # -# Based on a shell script by Leonardo Fontenelle. -# His remarks: -# -# Makes a Vim pt dictionary from OpenOffice.org's pt_BR and pt_PT. -# -# AFAIK, will have to update the script every time a new dictionary is -# released for pt_BR. I asked the maintainer to update OOo's FTP site, -# but it didn't happen yet. As for the pt_PT dictionary, they won't be -# in OOo's FTP site for some time, because the Portuguese OOo project -# decided to adapt the pt_BR dictionary, which is much more extensive. -# I picked the Natura project unofficial dictionary, because it has been -# developed by a team with linguists, and for a longer time. At least the -# pt_PT dictionary has a "latest" file to make our lives easier. - # Use a freshly compiled Vim if it exists. @if os.path.exists('../../../src/vim'): @@ -33,13 +19,10 @@ PT_FNAME = myspell.pt-latest.zip :attr {fetch = $PT_DIR/%file%} $PT_FNAME # -# Fetching the pt_BR files from BrOffice.org (Brazilian OOo) 2.1. Should be -# updated really soon. +# Fetching the pt_BR files from BrOffice.org (Brazilian OOo). # -BR_BASENAME = pt_BR-2007-04-11 -BR_DIR = http://www.deso-se.com.br/downloads/download.php?arquivo=$BR_BASENAME -BR_FNAME = $(BR_BASENAME).zip - +BR_FNAME = pt_BR-V.zip +BR_DIR = http://www.deso-se.com.br/downloads/broffice.org/$(BR_FNAME) :attr {fetch = $BR_DIR} $BR_FNAME all: $SPELLDIR/pt.latin1.spl $SPELLDIR/pt.utf-8.spl \ @@ -58,8 +41,7 @@ $SPELLDIR/pt.utf-8.spl : $FILES :cat README_pt_PT.txt | :eval re.sub('\r', '', stdin) >>$target :print =================================================== >>$target :print pt_BR: >>$target - :print Information is in Leia-me.pdf, see $BR_DIR >>$target - :cat README_pt_BR.txt >>$target + :cat README_pt_BR.txt | :eval re.sub('\r', '', stdin) >>$target # The files don't depend on the .zip file so that we can delete it. # Only download the zip file if the targets don't exist. @@ -85,19 +67,13 @@ pt_BR.aff pt_BR.dic: {buildcheck=} :fetch $BR_FNAME :sys $UNZIP $BR_FNAME :delete $BR_FNAME - :move Leia-me.pdf Leia-me_pt_BR.pdf + :sys $VIM README_pt_BR.TXT -e -c "set ff=unix" -c update -c q + :move README_pt_BR.TXT README_pt_BR.txt -# 1. pt_BR.dic contains a cp1252-specific character. -# Changing it to its latin1 equivalent. -# 2. Vim seems to ignore the dots from the word list. -# Removing words with dot to avoid misbehaviour. - :sys $VIM pt_BR.dic -e -c "set ff=unix" -c "%s/\%x92/'/g" -c "/\./d" -c update -c q - -# Removing /* ... */ header to avoid warnings. Write it to the README file, it -# contains the copyright notice. - :sys $VIM pt_BR.aff -e -c "set ff=unix" -c "/\/\*/,/\*\//w! README_pt_BR.txt" -c "/\/\*/,/\*\//+1d" -c update -c q - - #:sys $VIM README_pt_BR.txt -e -c "set ff=unix" -c update -c q +# Vim seems to ignore the dots from the word list. +# Removing words with dot to avoid misbehaviour. + :sys $VIM pt_BR.dic -e -c "set ff=unix" -c "/\./d" -c update -c q + :sys $VIM pt_BR.aff -e -c "set ff=unix" -c update -c q @if not os.path.exists('pt_BR.orig.aff'): :copy pt_BR.aff pt_BR.orig.aff @if not os.path.exists('pt_BR.orig.dic'): @@ -125,12 +101,12 @@ check: check-pt check-br check-pt: :assertpkg unzip diff - :fetch pt_PT.zip + :fetch $PT_FNAME :mkdir tmp :cd tmp @try: @import stat - :sys $UNZIP ../pt_PT.zip + :sys $UNZIP ../$PT_FNAME :sys {force} diff ../pt_PT.orig.aff pt_PT.aff >d @if os.stat('d')[stat.ST_SIZE] > 0: :copy pt_PT.aff ../pt_PT.new.aff @@ -140,16 +116,16 @@ check-pt: @finally: :cd .. :delete {r}{f}{q} tmp - :delete pt_PT.zip + :delete $PT_FNAME check-br: :assertpkg unzip diff - :fetch pt_BR.zip + :fetch $BR_FNAME :mkdir tmp :cd tmp @try: @import stat - :sys $UNZIP ../pt_BR.zip + :sys $UNZIP ../$BR_FNAME :sys {force} diff ../pt_BR.orig.aff pt_BR.aff >d @if os.stat('d')[stat.ST_SIZE] > 0: :copy pt_BR.aff ../pt_BR.new.aff @@ -159,6 +135,6 @@ check-br: @finally: :cd .. :delete {r}{f}{q} tmp - :delete pt_BR.zip + :delete $BR_FNAME # vim: set sts=4 sw=4 : diff --git a/runtime/syntax/gitsendemail.vim b/runtime/syntax/gitsendemail.vim new file mode 100644 index 0000000000..d247cdabab --- /dev/null +++ b/runtime/syntax/gitsendemail.vim @@ -0,0 +1,19 @@ +" Vim syntax file +" Language: git send-email message +" Maintainer: Tim Pope +" Filenames: *.msg.[0-9]* (first line is "From ... # This line is ignored.") +" Last Change: 2007 Dec 16 + +if exists("b:current_syntax") + finish +endif + +runtime! syntax/mail.vim +syn case match + +syn match gitsendemailComment "\%^From.*#.*" +syn match gitsendemailComment "^GIT:.*" + +hi def link gitsendemailComment Comment + +let b:current_syntax = "gitsendemail" diff --git a/runtime/syntax/mail.vim b/runtime/syntax/mail.vim index 7717cd970a..1157517f8b 100644 --- a/runtime/syntax/mail.vim +++ b/runtime/syntax/mail.vim @@ -1,8 +1,8 @@ " Vim syntax file " Language: Mail file " Previous Maintainer: Felix von Leitner <leitner@math.fu-berlin.de> -" Maintainer: Gautam Iyer <gautam@math.uchicago.edu> -" Last Change: Wed 01 Jun 2005 02:11:07 PM CDT +" Maintainer: Gautam Iyer <gi1242@users.sourceforge.net> +" Last Change: Thu 17 Jan 2008 11:25:44 AM PST " Quit when a syntax file was already loaded if exists("b:current_syntax") @@ -24,13 +24,15 @@ syn case match " emails " According to RFC 2822 any printable ASCII character can appear in a field " name, except ':'. -syn region mailHeader contains=@mailHeaderFields,@NoSpell start="^From " skip="^\s" end="\v^[!-9;-~]*([^!-~]|$)"me=s-1 -syn match mailHeaderKey contained contains=mailEmail,@NoSpell "^From\s.*$" +syn region mailHeader contains=@mailHeaderFields,@NoSpell start="^From .*\d\d\d\d$" skip="^\s" end="\v^[!-9;-~]*([^!-~]|$)"me=s-1 +syn match mailHeaderKey contained contains=mailEmail,@NoSpell "^From\s.*\d\d\d\d$" +" Usenet headers +syn match mailHeaderKey contained contains=mailHeaderEmail,mailEmail,@NoSpell "\v(^(\> ?)*)@<=(Newsgroups|Followup-To|Message-ID|Supersedes|Control):.*$" syn case ignore " Nothing else depends on case. Headers in properly quoted (with "> " or ">") " emails are matched -syn region mailHeader keepend contains=@mailHeaderFields,@mailQuoteExps,@NoSpell start="^\z(\(> \?\)*\)\v(newsgroups|from|((in-)?reply-)?to|b?cc|subject|return-path|received|date|replied):" skip="^\z1\s" end="\v^\z1[!-9;-~]*([^!-~]|$)"me=s-1 end="\v^\z1@!"me=s-1 end="\v^\z1(\> ?)+"me=s-1 +syn region mailHeader keepend contains=@mailHeaderFields,@mailQuoteExps,@NoSpell start="^\z(\(> \?\)*\)\v(newsgroups|x-([a-z\-])*|path|xref|message-id|from|((in-)?reply-)?to|b?cc|subject|return-path|received|date|replied):" skip="^\z1\s" end="\v^\z1[!-9;-~]*([^!-~]|$)"me=s-1 end="\v^\z1@!"me=s-1 end="\v^\z1(\> ?)+"me=s-1 syn region mailHeaderKey contained contains=mailHeaderEmail,mailEmail,@mailQuoteExps,@NoSpell start="\v(^(\> ?)*)@<=(to|b?cc):" skip=",$" end="$" syn match mailHeaderKey contained contains=mailHeaderEmail,mailEmail,@NoSpell "\v(^(\> ?)*)@<=(from|reply-to):.*$" diff --git a/runtime/syntax/postscr.vim b/runtime/syntax/postscr.vim index 40dbcec5f6..fddfe4c947 100644 --- a/runtime/syntax/postscr.vim +++ b/runtime/syntax/postscr.vim @@ -2,16 +2,16 @@ " Language: PostScript - all Levels, selectable " Maintainer: Mike Williams <mrw@eandem.co.uk> " Filenames: *.ps,*.eps -" Last Change: 27th June 2002 -" URL: http://www.eandem.co.uk/mrw/vim +" Last Change: 31st October 2007 +" URL: http://www.eandem.co.uk/mrw/vim " " Options Flags: -" postscr_level - language level to use for highligting (1, 2, or 3) -" postscr_display - include display PS operators -" postscr_ghostscript - include GS extensions -" postscr_fonts - highlight standard font names (a lot for PS 3) -" postscr_encodings - highlight encoding names (there are a lot) -" postscr_andornot_binary - highlight and, or, and not as binary operators (not logical) +" postscr_level - language level to use for highligting (1, 2, or 3) +" postscr_display - include display PS operators +" postscr_ghostscript - include GS extensions +" postscr_fonts - highlight standard font names (a lot for PS 3) +" postscr_encodings - highlight encoding names (there are a lot) +" postscr_andornot_binary - highlight and, or, and not as binary operators (not logical) " " For version 5.x: Clear all syntax items " For version 6.x: Quit when a syntax file was already loaded @@ -35,16 +35,16 @@ endif syn keyword postscrTodo contained TODO " Comment -syn match postscrComment "%.*$" contains=postscrTodo +syn match postscrComment "%.*$" contains=postscrTodo,@Spell " DSC comment start line (NB: defines DSC level, not PS level!) -syn match postscrDSCComment "^%!PS-Adobe-\d\+\.\d\+\s*.*$" +syn match postscrDSCComment "^%!PS-Adobe-\d\+\.\d\+\s*.* |