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-d3aeb78583b8master
parent
7dfec43f42
commit
df13e3beef
|
@ -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[])
|
||||||
{
|
{
|
||||||
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[])
|
||||||
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
|
||||||
|
|
Loading…
Reference in New Issue