From 5453b0accfbda203836b12ed2fb6b50f89c9ce8d Mon Sep 17 00:00:00 2001 From: David Lawrence Ramsey Date: Tue, 29 Nov 2005 04:16:43 +0000 Subject: [PATCH] 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 --- ChangeLog | 4 ++++ src/nano.c | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index 2af84bcd..626ce0b1 100644 --- 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 e8d68c7a..4708ca57 100644 --- 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 -- 2.39.5