[PATCH] fix menuconfig choice item help display

[Bjorn Helgaas]

This patch against 2.6.2-rc2 fixes menuconfig so it can display
help text for individual choice group config entries.

Previously it would only display the help text attached to the
"choice" item.  There was no way to display the help attached to
individual config entries inside the choice group.  Typically,
the "choice" item has no help text, and all the useful help is
attached to the individual entries, so this was a bit of a
problem.

===== scripts/kconfig/mconf.c 1.10 vs edited =====
--- 1.10/scripts/kconfig/mconf.c	Mon Jan 19 16:38:08 2004
+++ edited/scripts/kconfig/mconf.c	Tue Jan 27 09:44:30 2004
@@ -635,7 +635,9 @@
 			sym_set_tristate_value(menu->sym, yes);
 			return;
 		case 1:
-			show_help(menu);
+			if (sscanf(input_buf, "%p", &child) != 1)
+				break;
+			show_help(child);
 			break;
 		case 255:
 			return;
===== scripts/lxdialog/checklist.c 1.3 vs edited =====
--- 1.3/scripts/lxdialog/checklist.c	Tue Feb  5 00:39:14 2002
+++ edited/scripts/lxdialog/checklist.c	Tue Jan 27 09:35:44 2004
@@ -303,6 +303,9 @@
 	case 'h':
 	case '?':
 	    delwin (dialog);
+	    fprintf(stderr, "%s \"%s\"\n",
+		    items[(scroll + choice) * 3],
+		    items[(scroll + choice) * 3 + 1]);
 	    free (status);
 	    return 1;
 	case TAB:
@@ -318,7 +321,11 @@
 	case 's':
 	case ' ':
 	case '\n':
-	    if (!button) {
+	    if (button)
+		    fprintf(stderr, "%s \"%s\"\n",
+			    items[(scroll + choice) * 3],
+			    items[(scroll + choice) * 3 + 1]);
+	    else {
 		if (flag == FLAG_CHECK) {
 		    status[scroll + choice] = !status[scroll + choice];
 		    wmove (list, choice, check_x);

-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/