thac0/vim
1
0
Fork 0
forked from aniani/vim
Code Activity

patch 7.4.1203

Browse Source 
Problem:    Still more files still using __ARGS.
Solution:   Remove __ARGS in really the last files.
This commit is contained in:
Bram Moolenaar
2016-01-30 13:28:28 +01:00
parent 3e96c3d241
commit 4349c57543
9 changed files with 167 additions and 145 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/Makefile
View File

@@ -1661,6 +1661,7 @@ PRO_AUTO = \
hangulin.pro \ hangulin.pro \
if_cscope.pro \ if_cscope.pro \
if_lua.pro \ if_lua.pro \
if_mzsch.pro \
if_python.pro \ if_python.pro \
if_python3.pro \ if_python3.pro \
if_ruby.pro \ if_ruby.pro \
@@ -1668,6 +1669,7 @@ PRO_AUTO = \
json.pro \ json.pro \
main.pro \ main.pro \
mark.pro \ mark.pro \
mbyte.pro \
memfile.pro \ memfile.pro \
memline.pro \ memline.pro \
menu.pro \ menu.pro \
@@ -1675,7 +1677,6 @@ PRO_AUTO = \
misc1.pro \ misc1.pro \
misc2.pro \ misc2.pro \
move.pro \ move.pro \
mbyte.pro \
normal.pro \ normal.pro \
ops.pro \ ops.pro \
option.pro \ option.pro \

21
src/if_mzsch.c
View File

@@ -29,6 +29,19 @@
* depend". */ * depend". */
#if defined(FEAT_MZSCHEME) || defined(PROTO) #if defined(FEAT_MZSCHEME) || defined(PROTO)
#ifdef PROTO
typedef int Scheme_Object;
typedef int Scheme_Closed_Prim;
typedef int Scheme_Env;
typedef int Scheme_Hash_Table;
typedef int Scheme_Type;
typedef int Scheme_Thread;
typedef int Scheme_Closed_Prim;
typedef int mzshort;
typedef int Scheme_Prim;
typedef int HINSTANCE;
#endif
/* /*
* scheme_register_tls_space is only available on 32-bit Windows until * scheme_register_tls_space is only available on 32-bit Windows until
* racket-6.3. See * racket-6.3. See
@@ -248,7 +261,7 @@ static int window_fixup_proc(void *obj)
# define BUFFER_REF(buf) (vim_mz_buffer *)((buf)->b_mzscheme_ref) # define BUFFER_REF(buf) (vim_mz_buffer *)((buf)->b_mzscheme_ref)
#endif #endif
#ifdef DYNAMIC_MZSCHEME #if defined(DYNAMIC_MZSCHEME) || defined(PROTO)
static Scheme_Object *dll_scheme_eof; static Scheme_Object *dll_scheme_eof;
static Scheme_Object *dll_scheme_false; static Scheme_Object *dll_scheme_false;
static Scheme_Object *dll_scheme_void; static Scheme_Object *dll_scheme_void;
@@ -406,6 +419,8 @@ static void (*dll_scheme_register_embedded_load)(intptr_t len, const char *s);
static void (*dll_scheme_set_config_path)(Scheme_Object *p); static void (*dll_scheme_set_config_path)(Scheme_Object *p);
# endif # endif
#if defined(DYNAMIC_MZSCHEME) /* not when defined(PROTO) */
/* arrays are imported directly */ /* arrays are imported directly */
# define scheme_eof dll_scheme_eof # define scheme_eof dll_scheme_eof
# define scheme_false dll_scheme_false # define scheme_false dll_scheme_false
@@ -539,6 +554,8 @@ scheme_external_get_thread_local_variables(void)
# endif # endif
# endif # endif
#endif
typedef struct typedef struct
{ {
char *name; char *name;
@@ -866,7 +883,7 @@ mzvim_check_threads(void)
} }
#endif #endif
#ifdef MZSCHEME_GUI_THREADS #if defined(MZSCHEME_GUI_THREADS) || defined(PROTO)
static void setup_timer(void); static void setup_timer(void);
static void remove_timer(void); static void remove_timer(void);

6
src/proto/gui_gtk_gresources.pro
View File

@@ -1,5 +1,5 @@
/* auto/gui_gtk_gresources.c */ /* auto/gui_gtk_gresources.c */
GResource *gui_gtk_get_resource __ARGS((void)); GResource *gui_gtk_get_resource(void);
void gui_gtk_register_resource __ARGS((void)); void gui_gtk_unregister_resource(void);
void gui_gtk_unregister_resource __ARGS((void)); void gui_gtk_register_resource(void);
/* vim: set ft=c : */ /* vim: set ft=c : */

224
src/proto/gui_mac.pro
View File

@@ -4,114 +4,114 @@
* Mac specific prototypes * Mac specific prototypes
*/ */
pascal Boolean WaitNextEventWrp __ARGS((EventMask eventMask, EventRecord *theEvent, UInt32 sleep, RgnHandle mouseRgn)); pascal Boolean WaitNextEventWrp(EventMask eventMask, EventRecord *theEvent, UInt32 sleep, RgnHandle mouseRgn);
pascal void gui_mac_scroll_action __ARGS((ControlHandle theControl, short partCode)); pascal void gui_mac_scroll_action(ControlHandle theControl, short partCode);
pascal void gui_mac_drag_thumb (ControlHandle theControl, short partCode); pascal void gui_mac_drag_thumb (ControlHandle theControl, short partCode);
void gui_mac_handle_event __ARGS((EventRecord *event)); void gui_mac_handle_event(EventRecord *event);
void gui_mac_doMouseDown __ARGS((EventRecord *theEvent)); void gui_mac_doMouseDown(EventRecord *theEvent);
void gui_mac_do_key __ARGS((EventRecord *theEvent)); void gui_mac_do_key(EventRecord *theEvent);
void gui_mac_handle_menu __ARGS((long menuChoice)); void gui_mac_handle_menu(long menuChoice);
void gui_mac_focus_change __ARGS((EventRecord *event)); void gui_mac_focus_change(EventRecord *event);
void gui_mac_update __ARGS((EventRecord *event)); void gui_mac_update(EventRecord *event);
short gui_mch_get_mac_menu_item_index __ARGS((vimmenu_T *menu, vimmenu_T *parent)); short gui_mch_get_mac_menu_item_index(vimmenu_T *menu, vimmenu_T *parent);
void gui_mch_set_blinking __ARGS((long wait, long on, long off)); void gui_mch_set_blinking(long wait, long on, long off);
void gui_mch_stop_blink __ARGS((void)); void gui_mch_stop_blink(void);
void gui_mch_start_blink __ARGS((void)); void gui_mch_start_blink(void);
void gui_mch_getmouse __ARGS((int *x, int *y)); void gui_mch_getmouse(int *x, int *y);
void gui_mch_setmouse __ARGS((int x, int y)); void gui_mch_setmouse(int x, int y);
void gui_mch_prepare __ARGS((int *argc, char **argv)); void gui_mch_prepare(int *argc, char **argv);
int gui_mch_init_check __ARGS((void)); int gui_mch_init_check(void);
int gui_mch_init __ARGS((void)); int gui_mch_init(void);
void gui_mch_new_colors __ARGS((void)); void gui_mch_new_colors(void);
int gui_mch_open __ARGS((void)); int gui_mch_open(void);
void gui_mch_exit __ARGS((int)); void gui_mch_exit(int);
void gui_mch_set_winsize __ARGS((int width, int height, int min_width, int min_height, int base_width, int base_height)); void gui_mch_set_winsize(int width, int height, int min_width, int min_height, int base_width, int base_height);
int gui_mch_get_winpos __ARGS((int *x, int *y)); int gui_mch_get_winpos(int *x, int *y);
void gui_mch_set_winpos __ARGS((int x, int y)); void gui_mch_set_winpos(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_set_shellsize(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_get_screen_dimensions(int *screen_w, int *screen_h);
void gui_mch_set_text_area_pos __ARGS((int x, int y, int w, int h)); void gui_mch_set_text_area_pos(int x, int y, int w, int h);
void gui_mch_enable_scrollbar __ARGS((scrollbar_T *sb, int flag)); void gui_mch_enable_scrollbar(scrollbar_T *sb, int flag);
void gui_mch_set_scrollbar_thumb __ARGS((scrollbar_T *sb, long val, long size, long max)); void gui_mch_set_scrollbar_thumb(scrollbar_T *sb, long val, long size, long max);
void gui_mch_set_scrollbar_pos __ARGS((scrollbar_T *sb, int x, int y, int w, int h)); void gui_mch_set_scrollbar_pos(scrollbar_T *sb, int x, int y, int w, int h);
void gui_mch_create_scrollbar __ARGS((scrollbar_T *sb, int orient)); void gui_mch_create_scrollbar(scrollbar_T *sb, int orient);
void gui_mch_destroy_scrollbar __ARGS((scrollbar_T *sb)); void gui_mch_destroy_scrollbar(scrollbar_T *sb);
int gui_mch_adjust_charheight __ARGS((void)); int gui_mch_adjust_charheight(void);
int gui_mch_init_font __ARGS((char_u *font_name, int fontset)); int gui_mch_init_font(char_u *font_name, int fontset);
GuiFont gui_mch_get_font __ARGS((char_u *name, int giveErrorIfMissing)); GuiFont gui_mch_get_font(char_u *name, int giveErrorIfMissing);
char_u *gui_mch_get_fontname __ARGS((GuiFont font, char_u *name)); char_u *gui_mch_get_fontname(GuiFont font, char_u *name);
GuiFont gui_mac_find_font __ARGS((char_u *font_name)); GuiFont gui_mac_find_font(char_u *font_name);
void gui_mch_set_font __ARGS((GuiFont font)); void gui_mch_set_font(GuiFont font);
int gui_mch_same_font __ARGS((GuiFont f1, GuiFont f2)); int gui_mch_same_font(GuiFont f1, GuiFont f2);
void gui_mch_free_font __ARGS((GuiFont font)); void gui_mch_free_font(GuiFont font);
guicolor_T gui_mch_get_color __ARGS((char_u *name)); guicolor_T gui_mch_get_color(char_u *name);
void gui_mch_set_fg_color __ARGS((guicolor_T color)); void gui_mch_set_fg_color(guicolor_T color);
void gui_mch_set_bg_color __ARGS((guicolor_T color)); void gui_mch_set_bg_color(guicolor_T color);
void gui_mch_set_sp_color __ARGS((guicolor_T color)); void gui_mch_set_sp_color(guicolor_T color);
void gui_mch_draw_string __ARGS((int row, int col, char_u *s, int len, int flags)); void gui_mch_draw_string(int row, int col, char_u *s, int len, int flags);
int gui_mch_haskey __ARGS((char_u *name)); int gui_mch_haskey(char_u *name);
void gui_mch_beep __ARGS((void)); void gui_mch_beep(void);
void gui_mch_flash __ARGS((int msec)); void gui_mch_flash(int msec);
void gui_mch_invert_rectangle __ARGS((int r, int c, int nr, int nc)); void gui_mch_invert_rectangle(int r, int c, int nr, int nc);
void gui_mch_iconify __ARGS((void)); void gui_mch_iconify(void);
void gui_mch_settitle __ARGS((char_u *title, char_u *icon)); void gui_mch_settitle(char_u *title, char_u *icon);
void gui_mch_draw_hollow_cursor __ARGS((guicolor_T color)); void gui_mch_draw_hollow_cursor(guicolor_T color);
void gui_mch_draw_part_cursor __ARGS((int w, int h, guicolor_T color)); void gui_mch_draw_part_cursor(int w, int h, guicolor_T color);
void gui_mch_update __ARGS((void)); void gui_mch_update(void);
int gui_mch_wait_for_chars __ARGS((int wtime)); int gui_mch_wait_for_chars(int wtime);
void gui_mch_flush __ARGS((void)); void gui_mch_flush(void);
void gui_mch_clear_block __ARGS((int row1, int col1, int row2, int col2)); void gui_mch_clear_block(int row1, int col1, int row2, int col2);
void gui_mch_clear_all __ARGS((void)); void gui_mch_clear_all(void);
void gui_mch_delete_lines __ARGS((int row, int num_lines)); void gui_mch_delete_lines(int row, int num_lines);
void gui_mch_insert_lines __ARGS((int row, int num_lines)); void gui_mch_insert_lines(int row, int num_lines);
void gui_mch_enable_menu __ARGS((int flag)); void gui_mch_enable_menu(int flag);
void gui_mch_set_menu_pos __ARGS((int x, int y, int w, int h)); void gui_mch_set_menu_pos(int x, int y, int w, int h);
/*void gui_mch_add_menu __ARGS((vimmenu_T *menu, vimmenu_T *parent, int idx));*/ /*void gui_mch_add_menu(vimmenu_T *menu, vimmenu_T *parent, int idx);*/
void gui_mch_add_menu __ARGS((vimmenu_T *menu, int pos)); void gui_mch_add_menu(vimmenu_T *menu, int pos);
/*void gui_mch_add_menu_item __ARGS((vimmenu_T *menu, vimmenu_T *parent, int idx));*/ /*void gui_mch_add_menu_item(vimmenu_T *menu, vimmenu_T *parent, int idx);*/
void gui_mch_add_menu_item __ARGS((vimmenu_T *menu, int idx)); void gui_mch_add_menu_item(vimmenu_T *menu, int idx);
void gui_mch_show_popupmenu __ARGS((vimmenu_T *menu)); void gui_mch_show_popupmenu(vimmenu_T *menu);
void gui_mch_destroy_menu __ARGS((vimmenu_T *menu)); void gui_mch_destroy_menu(vimmenu_T *menu);
void gui_mch_menu_grey __ARGS((vimmenu_T *menu, int grey)); void gui_mch_menu_grey(vimmenu_T *menu, int grey);
void gui_mch_menu_hidden __ARGS((vimmenu_T *menu, int hidden)); void gui_mch_menu_hidden(vimmenu_T *menu, int hidden);
void gui_mch_draw_menubar __ARGS((void)); void gui_mch_draw_menubar(void);
int gui_mch_get_lightness __ARGS((guicolor_T pixel)); int gui_mch_get_lightness(guicolor_T pixel);
long_u gui_mch_get_rgb __ARGS((guicolor_T pixel)); long_u gui_mch_get_rgb(guicolor_T pixel);
int gui_mch_get_mouse_x __ARGS((void)); int gui_mch_get_mouse_x(void);
int gui_mch_get_mouse_y __ARGS((void)); int gui_mch_get_mouse_y(void);
void gui_mch_setmouse __ARGS((int x, int y)); void gui_mch_setmouse(int x, int y);
void gui_mch_show_popupmenu __ARGS((vimmenu_T *menu)); void gui_mch_show_popupmenu(vimmenu_T *menu);
int gui_mch_dialog __ARGS((int type, char_u *title, char_u *message, char_u *buttons, int dfltbutton, char_u *textfield, int ex_cmd)); int gui_mch_dialog(int type, char_u *title, char_u *message, char_u *buttons, int dfltbutton, char_u *textfield, int ex_cmd);
char_u *gui_mch_browse __ARGS((int saving, char_u *title, char_u *dflt, char_u *ext, char_u *initdir, char_u *filter)); char_u *gui_mch_browse(int saving, char_u *title, char_u *dflt, char_u *ext, char_u *initdir, char_u *filter);
void gui_mch_set_foreground __ARGS((void)); void gui_mch_set_foreground(void);
void gui_mch_show_tabline __ARGS((int showit)); void gui_mch_show_tabline(int showit);
int gui_mch_showing_tabline __ARGS((void)); int gui_mch_showing_tabline(void);
void gui_mch_update_tabline __ARGS((void)); void gui_mch_update_tabline(void);
void gui_mch_set_curtab __ARGS((int nr)); void gui_mch_set_curtab(int nr);
char_u *C2Pascal_save __ARGS((char_u *Cstring)); char_u *C2Pascal_save(char_u *Cstring);
char_u *C2Pascal_save_and_remove_backslash __ARGS((char_u *Cstring)); char_u *C2Pascal_save_and_remove_backslash(char_u *Cstring);
int_u EventModifiers2VimMouseModifiers __ARGS((EventModifiers macModifiers)); int_u EventModifiers2VimMouseModifiers(EventModifiers macModifiers);
char_u **new_fnames_from_AEDesc __ARGS((AEDesc *theList, long *numFiles, OSErr *error)); char_u **new_fnames_from_AEDesc(AEDesc *theList, long *numFiles, OSErr *error);
void gui_request_selection __ARGS((void)); void gui_request_selection(void);
void gui_mch_lose_selection __ARGS((void)); void gui_mch_lose_selection(void);
int gui_mch_own_selection __ARGS((void)); int gui_mch_own_selection(void);
void gui_mch_clear_selection __ARGS((void)); void gui_mch_clear_selection(void);
void gui_win_new_height __ARGS((win_T *wp)); void gui_win_new_height(win_T *wp);
void gui_win_comp_pos __ARGS((void)); void gui_win_comp_pos(void);
void gui_win_free __ARGS((win_T *wp)); void gui_win_free(win_T *wp);
void gui_win_alloc __ARGS((win_T *wp)); void gui_win_alloc(win_T *wp);
void mch_post_buffer_write (buf_T *buf); void mch_post_buffer_write (buf_T *buf);
void mch_errmsg __ARGS((char *str)); void mch_errmsg(char *str);
void mch_display_error __ARGS((void)); void mch_display_error(void);
void clip_mch_lose_selection __ARGS((VimClipboard *cbd)); void clip_mch_lose_selection(VimClipboard *cbd);
void clip_mch_request_selection __ARGS((VimClipboard *cbd)); void clip_mch_request_selection(VimClipboard *cbd);
void clip_mch_set_selection __ARGS((VimClipboard *cbd)); void clip_mch_set_selection(VimClipboard *cbd);
int clip_mch_own_selection __ARGS((VimClipboard *cbd)); int clip_mch_own_selection(VimClipboard *cbd);
pascal OSErr FindProcessBySignature( const OSType targetType, pascal OSErr FindProcessBySignature( const OSType targetType,
const OSType targetCreator, ProcessSerialNumberPtr psnPtr ); const OSType targetCreator, ProcessSerialNumberPtr psnPtr );
@@ -129,17 +129,17 @@ pascal OSErr Handle_KAHL_MOD_AE (const AppleEvent *theAEvent, AppleEvent *theRe
pascal OSErr Handle_KAHL_GTTX_AE (const AppleEvent *theAEvent, AppleEvent *theReply, long refCon); pascal OSErr Handle_KAHL_GTTX_AE (const AppleEvent *theAEvent, AppleEvent *theReply, long refCon);
void Send_KAHL_MOD_AE (buf_T *buf); void Send_KAHL_MOD_AE (buf_T *buf);
void gui_mac_doInContentClick __ARGS((EventRecord *theEvent, WindowPtr whichWindow)); void gui_mac_doInContentClick(EventRecord *theEvent, WindowPtr whichWindow);
void gui_mac_doInDragClick __ARGS((Point where, WindowPtr whichWindow)); void gui_mac_doInDragClick(Point where, WindowPtr whichWindow);
void gui_mac_doInGrowClick __ARGS((Point where, WindowPtr whichWindow)); void gui_mac_doInGrowClick(Point where, WindowPtr whichWindow);
void gui_mac_doUpdateEvent __ARGS((EventRecord *event)); void gui_mac_doUpdateEvent(EventRecord *event);
void gui_mac_doActivateEvent __ARGS((EventRecord *event)); void gui_mac_doActivateEvent(EventRecord *event);
void gui_mac_doSuspendEvent __ARGS((EventRecord *event)); void gui_mac_doSuspendEvent(EventRecord *event);
void gui_mac_doKeyEvent __ARGS((EventRecord *theEvent)); void gui_mac_doKeyEvent(EventRecord *theEvent);
void gui_mac_doMouseDownEvent __ARGS((EventRecord *theEvent)); void gui_mac_doMouseDownEvent(EventRecord *theEvent);
void gui_mac_doMouseMovedEvent __ARGS((EventRecord *event)); void gui_mac_doMouseMovedEvent(EventRecord *event);
void gui_mac_doMouseUpEvent __ARGS((EventRecord *theEvent)); void gui_mac_doMouseUpEvent(EventRecord *theEvent);
void gui_mch_mousehide __ARGS((int hide)); void gui_mch_mousehide(int hide);
int C2PascalString (char_u *CString, Str255 *PascalString); int C2PascalString (char_u *CString, Str255 *PascalString);
int GetFSSpecFromPath ( char_u *file, FSSpec *fileFSSpec); int GetFSSpecFromPath ( char_u *file, FSSpec *fileFSSpec);

31
src/proto/if_mzsch.pro
View File

@@ -1,20 +1,17 @@
/* if_mzsch.c */ /* if_mzsch.c */
int mzscheme_enabled __ARGS((int verbose)); int mzscheme_enabled(int verbose);
void mzscheme_end __ARGS((void)); void mzvim_check_threads(void);
void ex_mzscheme __ARGS((exarg_T *eap)); void mzvim_reset_timer(void);
void ex_mzfile __ARGS((exarg_T *eap)); void mzscheme_end(void);
void mzscheme_buffer_free __ARGS((buf_T *buf)); int mzscheme_main(int argc, char **argv);
void mzscheme_window_free __ARGS((win_T *win)); void mzscheme_buffer_free(buf_T *buf);
char *mzscheme_version __ARGS((void)); void mzscheme_window_free(win_T *win);
void ex_mzscheme(exarg_T *eap);
void ex_mzfile(exarg_T *eap);
void do_mzeval(char_u *str, typval_T *rettv);
void raise_vim_exn(const char *add_info); void raise_vim_exn(const char *add_info);
void raise_if_error __ARGS((void)); void raise_if_error(void);
buf_T *get_valid_buffer __ARGS((void *)); buf_T *get_valid_buffer(void *obj);
win_T *get_valid_window __ARGS((void *)); win_T *get_valid_window(void *obj);
void mzvim_check_threads __ARGS((void)); int mzthreads_allowed(void);
void mzvim_reset_timer __ARGS((void));
void *mzvim_eval_string __ARGS((char_u *str));
int mzthreads_allowed __ARGS((void));
int mzscheme_main __ARGS((int argc, char **argv));
void do_mzeval __ARGS((char_u *str, typval_T *rettv));
int vim_main2 __ARGS((int argc, char **argv));
/* vim: set ft=c : */ /* vim: set ft=c : */

8
src/proto/if_ole.pro
View File

@@ -1,5 +1,5 @@
/* if_ole.cpp */ /* if_ole.cpp */
void InitOLE __ARGS((int* pbDoRestart)); void InitOLE(int* pbDoRestart);
void UninitOLE __ARGS((void)); void UninitOLE(void);
void RegisterMe __ARGS((int silent)); void RegisterMe(int silent);
void UnregisterMe __ARGS((int bNotifyUser)); void UnregisterMe(int bNotifyUser);

12
src/proto/os_qnx.pro
View File

@@ -1,8 +1,8 @@
/* os_qnx.c */ /* os_qnx.c */
void qnx_init __ARGS((void)); void qnx_init(void);
void qnx_clip_init __ARGS((void)); void qnx_clip_init (void);
int clip_mch_own_selection __ARGS((VimClipboard *cbd)); int clip_mch_own_selection(VimClipboard *cbd);
void clip_mch_lose_selection __ARGS((VimClipboard *cbd)); void clip_mch_lose_selection(VimClipboard *cbd);
void clip_mch_request_selection __ARGS((VimClipboard *cbd)); void clip_mch_request_selection(VimClipboard *cbd);
void clip_mch_set_selection __ARGS((VimClipboard *cbd)); void clip_mch_set_selection(VimClipboard *cbd);
/* vim: set ft=c : */ /* vim: set ft=c : */

2
src/version.c
View File

@@ -746,6 +746,8 @@ static char *(features[]) =
static int included_patches[] = static int included_patches[] =
{ /* Add new patch number below this line */ { /* Add new patch number below this line */
/**/
1203,
/**/ /**/
1202, 1202,
/**/ /**/

5
src/vim.h
View File

@@ -2319,4 +2319,9 @@ typedef int sock_T;
# define MAX_OPEN_CHANNELS 0 # define MAX_OPEN_CHANNELS 0
#endif #endif
#ifdef FEAT_MZSCHEME
/* this is in main.c, cproto can't handle it. */
int vim_main2(int argc, char **argv);
#endif
#endif /* VIM__H */ #endif /* VIM__H */