mirror of
git://git.sv.gnu.org/emacs.git
synced 2025-12-29 00:31:01 -08:00
(xmenu_show, menubar_selection_callback): Move declaration
of entry to an outer block, to guarantee its value is preserved.
This commit is contained in:
parent
83d6804403
commit
c63f695277
1 changed files with 2 additions and 6 deletions
|
|
@ -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;
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue