diff options
| -rw-r--r-- | README_ami.txt | 2 | ||||
| -rw-r--r-- | runtime/autoload/htmlcomplete.vim | 38 | ||||
| -rw-r--r-- | runtime/doc/Makefile | 8 | ||||
| -rw-r--r-- | runtime/doc/gui.txt | 4 | ||||
| -rw-r--r-- | runtime/doc/os_qnx.txt | 2 | ||||
| -rw-r--r-- | runtime/doc/os_vms.txt | 4 | ||||
| -rw-r--r-- | runtime/doc/usr_43.txt | 2 | ||||
| -rw-r--r-- | runtime/doc/xxd-pl.1 | 2 | ||||
| -rw-r--r-- | runtime/indent/php.vim | 23 | ||||
| -rw-r--r-- | runtime/keymap/sinhala-phonetic_utf-8.vim | 14 | ||||
| -rw-r--r-- | runtime/keymap/thaana-phonetic_utf-8.vim | 86 | ||||
| -rw-r--r-- | runtime/optwin.vim | 10 | ||||
| -rw-r--r-- | runtime/syntax/sml.vim | 6 | ||||
| -rw-r--r-- | runtime/syntax/verilog.vim | 12 | ||||
| -rw-r--r-- | runtime/syntax/xmath.vim | 11 | ||||
| -rw-r--r-- | src/main.aap | 24 | ||||
| -rw-r--r-- | src/proto/gui_photon.pro | 130 | ||||
| -rw-r--r-- | src/proto/gui_w16.pro | 154 | ||||
| -rw-r--r-- | src/proto/if_cscope.pro | 14 | ||||
| -rw-r--r-- | src/proto/if_perlsfio.pro | 2 |
20 files changed, 317 insertions, 231 deletions
diff --git a/README_ami.txt b/README_ami.txt index 9afd8f915..80d2ea44b 100644 --- a/README_ami.txt +++ b/README_ami.txt @@ -1,4 +1,4 @@ -README_ami.txt for version 7.0 of Vim: Vi IMproved. +README_ami.txt for version 7.1a of Vim: Vi IMproved. This file explains the installation of Vim on Amiga systems. See README.txt for general information about Vim. diff --git a/runtime/autoload/htmlcomplete.vim b/runtime/autoload/htmlcomplete.vim index 8adc2bdb3..5420321b6 100644 --- a/runtime/autoload/htmlcomplete.vim +++ b/runtime/autoload/htmlcomplete.vim @@ -1,7 +1,7 @@ " Vim completion script " Language: HTML and XHTML " Maintainer: Mikolaj Machowski ( mikmach AT wp DOT pl ) -" Last Change: 2006 Apr 30 +" Last Change: 2006 Oct 19 function! htmlcomplete#CompleteTags(findstart, base) if a:findstart @@ -84,7 +84,7 @@ function! htmlcomplete#CompleteTags(findstart, base) let context_line = getline(curline-i) if context_line =~ '<[^>]*$' " Yep, this is this line - let context_lines = getline(curline-i, curline) + let context_lines = getline(curline-i, curline-1) + [b:compl_context] let b:compl_context = join(context_lines, ' ') break elseif context_line =~ '>[^<]*$' || i == curline @@ -448,6 +448,15 @@ function! htmlcomplete#CompleteTags(findstart, base) let attrname = matchstr(attr, '.*\ze\s*=') let entered_value = matchstr(attr, ".*=\\s*[\"']\\?\\zs.*") let values = [] + " Load data {{{ + if !exists("b:html_doctype") + call htmlcomplete#CheckDoctype() + endif + if !exists("b:html_omni") + "runtime! autoload/xml/xhtml10s.vim + call htmlcomplete#LoadData() + endif + " }}} if attrname == 'href' " Now we are looking for local anchors defined by name or id if entered_value =~ '^#' @@ -604,21 +613,20 @@ function! htmlcomplete#CompleteTags(findstart, base) if exists("uppercase_tag") && uppercase_tag == 1 let context = tolower(context) endif - " Handle XML keywords: DOCTYPE and CDATA. + " Handle XML keywords: DOCTYPE if opentag == '' let tags += [ - \ '!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 3.2 Final//EN">', - \ '!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd">', - \ '!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN" "http://www.w3.org/TR/REC-html40/loose.dtd">', - \ '!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Frameset//EN" "http://www.w3.org/TR/REC-html40/frameset.dtd">', - \ '!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">', - \ '!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">', - \ '!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Frameset//EN" "http://www.w3.org/TR/html4/frameset.dtd">', - \ '!DOCTYPE HTML PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">', - \ '!DOCTYPE HTML PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">', - \ '!DOCTYPE HTML PUBLIC "-//W3C//DTD XHTML 1.0 Frameset//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-frameset.dtd">', - \ '!DOCTYPE HTML PUBLIC "-//W3C//DTD XHTML 1.1//EN" "http://www.w3.org/1999/xhtml">', - \ '!CDATA' + \ '!DOCTYPE html PUBLIC "-//W3C//DTD HTML 3.2 Final//EN">', + \ '!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd">', + \ '!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN" "http://www.w3.org/TR/REC-html40/loose.dtd">', + \ '!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.0 Frameset//EN" "http://www.w3.org/TR/REC-html40/frameset.dtd">', + \ '!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">', + \ '!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">', + \ '!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Frameset//EN" "http://www.w3.org/TR/html4/frameset.dtd">', + \ '!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">', + \ '!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">', + \ '!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Frameset//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-frameset.dtd">', + \ '!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN" "http://www.w3.org/1999/xhtml">' \ ] endif diff --git a/runtime/doc/Makefile b/runtime/doc/Makefile index a337cb60f..83eb9e453 100644 --- a/runtime/doc/Makefile +++ b/runtime/doc/Makefile @@ -14,6 +14,7 @@ VIMEXE = vim include ../../src/auto/config.mk DOCS = \ + ada.txt \ arabic.txt \ autocmd.txt \ change.txt \ @@ -28,7 +29,6 @@ DOCS = \ farsi.txt \ filetype.txt \ fold.txt \ - getscript.txt \ gui.txt \ gui_w16.txt \ gui_w32.txt \ @@ -70,6 +70,7 @@ DOCS = \ os_vms.txt \ os_win32.txt \ pattern.txt \ + pi_getscript.txt \ pi_gzip.txt \ pi_netrw.txt \ pi_paren.txt \ @@ -144,6 +145,7 @@ DOCS = \ workshop.txt HTMLS = \ + ada.html \ arabic.html \ autocmd.html \ change.html \ @@ -158,7 +160,6 @@ HTMLS = \ farsi.html \ filetype.html \ fold.html \ - getscript.html \ gui.html \ gui_w16.html \ gui_w32.html \ @@ -200,6 +201,7 @@ HTMLS = \ os_vms.html \ os_win32.html \ pattern.html \ + pi_getscript.html \ pi_gzip.html \ pi_netrw.html \ pi_paren.html \ @@ -224,8 +226,8 @@ HTMLS = \ sql.html \ syntax.html \ tabpage.html \ - tagsrch.html \ tags.html \ + tagsrch.html \ term.html \ tips.html \ todo.html \ diff --git a/runtime/doc/gui.txt b/runtime/doc/gui.txt index ba62fc5b6..1d413c31b 100644 --- a/runtime/doc/gui.txt +++ b/runtime/doc/gui.txt @@ -1,4 +1,4 @@ -*gui.txt* For Vim version 7.0. Last change: 2006 May 04 +*gui.txt* For Vim version 7.1a. Last change: 2006 Aug 08 VIM REFERENCE MANUAL by Bram Moolenaar @@ -510,7 +510,7 @@ floating menus that do not appear on the main menu bar. *:ime* *:imenu* *:inoreme* *:inoremenu* *:cme* *:cmenu* *:cnoreme* *:cnoremenu* *E330* *E327* *E331* *E336* *E333* - *E328* *E329* *E337* + *E328* *E329* *E337* *E792* To create a new menu item, use the ":menu" commands. They are mostly like the ":map" set of commands but the first argument is a menu item name, given as a path of menus and submenus with a '.' between them, e.g.: > diff --git a/runtime/doc/os_qnx.txt b/runtime/doc/os_qnx.txt index bc965f1ea..5faad515f 100644 --- a/runtime/doc/os_qnx.txt +++ b/runtime/doc/os_qnx.txt @@ -1,4 +1,4 @@ -*os_qnx.txt* For Vim version 7.0. Last change: 2005 Mar 29 +*os_qnx.txt* For Vim version 7.1a. Last change: 2005 Mar 29 VIM REFERENCE MANUAL by Julian Kinraid diff --git a/runtime/doc/os_vms.txt b/runtime/doc/os_vms.txt index 9d80d706a..d585965ad 100644 --- a/runtime/doc/os_vms.txt +++ b/runtime/doc/os_vms.txt @@ -1,4 +1,4 @@ -*os_vms.txt* For Vim version 7.0. Last change: 2006 Apr 30 +*os_vms.txt* For Vim version 7.1a. Last change: 2006 Nov 18 VIM REFERENCE MANUAL @@ -243,7 +243,7 @@ and to the SYS$STARTUP:SYLOGIN.COM > It will set up a normal Vim work environment for every user on the system. IMPORTANT: Vim on OpenVMS (and on other case insensitive system) command line -parameters are assumed to be lowecase. In order to indicate that a command +parameters are assumed to be lowercase. In order to indicate that a command line parameter is uppercase "/" sign must be used. Examples: diff --git a/runtime/doc/usr_43.txt b/runtime/doc/usr_43.txt index 4e2070eee..064f17ca9 100644 --- a/runtime/doc/usr_43.txt +++ b/runtime/doc/usr_43.txt @@ -1,4 +1,4 @@ -*usr_43.txt* For Vim version 7.0. Last change: 2006 Apr 24 +*usr_43.txt* For Vim version 7.1a. Last change: 2006 Apr 24 VIM USER MANUAL - by Bram Moolenaar diff --git a/runtime/doc/xxd-pl.1 b/runtime/doc/xxd-pl.1 index 222151dc5..00cbbffee 100644 --- a/runtime/doc/xxd-pl.1 +++ b/runtime/doc/xxd-pl.1 @@ -216,7 +216,7 @@ Wypisz trzy linie (heksowe 0x30 bajtķw) z koņca \fI% xxd \-s \-0x30 plik .PP .br -Wypisz 120 bajtķw jako ciągŗy zrzut heksowy z 40 oktetami na linię. +Wypisz 120 bajtķw jako ciągŗy zrzut heksowy z 20 oktetami na linię. .br \fI% xxd \-l 120 \-ps \-c 20 xxd.1\fR .br diff --git a/runtime/indent/php.vim b/runtime/indent/php.vim index 0f79fd9d5..8ba3b2ea1 100644 --- a/runtime/indent/php.vim +++ b/runtime/indent/php.vim @@ -2,9 +2,9 @@ " Language: PHP " Author: John Wellesz <John.wellesz (AT) teaser (DOT) fr> " URL: http://www.2072productions.com/vim/indent/php.vim -" Last Change: 2006 Apr 30 +" Last Change: 2007 February 25th " Newsletter: http://www.2072productions.com/?to=php-indent-for-vim-newsletter.php -" Version: 1.23 +" Version: 1.24 " " The change log and all the comments have been removed from this file. " @@ -68,12 +68,6 @@ " NOTE: The script will be a bit slower if you use this option because " some optimizations won't be available. - - - - - - if exists("b:did_indent") finish endif @@ -137,7 +131,7 @@ endif let s:endline= '\s*\%(//.*\|#.*\|/\*.*\*/\s*\)\=$' let s:PHP_startindenttag = '<?\%(.*?>\)\@!\|<script[^>]*>\%(.*<\/script>\)\@!' -" setlocal debug=msg " XXX +"setlocal debug=msg " XXX function! GetLastRealCodeLNum(startline) " {{{ @@ -205,6 +199,9 @@ function! GetLastRealCodeLNum(startline) " {{{ if b:InPHPcode_and_script && !b:InPHPcode let b:InPHPcode_and_script = 0 endif + + + return lnum endfunction " }}} @@ -221,7 +218,7 @@ endfun function! Skippmatch() " {{{ let synname = synIDattr(synID(line("."), col("."), 0), "name") - if synname == "Delimiter" || synname == "phpParent" || synname == "javaScriptBraces" || synname == "phpComment" && b:UserIsTypingComment + if synname == "Delimiter" || synname == "phpRegionDelimiter" || synname =~# "^phpParent" || synname == "phpArrayParens" || synname =~# '^php\%(Block\|Brace\)' || synname == "javaScriptBraces" || synname == "phpComment" && b:UserIsTypingComment return 0 else return 1 @@ -380,7 +377,7 @@ function! GetPhpIndent() endif if synname!="" - if synname != "phpHereDoc" + if synname != "phpHereDoc" && synname != "phpHereDocDelimiter" let b:InPHPcode = 1 let b:InPHPcode_tofind = "" @@ -448,7 +445,7 @@ function! GetPhpIndent() if b:InPHPcode - if !b:InPHPcode_and_script && last_line =~ '\%(<?.*\)\@<!?>\%(.*<?\)\@!' && IslinePHP(lnum, '?>')=="Delimiter" + if !b:InPHPcode_and_script && last_line =~ '\%(<?.*\)\@<!?>\%(.*<?\)\@!' && IslinePHP(lnum, '?>')=~"Delimiter" if cline !~? s:PHP_startindenttag let b:InPHPcode = 0 let b:InPHPcode_tofind = s:PHP_startindenttag @@ -717,5 +714,3 @@ function! GetPhpIndent() let b:PHP_CurrentIndentLevel = ind return ind endfunction - -" vim: set ts=8 sw=4 sts=4: diff --git a/runtime/keymap/sinhala-phonetic_utf-8.vim b/runtime/keymap/sinhala-phonetic_utf-8.vim index 801cc82c1..cd8b2e8e9 100644 --- a/runtime/keymap/sinhala-phonetic_utf-8.vim +++ b/runtime/keymap/sinhala-phonetic_utf-8.vim @@ -1,6 +1,6 @@ " Vim Keymap file for Sinhala (Sri Lanka) (2003-11-02) -" Maintainer : Harshula Jayasuriya <hash@jayasolutions.cjb.net> -" Last Updated: 2004-12-22 +" Maintainer : Harshula Jayasuriya <harshula@gmail.com> +" Last Updated: 2006-06-08 " This is a static phonetic mapping for a standard US-English keyboard " (qwerty) " http://www.nongnu.org/sinhala/doc/keymaps/sinhala-keyboard_3.html @@ -15,8 +15,8 @@ let b:keymap_name = "sinhala" loadkeymap -V <char-0x0d82> " āļ - anusvaraya (anusvara) -<A-v> <char-0x0d83> " āļ - visargaya (visarga) +<A-n> <char-0x0d82> " āļ - anusvaraya (anusvara) +H <char-0x0d83> " āļ - visargaya (visarga) a <char-0x0d85> " āļ
- ayanna (a) A <char-0x0d86> " āļ - aayanna (aa) w <char-0x0d87> " āļ - aeyanna (ae) @@ -31,15 +31,15 @@ Q <char-0x0d8e> " āļ - iruuyanna (iruu) <A-K> <char-0x0d90> " āļ - iluuyanna (iluu) e <char-0x0d91> " āļ - eyanna (e) E <char-0x0d92> " āļ - eeyanna (ee) -F <char-0x0d93> " āļ - aiyanna (ai) +<A-F> <char-0x0d93> " āļ - aiyanna (ai) o <char-0x0d94> " āļ - oyanna (o) O <char-0x0d95> " āļ - ooyanna (oo) -H <char-0x0d96> " āļ - auyanna (au) +<A-H> <char-0x0d96> " āļ - auyanna (au) k <char-0x0d9a> " āļ - alpapraana kayanna (ka) K <char-0x0d9b> " āļ - mahaapraana kayanna (kha) g <char-0x0d9c> " āļ - alpapraana gayanna (ga) G <char-0x0d9d> " āļ - mahaapraana gayanna (gha) -<A-n> <char-0x0d9e> " āļ - kantaja naasikyaya (nga) +<A-N> <char-0x0d9e> " āļ - kantaja naasikyaya (nga) <A-g> <char-0x0d9f> " āļ - sanyaka gayanna (nnga) c <char-0x0da0> " āļ - alpapraana cayanna (ca) C <char-0x0da1> " āļĄ - mahaapraana cayanna (cha) diff --git a/runtime/keymap/thaana-phonetic_utf-8.vim b/runtime/keymap/thaana-phonetic_utf-8.vim new file mode 100644 index 000000000..ec235ac89 --- /dev/null +++ b/runtime/keymap/thaana-phonetic_utf-8.vim @@ -0,0 +1,86 @@ +" thaana keymap +" Maintainer: Ibrahim fayaz <p h a y a x at gmail dot com> +" please set enc to utf-8 +" thaana phonetic keyboard is used as a reference +" http://www.mcst.gov.mv/News_and_Events/xpfonts.htm +" changelog: 18th Feb 2006 - came up the initial idea of writing the keymap.. +" 13th May 2006 - made some few corrections regarding < and >.. + +let b:keymap_name= "thaana" + +" THAANA NORMAL LETTERS +loadkeymap +h <char-0x0780> "letter haa +S <char-0x0781> "shaviani +n <char-0x0782> "noonu +r <char-0x0783> "raa +b <char-0x0784> "baa +L <char-0x0785> "lhaviani +k <char-0x0786> "kaafu +w <char-0x0787> "alifu +v <char-0x0788> "vaavu +m <char-0x0789> "meemu +f <char-0x078A> "faafu +d <char-0x078B> "dhaalu +t <char-0x078C> "thaa +l <char-0x078D> "laamu +g <char-0x078E> "gaafu +N <char-0x078F> "gnaviani +s <char-0x0790> "seenu +D <char-0x0791> "daviani +z <char-0x0792> "zaviani +T <char-0x0793> "taviani +y <char-0x0794> "yaa +p <char-0x0795> "paviani +j <char-0x0796> "javiani +c <char-0x0797> "chaviani + +"THAANA DOTTED LETTERS +X <char-0x0798> "TTAA (thaa mathee thin thiki) +H <char-0x0799> "HHAA (haa thiree ehthiki) +K <char-0x079A> "KHAA (haa mathee ehthiki) +J <char-0x079B> "THAALU (dhaa mathee ehthiki) +R <char-0x079C> "ZAA (raa mathee ehthiki) +C <char-0x079D> "SHEENU (seenu mathee thinthiki) +M <char-0x079E> "SAADHU (seenu thiree ehthiki) +B <char-0x079F> "DHAADHU(seenu mathee ehthiki) +Y <char-0x07A0> "TO (thaa thiree ehthiki) +Z <char-0x07A1> "ZO (thaa mathee ehthiki) +W <char-0x07A2> "AINU (alifu thiree ehthiki) +G <char-0x07A3> "GHAINU (alifu mathee ehthiki) +Q <char-0x07A4> "QAAFU (gaafu mathee dhethkiki) +V <char-0x07A5> "VAAVU (vaavu mathee ehthiki) + +"THAANA FILI (combining characters) +a <char-0x07A6> "abafili +A <char-0x07A7> "aabaafili +i <char-0x07A8> "ibifili +I <char-0x07A9> "eebeefili +u <char-0x07AA> "ubufili +U <char-0x07AB> "ooboofili +e <char-0x07AC> "ebefili +E <char-0x07AD> "ebeyfili +o <char-0x07AE> "obofili +O <char-0x07AF> "oaboafili +q <char-0x07B0> "sukun + +"OTHER THAANA RELATED +F <char-0xFDF2> "arabic ligature allah isolated form +? <char-0x061F> "arabic question mark +"~ <char-0xFDFD> "arabic -bismillah ahrahman araheem- not in phonetic keyboard, thats why commented +[ <char-0x005D> "english open bracket is thaana closing bracket +] <char-0x005B> "english close bracket = thaana open bracket +{ <char-0x007B> "braces reversed +} <char-0x007D> +x <char-0x00D7> " x for multiplication sign.. +P <char-0x00F7> " division symbol mapped to 'p' +> <char-0x003C> +< <char-0x003E> +<M-v> <char-0x200D> "zwj - ZERO WIDTH JOINER i dont know how to use these yet.. +<M-b> <char-0x200C> "zwnj - ZERO WIDTH NON JOINER +<M-n> <char-0x200E> "lrm - LEFT TO RIGHT MARK +<M-m> <char-0x200F> "rlm - RIGHT TO LEFT MARK +; <char-0x061B> "arabic semicolon +, <char-0x060C> "arabic coma +<M-;> ; +<M-,> , diff --git a/runtime/optwin.vim b/runtime/optwin.vim index da979d1e6..c0cbf2b6e 100644 --- a/runtime/optwin.vim +++ b/runtime/optwin.vim @@ -1,7 +1,7 @@ " These commands create the option window. " " Maintainer: Bram Moolenaar <Bram@vim.org> -" Last Change: 2006 Apr 24 +" Last Change: 2006 Oct 10 " If there already is an option window, jump to that one. if bufwinnr("option-window") > 0 @@ -608,7 +608,7 @@ if has("gui") call append("$", " \tset bexpr=" . &bexpr) endif endif - if exists("&macatsui") + if exists("+macatsui") call append("$", "macatsui\tuse ATSUI text drawing; disable to avoid display problems") call <SID>OptionG("macatsui", &macatsui) endif @@ -1212,8 +1212,14 @@ call append("$", "gdefault\tuse the 'g' flag for \":substitute\"") call <SID>BinOptionG("gd", &gd) call append("$", "edcompatible\t'g' and 'c' flags of \":substitute\" toggle") call <SID>BinOptionG("ed", &ed) +if exists("+opendevice") + call append("$", "opendevice\tallow reading/writing devices") + call <SID>BinOptionG("odev", &odev) +endif +if exists("+maxfuncdepth") call append("$", "maxfuncdepth\tmaximum depth of function calls") call append("$", " \tset mfd=" . &mfd) +endif if has("mksession") call append("$", "sessionoptions\tlist of words that specifies what to put in a session file") call <SID>OptionG("ssop", &ssop) diff --git a/runtime/syntax/sml.vim b/runtime/syntax/sml.vim index a45b204a8..aa7d64a33 100644 --- a/runtime/syntax/sml.vim +++ b/runtime/syntax/sml.vim @@ -4,9 +4,9 @@ " Maintainers: Markus Mottl <markus.mottl@gmail.com> " Fabrizio Zeno Cornelli <zeno@filibusta.crema.unimi.it> " URL: http://www.ocaml.info/vim/syntax/sml.vim -" Last Change: 2006 Feb 05 +" Last Change: 2006 Oct 23 - Fixed character highlighting bug (MM) +" 2002 Jun 02 - Fixed small typo (MM) " 2001 Nov 20 - Fixed small highlighting bug with modules (MM) -" 2001 Aug 29 - Fixed small highlighting bug (MM) " For version 5.x: Clear all syntax items " For version 6.x: Quit when a syntax file was already loaded @@ -137,7 +137,7 @@ syn match smlConstructor "\u\(\w\|'\)*\>" " Module prefix syn match smlModPath "\u\(\w\|'\)*\."he=e-1 -syn match smlCharacter +#"."\|#"\\\d\d\d"+ +syn match smlCharacter +#"\\""\|#"."\|#"\\\d\d\d"+ syn match smlCharErr +#"\\\d\d"\|#"\\\d"+ syn region smlString start=+"+ skip=+\\\\\|\\"+ end=+"+ diff --git a/runtime/syntax/verilog.vim b/runtime/syntax/verilog.vim index aad918cdf..01f312f93 100644 --- a/runtime/syntax/verilog.vim +++ b/runtime/syntax/verilog.vim @@ -1,7 +1,7 @@ " Vim syntax file " Language: Verilog -" Maintainer: Mun Johl <mun_johl@sierralogic.com> -" Last Update: Tue Jun 7 14:27:10 PDT 2005 +" Maintainer: Mun Johl <Mun.Johl@emulex.com> +" Last Update: Fri Oct 13 11:44:32 PDT 2006 " For version 5.x: Clear all syntax items " For version 6.x: Quit when a syntax file was already loaded @@ -76,10 +76,10 @@ syn match verilogGlobal "$[a-zA-Z0-9_]\+\>" syn match verilogConstant "\<[A-Z][A-Z0-9_]\+\>" -syn match verilogNumber "\(\<\d\+\|\)'[bB]\s*[0-1_xXzZ?]\+\>" -syn match verilogNumber "\(\<\d\+\|\)'[oO]\s*[0-7_xXzZ?]\+\>" -syn match verilogNumber "\(\<\d\+\|\)'[dD]\s*[0-9_xXzZ?]\+\>" -syn match verilogNumber "\(\<\d\+\|\)'[hH]\s*[0-9a-fA-F_xXzZ?]\+\>" +syn match verilogNumber "\(\<\d\+\|\)'[sS]\?[bB]\s*[0-1_xXzZ?]\+\>" +syn match verilogNumber "\(\<\d\+\|\)'[sS]\?[oO]\s*[0-7_xXzZ?]\+\>" +syn match verilogNumber "\(\<\d\+\|\)'[sS]\?[dD]\s*[0-9_xXzZ?]\+\>" +syn match verilogNumber "\(\<\d\+\|\)'[sS]\?[hH]\s*[0-9a-fA-F_xXzZ?]\+\>" syn match verilogNumber "\<[+-]\=[0-9_]\+\(\.[0-9_]*\|\)\(e[0-9_]*\|\)\>" syn region verilogString start=+"+ skip=+\\"+ end=+"+ contains=verilogEscape,@Spell diff --git a/runtime/syntax/xmath.vim b/runtime/syntax/xmath.vim index e9c376216..83efb08db 100644 --- a/runtime/syntax/xmath.vim +++ b/runtime/syntax/xmath.vim @@ -1,8 +1,8 @@ " Vim syntax file " Language: xmath (a simulation tool) " Maintainer: Dr. Charles E. Campbell, Jr. <NdrOchipS@PcampbellAfamily.Mbiz> -" Last Change: Apr 12, 2006 -" Version: 5 +" Last Change: Sep 11, 2006 +" Version: 6 " URL: http://mysite.verizon.net/astronaut/vim/index.html#vimlinks_syntax " For version 5.x: Clear all syntax items @@ -175,7 +175,7 @@ syn match xmathLabel "^\s*<[a-zA-Z_][a-zA-Z0-9]*>" " String and Character constants " Highlight special characters (those which have a backslash) differently syn match xmathSpecial contained "\\\d\d\d\|\\." -syn region xmathString start=+"+ skip=+\\\\\|\\"+ end=+"+ contains=xmathSpecial +syn region xmathString start=+"+ skip=+\\\\\|\\"+ end=+"+ contains=xmathSpecial,@Spell syn match xmathCharacter "'[^\\]'" syn match xmathSpecialChar "'\\.'" @@ -184,9 +184,10 @@ syn match xmathNumber "-\=\<\d\+L\=\>\|0[xX][0-9a-fA-F]\+\>" " Comments: " xmath supports #... (like Unix shells) " and #{ ... }# comment blocks +syn cluster xmathCommentGroup contains=xmathString,xmathTodo,@Spell syn keyword xmathTodo contained COMBAK DEBUG FIXME Todo TODO XXX -syn match xmathComment "#.*$" contains=xmathString,xmathTodo,@Spell -syn region xmathCommentBlock start="#{" end="}#" contains=xmathString,xmathTodo +syn match xmathComment "#.*$" contains=@xmathCommentGroup +syn region xmathCommentBlock start="#{" end="}#" contains=@xmathCommentGroup " synchronizing syn sync match xmathSyncComment grouphere xmathCommentBlock "#{" diff --git a/src/main.aap b/src/main.aap index 3700edd98..ca199c684 100644 --- a/src/main.aap +++ b/src/main.aap @@ -1143,24 +1143,16 @@ REZ = /Developer/Tools/Rez RESDIR = $(APPDIR)/Contents/Resources @r = re.compile('.*VIM_VERSION_SHORT\\s*"(\\d[^"]*)".*', re.S) VERSION = /`r.match(open("version.h").read()).group(1)` -ICON_APP = gui_mac.icns ### Common flags M4FLAGSX = $?(M4FLAGS) -DAPP_EXE=$(VIMNAME) -DAPP_NAME=$(VIMNAME) \ - -DAPP_VER=$(VERSION) -DICON_APP=$(ICON_APP) + -DAPP_VER=$(VERSION) -### Icons -ICONS = $(RESDIR)/$(ICON_APP) +# Resources used for the Mac are in one directory. +RSRC_DIR = os_mac_rsrc :attr {directory = $DIRMOD} $RESDIR -# If you uncomment the following lines the *.icns in the src directory will be -# detected by this Makefile automatically, and used for Vim. -#ICON_APP = $(shell if [ -e app.icns ] ; then echo app.icns ; else echo gui_mac.icns ; fi) -#ICON_DOC = $(shell if [ -e doc.icns ] ; then echo doc.icns ; else echo ; fi) -#ICON_DOCTXT = $(shell if [ -e doc-txt.icns ] ; then echo doc-txt.icns ; else echo ; fi) -#ICONS = $(addprefix $(RESDIR)/, $(ICON_APP) $(ICON_DOC) $(ICON_DOCTXT)) - install_macosx {virtual}: gui_bundle # Remove the link to the runtime dir, don't want to copy all of that. :delete {force} $(RESDIR)/vim/runtime @@ -1175,7 +1167,7 @@ install_macosx {virtual}: gui_bundle :symlink `os.getcwd()`/../runtime $RESDIR/vim/runtime # TODO: Create the vimtutor application. -gui_bundle {virtual}: $(RESDIR) bundle-dir bundle-executable bundle-info \ +gui_bundle {virtual}: $(RESDIR) bundle-dir bundle-executable bundle-info bundle-resource bundle-language bundle-dir {virtual}: $(APPDIR)/Contents $(VIMTARGET) @@ -1194,9 +1186,8 @@ bundle-info {virtual}: bundle-dir :print Creating Info.plist :sys m4 $(M4FLAGSX) infplist.xml > $(APPDIR)/Contents/Info.plist -bundle-resource {virtual}: bundle-dir bundle-icons bundle-rsrc - -bundle-icons {virtual}: $ICONS +bundle-resource {virtual}: bundle-dir bundle-rsrc + :copy {force} $(RSRC_DIR)/*.icns $(RESDIR) ### Classic resources # Resource fork (in the form of a .rsrc file) for Classic Vim (Mac OS 9) @@ -1220,8 +1211,5 @@ $(APPDIR)/Contents: :mkdir {r} $(APPDIR)/Contents/MacOS :mkdir {r} $(RESDIR)/English.lproj -$ICONS: $ICON_APP - :copy $source $target - # vim: sts=4 sw=4 : diff --git a/src/proto/gui_photon.pro b/src/proto/gui_photon.pro index bd5f43e2f..6a3ff04b7 100644 --- a/src/proto/gui_photon.pro +++ b/src/proto/gui_photon.pro @@ -1,67 +1,67 @@ /* gui_photon.c */ -extern void gui_ph_encoding_changed __ARGS((int new_encoding)); -extern void gui_mch_prepare __ARGS((int *argc, char **argv)); -extern int gui_mch_init __ARGS((void)); -extern int gui_mch_init_check __ARGS((void)); -extern int gui_mch_open __ARGS((void)); -extern void gui_mch_exit __ARGS((int rc)); -extern void gui_mch_update __ARGS((void)); -extern int gui_mch_wait_for_chars __ARGS((int wtime)); -extern char_u *gui_mch_browse __ARGS((int saving, char_u *title, char_u *default_name, char_u *ext, char_u *initdir, char_u *filter)); -extern int gui_mch_dialog __ARGS((int type, char_u *title, char_u *message, char_u *buttons, int default_button, char_u *textfield)); -extern int gui_mch_get_winpos __ARGS((int *x, int *y)); -extern void gui_mch_set_winpos __ARGS((int x, int y)); -extern void gui_mch_set_shellsize __ARGS((int width, int height, int min_width, int min_height, int base_width, int base_height, int direction)); -extern void gui_mch_get_screen_dimensions __ARGS((int *screen_w, int *screen_h)); -extern void gui_mch_iconify __ARGS((void)); -extern void gui_mch_set_foreground __ARGS((void)); -extern void gui_mch_settitle __ARGS((char_u *title, char_u *icon)); -extern void gui_mch_set_scrollbar_thumb __ARGS((scrollbar_T *sb, int val, int size, int 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_enable_scrollbar __ARGS((scrollbar_T *sb, int flag)); -extern void gui_mch_destroy_scrollbar __ARGS((scrollbar_T *sb)); -extern void mch_set_mouse_shape __ARGS((int shape)); -extern void gui_mch_mousehide __ARGS((int hide)); -extern void gui_mch_getmouse __ARGS((int *x, int *y)); -extern void gui_mch_setmouse __ARGS((int x, int y)); -extern long_u gui_mch_get_rgb __ARGS((guicolor_T pixel)); -extern void gui_mch_new_colors __ARGS((void)); -extern guicolor_T gui_mch_get_color __ARGS((char_u *name)); -extern void gui_mch_set_fg_color __ARGS((guicolor_T color)); -extern void gui_mch_set_bg_color __ARGS((guicolor_T color)); -extern void gui_mch_set_sp_color __ARGS((guicolor_T color)); -extern void gui_mch_invert_rectangle __ARGS((int row, int col, int nr, int nc)); -extern void gui_mch_clear_block __ARGS((int row1, int col1, int row2, int col2)); -extern void gui_mch_clear_all __ARGS((void)); -extern void gui_mch_delete_lines __ARGS((int row, int num_lines)); -extern void gui_mch_insert_lines __ARGS((int row, int num_lines)); -extern void gui_mch_draw_string __ARGS((int row, int col, char_u *s, int len, int flags)); -extern void gui_mch_draw_hollow_cursor __ARGS((guicolor_T color)); -extern void gui_mch_draw_part_cursor __ARGS((int w, int h, guicolor_T color)); -extern void gui_mch_set_blinking __ARGS((long wait, long on, long off)); -extern void gui_mch_start_blink __ARGS((void)); -extern void gui_mch_stop_blink __ARGS((void)); -extern void gui_mch_beep __ARGS((void)); -extern void gui_mch_flash __ARGS((int msec)); -extern void gui_mch_flush __ARGS((void)); -extern void gui_mch_set_text_area_pos __ARGS((int x, int y, int w, int h)); -extern int gui_mch_haskey __ARGS((char_u *name)); -extern void gui_mch_enable_menu __ARGS((int flag)); -extern void gui_mch_set_menu_pos __ARGS((int x, int y, int w, int h)); -extern void gui_mch_add_menu __ARGS((vimmenu_T *menu, int index)); -extern void gui_mch_add_menu_item __ARGS((vimmenu_T *menu, int index)); -extern void gui_mch_destroy_menu __ARGS((vimmenu_T *menu)); -extern void gui_mch_menu_grey __ARGS((vimmenu_T *menu, int grey)); -extern void gui_mch_menu_hidden __ARGS((vimmenu_T *menu, int hidden)); -extern void gui_mch_draw_menubar __ARGS((void)); -extern void gui_mch_show_popupmenu __ARGS((vimmenu_T *menu)); -extern void gui_mch_toggle_tearoffs __ARGS((int enable)); -extern void gui_mch_show_toolbar __ARGS((int showit)); -extern int gui_mch_init_font __ARGS((char_u *vim_font_name, int fontset)); -extern int gui_mch_adjust_charheight __ARGS((void)); -extern GuiFont gui_mch_get_font __ARGS((char_u *vim_font_name, int report_error)); -extern char_u *gui_mch_get_fontname __ARGS((GuiFont font, char_u *name)); -extern void gui_mch_set_font __ARGS((GuiFont font)); -extern void gui_mch_free_font __ARGS((GuiFont font)); +void gui_ph_encoding_changed __ARGS((int new_encoding)); +void gui_mch_prepare __ARGS((int *argc, char **argv)); +int gui_mch_init __ARGS((void)); +int gui_mch_init_check __ARGS((void)); +int gui_mch_open __ARGS((void)); +void gui_mch_exit __ARGS((int rc)); +void gui_mch_update __ARGS((void)); +int gui_mch_wait_for_chars __ARGS((int wtime)); +char_u *gui_mch_browse __ARGS((int saving, char_u *title, char_u *default_name, char_u *ext, char_u *initdir, char_u *filter)); +int gui_mch_dialog __ARGS((int type, char_u *title, char_u *message, char_u *buttons, int default_button, char_u *textfield)); +int gui_mch_get_winpos __ARGS((int *x, int *y)); +void gui_mch_set_winpos __ARGS((int x, int y)); +void gui_mch_set_shellsize __ARGS((int width, int height, int min_width, int min_height, int base_width, int base_height, int direction)); +void gui_mch_get_screen_dimensions __ARGS((int *screen_w, int *screen_h)); +void gui_mch_iconify __ARGS((void)); +void gui_mch_set_foreground __ARGS((void)); +void gui_mch_settitle __ARGS((char_u *title, char_u *icon)); +void gui_mch_set_scrollbar_thumb __ARGS((scrollbar_T *sb, int val, int size, int 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_enable_scrollbar __ARGS((scrollbar_T *sb, int flag)); +void gui_mch_destroy_scrollbar __ARGS((scrollbar_T *sb)); +void mch_set_mouse_shape __ARGS((int shape)); +void gui_mch_mousehide __ARGS((int hide)); +void gui_mch_getmouse __ARGS((int *x, int *y)); +void gui_mch_setmouse __ARGS((int x, int y)); +long_u gui_mch_get_rgb __ARGS((guicolor_T pixel)); +void gui_mch_new_colors __ARGS((void)); +guicolor_T gui_mch_get_color __ARGS((char_u *name)); +void gui_mch_set_fg_color __ARGS((guicolor_T color)); +void gui_mch_set_bg_color __ARGS((guicolor_T color)); +void gui_mch_set_sp_color __ARGS((guicolor_T color)); +void gui_mch_invert_rectangle __ARGS((int row, int col, int nr, int nc)); +void gui_mch_clear_block __ARGS((int row1, int col1, int row2, int col2)); +void gui_mch_clear_all __ARGS((void)); +void gui_mch_delete_lines __ARGS((int row, int num_lines)); +void gui_mch_insert_lines __ARGS((int row, int num_lines)); +void gui_mch_draw_string __ARGS((int row, int col, char_u *s, int len, int flags)); +void gui_mch_draw_hollow_cursor __ARGS((guicolor_T color)); +void gui_mch_draw_part_cursor __ARGS((int w, int h, guicolor_T color)); +void gui_mch_set_blinking __ARGS((long wait, long on, long off)); +void gui_mch_start_blink __ARGS((void)); +void gui_mch_stop_blink __ARGS((void)); +void gui_mch_beep __ARGS((void)); +void gui_mch_flash __ARGS((int msec)); +void gui_mch_flush __ARGS((void)); +void gui_mch_set_text_area_pos __ARGS((int x, int y, int w, int h)); +int gui_mch_haskey __ARGS((char_u *name)); +void gui_mch_enable_menu __ARGS((int flag)); +void gui_mch_set_menu_pos __ARGS((int x, int y, int w, int h)); +void gui_mch_add_menu __ARGS((vimmenu_T *menu, int index)); +void gui_mch_add_menu_item __ARGS((vimmenu_T *menu, int index)); +void gui_mch_destroy_menu __ARGS((vimmenu_T *menu)); +void gui_mch_menu_grey __ARGS((vimmenu_T *menu, int grey)); +void gui_mch_menu_hidden __ARGS((vimmenu_T *menu, int hidden)); +void gui_mch_draw_menubar __ARGS((void)); +void gui_mch_show_popupmenu __ARGS((vimmenu_T *menu)); +void gui_mch_toggle_tearoffs __ARGS((int enable)); +void gui_mch_show_toolbar __ARGS((int showit)); +int gui_mch_init_font __ARGS((char_u *vim_font_name, int fontset)); +int gui_mch_adjust_charheight __ARGS((void)); +GuiFont gui_mch_get_font __ARGS((char_u *vim_font_name, int report_error)); +char_u *gui_mch_get_fontname __ARGS((GuiFont font, char_u *name)); +void gui_mch_set_font __ARGS((GuiFont font)); +void gui_mch_free_font __ARGS((GuiFont font)); /* vim: set ft=c : */ diff --git a/src/proto/gui_w16.pro b/src/proto/gui_w16.pro index eebd67514..0f82c5afe 100644 --- a/src/proto/gui_w16.pro +++ b/src/proto/gui_w16.pro @@ -1,79 +1,79 @@ /* gui_w16.c */ -extern void gui_mch_set_blinking __ARGS((long wait, long on, long off)); -extern void gui_mch_stop_blink __ARGS((void)); -extern void gui_mch_start_blink __ARGS((void)); -extern LRESULT WINAPI vim_WindowProc __ARGS((HWND hwnd, UINT message, WPARAM wParam, LPARAM lParam)); -extern void gui_mch_new_colors __ARGS((void)); -extern void gui_mch_def_colors __ARGS((void)); -extern int gui_mch_open __ARGS((void)); -extern int gui_mch_get_winpos __ARGS((int *x, int *y)); -extern void gui_mch_set_winpos __ARGS((int x, int y)); -extern void gui_mch_set_text_area_pos __ARGS((int x, int y, int w, int h)); -extern void gui_mch_enable_scrollbar __ARGS((scrollbar_T *sb, int flag)); -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 int gui_mch_adjust_charheight __ARGS((void)); -extern GuiFont gui_mch_get_font __ARGS((char_u *name, int giveErrorIfMissing)); -extern char_u *gui_mch_get_fontname __ARGS((GuiFont font, char_u *name)); -extern void gui_mch_free_font __ARGS((GuiFont font)); -extern guicolor_T gui_mch_get_color __ARGS((char_u *name)); -extern int gui_mch_haskey __ARGS((char_u *name)); -extern void gui_mch_beep __ARGS((void)); -extern void gui_mch_invert_rectangle __ARGS((int r, int c, int nr, int nc)); -extern void gui_mch_iconify __ARGS((void)); -extern void gui_mch_draw_hollow_cursor __ARGS((guicolor_T color)); -extern void gui_mch_draw_part_cursor __ARGS((int w, int h, guicolor_T color)); -extern void gui_mch_update __ARGS((void)); -extern int gui_mch_wait_for_chars __ARGS((int wtime)); -extern void gui_mch_clear_block __ARGS((int row1, int col1, int row2, int col2)); -extern void gui_mch_clear_all __ARGS((void)); -extern void gui_mch_enable_menu __ARGS((int flag)); -extern void gui_mch_set_menu_pos __ARGS((int x, int y, int w, int h)); -extern void gui_mch_menu_hidden __ARGS((vimmenu_T *menu, int hidden)); -extern void gui_mch_draw_menubar __ARGS((void)); -extern long_u gui_mch_get_rgb __ARGS((guicolor_T pixel)); -extern void gui_mch_activate_window __ARGS((void)); -extern void gui_mch_show_toolbar __ARGS((int showit)); -extern void gui_mch_show_tabline __ARGS((int showit)); -extern int gui_mch_showing_tabline __ARGS((void)); -extern void gui_mch_update_tabline __ARGS((void)); -extern void gui_mch_set_curtab __ARGS((int nr)); -extern void ex_simalt __ARGS((exarg_T *eap)); -extern void gui_mch_find_dialog __ARGS((exarg_T *eap)); -extern void gui_mch_replace_dialog __ARGS((exarg_T *eap)); -extern void gui_mch_mousehide __ARGS((int hide)); -extern void gui_mch_destroy_scrollbar __ARGS((scrollbar_T *sb)); -extern void gui_mch_getmouse __ARGS((int *x, int *y)); -extern void gui_mch_setmouse __ARGS((int x, int y)); -extern void gui_mch_flash __ARGS((int msec)); -extern void gui_mch_delete_lines __ARGS((int row, int num_lines)); -extern void gui_mch_insert_lines __ARGS((int row, int num_lines)); -extern void gui_mch_exit __ARGS((int rc)); -extern int gui_mch_init_font __ARGS((char_u *font_name, int fontset)); -extern int gui_mch_maximized __ARGS((void)); -extern void gui_mch_newfont __ARGS((void)); -extern void gui_mch_settitle __ARGS((char_u *title, char_u *icon)); -extern void mch_set_mouse_shape __ARGS((int shape)); -extern char_u *gui_mch_browsedir __ARGS((char_u *title, char_u *initdir)); -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 int get_cmd_args __ARGS((char *prog, char *cmdline, char ***argvp, char **tofree)); -extern void gui_mch_prepare __ARGS((int *argc, char **argv)); -extern int gui_mch_init __ARGS((void)); -extern void gui_mch_set_shellsize __ARGS((int width, int height, int min_width, int min_height, int base_width, int base_height, int direction)); -extern void gui_mch_set_scrollbar_thumb __ARGS((scrollbar_T *sb, long val, long size, long max)); -extern void gui_mch_set_font __ARGS((GuiFont font)); -extern void gui_mch_set_fg_color __ARGS((guicolor_T color)); -extern void gui_mch_set_bg_color __ARGS((guicolor_T color)); -extern void gui_mch_set_sp_color __ARGS((guicolor_T color)); -extern void gui_mch_draw_string __ARGS((int row, int col, char_u *text, int len, int flags)); -extern void gui_mch_flush __ARGS((void)); -extern void gui_mch_get_screen_dimensions __ARGS((int *screen_w, int *screen_h)); -extern void gui_mch_add_menu __ARGS((vimmenu_T *menu, int pos)); -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_add_menu_item __ARGS((vimmenu_T *menu, int idx)); -extern void gui_mch_destroy_menu __ARGS((vimmenu_T *menu)); -extern void gui_mch_menu_grey __ARGS((vimmenu_T *menu, int grey)); -extern int gui_mch_dialog __ARGS((int type, char_u *title, char_u *message, char_u *buttons, int dfltbutton, char_u *textfield)); -extern void gui_mch_set_foreground __ARGS((void)); +void gui_mch_set_blinking __ARGS((long wait, long on, long off)); +void gui_mch_stop_blink __ARGS((void)); +void gui_mch_start_blink __ARGS((void)); +LRESULT WINAPI vim_WindowProc __ARGS((HWND hwnd, UINT message, WPARAM wParam, LPARAM lParam)); +void gui_mch_new_colors __ARGS((void)); +void gui_mch_def_colors __ARGS((void)); +int gui_mch_open __ARGS((void)); +int gui_mch_get_winpos __ARGS((int *x, int *y)); +void gui_mch_set_winpos __ARGS((int x, int y)); +void gui_mch_set_text_area_pos __ARGS((int x, int y, int w, int h)); +void gui_mch_enable_scrollbar __ARGS((scrollbar_T *sb, int flag)); +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)); +int gui_mch_adjust_charheight __ARGS((void)); +GuiFont gui_mch_get_font __ARGS((char_u *name, int giveErrorIfMissing)); +char_u *gui_mch_get_fontname __ARGS((GuiFont font, char_u *name)); +void gui_mch_free_font __ARGS((GuiFont font)); +guicolor_T gui_mch_get_color __ARGS((char_u *name)); +int gui_mch_haskey __ARGS((char_u *name)); +void gui_mch_beep __ARGS((void)); +void gui_mch_invert_rectangle __ARGS((int r, int c, int nr, int nc)); +void gui_mch_iconify __ARGS((void)); +void gui_mch_draw_hollow_cursor __ARGS((guicolor_T color)); +void gui_mch_draw_part_cursor __ARGS((int w, int h, guicolor_T color)); +void gui_mch_update __ARGS((void)); +int gui_mch_wait_for_chars __ARGS((int wtime)); +void gui_mch_clear_block __ARGS((int row1, int col1, int row2, int col2)); +void gui_mch_clear_all __ARGS((void)); +void gui_mch_enable_menu __ARGS((int flag)); +void gui_mch_set_menu_pos __ARGS((int x, int y, int w, int h)); +void gui_mch_menu_hidden __ARGS((vimmenu_T *menu, int hidden)); +void gui_mch_draw_menubar __ARGS((void)); +long_u gui_mch_get_rgb __ARGS((guicolor_T pixel)); +void gui_mch_activate_window __ARGS((void)); +void gui_mch_show_toolbar __ARGS((int showit)); +void gui_mch_show_tabline __ARGS((int showit)); +int gui_mch_showing_tabline __ARGS((void)); +void gui_mch_update_tabline __ARGS((void)); +void gui_mch_set_curtab __ARGS((int nr)); +void ex_simalt __ARGS((exarg_T *eap)); +void gui_mch_find_dialog __ARGS((exarg_T *eap)); +void gui_mch_replace_dialog __ARGS((exarg_T *eap)); +void gui_mch_mousehide __ARGS((int hide)); +void gui_mch_destroy_scrollbar __ARGS((scrollbar_T *sb)); +void gui_mch_getmouse __ARGS((int *x, int *y)); +void gui_mch_setmouse __ARGS((int x, int y)); +void gui_mch_flash __ARGS((int msec)); +void gui_mch_delete_lines __ARGS((int row, int num_lines)); +void gui_mch_insert_lines __ARGS((int row, int num_lines)); +void gui_mch_exit __ARGS((int rc)); +int gui_mch_init_font __ARGS((char_u *font_name, int fontset)); +int gui_mch_maximized __ARGS((void)); +void gui_mch_newfont __ARGS((void)); +void gui_mch_settitle __ARGS((char_u *title, char_u *icon)); +void mch_set_mouse_shape __ARGS((int shape)); +char_u *gui_mch_browsedir __ARGS((char_u *title, char_u *initdir)); +char_u *gui_mch_browse __ARGS((int saving, char_u *title, char_u *dflt, char_u *ext, char_u *initdir, char_u *filter)); +int get_cmd_args __ARGS((char *prog, char *cmdline, char ***argvp, char **tofree)); +void gui_mch_prepare __ARGS((int *argc, char **argv)); +int gui_mch_init __ARGS((void)); +void gui_mch_set_shellsize __ARGS((int width, int height, int min_width, int min_height, int base_width, int base_height, int direction)); +void gui_mch_set_scrollbar_thumb __ARGS((scrollbar_T *sb, long val, long size, long max)); +void gui_mch_set_font __ARGS((GuiFont font)); +void gui_mch_set_fg_color __ARGS((guicolor_T color)); +void gui_mch_set_bg_color __ARGS((guicolor_T color)); +void gui_mch_set_sp_color __ARGS((guicolor_T color)); +void gui_mch_draw_string __ARGS((int row, int col, char_u *text, int len, int flags)); +void gui_mch_flush __ARGS((void)); +void gui_mch_get_screen_dimensions __ARGS((int *screen_w, int *screen_h)); +void gui_mch_add_menu __ARGS((vimmenu_T *menu, int pos)); +void gui_mch_show_popupmenu __ARGS((vimmenu_T *menu)); +void gui_make_popup __ARGS((char_u *path_name, int mouse_pos)); +void gui_mch_add_menu_item __ARGS((vimmenu_T *menu, int idx)); +void gui_mch_destroy_menu __ARGS((vimmenu_T *menu)); +void gui_mch_menu_grey __ARGS((vimmenu_T *menu, int grey)); +int gui_mch_dialog __ARGS((int type, char_u *title, char_u *message, char_u *buttons, int dfltbutton, char_u *textfield)); +void gui_mch_set_foreground __ARGS((void)); /* vim: set ft=c : */ diff --git a/src/proto/if_cscope.pro b/src/proto/if_cscope.pro index aae9edff3..0617d13a9 100644 --- a/src/proto/if_cscope.pro +++ b/src/proto/if_cscope.pro @@ -1,9 +1,9 @@ /* if_cscope.c */ -extern void do_cscope __ARGS((exarg_T *eap)); -extern void do_scscope __ARGS((exarg_T *eap)); -extern void do_cstag __ARGS((exarg_T *eap)); -extern int cs_fgets __ARGS((char_u *buf, int size)); -extern void cs_free_tags __ARGS((void)); -extern void cs_print_tags __ARGS((void)); -extern int cs_connection __ARGS((int num, char_u *dbpath, char_u *ppath)); +void do_cscope __ARGS((exarg_T *eap)); +void do_scscope __ARGS((exarg_T *eap)); +void do_cstag __ARGS((exarg_T *eap)); +int cs_fgets __ARGS((char_u *buf, int size)); +void cs_free_tags __ARGS((void)); +void cs_print_tags __ARGS((void)); +int cs_connection __ARGS((int num, char_u *dbpath, char_u *ppath)); /* vim: set ft=c : */ diff --git a/src/proto/if_perlsfio.pro b/src/proto/if_perlsfio.pro index 14fa4cc53..bb9046809 100644 --- a/src/proto/if_perlsfio.pro +++ b/src/proto/if_perlsfio.pro @@ -1,3 +1,3 @@ /* if_perlsfio.c */ -extern int *sfdcnewvim __ARGS((void)); +int *sfdcnewvim __ARGS((void)); /* vim: set ft=c : */ |