summary refs log tree commit diff
path: root/scripts/kconfig/lxdialog
diff options
context:
space:
mode:
authorRoman Zippel <zippel@linux-m68k.org>2006-11-25 11:09:32 -0800
committerLinus Torvalds <torvalds@woody.osdl.org>2006-11-25 13:28:34 -0800
commitc154348f00834911c49aa63dfb48bd50d1a07d93 (patch)
treeb0623769f5ee252168af0cec1eff756c8f7f36eb /scripts/kconfig/lxdialog
parentf12aa7045280836307e9bbdb1c676c4a94e2b3d3 (diff)
downloadlinux-c154348f00834911c49aa63dfb48bd50d1a07d93.tar.gz
[PATCH] fix menuconfig colours with TERM=vt100
On Mon, 13 Nov 2006, Phil Oester wrote:
> In commit 350b5b76384e77bcc58217f00455fdbec5cac594, the default menuconfig
> color scheme was changed to bluetitle.  This breaks the highlighting
> of the selected item for me with TERM=vt100.  The only way I can see
> which item is selected is via:
>
>     make MENUCONFIG_COLOR=mono menuconfig
>
> Which restores the pre-2.6.19 white on black highlighting.

Fix.

Cc: Phil Oester <kernel@linuxace.com>
Signed-off-by: Roman Zippel <zippel@linux-m68k.org>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'scripts/kconfig/lxdialog')
-rw-r--r--scripts/kconfig/lxdialog/util.c16
1 files changed, 7 insertions, 9 deletions
diff --git a/scripts/kconfig/lxdialog/util.c b/scripts/kconfig/lxdialog/util.c
index ebc781b493d7..d54440fc166c 100644
--- a/scripts/kconfig/lxdialog/util.c
+++ b/scripts/kconfig/lxdialog/util.c
@@ -221,16 +221,14 @@ static void init_dialog_colors(void)
  */
 static void color_setup(const char *theme)
 {
-	if (set_theme(theme)) {
-		if (has_colors()) {	/* Terminal supports color? */
-			start_color();
-			init_dialog_colors();
-		}
-	}
-	else
-	{
+	int use_color;
+
+	use_color = set_theme(theme);
+	if (use_color && has_colors()) {
+		start_color();
+		init_dialog_colors();
+	} else
 		set_mono_theme();
-	}
 }
 
 /*