From: Ingo Saitz <ingo@debian.org>
Date: Wed, 31 Dec 2003 03:57:34 +0100
Subject: Document the --color option

This patch includes the following fixes:

  - Document --color in the manpage
  - Add * to the output of --help for --color since it has a negative form
  - Also split the #ifdef outside the printf() call, see old Bug #104980.
    It's strange that gcc does build this code again.
---
 src/mikmod.1 |    4 ++++
 src/mikmod.c |   13 ++++++-------
 2 files changed, 10 insertions(+), 7 deletions(-)

diff --git a/src/mikmod.1 b/src/mikmod.1
index 41f1856..c78babe 100644
--- a/src/mikmod.1
+++ b/src/mikmod.1
@@ -137,6 +137,10 @@ Do not reschedule MikMod to gain real-time priority (default).
 Quiet mode. Disables interactive commands and displays only errors.
 .IP "\fB--terse\fR"
 Terse display like MikMod 2, i.e. without the information panels.
+.IP "\fB-C\fR, \fB--color\fR"
+Enable colors in interface (default).
+.IP "\fB--nocolor\fR"
+Disable colors in interface.
 
 
 .SH INFORMATION OPTIONS
diff --git a/src/mikmod.c b/src/mikmod.c
index fec2dd9..d5775e3 100644
--- a/src/mikmod.c
+++ b/src/mikmod.c
@@ -233,13 +233,15 @@ static void help(CONFIG *c)
 
 #endif
 
-	printf(
-		"Display options:\n"
+	puts(	"Display options:\n"
 		"  -q, --quiet                Quiet mode, no interface, displays only errors.\n"
-		"      --terse                Terse output : status line only.\n"
+		"      --terse                Terse output : status line only.");
 #ifdef ENABLE_COLOR_INTERFACE
-		"  -C, --color                Enable color interface. default: %s\n"
+	printf(
+		"* -C, --color                Enable color interface. default: %s\n",
+		S_B(c->color));
 #endif
+	printf(
 		"Information options:\n"
 		"  -n, --information          List all available drivers and module loaders.\n"
 		"  -V, --version              Display MikMod version.\n"
@@ -250,9 +252,6 @@ static void help(CONFIG *c)
 		"\n"
         "Options marked with '*' also exist in negative form (eg --nointerpolate)\n"
 		"F1 or H while playing: Display help panel.\n",
-#ifdef ENABLE_COLOR_INTERFACE
-		S_B(c->color),	
-#endif
 		conf_name);
 
 	if (conf_name)
-- 
