2002-11-23 09:38:09

by Petr Baudis

[permalink] [raw]
Subject: [PATCH] [TRIVIAL] [kconfig] Merge error of singlemenu mconf patch (resent)

Hello,

this patch (against 2.5.49) 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(-)

Note that this is the third resubmission of the patch.

Kind regards,
Petr Baudis

diff -ru linux/scripts/lxdialog/util.c linux+pasky/scripts/lxdialog/util.c
--- linux/scripts/lxdialog/util.c Wed Nov 6 21:50:00 2002
+++ linux+pasky/scripts/lxdialog/util.c Thu Nov 14 22:15:55 2002
@@ -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)