in version(), if DISABLE_WRAPPING is defined, the code in

DISABLE_ROOTWRAP #ifdefs isn't included, so don't display
"--disable-wrapping-as-root" in that case

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

diff --git a/ChangeLog b/ChangeLog
index 2af84bcd29f2af9c2bb99a09c798af2cea61ff4c..626ce0b14cd4facd521ada1b5d51589aa20d600a 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -150,6 +150,10 @@ CVS code -
        - Change the description of the Meta-] shortcut to "Find
          matching bracket", as it's clearer. (DLR)
 - nano.c:
+  version()
+       - If DISABLE_WRAPPING is defined, the code in DISABLE_ROOTWRAP
+         #ifdefs isn't included, so don't display
+         "--disable-wrapping-as-root" in that case. (DLR)
   do_verbatim_input()
        - Move to text.c, since it's an advanced text-based operation.
          (DLR)

diff --git a/src/nano.c b/src/nano.c
index e8d68c7af7eb70108403caa4036b76815c55c737..4708ca570212a175119b53f796d3727950938774 100644 (file)
--- a/src/nano.c
+++ b/src/nano.c
@@ -856,7 +856,7 @@ void version(void)
 #ifdef DISABLE_WRAPPING
     printf(" --disable-wrapping");
 #endif
-#ifdef DISABLE_ROOTWRAP
+#if defined(DISABLE_ROOTWRAP) && !defined(DISABLE_WRAPPING)
     printf(" --disable-wrapping-as-root");
 #endif
 #ifdef ENABLE_COLOR