From: David Lawrence Ramsey <pooka109@gmail.com>
Date: Wed, 12 Jul 2006 18:09:37 +0000 (+0000)
Subject: in nano.h, if we don't have nanorc support, disable color support, as it
X-Git-Tag: v1.9.99pre1~82
X-Git-Url: https://git.wh0rd.org/?a=commitdiff_plain;h=1a473483b1708449152f23b98e8cbc57d4eeb785;p=nano.git

in nano.h, if we don't have nanorc support, disable color support, as it
depends on the use of the nanorc


git-svn-id: svn://svn.savannah.gnu.org/nano/trunk/nano@3779 35c25a1d-7b9e-4130-9fde-d3aeb78583b8
---

diff --git a/ChangeLog b/ChangeLog
index 1785ce31..3d4dbc2d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -88,6 +88,9 @@ CVS code -
 	  lines would not be updated properly if the current line was
 	  not the first or last line of the edit window. (DLR, found by
 	  Mike Frysinger)
+- nano.h:
+	- If we don't have nanorc support, disable color support, as it
+	  depends on the use of the nanorc. (DLR)
 - winio.c:
   display_string()
 	- Properly handle buf[start_index]'s being a null terminator.
diff --git a/src/nano.h b/src/nano.h
index 21c08874..d6fc8a56 100644
--- a/src/nano.h
+++ b/src/nano.h
@@ -138,10 +138,10 @@
 #define getline ngetline
 #endif
 
-/* If we don't have regex support, turn the color support off, as it
- * depends on the use of regexes. */
-#ifndef HAVE_REGEX_H
-#undef ENABLE_COLOR 
+/* If we don't have regex or nanorc support, turn the color support off,
+ * as it depends on the use of both. */
+#if !defined(HAVE_REGEX_H) || !defined(ENABLE_NANORC)
+#undef ENABLE_COLOR
 #endif
 
 /* If we aren't using ncurses, turn the mouse support off, as it's