diff options
| author | Dmitry Antipov <dmantipov@yandex.ru> | 2013-01-15 13:22:25 +0400 |
|---|---|---|
| committer | Dmitry Antipov <dmantipov@yandex.ru> | 2013-01-15 13:22:25 +0400 |
| commit | 2b30549c493d7b67fa92c2b4bcd2bd2e55210ae1 (patch) | |
| tree | ac4cc77344b3285eb47d5145eb0b28dd6034f54d /src/xmenu.c | |
| parent | 1b971ac155006504b6b1c2688199747f976723af (diff) | |
| download | emacs-2b30549c493d7b67fa92c2b4bcd2bd2e55210ae1.tar.gz | |
* src/lisp.h (XSAVE_POINTER, XSAVE_INTEGER): Change to allow extraction
from any Lisp_Save_Value slot. Add type checking.
* src/alloc.c, src/dired.c, src/editfns.c, src/fileio.c, src/ftfont.c:
* src/gtkutil.c, src/keymap.c, src/lread.c, src/nsterm.h, src/nsmenu.c:
* src/xfns.c, src/xmenu.c, src/xselect.c: All users changed.
* admin/coccinelle/xsave.cocci: Semantic patch to adjust users of
XSAVE_POINTER and XSAVE_INTEGER macros.
Diffstat (limited to 'src/xmenu.c')
| -rw-r--r-- | src/xmenu.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/xmenu.c b/src/xmenu.c index 6d880993d19..56a3783127e 100644 --- a/src/xmenu.c +++ b/src/xmenu.c @@ -1413,7 +1413,7 @@ pop_down_menu (Lisp_Object arg) { popup_activated_flag = 0; block_input (); - gtk_widget_destroy (GTK_WIDGET (XSAVE_POINTER (arg))); + gtk_widget_destroy (GTK_WIDGET (XSAVE_POINTER (arg, 0))); unblock_input (); return Qnil; } @@ -1610,7 +1610,7 @@ create_and_show_popup_menu (FRAME_PTR f, widget_value *first_wv, static Lisp_Object cleanup_widget_value_tree (Lisp_Object arg) { - free_menubar_widget_value_tree (XSAVE_POINTER (arg)); + free_menubar_widget_value_tree (XSAVE_POINTER (arg, 0)); return Qnil; } @@ -2236,8 +2236,8 @@ menu_help_callback (char const *help_string, int pane, int item) static Lisp_Object pop_down_menu (Lisp_Object arg) { - FRAME_PTR f = XSAVE_POINTER (Fcar (arg)); - XMenu *menu = XSAVE_POINTER (Fcdr (arg)); + FRAME_PTR f = XSAVE_POINTER (Fcar (arg), 0); + XMenu *menu = XSAVE_POINTER (Fcdr (arg), 0); block_input (); #ifndef MSDOS |