Commit df13e3be authored by David Lawrence Ramsey's avatar David Lawrence Ramsey
Browse files

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
No related merge requests found
Showing with 6 additions and 1 deletion
+6 -1
...@@ -88,6 +88,9 @@ CVS code - ...@@ -88,6 +88,9 @@ CVS code -
make some of them more consistent. (David Benbennick and DLR) make some of them more consistent. (David Benbennick and DLR)
- Change some functions to take const char*'s instead of char*'s - Change some functions to take const char*'s instead of char*'s
where possible. (David Benbennick) 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: - files.c:
get_next_filename() get_next_filename()
- Tweak for efficiency, and add the ".save" suffix to the file - Tweak for efficiency, and add the ".save" suffix to the file
......
...@@ -3003,7 +3003,9 @@ int main(int argc, char *argv[]) ...@@ -3003,7 +3003,9 @@ int main(int argc, char *argv[])
{ {
int optchr; int optchr;
int startline = 0; /* Line to try and start at */ int startline = 0; /* Line to try and start at */
#ifndef DISABLE_WRAPJUSTIFY
bool fill_flag_used = FALSE; /* Was the fill option used? */ bool fill_flag_used = FALSE; /* Was the fill option used? */
#endif
const shortcut *s; const shortcut *s;
bool keyhandled = FALSE; /* Have we handled the keystroke yet? */ bool keyhandled = FALSE; /* Have we handled the keystroke yet? */
int kbinput; /* Input from keyboard */ int kbinput; /* Input from keyboard */
...@@ -3299,7 +3301,7 @@ int main(int argc, char *argv[]) ...@@ -3299,7 +3301,7 @@ int main(int argc, char *argv[])
operating_dir = operating_dir_cpy; operating_dir = operating_dir_cpy;
} }
#endif #endif
#ifndef DISABLE_WRAPPING #ifndef DISABLE_WRAPJUSTIFY
if (fill_flag_used) if (fill_flag_used)
wrap_at = wrap_at_cpy; wrap_at = wrap_at_cpy;
#endif #endif
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment