diff options
Diffstat (limited to 'src')
39 files changed, 988 insertions, 906 deletions
diff --git a/src/GvimExt/GvimExt.reg b/src/GvimExt/GvimExt.reg index 2b80956d8..ed0f5af1a 100644 --- a/src/GvimExt/GvimExt.reg +++ b/src/GvimExt/GvimExt.reg @@ -15,6 +15,6 @@ REGEDIT4 [HKEY_LOCAL_MACHINE\Software\Vim\Gvim] "path"="gvim.exe" -[HKEY_LOCAL_MACHINE\Software\Microsoft\Windows\CurrentVersion\Uninstall\Vim 7.0] - "DisplayName"="Vim 7.0: Edit with Vim popup menu entry" +[HKEY_LOCAL_MACHINE\Software\Microsoft\Windows\CurrentVersion\Uninstall\Vim 7.1a] + "DisplayName"="Vim 7.1a: Edit with Vim popup menu entry" "UninstallString"="uninstal.exe" diff --git a/src/if_xcmdsrv.c b/src/if_xcmdsrv.c index ef6e25741..3774ff421 100644 --- a/src/if_xcmdsrv.c +++ b/src/if_xcmdsrv.c @@ -37,8 +37,8 @@ # endif /* - * This file provides procedures that implement the command server functionality - * of Vim when in contact with an X11 server. + * This file provides procedures that implement the command server + * functionality of Vim when in contact with an X11 server. * * Adapted from TCL/TK's send command in tkSend.c of the tk 3.6 distribution. * Adapted for use in Vim by Flemming Madsen. Protocol changed to that of tk 4 diff --git a/src/keymap.h b/src/keymap.h index 34521e403..376ac9c00 100644 --- a/src/keymap.h +++ b/src/keymap.h @@ -229,7 +229,7 @@ enum key_extra , KE_S_XF4 , KE_MOUSEDOWN /* scroll wheel pseudo-button Down */ - , KE_MOUSEUP /* scroll wheel pseudo-button Up */ + , KE_MOUSEUP /* scroll wheel pseudo-button Up */ , KE_KINS /* keypad Insert key */ , KE_KDEL /* keypad Delete key */ diff --git a/src/move.c b/src/move.c index c0bbac265..f21f5e9f6 100644 --- a/src/move.c +++ b/src/move.c @@ -166,7 +166,7 @@ update_topline() #ifdef FEAT_MOUSE /* When dragging with the mouse, don't scroll that quickly */ - if (mouse_dragging) + if (mouse_dragging > 0) p_so = mouse_dragging - 1; #endif @@ -1995,7 +1995,7 @@ scroll_cursor_bot(min_scroll, set_topbot) if ((((scrolled <= 0 || scrolled >= min_scroll) && extra >= ( #ifdef FEAT_MOUSE - mouse_dragging ? mouse_dragging - 1 : + mouse_dragging > 0 ? mouse_dragging - 1 : #endif p_so)) || boff.lnum + 1 > curbuf->b_ml.ml_line_count) @@ -2209,7 +2209,7 @@ cursor_correct() above_wanted = p_so; below_wanted = p_so; #ifdef FEAT_MOUSE - if (mouse_dragging) + if (mouse_dragging > 0) { above_wanted = mouse_dragging - 1; below_wanted = mouse_dragging - 1; @@ -2225,7 +2225,7 @@ cursor_correct() validate_botline(); if (curwin->w_botline == curbuf->b_ml.ml_line_count + 1 #ifdef FEAT_MOUSE - && !mouse_dragging + && mouse_dragging == 0 #endif ) { diff --git a/src/os_vms.c b/src/os_vms.c index f87a1cd5d..a612d8104 100644 --- a/src/os_vms.c +++ b/src/os_vms.c @@ -626,12 +626,13 @@ vms_fixfilename(void *instring) Fspec_Rms = buf; /* for decc$to_vms */ - if ( strchr(instring,'/') == NULL ) + if (strchr(instring,'/') == NULL) /* It is already a VMS file spec */ strcpy(buf, instring); - else if ( strchr(instring,'"') == NULL ){ /* password in the path ? */ + else if (strchr(instring,'"') == NULL) /* password in the path? */ + { /* Seems it is a regular file, let guess that it is pure Unix fspec */ - if ( decc$to_vms(instring, vms_fspec_proc, 0, 0) <= 0 ) + if (decc$to_vms(instring, vms_fspec_proc, 0, 0) <= 0) /* No... it must be mixed */ vms_unix_mixed_filespec(instring, buf); } @@ -643,6 +644,7 @@ vms_fixfilename(void *instring) return buf; } + /* * Remove version number from file name * we need it in some special cases as: diff --git a/src/po/README_mvc.txt b/src/po/README_mvc.txt index cd107debf..293edf2d4 100644 --- a/src/po/README_mvc.txt +++ b/src/po/README_mvc.txt @@ -4,7 +4,7 @@ This file explains how to create and maintain po files using gnu-gettext.win32, a Windows port of gettext by Franco Bez <franco.bez@gmx.de>. You can find it at: - http://home.a-city.de/franco.bez/gettext/gettext_win32_en.html + http://people.freenet.de/franco.bez/gettext/gettext_win32_en.html First read the README.txt file in this directory for general remarks on translating Vim messages. @@ -12,18 +12,32 @@ translating Vim messages. SETUP -Set the enviroment variable LANGUAGE to the language code for the language you -are translating Vim messages to. Languagde codes are typically two characters -and you can find a list of them at: +Set the environment variable LANGUAGE to the language code for the language +you are translating Vim messages to. Language codes are typically two +characters and you can find a list of them at: http://www.geocities.com/click2speak/languages.html +Another possibility is to use the gnuwin32 port of gettext. This is +recommended especially if you use already gnuwin32 tools to gunzip, bunzip, +patch etc. these files. You find the gnuwin32 version of gettext here: + + http://gnuwin32.sourceforge.net/packages/gettext.htm + +Yet another very strait forward way is to get the sources of gettext from + + http://www.gnu.org/software/gettext/gettext.html + +and build your own version of these tools. The documentation states that this +should be possible with MSVC4.0, MSVC5.0, MSVC6.0 or MSVC7.0, but you can +build it even successfully with MSVC8.0. + The LANGUAGE environment variable can be set from the command line, by adding a line to your autoexec.bat file, or by defining a user variable from the Advanced tab in the System control panel. Next, edit Make_mvc.mak so that GETTEXT_PATH points the binary directory of -the intallation. +the installation. CREATING A NEW TRANSLATION @@ -43,7 +57,7 @@ highlighting turned on then untranslated messages will stand out more easily. You will also need to edit the file names in the comments in the .po file. You need to remove the absolute directory specification (which has the form c:\vim61\src\). You can do this in Vim with the following command with the -appropriate directory specfication for where you have installed the Vim +appropriate directory specification for where you have installed the Vim source: %s/c:\\vim61\\src\\//g @@ -57,7 +71,7 @@ with the following command: nmake -f Make_mvc.mak xx.po -where xx is the langauge code for the language needing translations. The +where xx is the language code for the language needing translations. The original .po file is copied to xx.po.orig. diff --git a/src/po/de.po b/src/po/de.po index 43fbbe78d..171ddca24 100644 --- a/src/po/de.po +++ b/src/po/de.po @@ -11,7 +11,7 @@ msgid "" msgstr "" "Project-Id-Version: Vim(deutsch)\n" "POT-Creation-Date: 2006-04-02 11:30+0200\n" -"PO-Revision-Date: 2006-04-02 17:26+0200\n" +"PO-Revision-Date: 2006-06-18 12:34+0200\n" "Last-Translator: Georg Dahn <gorgyd@yahoo.co.uk>\n" "Language-Team: German <de@li.org>\n" "MIME-Version: 1.0\n" @@ -3502,7 +3502,7 @@ msgid "" "&Quit\n" "&Abort" msgstr "" -"謋fnen nur zum &Lesen\n" +"Nur zum &Lesen 鰂fnen\n" "Trotzdem &editieren\n" "&Wiederherstellen\n" "&Beenden\n" @@ -3516,10 +3516,10 @@ msgid "" "&Quit\n" "&Abort" msgstr "" -"謋fnen nur zum &Lesen\n" +"Nur zum &Lesen 鰂fnen\n" "Trotzdem &editieren\n" "&Wiederherstellen\n" -"&L鰏chen\n" +"&Datei L鰏chen\n" "&Beenden\n" "&Abbrechen" @@ -6131,3 +6131,5 @@ msgstr "" "Die Definition von COMPOUNDPERMITFLAG nach dem PFX Element kann falsches Ergebnis in Zeile %s ergeben " "%d" +msgid "E116: Invalid arguments for function %s" +msgstr "E116: Ung黮tige Argumente f黵 die Funktion %s" diff --git a/src/po/pl.UTF-8.po b/src/po/pl.UTF-8.po index 302ff8c3a..75270caed 100644 --- a/src/po/pl.UTF-8.po +++ b/src/po/pl.UTF-8.po @@ -1,22 +1,22 @@ # translation of pl.po to Polish # Polish Translation for Vim # -# updated 2006 for vim-7.0 +# updated 2007 for vim-7.0 # # FIRST AUTHOR Marcin Dalecki <martin@dalecki.de>, 2000. -# Mikolaj Machowski <mikmach@wp.pl>, 2004, 2005, 2006. +# Mikolaj Machowski <mikmach@wp.pl>, 2004, 2005, 2006, 2007. msgid "" msgstr "" "Project-Id-Version: pl\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2006-04-27 18:27+0200\n" -"PO-Revision-Date: 2006-04-27 19:15+0200\n" +"POT-Creation-Date: 2007-04-30 20:03+0200\n" +"PO-Revision-Date: 2007-04-30 20:07+0200\n" "Last-Translator: Mikolaj Machowski <mikmach@wp.pl>\n" "Language-Team: Polish <kde-transl@mer.chemia.polsl.gliwice.pl>\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=utf-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: KBabel 1.11.2\n" +"X-Generator: KBabel 1.11.4\n" msgid "E82: Cannot allocate any buffer, exiting..." msgstr "E82: Nie mog臋 zarezerwowa膰 bufora; zako艅czenie..." @@ -194,6 +194,9 @@ msgstr "E98: Nie mog臋 wczyta膰 wyj艣cia r贸偶nicy" msgid "E99: Current buffer is not in diff mode" msgstr "E99: Bie偶膮cy bufor nie jest w trybie r贸偶nic" +msgid "E793: No other buffer in diff mode is modifiable" +msgstr "E793: 呕aden inny bufor w trybie diff nie jest modyfikowalny" + msgid "E100: No other buffer in diff mode" msgstr "E100: Brak innego bufora w trybie r贸偶nic" @@ -619,6 +622,10 @@ msgid "E706: Variable type mismatch for: %s" msgstr "E706: Nieprawid艂owy typ zmiennej dla: %s" #, c-format +msgid "E795: Cannot delete variable %s" +msgstr "E795: Nie mog臋 usun膮膰 zmiennej %s" + +#, c-format msgid "E741: Value is locked: %s" msgstr "E741: Warto艣膰 jest zablokowana: %s" @@ -883,6 +890,7 @@ msgstr " zak艂adki" msgid " FAILED" msgstr " NIE POWIOD艁O SI臉" +#. avoid a wait_return for this message, it's annoying #, c-format msgid "E137: Viminfo file is not writable: %s" msgstr "E137: Plik viminfo jest niezapisywalny: %s" @@ -1457,6 +1465,9 @@ msgstr "jest katalogiem" msgid "is not a file" msgstr "nie jest plikiem" +msgid "is a device (disabled with 'opendevice' option" +msgstr "jest urz膮dzeniem (wy艂膮czonym w opcji 'opendevice'" + msgid "[New File]" msgstr "[Nowy Plik]" @@ -1553,6 +1564,9 @@ msgstr "Cz臋艣ciowy zapis niemo偶liwy dla bufor贸w NetBeans" msgid "is not a file or writable device" msgstr "nie jest plikiem lub zapisywalnym przyrz膮dem" +msgid "writing to device disabled with 'opendevice' option" +msgstr "zapisywanie do urz膮dzenia wy艂膮czone w opcji 'opendevice'" + msgid "is read-only (add ! to override)" msgstr "jest tylko do odczytu (wymu艣 poprzez !)" @@ -3288,6 +3302,9 @@ msgstr "" ",\n" "lub plik zosta艂 uszkodzony." +msgid " has been damaged (page size is smaller than minimum value).\n" +msgstr " zosta艂 uszkodzony (wielko艣膰 strony jest mniejsza ni偶 najmniejsza warto艣膰).\n" + #, c-format msgid "Using swap file \"%s\"" msgstr "U偶ywam pliku wymiany \"%s\"" @@ -3626,6 +3643,10 @@ msgstr "E328: Menu istnieje tylko w innym trybie" msgid "E329: No menu \"%s\"" msgstr "E329: Nie ma menu \"%s\"" +#. Only a mnemonic or accelerator is not valid. +msgid "E792: Empty menu name" +msgstr "E792: Pusta nazwa menu" + msgid "E330: Menu path must not lead to a sub-menu" msgstr "E330: Trop menu nie mo偶e prowadzi膰 do podmenu" @@ -4999,6 +5020,7 @@ msgstr "Przykro mi, brak podpowiedzi" msgid "Sorry, only %ld suggestions" msgstr "Przykro mi, tylko %ld podpowiedzi" +#. for when 'cmdheight' > 1 #. avoid more prompt #, c-format msgid "Change \"%.*s\" to:" @@ -5423,6 +5445,13 @@ msgstr "" msgid "" "\n" +"MS-Windows 64 bit GUI version" +msgstr "" +"\n" +"64 bitowa wersja GUI dla MS-Windows" + +msgid "" +"\n" "MS-Windows 32 bit GUI version" msgstr "" "\n" @@ -6016,8 +6045,8 @@ msgid "E46: Cannot change read-only variable \"%s\"" msgstr "E46: Nie mog臋 zmieni膰 zmiennej tylko do odczytu \"%s\"" #, c-format -msgid "E46: Cannot set variable in the sandbox: \"%s\"" -msgstr "E46: Nie mog臋 ustawi膰 zmiennej w piaskownicy: \"%s\"" +msgid "E794: Cannot set variable in the sandbox: \"%s\"" +msgstr "E794: Nie mog臋 ustawi膰 zmiennej w piaskownicy: \"%s\"" msgid "E47: Error while reading errorfile" msgstr "E47: B艂膮d w trakcie czytania pliku b艂臋d贸w" diff --git a/src/po/pl.cp1250.po b/src/po/pl.cp1250.po index e10e74541..c67f748c2 100644 --- a/src/po/pl.cp1250.po +++ b/src/po/pl.cp1250.po @@ -1,22 +1,22 @@ # translation of pl.po to Polish # Polish Translation for Vim # -# updated 2006 for vim-7.0 +# updated 2007 for vim-7.0 # # FIRST AUTHOR Marcin Dalecki <martin@dalecki.de>, 2000. -# Mikolaj Machowski <mikmach@wp.pl>, 2004, 2005, 2006. +# Mikolaj Machowski <mikmach@wp.pl>, 2004, 2005, 2006, 2007. msgid "" msgstr "" "Project-Id-Version: pl\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2006-04-27 18:27+0200\n" -"PO-Revision-Date: 2006-04-27 19:15+0200\n" +"POT-Creation-Date: 2007-04-30 20:03+0200\n" +"PO-Revision-Date: 2007-04-30 20:07+0200\n" "Last-Translator: Mikolaj Machowski <mikmach@wp.pl>\n" "Language-Team: Polish <kde-transl@mer.chemia.polsl.gliwice.pl>\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=cp1250\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: KBabel 1.11.2\n" +"X-Generator: KBabel 1.11.4\n" msgid "E82: Cannot allocate any buffer, exiting..." msgstr "E82: Nie mog zarezerwowa bufora; zako馽zenie..." @@ -194,6 +194,9 @@ msgstr "E98: Nie mog wczyta wyj渃ia r罂nicy" msgid "E99: Current buffer is not in diff mode" msgstr "E99: Bie抗cy bufor nie jest w trybie r罂nic" +msgid "E793: No other buffer in diff mode is modifiable" +msgstr "E793: 痑den inny bufor w trybie diff nie jest modyfikowalny" + msgid "E100: No other buffer in diff mode" msgstr "E100: Brak innego bufora w trybie r罂nic" @@ -619,6 +622,10 @@ msgid "E706: Variable type mismatch for: %s" msgstr "E706: Nieprawid硂wy typ zmiennej dla: %s" #, c-format +msgid "E795: Cannot delete variable %s" +msgstr "E795: Nie mog usun规 zmiennej %s" + +#, c-format msgid "E741: Value is locked: %s" msgstr "E741: Warto滄 jest zablokowana: %s" @@ -883,6 +890,7 @@ msgstr " zak砤dki" msgid " FAILED" msgstr " NIE POWIOD SI" +#. avoid a wait_return for this message, it's annoying #, c-format msgid "E137: Viminfo file is not writable: %s" msgstr "E137: Plik viminfo jest niezapisywalny: %s" @@ -1457,6 +1465,9 @@ msgstr "jest katalogiem" msgid "is not a file" msgstr "nie jest plikiem" +msgid "is a device (disabled with 'opendevice' option" +msgstr "jest urz筪zeniem (wy彻czonym w opcji 'opendevice'" + msgid "[New File]" msgstr "[Nowy Plik]" @@ -1553,6 +1564,9 @@ msgstr "Cz隃ciowy zapis niemo縧iwy dla bufor體 NetBeans" msgid "is not a file or writable device" msgstr "nie jest plikiem lub zapisywalnym przyrz筪em" +msgid "writing to device disabled with 'opendevice' option" +msgstr "zapisywanie do urz筪zenia wy彻czone w opcji 'opendevice'" + msgid "is read-only (add ! to override)" msgstr "jest tylko do odczytu (wymu poprzez !)" @@ -3288,6 +3302,9 @@ msgstr "" ",\n" "lub plik zosta uszkodzony." +msgid " has been damaged (page size is smaller than minimum value).\n" +msgstr " zosta uszkodzony (wielko滄 strony jest mniejsza ni najmniejsza warto滄).\n" + #, c-format msgid "Using swap file \"%s\"" msgstr "U縴wam pliku wymiany \"%s\"" @@ -3626,6 +3643,10 @@ msgstr "E328: Menu istnieje tylko w innym trybie" msgid "E329: No menu \"%s\"" msgstr "E329: Nie ma menu \"%s\"" +#. Only a mnemonic or accelerator is not valid. +msgid "E792: Empty menu name" +msgstr "E792: Pusta nazwa menu" + msgid "E330: Menu path must not lead to a sub-menu" msgstr "E330: Trop menu nie mo縠 prowadzi do podmenu" @@ -4999,6 +5020,7 @@ msgstr "Przykro mi, brak podpowiedzi" msgid "Sorry, only %ld suggestions" msgstr "Przykro mi, tylko %ld podpowiedzi" +#. for when 'cmdheight' > 1 #. avoid more prompt #, c-format msgid "Change \"%.*s\" to:" @@ -5423,6 +5445,13 @@ msgstr "" msgid "" "\n" +"MS-Windows 64 bit GUI version" +msgstr "" +"\n" +"64 bitowa wersja GUI dla MS-Windows" + +msgid "" +"\n" "MS-Windows 32 bit GUI version" msgstr "" "\n" @@ -6016,8 +6045,8 @@ msgid "E46: Cannot change read-only variable \"%s\"" msgstr "E46: Nie mog zmieni zmiennej tylko do odczytu \"%s\"" #, c-format -msgid "E46: Cannot set variable in the sandbox: \"%s\"" -msgstr "E46: Nie mog ustawi zmiennej w piaskownicy: \"%s\"" +msgid "E794: Cannot set variable in the sandbox: \"%s\"" +msgstr "E794: Nie mog ustawi zmiennej w piaskownicy: \"%s\"" msgid "E47: Error while reading errorfile" msgstr "E47: B彻d w trakcie czytania pliku b酬d體" diff --git a/src/proto/charset.pro b/src/proto/charset.pro index a6f480262..4b6890d18 100644 --- a/src/proto/charset.pro +++ b/src/proto/charset.pro @@ -1,56 +1,56 @@ /* charset.c */ -extern int init_chartab __ARGS((void)); -extern int buf_init_chartab __ARGS((buf_T *buf, int global)); -extern void trans_characters __ARGS((char_u *buf, int bufsize)); -extern char_u *transstr __ARGS((char_u *s)); -extern char_u *str_foldcase __ARGS((char_u *str, int orglen, char_u *buf, int buflen)); -extern char_u *transchar __ARGS((int c)); -extern char_u *transchar_byte __ARGS((int c)); -extern void transchar_nonprint __ARGS((char_u *buf, int c)); -extern void transchar_hex __ARGS((char_u *buf, int c)); -extern int byte2cells __ARGS((int b)); -extern int char2cells __ARGS((int c)); -extern int ptr2cells __ARGS((char_u *p)); -extern int vim_strsize __ARGS((char_u *s)); -extern int vim_strnsize __ARGS((char_u *s, int len)); -extern int chartabsize __ARGS((char_u *p, colnr_T col)); -extern int linetabsize __ARGS((char_u *s)); -extern int win_linetabsize __ARGS((win_T *wp, char_u *p, colnr_T len)); -extern int vim_isIDc __ARGS((int c)); -extern int vim_iswordc __ARGS((int c)); -extern int vim_iswordp __ARGS((char_u *p)); -extern int vim_iswordc_buf __ARGS((char_u *p, buf_T *buf)); -extern int vim_isfilec __ARGS((int c)); -extern int vim_isprintc __ARGS((int c)); -extern int vim_isprintc_strict __ARGS((int c)); -extern int lbr_chartabsize __ARGS((unsigned char *s, colnr_T col)); -extern int lbr_chartabsize_adv __ARGS((char_u **s, colnr_T col)); -extern int win_lbr_chartabsize __ARGS((win_T *wp, char_u *s, colnr_T col, int *headp)); -extern int in_win_border __ARGS((win_T *wp, colnr_T vcol)); -extern void getvcol __ARGS((win_T *wp, pos_T *pos, colnr_T *start, colnr_T *cursor, colnr_T *end)); -extern colnr_T getvcol_nolist __ARGS((pos_T *posp)); -extern void getvvcol __ARGS((win_T *wp, pos_T *pos, colnr_T *start, colnr_T *cursor, colnr_T *end)); -extern void getvcols __ARGS((win_T *wp, pos_T *pos1, pos_T *pos2, colnr_T *left, colnr_T *right)); -extern char_u *skipwhite __ARGS((char_u *p)); -extern char_u *skipdigits __ARGS((char_u *p)); -extern char_u *skiphex __ARGS((char_u *p)); -extern char_u *skiptodigit __ARGS((char_u *p)); -extern char_u *skiptohex __ARGS((char_u *p)); -extern int vim_isdigit __ARGS((int c)); -extern int vim_isxdigit __ARGS((int c)); -extern int vim_islower __ARGS((int c)); -extern int vim_isupper __ARGS((int c)); -extern int vim_toupper __ARGS((int c)); -extern int vim_tolower __ARGS((int c)); -extern char_u *skiptowhite __ARGS((char_u *p)); -extern char_u *skiptowhite_esc __ARGS((char_u *p)); -extern long getdigits __ARGS((char_u **pp)); -extern int vim_isblankline __ARGS((char_u *lbuf)); -extern void vim_str2nr __ARGS((char_u *start, int *hexp, int *len, int dooct, int dohex, long *nptr, unsigned long *unptr)); -extern int hex2nr __ARGS((int c)); -extern int hexhex2nr __ARGS((char_u *p)); -extern int rem_backslash __ARGS((char_u *str)); -extern void backslash_halve __ARGS((char_u *p)); -extern char_u *backslash_halve_save __ARGS((char_u *p)); -extern void ebcdic2ascii __ARGS((char_u *buffer, int len)); +int init_chartab __ARGS((void)); +int buf_init_chartab __ARGS((buf_T *buf, int global)); +void trans_characters __ARGS((char_u *buf, int bufsize)); +char_u *transstr __ARGS((char_u *s)); +char_u *str_foldcase __ARGS((char_u *str, int orglen, char_u *buf, int buflen)); +char_u *transchar __ARGS((int c)); +char_u *transchar_byte __ARGS((int c)); +void transchar_nonprint __ARGS((char_u *buf, int c)); +void transchar_hex __ARGS((char_u *buf, int c)); +int byte2cells __ARGS((int b)); +int char2cells __ARGS((int c)); +int ptr2cells __ARGS((char_u *p)); +int vim_strsize __ARGS((char_u *s)); +int vim_strnsize __ARGS((char_u *s, int len)); +int chartabsize __ARGS((char_u *p, colnr_T col)); +int linetabsize __ARGS((char_u *s)); +int win_linetabsize __ARGS((win_T *wp, char_u *p, colnr_T len)); +int vim_isIDc __ARGS((int c)); +int vim_iswordc __ARGS((int c)); +int vim_iswordp __ARGS((char_u *p)); +int vim_iswordc_buf __ARGS((char_u *p, buf_T *buf)); +int vim_isfilec __ARGS((int c)); +int vim_isprintc __ARGS((int c)); +int vim_isprintc_strict __ARGS((int c)); +int lbr_chartabsize __ARGS((unsigned char *s, colnr_T col)); +int lbr_chartabsize_adv __ARGS((char_u **s, colnr_T col)); +int win_lbr_chartabsize __ARGS((win_T *wp, char_u *s, colnr_T col, int *headp)); +int in_win_border __ARGS((win_T *wp, colnr_T vcol)); +void getvcol __ARGS((win_T *wp, pos_T *pos, colnr_T *start, colnr_T *cursor, colnr_T *end)); +colnr_T getvcol_nolist __ARGS((pos_T *posp)); +void getvvcol __ARGS((win_T *wp, pos_T *pos, colnr_T *start, colnr_T *cursor, colnr_T *end)); +void getvcols __ARGS((win_T *wp, pos_T *pos1, pos_T *pos2, colnr_T *left, colnr_T *right)); +char_u *skipwhite __ARGS((char_u *p)); +char_u *skipdigits __ARGS((char_u *p)); +char_u *skiphex __ARGS((char_u *p)); +char_u *skiptodigit __ARGS((char_u *p)); +char_u *skiptohex __ARGS((char_u *p)); +int vim_isdigit __ARGS((int c)); +int vim_isxdigit __ARGS((int c)); +int vim_islower __ARGS((int c)); +int vim_isupper __ARGS((int c)); +int vim_toupper __ARGS((int c)); +int vim_tolower __ARGS((int c)); +char_u *skiptowhite __ARGS((char_u *p)); +char_u *skiptowhite_esc __ARGS((char_u *p)); +long getdigits __ARGS((char_u **pp)); +int vim_isblankline __ARGS((char_u *lbuf)); +void vim_str2nr __ARGS((char_u *start, int *hexp, int *len, int dooct, int dohex, long *nptr, unsigned long *unptr)); +int hex2nr __ARGS((int c)); +int hexhex2nr __ARGS((char_u *p)); +int rem_backslash __ARGS((char_u *str)); +void backslash_halve __ARGS((char_u *p)); +char_u *backslash_halve_save __ARGS((char_u *p)); +void ebcdic2ascii __ARGS((char_u *buffer, int len)); /* vim: set ft=c : */ diff --git a/src/proto/diff.pro b/src/proto/diff.pro index 65b978fe9..e45127ad0 100644 --- a/src/proto/diff.pro +++ b/src/proto/diff.pro @@ -1,26 +1,26 @@ /* diff.c */ -extern void diff_buf_delete __ARGS((buf_T *buf)); -extern void diff_buf_adjust __ARGS((win_T *win)); -extern void diff_buf_add __ARGS((buf_T *buf)); -extern void diff_invalidate __ARGS((buf_T *buf)); -extern void diff_mark_adjust __ARGS((linenr_T line1, linenr_T line2, long amount, long amount_after)); -extern void ex_diffupdate __ARGS((exarg_T *eap)); -extern void ex_diffpatch __ARGS((exarg_T *eap)); -extern void ex_diffsplit __ARGS((exarg_T *eap)); -extern void ex_diffthis __ARGS((exarg_T *eap)); -extern void diff_win_options __ARGS((win_T *wp, int addbuf)); -extern void ex_diffoff __ARGS((exarg_T *eap)); -extern void diff_clear __ARGS((tabpage_T *tp)); -extern int diff_check __ARGS((win_T *wp, linenr_T lnum)); -extern int diff_check_fill __ARGS((win_T *wp, linenr_T lnum)); -extern void diff_set_topline __ARGS((win_T *fromwin, win_T *towin)); -extern int diffopt_changed __ARGS((void)); -extern int diffopt_horizontal __ARGS((void)); -extern int diff_find_change __ARGS((win_T *wp, linenr_T lnum, int *startp, int *endp)); -extern int diff_infold __ARGS((win_T *wp, linenr_T lnum)); -extern void nv_diffgetput __ARGS((int put)); -extern void ex_diffgetput __ARGS((exarg_T *eap)); -extern int diff_mode_buf __ARGS((buf_T *buf)); -extern int diff_move_to __ARGS((int dir, long count)); -extern linenr_T diff_lnum_win __ARGS((linenr_T lnum, win_T *wp)); +void diff_buf_delete __ARGS((buf_T *buf)); +void diff_buf_adjust __ARGS((win_T *win)); +void diff_buf_add __ARGS((buf_T *buf)); +void diff_invalidate __ARGS((buf_T *buf)); +void diff_mark_adjust __ARGS((linenr_T line1, linenr_T line2, long amount, long amount_after)); +void ex_diffupdate __ARGS((exarg_T *eap)); +void ex_diffpatch __ARGS((exarg_T *eap)); +void ex_diffsplit __ARGS((exarg_T *eap)); +void ex_diffthis __ARGS((exarg_T *eap)); +void diff_win_options __ARGS((win_T *wp, int addbuf)); +void ex_diffoff __ARGS((exarg_T *eap)); +void diff_clear __ARGS((tabpage_T *tp)); +int diff_check __ARGS((win_T *wp, linenr_T lnum)); +int diff_check_fill __ARGS((win_T *wp, linenr_T lnum)); +void diff_set_topline __ARGS((win_T *fromwin, win_T *towin)); +int diffopt_changed __ARGS((void)); +int diffopt_horizontal __ARGS((void)); +int diff_find_change __ARGS((win_T *wp, linenr_T lnum, int *startp, int *endp)); +int diff_infold __ARGS((win_T *wp, linenr_T lnum)); +void nv_diffgetput __ARGS((int put)); +void ex_diffgetput __ARGS((exarg_T *eap)); +int diff_mode_buf __ARGS((buf_T *buf)); +int diff_move_to __ARGS((int dir, long count)); +linenr_T diff_lnum_win __ARGS((linenr_T lnum, win_T *wp)); /* vim: set ft=c : */ diff --git a/src/proto/ex_eval.pro b/src/proto/ex_eval.pro index 20601f8af..8fb234283 100644 --- a/src/proto/ex_eval.pro +++ b/src/proto/ex_eval.pro @@ -1,32 +1,32 @@ /* ex_eval.c */ -extern int aborting __ARGS((void)); -extern void update_force_abort __ARGS((void)); -extern int should_abort __ARGS((int retcode)); -extern int aborted_in_try __ARGS((void)); -extern int cause_errthrow __ARGS((char_u *mesg, int severe, int *ignore)); -extern void do_errthrow __ARGS((struct condstack *cstack, char_u *cmdname)); -extern int do_intthrow __ARGS((struct condstack *cstack)); -extern void discard_current_exception __ARGS((void)); -extern void report_make_pending __ARGS((int pending, void *value)); -extern void report_resume_pending __ARGS((int pending, void *value)); -extern void report_discard_pending __ARGS((int pending, void *value)); -extern void ex_if __ARGS((exarg_T *eap)); -extern void ex_endif __ARGS((exarg_T *eap)); -extern void ex_else __ARGS((exarg_T *eap)); -extern void ex_while __ARGS((exarg_T *eap)); -extern void ex_continue __ARGS((exarg_T *eap)); -extern void ex_break __ARGS((exarg_T *eap)); -extern void ex_endwhile __ARGS((exarg_T *eap)); -extern void ex_throw __ARGS((exarg_T *eap)); -extern void do_throw __ARGS((struct condstack *cstack)); -extern void ex_try __ARGS((exarg_T *eap)); -extern void ex_catch __ARGS((exarg_T *eap)); -extern void ex_finally __ARGS((exarg_T *eap)); -extern void ex_endtry __ARGS((exarg_T *eap)); -extern void enter_cleanup __ARGS((cleanup_T *csp)); -extern void leave_cleanup __ARGS((cleanup_T *csp)); -extern int cleanup_conditionals __ARGS((struct condstack *cstack, int searched_cond, int inclusive)); -extern void rewind_conditionals __ARGS((struct condstack *cstack, int idx, int cond_type, int *cond_level)); -extern void ex_endfunction __ARGS((exarg_T *eap)); -extern int has_loop_cmd __ARGS((char_u *p)); +int aborting __ARGS((void)); +void update_force_abort __ARGS((void)); +int should_abort __ARGS((int retcode)); +int aborted_in_try __ARGS((void)); +int cause_errthrow __ARGS((char_u *mesg, int severe, int *ignore)); +void do_errthrow __ARGS((struct condstack *cstack, char_u *cmdname)); +int do_intthrow __ARGS((struct condstack *cstack)); +void discard_current_exception __ARGS((void)); +void report_make_pending __ARGS((int pending, void *value)); +void report_resume_pending __ARGS((int pending, void *value)); +void report_discard_pending __ARGS((int pending, void *value)); +void ex_if __ARGS((exarg_T *eap)); +void ex_endif __ARGS((exarg_T *eap)); +void ex_else __ARGS((exarg_T *eap)); +void ex_while __ARGS((exarg_T *eap)); +void ex_continue __ARGS((exarg_T *eap)); +void ex_break __ARGS((exarg_T *eap)); +void ex_endwhile __ARGS((exarg_T *eap)); +void ex_throw __ARGS((exarg_T *eap)); +void do_throw __ARGS((struct condstack *cstack)); +void ex_try __ARGS((exarg_T *eap)); +void ex_catch __ARGS((exarg_T *eap)); +void ex_finally __ARGS((exarg_T *eap)); +void ex_endtry __ARGS((exarg_T *eap)); +void enter_cleanup __ARGS((cleanup_T *csp)); +void leave_cleanup __ARGS((cleanup_T *csp)); +int cleanup_conditionals __ARGS((struct condstack *cstack, int searched_cond, int inclusive)); +void rewind_conditionals __ARGS((struct condstack *cstack, int idx, int cond_type, int *cond_level)); +void ex_endfunction __ARGS((exarg_T *eap)); +int has_loop_cmd __ARGS((char_u *p)); /* vim: set ft=c : */ diff --git a/src/proto/ex_getln.pro b/src/proto/ex_getln.pro index 6dd06ff02..f5feb201f 100644 --- a/src/proto/ex_getln.pro +++ b/src/proto/ex_getln.pro @@ -1,56 +1,56 @@ /* ex_getln.c */ -extern char_u *getcmdline __ARGS((int firstc, long count, int indent)); -extern char_u *getcmdline_prompt __ARGS((int firstc, char_u *prompt, int attr, int xp_context, char_u *xp_arg)); -extern int text_locked __ARGS((void)); -extern void text_locked_msg __ARGS((void)); -extern int curbuf_locked __ARGS((void)); -extern char_u *getexline __ARGS((int c, void *dummy, int indent)); -extern char_u *getexmodeline __ARGS((int promptc, void *dummy, int indent)); -extern int cmdline_overstrike __ARGS((void)); -extern int cmdline_at_end __ARGS((void)); -extern colnr_T cmdline_getvcol_cursor __ARGS((void)); -extern void free_cmdline_buf __ARGS((void)); -extern void putcmdline __ARGS((int c, int shift)); -extern void unputcmdline __ARGS((void)); -extern int put_on_cmdline __ARGS((char_u *str, int len, int redraw)); -extern char_u *save_cmdline_alloc __ARGS((void)); -extern void restore_cmdline_alloc __ARGS((char_u *p)); -extern void cmdline_paste_str __ARGS((char_u *s, int literally)); -extern void redrawcmdline __ARGS((void)); -extern void redrawcmd __ARGS((void)); -extern void compute_cmdrow __ARGS((void)); -extern void gotocmdline __ARGS((int clr)); -extern char_u *ExpandOne __ARGS((expand_T *xp, char_u *str, char_u *orig, int options, int mode)); -extern void ExpandInit __ARGS((expand_T *xp)); -extern void ExpandCleanup __ARGS((expand_T *xp)); -extern void ExpandEscape __ARGS((expand_T *xp, char_u *str, int numfiles, char_u **files, int options)); -extern void tilde_replace __ARGS((char_u *orig_pat, int num_files, char_u **files)); -extern char_u *sm_gettail __ARGS((char_u *s)); -extern char_u *addstar __ARGS((char_u *fname, int len, int context)); -extern void set_cmd_context __ARGS((expand_T *xp, char_u *str, int len, int col)); -extern int expand_cmdline __ARGS((expand_T *xp, char_u *str, int col, int *matchcount, char_u ***matches)); -extern int ExpandGeneric __ARGS((expand_T *xp, regmatch_T *regmatch, int *num_file, char_u ***file, char_u *((*func)(expand_T *, int)))); -extern char_u *globpath __ARGS((char_u *path, char_u *file)); -extern void init_history __ARGS((void)); -extern int get_histtype __ARGS((char_u *name)); -extern void add_to_history __ARGS((int histype, char_u *new_entry, int in_map, int sep)); -extern int get_history_idx __ARGS((int histype)); -extern char_u *get_cmdline_str __ARGS((void)); -extern int get_cmdline_pos __ARGS((void)); -extern int set_cmdline_pos __ARGS((int pos)); -extern int get_cmdline_type __ARGS((void)); -extern char_u *get_history_entry __ARGS((int histype, int idx)); -extern int clr_history __ARGS((int histype)); -extern int del_history_entry __ARGS((int histype, char_u *str)); -extern int del_history_idx __ARGS((int histype, int idx)); -extern void remove_key_from_history __ARGS((void)); -extern int get_list_range __ARGS((char_u **str, int *num1, int *num2)); -extern void ex_history __ARGS((exarg_T *eap)); -extern void prepare_viminfo_history __ARGS((int asklen)); -extern int read_viminfo_history __ARGS((vir_T *virp)); -extern void finish_viminfo_history __ARGS((void)); -extern void write_viminfo_history __ARGS((FILE *fp)); -extern void cmd_pchar __ARGS((int c, int offset)); -extern int cmd_gchar __ARGS((int offset)); -extern char_u *script_get __ARGS((exarg_T *eap, char_u *cmd)); +char_u *getcmdline __ARGS((int firstc, long count, int indent)); +char_u *getcmdline_prompt __ARGS((int firstc, char_u *prompt, int attr, int xp_context, char_u *xp_arg)); +int text_locked __ARGS((void)); +void text_locked_msg __ARGS((void)); +int curbuf_locked __ARGS((void)); +char_u *getexline __ARGS((int c, void *dummy, int indent)); +char_u *getexmodeline __ARGS((int promptc, void *dummy, int indent)); +int cmdline_overstrike __ARGS((void)); +int cmdline_at_end __ARGS((void)); +colnr_T cmdline_getvcol_cursor __ARGS((void)); +void free_cmdline_buf __ARGS((void)); +void putcmdline __ARGS((int c, int shift)); +void unputcmdline __ARGS((void)); +int put_on_cmdline __ARGS((char_u *str, int len, int redraw)); +char_u *save_cmdline_alloc __ARGS((void)); +void restore_cmdline_alloc __ARGS((char_u *p)); +void cmdline_paste_str __ARGS((char_u *s, int literally)); +void redrawcmdline __ARGS((void)); +void redrawcmd __ARGS((void)); +void compute_cmdrow __ARGS((void)); +void gotocmdline __ARGS((int clr)); +char_u *ExpandOne __ARGS((expand_T *xp, char_u *str, char_u *orig, int options, int mode)); +void ExpandInit __ARGS((expand_T *xp)); +void ExpandCleanup __ARGS((expand_T *xp)); +void ExpandEscape __ARGS((expand_T *xp, char_u *str, int numfiles, char_u **files, int options)); +void tilde_replace __ARGS((char_u *orig_pat, int num_files, char_u **files)); +char_u *sm_gettail __ARGS((char_u *s)); +char_u *addstar __ARGS((char_u *fname, int len, int context)); +void set_cmd_context __ARGS((expand_T *xp, char_u *str, int len, int col)); +int expand_cmdline __ARGS((expand_T *xp, char_u *str, int col, int *matchcount, char_u ***matches)); +int ExpandGeneric __ARGS((expand_T *xp, regmatch_T *regmatch, int *num_file, char_u ***file, char_u *((*func)(expand_T *, int)))); +char_u *globpath __ARGS((char_u *path, char_u *file)); +void init_history __ARGS((void)); +int get_histtype __ARGS((char_u *name)); +void add_to_history __ARGS((int histype, char_u *new_entry, int in_map, int sep)); +int get_history_idx __ARGS((int histype)); +char_u *get_cmdline_str __ARGS((void)); +int get_cmdline_pos __ARGS((void)); +int set_cmdline_pos __ARGS((int pos)); +int get_cmdline_type __ARGS((void)); +char_u *get_history_entry __ARGS((int histype, int idx)); +int clr_history __ARGS((int histype)); +int del_history_entry __ARGS((int histype, char_u *str)); +int del_history_idx __ARGS((int histype, int idx)); +void remove_key_from_history __ARGS((void)); +int get_list_range __ARGS((char_u **str, int *num1, int *num2)); +void ex_history __ARGS((exarg_T *eap)); +void prepare_viminfo_history __ARGS((int asklen)); +int read_viminfo_history __ARGS((vir_T *virp)); +void finish_viminfo_history __ARGS((void)); +void write_viminfo_history __ARGS((FILE *fp)); +void cmd_pchar __ARGS((int c, int offset)); +int cmd_gchar __ARGS((int offset)); +char_u *script_get __ARGS((exarg_T *eap, char_u *cmd)); /* vim: set ft=c : */ diff --git a/src/proto/fold.pro b/src/proto/fold.pro index 85510932f..3318bbde7 100644 --- a/src/proto/fold.pro +++ b/src/proto/fold.pro @@ -1,41 +1,41 @@ /* fold.c */ -extern void copyFoldingState __ARGS((win_T *wp_from, win_T *wp_to)); -extern int hasAnyFolding __ARGS((win_T *win)); -extern int hasFolding __ARGS((linenr_T lnum, linenr_T *firstp, linenr_T *lastp)); -extern int hasFoldingWin __ARGS((win_T *win, linenr_T lnum, linenr_T *firstp, linenr_T *lastp, int cache, foldinfo_T *infop)); -extern int foldLevel __ARGS((linenr_T lnum)); -extern int lineFolded __ARGS((win_T *win, linenr_T lnum)); -extern long foldedCount __ARGS((win_T *win, linenr_T lnum, foldinfo_T *infop)); -extern int foldmethodIsManual __ARGS((win_T *wp)); -extern int foldmethodIsIndent __ARGS((win_T *wp)); -extern int foldmethodIsExpr __ARGS((win_T *wp)); -extern int foldmethodIsMarker __ARGS((win_T *wp)); -extern int foldmethodIsSyntax __ARGS((win_T *wp)); -extern int foldmethodIsDiff __ARGS((win_T *wp)); -extern void closeFold __ARGS((linenr_T lnum, long count)); -extern void closeFoldRecurse __ARGS((linenr_T lnum)); -extern void opFoldRange __ARGS((linenr_T first, linenr_T last, int opening, int recurse, int had_visual)); -extern void openFold __ARGS((linenr_T lnum, long count)); -extern void openFoldRecurse __ARGS((linenr_T lnum)); -extern void foldOpenCursor __ARGS((void)); -extern void newFoldLevel __ARGS((void)); -extern void foldCheckClose __ARGS((void)); -extern int foldManualAllowed __ARGS((int create)); -extern void foldCreate __ARGS((linenr_T start, linenr_T end)); -extern void deleteFold __ARGS((linenr_T start, linenr_T end, int recursive, int had_visual)); -extern void clearFolding __ARGS((win_T *win)); -extern void foldUpdate __ARGS((win_T *wp, linenr_T top, linenr_T bot)); -extern void foldUpdateAll __ARGS((win_T *win)); -extern int foldMoveTo __ARGS((int updown, int dir, long count)); -extern void foldInitWin __ARGS((win_T *newwin)); -extern int find_wl_entry __ARGS((win_T *win, linenr_T lnum)); -extern void foldAdjustVisual __ARGS((void)); -extern void foldAdjustCursor __ARGS((void)); -extern void cloneFoldGrowArray __ARGS((garray_T *from, garray_T *to)); -extern void deleteFoldRecurse __ARGS((garray_T *gap)); -extern void foldMarkAdjust __ARGS((win_T *wp, linenr_T line1, linenr_T line2, long amount, long amount_after)); -extern int getDeepestNesting __ARGS((void)); -extern char_u *get_foldtext __ARGS((win_T *wp, linenr_T lnum, linenr_T lnume, foldinfo_T *foldinfo, char_u *buf)); -extern void foldtext_cleanup __ARGS((char_u *str)); -extern int put_folds __ARGS((FILE *fd, win_T *wp)); +void copyFoldingState __ARGS((win_T *wp_from, win_T *wp_to)); +int hasAnyFolding __ARGS((win_T *win)); +int hasFolding __ARGS((linenr_T lnum, linenr_T *firstp, linenr_T *lastp)); +int hasFoldingWin __ARGS((win_T *win, linenr_T lnum, linenr_T *firstp, linenr_T *lastp, int cache, foldinfo_T *infop)); +int foldLevel __ARGS((linenr_T lnum)); +int lineFolded __ARGS((win_T *win, linenr_T lnum)); +long foldedCount __ARGS((win_T *win, linenr_T lnum, foldinfo_T *infop)); +int foldmethodIsManual __ARGS((win_T *wp)); +int foldmethodIsIndent __ARGS((win_T *wp)); +int foldmethodIsExpr __ARGS((win_T *wp)); +int foldmethodIsMarker __ARGS((win_T *wp)); +int foldmethodIsSyntax __ARGS((win_T *wp)); +int foldmethodIsDiff __ARGS((win_T *wp)); +void closeFold __ARGS((linenr_T lnum, long count)); +void closeFoldRecurse __ARGS((linenr_T lnum)); +void opFoldRange __ARGS((linenr_T first, linenr_T last, int opening, int recurse, int had_visual)); +void openFold __ARGS((linenr_T lnum, long count)); +void openFoldRecurse __ARGS((linenr_T lnum)); +void foldOpenCursor __ARGS((void)); +void newFoldLevel __ARGS((void)); +void foldCheckClose __ARGS((void)); +int foldManualAllowed __ARGS((int create)); +void foldCreate __ARGS((linenr_T start, linenr_T end)); +void deleteFold __ARGS((linenr_T start, linenr_T end, int recursive, int had_visual)); +void clearFolding __ARGS((win_T *win)); +void foldUpdate __ARGS((win_T *wp, linenr_T top, linenr_T bot)); +void foldUpdateAll __ARGS((win_T *win)); +int foldMoveTo __ARGS((int updown, int dir, long count)); +void foldInitWin __ARGS((win_T *newwin)); +int find_wl_entry __ARGS((win_T *win, linenr_T lnum)); +void foldAdjustVisual __ARGS((void)); +void foldAdjustCursor __ARGS((void)); +void cloneFoldGrowArray __ARGS((garray_T *from, garray_T *to)); +void deleteFoldRecurse __ARGS((garray_T *gap)); +void foldMarkAdjust __ARGS((win_T *wp, linenr_T line1, linenr_T line2, long amount, long amount_after)); +int getDeepestNesting __ARGS((void)); +char_u *get_foldtext __ARGS((win_T *wp, linenr_T lnum, linenr_T lnume, foldinfo_T *foldinfo, char_u *buf)); +void foldtext_cleanup __ARGS((char_u *str)); +int put_folds __ARGS((FILE *fd, win_T *wp)); /* vim: set ft=c : */ diff --git a/src/proto/gui.pro b/src/proto/gui.pro index aeabd42cd..322dc7955 100644 --- a/src/proto/gui.pro +++ b/src/proto/gui.pro @@ -1,65 +1,65 @@ /* gui.c */ -extern void gui_start __ARGS((void)); -extern void gui_prepare __ARGS((int *argc, char **argv)); -extern int gui_init_check __ARGS((void)); -extern void gui_init __ARGS((void)); -extern void gui_exit __ARGS((int rc)); -extern void gui_shell_closed __ARGS((void)); -extern int gui_init_font __ARGS((char_u *font_list, int fontset)); -extern int gui_get_wide_font __ARGS((void)); -extern void gui_set_cursor __ARGS((int row, int col)); -extern void gui_update_cursor __ARGS((int force, int clear_selection)); -extern void gui_position_menu __ARGS((void)); -extern int gui_get_base_width __ARGS((void)); -extern int gui_get_base_height __ARGS((void)); -extern void gui_resize_shell __ARGS((int pixel_width, int pixel_height)); -extern void gui_may_resize_shell __ARGS((void)); -extern int gui_get_shellsize __ARGS((void)); -extern void gui_set_shellsize __ARGS((int mustset, int fit_to_display, int direction)); -extern void gui_new_shellsize __ARGS((void)); -extern void gui_reset_scroll_region __ARGS((void)); -extern void gui_start_highlight __ARGS((int mask)); -extern void gui_stop_highlight __ARGS((int mask)); -extern void gui_clear_block __ARGS((int row1, int col1, int row2, int col2)); -extern void gui_update_cursor_later __ARGS((void)); -extern void gui_write __ARGS((char_u *s, int len)); -extern void gui_dont_update_cursor __ARGS((void)); -extern void gui_can_update_cursor __ARGS((void)); -extern int gui_outstr_nowrap __ARGS((char_u *s, int len, int flags, guicolor_T fg, guicolor_T bg, int back)); -extern void gui_undraw_cursor __ARGS((void)); -extern void gui_redraw __ARGS((int x, int y, int w, int h)); -extern int gui_redraw_block __ARGS((int row1, int col1, int row2, int col2, int flags)); -extern int gui_wait_for_chars __ARGS((long wtime)); -extern void gui_send_mouse_event __ARGS((int button, int x, int y, int repeated_click, int_u modifiers)); -extern int gui_xy2colrow __ARGS((int x, int y, int *colp)); -extern void gui_menu_cb __ARGS((vimmenu_T *menu)); -extern void gui_init_which_components __ARGS((char_u *oldval)); -extern int gui_use_tabline __ARGS((void)); -extern void gui_update_tabline __ARGS((void)); -extern void get_tabline_label __ARGS((tabpage_T *tp, int tooltip)); -extern int send_tabline_event __ARGS((int nr)); -extern void send_tabline_menu_event __ARGS((int tabidx, int event)); -extern void gui_remove_scrollbars __ARGS((void)); -extern void gui_create_scrollbar __ARGS((scrollbar_T *sb, int type, win_T *wp)); -extern scrollbar_T *gui_find_scrollbar __ARGS((long ident)); -extern void gui_drag_scrollbar __ARGS((scrollbar_T *sb, long value, int still_dragging)); -extern void gui_update_scrollbars __ARGS((int force)); -extern int gui_do_scroll __ARGS((void)); -extern int gui_do_horiz_scroll __ARGS((void)); -extern void gui_check_colors __ARGS((void)); -extern guicolor_T gui_get_color __ARGS((char_u *name)); -extern int gui_get_lightness __ARGS((guicolor_T pixel)); -extern void gui_new_scrollbar_colors __ARGS((void)); -extern void gui_focus_change __ARGS((int in_focus)); -extern void gui_mouse_moved __ARGS((int x, int y)); -extern void gui_mouse_correct __ARGS((void)); -extern void ex_gui __ARGS((exarg_T *eap)); -extern int gui_find_bitmap __ARGS((char_u *name, char_u *buffer, char *ext)); -extern void gui_find_iconfile __ARGS((char_u *name, char_u *buffer, char *ext)); -extern void display_errors __ARGS((void)); -extern int no_console_input __ARGS((void)); -extern void gui_update_screen __ARGS((void)); -extern char_u *get_find_dialog_text __ARGS((char_u *arg, int *wwordp, int *mcasep)); -extern int gui_do_findrepl __ARGS((int flags, char_u *find_text, char_u *repl_text, int down)); -extern void gui_handle_drop __ARGS((int x, int y, int_u modifiers, char_u **fnames, int count)); +void gui_start __ARGS((void)); +void gui_prepare __ARGS((int *argc, char **argv)); +int gui_init_check __ARGS((void)); +void gui_init __ARGS((void)); +void gui_exit __ARGS((int rc)); +void gui_shell_closed __ARGS((void)); +int gui_init_font __ARGS((char_u *font_list, int fontset)); +int gui_get_wide_font __ARGS((void)); +void gui_set_cursor __ARGS((int row, int col)); +void gui_update_cursor __ARGS((int force, int clear_selection)); +void gui_position_menu __ARGS((void)); +int gui_get_base_width __ARGS((void)); +int gui_get_base_height __ARGS((void)); +void gui_resize_shell __ARGS((int pixel_width, int pixel_height)); +void gui_may_resize_shell __ARGS((void)); +int gui_get_shellsize __ARGS((void)); +void gui_set_shellsize __ARGS((int mustset, int fit_to_display, int direction)); +void gui_new_shellsize __ARGS((void)); +void gui_reset_scroll_region __ARGS((void)); +void gui_start_highlight __ARGS((int mask)); +void gui_stop_highlight __ARGS((int mask)); +void gui_clear_block __ARGS((int row1, int col1, int row2, int col2)); +void gui_update_cursor_later __ARGS((void)); +void gui_write __ARGS((char_u *s, int len)); +void gui_dont_update_cursor __ARGS((void)); +void gui_can_update_cursor __ARGS((void)); +int gui_outstr_nowrap __ARGS((char_u *s, int len, int flags, guicolor_T fg, guicolor_T bg, int back)); +void gui_undraw_cursor __ARGS((void)); +void gui_redraw __ARGS((int x, int y, int w, int h)); +int gui_redraw_block __ARGS((int row1, int col1, int row2, int col2, int flags)); +int gui_wait_for_chars __ARGS((long wtime)); +void gui_send_mouse_event __ARGS((int button, int x, int y, int repeated_click, int_u modifiers)); +int gui_xy2colrow __ARGS((int x, int y, int *colp)); +void gui_menu_cb __ARGS((vimmenu_T *menu)); +void gui_init_which_components __ARGS((char_u *oldval)); +int gui_use_tabline __ARGS((void)); +void gui_update_tabline __ARGS((void)); +void get_tabline_label __ARGS((tabpage_T *tp, int tooltip)); +int send_tabline_event __ARGS((int nr)); +void send_tabline_menu_event __ARGS((int tabidx, int event)); +void gui_remove_scrollbars __ARGS((void)); +void gui_create_scrollbar __ARGS((scrollbar_T *sb, int type, win_T *wp)); +scrollbar_T *gui_find_scrollbar __ARGS((long ident)); +void gui_drag_scrollbar __ARGS((scrollbar_T *sb, long value, int still_dragging)); +void gui_update_scrollbars __ARGS((int force)); +int gui_do_scroll __ARGS((void)); +int gui_do_horiz_scroll __ARGS((void)); +void gui_check_colors __ARGS((void)); +guicolor_T gui_get_color __ARGS((char_u *name)); +int gui_get_lightness __ARGS((guicolor_T pixel)); +void gui_new_scrollbar_colors __ARGS((void)); +void gui_focus_change __ARGS((int in_focus)); +void gui_mouse_moved __ARGS((int x, int y)); +void gui_mouse_correct __ARGS((void)); +void ex_gui __ARGS((exarg_T *eap)); +int gui_find_bitmap __ARGS((char_u *name, char_u *buffer, char *ext)); +void gui_find_iconfile __ARGS((char_u *name, char_u *buffer, char *ext)); +void display_errors __ARGS((void)); +int no_console_input __ARGS((void)); +void gui_update_screen __ARGS((void)); +char_u *get_find_dialog_text __ARGS((char_u *arg, int *wwordp, int *mcasep)); +int gui_do_findrepl __ARGS((int flags, char_u *find_text, char_u *repl_text, int down)); +void gui_handle_drop __ARGS((int x, int y, int_u modifiers, char_u **fnames, int count)); /* vim: set ft=c : */ diff --git a/src/proto/gui_gtk_x11.pro b/src/proto/gui_gtk_x11.pro index deb8039be..87ff6da40 100644 --- a/src/proto/gui_gtk_x11.pro +++ b/src/proto/gui_gtk_x11.pro @@ -1,73 +1,73 @@ /* gui_gtk_x11.c */ -extern void gui_mch_prepare __ARGS((int *argc, char **argv)); -extern void gui_mch_free_all __ARGS((void)); -extern void gui_mch_set_blinking __ARGS((long waittime, long on, long off)); -extern void gui_mch_stop_blink __ARGS((void)); -extern void gui_mch_start_blink __ARGS((void)); -extern int gui_mch_init_check __ARGS((void)); -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 int gui_mch_init __ARGS((void)); -extern void gui_mch_forked __ARGS((void)); -extern void gui_mch_new_colors __ARGS((void)); -extern int gui_mch_open __ARGS((void)); -extern void gui_mch_exit __ARGS((int rc)); -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_settitle __ARGS((char_u *title, char_u *icon)); -extern void gui_mch_enable_menu __ARGS((int showit)); -extern void gui_mch_show_toolbar __ARGS((int showit)); -extern int gui_mch_adjust_charheight __ARGS((void)); -extern GuiFontset gui_mch_get_fontset __ARGS((char_u *name, int report_error, int fixed_width)); -extern char_u *gui_mch_font_dialog __ARGS((char_u *oldval)); -extern int gui_mch_init_font __ARGS((char_u *font_name, int fontset)); -extern GuiFont gui_mch_get_font __ARGS((char_u *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_set_fontset __ARGS((GuiFontset fontset)); -extern void gui_mch_free_font __ARGS((GuiFont font)); -extern void gui_mch_free_fontset __ARGS((GuiFontset fontset)); -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 int gui_gtk2_draw_string __ARGS((int row, int col, char_u *s, int len, int flags)); -extern void gui_mch_draw_string __ARGS((int row, int col, char_u *s, int len, int flags)); -extern int gui_mch_haskey __ARGS((char_u *name)); -extern int gui_get_x11_windis __ARGS((Window *win, Display **dis)); -extern Display *gui_mch_get_display __ARGS((void)); -extern void gui_mch_beep __ARGS((void)); -extern void gui_mch_flash __ARGS((int msec)); -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_set_foreground __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((long wtime)); -extern void gui_mch_flush __ARGS((void)); -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 clip_mch_request_selection __ARGS((VimClipboard *cbd)); -extern void clip_mch_lose_selection __ARGS((VimClipboard *cbd)); -extern int clip_mch_own_selection __ARGS((VimClipboard *cbd)); -extern void clip_mch_set_selection __ARGS((VimClipboard *cbd)); -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_enable_scrollbar __ARGS((scrollbar_T *sb, int flag)); -extern long_u gui_mch_get_rgb __ARGS((guicolor_T pixel)); -extern void gui_mch_getmouse __ARGS((int *x, int *y)); -extern void gui_mch_setmouse __ARGS((int x, int y)); -extern void gui_mch_mousehide __ARGS((int hide)); -extern void mch_set_mouse_shape __ARGS((int shape)); -extern void gui_mch_drawsign __ARGS((int row, int col, int typenr)); -extern void *gui_mch_register_sign __ARGS((char_u *signfile)); -extern void gui_mch_destroy_sign __ARGS((void *sign)); +void gui_mch_prepare __ARGS((int *argc, char **argv)); +void gui_mch_free_all __ARGS((void)); +void gui_mch_set_blinking __ARGS((long waittime, long on, long off)); +void gui_mch_stop_blink __ARGS((void)); +void gui_mch_start_blink __ARGS((void)); +int gui_mch_init_check __ARGS((void)); +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)); +int gui_mch_init __ARGS((void)); +void gui_mch_forked __ARGS((void)); +void gui_mch_new_colors __ARGS((void)); +int gui_mch_open __ARGS((void)); +void gui_mch_exit __ARGS((int rc)); +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_settitle __ARGS((char_u *title, char_u *icon)); +void gui_mch_enable_menu __ARGS((int showit)); +void gui_mch_show_toolbar __ARGS((int showit)); +int gui_mch_adjust_charheight __ARGS((void)); +GuiFontset gui_mch_get_fontset __ARGS((char_u *name, int report_error, int fixed_width)); +char_u *gui_mch_font_dialog __ARGS((char_u *oldval)); +int gui_mch_init_font __ARGS((char_u *font_name, int fontset)); +GuiFont gui_mch_get_font __ARGS((char_u *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_set_fontset __ARGS((GuiFontset fontset)); +void gui_mch_free_font __ARGS((GuiFont font)); +void gui_mch_free_fontset __ARGS((GuiFontset fontset)); +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)); +int gui_gtk2_draw_string __ARGS((int row, int col, char_u *s, int len, int flags)); +void gui_mch_draw_string __ARGS((int row, int col, char_u *s, int len, int flags)); +int gui_mch_haskey __ARGS((char_u *name)); +int gui_get_x11_windis __ARGS((Window *win, Display **dis)); +Display *gui_mch_get_display __ARGS((void)); +void gui_mch_beep __ARGS((void)); +void gui_mch_flash __ARGS((int msec)); +void gui_mch_invert_rectangle __ARGS((int r, int c, int nr, int nc)); +void gui_mch_iconify __ARGS((void)); +void gui_mch_set_foreground __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((long wtime)); +void gui_mch_flush __ARGS((void)); +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 clip_mch_request_selection __ARGS((VimClipboard *cbd)); +void clip_mch_lose_selection __ARGS((VimClipboard *cbd)); +int clip_mch_own_selection __ARGS((VimClipboard *cbd)); +void clip_mch_set_selection __ARGS((VimClipboard *cbd)); +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_enable_scrollbar __ARGS((scrollbar_T *sb, int flag)); +long_u gui_mch_get_rgb __ARGS((guicolor_T pixel)); +void gui_mch_getmouse __ARGS((int *x, int *y)); +void gui_mch_setmouse __ARGS((int x, int y)); +void gui_mch_mousehide __ARGS((int hide)); +void mch_set_mouse_shape __ARGS((int shape)); +void gui_mch_drawsign __ARGS((int row, int col, int typenr)); +void *gui_mch_register_sign __ARGS((char_u *signfile)); +void gui_mch_destroy_sign __ARGS((void *sign)); /* vim: set ft=c : */ diff --git a/src/proto/gui_xmdlg.pro b/src/proto/gui_xmdlg.pro index dc6655a15..4f88c2ff1 100644 --- a/src/proto/gui_xmdlg.pro +++ b/src/proto/gui_xmdlg.pro @@ -1,3 +1,3 @@ /* gui_xmdlg.c */ -extern char_u *gui_xm_select_font __ARGS((char_u *current)); +char_u *gui_xm_select_font __ARGS((char_u *current)); /* vim: set ft=c : */ diff --git a/src/proto/hashtab.pro b/src/proto/hashtab.pro index 90abb9f0b..e3c22b726 100644 --- a/src/proto/hashtab.pro +++ b/src/proto/hashtab.pro @@ -1,14 +1,14 @@ /* hashtab.c */ -extern void hash_init __ARGS((hashtab_T *ht)); -extern void hash_clear __ARGS((hashtab_T *ht)); -extern void hash_clear_all __ARGS((hashtab_T *ht, int off)); -extern hashitem_T *hash_find __ARGS((hashtab_T *ht, char_u *key)); -extern hashitem_T *hash_lookup __ARGS((hashtab_T *ht, char_u *key, hash_T hash)); -extern void hash_debug_results __ARGS((void)); -extern int hash_add __ARGS((hashtab_T *ht, char_u *key)); -extern int hash_add_item __ARGS((hashtab_T *ht, hashitem_T *hi, char_u *key, hash_T hash)); -extern void hash_remove __ARGS((hashtab_T *ht, hashitem_T *hi)); -extern void hash_lock __ARGS((hashtab_T *ht)); -extern void hash_unlock __ARGS((hashtab_T *ht)); -extern hash_T hash_hash __ARGS((char_u *key)); +void hash_init __ARGS((hashtab_T *ht)); +void hash_clear __ARGS((hashtab_T *ht)); +void hash_clear_all __ARGS((hashtab_T *ht, int off)); +hashitem_T *hash_find __ARGS((hashtab_T *ht, char_u *key)); +hashitem_T *hash_lookup __ARGS((hashtab_T *ht, char_u *key, hash_T hash)); +void hash_debug_results __ARGS((void)); +int hash_add __ARGS((hashtab_T *ht, char_u *key)); +int hash_add_item __ARGS((hashtab_T *ht, hashitem_T *hi, char_u *key, hash_T hash)); +void hash_remove __ARGS((hashtab_T *ht, hashitem_T *hi)); +void hash_lock __ARGS((hashtab_T *ht)); +void hash_unlock __ARGS((hashtab_T *ht)); +hash_T hash_hash __ARGS((char_u *key)); /* vim: set ft=c : */ diff --git a/src/proto/if_tcl.pro b/src/proto/if_tcl.pro index 2af917429..0679ed41a 100644 --- a/src/proto/if_tcl.pro +++ b/src/proto/if_tcl.pro @@ -1,10 +1,10 @@ /* if_tcl.c */ -extern void vim_tcl_init __ARGS((char *arg)); -extern int tcl_enabled __ARGS((int verbose)); -extern void tcl_end __ARGS((void)); -extern void ex_tcl __ARGS((exarg_T *eap)); -extern void ex_tclfile __ARGS((exarg_T *eap)); -extern void ex_tcldo __ARGS((exarg_T *eap)); -extern void tcl_buffer_free __ARGS((buf_T *buf)); -extern void tcl_window_free __ARGS((win_T *win)); +void vim_tcl_init __ARGS((char *arg)); +int tcl_enabled __ARGS((int verbose)); +void tcl_end __ARGS((void)); +void ex_tcl __ARGS((exarg_T *eap)); +void ex_tclfile __ARGS((exarg_T *eap)); +void ex_tcldo __ARGS((exarg_T *eap)); +void tcl_buffer_free __ARGS((buf_T *buf)); +void tcl_window_free __ARGS((win_T *win)); /* vim: set ft=c : */ diff --git a/src/proto/main.pro b/src/proto/main.pro index 93a312f24..2ecce7955 100644 --- a/src/proto/main.pro +++ b/src/proto/main.pro @@ -1,26 +1,26 @@ /* main.c */ -extern void main_loop __ARGS((int cmdwin, int noexmode)); -extern void getout_preserve_modified __ARGS((int exitval)); -extern void getout __ARGS((int exitval)); -extern int process_env __ARGS((char_u *env, int is_viminit)); -extern void mainerr_arg_missing __ARGS((char_u *str)); -extern void time_push __ARGS((void *tv_rel, void *tv_start)); -extern void time_pop __ARGS((void *tp)); -extern void time_msg __ARGS((char *msg, void *tv_start)); -extern void server_to_input_buf __ARGS((char_u *str)); -extern char_u *eval_client_expr_to_string __ARGS((char_u *expr)); -extern char_u *serverConvert __ARGS((char_u *client_enc, char_u *data, char_u **tofree)); -extern int toF_TyA __ARGS((int c)); -extern int fkmap __ARGS((int c)); -extern void conv_to_pvim __ARGS((void)); -extern void conv_to_pstd __ARGS((void)); -extern char_u *lrswap __ARGS((char_u *ibuf)); -extern char_u *lrFswap __ARGS((char_u *cmdbuf, int len)); -extern char_u *lrF_sub __ARGS((char_u *ibuf)); -extern int cmdl_fkmap __ARGS((int c)); -extern int F_isalpha __ARGS((int c)); -extern int F_isdigit __ARGS((int c)); -extern int F_ischar __ARGS((int c)); -extern void farsi_fkey __ARGS((cmdarg_T *cap)); -extern int arabic_shape __ARGS((int c, int *ccp, int *c1p, int prev_c, int prev_c1, int next_c)); +void main_loop __ARGS((int cmdwin, int noexmode)); +void getout_preserve_modified __ARGS((int exitval)); +void getout __ARGS((int exitval)); +int process_env __ARGS((char_u *env, int is_viminit)); +void mainerr_arg_missing __ARGS((char_u *str)); +void time_push __ARGS((void *tv_rel, void *tv_start)); +void time_pop __ARGS((void *tp)); +void time_msg __ARGS((char *msg, void *tv_start)); +void server_to_input_buf __ARGS((char_u *str)); +char_u *eval_client_expr_to_string __ARGS((char_u *expr)); +char_u *serverConvert __ARGS((char_u *client_enc, char_u *data, char_u **tofree)); +int toF_TyA __ARGS((int c)); +int fkmap __ARGS((int c)); +void conv_to_pvim __ARGS((void)); +void conv_to_pstd __ARGS((void)); +char_u *lrswap __ARGS((char_u *ibuf)); +char_u *lrFswap __ARGS((char_u *cmdbuf, int len)); +char_u *lrF_sub __ARGS((char_u *ibuf)); +int cmdl_fkmap __ARGS((int c)); +int F_isalpha __ARGS((int c)); +int F_isdigit __ARGS((int c)); +int F_ischar __ARGS((int c)); +void farsi_fkey __ARGS((cmdarg_T *cap)); +int arabic_shape __ARGS((int c, int *ccp, int *c1p, int prev_c, int prev_c1, int next_c)); /* vim: set ft=c : */ diff --git a/src/proto/mark.pro b/src/proto/mark.pro index fe4403188..13e186899 100644 --- a/src/proto/mark.pro +++ b/src/proto/mark.pro @@ -1,30 +1,30 @@ /* mark.c */ -extern int setmark __ARGS((int c)); -extern int setmark_pos __ARGS((int c, pos_T *pos, int fnum)); -extern void setpcmark __ARGS((void)); -extern void checkpcmark __ARGS((void)); -extern pos_T *movemark __ARGS((int count)); -extern pos_T *movechangelist __ARGS((int count)); -extern pos_T *getmark __ARGS((int c, int changefile)); -extern pos_T *getmark_fnum __ARGS((int c, int changefile, int *fnum)); -extern pos_T *getnextmark __ARGS((pos_T *startpos, int dir, int begin_line)); -extern void fmarks_check_names __ARGS((buf_T *buf)); -extern int check_mark __ARGS((pos_T *pos)); -extern void clrallmarks __ARGS((buf_T *buf)); -extern char_u *fm_getname __ARGS((fmark_T *fmark, int lead_len)); -extern void do_marks __ARGS((exarg_T *eap)); -extern void ex_delmarks __ARGS((exarg_T *eap)); -extern void ex_jumps __ARGS((exarg_T *eap)); -extern void ex_changes __ARGS((exarg_T *eap)); -extern void mark_adjust __ARGS((linenr_T line1, linenr_T line2, long amount, long amount_after)); -extern void mark_col_adjust __ARGS((linenr_T lnum, colnr_T mincol, long lnum_amount, long col_amount)); -extern void copy_jumplist __ARGS((win_T *from, win_T *to)); -extern void free_jumplist __ARGS((win_T *wp)); -extern void set_last_cursor __ARGS((win_T *win)); -extern void free_all_marks __ARGS((void)); -extern int read_viminfo_filemark __ARGS((vir_T *virp, int force)); -extern void write_viminfo_filemarks __ARGS((FILE *fp)); -extern int removable __ARGS((char_u *name)); -extern int write_viminfo_marks __ARGS((FILE *fp_out)); -extern void copy_viminfo_marks __ARGS((vir_T *virp, FILE *fp_out, int count, int eof)); +int setmark __ARGS((int c)); +int setmark_pos __ARGS((int c, pos_T *pos, int fnum)); +void setpcmark __ARGS((void)); +void checkpcmark __ARGS((void)); +pos_T *movemark __ARGS((int count)); +pos_T *movechangelist __ARGS((int count)); +pos_T *getmark __ARGS((int c, int changefile)); +pos_T *getmark_fnum __ARGS((int c, int changefile, int *fnum)); +pos_T *getnextmark __ARGS((pos_T *startpos, int dir, int begin_line)); +void fmarks_check_names __ARGS((buf_T *buf)); +int check_mark __ARGS((pos_T *pos)); +void clrallmarks __ARGS((buf_T *buf)); +char_u *fm_getname __ARGS((fmark_T *fmark, int lead_len)); +void do_marks __ARGS((exarg_T *eap)); +void ex_delmarks __ARGS((exarg_T *eap)); +void ex_jumps __ARGS((exarg_T *eap)); +void ex_changes __ARGS((exarg_T *eap)); +void mark_adjust __ARGS((linenr_T line1, linenr_T line2, long amount, long amount_after)); +void mark_col_adjust __ARGS((linenr_T lnum, colnr_T mincol, long lnum_amount, long col_amount)); +void copy_jumplist __ARGS((win_T *from, win_T *to)); +void free_jumplist __ARGS((win_T *wp)); +void set_last_cursor __ARGS((win_T *win)); +void free_all_marks __ARGS((void)); +int read_viminfo_filemark __ARGS((vir_T *virp, int force)); +void write_viminfo_filemarks __ARGS((FILE *fp)); +int removable __ARGS((char_u *name)); +int write_viminfo_marks __ARGS((FILE *fp_out)); +void copy_viminfo_marks __ARGS((vir_T *virp, FILE *fp_out, int count, int eof)); /* vim: set ft=c : */ diff --git a/src/proto/memfile.pro b/src/proto/memfile.pro index 6c4329a18..3983b4799 100644 --- a/src/proto/memfile.pro +++ b/src/proto/memfile.pro @@ -1,18 +1,18 @@ /* memfile.c */ -extern memfile_T *mf_open __ARGS((char_u *fname, int flags)); -extern int mf_open_file __ARGS((memfile_T *mfp, char_u *fname)); -extern void mf_close __ARGS((memfile_T *mfp, int del_file)); -extern void mf_close_file __ARGS((buf_T *buf, int getlines)); -extern void mf_new_page_size __ARGS((memfile_T *mfp, unsigned new_size)); -extern bhdr_T *mf_new __ARGS((memfile_T *mfp, int negative, int page_count)); -extern bhdr_T *mf_get __ARGS((memfile_T *mfp, blocknr_T nr, int page_count)); -extern void mf_put __ARGS((memfile_T *mfp, bhdr_T *hp, int dirty, int infile)); -extern void mf_free __ARGS((memfile_T *mfp, bhdr_T *hp)); -extern int mf_sync __ARGS((memfile_T *mfp, int flags)); -extern void mf_set_dirty __ARGS((memfile_T *mfp)); -extern int mf_release_all __ARGS((void)); -extern blocknr_T mf_trans_del __ARGS((memfile_T *mfp, blocknr_T old_nr)); -extern void mf_set_ffname __ARGS((memfile_T *mfp)); -extern void mf_fullname __ARGS((memfile_T *mfp)); -extern int mf_need_trans __ARGS((memfile_T *mfp)); +memfile_T *mf_open __ARGS((char_u *fname, int flags)); +int mf_open_file __ARGS((memfile_T *mfp, char_u *fname)); +void mf_close __ARGS((memfile_T *mfp, int del_file)); +void mf_close_file __ARGS((buf_T *buf, int getlines)); +void mf_new_page_size __ARGS((memfile_T *mfp, unsigned new_size)); +bhdr_T *mf_new __ARGS((memfile_T *mfp, int negative, int page_count)); +bhdr_T *mf_get __ARGS((memfile_T *mfp, blocknr_T nr, int page_count)); +void mf_put __ARGS((memfile_T *mfp, bhdr_T *hp, int dirty, int infile)); +void mf_free __ARGS((memfile_T *mfp, bhdr_T *hp)); +int mf_sync __ARGS((memfile_T *mfp, int flags)); +void mf_set_dirty __ARGS((memfile_T *mfp)); +int mf_release_all __ARGS((void)); +blocknr_T mf_trans_del __ARGS((memfile_T *mfp, blocknr_T old_nr)); +void mf_set_ffname __ARGS((memfile_T *mfp)); +void mf_fullname __ARGS((memfile_T *mfp)); +int mf_need_trans __ARGS((memfile_T *mfp)); /* vim: set ft=c : */ diff --git a/src/proto/message.pro b/src/proto/message.pro index e6bd3e9e2..cff7d6b50 100644 --- a/src/proto/message.pro +++ b/src/proto/message.pro @@ -1,71 +1,71 @@ /* message.c */ -extern int msg __ARGS((char_u *s)); -extern int verb_msg __ARGS((char_u *s)); -extern int msg_attr __ARGS((char_u *s, int attr)); -extern int msg_attr_keep __ARGS((char_u *s, int attr, int keep)); -extern char_u *msg_strtrunc __ARGS((char_u *s, int force)); -extern void trunc_string __ARGS((char_u *s, char_u *buf, int room)); -extern void reset_last_sourcing __ARGS((void)); -extern void msg_source __ARGS((int attr)); -extern int emsg_not_now __ARGS((void)); -extern int emsg __ARGS((char_u *s)); -extern int emsg2 __ARGS((char_u *s, char_u *a1)); -extern void emsg_invreg __ARGS((int name)); -extern char_u *msg_trunc_attr __ARGS((char_u *s, int force, int attr)); -extern char_u *msg_may_trunc __ARGS((int force, char_u *s)); -extern int delete_first_msg __ARGS((void)); -extern void ex_messages __ARGS((exarg_T *eap)); -extern void msg_end_prompt __ARGS((void)); -extern void wait_return __ARGS((int redraw)); -extern void set_keep_msg __ARGS((char_u *s, int attr)); -extern void set_keep_msg_from_hist __ARGS((void)); -extern void msg_start __ARGS((void)); -extern void msg_starthere __ARGS((void)); -extern void msg_putchar __ARGS((int c)); -extern void msg_putchar_attr __ARGS((int c, int attr)); -extern void msg_outnum __ARGS((long n)); -extern void msg_home_replace __ARGS((char_u *fname)); -extern void msg_home_replace_hl __ARGS((char_u *fname)); -extern int msg_outtrans __ARGS((char_u *str)); -extern int msg_outtrans_attr __ARGS((char_u *str, int attr)); -extern int msg_outtrans_len __ARGS((char_u *str, int len)); -extern char_u *msg_outtrans_one __ARGS((char_u *p, int attr)); -extern int msg_outtrans_len_attr __ARGS((char_u *msgstr, int len, int attr)); -extern void msg_make __ARGS((char_u *arg)); -extern int msg_outtrans_special __ARGS((char_u *strstart, int from)); -extern char_u *str2special __ARGS((char_u **sp, int from)); -extern void str2specialbuf __ARGS((char_u *sp, char_u *buf, int len)); -extern void msg_prt_line __ARGS((char_u *s, int list)); -extern void msg_puts __ARGS((char_u *s)); -extern void msg_puts_title __ARGS((char_u *s)); -extern void msg_puts_long_attr __ARGS((char_u *longstr, int attr)); -extern void msg_puts_long_len_attr __ARGS((char_u *longstr, int len, int attr)); -extern void msg_puts_attr __ARGS((char_u *s, int attr)); -extern void may_clear_sb_text __ARGS((void)); -extern void clear_sb_text __ARGS((void)); -extern void show_sb_text __ARGS((void)); -extern int msg_use_printf __ARGS((void)); -extern void mch_errmsg __ARGS((char *str)); -extern void mch_msg __ARGS((char *str)); -extern void msg_moremsg __ARGS((int full)); -extern void repeat_message __ARGS((void)); -extern void msg_clr_eos __ARGS((void)); -extern void msg_clr_eos_force __ARGS((void)); -extern void msg_clr_cmdline __ARGS((void)); -extern int msg_end __ARGS((void)); -extern void msg_check __ARGS((void)); -extern void verbose_enter __ARGS((void)); -extern void verbose_leave __ARGS((void)); -extern void verbose_enter_scroll __ARGS((void)); -extern void verbose_leave_scroll __ARGS((void)); -extern void verbose_stop __ARGS((void)); -extern int verbose_open __ARGS((void)); -extern void give_warning __ARGS((char_u *message, int hl)); -extern void msg_advance __ARGS((int col)); -extern int do_dialog __ARGS((int type, char_u *title, char_u *message, char_u *buttons, int dfltbutton, char_u *textfield)); -extern void display_confirm_msg __ARGS((void)); -extern int vim_dialog_yesno __ARGS((int type, char_u *title, char_u *message, int dflt)); -extern int vim_dialog_yesnocancel __ARGS((int type, char_u *title, char_u *message, int dflt)); -extern int vim_dialog_yesnoallcancel __ARGS((int type, char_u *title, char_u *message, int dflt)); -extern char_u *do_browse __ARGS((int flags, char_u *title, char_u *dflt, char_u *ext, char_u *initdir, char_u *filter, buf_T *buf)); +int msg __ARGS((char_u *s)); +int verb_msg __ARGS((char_u *s)); +int msg_attr __ARGS((char_u *s, int attr)); +int msg_attr_keep __ARGS((char_u *s, int attr, int keep)); +char_u *msg_strtrunc __ARGS((char_u *s, int force)); +void trunc_string __ARGS((char_u *s, char_u *buf, int room)); +void reset_last_sourcing __ARGS((void)); +void msg_source __ARGS((int attr)); +int emsg_not_now __ARGS((void)); +int emsg __ARGS((char_u *s)); +int emsg2 __ARGS((char_u *s, char_u *a1)); +void emsg_invreg __ARGS((int name)); +char_u *msg_trunc_attr __ARGS((char_u *s, int force, int attr)); +char_u *msg_may_trunc __ARGS((int force, char_u *s)); +int delete_first_msg __ARGS((void)); +void ex_messages __ARGS((exarg_T *eap)); +void msg_end_prompt __ARGS((void)); +void wait_return __ARGS((int redraw)); +void set_keep_msg __ARGS((char_u *s, int attr)); +void set_keep_msg_from_hist __ARGS((void)); +void msg_start __ARGS((void)); +void msg_starthere __ARGS((void)); +void msg_putchar __ARGS((int c)); +void msg_putchar_attr __ARGS((int c, int attr)); +void msg_outnum __ARGS((long n)); +void msg_home_replace __ARGS((char_u *fname)); +void msg_home_replace_hl __ARGS((char_u *fname)); +int msg_outtrans __ARGS((char_u *str)); +int msg_outtrans_attr __ARGS((char_u *str, int attr)); +int msg_outtrans_len __ARGS((char_u *str, int len)); +char_u *msg_outtrans_one __ARGS((char_u *p, int attr)); +int msg_outtrans_len_attr __ARGS((char_u *msgstr, int len, int attr)); +void msg_make __ARGS((char_u *arg)); +int msg_outtrans_special __ARGS((char_u *strstart, int from)); +char_u *str2special __ARGS((char_u **sp, int from)); +void str2specialbuf __ARGS((char_u *sp, char_u *buf, int len)); +void msg_prt_line __ARGS((char_u *s, int list)); +void msg_puts __ARGS((char_u *s)); +void msg_puts_title __ARGS((char_u *s)); +void msg_puts_long_attr __ARGS((char_u *longstr, int attr)); +void msg_puts_long_len_attr __ARGS((char_u *longstr, int len, int attr)); +void msg_puts_attr __ARGS((char_u *s, int attr)); +void may_clear_sb_text __ARGS((void)); +void clear_sb_text __ARGS((void)); +void show_sb_text __ARGS((void)); +int msg_use_printf __ARGS((void)); +void mch_errmsg __ARGS((char *str)); +void mch_msg __ARGS((char *str)); +void msg_moremsg __ARGS((int full)); +void repeat_message __ARGS((void)); +void msg_clr_eos __ARGS((void)); +void msg_clr_eos_force __ARGS((void)); +void msg_clr_cmdline __ARGS((void)); +int msg_end __ARGS((void)); +void msg_check __ARGS((void)); +void verbose_enter __ARGS((void)); +void verbose_leave __ARGS((void)); +void verbose_enter_scroll __ARGS((void)); +void verbose_leave_scroll __ARGS((void)); +void verbose_stop __ARGS((void)); +int verbose_open __ARGS((void)); +void give_warning __ARGS((char_u *message, int hl)); +void msg_advance __ARGS((int col)); +int do_dialog __ARGS((int type, char_u *title, char_u *message, char_u *buttons, int dfltbutton, char_u *textfield)); +void display_confirm_msg __ARGS((void)); +int vim_dialog_yesno __ARGS((int type, char_u *title, char_u *message, int dflt)); +int vim_dialog_yesnocancel __ARGS((int type, char_u *title, char_u *message, int dflt)); +int vim_dialog_yesnoallcancel __ARGS((int type, char_u *title, char_u *message, int dflt)); +char_u *do_browse __ARGS((int flags, char_u *title, char_u *dflt, char_u *ext, char_u *initdir, char_u *filter, buf_T *buf)); /* vim: set ft=c : */ diff --git a/src/proto/netbeans.pro b/src/proto/netbeans.pro index 71a5ec459..75d01494a 100644 --- a/src/proto/netbeans.pro +++ b/src/proto/netbeans.pro @@ -1,25 +1,25 @@ /* netbeans.c */ -extern void messageFromNetbeansW32 __ARGS((void)); -extern int isNetbeansBuffer __ARGS((buf_T *bufp)); -extern int isNetbeansModified __ARGS((buf_T *bufp)); -extern void netbeans_end __ARGS((void)); -extern void ex_nbkey __ARGS((exarg_T *eap)); -extern void netbeans_beval_cb __ARGS((BalloonEval *beval, int state)); -extern void netbeans_startup_done __ARGS((void)); -extern void netbeans_send_disconnect __ARGS((void)); -extern void netbeans_frame_moved __ARGS((int new_x, int new_y)); -extern void netbeans_file_activated __ARGS((buf_T *bufp)); -extern void netbeans_file_opened __ARGS((buf_T *bufp)); -extern void netbeans_file_closed __ARGS((buf_T *bufp)); -extern void netbeans_inserted __ARGS((buf_T *bufp, linenr_T linenr, colnr_T col, char_u *txt, int newlen)); -extern void netbeans_removed __ARGS((buf_T *bufp, linenr_T linenr, colnr_T col, long len)); -extern void netbeans_unmodified __ARGS((buf_T *bufp)); -extern void netbeans_button_release __ARGS((int button)); -extern void netbeans_keycommand __ARGS((int key)); -extern void netbeans_save_buffer __ARGS((buf_T *bufp)); -extern void netbeans_deleted_all_lines __ARGS((buf_T *bufp)); -extern int netbeans_is_guarded __ARGS((linenr_T top, linenr_T bot)); -extern void netbeans_draw_multisign_indicator __ARGS((int row)); -extern void netbeans_draw_multisign_indicator __ARGS((int row)); -extern void netbeans_gutter_click __ARGS((linenr_T lnum)); +void messageFromNetbeansW32 __ARGS((void)); +int isNetbeansBuffer __ARGS((buf_T *bufp)); +int isNetbeansModified __ARGS((buf_T *bufp)); +void netbeans_end __ARGS((void)); +void ex_nbkey __ARGS((exarg_T *eap)); +void netbeans_beval_cb __ARGS((BalloonEval *beval, int state)); +void netbeans_startup_done __ARGS((void)); +void netbeans_send_disconnect __ARGS((void)); +void netbeans_frame_moved __ARGS((int new_x, int new_y)); +void netbeans_file_activated __ARGS((buf_T *bufp)); +void netbeans_file_opened __ARGS((buf_T *bufp)); +void netbeans_file_closed __ARGS((buf_T *bufp)); +void netbeans_inserted __ARGS((buf_T *bufp, linenr_T linenr, colnr_T col, char_u *txt, int newlen)); +void netbeans_removed __ARGS((buf_T *bufp, linenr_T linenr, colnr_T col, long len)); +void netbeans_unmodified __ARGS((buf_T *bufp)); +void netbeans_button_release __ARGS((int button)); +void netbeans_keycommand __ARGS((int key)); +void netbeans_save_buffer __ARGS((buf_T *bufp)); +void netbeans_deleted_all_lines __ARGS((buf_T *bufp)); +int netbeans_is_guarded __ARGS((linenr_T top, linenr_T bot)); +void netbeans_draw_multisign_indicator __ARGS((int row)); +void netbeans_draw_multisign_indicator __ARGS((int row)); +void netbeans_gutter_click __ARGS((linenr_T lnum)); /* vim: set ft=c : */ diff --git a/src/proto/normal.pro b/src/proto/normal.pro index 8280e45d9..55e81635e 100644 --- a/src/proto/normal.pro +++ b/src/proto/normal.pro @@ -1,26 +1,26 @@ /* normal.c */ -extern void init_normal_cmds __ARGS((void)); -extern void normal_cmd __ARGS((oparg_T *oap, int toplevel)); -extern void do_pending_operator __ARGS((cmdarg_T *cap, int old_col, int gui_yank)); -extern int do_mouse __ARGS((oparg_T *oap, int c, int dir, long count, int fixindent)); -extern void check_visual_highlight __ARGS((void)); -extern void end_visual_mode __ARGS((void)); -extern void reset_VIsual_and_resel __ARGS((void)); -extern void reset_VIsual __ARGS((void)); -extern int find_ident_under_cursor __ARGS((char_u **string, int find_type)); -extern int find_ident_at_pos __ARGS((win_T *wp, linenr_T lnum, colnr_T startcol, char_u **string, int find_type)); -extern void clear_showcmd __ARGS((void)); -extern int add_to_showcmd __ARGS((int c)); -extern void add_to_showcmd_c __ARGS((int c)); -extern void push_showcmd __ARGS((void)); -extern void pop_showcmd __ARGS((void)); -extern void do_check_scrollbind __ARGS((int check)); -extern void check_scrollbind __ARGS((linenr_T topline_diff, long leftcol_diff)); -extern int find_decl __ARGS((char_u *ptr, int len, int locally, int thisblock, int searchflags)); -extern void scroll_redraw __ARGS((int up, long count)); -extern void handle_tabmenu __ARGS((void)); -extern void do_nv_ident __ARGS((int c1, int c2)); -extern int get_visual_text __ARGS((cmdarg_T *cap, char_u **pp, int *lenp)); -extern void start_selection __ARGS((void)); -extern void may_start_select __ARGS((int c)); +void init_normal_cmds __ARGS((void)); +void normal_cmd __ARGS((oparg_T *oap, int toplevel)); +void do_pending_operator __ARGS((cmdarg_T *cap, int old_col, int gui_yank)); +int do_mouse __ARGS((oparg_T *oap, int c, int dir, long count, int fixindent)); +void check_visual_highlight __ARGS((void)); +void end_visual_mode __ARGS((void)); +void reset_VIsual_and_resel __ARGS((void)); +void reset_VIsual __ARGS((void)); +int find_ident_under_cursor __ARGS((char_u **string, int find_type)); +int find_ident_at_pos __ARGS((win_T *wp, linenr_T lnum, colnr_T startcol, char_u **string, int find_type)); +void clear_showcmd __ARGS((void)); +int add_to_showcmd __ARGS((int c)); +void add_to_showcmd_c __ARGS((int c)); +void push_showcmd __ARGS((void)); +void pop_showcmd __ARGS((void)); +void do_check_scrollbind __ARGS((int check)); +void check_scrollbind __ARGS((linenr_T topline_diff, long leftcol_diff)); +int find_decl __ARGS((char_u *ptr, int len, int locally, int thisblock, int searchflags)); +void scroll_redraw __ARGS((int up, long count)); +void handle_tabmenu __ARGS((void)); +void do_nv_ident __ARGS((int c1, int c2)); +int get_visual_text __ARGS((cmdarg_T *cap, char_u **pp, int *lenp)); +void start_selection __ARGS((void)); +void may_start_select __ARGS((int c)); /* vim: set ft=c : */ diff --git a/src/proto/option.pro b/src/proto/option.pro index cf31dca7d..bb50ef14a 100644 --- a/src/proto/option.pro +++ b/src/proto/option.pro @@ -1,56 +1,56 @@ /* option.c */ -extern void set_init_1 __ARGS((void)); -extern void set_string_default __ARGS((char *name, char_u *val)); -extern void set_number_default __ARGS((char *name, long val)); -extern void free_all_options __ARGS((void)); -extern void set_init_2 __ARGS((void)); -extern void set_init_3 __ARGS((void)); -extern void set_helplang_default __ARGS((char_u *lang)); -extern void init_gui_options __ARGS((void)); -extern void set_title_defaults __ARGS((void)); -extern int do_set __ARGS((char_u *arg, int opt_flags)); -extern void set_options_bin __ARGS((int oldval, int newval, int opt_flags)); -extern int get_viminfo_parameter __ARGS((int type)); -extern char_u *find_viminfo_parameter __ARGS((int type)); -extern void check_options __ARGS((void)); -extern void check_buf_options __ARGS((buf_T *buf)); -extern void free_string_option __ARGS((char_u *p)); -extern void clear_string_option __ARGS((char_u **pp)); -extern void set_term_option_alloced __ARGS((char_u **p)); -extern int was_set_insecurely __ARGS((char_u *opt, int opt_flags)); -extern void set_string_option_direct __ARGS((char_u *name, int opt_idx, char_u *val, int opt_flags, int set_sid)); -extern char_u *check_stl_option __ARGS((char_u *s)); -extern int get_option_value __ARGS((char_u *name, long *numval, char_u **stringval, int opt_flags)); -extern void set_option_value __ARGS((char_u *name, long number, char_u *string, int opt_flags)); -extern char_u *get_term_code __ARGS((char_u *tname)); -extern char_u *get_highlight_default __ARGS((void)); -extern char_u *get_encoding_default __ARGS((void)); -extern int makeset __ARGS((FILE *fd, int opt_flags, int local_only)); -extern int makefoldset __ARGS((FILE *fd)); -extern void clear_termoptions __ARGS((void)); -extern void free_termoptions __ARGS((void)); -extern void set_term_defaults __ARGS((void)); -extern void comp_col __ARGS((void)); -extern char_u *get_equalprg __ARGS((void)); -extern void win_copy_options __ARGS((win_T *wp_from, win_T *wp_to)); -extern void copy_winopt __ARGS((winopt_T *from, winopt_T *to)); -extern void check_win_options __ARGS((win_T *win)); -extern void check_winopt __ARGS((winopt_T *wop)); -extern void clear_winopt __ARGS((winopt_T *wop)); -extern void buf_copy_options __ARGS((buf_T *buf, int flags)); -extern void reset_modifiable __ARGS((void)); -extern void set_iminsert_global __ARGS((void)); -extern void set_imsearch_global __ARGS((void)); -extern void set_context_in_set_cmd __ARGS((expand_T *xp, char_u *arg, int opt_flags)); -extern int ExpandSettings __ARGS((expand_T *xp, regmatch_T *regmatch, int *num_file, char_u ***file)); -extern int ExpandOldSetting __ARGS((int *num_file, char_u ***file)); -extern int has_format_option __ARGS((int x)); -extern int shortmess __ARGS((int x)); -extern void vimrc_found __ARGS((char_u *fname, char_u *envname)); -extern void change_compatible __ARGS((int on)); -extern int option_was_set __ARGS((char_u *name)); -extern int can_bs __ARGS((int what)); -extern void save_file_ff __ARGS((buf_T *buf)); -extern int file_ff_differs __ARGS((buf_T *buf)); -extern int check_ff_value __ARGS((char_u *p)); +void set_init_1 __ARGS((void)); +void set_string_default __ARGS((char *name, char_u *val)); +void set_number_default __ARGS((char *name, long val)); +void free_all_options __ARGS((void)); +void set_init_2 __ARGS((void)); +void set_init_3 __ARGS((void)); +void set_helplang_default __ARGS((char_u *lang)); +void init_gui_options __ARGS((void)); +void set_title_defaults __ARGS((void)); +int do_set __ARGS((char_u *arg, int opt_flags)); +void set_options_bin __ARGS((int oldval, int newval, int opt_flags)); +int get_viminfo_parameter __ARGS((int type)); +char_u *find_viminfo_parameter __ARGS((int type)); +void check_options __ARGS((void)); +void check_buf_options __ARGS((buf_T *buf)); +void free_string_option __ARGS((char_u *p)); +void clear_string_option __ARGS((char_u **pp)); +void set_term_option_alloced __ARGS((char_u **p)); +int was_set_insecurely __ARGS((char_u *opt, int opt_flags)); +void set_string_option_direct __ARGS((char_u *name, int opt_idx, char_u *val, int opt_flags, int set_sid)); +char_u *check_stl_option __ARGS((char_u *s)); +int get_option_value __ARGS((char_u *name, long *numval, char_u **stringval, int opt_flags)); +void set_option_value __ARGS((char_u *name, long number, char_u *string, int opt_flags)); +char_u *get_term_code __ARGS((char_u *tname)); +char_u *get_highlight_default __ARGS((void)); +char_u *get_encoding_default __ARGS((void)); +int makeset __ARGS((FILE *fd, int opt_flags, int local_only)); +int makefoldset __ARGS((FILE *fd)); +void clear_termoptions __ARGS((void)); +void free_termoptions __ARGS((void)); +void set_term_defaults __ARGS((void)); +void comp_col __ARGS((void)); +char_u *get_equalprg __ARGS((void)); +void win_copy_options __ARGS((win_T *wp_from, win_T *wp_to)); +void copy_winopt __ARGS((winopt_T *from, winopt_T *to)); +void check_win_options __ARGS((win_T *win)); +void check_winopt __ARGS((winopt_T *wop)); +void clear_winopt __ARGS((winopt_T *wop)); +void buf_copy_options __ARGS((buf_T *buf, int flags)); +void reset_modifiable __ARGS((void)); +void set_iminsert_global __ARGS((void)); +void set_imsearch_global __ARGS((void)); +void set_context_in_set_cmd __ARGS((expand_T *xp, char_u *arg, int opt_flags)); +int ExpandSettings __ARGS((expand_T *xp, regmatch_T *regmatch, int *num_file, char_u ***file)); +int ExpandOldSetting __ARGS((int *num_file, char_u ***file)); +int has_format_option __ARGS((int x)); +int shortmess __ARGS((int x)); +void vimrc_found __ARGS((char_u *fname, char_u *envname)); +void change_compatible __ARGS((int on)); +int option_was_set __ARGS((char_u *name)); +int can_bs __ARGS((int what)); +void save_file_ff __ARGS((buf_T *buf)); +int file_ff_differs __ARGS((buf_T *buf)); +int check_ff_value __ARGS((char_u *p)); /* vim: set ft=c : */ diff --git a/src/proto/os_riscos.pro b/src/proto/os_riscos.pro index ec8055b43..9ea4cd55f 100644 --- a/src/proto/os_riscos.pro +++ b/src/proto/os_riscos.pro @@ -1,49 +1,49 @@ /* os_riscos.c */ -extern void mch_write __ARGS((char_u *s, int len)); -extern int mch_inchar __ARGS((char_u *buf, int maxlen, long wtime, int tb_change_cnt)); -extern int mch_char_avail __ARGS((void)); -extern long_u mch_avail_mem __ARGS((int special)); -extern void mch_delay __ARGS((long msec, int ignoreinput)); -extern void mch_suspend __ARGS((void)); -extern void mch_init __ARGS((void)); -extern int mch_check_win __ARGS((int argc, char **argv)); -extern int mch_input_isatty __ARGS((void)); -extern int mch_can_restore_title __ARGS((void)); -extern int mch_can_restore_icon __ARGS((void)); -extern void mch_settitle __ARGS((char_u *title, char_u *icon)); -extern void mch_restore_title __ARGS((int which)); -extern int mch_get_user_name __ARGS((char_u *s, int len)); -extern void mch_get_host_name __ARGS((char_u *s, int len)); -extern long mch_get_pid __ARGS((void)); -extern int mch_dirname __ARGS((char_u *buf, int len)); -extern int mch_FullName __ARGS((char_u *fname, char_u *buf, int len, int force)); -extern int mch_isFullName __ARGS((char_u *fname)); -extern long mch_getperm __ARGS((char_u *name)); -extern int mch_setperm __ARGS((char_u *name, long perm)); -extern void mch_hide __ARGS((char_u *name)); -extern int mch_isdir __ARGS((char_u *name)); -extern int mch_can_exe __ARGS((char_u *name)); -extern int mch_nodetype __ARGS((char_u *name)); -extern void mch_early_init __ARGS((void)); -extern void mch_exit __ARGS((int r)); -extern void mch_settmode __ARGS((int tmode)); -extern void mch_setmouse __ARGS((int on)); -extern int mch_screenmode __ARGS((char_u *arg)); -extern int mch_get_shellsize __ARGS((void)); -extern void mch_set_shellsize __ARGS((void)); -extern void mch_new_shellsize __ARGS((void)); -extern int mch_call_shell __ARGS((char_u *cmd, int options)); -extern void mch_breakcheck __ARGS((void)); -extern int mch_expandpath __ARGS((garray_T *gap, char_u *path, int flags)); -extern int expand_section __ARGS((garray_T *gap, char_u *root, char_u *rest, int flags)); -extern int mch_expand_wildcards __ARGS((int num_pat, char_u **pat, int *num_file, char_u ***file, int flags)); -extern int mch_has_exp_wildcard __ARGS((char_u *p)); -extern int mch_has_wildcard __ARGS((char_u *p)); -extern int mch_remove __ARGS((char_u *file)); -extern char_u *mch_munge_fname __ARGS((char_u *fname)); -extern int ro_buflist_add __ARGS((char_u *old_name)); -extern int mch_chdir __ARGS((char_u *dir)); -extern void mch_read_filetype __ARGS((char_u *file)); -extern void mch_set_filetype __ARGS((char_u *file, char_u *type)); -extern int mch_check_filetype __ARGS((char_u *fname, char_u *type)); +void mch_write __ARGS((char_u *s, int len)); +int mch_inchar __ARGS((char_u *buf, int maxlen, long wtime, int tb_change_cnt)); +int mch_char_avail __ARGS((void)); +long_u mch_avail_mem __ARGS((int special)); +void mch_delay __ARGS((long msec, int ignoreinput)); +void mch_suspend __ARGS((void)); +void mch_init __ARGS((void)); +int mch_check_win __ARGS((int argc, char **argv)); +int mch_input_isatty __ARGS((void)); +int mch_can_restore_title __ARGS((void)); +int mch_can_restore_icon __ARGS((void)); +void mch_settitle __ARGS((char_u *title, char_u *icon)); +void mch_restore_title __ARGS((int which)); +int mch_get_user_name __ARGS((char_u *s, int len)); +void mch_get_host_name __ARGS((char_u *s, int len)); +long mch_get_pid __ARGS((void)); +int mch_dirname __ARGS((char_u *buf, int len)); +int mch_FullName __ARGS((char_u *fname, char_u *buf, int len, int force)); +int mch_isFullName __ARGS((char_u *fname)); +long mch_getperm __ARGS((char_u *name)); +int mch_setperm __ARGS((char_u *name, long perm)); +void mch_hide __ARGS((char_u *name)); +int mch_isdir __ARGS((char_u *name)); +int mch_can_exe __ARGS((char_u *name)); +int mch_nodetype __ARGS((char_u *name)); +void mch_early_init __ARGS((void)); +void mch_exit __ARGS((int r)); +void mch_settmode __ARGS((int tmode)); +void mch_setmouse __ARGS((int on)); +int mch_screenmode __ARGS((char_u *arg)); +int mch_get_shellsize __ARGS((void)); +void mch_set_shellsize __ARGS((void)); +void mch_new_shellsize __ARGS((void)); +int mch_call_shell __ARGS((char_u *cmd, int options)); +void mch_breakcheck __ARGS((void)); +int mch_expandpath __ARGS((garray_T *gap, char_u *path, int flags)); +int expand_section __ARGS((garray_T *gap, char_u *root, char_u *rest, int flags)); +int mch_expand_wildcards __ARGS((int num_pat, char_u **pat, int *num_file, char_u ***file, int flags)); +int mch_has_exp_wildcard __ARGS((char_u *p)); +int mch_has_wildcard __ARGS((char_u *p)); +int mch_remove __ARGS((char_u *file)); +char_u *mch_munge_fname __ARGS((char_u *fname)); +int ro_buflist_add __ARGS((char_u *old_name)); +int mch_chdir __ARGS((char_u *dir)); +void mch_read_filetype __ARGS((char_u *file)); +void mch_set_filetype __ARGS((char_u *file, char_u *type)); +int mch_check_filetype __ARGS((char_u *fname, char_u *type)); /* vim: set ft=c : */ diff --git a/src/proto/os_vms.pro b/src/proto/os_vms.pro index 667f7ab3c..2ed6394eb 100644 --- a/src/proto/os_vms.pro +++ b/src/proto/os_vms.pro @@ -1,14 +1,14 @@ /* os_vms.c */ -extern void mch_settmode __ARGS((int tmode)); -extern int mch_get_shellsize __ARGS((void)); -extern void mch_set_shellsize __ARGS((void)); -extern char_u *mch_getenv __ARGS((char_u *lognam)); -extern int mch_setenv __ARGS((char *var, char *value, int x)); -extern int vms_sys __ARGS((char *cmd, char *out, char *inp)); -extern int vms_sys_status __ARGS((int status)); -extern int vms_read __ARGS((char *inbuf, size_t nbytes)); -extern int mch_expand_wildcards __ARGS((int num_pat, char_u **pat, int *num_file, char_u ***file, int flags)); -extern int mch_expandpath __ARGS((garray_T *gap, char_u *path, int flags)); -extern void *vms_fixfilename __ARGS((void *instring)); -extern void vms_remove_version __ARGS((void *fname)); +void mch_settmode __ARGS((int tmode)); +int mch_get_shellsize __ARGS((void)); +void mch_set_shellsize __ARGS((void)); +char_u *mch_getenv __ARGS((char_u *lognam)); +int mch_setenv __ARGS((char *var, char *value, int x)); +int vms_sys __ARGS((char *cmd, char *out, char *inp)); +int vms_sys_status __ARGS((int status)); +int vms_read __ARGS((char *inbuf, size_t nbytes)); +int mch_expand_wildcards __ARGS((int num_pat, char_u **pat, int *num_file, char_u ***file, int flags)); +int mch_expandpath __ARGS((garray_T *gap, char_u *path, int flags)); +void *vms_fixfilename __ARGS((void *instring)); +void vms_remove_version __ARGS((void *fname)); /* vim: set ft=c : */ diff --git a/src/proto/os_win16.pro b/src/proto/os_win16.pro index 4bfd9b32f..31fa72c05 100644 --- a/src/proto/os_win16.pro +++ b/src/proto/os_win16.pro @@ -1,12 +1,12 @@ /* os_win16.c */ -extern void mch_setmouse __ARGS((int on)); -extern void mch_init __ARGS((void)); -extern int mch_check_win __ARGS((int argc, char **argv)); -extern long mch_get_pid __ARGS((void)); -extern int mch_call_shell __ARGS((char_u *cmd, int options)); -extern void mch_delay __ARGS((long msec, int ignoreinput)); -extern void mch_breakcheck __ARGS((void)); -extern long_u mch_avail_mem __ARGS((int special)); -extern int mch_rename __ARGS((const char *pszOldFile, const char *pszNewFile)); -extern char *default_shell __ARGS((void)); +void mch_setmouse __ARGS((int on)); +void mch_init __ARGS((void)); +int mch_check_win __ARGS((int argc, char **argv)); +long mch_get_pid __ARGS((void)); +int mch_call_shell __ARGS((char_u *cmd, int options)); +void mch_delay __ARGS((long msec, int ignoreinput)); +void mch_breakcheck __ARGS((void)); +long_u mch_avail_mem __ARGS((int special)); +int mch_rename __ARGS((const char *pszOldFile, const char *pszNewFile)); +char *default_shell __ARGS((void)); /* vim: set ft=c : */ diff --git a/src/proto/popupmnu.pro b/src/proto/popupmnu.pro index 5427dad83..74a53e2f0 100644 --- a/src/proto/popupmnu.pro +++ b/src/proto/popupmnu.pro @@ -1,8 +1,8 @@ /* popupmnu.c */ -extern void pum_display __ARGS((pumitem_T *array, int size, int selected)); -extern void pum_redraw __ARGS((void)); -extern void pum_undisplay __ARGS((void)); -extern void pum_clear __ARGS((void)); -extern int pum_visible __ARGS((void)); -extern int pum_get_height __ARGS((void)); +void pum_display __ARGS((pumitem_T *array, int size, int selected)); +void pum_redraw __ARGS((void)); +void pum_undisplay __ARGS((void)); +void pum_clear __ARGS((void)); +int pum_visible __ARGS((void)); +int pum_get_height __ARGS((void)); /* vim: set ft=c : */ diff --git a/src/proto/regexp.pro b/src/proto/regexp.pro index 27597b2ef..df2fde40c 100644 --- a/src/proto/regexp.pro +++ b/src/proto/regexp.pro @@ -1,17 +1,17 @@ /* regexp.c */ -extern void free_regexp_stuff __ARGS((void)); -extern int re_multiline __ARGS((regprog_T *prog)); -extern int re_lookbehind __ARGS((regprog_T *prog)); -extern char_u *skip_regexp __ARGS((char_u *startp, int dirc, int magic, char_u **newp)); -extern regprog_T *vim_regcomp __ARGS((char_u *expr, int re_flags)); -extern int vim_regcomp_had_eol __ARGS((void)); -extern int vim_regexec __ARGS((regmatch_T *rmp, char_u *line, colnr_T col)); -extern int vim_regexec_nl __ARGS((regmatch_T *rmp, char_u *line, colnr_T col)); -extern long vim_regexec_multi __ARGS((regmmatch_T *rmp, win_T *win, buf_T *buf, linenr_T lnum, colnr_T col)); -extern reg_extmatch_T *ref_extmatch __ARGS((reg_extmatch_T *em)); -extern void unref_extmatch __ARGS((reg_extmatch_T *em)); -extern char_u *regtilde __ARGS((char_u *source, int magic)); -extern int vim_regsub __ARGS((regmatch_T *rmp, char_u *source, char_u *dest, int copy, int magic, int backslash)); -extern int vim_regsub_multi __ARGS((regmmatch_T *rmp, linenr_T lnum, char_u *source, char_u *dest, int copy, int magic, int backslash)); -extern char_u *reg_submatch __ARGS((int no)); +void free_regexp_stuff __ARGS((void)); +int re_multiline __ARGS((regprog_T *prog)); +int re_lookbehind __ARGS((regprog_T *prog)); +char_u *skip_regexp __ARGS((char_u *startp, int dirc, int magic, char_u **newp)); +regprog_T *vim_regcomp __ARGS((char_u *expr, int re_flags)); +int vim_regcomp_had_eol __ARGS((void)); +int vim_regexec __ARGS((regmatch_T *rmp, char_u *line, colnr_T col)); +int vim_regexec_nl __ARGS((regmatch_T *rmp, char_u *line, colnr_T col)); +long vim_regexec_multi __ARGS((regmmatch_T *rmp, win_T *win, buf_T *buf, linenr_T lnum, colnr_T col)); +reg_extmatch_T *ref_extmatch __ARGS((reg_extmatch_T *em)); +void unref_extmatch __ARGS((reg_extmatch_T *em)); +char_u *regtilde __ARGS((char_u *source, int magic)); +int vim_regsub __ARGS((regmatch_T *rmp, char_u *source, char_u *dest, int copy, int magic, int backslash)); +int vim_regsub_multi __ARGS((regmmatch_T *rmp, linenr_T lnum, char_u *source, char_u *dest, int copy, int magic, int backslash)); +char_u *reg_submatch __ARGS((int no)); /* vim: set ft=c : */ diff --git a/src/proto/spell.pro b/src/proto/spell.pro index d1e5ef72c..fecf4e05a 100644 --- a/src/proto/spell.pro +++ b/src/proto/spell.pro @@ -1,26 +1,26 @@ /* spell.c */ -extern int spell_check __ARGS((win_T *wp, char_u *ptr, hlf_T *attrp, int *capcol, int docount)); -extern int spell_move_to __ARGS((win_T *wp, int dir, int allwords, int curline, hlf_T *attrp)); -extern void spell_cat_line __ARGS((char_u *buf, char_u *line, int maxlen)); -extern char_u *did_set_spelllang __ARGS((buf_T *buf)); -extern void spell_free_all __ARGS((void)); -extern void spell_reload __ARGS((void)); -extern int spell_check_msm __ARGS((void)); -extern void put_bytes __ARGS((FILE *fd, long_u nr, int len)); -extern void ex_mkspell __ARGS((exarg_T *eap)); -extern void ex_spell __ARGS((exarg_T *eap)); -extern void spell_add_word __ARGS((char_u *word, int len, int bad, int index, int undo)); -extern void init_spell_chartab __ARGS((void)); -extern int spell_check_sps __ARGS((void)); -extern void spell_suggest __ARGS((int count)); -extern void ex_spellrepall __ARGS((exarg_T *eap)); -extern void spell_suggest_list __ARGS((garray_T *gap, char_u *word, int maxcount, int need_cap, int interactive)); -extern char_u *eval_soundfold __ARGS((char_u *word)); -extern void ex_spellinfo __ARGS((exarg_T *eap)); -extern void ex_spelldump __ARGS((exarg_T *eap)); -extern void spell_dump_compl __ARGS((buf_T *buf, char_u *pat, int ic, int *dir, int dumpflags_arg)); -extern char_u *spell_to_word_end __ARGS((char_u *start, buf_T *buf)); -extern int spell_word_start __ARGS((int startcol)); -extern void spell_expand_check_cap __ARGS((colnr_T col)); -extern int expand_spelling __ARGS((linenr_T lnum, int col, char_u *pat, char_u ***matchp)); +int spell_check __ARGS((win_T *wp, char_u *ptr, hlf_T *attrp, int *capcol, int docount)); +int spell_move_to __ARGS((win_T *wp, int dir, int allwords, int curline, hlf_T *attrp)); +void spell_cat_line __ARGS((char_u *buf, char_u *line, int maxlen)); +char_u *did_set_spelllang __ARGS((buf_T *buf)); +void spell_free_all __ARGS((void)); +void spell_reload __ARGS((void)); +int spell_check_msm __ARGS((void)); +void put_bytes __ARGS((FILE *fd, long_u nr, int len)); +void ex_mkspell __ARGS((exarg_T *eap)); +void ex_spell __ARGS((exarg_T *eap)); +void spell_add_word __ARGS((char_u *word, int len, int bad, int idx, int undo)); +void init_spell_chartab __ARGS((void)); +int spell_check_sps __ARGS((void)); +void spell_suggest __ARGS((int count)); +void ex_spellrepall __ARGS((exarg_T *eap)); +void spell_suggest_list __ARGS((garray_T *gap, char_u *word, int maxcount, int need_cap, int interactive)); +char_u *eval_soundfold __ARGS((char_u *word)); +void ex_spellinfo __ARGS((exarg_T *eap)); +void ex_spelldump __ARGS((exarg_T *eap)); +void spell_dump_compl __ARGS((buf_T *buf, char_u *pat, int ic, int *dir, int dumpflags_arg)); +char_u *spell_to_word_end __ARGS((char_u *start, buf_T *buf)); +int spell_word_start __ARGS((int startcol)); +void spell_expand_check_cap __ARGS((colnr_T col)); +int expand_spelling __ARGS((linenr_T lnum, int col, char_u *pat, char_u ***matchp)); /* vim: set ft=c : */ diff --git a/src/proto/syntax.pro b/src/proto/syntax.pro index ad442e66f..c33a890d2 100644 --- a/src/proto/syntax.pro +++ b/src/proto/syntax.pro @@ -1,47 +1,47 @@ /* syntax.c */ -extern void syntax_start __ARGS((win_T *wp, linenr_T lnum)); -extern void syn_stack_free_all __ARGS((buf_T *buf)); -extern void syn_stack_apply_changes __ARGS((buf_T *buf)); -extern void syntax_end_parsing __ARGS((linenr_T lnum)); -extern int syntax_check_changed __ARGS((linenr_T lnum)); -extern int get_syntax_attr __ARGS((colnr_T col, int *can_spell)); -extern void syntax_clear __ARGS((buf_T *buf)); -extern void ex_syntax __ARGS((exarg_T *eap)); -extern int syntax_present __ARGS((buf_T *buf)); -extern void set_context_in_syntax_cmd __ARGS((expand_T *xp, char_u *arg)); -extern char_u *get_syntax_name __ARGS((expand_T *xp, int idx)); -extern int syn_get_id __ARGS((win_T *wp, long lnum, colnr_T col, int trans, int *spellp)); -extern int syn_get_foldlevel __ARGS((win_T *wp, long lnum)); -extern void init_highlight __ARGS((int both, int reset)); -extern int load_colors __ARGS((char_u *name)); -extern void do_highlight __ARGS((char_u *line, int forceit, int init)); -extern void free_highlight __ARGS((void)); -extern void restore_cterm_colors __ARGS((void)); -extern void set_normal_colors __ARGS((void)); -extern char_u *hl_get_font_name __ARGS((void)); -extern void hl_set_font_name __ARGS((char_u *font_name)); -extern void hl_set_bg_color_name __ARGS((char_u *name)); -extern void hl_set_fg_color_name __ARGS((char_u *name)); -extern void clear_hl_tables __ARGS((void)); -extern int hl_combine_attr __ARGS((int char_attr, int prim_attr)); -extern attrentry_T *syn_gui_attr2entry __ARGS((int attr)); -extern int syn_attr2attr __ARGS((int attr)); -extern attrentry_T *syn_term_attr2entry __ARGS((int attr)); -extern attrentry_T *syn_cterm_attr2entry __ARGS((int attr)); -extern char_u *highlight_has_attr __ARGS((int id, int flag, int modec)); -extern char_u *highlight_color __ARGS((int id, char_u *what, int modec)); -extern long_u highlight_gui_color_rgb __ARGS((int id, int fg)); -extern int syn_name2id __ARGS((char_u *name)); -extern int highlight_exists __ARGS((char_u *name)); -extern char_u *syn_id2name __ARGS((int id)); -extern int syn_namen2id __ARGS((char_u *linep, int len)); -extern int syn_check_group __ARGS((char_u *pp, int len)); -extern int syn_id2attr __ARGS((int hl_id)); -extern int syn_id2colors __ARGS((int hl_id, guicolor_T *fgp, guicolor_T *bgp)); -extern int syn_get_final_id __ARGS((int hl_id)); -extern void highlight_gui_started __ARGS((void)); -extern int highlight_changed __ARGS((void)); -extern void set_context_in_highlight_cmd __ARGS((expand_T *xp, char_u *arg)); -extern char_u *get_highlight_name __ARGS((expand_T *xp, int idx)); -extern void free_highlight_fonts __ARGS((void)); +void syntax_start __ARGS((win_T *wp, linenr_T lnum)); +void syn_stack_free_all __ARGS((buf_T *buf)); +void syn_stack_apply_changes __ARGS((buf_T *buf)); +void syntax_end_parsing __ARGS((linenr_T lnum)); +int syntax_check_changed __ARGS((linenr_T lnum)); +int get_syntax_attr __ARGS((colnr_T col, int *can_spell)); +void syntax_clear __ARGS((buf_T *buf)); +void ex_syntax __ARGS((exarg_T *eap)); +int syntax_present __ARGS((buf_T *buf)); +void set_context_in_syntax_cmd __ARGS((expand_T *xp, char_u *arg)); +char_u *get_syntax_name __ARGS((expand_T *xp, int idx)); +int syn_get_id __ARGS((win_T *wp, long lnum, colnr_T col, int trans, int *spellp)); +int syn_get_foldlevel __ARGS((win_T *wp, long lnum)); +void init_highlight __ARGS((int both, int reset)); +int load_colors __ARGS((char_u *name)); +void do_highlight __ARGS((char_u *line, int forceit, int init)); +void free_highlight __ARGS((void)); +void restore_cterm_colors __ARGS((void)); +void set_normal_colors __ARGS((void)); +char_u *hl_get_font_name __ARGS((void)); +void hl_set_font_name __ARGS((char_u *font_name)); +void hl_set_bg_color_name __ARGS((char_u *name)); +void hl_set_fg_color_name __ARGS((char_u *name)); +void clear_hl_tables __ARGS((void)); +int hl_combine_attr __ARGS((int char_attr, int prim_attr)); +attrentry_T *syn_gui_attr2entry __ARGS((int attr)); +int syn_attr2attr __ARGS((int attr)); +attrentry_T *syn_term_attr2entry __ARGS((int attr)); +attrentry_T *syn_cterm_attr2entry __ARGS((int attr)); +char_u *highlight_has_attr __ARGS((int id, int flag, int modec)); +char_u *highlight_color __ARGS((int id, char_u *what, int modec)); +long_u highlight_gui_color_rgb __ARGS((int id, int fg)); +int syn_name2id __ARGS((char_u *name)); +int highlight_exists __ARGS((char_u *name)); +char_u *syn_id2name __ARGS((int id)); +int syn_namen2id __ARGS((char_u *linep, int len)); +int syn_check_group __ARGS((char_u *pp, int len)); +int syn_id2attr __ARGS((int hl_id)); +int syn_id2colors __ARGS((int hl_id, guicolor_T *fgp, guicolor_T *bgp)); +int syn_get_final_id __ARGS((int hl_id)); +void highlight_gui_started __ARGS((void)); +int highlight_changed __ARGS((void)); +void set_context_in_highlight_cmd __ARGS((expand_T *xp, char_u *arg)); +char_u *get_highlight_name __ARGS((expand_T *xp, int idx)); +void free_highlight_fonts __ARGS((void)); /* vim: set ft=c : */ diff --git a/src/proto/version.pro b/src/proto/version.pro index 00ca91663..3f371f9b8 100644 --- a/src/proto/version.pro +++ b/src/proto/version.pro @@ -1,9 +1,9 @@ /* version.c */ -extern void make_version __ARGS((void)); -extern int highest_patch __ARGS((void)); -extern int has_patch __ARGS((int n)); -extern void ex_version __ARGS((exarg_T *eap)); -extern void list_version __ARGS((void)); -extern void intro_message __ARGS((int colon)); -extern void ex_intro __ARGS((exarg_T *eap)); +void make_version __ARGS((void)); +int highest_patch __ARGS((void)); +int has_patch __ARGS((int n)); +void ex_version __ARGS((exarg_T *eap)); +void list_version __ARGS((void)); +void intro_message __ARGS((int colon)); +void ex_intro __ARGS((exarg_T *eap)); /* vim: set ft=c : */ diff --git a/src/proto/window.pro b/src/proto/window.pro index ad40a527c..45a90b82a 100644 --- a/src/proto/window.pro +++ b/src/proto/window.pro @@ -1,62 +1,62 @@ /* window.c */ -extern void do_window __ARGS((int nchar, long Prenum, int xchar)); -extern int win_split __ARGS((int size, int flags)); -extern int win_valid __ARGS((win_T *win)); -extern int win_count __ARGS((void)); -extern int make_windows __ARGS((int count, int vertical)); -extern void win_move_after __ARGS((win_T *win1, win_T *win2)); -extern void win_equal __ARGS((win_T *next_curwin, int current, int dir)); -extern void close_windows __ARGS((buf_T *buf, int keep_curwin)); -extern void win_close __ARGS((win_T *win, int free_buf)); -extern void win_close_othertab __ARGS((win_T *win, int free_buf, tabpage_T *tp)); -extern void win_free_all __ARGS((void)); -extern void close_others __ARGS((int message, int forceit)); -extern void curwin_init __ARGS((void)); -extern int win_alloc_first __ARGS((void)); -extern void win_init_size __ARGS((void)); -extern void free_tabpage __ARGS((tabpage_T *tp)); -extern int win_new_tabpage __ARGS((int after)); -extern int may_open_tabpage __ARGS((void)); -extern int make_tabpages __ARGS((int maxcount)); -extern int valid_tabpage __ARGS((tabpage_T *tpc)); -extern tabpage_T *find_tabpage __ARGS((int n)); -extern int tabpage_index __ARGS((tabpage_T *ftp)); -extern void goto_tabpage __ARGS((int n)); -extern void goto_tabpage_tp __ARGS((tabpage_T *tp)); -extern void goto_tabpage_win __ARGS((tabpage_T *tp, win_T *wp)); -extern void tabpage_move __ARGS((int nr)); -extern void win_goto __ARGS((win_T *wp)); -extern win_T *win_find_nr __ARGS((int winnr)); -extern void win_enter __ARGS((win_T *wp, int undo_sync)); -extern win_T *buf_jump_open_win __ARGS((buf_T *buf)); -extern win_T *buf_jump_open_tab __ARGS((buf_T *buf)); -extern int win_alloc_lines __ARGS((win_T *wp)); -extern void win_free_lsize __ARGS((win_T *wp)); -extern void shell_new_rows __ARGS((void)); -extern void shell_new_columns __ARGS((void)); -extern void win_size_save __ARGS((garray_T *gap)); -extern void win_size_restore __ARGS((garray_T *gap)); -extern int win_comp_pos __ARGS((void)); -extern void win_setheight __ARGS((int height)); -extern void win_setheight_win __ARGS((int height, win_T *win)); -extern void win_setwidth __ARGS((int width)); -extern void win_setwidth_win __ARGS((int width, win_T *wp)); -extern void win_setminheight __ARGS((void)); -extern void win_drag_status_line __ARGS((win_T *dragwin, int offset)); -extern void win_drag_vsep_line __ARGS((win_T *dragwin, int offset)); -extern void win_comp_scroll __ARGS((win_T *wp)); -extern void command_height __ARGS((void)); -extern void last_status __ARGS((int morewin)); -extern int tabline_height __ARGS((void)); -extern char_u *grab_file_name __ARGS((long count, linenr_T *file_lnum)); -extern char_u *file_name_at_cursor __ARGS((int options, long count, linenr_T *file_lnum)); -extern char_u *file_name_in_line __ARGS((char_u *line, int col, int options, long count, char_u *rel_fname, linenr_T *file_lnum)); -extern char_u *find_file_name_in_path __ARGS((char_u *ptr, int len, int options, long count, char_u *rel_fname)); -extern int path_with_url __ARGS((char_u *fname)); -extern int vim_isAbsName __ARGS((char_u *name)); -extern int vim_FullName __ARGS((char_u *fname, char_u *buf, int len, int force)); -extern int min_rows __ARGS((void)); -extern int only_one_window __ARGS((void)); -extern void check_lnums __ARGS((int do_curwin)); -extern int win_hasvertsplit __ARGS((void)); +void do_window __ARGS((int nchar, long Prenum, int xchar)); +int win_split __ARGS((int size, int flags)); +int win_valid __ARGS((win_T *win)); +int win_count __ARGS((void)); +int make_windows __ARGS((int count, int vertical)); +void win_move_after __ARGS((win_T *win1, win_T *win2)); +void win_equal __ARGS((win_T *next_curwin, int current, int dir)); +void close_windows __ARGS((buf_T *buf, int keep_curwin)); +void win_close __ARGS((win_T *win, int free_buf)); +void win_close_othertab __ARGS((win_T *win, int free_buf, tabpage_T *tp)); +void win_free_all __ARGS((void)); +void close_others __ARGS((int message, int forceit)); +void curwin_init __ARGS((void)); +int win_alloc_first __ARGS((void)); +void win_init_size __ARGS((void)); +void free_tabpage __ARGS((tabpage_T *tp)); +int win_new_tabpage __ARGS((int after)); +int may_open_tabpage __ARGS((void)); +int make_tabpages __ARGS((int maxcount)); +int valid_tabpage __ARGS((tabpage_T *tpc)); +tabpage_T *find_tabpage __ARGS((int n)); +int tabpage_index __ARGS((tabpage_T *ftp)); +void goto_tabpage __ARGS((int n)); +void goto_tabpage_tp __ARGS((tabpage_T *tp)); +void goto_tabpage_win __ARGS((tabpage_T *tp, win_T *wp)); +void tabpage_move __ARGS((int nr)); +void win_goto __ARGS((win_T *wp)); +win_T *win_find_nr __ARGS((int winnr)); +void win_enter __ARGS((win_T *wp, int undo_sync)); +win_T *buf_jump_open_win __ARGS((buf_T *buf)); +win_T *buf_jump_open_tab __ARGS((buf_T *buf)); +int win_alloc_lines __ARGS((win_T *wp)); +void win_free_lsize __ARGS((win_T *wp)); +void shell_new_rows __ARGS((void)); +void shell_new_columns __ARGS((void)); +void win_size_save __ARGS((garray_T *gap)); +void win_size_restore __ARGS((garray_T *gap)); +int win_comp_pos __ARGS((void)); +void win_setheight __ARGS((int height)); +void win_setheight_win __ARGS((int height, win_T *win)); +void win_setwidth __ARGS((int width)); +void win_setwidth_win __ARGS((int width, win_T *wp)); +void win_setminheight __ARGS((void)); +void win_drag_status_line __ARGS((win_T *dragwin, int offset)); +void win_drag_vsep_line __ARGS((win_T *dragwin, int offset)); +void win_comp_scroll __ARGS((win_T *wp)); +void command_height __ARGS((void)); +void last_status __ARGS((int morewin)); +int tabline_height __ARGS((void)); +char_u *grab_file_name __ARGS((long count, linenr_T *file_lnum)); +char_u *file_name_at_cursor __ARGS((int options, long count, linenr_T *file_lnum)); +char_u *file_name_in_line __ARGS((char_u *line, int col, int options, long count, char_u *rel_fname, linenr_T *file_lnum)); +char_u *find_file_name_in_path __ARGS((char_u *ptr, int len, int options, long count, char_u *rel_fname)); +int path_with_url __ARGS((char_u *fname)); +int vim_isAbsName __ARGS((char_u *name)); +int vim_FullName __ARGS((char_u *fname, char_u *buf, int len, int force)); +int min_rows __ARGS((void)); +int only_one_window __ARGS((void)); +void check_lnums __ARGS((int do_curwin)); +int win_hasvertsplit __ARGS((void)); /* vim: set ft=c : */ diff --git a/src/proto/workshop.pro b/src/proto/workshop.pro index c72e215f4..426fded0b 100644 --- a/src/proto/workshop.pro +++ b/src/proto/workshop.pro @@ -1,49 +1,49 @@ /* workshop.c */ -extern void workshop_init __ARGS((void)); -extern void workshop_postinit __ARGS((void)); -extern void ex_wsverb __ARGS((exarg_T *eap)); -extern char *workshop_get_editor_name __ARGS((void)); -extern char *workshop_get_editor_version __ARGS((void)); -extern void workshop_load_file __ARGS((char *filename, int line, char *frameid)); -extern void workshop_reload_file __ARGS((char *filename, int line)); -extern void workshop_show_file __ARGS((char *filename)); -extern void workshop_goto_line __ARGS((char *filename, int lineno)); -extern void workshop_front_file __ARGS((char *filename)); -extern void workshop_save_file __ARGS((char *filename)); -extern void workshop_save_files __ARGS((void)); -extern void workshop_quit __ARGS((void)); -extern void workshop_minimize __ARGS((void)); -extern void workshop_maximize __ARGS((void)); -extern void workshop_add_mark_type __ARGS((int idx, char *colorspec, char *sign)); -extern void workshop_set_mark __ARGS((char *filename, int lineno, int markId, int idx)); -extern void workshop_change_mark_type __ARGS((char *filename, int markId, int idx)); -extern void workshop_goto_mark __ARGS((char *filename, int markId, char *message)); -extern void workshop_delete_mark __ARGS((char *filename, int markId)); -extern int workshop_get_mark_lineno __ARGS((char *filename, int markId)); -extern void workshop_moved_marks __ARGS((char *filename)); -extern int workshop_get_font_height __ARGS((void)); -extern void workshop_footer_message __ARGS((char *message, int severity)); -extern void workshop_menu_begin __ARGS((char *label)); -extern void workshop_submenu_begin __ARGS((char *label)); -extern void workshop_submenu_end __ARGS((void)); -extern void workshop_menu_item __ARGS((char *label, char *verb, char *accelerator, char *acceleratorText, char *name, char *filepos, char *sensitive)); -extern void workshop_menu_end __ARGS((void)); -extern void workshop_toolbar_begin __ARGS((void)); -extern void workshop_toolbar_end __ARGS((void)); -extern void workshop_toolbar_button __ARGS((char *label, char *verb, char *senseVerb, char *filepos, char *help, char *sense, char *file, char *left)); -extern void workshop_frame_sensitivities __ARGS((VerbSense *vs)); -extern void workshop_set_option __ARGS((char *option, char *value)); -extern void workshop_balloon_mode __ARGS((Boolean on)); -extern void workshop_balloon_delay __ARGS((int delay)); -extern void workshop_show_balloon_tip __ARGS((char *tip)); -extern void workshop_hotkeys __ARGS((Boolean on)); -extern int workshop_get_positions __ARGS((void *clientData, char **filename, int *curLine, int *curCol, int *selStartLine, int *selStartCol, int *selEndLine, int *selEndCol, int *selLength, char **selection)); -extern char *workshop_test_getcurrentfile __ARGS((void)); -extern int workshop_test_getcursorrow __ARGS((void)); -extern int workshop_test_getcursorcol __ARGS((void)); -extern char *workshop_test_getcursorrowtext __ARGS((void)); -extern char *workshop_test_getselectedtext __ARGS((void)); -extern void workshop_save_sensitivity __ARGS((char *filename)); -extern void workshop_beval_cb __ARGS((BalloonEval *beval, int state)); -extern void findYourself __ARGS((char *argv0)); +void workshop_init __ARGS((void)); +void workshop_postinit __ARGS((void)); +void ex_wsverb __ARGS((exarg_T *eap)); +char *workshop_get_editor_name __ARGS((void)); +char *workshop_get_editor_version __ARGS((void)); +void workshop_load_file __ARGS((char *filename, int line, char *frameid)); +void workshop_reload_file __ARGS((char *filename, int line)); +void workshop_show_file __ARGS((char *filename)); +void workshop_goto_line __ARGS((char *filename, int lineno)); +void workshop_front_file __ARGS((char *filename)); +void workshop_save_file __ARGS((char *filename)); +void workshop_save_files __ARGS((void)); +void workshop_quit __ARGS((void)); +void workshop_minimize __ARGS((void)); +void workshop_maximize __ARGS((void)); +void workshop_add_mark_type __ARGS((int idx, char *colorspec, char *sign)); +void workshop_set_mark __ARGS((char *filename, int lineno, int markId, int idx)); +void workshop_change_mark_type __ARGS((char *filename, int markId, int idx)); +void workshop_goto_mark __ARGS((char *filename, int markId, char *message)); +void workshop_delete_mark __ARGS((char *filename, int markId)); +int workshop_get_mark_lineno __ARGS((char *filename, int markId)); +void workshop_moved_marks __ARGS((char *filename)); +int workshop_get_font_height __ARGS((void)); +void workshop_footer_message __ARGS((char *message, int severity)); +void workshop_menu_begin __ARGS((char *label)); +void workshop_submenu_begin __ARGS((char *label)); +void workshop_submenu_end __ARGS((void)); +void workshop_menu_item __ARGS((char *label, char *verb, char *accelerator, char *acceleratorText, char *name, char *filepos, char *sensitive)); +void workshop_menu_end __ARGS((void)); +void workshop_toolbar_begin __ARGS((void)); +void workshop_toolbar_end __ARGS((void)); +void workshop_toolbar_button __ARGS((char *label, char *verb, char *senseVerb, char *filepos, char *help, char *sense, char *file, char *left)); +void workshop_frame_sensitivities __ARGS((VerbSense *vs)); +void workshop_set_option __ARGS((char *option, char *value)); +void workshop_balloon_mode __ARGS((Boolean on)); +void workshop_balloon_delay __ARGS((int delay)); +void workshop_show_balloon_tip __ARGS((char *tip)); +void workshop_hotkeys __ARGS((Boolean on)); +int workshop_get_positions __ARGS((void *clientData, char **filename, int *curLine, int *curCol, int *selStartLine, int *selStartCol, int *selEndLine, int *selEndCol, int *selLength, char **selection)); +char *workshop_test_getcurrentfile __ARGS((void)); +int workshop_test_getcursorrow __ARGS((void)); +int workshop_test_getcursorcol __ARGS((void)); +char *workshop_test_getcursorrowtext __ARGS((void)); +char *workshop_test_getselectedtext __ARGS((void)); +void workshop_save_sensitivity __ARGS((char *filename)); +void workshop_beval_cb __ARGS((BalloonEval *beval, int state)); +void findYourself __ARGS((char *argv0)); /* vim: set ft=c : */ diff --git a/src/testdir/test55.ok b/src/testdir/test55.ok index 1f52f2955..da8300290 100644 --- a/src/testdir/test55.ok +++ b/src/testdir/test55.ok @@ -105,3 +105,7 @@ caught a:000[3] ['aa', '', 'bb', 'cc', ''] ['a', 'b', 'c'] ['', 'a', '', 'b', '', 'c', ''] +1 +1 +0 +0 diff --git a/src/vim16.def b/src/vim16.def index 452325cb2..c32529d4c 100644 --- a/src/vim16.def +++ b/src/vim16.def @@ -1,5 +1,5 @@ CODE PRELOAD EXECUTEONLY DATA MULTIPLE SHARED -DESCRIPTION 'Vim 7.0' +DESCRIPTION 'Vim 7.1a' STACKSIZE 16000 HEAPSIZE 10000 diff --git a/src/vimrun.c b/src/vimrun.c index fed5076a5..c423e6cc5 100644 --- a/src/vimrun.c +++ b/src/vimrun.c @@ -99,7 +99,9 @@ main(void) */ retval = system(p); - if (retval != 0) + if (retval == -1) + perror("vimrun system(): "); + else if (retval != 0) printf("shell returned %d\n", retval); if (!silent) |