* nano.c (main) - Allow --fill and --nowrap to override nanorc entries and each other
on the command line. Backported from 2.2 at request of Benno Schulenberg.
git-svn-id: svn://svn.savannah.gnu.org/nano/branches/nano_2_0_branch/nano@4510
35c25a1d-7b9e-4130-9fde-
d3aeb78583b8
+2010-07-07 Adrian Bunk <bunk via Savannah>
+ * nano.c (main) - Allow --fill and --nowrap to override nanorc entries and each other
+ on the command line. Backported from 2.2 at request of Benno Schulenberg.
+
2010-04-25 Chris Allegretta <chrisa@asty.org>
* files.c (do_writeout): Merge in 2.1/2.2 branch modification check and security fixes
(in particular revs 4424 4467 4474 4490 4491 4494 4495 4496 4497 and 4500). Addresses
#ifndef DISABLE_WRAPPING
case 'w':
SET(NO_WRAP);
+
+ /* If both --fill and --nowrap are given on the command line,
+ the last option wins, */
+ fill_used = FALSE;
+
break;
#endif
case 'x':
#endif
#endif /* ENABLE_NANORC */
+ /* Overwrite an rcfile "set nowrap" or --disable-wrapping-as-root
+ if a --fill option was given on the command line. */
+ if (fill_used)
+ UNSET(NO_WRAP);
+
/* If we're using bold text instead of reverse video text, set it up
* now. */
if (ISSET(BOLD_TEXT))