Date: Sat, 23 Nov 2002 10:45:18 +0100
From: Petr Baudis <pasky@ucw.cz>
To: torvalds@transmeta.com
Cc: zippel@linux-m68k.org, linux-kernel@vger.kernel.org
Subject: [PATCH] [TRIVIAL] [kconfig] Merge error of singlemenu mconf patch (resent)
Message-ID: <20021123094518.GX25628@pasky.ji.cz>
Mail-Followup-To: torvalds@transmeta.com, zippel@linux-m68k.org,
	linux-kernel@vger.kernel.org
Mime-Version: 1.0
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
User-Agent: Mutt/1.4i
Sender: linux-kernel-owner@vger.kernel.org
Content-Length: 1215
Lines: 34

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