Merge tag 'v3.10.76' into update

This is the 3.10.76 stable release
2018-03-21 22:42:30 +01:00
parent 446a42c9b2 89bf6007dd
commit 85511b9d61
77 changed files with 333 additions and 220 deletions
@@ -563,7 +563,7 @@ static void get_prompt_str(struct gstr *r, struct property *prop,
 		str_printf(r, _("  Location:\n"));
 		for (j = 4; --i >= 0; j += 2) {
 			menu = submenu[i];
-			if (head && location && menu == location)
+			if (jump && menu == location)
 				jump->offset = r->len - 1;
 			str_printf(r, "%*c-> %s", j, ' ',
 				   _(menu_get_prompt(menu)));