From c63f69527768e3e52d4ac8cd86f7cbee7d4e3a1a Mon Sep 17 00:00:00 2001 From: Karl Heuer Date: Tue, 2 May 1995 04:50:07 +0000 Subject: [PATCH] (xmenu_show, menubar_selection_callback): Move declaration of entry to an outer block, to guarantee its value is preserved. --- src/xmenu.c | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/src/xmenu.c b/src/xmenu.c index 5ac3ca8095..aaa098d55a 100644 --- a/src/xmenu.c +++ b/src/xmenu.c @@ -1148,7 +1148,7 @@ menubar_selection_callback (widget, id, client_data) LWLIB_ID id; XtPointer client_data; { - Lisp_Object prefix; + Lisp_Object prefix, entry; FRAME_PTR f = XFRAME (XVECTOR (frame_vector)->contents[id]); Lisp_Object vector; Lisp_Object *subprefix_stack; @@ -1163,8 +1163,6 @@ menubar_selection_callback (widget, id, client_data) i = 0; while (i < f->menu_bar_items_used) { - Lisp_Object entry; - if (EQ (XVECTOR (vector)->contents[i], Qnil)) { subprefix_stack[submenu_depth++] = prefix; @@ -1840,14 +1838,12 @@ xmenu_show (f, x, y, for_click, keymaps, title, error) the proper value. */ if (menu_item_selection != 0) { - Lisp_Object prefix; + Lisp_Object prefix, entry; prefix = Qnil; i = 0; while (i < menu_items_used) { - Lisp_Object entry; - if (EQ (XVECTOR (menu_items)->contents[i], Qnil)) { subprefix_stack[submenu_depth++] = prefix; -- 2.20.1