summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRichard M. Stallman <rms@gnu.org>1996-05-31 20:10:02 +0000
committerRichard M. Stallman <rms@gnu.org>1996-05-31 20:10:02 +0000
commit82856819656f05d8d8b486f2c466efa37ea795af (patch)
treead0f205006fb6c5ff3f5cccd66b95eecf228035b
parent0fefc86a6e3d49d08d6cde96843664794172242e (diff)
downloademacs-82856819656f05d8d8b486f2c466efa37ea795af.tar.gz
(single_submenu): Handle non-keymap lists like symbols.
-rw-r--r--src/xmenu.c6
1 files changed, 5 insertions, 1 deletions
diff --git a/src/xmenu.c b/src/xmenu.c
index ef2bbd792ac..1ea7140d50f 100644
--- a/src/xmenu.c
+++ b/src/xmenu.c
@@ -1377,8 +1377,12 @@ single_submenu (item_key, item_name, maps)
But don't make a pane that is empty--ignore that map instead. */
for (i = 0; i < len; i++)
{
- if (SYMBOLP (mapvec[i]))
+ if (SYMBOLP (mapvec[i])
+ || (CONSP (mapvec[i])
+ && NILP (Fkeymapp (mapvec[i]))))
{
+ /* Here we have a command at top level in the menu bar
+ as opposed to a submenu. */
top_level_items = 1;
push_menu_pane (Qnil, Qnil);
push_menu_item (item_name, Qt, item_key, mapvec[i], Qnil);