Mercurial > emacs
changeset 109440:f8f118e78387
* xmenu.c (create_and_show_popup_menu, xmenu_show): Fix type of timestamp argument.
| author | Andreas Schwab <schwab@linux-m68k.org> |
|---|---|
| date | Thu, 15 Jul 2010 23:53:32 +0200 |
| parents | 9ad1e76fc718 |
| children | 0ed7d8444705 |
| files | src/ChangeLog src/xmenu.c |
| diffstat | 2 files changed, 9 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- a/src/ChangeLog Thu Jul 15 19:48:34 2010 +0300 +++ b/src/ChangeLog Thu Jul 15 23:53:32 2010 +0200 @@ -1,3 +1,8 @@ +2010-07-15 Andreas Schwab <schwab@linux-m68k.org> + + * xmenu.c (create_and_show_popup_menu, xmenu_show): Fix type of + timestamp argument. + 2010-07-15 Eli Zaretskii <eliz@gnu.org> * fringe.c (update_window_fringes): Restore mistakenly reverted
--- a/src/xmenu.c Thu Jul 15 19:48:34 2010 +0300 +++ b/src/xmenu.c Thu Jul 15 23:53:32 2010 +0200 @@ -1562,7 +1562,8 @@ menu pops down. menu_item_selection will be set to the selection. */ static void -create_and_show_popup_menu (FRAME_PTR f, widget_value *first_wv, int x, int y, int for_click, unsigned int timestamp) +create_and_show_popup_menu (FRAME_PTR f, widget_value *first_wv, + int x, int y, int for_click, EMACS_UINT timestamp) { int i; Arg av[2]; @@ -2275,7 +2276,8 @@ Lisp_Object -xmenu_show (FRAME_PTR f, int x, int y, int for_click, int keymaps, Lisp_Object title, char **error, unsigned int timestamp) +xmenu_show (FRAME_PTR f, int x, int y, int for_click, int keymaps, + Lisp_Object title, char **error, EMACS_UINT timestamp) { Window root; XMenu *menu;