diff options
| author | Paul Eggert <eggert@cs.ucla.edu> | 2011-03-06 22:23:15 -0800 |
|---|---|---|
| committer | Paul Eggert <eggert@cs.ucla.edu> | 2011-03-06 22:23:15 -0800 |
| commit | d432397227a87fd18c33a27806cd2c0fbcd203af (patch) | |
| tree | d11be1bb054e07e268b799d24e168460f44ae53d /src/xmenu.c | |
| parent | 9d66f88eb9f67c5484abb4000e2d5e6acf34a795 (diff) | |
| download | emacs-d432397227a87fd18c33a27806cd2c0fbcd203af.tar.gz | |
* xmenu.c (xmenu_show): Rename parameter to avoid shadowing.
Diffstat (limited to 'src/xmenu.c')
| -rw-r--r-- | src/xmenu.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/xmenu.c b/src/xmenu.c index c79db086df3..64d74ee66d7 100644 --- a/src/xmenu.c +++ b/src/xmenu.c @@ -1598,7 +1598,7 @@ create_and_show_popup_menu (FRAME_PTR f, widget_value *first_wv, Lisp_Object xmenu_show (FRAME_PTR f, int x, int y, int for_click, int keymaps, - Lisp_Object title, const char **error, EMACS_UINT timestamp) + Lisp_Object title, const char **error_name, EMACS_UINT timestamp) { int i; widget_value *wv, *save_wv = 0, *first_wv = 0, *prev_wv = 0; @@ -1613,11 +1613,11 @@ xmenu_show (FRAME_PTR f, int x, int y, int for_click, int keymaps, if (! FRAME_X_P (f)) abort (); - *error = NULL; + *error_name = NULL; if (menu_items_used <= MENU_ITEMS_PANE_LENGTH) { - *error = "Empty menu"; + *error_name = "Empty menu"; return Qnil; } |