From df13e3beefe41f74278c6e492c8fcb175bfc00b1 Mon Sep 17 00:00:00 2001
From: David Lawrence Ramsey <pooka109@gmail.com>
Date: Thu, 12 Aug 2004 19:48:21 +0000
Subject: [PATCH] tweak some #ifdefs to avoid warnings when compiling with
--disable-wrapping, --disable-justify, or a combination of the two
git-svn-id: svn://svn.savannah.gnu.org/nano/trunk/nano@1897 35c25a1d-7b9e-4130-9fde-d3aeb78583b8
---
ChangeLog | 3 +++
src/nano.c | 4 +++-
2 files changed, 6 insertions(+), 1 deletion(-)
diff --git a/ChangeLog b/ChangeLog
index 333caa4d..ec29716e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -88,6 +88,9 @@ CVS code -
make some of them more consistent. (David Benbennick and DLR)
- Change some functions to take const char*'s instead of char*'s
where possible. (David Benbennick)
+ - Tweak some #ifdefs to avoid warnings when compiling with
+ --disable-wrapping, --disable-justify, or a combination of the
+ two. (DLR)
- files.c:
get_next_filename()
- Tweak for efficiency, and add the ".save" suffix to the file
diff --git a/src/nano.c b/src/nano.c
index 179eb8d3..16cdd427 100644
--- a/src/nano.c
+++ b/src/nano.c
@@ -3003,7 +3003,9 @@ int main(int argc, char *argv[])
{
int optchr;
int startline = 0; /* Line to try and start at */
+#ifndef DISABLE_WRAPJUSTIFY
bool fill_flag_used = FALSE; /* Was the fill option used? */
+#endif
const shortcut *s;
bool keyhandled = FALSE; /* Have we handled the keystroke yet? */
int kbinput; /* Input from keyboard */
@@ -3299,7 +3301,7 @@ int main(int argc, char *argv[])
operating_dir = operating_dir_cpy;
}
#endif
-#ifndef DISABLE_WRAPPING
+#ifndef DISABLE_WRAPJUSTIFY
if (fill_flag_used)
wrap_at = wrap_at_cpy;
#endif
--
GitLab