Commit ccc1cac0 authored by Richard M. Stallman's avatar Richard M. Stallman
Browse files

(display_menu): If an item is disabled,

don't display its submenu (if any).
parent 7cf45b04
......@@ -644,6 +644,9 @@ display_menu (mw, level, just_compute_p, highlighted_pos, hit, hit_return,
int horizontal_p = mw->menu.horizontal && (level == 0);
int highlighted_p;
int just_compute_this_one_p;
/* This is set nonzero if the element containing HIGHLIGHTED_POS
is disabled, so that we do not return any subsequent element either. */
int no_return = 0;
if (level >= mw->menu.old_depth)
abort ();
......@@ -688,8 +691,14 @@ display_menu (mw, level, just_compute_p, highlighted_pos, hit, hit_return,
if (hit
&& !*hit_return
&& (horizontal_p ? hit->x < where.x : hit->y < where.y)
&& !all_dashes_p (val->name))
*hit_return = val;
&& !all_dashes_p (val->name)
&& !no_return)
{
if (val->enabled)
*hit_return = val;
else
no_return = 1;
}
if (horizontal_p)
where.y = 0;
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment