mirrors
/
nano
mirror of git://git.sv.gnu.org/nano.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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.



git-svn-id: svn://svn.savannah.gnu.org/nano/branches/nano_2_0_branch/nano@4510 35c25a1d-7b9e-4130-9fde-d3aeb78583b8
This commit is contained in:
Chris Allegretta 2010-07-07 16:07:33 +00:00
parent 7f86c15ffb
commit e3f04bd8d5
2 changed files with 14 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ChangeLog
View File

@ -1,3 +1,7 @@
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> 2010-04-25 Chris Allegretta <chrisa@asty.org>
* files.c (do_writeout): Merge in 2.1/2.2 branch modification check and security fixes * 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 (in particular revs 4424 4467 4474 4490 4491 4494 4495 4496 4497 and 4500). Addresses

10
src/nano.c
View File

@ -1963,6 +1963,11 @@ int main(int argc, char **argv)
#ifndef DISABLE_WRAPPING #ifndef DISABLE_WRAPPING
case 'w': case 'w':
SET(NO_WRAP); SET(NO_WRAP);
/* If both --fill and --nowrap are given on the command line,
the last option wins, */
fill_used = FALSE;
break; break;
#endif #endif
case 'x': case 'x':
@ -2070,6 +2075,11 @@ int main(int argc, char **argv)
#endif #endif
#endif /* ENABLE_NANORC */ #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 /* If we're using bold text instead of reverse video text, set it up
* now. */ * now. */
if (ISSET(BOLD_TEXT)) if (ISSET(BOLD_TEXT))