comparison src/menu.c @ 7803:37c929c4a073 v7.4.1198

commit https://github.com/vim/vim/commit/92b8b2d307e34117f146319872010b0ccc9d2713 Author: Bram Moolenaar <Bram@vim.org> Date: Fri Jan 29 22:36:45 2016 +0100 patch 7.4.1198 Problem: Still using __ARGS. Solution: Remove __ARGS in several files. (script by Hirohito Higashi) Also remove use of HAVE_STDARG_H.
author Christian Brabandt <cb@256bit.org>
date Fri, 29 Jan 2016 22:45:06 +0100
parents 50dbef5e774a
children 41789f16d6b2
comparison
equal deleted inserted replaced
7802:d9180d8cfe40 7803:37c929c4a073
17 #if defined(FEAT_MENU) || defined(PROTO) 17 #if defined(FEAT_MENU) || defined(PROTO)
18 18
19 #define MENUDEPTH 10 /* maximum depth of menus */ 19 #define MENUDEPTH 10 /* maximum depth of menus */
20 20
21 #ifdef FEAT_GUI_W32 21 #ifdef FEAT_GUI_W32
22 static int add_menu_path __ARGS((char_u *, vimmenu_T *, int *, char_u *, int)); 22 static int add_menu_path(char_u *, vimmenu_T *, int *, char_u *, int);
23 #else 23 #else
24 static int add_menu_path __ARGS((char_u *, vimmenu_T *, int *, char_u *)); 24 static int add_menu_path(char_u *, vimmenu_T *, int *, char_u *);
25 #endif 25 #endif
26 static int menu_nable_recurse __ARGS((vimmenu_T *menu, char_u *name, int modes, int enable)); 26 static int menu_nable_recurse(vimmenu_T *menu, char_u *name, int modes, int enable);
27 static int remove_menu __ARGS((vimmenu_T **, char_u *, int, int silent)); 27 static int remove_menu(vimmenu_T **, char_u *, int, int silent);
28 static void free_menu __ARGS((vimmenu_T **menup)); 28 static void free_menu(vimmenu_T **menup);
29 static void free_menu_string __ARGS((vimmenu_T *, int)); 29 static void free_menu_string(vimmenu_T *, int);
30 static int show_menus __ARGS((char_u *, int)); 30 static int show_menus(char_u *, int);
31 static void show_menus_recursive __ARGS((vimmenu_T *, int, int)); 31 static void show_menus_recursive(vimmenu_T *, int, int);
32 static int menu_name_equal __ARGS((char_u *name, vimmenu_T *menu)); 32 static int menu_name_equal(char_u *name, vimmenu_T *menu);
33 static int menu_namecmp __ARGS((char_u *name, char_u *mname)); 33 static int menu_namecmp(char_u *name, char_u *mname);
34 static int get_menu_cmd_modes __ARGS((char_u *, int, int *, int *)); 34 static int get_menu_cmd_modes(char_u *, int, int *, int *);
35 static char_u *popup_mode_name __ARGS((char_u *name, int idx)); 35 static char_u *popup_mode_name(char_u *name, int idx);
36 static char_u *menu_text __ARGS((char_u *text, int *mnemonic, char_u **actext)); 36 static char_u *menu_text(char_u *text, int *mnemonic, char_u **actext);
37 #ifdef FEAT_GUI 37 #ifdef FEAT_GUI
38 static int get_menu_mode __ARGS((void)); 38 static int get_menu_mode(void);
39 static void gui_update_menus_recurse __ARGS((vimmenu_T *, int)); 39 static void gui_update_menus_recurse(vimmenu_T *, int);
40 #endif 40 #endif
41 41
42 #if defined(FEAT_GUI_W32) && defined(FEAT_TEAROFF) 42 #if defined(FEAT_GUI_W32) && defined(FEAT_TEAROFF)
43 static void gui_create_tearoffs_recurse __ARGS((vimmenu_T *menu, const char_u *pname, int *pri_tab, int pri_idx)); 43 static void gui_create_tearoffs_recurse(vimmenu_T *menu, const char_u *pname, int *pri_tab, int pri_idx);
44 static void gui_add_tearoff __ARGS((char_u *tearpath, int *pri_tab, int pri_idx)); 44 static void gui_add_tearoff(char_u *tearpath, int *pri_tab, int pri_idx);
45 static void gui_destroy_tearoffs_recurse __ARGS((vimmenu_T *menu)); 45 static void gui_destroy_tearoffs_recurse(vimmenu_T *menu);
46 static int s_tearoffs = FALSE; 46 static int s_tearoffs = FALSE;
47 #endif 47 #endif
48 48
49 static int menu_is_hidden __ARGS((char_u *name)); 49 static int menu_is_hidden(char_u *name);
50 #if defined(FEAT_CMDL_COMPL) || (defined(FEAT_GUI_W32) && defined(FEAT_TEAROFF)) 50 #if defined(FEAT_CMDL_COMPL) || (defined(FEAT_GUI_W32) && defined(FEAT_TEAROFF))
51 static int menu_is_tearoff __ARGS((char_u *name)); 51 static int menu_is_tearoff(char_u *name);
52 #endif 52 #endif
53 53
54 #if defined(FEAT_MULTI_LANG) || defined(FEAT_TOOLBAR) 54 #if defined(FEAT_MULTI_LANG) || defined(FEAT_TOOLBAR)
55 static char_u *menu_skip_part __ARGS((char_u *p)); 55 static char_u *menu_skip_part(char_u *p);
56 #endif 56 #endif
57 #ifdef FEAT_MULTI_LANG 57 #ifdef FEAT_MULTI_LANG
58 static char_u *menutrans_lookup __ARGS((char_u *name, int len)); 58 static char_u *menutrans_lookup(char_u *name, int len);
59 static void menu_unescape_name __ARGS((char_u *p)); 59 static void menu_unescape_name(char_u *p);
60 #endif 60 #endif
61 61
62 static char_u *menu_translate_tab_and_shift __ARGS((char_u *arg_start)); 62 static char_u *menu_translate_tab_and_shift(char_u *arg_start);
63 63
64 /* The character for each menu mode */ 64 /* The character for each menu mode */
65 static char_u menu_mode_chars[] = {'n', 'v', 's', 'o', 'i', 'c', 't'}; 65 static char_u menu_mode_chars[] = {'n', 'v', 's', 'o', 'i', 'c', 't'};
66 66
67 static char_u e_notsubmenu[] = N_("E327: Part of menu-item path is not sub-menu"); 67 static char_u e_notsubmenu[] = N_("E327: Part of menu-item path is not sub-menu");