nano

commit 5453b0accfbda203836b12ed2fb6b50f89c9ce8d
parent 315eb3280a4d6a7ac71016af67fba9211f1422d8
Author: David Lawrence Ramsey <pooka109@gmail.com>
Date:   Tue, 29 Nov 2005 04:16:43 +0000

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

Diffstat:
M
ChangeLog
 | 
4
++++
M
src/nano.c
 | 
2
+-

2 files changed, 5 insertions(+), 1 deletion(-)
diff --git 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
@@ -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