diff options
| author | Paul Eggert | 2011-03-06 22:23:15 -0800 |
|---|---|---|
| committer | Paul Eggert | 2011-03-06 22:23:15 -0800 |
| commit | d432397227a87fd18c33a27806cd2c0fbcd203af (patch) | |
| tree | d11be1bb054e07e268b799d24e168460f44ae53d /src/xmenu.c | |
| parent | 9d66f88eb9f67c5484abb4000e2d5e6acf34a795 (diff) | |
| download | emacs-d432397227a87fd18c33a27806cd2c0fbcd203af.tar.gz emacs-d432397227a87fd18c33a27806cd2c0fbcd203af.zip | |
* 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, | |||
| 1598 | 1598 | ||
| 1599 | Lisp_Object | 1599 | Lisp_Object |
| 1600 | xmenu_show (FRAME_PTR f, int x, int y, int for_click, int keymaps, | 1600 | xmenu_show (FRAME_PTR f, int x, int y, int for_click, int keymaps, |
| 1601 | Lisp_Object title, const char **error, EMACS_UINT timestamp) | 1601 | Lisp_Object title, const char **error_name, EMACS_UINT timestamp) |
| 1602 | { | 1602 | { |
| 1603 | int i; | 1603 | int i; |
| 1604 | widget_value *wv, *save_wv = 0, *first_wv = 0, *prev_wv = 0; | 1604 | 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, | |||
| 1613 | if (! FRAME_X_P (f)) | 1613 | if (! FRAME_X_P (f)) |
| 1614 | abort (); | 1614 | abort (); |
| 1615 | 1615 | ||
| 1616 | *error = NULL; | 1616 | *error_name = NULL; |
| 1617 | 1617 | ||
| 1618 | if (menu_items_used <= MENU_ITEMS_PANE_LENGTH) | 1618 | if (menu_items_used <= MENU_ITEMS_PANE_LENGTH) |
| 1619 | { | 1619 | { |
| 1620 | *error = "Empty menu"; | 1620 | *error_name = "Empty menu"; |
| 1621 | return Qnil; | 1621 | return Qnil; |
| 1622 | } | 1622 | } |
| 1623 | 1623 | ||