===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/tmux/menu.c,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- src/usr.bin/tmux/menu.c	2019/05/28 07:18:42	1.8
+++ src/usr.bin/tmux/menu.c	2019/05/28 09:50:54	1.9
@@ -1,4 +1,4 @@
-/* $OpenBSD: menu.c,v 1.8 2019/05/28 07:18:42 nicm Exp $ */
+/* $OpenBSD: menu.c,v 1.9 2019/05/28 09:50:54 nicm Exp $ */
 
 /*
  * Copyright (c) 2019 Nicholas Marriott <nicholas.marriott@gmail.com>
@@ -80,7 +80,7 @@
 		menu->count--;
 		return;
 	}
-	if (item->key != KEYC_UNKNOWN && item->key != KEYC_NONE) {
+	if (*s != '-' && item->key != KEYC_UNKNOWN && item->key != KEYC_NONE) {
 		key = key_string_lookup_key(item->key);
 		xasprintf(&name, "%s#[default] #[align=right](%s)", s, key);
 	} else
@@ -182,6 +182,7 @@
 	const struct menu_item		*item;
 	struct cmdq_item		*new_item;
 	struct cmd_parse_result		*pr;
+	const char			*name;
 
 	if (KEYC_IS_MOUSE(event->key)) {
 		if (md->flags & MENU_NOMOUSE)
@@ -207,21 +208,27 @@
 	}
 	switch (event->key) {
 	case KEYC_UP:
+		if (old == -1)
+			old = 0;
 		do {
 			if (md->choice == -1 || md->choice == 0)
 				md->choice = count - 1;
 			else
 				md->choice--;
-		} while (menu->items[md->choice].name == NULL);
+			name = menu->items[md->choice].name;
+		} while ((name == NULL || *name == '-') && md->choice != old);
 		c->flags |= CLIENT_REDRAWOVERLAY;
 		return (0);
 	case KEYC_DOWN:
+		if (old == -1)
+			old = 0;
 		do {
 			if (md->choice == -1 || md->choice == count - 1)
 				md->choice = 0;
-		else
-			md->choice++;
-		} while (menu->items[md->choice].name == NULL);
+			else
+				md->choice++;
+			name = menu->items[md->choice].name;
+		} while ((name == NULL || *name == '-') && md->choice != old);
 		c->flags |= CLIENT_REDRAWOVERLAY;
 		return (0);
 	case '\r':
@@ -233,6 +240,9 @@
 		return (1);
 	}
 	for (i = 0; i < (u_int)count; i++) {
+		name = menu->items[i].name;
+		if (name == NULL || *name == '-')
+			continue;
 		if (event->key == menu->items[i].key) {
 			md->choice = i;
 			goto chosen;
@@ -244,7 +254,7 @@
 	if (md->choice == -1)
 		return (1);
 	item = &menu->items[md->choice];
-	if (item->name == NULL)
+	if (item->name == NULL || *item->name == '-')
 		return (1);
 	if (md->cb != NULL) {
 	    md->cb(md->menu, md->choice, item->key, md->data);