diff options
| author | Karoly Lorentey <[email protected]> | 2005-04-19 13:33:31 +0000 |
|---|---|---|
| committer | Karoly Lorentey <[email protected]> | 2005-04-19 13:33:31 +0000 |
| commit | 8d6f9bce72ee94ed6c297b79a181eac3f5beca74 (patch) | |
| tree | 36cf3b6a5923171e371f9236eab36ad7de742b48 /src/xmenu.c | |
| parent | 774a8da14bb2520b6adad223ab13f0b64f002872 (diff) | |
| parent | cd01ded928a8d082b9dbed6e9747c3d31b337b71 (diff) | |
Merged from [email protected] (patch 66, 266-268)
Patches applied:
* [email protected]/emacs--cvs-trunk--0--patch-266
Update from CVS
* [email protected]/emacs--cvs-trunk--0--patch-267
Update from CVS
* [email protected]/emacs--cvs-trunk--0--patch-268
Merge from gnus--rel--5.10
* [email protected]/gnus--rel--5.10--patch-66
Update from CVS
git-archimport-id: [email protected]/emacs--multi-tty--0--patch-330
Diffstat (limited to 'src/xmenu.c')
| -rw-r--r-- | src/xmenu.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/xmenu.c b/src/xmenu.c index b29b74b6e4..f32074c2f6 100644 --- a/src/xmenu.c +++ b/src/xmenu.c @@ -771,7 +771,7 @@ cached information about equivalent key sequences. */) Lisp_Object keymap, tem; int xpos = 0, ypos = 0; Lisp_Object title; - char *error_name; + char *error_name = NULL; Lisp_Object selection; FRAME_PTR f = NULL; Lisp_Object x, y, window; @@ -2483,7 +2483,7 @@ create_and_show_popup_menu (f, first_wv, x, y, for_click) if (FRAME_X_DISPLAY_INFO (f)->grabbed & (1 << i)) break; } - + /* Display the menu. */ gtk_widget_show_all (menu); gtk_menu_popup (GTK_MENU (menu), 0, 0, pos_func, &popup_x_y, i, 0); @@ -2601,7 +2601,7 @@ create_and_show_popup_menu (f, first_wv, x, y, for_click) /* Display the menu. */ lw_popup_menu (menu, (XEvent *) &dummy); popup_activated_flag = 1; - + { int fact = 4 * sizeof (LWLIB_ID); int specpdl_count = SPECPDL_INDEX (); @@ -3225,7 +3225,7 @@ pop_down_menu (arg) { struct Lisp_Save_Value *p1 = XSAVE_VALUE (Fcar (arg)); struct Lisp_Save_Value *p2 = XSAVE_VALUE (Fcdr (arg)); - + FRAME_PTR f = p1->pointer; XMenu *menu = p2->pointer; @@ -3459,7 +3459,7 @@ xmenu_show (f, x, y, for_click, keymaps, title, error) #ifndef MSDOS XMenuActivateSetWaitFunction (x_menu_wait_for_event, FRAME_X_DISPLAY (f)); #endif - + record_unwind_protect (pop_down_menu, Fcons (make_save_value (f, 0), make_save_value (menu, 0))); |