Skip to contentSkip to conversation

Merge error of singlemenu mconf patch

PATCH New Petr Baudis 1 participant 1 message Nov 14, 2002

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 Merge error of singlemenu mconf patch

Hello,

this patch (against 2.5.47) fixes apparent merge error of my menuconfig
singlemenu patch, accepted before 2.5.47 release. In that patch, following modification to lxdialog was needed - without this change, the highlighting of the menu items' hotkey is broken (the first '+' is highlighted).

Please apply.

 scripts/lxdialog/util.c |    2 +-
 1 files changed, 1 insertion(+), 1 deletion(-)

Kind regards,
Petr Baudis

scripts/lxdialog/util.c +1 -1
diff -ru linux/scripts/lxdialog/util.c linux+pasky/scripts/lxdialog/util.c
@@ -348,7 +348,7 @@
 		c = tolower(string[i]);
 
 		if (strchr("<[(", c)) ++in_paren;
-		if (strchr(">])", c)) --in_paren;
+		if (strchr(">])", c) && in_paren > 0) --in_paren;
 
 		if ((! in_paren) && isalpha(c) && 
 		     strchr(exempt, c) == 0)