Mercurial > vim
changeset 1122:2ad54fcf37e3
updated for version 7.1a
| author | vimboss |
|---|---|
| date | Sat, 05 May 2007 17:56:55 +0000 |
| parents | e63691e7c504 |
| children | c4cd8ad60bee |
| files | runtime/autoload/netrwSettings.vim runtime/doc/if_tcl.txt runtime/doc/usr_21.txt runtime/doc/usr_24.txt runtime/ftplugin/mrxvtrc.vim runtime/keymap/mongolian_utf-8.vim runtime/lang/menu_zh_cn.utf-8.vim runtime/syntax/2html.vim runtime/syntax/rnoweb.vim runtime/syntax/vb.vim src/proto/gui_gtk.pro src/version.h |
| diffstat | 12 files changed, 589 insertions(+), 353 deletions(-) [+] |
line wrap: on
line diff
--- a/runtime/autoload/netrwSettings.vim +++ b/runtime/autoload/netrwSettings.vim @@ -1,8 +1,8 @@ " netrwSettings.vim: makes netrw settings simpler -" Date: Mar 22, 2006 +" Date: Jan 05, 2007 " Maintainer: Charles E Campbell, Jr <drchipNOSPAM at campbellfamily dot biz> -" Version: 6 -" Copyright: Copyright (C) 1999-2005 Charles E. Campbell, Jr. {{{1 +" Version: 9b ASTRO-ONLY +" Copyright: Copyright (C) 1999-2007 Charles E. Campbell, Jr. {{{1 " Permission is hereby granted to use and distribute this code, " with or without modifications, provided that this copyright " notice is copied with it. Like anything else that's free, @@ -19,7 +19,7 @@ if exists("g:loaded_netrwSettings") || &cp finish endif -let g:loaded_netrwSettings = "v6" +let g:loaded_netrwSettings = "v9b" " --------------------------------------------------------------------- " NetrwSettings: {{{1 @@ -39,8 +39,8 @@ fun! netrwSettings#NetrwSettings() " these variables have the following default effects when they don't " exist (ie. have not been set by the user in his/her .vimrc) - if !exists("g:netrw_longlist") - let g:netrw_longlist= 0 + if !exists("g:netrw_liststyle") + let g:netrw_liststyle= 0 let g:netrw_list_cmd= "ssh HOSTNAME ls -FLa" endif if !exists("g:netrw_silent") @@ -81,6 +81,8 @@ fun! netrwSettings#NetrwSettings() put = 'let g:netrw_ftp = '.g:netrw_ftp put = 'let g:netrw_ftpmode = '.g:netrw_ftpmode put = 'let g:netrw_ignorenetrc = '.g:netrw_ignorenetrc + let shqline= line("$") + put = 'let g:netrw_shq...' put = 'let g:netrw_use_nt_rcp = '.g:netrw_use_nt_rcp put = 'let g:netrw_win95ftp = '.g:netrw_win95ftp let s:netrw_xfer_stop= line(".") @@ -99,14 +101,17 @@ fun! netrwSettings#NetrwSettings() put = 'let g:netrw_fastbrowse = '.g:netrw_fastbrowse put = 'let g:netrw_ftp_browse_reject = '.g:netrw_ftp_browse_reject put = 'let g:netrw_ftp_list_cmd = '.g:netrw_ftp_list_cmd + put = 'let g:netrw_ftp_sizelist_cmd = '.g:netrw_ftp_sizelist_cmd + put = 'let g:netrw_ftp_timelist_cmd = '.g:netrw_ftp_timelist_cmd put = 'let g:netrw_hide = '.g:netrw_hide put = 'let g:netrw_keepdir = '.g:netrw_keepdir put = 'let g:netrw_list_cmd = '.g:netrw_list_cmd put = 'let g:netrw_list_hide = '.g:netrw_list_hide put = 'let g:netrw_local_mkdir = '.g:netrw_local_mkdir put = 'let g:netrw_local_rmdir = '.g:netrw_local_rmdir - put = 'let g:netrw_longlist = '.g:netrw_longlist + put = 'let g:netrw_liststyle = '.g:netrw_liststyle put = 'let g:netrw_maxfilenamelen = '.g:netrw_maxfilenamelen + put = 'let g:netrw_menu = '.g:netrw_menu put = 'let g:netrw_mkdir_cmd = '.g:netrw_mkdir_cmd put = 'let g:netrw_rename_cmd = '.g:netrw_rename_cmd put = 'let g:netrw_rm_cmd = '.g:netrw_rm_cmd @@ -118,6 +123,7 @@ fun! netrwSettings#NetrwSettings() put = 'let g:netrw_sort_sequence = '.g:netrw_sort_sequence put = 'let g:netrw_ssh_browse_reject = '.g:netrw_ssh_browse_reject put = 'let g:netrw_timefmt = '.g:netrw_timefmt + put = 'let g:netrw_use_noswf = '.g:netrw_use_noswf put = 'let g:netrw_winsize = '.g:netrw_winsize put ='' @@ -130,9 +136,18 @@ fun! netrwSettings#NetrwSettings() silent %s/= $/= ''/e 1 + " Put in shq setting. + " (deferred so as to avoid the quote manipulation just preceding) + if g:netrw_shq == "'" + call setline(shqline,'let g:netrw_shq = "'.g:netrw_shq.'"') + else + call setline(shqline,"let g:netrw_shq = '".g:netrw_shq."'") + endif + set nomod - map <buffer> <silent> <F1> :call NetrwSettingHelp()<cr> + nmap <buffer> <silent> <F1> :call NetrwSettingHelp()<cr> + nnoremap <buffer> <silent> <leftmouse> <leftmouse>:call NetrwSettingHelp()<cr> let tmpfile= tempname() exe 'au BufWriteCmd Netrw\ Settings silent w! '.tmpfile.'|so '.tmpfile.'|call delete("'.tmpfile.'")|set nomod' endfun
--- a/runtime/doc/if_tcl.txt +++ b/runtime/doc/if_tcl.txt @@ -1,4 +1,4 @@ -*if_tcl.txt* For Vim version 7.0. Last change: 2006 Mar 06 +*if_tcl.txt* For Vim version 7.1a. Last change: 2006 Mar 06 VIM REFERENCE MANUAL by Ingo Wilken
--- a/runtime/doc/usr_21.txt +++ b/runtime/doc/usr_21.txt @@ -1,4 +1,4 @@ -*usr_21.txt* For Vim version 7.0. Last change: 2006 Apr 25 +*usr_21.txt* For Vim version 7.1a. Last change: 2007 May 01 VIM USER MANUAL - by Bram Moolenaar @@ -421,7 +421,8 @@ file are inspected for containing a mode :set modelines=10 The 'modeline' option can be used to switch this off. Do this when you are -working as root or don't trust the files you are editing: > +working as root on Unix or Administrator on MS-Windows, or when you don't +trust the files you are editing: > :set nomodeline @@ -432,9 +433,9 @@ Use this format for the modeline: The "any-text" indicates that you can put any text before and after the part that Vim will use. This allows making it look like a comment, like what was done above with /* and */. - The " vim:" part is what makes Vim recognize this line. The must be white -space before "vim", or "vim" must be at the start of the line. Thus using -something like "gvim:" will not work. + The " vim:" part is what makes Vim recognize this line. There must be +white space before "vim", or "vim" must be at the start of the line. Thus +using something like "gvim:" will not work. The part between the colons is a ":set" command. It works the same way as typing the ":set" command, except that you need to insert a backslash before a colon (otherwise it would be seen as the end of the modeline).
--- a/runtime/doc/usr_24.txt +++ b/runtime/doc/usr_24.txt @@ -1,4 +1,4 @@ -*usr_24.txt* For Vim version 7.0. Last change: 2006 Apr 24 +*usr_24.txt* For Vim version 7.1a. Last change: 2006 Jul 23 VIM USER MANUAL - by Bram Moolenaar @@ -252,11 +252,18 @@ of alternatives, which are the items tha quite different from using CTRL-P, which would complete any word, while only members of "struct foo" are valid here. -For Omni completion to work you may need to do some setup. For C code you -need to create a tags file and set the 'tags' option. That is explained -|ft-c-omni|. For other filetypes you may need to do something similar, look -below |compl-omni-filetypes|. It only works for specific filetypes. Check -the value of the 'omnifunc' option to find out if it would work. +For Omni completion to work you may need to do some setup. At least make sure +filetype plugins are enabled. Your vimrc file should contain a line like +this: > + filetype plugin on +Or: > + filetype plugin indent on + +For C code you need to create a tags file and set the 'tags' option. That is +explained |ft-c-omni|. For other filetypes you may need to do something +similar, look below |compl-omni-filetypes|. It only works for specific +filetypes. Check the value of the 'omnifunc' option to find out if it would +work. ============================================================================== *24.4* Repeating an insert
--- a/runtime/ftplugin/mrxvtrc.vim +++ b/runtime/ftplugin/mrxvtrc.vim @@ -1,5 +1,5 @@ " Created : Wed 26 Apr 2006 01:20:53 AM CDT -" Modified : Thu 27 Apr 2006 03:29:13 AM CDT +" Modified : Fri 28 Apr 2006 03:24:01 AM CDT " Author : Gautam Iyer <gi1242@users.sourceforge.net> " Description : ftplugin for mrxvtrc @@ -10,5 +10,13 @@ let b:did_ftplugin = 1 let b:undo_ftplugin = "setl com< cms< fo<" -setlocal comments=:! commentstring=!\ %s formatoptions-=t formatoptions+=croql +" Really any line that does not match an option is a comment. But use '!' for +" compatibility with x-defaults files, and "#" (preferred) for compatibility +" with all other config files. +" +" Comments beginning with "#" are preferred because Vim will not flag the +" first word as a spelling error if it is not capitalised. The '!' used as +" comment leaders makes Vim think that every comment line is a new sentence. +setlocal comments=:!,:# commentstring=#\ %s +setlocal formatoptions-=t formatoptions+=croql
new file mode 100644 --- /dev/null +++ b/runtime/keymap/mongolian_utf-8.vim @@ -0,0 +1,101 @@ +" Maintainer: Natsagdorj Shagdar <natsag2000@yahoo.com> +" Last Changed: 2007 Jun 26 + +" All characters are given literally, conversion to another encoding (e.g., +" UTF-8) should work. +scriptencoding utf-8 + +let b:keymap_name = "mn" + +loadkeymap +C Ё CYRILLIC CAPITAL LETTER IO +c ё CYRILLIC SMALL LETTER IO +G А CYRILLIC CAPITAL LETTER A +D Б CYRILLIC CAPITAL LETTER BE +> В CYRILLIC CAPITAL LETTER VE +U Г CYRILLIC CAPITAL LETTER GHE +: Д CYRILLIC CAPITAL LETTER DE +_ Е CYRILLIC CAPITAL LETTER IE +R Ж CYRILLIC CAPITAL LETTER ZHE +P З CYRILLIC CAPITAL LETTER ZE +N И CYRILLIC CAPITAL LETTER I +A Й CYRILLIC CAPITAL LETTER SHORT I +{ К CYRILLIC CAPITAL LETTER KA +L Л CYRILLIC CAPITAL LETTER EL +B М CYRILLIC CAPITAL LETTER EM +Y Н CYRILLIC CAPITAL LETTER EN +K О CYRILLIC CAPITAL LETTER O +\" П CYRILLIC CAPITAL LETTER PE +J Р CYRILLIC CAPITAL LETTER ER +V С CYRILLIC CAPITAL LETTER ES +M Т CYRILLIC CAPITAL LETTER TE +E У CYRILLIC CAPITAL LETTER U +Q Ф CYRILLIC CAPITAL LETTER EF +H Х CYRILLIC CAPITAL LETTER HA +W Ц CYRILLIC CAPITAL LETTER TSE +X Ч CYRILLIC CAPITAL LETTER CHE +I Ш CYRILLIC CAPITAL LETTER SHA ++ Щ CYRILLIC CAPITAL LETTER SHCHA +} Ъ CYRILLIC CAPITAL LETTER HARD SIGN +S Ы CYRILLIC CAPITAL LETTER YERU +< Ь CYRILLIC CAPITAL LETTER SOFT SIGN +T Э CYRILLIC CAPITAL LETTER E +? Ю CYRILLIC CAPITAL LETTER YU +Z Я CYRILLIC CAPITAL LETTER YA +g а CYRILLIC SMALL LETTER A +d б CYRILLIC SMALL LETTER BE +. в CYRILLIC SMALL LETTER VE +u г CYRILLIC SMALL LETTER GHE +; д CYRILLIC SMALL LETTER DE +- е CYRILLIC SMALL LETTER IE +r ж CYRILLIC SMALL LETTER ZHE +p з CYRILLIC SMALL LETTER ZE +n и CYRILLIC SMALL LETTER I +a й CYRILLIC SMALL LETTER SHORT I +[ к CYRILLIC SMALL LETTER KA +l л CYRILLIC SMALL LETTER EL +b м CYRILLIC SMALL LETTER EM +y н CYRILLIC SMALL LETTER EN +k о CYRILLIC SMALL LETTER O +' п CYRILLIC SMALL LETTER PE +j р CYRILLIC SMALL LETTER ER +v с CYRILLIC SMALL LETTER ES +m т CYRILLIC SMALL LETTER TE +e у CYRILLIC SMALL LETTER U +q ф CYRILLIC SMALL LETTER EF +h х CYRILLIC SMALL LETTER HA +w ц CYRILLIC SMALL LETTER TSE +x ч CYRILLIC SMALL LETTER CHE +i ш CYRILLIC SMALL LETTER SHA += щ CYRILLIC SMALL LETTER SHCHA +] ъ CYRILLIC SMALL LETTER HARD SIGN +s ы CYRILLIC SMALL LETTER YERU +, ь CYRILLIC SMALL LETTER SOFT SIGN +t э CYRILLIC SMALL LETTER E +/ ю CYRILLIC SMALL LETTER YU +z я CYRILLIC SMALL LETTER YA +f ө CYRILLIC SMALL LETTER Oе +F Ө CYRILLIC SMALL LETTER Oе +o ү CYRILLIC SMALL LETTER Ге +O Ү CYRILLIC SMALL LETTER Oе +` = +1 № NUMERO SIGN +2 - +3 " +4 T +5 : +7 ? +6 . +8 , +9 ( +0 ) +! 1 +@ 2 +# 3 +$ 4 +% 5 +^ 6 +& 7 +* 8 +( 9 +) 0
--- a/runtime/lang/menu_zh_cn.utf-8.vim +++ b/runtime/lang/menu_zh_cn.utf-8.vim @@ -109,7 +109,7 @@ menutrans &Keymap 键盘映射(&K) menutrans &Tools 工具(&T) menutrans &Jump\ to\ this\ tag<Tab>g^] 跳转到这个\ tag(&J)<Tab>g^] menutrans Jump\ &back<Tab>^T 跳转返回(&B)<Tab>^T -menutrans Build\ &Tags\ File 建立 Tags 文件(&T) +menutrans Build\ &Tags\ File 建立\ Tags\ 文件(&T) " Tools.Spelling Menu menutrans &Spelling 拼写检查(&S) @@ -209,7 +209,7 @@ menutrans Min\ Widt&h<Tab>^W1\| 最小宽度(&H)<Tab>^W1\| menutrans &Undo 撤销(&U) menutrans Cu&t 剪切(&T) menutrans &Copy 复制(&C) -menutrans &Paste 粘帖(&P) +menutrans &Paste 粘贴(&P) menutrans &Delete 删除(&D) menutrans Select\ Blockwise 选择块 menutrans Select\ &Word 选择单词(&W) @@ -233,7 +233,7 @@ if has("toolbar") tmenu ToolBar.Redo 重做 tmenu ToolBar.Cut 剪切到剪贴板 tmenu ToolBar.Copy 复制到剪贴板 - tmenu ToolBar.Paste 从剪贴板粘帖 + tmenu ToolBar.Paste 从剪贴板粘贴 tmenu ToolBar.Find 查找... tmenu ToolBar.FindNext 查找下一个 tmenu ToolBar.FindPrev 查找上一个
--- a/runtime/syntax/2html.vim +++ b/runtime/syntax/2html.vim @@ -1,8 +1,10 @@ " Vim syntax support file " Maintainer: Bram Moolenaar <Bram@vim.org> -" Last Change: 2006 Apr 30 +" Last Change: 2007 Mar 10 " (modified by David Ne\v{c}as (Yeti) <yeti@physics.muni.cz>) " (XHTML support by Panagiotis Issaris <takis@lumumba.luc.ac.be>) +" (made w3 compliant by Edd Barrett <vext01@gmail.com>) +" (added html_font. Edd Barrett <vext01@gmail.com>) " Transform a file into HTML, using the current syntax highlighting. @@ -13,50 +15,47 @@ else let s:numblines = &number endif +" Font +if exists("html_font") + let s:htmlfont = html_font . ", monospace" +else + let s:htmlfont = "monospace" +endif + " When not in gui we can only guess the colors. if has("gui_running") let s:whatterm = "gui" else let s:whatterm = "cterm" if &t_Co == 8 - let s:cterm_color0 = "#808080" - let s:cterm_color1 = "#ff6060" - let s:cterm_color2 = "#00ff00" - let s:cterm_color3 = "#ffff00" - let s:cterm_color4 = "#8080ff" - let s:cterm_color5 = "#ff40ff" - let s:cterm_color6 = "#00ffff" - let s:cterm_color7 = "#ffffff" + let s:cterm_color = {0: "#808080", 1: "#ff6060", 2: "#00ff00", 3: "#ffff00", 4: "#8080ff", 5: "#ff40ff", 6: "#00ffff", 7: "#ffffff"} else - let s:cterm_color0 = "#000000" - let s:cterm_color1 = "#c00000" - let s:cterm_color2 = "#008000" - let s:cterm_color3 = "#804000" - let s:cterm_color4 = "#0000c0" - let s:cterm_color5 = "#c000c0" - let s:cterm_color6 = "#008080" - let s:cterm_color7 = "#c0c0c0" - let s:cterm_color8 = "#808080" - let s:cterm_color9 = "#ff6060" - let s:cterm_color10 = "#00ff00" - let s:cterm_color11 = "#ffff00" - let s:cterm_color12 = "#8080ff" - let s:cterm_color13 = "#ff40ff" - let s:cterm_color14 = "#00ffff" - let s:cterm_color15 = "#ffffff" + let s:cterm_color = {0: "#000000", 1: "#c00000", 2: "#008000", 3: "#804000", 4: "#0000c0", 5: "#c000c0", 6: "#008080", 7: "#c0c0c0", 8: "#808080", 9: "#ff6060", 10: "#00ff00", 11: "#ffff00", 12: "#8080ff", 13: "#ff40ff", 14: "#00ffff", 15: "#ffffff"} + + " Colors for 88 and 256 come from xterm. + if &t_Co == 88 + call extend(s:cterm_color, {16: "#000000", 17: "#00008b", 18: "#0000cd", 19: "#0000ff", 20: "#008b00", 21: "#008b8b", 22: "#008bcd", 23: "#008bff", 24: "#00cd00", 25: "#00cd8b", 26: "#00cdcd", 27: "#00cdff", 28: "#00ff00", 29: "#00ff8b", 30: "#00ffcd", 31: "#00ffff", 32: "#8b0000", 33: "#8b008b", 34: "#8b00cd", 35: "#8b00ff", 36: "#8b8b00", 37: "#8b8b8b", 38: "#8b8bcd", 39: "#8b8bff", 40: "#8bcd00", 41: "#8bcd8b", 42: "#8bcdcd", 43: "#8bcdff", 44: "#8bff00", 45: "#8bff8b", 46: "#8bffcd", 47: "#8bffff", 48: "#cd0000", 49: "#cd008b", 50: "#cd00cd", 51: "#cd00ff", 52: "#cd8b00", 53: "#cd8b8b", 54: "#cd8bcd", 55: "#cd8bff", 56: "#cdcd00", 57: "#cdcd8b", 58: "#cdcdcd", 59: "#cdcdff", 60: "#cdff00", 61: "#cdff8b", 62: "#cdffcd", 63: "#cdffff", 64: "#ff0000"}) + call extend(s:cterm_color, {65: "#ff008b", 66: "#ff00cd", 67: "#ff00ff", 68: "#ff8b00", 69: "#ff8b8b", 70: "#ff8bcd", 71: "#ff8bff", 72: "#ffcd00", 73: "#ffcd8b", 74: "#ffcdcd", 75: "#ffcdff", 76: "#ffff00", 77: "#ffff8b", 78: "#ffffcd", 79: "#ffffff", 80: "#2e2e2e", 81: "#5c5c5c", 82: "#737373", 83: "#8b8b8b", 84: "#a2a2a2", 85: "#b9b9b9", 86: "#d0d0d0", 87: "#e7e7e7"}) + elseif &t_Co == 256 + call extend(s:cterm_color, {16: "#000000", 17: "#00005f", 18: "#000087", 19: "#0000af", 20: "#0000d7", 21: "#0000ff", 22: "#005f00", 23: "#005f5f", 24: "#005f87", 25: "#005faf", 26: "#005fd7", 27: "#005fff", 28: "#008700", 29: "#00875f", 30: "#008787", 31: "#0087af", 32: "#0087d7", 33: "#0087ff", 34: "#00af00", 35: "#00af5f", 36: "#00af87", 37: "#00afaf", 38: "#00afd7", 39: "#00afff", 40: "#00d700", 41: "#00d75f", 42: "#00d787", 43: "#00d7af", 44: "#00d7d7", 45: "#00d7ff", 46: "#00ff00", 47: "#00ff5f", 48: "#00ff87", 49: "#00ffaf", 50: "#00ffd7", 51: "#00ffff", 52: "#5f0000", 53: "#5f005f", 54: "#5f0087", 55: "#5f00af", 56: "#5f00d7", 57: "#5f00ff", 58: "#5f5f00", 59: "#5f5f5f", 60: "#5f5f87", 61: "#5f5faf", 62: "#5f5fd7", 63: "#5f5fff", 64: "#5f8700"}) + call extend(s:cterm_color, {65: "#5f875f", 66: "#5f8787", 67: "#5f87af", 68: "#5f87d7", 69: "#5f87ff", 70: "#5faf00", 71: "#5faf5f", 72: "#5faf87", 73: "#5fafaf", 74: "#5fafd7", 75: "#5fafff", 76: "#5fd700", 77: "#5fd75f", 78: "#5fd787", 79: "#5fd7af", 80: "#5fd7d7", 81: "#5fd7ff", 82: "#5fff00", 83: "#5fff5f", 84: "#5fff87", 85: "#5fffaf", 86: "#5fffd7", 87: "#5fffff", 88: "#870000", 89: "#87005f", 90: "#870087", 91: "#8700af", 92: "#8700d7", 93: "#8700ff", 94: "#875f00", 95: "#875f5f", 96: "#875f87", 97: "#875faf", 98: "#875fd7", 99: "#875fff", 100: "#878700", 101: "#87875f", 102: "#878787", 103: "#8787af", 104: "#8787d7", 105: "#8787ff", 106: "#87af00", 107: "#87af5f", 108: "#87af87", 109: "#87afaf", 110: "#87afd7", 111: "#87afff", 112: "#87d700"}) + call extend(s:cterm_color, {113: "#87d75f", 114: "#87d787", 115: "#87d7af", 116: "#87d7d7", 117: "#87d7ff", 118: "#87ff00", 119: "#87ff5f", 120: "#87ff87", 121: "#87ffaf", 122: "#87ffd7", 123: "#87ffff", 124: "#af0000", 125: "#af005f", 126: "#af0087", 127: "#af00af", 128: "#af00d7", 129: "#af00ff", 130: "#af5f00", 131: "#af5f5f", 132: "#af5f87", 133: "#af5faf", 134: "#af5fd7", 135: "#af5fff", 136: "#af8700", 137: "#af875f", 138: "#af8787", 139: "#af87af", 140: "#af87d7", 141: "#af87ff", 142: "#afaf00", 143: "#afaf5f", 144: "#afaf87", 145: "#afafaf", 146: "#afafd7", 147: "#afafff", 148: "#afd700", 149: "#afd75f", 150: "#afd787", 151: "#afd7af", 152: "#afd7d7", 153: "#afd7ff", 154: "#afff00", 155: "#afff5f", 156: "#afff87", 157: "#afffaf", 158: "#afffd7"}) + call extend(s:cterm_color, {159: "#afffff", 160: "#d70000", 161: "#d7005f", 162: "#d70087", 163: "#d700af", 164: "#d700d7", 165: "#d700ff", 166: "#d75f00", 167: "#d75f5f", 168: "#d75f87", 169: "#d75faf", 170: "#d75fd7", 171: "#d75fff", 172: "#d78700", 173: "#d7875f", 174: "#d78787", 175: "#d787af", 176: "#d787d7", 177: "#d787ff", 178: "#d7af00", 179: "#d7af5f", 180: "#d7af87", 181: "#d7afaf", 182: "#d7afd7", 183: "#d7afff", 184: "#d7d700", 185: "#d7d75f", 186: "#d7d787", 187: "#d7d7af", 188: "#d7d7d7", 189: "#d7d7ff", 190: "#d7ff00", 191: "#d7ff5f", 192: "#d7ff87", 193: "#d7ffaf", 194: "#d7ffd7", 195: "#d7ffff", 196: "#ff0000", 197: "#ff005f", 198: "#ff0087", 199: "#ff00af", 200: "#ff00d7", 201: "#ff00ff", 202: "#ff5f00", 203: "#ff5f5f", 204: "#ff5f87"}) + call extend(s:cterm_color, {205: "#ff5faf", 206: "#ff5fd7", 207: "#ff5fff", 208: "#ff8700", 209: "#ff875f", 210: "#ff8787", 211: "#ff87af", 212: "#ff87d7", 213: "#ff87ff", 214: "#ffaf00", 215: "#ffaf5f", 216: "#ffaf87", 217: "#ffafaf", 218: "#ffafd7", 219: "#ffafff", 220: "#ffd700", 221: "#ffd75f", 222: "#ffd787", 223: "#ffd7af", 224: "#ffd7d7", 225: "#ffd7ff", 226: "#ffff00", 227: "#ffff5f", 228: "#ffff87", 229: "#ffffaf", 230: "#ffffd7", 231: "#ffffff", 232: "#080808", 233: "#121212", 234: "#1c1c1c", 235: "#262626", 236: "#303030", 237: "#3a3a3a", 238: "#444444", 239: "#4e4e4e", 240: "#585858", 241: "#626262", 242: "#6c6c6c", 243: "#767676", 244: "#808080", 245: "#8a8a8a", 246: "#949494", 247: "#9e9e9e", 248: "#a8a8a8", 249: "#b2b2b2", 250: "#bcbcbc", 251: "#c6c6c6", 252: "#d0d0d0", 253: "#dadada", 254: "#e4e4e4", 255: "#eeeeee"}) + endif endif endif " Return good color specification: in GUI no transformation is done, in -" terminal return RGB values of known colors and empty string on unknown +" terminal return RGB values of known colors and empty string for unknown if s:whatterm == "gui" function! s:HtmlColor(color) return a:color endfun else function! s:HtmlColor(color) - if exists("s:cterm_color" . a:color) - execute "return s:cterm_color" . a:color + if has_key(s:cterm_color, a:color) + return s:cterm_color[a:color] else return "" endif @@ -219,21 +218,27 @@ if exists("use_xhtml") else exe "normal! a<?xml version=\"1.0\"?>\n\e" endif - let s:tag_close = '/>' + let s:tag_close = ' />' else let s:tag_close = '>' endif +" Cache html_no_pre incase we have to turn it on for non-css mode +if exists("html_no_pre") + let s:old_html_no_pre = html_no_pre +endif + +if !exists("html_use_css") + " Cant put font tags in <pre> + let html_no_pre=1 +endif + let s:HtmlSpace = ' ' let s:LeadingSpace = ' ' let s:HtmlEndline = '' if exists("html_no_pre") let s:HtmlEndline = '<br' . s:tag_close - if exists("use_xhtml") - let s:LeadingSpace = ' ' - else let s:LeadingSpace = ' ' - endif let s:HtmlSpace = '\' . s:LeadingSpace endif @@ -245,21 +250,14 @@ exe "normal! a<meta name=\"Generator\" c if s:html_encoding != "" exe "normal! a<meta http-equiv=\"content-type\" content=\"text/html; charset=" . s:html_encoding . '"' . s:tag_close . "\n\e" endif + if exists("html_use_css") exe "normal! a<style type=\"text/css\">\n<!--\n-->\n</style>\n\e" endif if exists("html_no_pre") - if exists("use_xhtml") - exe "normal! a</head>\n<body>\n<p>\n\e" - else - exe "normal! a</head>\n<body>\n\e" - endif + exe "normal! a</head>\n<body>\n\e" else - if exists("use_xhtml") - exe "normal! a</head>\n<body>\n<p>\n<pre>\n\e" - else - exe "normal! a</head>\n<body>\n<pre>\n\e" - endif + exe "normal! a</head>\n<body>\n<pre>\n\e" endif exe s:orgwin . "wincmd w" @@ -416,18 +414,16 @@ while s:lnum <= s:end endwhile " Finish with the last line exe s:newwin . "wincmd w" + +" Close off the font tag that encapsulates the whole <body> +if !exists("html_use_css") + exe "normal! a</font>\e" +endif + if exists("html_no_pre") - if exists("use_xhtml") - exe "normal! a</p>\n</body>\n</html>\e" - else - exe "normal! a</body>\n</html>\e" - endif + exe "normal! a</body>\n</html>\e" else - if exists("use_xhtml") - exe "normal! a</pre>\n</p>\n</body>\n</html>\e" - else - exe "normal! a</pre>\n</body>\n</html>\e" - endif + exe "normal! a</pre>\n</body>\n</html>\e" endif @@ -451,19 +447,15 @@ endif " incorrect. if exists("html_use_css") if exists("html_no_pre") - execute "normal! A\nbody { color: " . s:fgc . "; background-color: " . s:bgc . "; font-family: Courier, monospace; }\e" + execute "normal! A\nbody { color: " . s:fgc . "; background-color: " . s:bgc . "; font-family: ". s:htmlfont ."; }\e" else - execute "normal! A\npre { color: " . s:fgc . "; background-color: " . s:bgc . "; }\e" + execute "normal! A\npre { font-family: ". s:htmlfont ."; color: " . s:fgc . "; background-color: " . s:bgc . "; }\e" yank put execute "normal! ^cwbody\e" endif else - if exists("html_no_pre") - execute '%s:<body>:<body ' . 'bgcolor="' . s:bgc . '" text="' . s:fgc . '" style="font-family\: Courier, monospace;">' - else - execute '%s:<body>:<body ' . 'bgcolor="' . s:bgc . '" text="' . s:fgc . '">' - endif + execute '%s:<body>:<body bgcolor="' . s:bgc . '" text="' . s:fgc . '"><font face="'. s:htmlfont .'">' endif " Line numbering attributes @@ -493,7 +485,7 @@ while s:idlist != "" execute '%s+<span class="' . s:id_name . '">\([^<]*\)</span>+' . s:HtmlOpening(s:id) . '\1' . s:HtmlClosing(s:id) . '+g' endif else - execute '%s+<span class="' . s:id_name . '">\([^<]*\)</span>+\1+g' + execute '%s+<span class="' . s:id_name . '">\([^<]*\)</span>+\1+ge' if exists("html_use_css") 1;/<style type="text/+1 endif @@ -504,12 +496,10 @@ endwhile %s+\(https\=://\S\{-}\)\(\([.,;:}]\=\(\s\|$\)\)\|[\\"'<>]\|>\|<\|"\)+<a href="\1">\1</a>\2+ge " The DTD -if exists("html_use_css") - if exists("use_xhtml") - exe "normal! gg$a\n<!DOCTYPE html PUBLIC \"-//W3C//DTD XHTML 1.0 Strict//EN\" \"http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd\">\e" - else - exe "normal! gg0i<!DOCTYPE HTML PUBLIC \"-//W3C//DTD HTML 4.01//EN\" \"http://www.w3.org/TR/html4/strict.dtd\">\n\e" - endif +if exists("use_xhtml") + exe "normal! gg$a\n<!DOCTYPE html PUBLIC \"-//W3C//DTD XHTML 1.0 Transitional//EN\" \"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd\">\e" +else + exe "normal! gg0i<!DOCTYPE HTML PUBLIC \"-//W3C//DTD HTML 4.01 Transitional//EN\" \"http://www.w3.org/TR/html4/loose.dtd\">\n\e" endif if exists("use_xhtml") @@ -530,7 +520,16 @@ exe s:orgwin . "wincmd w" let &l:et = s:old_et exe s:newwin . "wincmd w" +" Reset old <pre> settings +if exists("s:old_html_no_pre") + let html_no_pre = s:old_html_no_pre + unlet s:old_html_no_pre +elseif exists("html_no_pre") + unlet html_no_pre +endif + " Save a little bit of memory (worth doing?) +unlet s:htmlfont unlet s:old_et s:old_paste s:old_icon s:old_report s:old_title s:old_search unlet s:whatterm s:idlist s:lnum s:end s:fgc s:bgc s:old_magic unlet! s:col s:id s:attr s:len s:line s:new s:expandedtab s:numblines
--- a/runtime/syntax/rnoweb.vim +++ b/runtime/syntax/rnoweb.vim @@ -1,15 +1,12 @@ " Vim syntax file " Language: R noweb Files " Maintainer: Johannes Ranke <jranke@uni-bremen.de> -" Last Change: 2006 Apr 25 -" Version: 0.6 +" Last Change: 2007 Mr 30 +" Version: 0.8 " SVN: $Id$ " Remarks: - This file is inspired by the proposal of " Fernando Henrique Ferraz Pereira da Rosa <feferraz@ime.usp.br> " http://www.ime.usp.br/~feferraz/en/sweavevim.html -" - It extends some clusters from syntax/tex.vim (version 33, -" March 06 2006) and therefore depends on some contents -" of this file " " Version Clears: {{{1 @@ -23,21 +20,24 @@ endif syn case match -" Extension of Tex regions {{{1 +" Extension of Tex clusters {{{1 runtime syntax/tex.vim unlet b:current_syntax -syn cluster texDocGroup contains=texPartZone,@texPartGroup,@rnoweb -syn cluster texPartGroup contains=texChapterZone,texSectionZone,texParaZone,@rnoweb -syn cluster texChapterGroup contains=texSectionZone,texParaZone,@rnoweb -syn cluster texSectionGroup contains=texSubSectionZone,texParaZone,@rnoweb -syn cluster texSubSectionGroup contains=texSubSubSectionZone,texParaZone,@rnoweb -syn cluster texSubSubSectionGroup contains=texParaZone,@rnoweb -syn cluster texParaGroup contains=texSubParaZone,@rnoweb +syn cluster texMatchGroup add=@rnoweb +syn cluster texEnvGroup add=@rnoweb +syn cluster texFoldGroup add=@rnoweb +syn cluster texDocGroup add=@rnoweb +syn cluster texPartGroup add=@rnoweb +syn cluster texChapterGroup add=@rnoweb +syn cluster texSectionGroup add=@rnoweb +syn cluster texSubSectionGroup add=@rnoweb +syn cluster texSubSubSectionGroup add=@rnoweb +syn cluster texParaGroup add=@rnoweb " Highlighting of R code using an existing r.vim syntax file if available {{{1 syn include @rnowebR syntax/r.vim -syn region rnowebChunk matchgroup=rnowebDelimiter start="^<<.*>>=" matchgroup=rnowebDelimiter end="^@" contains=@rnowebR,rnowebChunkReference,rnowebChunk keepend +syn region rnowebChunk matchgroup=rnowebDelimiter start="^<<.*>>=" matchgroup=rnowebDelimiter end="^@" contains=@rnowebR,rnowebChunkReference,rnowebChunk fold keepend syn match rnowebChunkReference "^<<.*>>$" contained syn region rnowebSexpr matchgroup=Delimiter start="\\Sexpr{" matchgroup=Delimiter end="}" contains=@rnowebR
--- a/runtime/syntax/vb.vim +++ b/runtime/syntax/vb.vim @@ -3,7 +3,8 @@ " Maintainer: Tim Chase <vb.vim@tim.thechases.com> " Former Maintainer: Robert M. Cortopassi <cortopar@mindspring.com> " (tried multiple times to contact, but email bounced) -" Last Change: 2004 May 25 +" Last Change: +" 2005 May 25 Synched with work by Thomas Barthel " 2004 May 30 Added a few keywords " This was thrown together after seeing numerous requests on the @@ -21,223 +22,320 @@ endif " VB is case insensitive syn case ignore -syn keyword vbStatement Alias AppActivate As Base Beep Call Case -syn keyword vbStatement ChDir ChDrive Const Declare DefBool DefByte -syn keyword vbStatement DefCur DefDate DefDbl DefDec DefInt -syn keyword vbStatement DefLng DefObj DefSng DefStr Deftype -syn keyword vbStatement DefVar DeleteSetting Dim Do Each Else -syn keyword vbStatement ElseIf End Enum Erase Event Exit Explicit -syn keyword vbStatement FileCopy For ForEach Function Get GoSub -syn keyword vbStatement GoTo If Implements Kill Let Lib LineInput -syn keyword vbStatement Lock Loop LSet MkDir Name Next OnError On -syn keyword vbStatement Option Preserve Private Property Public Put -syn keyword vbStatement RaiseEvent Randomize ReDim Reset Resume -syn keyword vbStatement Return RmDir RSet SavePicture SaveSetting -syn keyword vbStatement SendKeys Select SetAttr Static Step Sub -syn keyword vbStatement Then Type Unlock Until Wend While Width -syn keyword vbStatement With Write - -syn keyword vbFunction Abs Array Asc AscB AscW Atn Avg CBool -syn keyword vbFunction CByte CCur CDate CDbl Cdec Choose Chr -syn keyword vbFunction ChrB ChrW CInt CLng Command Cos Count -syn keyword vbFunction CreateObject CSng CStr CurDir CVar -syn keyword vbFunction CVDate CVErr DateAdd DateDiff DatePart -syn keyword vbFunction DateSerial DateValue Day DDB Dir -syn keyword vbFunction DoEvents Environ EOF Error Exp FileAttr -syn keyword vbFunction FileDateTime FileLen Fix Format FreeFile -syn keyword vbFunction FV GetAllStrings GetAttr -syn keyword vbFunction GetAutoServerSettings GetObject -syn keyword vbFunction GetSetting Hex Hour IIf IMEStatus Input -syn keyword vbFunction InputB InputBox InStr InstB Int IPmt -syn keyword vbFunction IsArray IsDate IsEmpty IsError IsMissing -syn keyword vbFunction IsNull IsNumeric IsObject LBound LCase -syn keyword vbFunction Left LeftB Len LenB LoadPicture Loc LOF -syn keyword vbFunction Log LTrim Max Mid MidB Min Minute MIRR -syn keyword vbFunction Month MsgBox Now NPer NPV Oct Partition -syn keyword vbFunction Pmt PPmt PV QBColor Rate RGB Right -syn keyword vbFunction RightB Rnd RTrim Second Seek Sgn Shell -syn keyword vbFunction Sin SLN Space Spc Sqr StDev StDevP Str -syn keyword vbFunction StrComp StrConv String Switch Sum SYD -syn keyword vbFunction Tab Tan Time Timer TimeSerial TimeValue -syn keyword vbFunction Trim TypeName UBound UCase Val Var VarP -syn keyword vbFunction VarType Weekday Year +syn keyword vbConditional If Then ElseIf Else Select Case -syn keyword vbMethods Accept Activate Add AddCustom AddFile -syn keyword vbMethods AddFromFile AddFromTemplate AddItem -syn keyword vbMethods AddNew AddToAddInToolbar -syn keyword vbMethods AddToolboxProgID Append AppendChunk -syn keyword vbMethods Arrange Assert AsyncRead BatchUpdate -syn keyword vbMethods BeginTrans Bind Cancel CancelAsyncRead -syn keyword vbMethods CancelBatch CancelUpdate -syn keyword vbMethods CanPropertyChange CaptureImage CellText -syn keyword vbMethods CellValue Circle Clear ClearFields -syn keyword vbMethods ClearSel ClearSelCols Clone Close Cls -syn keyword vbMethods ColContaining ColumnSize CommitTrans -syn keyword vbMethods CompactDatabase Compose Connect Copy -syn keyword vbMethods CopyQueryDef CreateDatabase -syn keyword vbMethods CreateDragImage CreateEmbed CreateField -syn keyword vbMethods CreateGroup CreateIndex CreateLink -syn keyword vbMethods CreatePreparedStatement CreatePropery -syn keyword vbMethods CreateQuery CreateQueryDef -syn keyword vbMethods CreateRelation CreateTableDef CreateUser -syn keyword vbMethods CreateWorkspace Customize Delete -syn keyword vbMethods DeleteColumnLabels DeleteColumns -syn keyword vbMethods DeleteRowLabels DeleteRows DoVerb Drag -syn keyword vbMethods Draw Edit EditCopy EditPaste EndDoc -syn keyword vbMethods EnsureVisible EstablishConnection -syn keyword vbMethods Execute ExtractIcon Fetch FetchVerbs -syn keyword vbMethods Files FillCache Find FindFirst FindItem -syn keyword vbMethods FindLast FindNext FindPrevious Forward -syn keyword vbMethods GetBookmark GetChunk GetClipString -syn keyword vbMethods GetData GetFirstVisible GetFormat -syn keyword vbMethods GetHeader GetLineFromChar GetNumTicks -syn keyword vbMethods GetRows GetSelectedPart GetText -syn keyword vbMethods GetVisibleCount GoBack GoForward Hide -syn keyword vbMethods HitTest HoldFields Idle InitializeLabels -syn keyword vbMethods InsertColumnLabels InsertColumns -syn keyword vbMethods InsertObjDlg InsertRowLabels InsertRows -syn keyword vbMethods Item KillDoc Layout Line LinkExecute -syn keyword vbMethods LinkPoke LinkRequest LinkSend Listen -syn keyword vbMethods LoadFile LoadResData LoadResPicture -syn keyword vbMethods LoadResString LogEvent MakeCompileFile -syn keyword vbMethods MakeReplica MoreResults Move MoveData -syn keyword vbMethods MoveFirst MoveLast MoveNext MovePrevious -syn keyword vbMethods NavigateTo NewPage NewPassword -syn keyword vbMethods NextRecordset OLEDrag OnAddinsUpdate -syn keyword vbMethods OnConnection OnDisconnection -syn keyword vbMethods OnStartupComplete Open OpenConnection -syn keyword vbMethods OpenDatabase OpenQueryDef OpenRecordset -syn keyword vbMethods OpenResultset OpenURL Overlay -syn keyword vbMethods PaintPicture Paste PastSpecialDlg -syn keyword vbMethods PeekData Play Point PopulatePartial -syn keyword vbMethods PopupMenu Print PrintForm -syn keyword vbMethods PropertyChanged PSet Quit Raise -syn keyword vbMethods RandomDataFill RandomFillColumns -syn keyword vbMethods RandomFillRows rdoCreateEnvironment -syn keyword vbMethods rdoRegisterDataSource ReadFromFile -syn keyword vbMethods ReadProperty Rebind ReFill Refresh -syn keyword vbMethods RefreshLink RegisterDatabase Reload -syn keyword vbMethods Remove RemoveAddInFromToolbar RemoveItem -syn keyword vbMethods Render RepairDatabase Reply ReplyAll -syn keyword vbMethods Requery ResetCustom ResetCustomLabel -syn keyword vbMethods ResolveName RestoreToolbar Resync -syn keyword vbMethods Rollback RollbackTrans RowBookmark -syn keyword vbMethods RowContaining RowTop Save SaveAs -syn keyword vbMethods SaveFile SaveToFile SaveToolbar -syn keyword vbMethods SaveToOle1File Scale ScaleX ScaleY -syn keyword vbMethods Scroll SelectAll SelectPart SelPrint -syn keyword vbMethods Send SendData Set SetAutoServerSettings -syn keyword vbMethods SetData SetFocus SetOption SetSize -syn keyword vbMethods SetText SetViewport Show ShowColor -syn keyword vbMethods ShowFont ShowHelp ShowOpen ShowPrinter -syn keyword vbMethods ShowSave ShowWhatsThis SignOff SignOn -syn keyword vbMethods Size Span SplitContaining StartLabelEdit -syn keyword vbMethods StartLogging Stop Synchronize TextHeight -syn keyword vbMethods TextWidth ToDefaults TwipsToChartPart -syn keyword vbMethods TypeByChartType Update UpdateControls -syn keyword vbMethods UpdateRecord UpdateRow Upto -syn keyword vbMethods WhatsThisMode WriteProperty ZOrder - -syn keyword vbEvents AccessKeyPress AfterAddFile -syn keyword vbEvents AfterChangeFileName AfterCloseFile -syn keyword vbEvents AfterColEdit AfterColUpdate AfterDelete -syn keyword vbEvents AfterInsert AfterLabelEdit -syn keyword vbEvents AfterRemoveFile AfterUpdate -syn keyword vbEvents AfterWriteFile AmbienChanged -syn keyword vbEvents ApplyChanges Associate AsyncReadComplete -syn keyword vbEvents AxisActivated AxisLabelActivated -syn keyword vbEvents AxisLabelSelected AxisLabelUpdated -syn keyword vbEvents AxisSelected AxisTitleActivated -syn keyword vbEvents AxisTitleSelected AxisTitleUpdated -syn keyword vbEvents AxisUpdated BeforeClick BeforeColEdit -syn keyword vbEvents BeforeColUpdate BeforeConnect -syn keyword vbEvents BeforeDelete BeforeInsert -syn keyword vbEvents BeforeLabelEdit BeforeLoadFile -syn keyword vbEvents BeforeUpdate ButtonClick ButtonCompleted -syn keyword vbEvents ButtonGotFocus ButtonLostFocus Change -syn keyword vbEvents ChartActivated ChartSelected -syn keyword vbEvents ChartUpdated Click ColEdit Collapse -syn keyword vbEvents ColResize ColumnClick Compare -syn keyword vbEvents ConfigChageCancelled ConfigChanged -syn keyword vbEvents ConnectionRequest DataArrival -syn keyword vbEvents DataChanged DataUpdated DblClick -syn keyword vbEvents Deactivate DeviceArrival -syn keyword vbEvents DeviceOtherEvent DeviceQueryRemove -syn keyword vbEvents DeviceQueryRemoveFailed -syn keyword vbEvents DeviceRemoveComplete DeviceRemovePending -syn keyword vbEvents DevModeChange Disconnect DisplayChanged -syn keyword vbEvents Dissociate DoGetNewFileName Done -syn keyword vbEvents DonePainting DownClick DragDrop DragOver -syn keyword vbEvents DropDown EditProperty EnterCell -syn keyword vbEvents EnterFocus ExitFocus Expand -syn keyword vbEvents FootnoteActivated FootnoteSelected -syn keyword vbEvents FootnoteUpdated GotFocus HeadClick -syn keyword vbEvents InfoMessage Initialize IniProperties -syn keyword vbEvents ItemActivated ItemAdded ItemCheck -syn keyword vbEvents ItemClick ItemReloaded ItemRemoved -syn keyword vbEvents ItemRenamed ItemSeletected KeyDown -syn keyword vbEvents KeyPress KeyUp LeaveCell LegendActivated -syn keyword vbEvents LegendSelected LegendUpdated LinkClose -syn keyword vbEvents LinkError LinkNotify LinkOpen Load -syn keyword vbEvents LostFocus MouseDown MouseMove MouseUp -syn keyword vbEvents NodeClick ObjectMove OLECompleteDrag -syn keyword vbEvents OLEDragDrop OLEDragOver OLEGiveFeedback -syn keyword vbEvents OLESetData OLEStartDrag OnAddNew OnComm -syn keyword vbEvents Paint PanelClick PanelDblClick -syn keyword vbEvents PathChange PatternChange PlotActivated -syn keyword vbEvents PlotSelected PlotUpdated PointActivated -syn keyword vbEvents PointLabelActivated PointLabelSelected -syn keyword vbEvents PointLabelUpdated PointSelected -syn keyword vbEvents PointUpdated PowerQuerySuspend -syn keyword vbEvents PowerResume PowerStatusChanged -syn keyword vbEvents PowerSuspend QueryChangeConfig -syn keyword vbEvents QueryComplete QueryCompleted -syn keyword vbEvents QueryTimeout QueryUnload ReadProperties -syn keyword vbEvents Reposition RequestChangeFileName -syn keyword vbEvents RequestWriteFile Resize ResultsChanged -syn keyword vbEvents RowColChange RowCurrencyChange RowResize -syn keyword vbEvents RowStatusChanged SelChange -syn keyword vbEvents SelectionChanged SendComplete -syn keyword vbEvents SendProgress SeriesActivated -syn keyword vbEvents SeriesSelected SeriesUpdated -syn keyword vbEvents SettingChanged SplitChange StateChanged -syn keyword vbEvents StatusUpdate SysColorsChanged Terminate -syn keyword vbEvents TimeChanged TitleActivated TitleSelected -syn keyword vbEvents TitleActivated UnboundAddData -syn keyword vbEvents UnboundDeleteRow -syn keyword vbEvents UnboundGetRelativeBookmark -syn keyword vbEvents UnboundReadData UnboundWriteData Unload -syn keyword vbEvents UpClick Updated Validate ValidationError -syn keyword vbEvents WillAssociate WillChangeData -syn keyword vbEvents WillDissociate WillExecute -syn keyword vbEvents WillUpdateRows WriteProperties - -syn keyword vbTypes Boolean Byte Currency Date Decimal -syn keyword vbTypes Double Empty Integer Long Single String +syn keyword vbOperator AddressOf And ByRef ByVal Eqv Imp In +syn keyword vbOperator Is Like Mod Not Or To Xor syn match vbOperator "[()+.,\-/*=&]" syn match vbOperator "[<>]=\=" syn match vbOperator "<>" syn match vbOperator "\s\+_$" -syn keyword vbOperator And Or Not Xor Mod In Is Imp Eqv -syn keyword vbOperator To ByVal ByRef -syn keyword vbConst True False Null Nothing + +syn keyword vbBoolean True False +syn keyword vbConst Null Nothing + +syn keyword vbRepeat Do For ForEach Loop Next +syn keyword vbRepeat Step To Until Wend While + +syn keyword vbEvents AccessKeyPress Activate ActiveRowChanged +syn keyword vbEvents AfterAddFile AfterChangeFileName AfterCloseFile +syn keyword vbEvents AfterColEdit AfterColUpdate AfterDelete +syn keyword vbEvents AfterInsert AfterLabelEdit AfterRemoveFile +syn keyword vbEvents AfterUpdate AfterWriteFile AmbientChanged +syn keyword vbEvents ApplyChanges Associate AsyncProgress +syn keyword vbEvents AsyncReadComplete AsyncReadProgress AxisActivated +syn keyword vbEvents AxisLabelActivated AxisLabelSelected +syn keyword vbEvents AxisLabelUpdated AxisSelected AxisTitleActivated +syn keyword vbEvents AxisTitleSelected AxisTitleUpdated AxisUpdated +syn keyword vbEvents BeforeClick BeforeColEdit BeforeColUpdate +syn keyword vbEvents BeforeConnect BeforeDelete BeforeInsert +syn keyword vbEvents BeforeLabelEdit BeforeLoadFile BeforeUpdate +syn keyword vbEvents BeginRequest BeginTrans ButtonClick +syn keyword vbEvents ButtonCompleted ButtonDropDown ButtonGotFocus +syn keyword vbEvents ButtonLostFocus CallbackKeyDown Change Changed +syn keyword vbEvents ChartActivated ChartSelected ChartUpdated Click +syn keyword vbEvents Close CloseQuery CloseUp ColEdit ColResize +syn keyword vbEvents Collapse ColumnClick CommitTrans Compare +syn keyword vbEvents ConfigChageCancelled ConfigChanged +syn keyword vbEvents ConfigChangedCancelled Connect ConnectionRequest +syn keyword vbEvents CurrentRecordChanged DECommandAdded +syn keyword vbEvents DECommandPropertyChanged DECommandRemoved +syn keyword vbEvents DEConnectionAdded DEConnectionPropertyChanged +syn keyword vbEvents DEConnectionRemoved DataArrival DataChanged +syn keyword vbEvents DataUpdated DateClicked DblClick Deactivate +syn keyword vbEvents DevModeChange DeviceArrival DeviceOtherEvent +syn keyword vbEvents DeviceQueryRemove DeviceQueryRemoveFailed +syn keyword vbEvents DeviceRemoveComplete DeviceRemovePending +syn keyword vbEvents Disconnect DisplayChanged Dissociate +syn keyword vbEvents DoGetNewFileName Done DonePainting DownClick +syn keyword vbEvents DragDrop DragOver DropDown EditProperty EditQuery +syn keyword vbEvents EndRequest EnterCell EnterFocus ExitFocus Expand +syn keyword vbEvents FontChanged FootnoteActivated FootnoteSelected +syn keyword vbEvents FootnoteUpdated Format FormatSize GotFocus +syn keyword vbEvents HeadClick HeightChanged Hide InfoMessage +syn keyword vbEvents IniProperties InitProperties Initialize +syn keyword vbEvents ItemActivated ItemAdded ItemCheck ItemClick +syn keyword vbEvents ItemReloaded ItemRemoved ItemRenamed +syn keyword vbEvents ItemSeletected KeyDown KeyPress KeyUp LeaveCell +syn keyword vbEvents LegendActivated LegendSelected LegendUpdated +syn keyword vbEvents LinkClose LinkError LinkExecute LinkNotify +syn keyword vbEvents LinkOpen Load LostFocus MouseDown MouseMove +syn keyword vbEvents MouseUp NodeCheck NodeClick OLECompleteDrag +syn keyword vbEvents OLEDragDrop OLEDragOver OLEGiveFeedback OLESetData +syn keyword vbEvents OLEStartDrag ObjectEvent ObjectMove OnAddNew +syn keyword vbEvents OnComm Paint PanelClick PanelDblClick PathChange +syn keyword vbEvents PatternChange PlotActivated PlotSelected +syn keyword vbEvents PlotUpdated PointActivated PointLabelActivated +syn keyword vbEvents PointLabelSelected PointLabelUpdated PointSelected +syn keyword vbEvents PointUpdated PowerQuerySuspend PowerResume +syn keyword vbEvents PowerStatusChanged PowerSuspend ProcessTag +syn keyword vbEvents ProcessingTimeout QueryChangeConfig QueryClose +syn keyword vbEvents QueryComplete QueryCompleted QueryTimeout +syn keyword vbEvents QueryUnload ReadProperties RepeatedControlLoaded +syn keyword vbEvents RepeatedControlUnloaded Reposition +syn keyword vbEvents RequestChangeFileName RequestWriteFile Resize +syn keyword vbEvents ResultsChanged RetainedProject RollbackTrans +syn keyword vbEvents RowColChange RowCurrencyChange RowResize +syn keyword vbEvents RowStatusChanged Scroll SelChange SelectionChanged +syn keyword vbEvents SendComplete SendProgress SeriesActivated +syn keyword vbEvents SeriesSelected SeriesUpdated SettingChanged Show +syn keyword vbEvents SplitChange Start StateChanged StatusUpdate +syn keyword vbEvents SysColorsChanged Terminate TimeChanged Timer +syn keyword vbEvents TitleActivated TitleSelected TitleUpdated +syn keyword vbEvents UnboundAddData UnboundDeleteRow +syn keyword vbEvents UnboundGetRelativeBookmark UnboundReadData +syn keyword vbEvents UnboundWriteData Unformat Unload UpClick Updated +syn keyword vbEvents UserEvent Validate ValidationError +syn keyword vbEvents VisibleRecordChanged WillAssociate WillChangeData +syn keyword vbEvents WillDissociate WillExecute WillUpdateRows +syn keyword vbEvents WriteProperties + + +syn keyword vbFunction Abs Array Asc AscB AscW Atn Avg BOF CBool CByte +syn keyword vbFunction CCur CDate CDbl CInt CLng CSng CStr CVDate CVErr +syn keyword vbFunction CVar CallByName Cdec Choose Chr ChrB ChrW Command +syn keyword vbFunction Cos Count CreateObject CurDir DDB Date DateAdd +syn keyword vbFunction DateDiff DatePart DateSerial DateValue Day Dir +syn keyword vbFunction DoEvents EOF Environ Error Exp FV FileAttr +syn keyword vbFunction FileDateTime FileLen FilterFix Fix Format +syn keyword vbFunction FormatCurrency FormatDateTime FormatNumber +syn keyword vbFunction FormatPercent FreeFile GetAllStrings GetAttr +syn keyword vbFunction GetAutoServerSettings GetObject GetSetting Hex +syn keyword vbFunction Hour IIf IMEStatus IPmt InStr Input InputB +syn keyword vbFunction InputBox InstrB Int IsArray IsDate IsEmpty IsError +syn keyword vbFunction IsMissing IsNull IsNumeric IsObject Join LBound +syn keyword vbFunction LCase LOF LTrim Left LeftB Len LenB LoadPicture +syn keyword vbFunction LoadResData LoadResPicture LoadResString Loc Log +syn keyword vbFunction MIRR Max Mid MidB Min Minute Month MonthName +syn keyword vbFunction MsgBox NPV NPer Now Oct PPmt PV Partition Pmt +syn keyword vbFunction QBColor RGB RTrim Rate Replace Right RightB Rnd +syn keyword vbFunction Round SLN SYD Second Seek Sgn Shell Sin Space Spc +syn keyword vbFunction Split Sqr StDev StDevP Str StrComp StrConv +syn keyword vbFunction StrReverse String Sum Switch Tab Tan Time +syn keyword vbFunction TimeSerial TimeValue Timer Trim TypeName UBound +syn keyword vbFunction UCase Val Var VarP VarType Weekday WeekdayName +syn keyword vbFunction Year -syn keyword vbTodo contained TODO +syn keyword vbMethods AboutBox Accept Activate Add AddCustom AddFile +syn keyword vbMethods AddFromFile AddFromGuid AddFromString +syn keyword vbMethods AddFromTemplate AddItem AddNew AddToAddInToolbar +syn keyword vbMethods AddToolboxProgID Append AppendAppendChunk +syn keyword vbMethods AppendChunk Arrange Assert AsyncRead BatchUpdate +syn keyword vbMethods BeginQueryEdit BeginTrans Bind BuildPath +syn keyword vbMethods CanPropertyChange Cancel CancelAsyncRead +syn keyword vbMethods CancelBatch CancelUpdate CaptureImage CellText +syn keyword vbMethods CellValue Circle Clear ClearFields ClearSel +syn keyword vbMethods ClearSelCols ClearStructure Clone Close Cls +syn keyword vbMethods ColContaining CollapseAll ColumnSize CommitTrans +syn keyword vbMethods CompactDatabase Compose Connect Copy CopyFile +syn keyword vbMethods CopyFolder CopyQueryDef Count CreateDatabase +syn keyword vbMethods CreateDragImage CreateEmbed CreateField +syn keyword vbMethods CreateFolder CreateGroup CreateIndex CreateLink +syn keyword vbMethods CreatePreparedStatement CreatePropery CreateQuery +syn keyword vbMethods CreateQueryDef CreateRelation CreateTableDef +syn keyword vbMethods CreateTextFile CreateToolWindow CreateUser +syn keyword vbMethods CreateWorkspace Customize Cut Delete +syn keyword vbMethods DeleteColumnLabels DeleteColumns DeleteFile +syn keyword vbMethods DeleteFolder DeleteLines DeleteRowLabels +syn keyword vbMethods DeleteRows DeselectAll DesignerWindow DoVerb Drag +syn keyword vbMethods Draw DriveExists Edit EditCopy EditPaste EndDoc +syn keyword vbMethods EnsureVisible EstablishConnection Execute Exists +syn keyword vbMethods Expand Export ExportReport ExtractIcon Fetch +syn keyword vbMethods FetchVerbs FileExists Files FillCache Find +syn keyword vbMethods FindFirst FindItem FindLast FindNext FindPrevious +syn keyword vbMethods FolderExists Forward GetAbsolutePathName +syn keyword vbMethods GetBaseName GetBookmark GetChunk GetClipString +syn keyword vbMethods GetData GetDrive GetDriveName GetFile GetFileName +syn keyword vbMethods GetFirstVisible GetFolder GetFormat GetHeader +syn keyword vbMethods GetLineFromChar GetNumTicks GetParentFolderName +syn keyword vbMethods GetRows GetSelectedPart GetSelection +syn keyword vbMethods GetSpecialFolder GetTempName GetText +syn keyword vbMethods GetVisibleCount GoBack GoForward Hide HitTest +syn keyword vbMethods HoldFields Idle Import InitializeLabels Insert +syn keyword vbMethods InsertColumnLabels InsertColumns InsertFile +syn keyword vbMethods InsertLines InsertObjDlg InsertRowLabels +syn keyword vbMethods InsertRows Item Keys KillDoc Layout Line Lines +syn keyword vbMethods LinkExecute LinkPoke LinkRequest LinkSend Listen +syn keyword vbMethods LoadFile LoadResData LoadResPicture LoadResString +syn keyword vbMethods LogEvent MakeCompileFile MakeCompiledFile +syn keyword vbMethods MakeReplica MoreResults Move MoveData MoveFile +syn keyword vbMethods MoveFirst MoveFolder MoveLast MoveNext +syn keyword vbMethods MovePrevious NavigateTo NewPage NewPassword +syn keyword vbMethods NextRecordset OLEDrag OnAddinsUpdate OnConnection +syn keyword vbMethods OnDisconnection OnStartupComplete Open +syn keyword vbMethods OpenAsTextStream OpenConnection OpenDatabase +syn keyword vbMethods OpenQueryDef OpenRecordset OpenResultset OpenURL +syn keyword vbMethods Overlay PSet PaintPicture PastSpecialDlg Paste +syn keyword vbMethods PeekData Play Point PopulatePartial PopupMenu +syn keyword vbMethods Print PrintForm PrintReport PropertyChanged Quit +syn keyword vbMethods Raise RandomDataFill RandomFillColumns +syn keyword vbMethods RandomFillRows ReFill Read ReadAll ReadFromFile +syn keyword vbMethods ReadLine ReadProperty Rebind Refresh RefreshLink +syn keyword vbMethods RegisterDatabase ReleaseInstance Reload Remove +syn keyword vbMethods RemoveAddInFromToolbar RemoveAll RemoveItem Render +syn keyword vbMethods RepairDatabase ReplaceLine Reply ReplyAll Requery +syn keyword vbMethods ResetCustom ResetCustomLabel ResolveName +syn keyword vbMethods RestoreToolbar Resync Rollback RollbackTrans +syn keyword vbMethods RowBookmark RowContaining RowTop Save SaveAs +syn keyword vbMethods SaveFile SaveToFile SaveToOle1File SaveToolbar +syn keyword vbMethods Scale ScaleX ScaleY Scroll SelPrint SelectAll +syn keyword vbMethods SelectPart Send SendData Set SetAutoServerSettings +syn keyword vbMethods SetData SetFocus SetOption SetSelection SetSize +syn keyword vbMethods SetText SetViewport Show ShowColor ShowFont +syn keyword vbMethods ShowHelp ShowOpen ShowPrinter ShowSave +syn keyword vbMethods ShowWhatsThis SignOff SignOn Size Skip SkipLine +syn keyword vbMethods Span Split SplitContaining StartLabelEdit +syn keyword vbMethods StartLogging Stop Synchronize Tag TextHeight +syn keyword vbMethods TextWidth ToDefaults Trace TwipsToChartPart +syn keyword vbMethods TypeByChartType URLFor Update UpdateControls +syn keyword vbMethods UpdateRecord UpdateRow Upto ValidateControls Value +syn keyword vbMethods WhatsThisMode Write WriteBlankLines WriteLine +syn keyword vbMethods WriteProperty WriteTemplate ZOrder +syn keyword vbMethods rdoCreateEnvironment rdoRegisterDataSource +syn keyword vbStatement Alias AppActivate As Base Beep Begin Call ChDir +syn keyword vbStatement ChDrive Close Const Date Declare DefBool DefByte +syn keyword vbStatement DefCur DefDate DefDbl DefDec DefInt DefLng DefObj +syn keyword vbStatement DefSng DefStr DefVar Deftype DeleteSetting Dim Do +syn keyword vbStatement Each ElseIf End Enum Erase Error Event Exit +syn keyword vbStatement Explicit FileCopy For ForEach Function Get GoSub +syn keyword vbStatement GoTo Gosub Implements Kill LSet Let Lib LineInput +syn keyword vbStatement Load Lock Loop Mid MkDir Name Next On OnError Open +syn keyword vbStatement Option Preserve Private Property Public Put RSet +syn keyword vbStatement RaiseEvent Randomize ReDim Redim Rem Reset Resume +syn keyword vbStatement Return RmDir SavePicture SaveSetting Seek SendKeys +syn keyword vbStatement Sendkeys Set SetAttr Static Step Stop Sub Time +syn keyword vbStatement Type Unload Unlock Until Wend While Width With +syn keyword vbStatement Write + +syn keyword vbKeyword As Binary ByRef ByVal Date Empty Error Friend Get +syn keyword vbKeyword Input Is Len Lock Me Mid New Nothing Null On +syn keyword vbKeyword Option Optional ParamArray Print Private Property +syn keyword vbKeyword Public PublicNotCreateable OnNewProcessSingleUse +syn keyword vbKeyword InSameProcessMultiUse GlobalMultiUse Resume Seek +syn keyword vbKeyword Set Static Step String Time WithEvents + +syn keyword vbTodo contained TODO + +"Datatypes +syn keyword vbTypes Boolean Byte Currency Date Decimal Double Empty +syn keyword vbTypes Integer Long Object Single String Variant + +"VB defined values +syn keyword vbDefine dbBigInt dbBinary dbBoolean dbByte dbChar +syn keyword vbDefine dbCurrency dbDate dbDecimal dbDouble dbFloat +syn keyword vbDefine dbGUID dbInteger dbLong dbLongBinary dbMemo +syn keyword vbDefine dbNumeric dbSingle dbText dbTime dbTimeStamp +syn keyword vbDefine dbVarBinary + +"VB defined values +syn keyword vbDefine vb3DDKShadow vb3DFace vb3DHighlight vb3DLight +syn keyword vbDefine vb3DShadow vbAbort vbAbortRetryIgnore +syn keyword vbDefine vbActiveBorder vbActiveTitleBar vbAlias +syn keyword vbDefine vbApplicationModal vbApplicationWorkspace +syn keyword vbDefine vbAppTaskManager vbAppWindows vbArchive vbArray +syn keyword vbDefine vbBack vbBinaryCompare vbBlack vbBlue vbBoolean +syn keyword vbDefine vbButtonFace vbButtonShadow vbButtonText vbByte +syn keyword vbDefine vbCalGreg vbCalHijri vbCancel vbCr vbCritical +syn keyword vbDefine vbCrLf vbCurrency vbCyan vbDatabaseCompare +syn keyword vbDefine vbDataObject vbDate vbDecimal vbDefaultButton1 +syn keyword vbDefine vbDefaultButton2 vbDefaultButton3 vbDefaultButton4 +syn keyword vbDefine vbDesktop vbDirectory vbDouble vbEmpty vbError +syn keyword vbDefine vbExclamation vbFirstFourDays vbFirstFullWeek +syn keyword vbDefine vbFirstJan1 vbFormCode vbFormControlMenu +syn keyword vbDefine vbFormFeed vbFormMDIForm vbFriday vbFromUnicode +syn keyword vbDefine vbGrayText vbGreen vbHidden vbHide vbHighlight +syn keyword vbDefine vbHighlightText vbHiragana vbIgnore vbIMEAlphaDbl +syn keyword vbDefine vbIMEAlphaSng vbIMEDisable vbIMEHiragana +syn keyword vbDefine vbIMEKatakanaDbl vbIMEKatakanaSng vbIMEModeAlpha +syn keyword vbDefine vbIMEModeAlphaFull vbIMEModeDisable +syn keyword vbDefine vbIMEModeHangul vbIMEModeHangulFull +syn keyword vbDefine vbIMEModeHiragana vbIMEModeKatakana +syn keyword vbDefine vbIMEModeKatakanaHalf vbIMEModeNoControl +syn keyword vbDefine vbIMEModeOff vbIMEModeOn vbIMENoOp vbIMEOff +syn keyword vbDefine vbIMEOn vbInactiveBorder vbInactiveCaptionText +syn keyword vbDefine vbInactiveTitleBar vbInfoBackground vbInformation +syn keyword vbDefine vbInfoText vbInteger vbKatakana vbKey0 vbKey1 +syn keyword vbDefine vbKey2 vbKey3 vbKey4 vbKey5 vbKey6 vbKey7 vbKey8 +syn keyword vbDefine vbKey9 vbKeyA vbKeyAdd vbKeyB vbKeyBack vbKeyC +syn keyword vbDefine vbKeyCancel vbKeyCapital vbKeyClear vbKeyControl +syn keyword vbDefine vbKeyD vbKeyDecimal vbKeyDelete vbKeyDivide +syn keyword vbDefine vbKeyDown vbKeyE vbKeyEnd vbKeyEscape vbKeyExecute +syn keyword vbDefine vbKeyF vbKeyF1 vbKeyF10 vbKeyF11 vbKeyF12 vbKeyF13 +syn keyword vbDefine vbKeyF14 vbKeyF15 vbKeyF16 vbKeyF2 vbKeyF3 vbKeyF4 +syn keyword vbDefine vbKeyF5 vbKeyF6 vbKeyF7 vbKeyF8 vbKeyF9 vbKeyG +syn keyword vbDefine vbKeyH vbKeyHelp vbKeyHome vbKeyI vbKeyInsert +syn keyword vbDefine vbKeyJ vbKeyK vbKeyL vbKeyLButton vbKeyLeft vbKeyM +syn keyword vbDefine vbKeyMButton vbKeyMenu vbKeyMultiply vbKeyN +syn keyword vbDefine vbKeyNumlock vbKeyNumpad0 vbKeyNumpad1 +syn keyword vbDefine vbKeyNumpad2 vbKeyNumpad3 vbKeyNumpad4 +syn keyword vbDefine vbKeyNumpad5 vbKeyNumpad6 vbKeyNumpad7 +syn keyword vbDefine vbKeyNumpad8 vbKeyNumpad9 vbKeyO vbKeyP +syn keyword vbDefine vbKeyPageDown vbKeyPageUp vbKeyPause vbKeyPrint +syn keyword vbDefine vbKeyQ vbKeyR vbKeyRButton vbKeyReturn vbKeyRight +syn keyword vbDefine vbKeyS vbKeySelect vbKeySeparator vbKeyShift +syn keyword vbDefine vbKeySnapshot vbKeySpace vbKeySubtract vbKeyT +syn keyword vbDefine vbKeyTab vbKeyU vbKeyUp vbKeyV vbKeyW vbKeyX +syn keyword vbDefine vbKeyY vbKeyZ vbLf vbLong vbLowerCase vbMagenta +syn keyword vbDefine vbMaximizedFocus vbMenuBar vbMenuText +syn keyword vbDefine vbMinimizedFocus vbMinimizedNoFocus vbMonday +syn keyword vbDefine vbMsgBox vbMsgBoxHelpButton vbMsgBoxRight +syn keyword vbDefine vbMsgBoxRtlReading vbMsgBoxSetForeground +syn keyword vbDefine vbMsgBoxText vbNarrow vbNewLine vbNo vbNormal +syn keyword vbDefine vbNormalFocus vbNormalNoFocus vbNull vbNullChar +syn keyword vbDefine vbNullString vbObject vbObjectError vbOK +syn keyword vbDefine vbOKCancel vbOKOnly vbProperCase vbQuestion +syn keyword vbDefine vbReadOnly vbRed vbRetry vbRetryCancel vbSaturday +syn keyword vbDefine vbScrollBars vbSingle vbString vbSunday vbSystem +syn keyword vbDefine vbSystemModal vbTab vbTextCompare vbThursday +syn keyword vbDefine vbTitleBarText vbTuesday vbUnicode vbUpperCase +syn keyword vbDefine vbUseSystem vbUseSystemDayOfWeek vbVariant +syn keyword vbDefine vbVerticalTab vbVolume vbWednesday vbWhite vbWide +syn keyword vbDefine vbWindowBackground vbWindowFrame vbWindowText +syn keyword vbDefine vbYellow vbYes vbYesNo vbYesNoCancel + +"Numbers "integer number, or floating point number without a dot. syn match vbNumber "\<\d\+\>" "floating point number, with dot syn match vbNumber "\<\d\+\.\d*\>" "floating point number, starting with a dot syn match vbNumber "\.\d\+\>" +"syn match vbNumber "{[[:xdigit:]-]\+}\|&[hH][[:xdigit:]]\+&" +"syn match vbNumber ":[[:xdigit:]]\+" +"syn match vbNumber "[-+]\=\<\d\+\>" +syn match vbFloat "[-+]\=\<\d\+[eE][\-+]\=\d\+" +syn match vbFloat "[-+]\=\<\d\+\.\d*\([eE][\-+]\=\d\+\)\=" +syn match vbFloat "[-+]\=\<\.\d\+\([eE][\-+]\=\d\+\)\=" " String and Character contstants -syn region vbString start=+"+ end=+"+ -syn region vbComment start="\<REM\>" end="$" contains=vbTodo -syn region vbComment start="'" end="$" contains=vbTodo -syn region vbLineNumber start="^\d" end="\s" -syn match vbTypeSpecifier "[a-zA-Z0-9][\$%&!#]"ms=s+1 +syn region vbString start=+"+ end=+"\|$+ +syn region vbComment start="\(^\|\s\)REM\s" end="$" contains=vbTodo +syn region vbComment start="\(^\|\s\)\'" end="$" contains=vbTodo +syn match vbLineNumber "^\d\+\(\s\|$\)" +syn match vbTypeSpecifier "[a-zA-Z0-9][\$%&!#]"ms=s+1 +syn match vbTypeSpecifier "#[a-zA-Z0-9]"me=e-1 " Define the default highlighting. " For version 5.7 and earlier: only when not done already @@ -250,20 +348,27 @@ if version >= 508 || !exists("did_vb_syn command -nargs=+ HiLink hi def link <args> endif - HiLink vbLineNumber Comment - HiLink vbNumber Number - HiLink vbConst Constant - HiLink vbError Error - HiLink vbStatement Statement - HiLink vbString String - HiLink vbComment Comment - HiLink vbTodo Todo - HiLink vbFunction Identifier - HiLink vbMethods PreProc - HiLink vbEvents Special + HiLink vbBoolean Boolean + HiLink vbLineNumber Comment + HiLink vbComment Comment + HiLink vbConditional Conditional + HiLink vbConst Constant + HiLink vbDefine Constant + HiLink vbError Error + HiLink vbFunction Identifier + HiLink vbIdentifier Identifier + HiLink vbNumber Number + HiLink vbFloat Float + HiLink vbMethods PreProc + HiLink vbOperator Operator + HiLink vbRepeat Repeat + HiLink vbString String + HiLink vbStatement Statement + HiLink vbKeyword Statement + HiLink vbEvents Special + HiLink vbTodo Todo + HiLink vbTypes Type HiLink vbTypeSpecifier Type - HiLink vbTypes Type - HiLink vbOperator Operator delcommand HiLink endif
--- a/src/proto/gui_gtk.pro +++ b/src/proto/gui_gtk.pro @@ -1,23 +1,23 @@ /* gui_gtk.c */ -extern void gui_gtk_register_stock_icons __ARGS((void)); -extern void gui_mch_add_menu __ARGS((vimmenu_T *menu, int idx)); -extern void gui_mch_add_menu_item __ARGS((vimmenu_T *menu, int idx)); -extern void gui_mch_set_text_area_pos __ARGS((int x, int y, int w, int h)); -extern void gui_gtk_set_mnemonics __ARGS((int enable)); -extern void gui_mch_toggle_tearoffs __ARGS((int enable)); -extern void gui_mch_menu_set_tip __ARGS((vimmenu_T *menu)); -extern void gui_mch_destroy_menu __ARGS((vimmenu_T *menu)); -extern void gui_mch_set_scrollbar_thumb __ARGS((scrollbar_T *sb, long val, long size, long max)); -extern void gui_mch_set_scrollbar_pos __ARGS((scrollbar_T *sb, int x, int y, int w, int h)); -extern void gui_mch_create_scrollbar __ARGS((scrollbar_T *sb, int orient)); -extern void gui_mch_destroy_scrollbar __ARGS((scrollbar_T *sb)); -extern char_u *gui_mch_browse __ARGS((int saving, char_u *title, char_u *dflt, char_u *ext, char_u *initdir, char_u *filter)); -extern char_u *gui_mch_browsedir __ARGS((char_u *title, char_u *initdir)); -extern int gui_mch_dialog __ARGS((int type, char_u *title, char_u *message, char_u *buttons, int def_but, char_u *textfield)); -extern void gui_mch_show_popupmenu __ARGS((vimmenu_T *menu)); -extern void gui_make_popup __ARGS((char_u *path_name, int mouse_pos)); -extern void gui_mch_find_dialog __ARGS((exarg_T *eap)); -extern void gui_mch_replace_dialog __ARGS((exarg_T *eap)); -extern void gui_gtk_synch_fonts __ARGS((void)); -extern void ex_helpfind __ARGS((exarg_T *eap)); +void gui_gtk_register_stock_icons __ARGS((void)); +void gui_mch_add_menu __ARGS((vimmenu_T *menu, int idx)); +void gui_mch_add_menu_item __ARGS((vimmenu_T *menu, int idx)); +void gui_mch_set_text_area_pos __ARGS((int x, int y, int w, int h)); +void gui_gtk_set_mnemonics __ARGS((int enable)); +void gui_mch_toggle_tearoffs __ARGS((int enable)); +void gui_mch_menu_set_tip __ARGS((vimmenu_T *menu)); +void gui_mch_destroy_menu __ARGS((vimmenu_T *menu)); +void gui_mch_set_scrollbar_thumb __ARGS((scrollbar_T *sb, long val, long size, long max)); +void gui_mch_set_scrollbar_pos __ARGS((scrollbar_T *sb, int x, int y, int w, int h)); +void gui_mch_create_scrollbar __ARGS((scrollbar_T *sb, int orient)); +void gui_mch_destroy_scrollbar __ARGS((scrollbar_T *sb)); +char_u *gui_mch_browse __ARGS((int saving, char_u *title, char_u *dflt, char_u *ext, char_u *initdir, char_u *filter)); +char_u *gui_mch_browsedir __ARGS((char_u *title, char_u *initdir)); +int gui_mch_dialog __ARGS((int type, char_u *title, char_u *message, char_u *buttons, int def_but, char_u *textfield)); +void gui_mch_show_popupmenu __ARGS((vimmenu_T *menu)); +void gui_make_popup __ARGS((char_u *path_name, int mouse_pos)); +void gui_mch_find_dialog __ARGS((exarg_T *eap)); +void gui_mch_replace_dialog __ARGS((exarg_T *eap)); +void gui_gtk_synch_fonts __ARGS((void)); +void ex_helpfind __ARGS((exarg_T *eap)); /* vim: set ft=c : */
--- a/src/version.h +++ b/src/version.h @@ -15,17 +15,17 @@ #define VIM_VERSION_MAJOR 7 #define VIM_VERSION_MAJOR_STR "7" -#define VIM_VERSION_MINOR 0 -#define VIM_VERSION_MINOR_STR "0" +#define VIM_VERSION_MINOR 1 +#define VIM_VERSION_MINOR_STR "1" #define VIM_VERSION_100 (VIM_VERSION_MAJOR * 100 + VIM_VERSION_MINOR) -#define VIM_VERSION_BUILD 262 -#define VIM_VERSION_BUILD_BCD 0x106 -#define VIM_VERSION_BUILD_STR "262" +#define VIM_VERSION_BUILD 263 +#define VIM_VERSION_BUILD_BCD 0x107 +#define VIM_VERSION_BUILD_STR "263" #define VIM_VERSION_PATCHLEVEL 0 #define VIM_VERSION_PATCHLEVEL_STR "0" /* Used by MacOS port should be one of: development, alpha, beta, final */ -#define VIM_VERSION_RELEASE final +#define VIM_VERSION_RELEASE beta /* * VIM_VERSION_NODOT is used for the runtime directory name. @@ -33,8 +33,8 @@ * VIM_VERSION_MEDIUM is used for the startup-screen. * VIM_VERSION_LONG is used for the ":version" command and "Vim -h". */ -#define VIM_VERSION_NODOT "vim70" -#define VIM_VERSION_SHORT "7.0" -#define VIM_VERSION_MEDIUM "7.0" -#define VIM_VERSION_LONG "VIM - Vi IMproved 7.0 (2006 May 7)" -#define VIM_VERSION_LONG_DATE "VIM - Vi IMproved 7.0 (2006 May 7, compiled " +#define VIM_VERSION_NODOT "vim71a" +#define VIM_VERSION_SHORT "7.1a" +#define VIM_VERSION_MEDIUM "7.1a BETA" +#define VIM_VERSION_LONG "VIM - Vi IMproved 7.1a BETA (2007 May 5)" +#define VIM_VERSION_LONG_DATE "VIM - Vi IMproved 7.1a BETA (2007 May 5, compiled "