ariadne
/
smol
2
1
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

2009-11-18 Adrian Bunk <bunk via Savannah> 

* nano.c (main) - Allow --fill and --nowrap to override nanorc entries and each other
          on the command line.



git-svn-id: svn://svn.savannah.gnu.org/nano/trunk/nano@4429 35c25a1d-7b9e-4130-9fde-d3aeb78583b8
master
Chris Allegretta 2009-11-18 12:39:47 +00:00
parent 8c1edd17e3
commit 16e07d5878
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 @@
2009-11-18 Adrian Bunk <bunk via Savannah>
* nano.c (main) - Allow --fill and --nowrap to override nanorc entries and each other
on the command line.
2009-11-15 Chris Allegretta <chrisa@asty.org> 2009-11-15 Chris Allegretta <chrisa@asty.org>
* winio.c (edit_refresh): Always computer maxsize regardless of whether smooth scrolling * winio.c (edit_refresh): Always computer maxsize regardless of whether smooth scrolling
is enabled. Fixes Savannah bug 28024 by Mike Frysinger. is enabled. Fixes Savannah bug 28024 by Mike Frysinger.

10
src/nano.c
View File

@ -2263,6 +2263,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':
@ -2390,6 +2395,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))