revert unneeded #ifdef fixes

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

diff --git a/ChangeLog b/ChangeLog
index 7d81033028ab2b6c365d0ec9751f6cde3bff3885..9243b90d2e7418a6756c5edc8f6e0ff4242b1edf 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -104,11 +104,6 @@ CVS code -
 - nano.h:
        - Remove the manual disabling of color support if regex.h isn't
          found, as configure.ac now handles that. (DLR)
-       - If DISABLE_WRAPPING is defined, undefine DISABLE_ROOTWRAP, as
-         the latter makes no sense when the former is set, and adjust
-         all #ifdefs that check for both being enabled. (DLR)
-       - If HAVE_REGEX_H isn't defined, undefine ENABLE_COLOR, as the
-         latter is useless without regex support. (DLR)
 - search.c:
   replace_regexp()
        - Remove unnecessary casting of c to int. (DLR)

diff --git a/src/nano.h b/src/nano.h
index ee50a48afa363bda33730402707fa180f5c54623..8770e04deda753250839ecc5331816d6c6793c6c 100644 (file)
--- a/src/nano.h
+++ b/src/nano.h
@@ -143,23 +143,9 @@
 #ifndef NCURSES_MOUSE_VERSION
 #define DISABLE_MOUSE 1
 #endif
-#ifdef DISABLE_WRAPPING
-/* If both wrapping and justifying are disabled, disable all the code
- * used by either of the two. */
-#ifdef DISABLE_JUSTIFY
-#define DISABLE_WRAPJUSTIFY 1
-#endif
-/* If wrapping is disabled, turn the --disable-wrapping-as-root option
- * off, as it's useless then. */
-#ifdef DISABLE_ROOTWRAP
-#undef DISABLE_ROOTWRAP
-#endif
-#endif
 
-/* If regex support is disabled, turn color support off, as it's useless
- * then. */
-#ifndef HAVE_REGEX_H
-#undef ENABLE_COLOR
+#if defined(DISABLE_WRAPPING) && defined(DISABLE_JUSTIFY)
+#define DISABLE_WRAPJUSTIFY 1
 #endif
 
 /* Enumeration types. */