# HG changeset patch # User Karl Heuer # Date 799390207 0 # Node ID a9f93ce6e1b4a837a30f04aaf909a8f36fa7c61f # Parent 47ceabade5b29de455c15aa1c571c1a6a48034a8 (xmenu_show, menubar_selection_callback): Move declaration of entry to an outer block, to guarantee its value is preserved. diff -r 47ceabade5b2 -r a9f93ce6e1b4 src/xmenu.c --- a/src/xmenu.c Tue May 02 04:41:26 1995 +0000 +++ b/src/xmenu.c Tue May 02 04:50:07 1995 +0000 @@ -1148,7 +1148,7 @@ 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 @@ 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 @@ 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;