GNU nano 2.2.2 release

git-svn-id: svn://svn.savannah.gnu.org/nano/trunk/nano@4478 35c25a1d-7b9e-4130-9fde-d3aeb78583b8
Compile fix with current_stat. Not sure how I missed that.
2010-01-18 03:47:40 +00:00 · 2010-01-18 03:43:24 +00:00 · 2010-01-18 00:24:09 +00:00 · 2010-01-17 05:30:22 +00:00 · 2010-01-14 06:32:37 +00:00 · 2010-01-13 03:21:19 +00:00
65 changed files with 10780 additions and 10136 deletions
--- a/2
+++ b/2
@@ -1,5 +1,4 @@
 ** Open BUGS **
- Cutting the line at the top of the screen recenters to center (71)

 ** Fixed BUGS **
 - Marked cutting sometimes leaves a newline in the file unintelligently,
@@ -156,6 +155,7 @@
  assigned to it (79 - may not be worth fixing) [FIXED]
 - Segfault editing at COLS presumably due to new color syntax 
  highlighting (80) [FIXED]
+- Cutting the line at the top of the screen recenters to center (71) [FIXED]


 $Id$
--- a/146
+++ b/146
@@ -1,3 +1,149 @@
+2010-01-17 Chris Allegretta <chrisa@asty.org>
+	* nano.c (main), prompt.c (do_statusbar_input): Handle problems with an unmapped 
+	  function due to key rebinding, fixes crashes on FreeBSD repoted by Eitan 
+	  Adler <eitanadlerlist@gmail.com>.
+
+2010-01-14 Chris Allegretta <chrisa@asty.org>
+	* files.c (do_writeout): Fix for crash / incorrect external modification warning
+	  due to earlier fix in r4467.
+
+2010-01-12 Chris Allegretta <chrisa@asty.org>
+	* move.c (do_page_up, do_page_down): Fix issues with not enough scrolling down/up
+	  and cursor centering.
+	* winio.c (edit_scroll): Remove lots of needless checking of line length for 
+	  soft wrapping code.
+	* winio.c (edit_update) - Remove extra code for when updating with old_current outside
+	  of the new buffer boundary and centering issues.
+
+2010-01-05 Tito <farmatito@tiscali.it>
+	* search.c (update_history): Fix bad length check causing search crash on armel platform.
+
+2010-01-04 Chris Allegretta <chrisa@asty.org>
+	* winio.c: edit_update, edit_redraw: Fix search not scrolling to the middle of the screen
+	  (reported by alpha@qzx.com) and places where we rely on maxrows but should not.
+
+2009-12-26 Jordi Mallach <jordi@gnu.org>
+	* doc/man/nano.1: Avoid a groff warning by prepending a zero-width
+	space to a line starting with '.
+
+2009-12-22 Chris Allegretta <chrisa@asty.org>
+	* files.c (write_file): Fix compatibility with previous stat fix and tiny mode.
+
+2009-12-22 David Lawrence Ramsey <pooka109@gmail.com>
+	* global.c: Add new strings for forward/back in the file browser.  New variables
+	  nano_forwardfile_msg and nano_backfile_msg.
+
+2009-12-20 Chris Allegretta <chrisa@asty.org>
+	* files.c (is_file_writable): remove assert check for f, since it's not
+	  initialized at the time.  Fixes Savannah bug 28309, reported by Zoltan Kovacs.
+
+2009-12-20 Brian Szymanski <skibrianski via Savannah>
+	* src/files.c (write_file): Check stat struct exists, and if not use just obtained stat data.
+	  Fixes Ubuntu bug 471568, "reproducible crash in nano on trying to save to a file 
+	  different than the one specified on the command line".
+
+2009-12-15 Chris Allegretta <chrisa@asty.org>
+	* doc/nanorc.sample.in - Remove erroneous 'set suspendenable' as it's actually a 
+	  key binding (e.g. 'bind M-Z suspendenable all') and not a settable flag.  Fixes
+	  Savannah bug 28299 reported by Mike Frysinger.
+
+GNU nano 2.2.1 - 2009.12.12
+2009-12-12 Chris Allegretta <chrisa@asty.org>
+	* text.c (do_delete), nano.c (do_output): Add check for length of current line 
+	  before and after adding/deleting text, and do full refresh if it is now
+	  a different multiple of COLS.  Also get rid of superfluous do_refresh
+	  vars now that we have edit_refresh_needed.
+
+2009-12-09 David Lawrence Ramsey <pooka109@gmail.com>
+	* global.c (shortcut_init), browser.c (do_browser): Fix M-W not being bound to 
+	  research in either main menu or browser.
+
+2009-12-09 Chris Allegretta <chrisa@asty.org>
+	* files.c (read_file) - Add parameter for whether we should even try to check
+	  file writability, as the message is useless when we're inserting into an 
+	  existing buffer.  Fixes Savannah bug 28219.
+
+2009-12-07 David Lawrence Ramsey <pooka109@gmail.com>
+	* global.c (shortcut_init): Many fixes for keybindings code oversights, including
+	  restore page up/down and GotoDir to browser, 
+	* browser.c (do_browser): Fix breaking out of a submenu (e.g. gotodir) breaks out
+	  of browser altogether.
+	* doc/nanorc.sample.in: Add missing entries for fortran/ObjC/OCaml entries.
+
+2009-12-03 David Lawrence Ramsey <pooka109@gmail.com>
+	* global.c (shortcut_init) - Remove help shortcut from help shortcut list :-)  Tweaked 
+	  to reorder exit shortcut to end of list to not mess up prev/next shortcut symmetry.
+
+2009-12-03 Eitan Adler <eitanadlerlist@gmail.com>
+	* doc/syntax/makefile.nanorc - Fix poor regex for all alpha characters which sometimes leads to
+	  error messages, reported by gibboris@gmail.com.
+
+2009-12-02 Chris Allegretta <chrisa@asty.org>
+	* text.c (add_undo, do_undo, do_redo) - Do not execute cases for SPLIT when DISABLE_WRAPPING
+	  is defined.  Fixes Savannah bug 28151 (anon).
+
+2009-12-02 Jordi Mallach <jordi@gnu.org>
+	* doc/man/nano.1: Fix escaping of hyphens for the -$ option.
+
+2009-12-01 Kamil Dudka <kdudka@redhat.com>
+	* chars.c, file.c - Better handle unused results for things like mbtowc(), new
+	  macro IGNORE_CALL_RESULT.
+
+2009-12-01 Chris Allegretta <chrisa@asty.org>
+	* global.c (shortcut_init) - Remove redundant entries for ^Y/^V reported by
+	  Christian Weisgerber.
+	* doc/man/nanorc.5 - Fix typo in Meta documentation, reported by gibboris@gmail.com.
+
+2009-12-01 David Lawrence Ramsey <pooka109@gmail.com>
+	* global.c (shortcut_init) - Add support for ^P and ^N in the help menu.
+	* Update documentation for 2.2 features including sample nanorc file, texinfo
+	  file, man pages, UPGRADE file, and update copyright noticed for the current year.
+
+GNU nano 2.2.0 - 2009.11.30
+2009-11-29 Chris Allegretta <chrisa@asty.org>
+	* prompt.c (get_prompt_string) - Universally handle help key when is 
+disabled.  Fixes Savannah
+	  bug 28117 by David Lawrence Ramsey <pooka109@gmail.com>.
+	* chars.c, files.c: Add junk vars to silence the compiler.  Sigh.
+
+2009-11-29 David Lawrence Ramsey <pooka109@gmail.com>
+	* Change several *chars to const char, additional cleanups and casts to make compilers happier.
+	* global.c: Fix replace and insert file initializations for proper compilation options.
+	* nano.c (do_suspend): Update comments to reflect actual code path, bad Chris and thanks for
+	  noticing Jordi.
+	* configure.ac: Fix typos
+
+2009-11-27 Chris Allegretta <chrisa@asty.org>
+	* nano.c (do_suspend): Don't clear the screen but do move the cursor down to the last line
+	  first in an effort to not corrupt the screen, which contradicts Pico but is consistent
+	  with almost all other text editors.  Fixes Savannah bug 28110/Debian bug 460510
+	  reported by Tim Connors <reportbug@rather.puzzling.org>.
+	* doc/dyntax/makefile.nanorc - Sample Makefile highlighting based on wiki.linuxhelp.net version.
+
+2009-11-26 Chris Allegretta <chrisa@asty.org>
+	* winio.c (edit_scroll): Adjust for long lines when scrolling.
+	* rcfile.c (parse_rcfile), initialize size argument to getline(), fixes crash on FreeBSD 
+	  reported by Eitan Adler <eitanadlerlist@gmail.com>.
+
+2009-11-26 Jordi Mallach <jordi@gnu.org>
+	* doc/man/*: Update all man pages to escape unescaped hyphens.
+
+2009-11-24 Chris Allegretta <chrisa@asty.org>
+	* move.c (do_page_up, do_page_down): Make these functions work better with soft
+	  line wrapping.
+	* winio.c (compute_maxrows): Make maxrows calculation more accurate when all lines are > COLS.
+
+2009-11-22 Chris Allegretta <chrisa@asty.org>
+	* nano.c (main): Allow edit_refresh_needed to take effect when using --enable-tiny
+	  (fixes Savannah bug 28076 reported by David Lawrence Ramsey).
+
+2009-11-22 David Lawrence Ramsey <pooka109@gmail.com>
+	* nano.c (move_to_filestruct): Fix bug 71 (cut at top of line recenters)
+	* Fix compilation with --enable-tiny
+
+2009-11-22 Mike Frysinger <vapier@gentoo.org>
+	* doc/syntax/gentoo.nanorc: Tweak comment highlighting.
+
 GNU nano 2.1.99pre2 - 2009.11.21
 2009-11-21 Chris Allegretta <chrisa@asty.org>
 	* rcfile.c: Add unbinding keyword, fixes Savannah bug 22852 reported by frankd.
--- a/47
+++ b/47
@@ -1,3 +1,50 @@
+2010.01.17 - GNU nano 2.2.2 is released for you, you, you.  This
+		release includes fixes for: crashed when writing
+		backup files in certain conditions, improper
+		screen centering when moving up/down in various
+		combination of smooth scrolling and soft wrapping modes,
+		a search crash on the armel arch, and issues with
+		lots of keybinding customizations causing crashing
+		particularly on FreeBSD.  Also included are better
+		help menu entries for forward/back in the file browser,
+		some man page tweaks and one assert fix.   As always,
+		share and enjoy!
+
+2009.12.12 - GNU nano 2.2.1 "DLR strikes back" is open for business.
+		This release fixes many bugs, including: missing
+		keybindings for page up/down and GotoDir in the browser, 
+		^P/^N in the help menu, and restoration of M-W as the 
+		default re-search binding.  Other fixes include several
+		issues with compiler warnings and configure options, and 
+		documentation updates, including the nano texinfo manual, 
+		nano and nanorc man pages, and UPGRADE file, and some
+		missing syntax highliting entries for the saple nanorc.
+		And no release would be complete without the latest round
+		of 'final' soft wrapping fixes!  Finally, nano will no 
+		longer print a warning when attempting to insert the 
+		contents of a read-only file into an existing buffer.  
+		Enjoy and Happy Hanukkah.
+		
+
+2009.11.30 - GNU nano 2.2.0 "Doc Brown" is released!  The culmination
+		of almost two years of development and hot on the heels
+		of nano's 10th birthday is available for all your
+		editing needs!  Bugs fixed since the last release
+		include several fixes for tiny mode (involving both
+		the help keys and replace menu text), more 'final'
+		fixes for soft wrapping, and several typo and documentation
+		updates including nanorc tweaks and a new syntax 
+		highlighting file for makefiles. Also included is a long
+		standing fix for random crashing when using nanorc on
+		FreeBSD, and nano will no longer clear the screen on
+		suspend to maintain compatibility with other *nix editors.
+		For those who haven't been playing along at home, please
+		see the official web page for the summary of new
+		features since 2.0.  Special thanks to all who have 
+		submitted bug reports recently in support of our new 
+		stable release, and apologies for all those bugs we 
+		didn't yet find :-) Peace to all.
+
 2009.11.21 - GNU nano 2.1.99pre2 is available for a special pre-Black
 		Friday discount.  Included are some (hopefully
 		final) fixes for issues with last page display
--- a/16
+++ b/16
@@ -1,6 +1,22 @@
 GNU nano upgrading information
 ==============================

+Visible changes since 2.0
+-------------------------
+* Editor Features
+  - The ability to rebind (reassign) keys using the nanorc.
+  - The ability to read standard input like a pager ("nano -").
+  - Color syntax highlighting can be set by the first line of a file.
+  - The ability to silence nanorc error messages (-q).
+  - Undo/redo operations (-u).
+  - Soft wrapping of text (-$).
+
+* File Handling
+  - Better handling of backup files: if nano can't write a backup file,
+    it won't try to write the original file afterward.
+  - Emergency savefiles retain ownerships and permissions when possible.
+  - Performance improvements in color syntax highlighting.
+
 Visible changes since 1.2
 -------------------------
 * Editor Features
--- a/configure.ac
+++ b/configure.ac
@@ -20,7 +20,7 @@
 #
 # $Id$

-AC_INIT([GNU nano], [2.1.99pre2], [nano-devel@gnu.org], [nano])
+AC_INIT([GNU nano], [2.2.2], [nano-devel@gnu.org], [nano])
 AC_CONFIG_SRCDIR([src/nano.c])
 AC_CANONICAL_TARGET([])
 AM_INIT_AUTOMAKE
@@ -191,7 +191,7 @@ fi],
 AC_ARG_ENABLE(all,
 [  --enable-all            Enable ALL extra nano functionality (ignored for compatibility as all options default to on)],
 [if test x$enableval = xyes; then
-    echo "--enable-all option no longer needed, ignoring for compatiblity"
+    echo "--enable-all option no longer needed, ignoring for compatibility"
 fi])

 AC_MSG_CHECKING([whether to enable UTF-8 support])
--- a/doc/faq.html
+++ b/doc/faq.html
@@ -83,9 +83,9 @@
 <h2><a name="1.5"></a>1.5. Why the name change from TIP?</h2>
 <blockquote><p>On January 10, 2000, TIP was officially renamed to nano because of a namespace conflict with another program called 'tip'. The original 'tip' program &quot;establishes a full duplex terminal connection to a remote host&quot;, and was included with many older Unix systems (and newer ones like Solaris). The conflict was not noticed at first because there is no 'tip' utility included with most GNU/Linux distributions (where nano was developed).</p></blockquote>
 <h2><a name="1.6"></a>1.6. What is the current version of nano?</h2>
-<blockquote><p>The current version of nano *should* be 2.0.7. Of course, you should always check the nano homepage to see what the latest and greatest version is.</p></blockquote>
+<blockquote><p>The current version of nano *should* be 2.2.0. Of course, you should always check the nano homepage to see what the latest and greatest version is.</p></blockquote>
 <h2><a name="1.7"></a>1.7. I want to read the man page without having to download the program!</h2>
-<blockquote><p>Jeez, demanding, aren't we? Okay, look <a href="http://www.nano-editor.org/dist/v2.0/nano.1.html">here</a>.</p></blockquote>
+<blockquote><p>Jeez, demanding, aren't we? Okay, look <a href="http://www.nano-editor.org/dist/v2.2/nano.1.html">here</a>.</p></blockquote>
 <hr width="100%">
 <h1><a name="2"></a>2. Where to get GNU nano.</h1>
 <h2><a name="2.1"></a>2.1. FTP and WWW sites that carry nano.</h2>
@@ -99,8 +99,8 @@
 <h2><a name="2.2"></a>2.2. RedHat and derivatives (.rpm) packages.</h2>
 <blockquote>
  <ul>
-    <li><a href="http://www.nano-editor.org/dist/v2.0/RPMS/">http://www.nano-editor.org/dist/v2.0/RPMS/</a></li>
-    <li><a href="http://www.ewtoo.org/~astyanax/nano/dist/v2.0/RPMS/">http://www.ewtoo.org/~astyanax/nano/dist/v2.0/RPMS/</a></li>
+    <li><a href="http://www.nano-editor.org/dist/v2.2/RPMS/">http://www.nano-editor.org/dist/v2.2/RPMS/</a></li>
+    <li><a href="http://www.ewtoo.org/~astyanax/nano/dist/v2.2/RPMS/">http://www.ewtoo.org/~astyanax/nano/dist/v2.2/RPMS/</a></li>
  </ul>
 </blockquote>
 <h2><a name="2.3"></a>2.3. Debian (.deb) packages.</h2>
@@ -246,7 +246,7 @@ Of course, due to the license change you can now use the <A HREF="http://www.was
  help-nano - <a href="http://mail.gnu.org/mailman/listinfo/help-nano/">http://mail.gnu.org/mailman/listinfo/help-nano/</a><br>
  nano-devel - <a href="http://mail.gnu.org/mailman/listinfo/nano-devel/">http://mail.gnu.org/mailman/listinfo/nano-devel/</a></p></blockquote>
 <h2><a name="7.2"></a>7.2. I want to send the development team a big load of cash (or just a thank you).</h2>
-<blockquote><p>That's fine. Send it <a href="mailto:nano-devel@gnu.org">our way</a>! Better yet, fix a <a href="http://www.nano-editor.org/dist/v2.0/BUGS">bug</a> in the program or implement a <a href="http://www.nano-editor.org/dist/v2.0/TODO">cool feature</a> and send us that instead (though cash is fine too).</p></blockquote>
+<blockquote><p>That's fine. Send it <a href="mailto:nano-devel@gnu.org">our way</a>! Better yet, fix a <a href="http://www.nano-editor.org/dist/v2.2/BUGS">bug</a> in the program or implement a <a href="http://www.nano-editor.org/dist/v2.2/TODO">cool feature</a> and send us that instead (though cash is fine too).</p></blockquote>
 <h2><a name="7.3"></a>7.3. How do I submit a bug report or patch?</h2>
 <blockquote>
 <p>The best place to submit bugs is to the <A HREF="https://savannah.gnu.org/bugs/?group=nano">Savannah bug tracker</A> as you can check whether the bug you are submitting has already been submitted.
@@ -256,8 +256,10 @@ Of course, due to the license change you can now use the <A HREF="http://www.was
 <h2><a name="7.5"></a>7.5. Can I have write access to the subversion tree?</h2>
 <blockquote><p>Re-read Section <a href="#7.4">7.4</a> and you should know the answer.</p></blockquote>
 <h2><a name="8"></a>8. ChangeLog</h2>
-<blockquote><p>2007/12/21 - Update maintainer information. (DLR)<br>
-2008/03/16 - Update docs to refer to subversion instead of CVS, add more words about Apline, and refer to Savannah for bugs and patches.  (chrisa)
+<blockquote><p>2009/11/30 - Update various bits for nano 2.2.x. (DLR)<br>
+2009/11/18 - Typo fix. (j.mader@gmail.com)<br>
+2008/03/16 - Update docs to refer to subversion instead of CVS, add more words about Alpine, and refer to Savannah for bugs and patches. (chrisa)<br>
+2007/12/21 - Update maintainer information. (DLR)<br>
 2007/12/09 - Add minor punctuation and wording fixes, and update various sections to account for Alpine. (DLR)<br>
 2007/08/26 - Update links to the Free Translation Project. (DLR)<br>
 2007/07/29 - Update RPM links for nano 2.0.x. (DLR)<br>
--- a/doc/man/fr/nano.1
+++ b/doc/man/fr/nano.1
@@ -230,7 +230,7 @@ Passe automatiquement
 \fIcolonne\fR. Si la valeur indiquée est de 0 ou moins, le point de 
 passage à la ligne aura lieu à la taille de l'écran moins \fIcolonne\fR. 
 Cela permet de faire varier le point de passage à la ligne lorsque l'on 
-change la taille de l'écran. La valeur par défaut est de -8.
+change la taille de l'écran. La valeur par défaut est de \-8.
 .TP
 .B \-s \fIprogramme\fP (\-\-speller=\fIprogramme\fP)
 Choix d'un correcteur orthographique de remplacement.
--- a/doc/man/fr/nanorc.5
+++ b/doc/man/fr/nanorc.5
@@ -143,7 +143,7 @@ Passe automatiquement
 \fIn\fR. Si la valeur indiquée est de 0 ou moins, le point de passage à 
 la ligne aura lieu à la taille de l'écran moins \fIn\fR. Cela permet de 
 faire varier le point de passage à la ligne lorsque l'on change la 
-taille de l'écran. La valeur par défaut est de -8.
+taille de l'écran. La valeur par défaut est de \-8.
 .TP
 .B set/unset historylog
 Active l'utilisation de
--- a/doc/man/nano.1
+++ b/doc/man/nano.1
@@ -1,6 +1,6 @@
 .\" Hey, EMACS: -*- nroff -*-
-.\" Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007
-.\" Free Software Foundation, Inc.
+.\" Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007,
+.\" 2008, 2009 Free Software Foundation, Inc.
 .\"
 .\" This document is dual-licensed.  You may distribute and/or modify it
 .\" under the terms of either of the following licenses:
@@ -19,7 +19,7 @@
 .\"   <http://www.gnu.org/licenses/>.
 .\"
 .\" $Id$
-.TH NANO 1 "version 2.0.0" "August 23, 2007"
+.TH NANO 1 "version 2.2.0" "November 30, 2009"
 .\" Please adjust this date whenever revising the manpage.
 .\"

@@ -79,11 +79,11 @@ Enable multiple file buffers, if available.
 .TP
 .B \-H (\-\-historylog)
 Log search and replace strings to \fI~/.nano_history\fP, so they can be
-retrieved in later sessions, if nanorc support is available.
+retrieved in later sessions, if \fInanorc\fP support is available.
 .TP
 .B \-I (\-\-ignorercfiles)
-Don't look at \fISYSCONFDIR/nanorc\fP or \fI~/.nanorc\fP, if nanorc
-support is available.
+Don't look at \fISYSCONFDIR/nanorc\fP or \fI~/.nanorc\fP, if
+\fInanorc\fP support is available.
 .TP
 .B \-K (\-\-rebindkeypad)
 Interpret the numeric keypad keys so that they all work properly.  You
@@ -107,10 +107,11 @@ Tab.
 .TP
 .B \-R (\-\-restricted)
 Restricted mode: don't read or write to any file not specified on the
-command line; read any nanorc files; allow suspending; allow a file
-to be appended to, prepended to, or saved under a different name if it
-already has one; or use backup files or spell checking.  Also accessible
-by invoking \fBnano\fP with any name beginning with 'r' (e.g. "rnano").
+command line; read any \fInanorc\fP files; allow suspending; allow a
+file to be appended to, prepended to, or saved under a different name if
+it already has one; or use backup files or spell checking.  Also
+accessible by invoking \fBnano\fP with any name beginning with 'r' (e.g.
+"rnano").
 .TP
 .B \-S (\-\-smooth)
 Enable smooth scrolling.  Text will scroll line-by-line, instead of the
@@ -173,14 +174,14 @@ Preserve the XON and XOFF sequences (^Q and ^S) so they will be caught
 by the terminal.
 .TP
 .B \-q (\-\-quiet)
-Do not report errors in the nanorc file and ask them to
-be acknowledged by pressing enter at startup.
+Do not report errors in the \fInanorc\fP file and ask them to be
+acknowledged by pressing Enter at startup.
 .TP
 .B \-r \fIcols\fP (\-\-fill=\fIcols\fP)
 Wrap lines at column \fIcols\fP.  If this value is 0 or less, wrapping
 will occur at the width of the screen less \fIcols\fP columns, allowing
 the wrap point to vary along with the width of the screen if the screen
-is resized.  The default value is -8.
+is resized.  The default value is \-8.
 .TP
 .B \-s \fIprog\fP (\-\-speller=\fIprog\fP)
 Enable alternative spell checker command.
@@ -206,11 +207,11 @@ Disable help screen at bottom of editor.
 Enable suspend ability.
 .TP
 .B \-$ (\-\-softwrap)
-Enable 'soft wrapping'.  Nano will attempt to display lines the entire 
-contents of a line, even if it is longer than the screen width.
-Since '$' normally refers to a variable in the Unix shell, you should
-specify this option last when using other options (e.g. 'nano -wS$') 
-or pass it separately (e.g. 'nano -wS -$'). 
+Enable 'soft wrapping'.  \fBnano\fP will attempt to display the entire
+contents of a line, even if it is longer than the screen width.  Since
+\&'$' normally refers to a variable in the Unix shell, you should specify
+this option last when using other options (e.g. 'nano \-wS$') or pass it
+separately (e.g. 'nano \-wS \-$').
 .TP
 .B \-a, \-b, \-e, \-f, \-g, \-j
 Ignored, for compatibility with Pico.
@@ -223,7 +224,7 @@ should be provided with \fBnano\fP.

 .SH NOTES
 If no alternative spell checker command is specified on the command
-line or in one of the nanorc files, \fBnano\fP will check the
+line or in one of the \fInanorc\fP files, \fBnano\fP will check the
 \fBSPELL\fP environment variable for one.

 In some cases \fBnano\fP will try to dump the buffer into an emergency
--- a/doc/man/nanorc.5
+++ b/doc/man/nanorc.5
@@ -1,5 +1,5 @@
 .\" Hey, EMACS: -*- nroff -*-
-.\" Copyright (C) 2003, 2004, 2005, 2006, 2007
+.\" Copyright (C) 2003, 2004, 2005, 2006, 2007, 2008, 2009
 .\" Free Software Foundation, Inc.
 .\"
 .\" This document is dual-licensed.  You may distribute and/or modify it
@@ -45,9 +45,9 @@ the command line options.  Additionally, the \fBsyntax\fP, \fBcolor\fP,
 and \fBicolor\fP keywords are used to define syntax highlighting rules
 for different text patterns.  \fBnano\fP will read one command per line.

-Options in nanorc files take precedence over nano's defaults, and
-command line options override nanorc settings.  Also, options are unset
-by default, except for those that take arguments.
+Options in \fInanorc\fP files take precedence over nano's defaults, and
+command line options override \fInanorc\fP settings.  Also, options are
+unset by default, except for those that take arguments.

 Quotes inside string parameters don't have to be escaped with
 backslashes.  The last double quote in the string will be treated as its
@@ -91,7 +91,7 @@ Use cut to end of line by default.
 .B set fill \fIn\fP
 Wrap lines at column number \fIn\fP.  If \fIn\fP is 0 or less, the
 maximum line length will be the screen width less \fIn\fP columns.  The
-default value is -8.
+default value is \-8.
 .TP
 .B set/unset historylog
 Enable \fI~/.nano_history\fP for saving and reading search/replace
@@ -146,9 +146,9 @@ punctuation, optionally followed by closing brackets, can end sentences.
 The default value is "\fI!.?\fP".
 .TP
 .B set/unset quiet
-\fBnano\fP will not report errors in the nanorc file and ask them to 
-be acknowledged by pressing enter at startup.  If this is used it should
-be placed at the top of the file to be fully effective.
+\fBnano\fP will not report errors in the \fInanorc\fP file and ask them
+to be acknowledged by pressing enter at startup.  If this is used it
+should be placed at the top of the file to be fully effective.
 .TP
 .B set/unset quickblank
 Do quick statusbar blanking.  Statusbar messages will disappear after 1
@@ -224,7 +224,7 @@ characters as parts of words.
 .TP
 .B syntax "\fIstr\fP" ["\fIfileregex\fP" ... ]
 Defines a syntax named \fIstr\fP which can be activated via the
-Y/--syntax command line option, or will be automatically activated if
+\-Y/\-\-syntax command line option, or will be automatically activated if
 the current filename matches the extended regular expression
 \fIfileregex\fP.  All following \fBcolor\fP and \fBicolor\fP statements
 will apply to \fIsyntax\fP until a new syntax is defined.
@@ -276,7 +276,7 @@ followed by an alpha character or the word "Space".
 Example: ^C
 .TP
 .B M- 
-followed by a prinable character or the word "Space".
+followed by a printable character or the word "Space".
 Example: M-C
 .TP
 .B F 
@@ -414,7 +414,7 @@ Refresh the screen.
 Undo the text action peformed (add text, delete text, etc).
 .TP
 .B redo
-"Re-do" the last undone action (i.e. undo an undo)
+Redo the last undone action (i.e., undo an undo).
 .TP
 .B suspend
 Suspend the editor (if the suspend function is enabled, see the 
--- a/doc/nanorc.sample.in
+++ b/doc/nanorc.sample.in
@@ -141,6 +141,9 @@
 ## Use smooth scrolling as the default.
 # set smooth

+## Enable soft line wrapping (AKA full line display).
+# set softwrap
+
 ## Use this spelling checker instead of the internal one.  This option
 ## does not properly have a default value.
 ##
@@ -158,6 +161,10 @@
 ## Save automatically on exit, don't prompt.
 # set tempfile

+## Enable the new (EXPERIMENTAL) generic undo code, not just for line
+## cuts.
+# set undo
+
 ## Disallow file modification.  Why would you want this in an rcfile? ;)
 # set view

@@ -170,12 +177,6 @@
 ## characters as parts of words.
 # set wordbounds

-## Enable the new (EXPERIMENTAL) generic undo code, not just for line cuts
-# set undo
-
-## Enable soft line wrapping (AKA full line display)
-# set softwrap
-

 ## Color setup
 ##
@@ -238,6 +239,9 @@
 ## C/C++
 # include "@PKGDATADIR@/c.nanorc"

+## Makefiles
+# include "@PKGDATADIR@/makefile.nanorc"
+
 ## Cascading Style Sheets
 # include "@PKGDATADIR@/css.nanorc"

@@ -283,6 +287,15 @@
 ## Java
 # include "@PKGDATADIR@/java.nanorc"

+## Fortran
+# include "@PKGDATADIR@/fortran.nanorc"
+
+## Objective-C
+# include "@PKGDATADIR@/objc.nanorc"
+
+## OCaml
+# include "@PKGDATADIR@/ocaml.nanorc"
+
 ## AWK
 # include "@PKGDATADIR@/awk.nanorc"

--- a/doc/syntax/Makefile.am
+++ b/doc/syntax/Makefile.am
@@ -22,6 +22,7 @@ pkgdata_DATA =	asm.nanorc \
 		xml.nanorc \
 		ocaml.nanorc \
 		objc.nanorc \
-		fortran.nanorc
+		fortran.nanorc \
+		makefile.nanorc

 EXTRA_DIST = $(pkgdata_DATA)
--- a/doc/syntax/gentoo.nanorc
+++ b/doc/syntax/gentoo.nanorc
@@ -27,7 +27,7 @@ color brightblue "\<(doc|ins|exe)?into\>" "\<(f|games)(owners|perms)\>" "\<(exe|
 ## Highlight common commands used in ebuilds
 color blue "\<make\>" "\<(awk|cat|cd|chmod|chown|cp|echo|env|export|find|e?grep|ln|mkdir|mv|rm|sed|set|tar|touch|unset|xargs)\>"
 ## Highlight comments (doesnt work that well)
-color yellow "#.*$"
+color yellow "(^|[[:space:]])#.*$"
 ## Highlight strings (doesnt work that well)
 color brightyellow ""(\\.|[^\"])*"" "'(\\.|[^'])*'"
 ## Trailing space is bad!
--- a/doc/syntax/makefile.nanorc
+++ b/doc/syntax/makefile.nanorc
@@ -0,0 +1,8 @@
+# unattributed syntax highlighting example from wiki.linuxhelp.net/
+
+syntax "makefile" "Makefile[^/]*$"
+color red "[:=]"
+color magenta "\<(if|ifeq|else|endif)\>"
+color blue "\$+[{(][a-zA-Z0-9_-]+[})]"
+color brightblue "^[^ 	]+:"
+color green "#.*$"
--- a/doc/syntax/nanorc.nanorc
+++ b/doc/syntax/nanorc.nanorc
@@ -4,7 +4,7 @@ syntax "nanorc" "\.?nanorc$"
 ## Possible errors and parameters
 icolor brightwhite "^[[:space:]]*((un)?set|include|syntax|i?color).*$"
 ## Keywords
-icolor brightgreen "^[[:space:]]*(set|unset)[[:space:]]+(autoindent|backup|backupdir|backwards|boldtext|brackets|casesensitive|const|cut|fill|historylog|matchbrackets|morespace|mouse|multibuffer|noconvert|nofollow|nohelp|nonewlines|nowrap|operatingdir|preserve|punct)\>" "^[[:space:]]*(set|unset)[[:space:]]+(quickblank|quotestr|rebinddelete|rebindkeypad|regexp|smarthome|smooth|speller|suspend|tabsize|tabstospaces|tempfile|view|whitespace|wordbounds)\>"
+icolor brightgreen "^[[:space:]]*(set|unset)[[:space:]]+(autoindent|backup|backupdir|backwards|boldtext|brackets|casesensitive|const|cut|fill|historylog|matchbrackets|morespace|mouse|multibuffer|noconvert|nofollow|nohelp|nonewlines|nowrap|operatingdir|preserve|punct)\>" "^[[:space:]]*(set|unset)[[:space:]]+(quickblank|quotestr|rebinddelete|rebindkeypad|regexp|smarthome|smooth|softwrap|speller|suspend|suspendenable|tabsize|tabstospaces|tempfile|undo|view|whitespace|wordbounds)\>"
 icolor green "^[[:space:]]*(set|unset|include|syntax|header)\>"
 ## Colors
 icolor yellow "^[[:space:]]*i?color[[:space:]]*(bright)?(white|black|red|blue|green|yellow|magenta|cyan)?(,(white|black|red|blue|green|yellow|magenta|cyan))?\>"
--- a/doc/texinfo/nano.texi
+++ b/doc/texinfo/nano.texi
@@ -8,8 +8,8 @@
@c Run 'makeinfo' rather than 'texinfo-format-buffer'.
@smallbook
@set EDITION 0.1
-@set VERSION 2.0.0
-@set UPDATED 17 Dec 2007
+@set VERSION 2.2.0
+@set UPDATED 30 Nov 2009

@dircategory Editors
@direntry
@@ -23,7 +23,7 @@
@titlepage
@title GNU @code{nano}
@subtitle a small and friendly text editor.
-@subtitle version 2.0.0
+@subtitle version 2.2.0

@author Chris Allegretta
@page
@@ -33,8 +33,8 @@ editor.

 This manual is part of the GNU @code{nano} distribution.@*
@sp4
-Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007
-Free Software Foundation, Inc.
+Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007,
+2008, 2009 Free Software Foundation, Inc.

 This document is dual-licensed.  You may distribute and/or modify it
 under the terms of either of the following licenses:
@@ -249,6 +249,10 @@ a chroot.
 Preserve the ^Q (XON) and ^S (XOFF) sequences so data being sent to the
 editor can be can be stopped and started.

+@item -q, --quiet
+Do not report errors in the nanorc file and ask them to be acknowledged
+by pressing Enter at startup.
+
@item -r <#cols>, --fill=<#cols>
 Wrap lines at column #cols.  If this value is 0 or less, wrapping will
 occur at the width of the screen less #cols, allowing it to vary along
@@ -266,6 +270,10 @@ Don't ask whether or not to save the current contents of the file when
 exiting, assume yes.  This is most useful when using @code{nano} as the
 composer of a mailer program.

+@item -u, --undo
+Enable experimental generic-purpose undo code.  By default, the undo and
+redo shortcuts are Meta-U and Meta-E, respectively.
+
@item -v, --view
 Don't allow the contents of the file to be altered.  Note that this
 option should NOT be used in place of correct file permissions to
@@ -288,6 +296,13 @@ disabled to display the help system navigation keys.
 Enable @code{nano}'s suspend ability using the system's suspend
 keystroke (usually ^Z).

+@item -$, --softwrap
+Enable 'soft wrapping'.  @code{nano} will attempt to display the entire
+contents of a line, even if it is longer than the screen width.  Since
+'$' normally refers to a variable in the Unix shell, you should specify
+this option last when using other options (e.g. 'nano -wS$') or pass it
+separately (e.g. 'nano -wS -$').
+
@item -a, -b, -e, -f, -g, -j
 Ignored, for compatibility with Pico.
@end table
@@ -447,6 +462,9 @@ nanorc.  See @xref{Nanorc Files}, for more info.
@item Suspend Toggle (Meta-Z)
 toggles the -z (@code{--suspend}) command line option.

+@item Soft Wrapping Toggle (Meta-$)
+toggles the -$ (@code{--softwrap}) command line option.
+
@end table


@@ -615,6 +633,9 @@ line.
@item set/unset smooth
 Use smooth scrolling by default.

+@item set/unset softwrap
+Use soft wrapping by default.
+
@item set speller "spellprog"
 Use spelling checker "spellprog" instead of the built-in one, which
 calls "spell".
@@ -622,6 +643,10 @@ calls "spell".
@item set/unset suspend
 Allow @code{nano} to be suspended.

+@item set/unset suspendenable
+If @code{nano} is allowed to be suspended, allow the suspend key
+(usually ^Z) to actually suspend it.
+
@item set tabsize "n"
 Use a tab size of "n" columns.  The value of "n" must be greater than 0.
 The default value is 8.
@@ -632,6 +657,9 @@ Convert typed tabs to spaces.
@item set/unset tempfile
 Save automatically on exit, don't prompt.

+@item set/unset undo
+Enable experimental generic-purpose undo code.
+
@item set/unset view
 Disallow file modification.

--- a/2
+++ b/2
@@ -8,7 +8,7 @@ sub combinations {
  return @rest, map { [$first, @$_] } @rest;
 } 

-my @allargs=("--enable-debug", "--disable-justify", "--disable-extra", "--enable-tiny", "--disable-browser --disable-help --disable-mouse --disable-operatingdir --disable-speller", "--disable-multibuffer", "--disable-nanorc", "--with-slang");
+my @allargs=("--enable-debug", "--disable-wrapping", "--disable-justify", "--disable-extra", "--enable-tiny", "--disable-browser --disable-help --disable-mouse --disable-operatingdir --disable-speller", "--disable-multibuffer", "--disable-nanorc", "--with-slang");
 my @combos =  combinations(@allargs);

 my $i = 0;
--- a/po/bg.po
+++ b/po/bg.po
--- a/po/ca.po
+++ b/po/ca.po
--- a/po/cs.po
+++ b/po/cs.po
--- a/po/da.po
+++ b/po/da.po
--- a/po/de.po
+++ b/po/de.po
--- a/po/es.po
+++ b/po/es.po
--- a/po/eu.po
+++ b/po/eu.po
--- a/po/fi.po
+++ b/po/fi.po
--- a/po/fr.po
+++ b/po/fr.po
--- a/po/ga.po
+++ b/po/ga.po
--- a/po/gl.po
+++ b/po/gl.po
--- a/po/hu.po
+++ b/po/hu.po
--- a/po/id.po
+++ b/po/id.po
--- a/po/it.po
+++ b/po/it.po
--- a/po/ms.po
+++ b/po/ms.po
--- a/po/nano.pot
+++ b/po/nano.pot
--- a/po/nb.po
+++ b/po/nb.po
--- a/po/nl.po
+++ b/po/nl.po
--- a/po/nn.po
+++ b/po/nn.po
--- a/po/pl.po
+++ b/po/pl.po
--- a/po/pt_BR.po
+++ b/po/pt_BR.po
--- a/po/ro.po
+++ b/po/ro.po
--- a/po/ru.po
+++ b/po/ru.po
--- a/po/rw.po
+++ b/po/rw.po
--- a/po/sr.po
+++ b/po/sr.po
--- a/po/sv.po
+++ b/po/sv.po
--- a/po/tr.po
+++ b/po/tr.po
--- a/po/uk.po
+++ b/po/uk.po
--- a/po/vi.po
+++ b/po/vi.po
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
--- a/po/zh_TW.po
+++ b/po/zh_TW.po
--- a/src/browser.c
+++ b/src/browser.c
@@ -2,7 +2,7 @@
 /**************************************************************************
 *   browser.c                                                            *
 *                                                                        *
- *   Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2007               *
+ *   Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009   *
 *   Free Software Foundation, Inc.                                       *
 *   This program is free software; you can redistribute it and/or modify *
 *   it under the terms of the GNU General Public License as published by *
@@ -184,7 +184,7 @@ char *do_browser(char *path, DIR *dir)
 		do_filesearch();
 		curs_set(0);
 	    /* Search for another filename. */
-	} else if (f->scfunc ==  WHEREIS_NEXT_MSG) {
+	} else if (f->scfunc == DO_RESEARCH) {
 		do_fileresearch();
 	} else if (f->scfunc == DO_PAGE_UP) {
 		if (selected >= (editwinrows + fileline % editwinrows) *
@@ -232,7 +232,7 @@ char *do_browser(char *path, DIR *dir)
 		     * blank out ans, since we're done with it. */
 		    statusbar(_("Cancelled"));
 		    ans = mallocstrcpy(ans, "");
-		    break;
+		    continue;
 		} else if (i != 0) {
 		    /* Put back the "Go to Directory" key and save
 		     * answer in ans, so that the file list is displayed
@@ -240,7 +240,7 @@ char *do_browser(char *path, DIR *dir)
 		     * typed before at the prompt is displayed again. */
 		    unget_kbinput(sc_seq_or(DO_GOTOLINECOLUMN_VOID, 0), FALSE, FALSE);
 		    ans = mallocstrcpy(ans, answer);
-		    break;
+		    continue;
 		}

 		/* We have a directory.  Blank out ans, since we're done
@@ -266,7 +266,7 @@ char *do_browser(char *path, DIR *dir)
 			_("Can't go outside of %s in restricted mode"),
 			operating_dir);
 		    free(new_path);
-		    break;
+		    continue;
 		}
 #endif

@@ -278,7 +278,7 @@ char *do_browser(char *path, DIR *dir)
 			strerror(errno));
 		    beep();
 		    free(new_path);
-		    break;
+		    continue;
 		}

 		/* Start over again with the new path value. */
@@ -302,7 +302,7 @@ char *do_browser(char *path, DIR *dir)
 		if (strcmp(filelist[selected], "/..") == 0) {
 		    statusbar(_("Can't move up a directory"));
 		    beep();
-		    break;
+		    continue;
 		}

 #ifndef DISABLE_OPERATINGDIR
@@ -314,7 +314,7 @@ char *do_browser(char *path, DIR *dir)
 			_("Can't go outside of %s in restricted mode"),
 			operating_dir);
 		    beep();
-		    break;
+		    continue;
 		}
 #endif

@@ -324,7 +324,7 @@ char *do_browser(char *path, DIR *dir)
 		    statusbar(_("Error reading %s: %s"),
 			filelist[selected], strerror(errno));
 		    beep();
-		    break;
+		    continue;
 		}

 		/* If we've successfully opened a file, we're done, so
@@ -332,7 +332,7 @@ char *do_browser(char *path, DIR *dir)
 		if (!S_ISDIR(st.st_mode)) {
 		    retval = mallocstrcpy(NULL, filelist[selected]);
 		    abort = TRUE;
-		    break;
+		    continue;
 		/* If we've successfully opened a directory, and it's
 		 * "..", save the current directory in prev_dir, so that
 		 * we can select it later. */
@@ -347,7 +347,7 @@ char *do_browser(char *path, DIR *dir)
 		    statusbar(_("Error reading %s: %s"),
 			filelist[selected], strerror(errno));
 		    beep();
-		    break;
+		    continue;
 		}

 		path = mallocstrcpy(path, filelist[selected]);
--- a/src/chars.c
+++ b/src/chars.c
@@ -2,7 +2,7 @@
 /**************************************************************************
 *   chars.c                                                              *
 *                                                                        *
- *   Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2007               *
+ *   Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009   *
 *   Free Software Foundation, Inc.                                       *
 *   This program is free software; you can redistribute it and/or modify *
 *   it under the terms of the GNU General Public License as published by *
@@ -79,6 +79,16 @@ bool is_byte(int c)
    return ((unsigned int)c == (unsigned char)c);
 }

+static void mbtowc_reset(void)
+{
+    IGNORE_CALL_RESULT(mbtowc(NULL, NULL, 0));
+}
+
+static void wctomb_reset(void)
+{
+    IGNORE_CALL_RESULT(wctomb(NULL, 0));
+}
+
 /* This function is equivalent to isalnum() for multibyte characters. */
 bool is_alnum_mbchar(const char *c)
 {
@@ -89,7 +99,7 @@ bool is_alnum_mbchar(const char *c)
 	wchar_t wc;

 	if (mbtowc(&wc, c, MB_CUR_MAX) < 0) {
-	    mbtowc(NULL, NULL, 0);
+	    mbtowc_reset();
 	    wc = bad_wchar;
 	}

@@ -109,7 +119,7 @@ bool is_blank_mbchar(const char *c)
 	wchar_t wc;

 	if (mbtowc(&wc, c, MB_CUR_MAX) < 0) {
-	    mbtowc(NULL, NULL, 0);
+	    mbtowc_reset();
 	    wc = bad_wchar;
 	}

@@ -156,7 +166,7 @@ bool is_cntrl_mbchar(const char *c)
 	wchar_t wc;

 	if (mbtowc(&wc, c, MB_CUR_MAX) < 0) {
-	    mbtowc(NULL, NULL, 0);
+	    mbtowc_reset();
 	    wc = bad_wchar;
 	}

@@ -177,7 +187,7 @@ bool is_punct_mbchar(const char *c)
 	int c_mb_len = mbtowc(&wc, c, MB_CUR_MAX);

 	if (c_mb_len < 0) {
-	    mbtowc(NULL, NULL, 0);
+	    mbtowc_reset();
 	    wc = bad_wchar;
 	}

@@ -243,14 +253,14 @@ char *control_mbrep(const char *c, char *crep, int *crep_len)
 	wchar_t wc;

 	if (mbtowc(&wc, c, MB_CUR_MAX) < 0) {
-	    mbtowc(NULL, NULL, 0);
+	    mbtowc_reset();
 	    *crep_len = bad_mbchar_len;
 	    strncpy(crep, bad_mbchar, *crep_len);
 	} else {
 	    *crep_len = wctomb(crep, control_wrep(wc));

 	    if (*crep_len < 0) {
-		wctomb(NULL, 0);
+		wctomb_reset();
 		*crep_len = 0;
 	    }
 	}
@@ -278,14 +288,14 @@ char *mbrep(const char *c, char *crep, int *crep_len)

 	/* Reject invalid Unicode characters. */
 	if (mbtowc(&wc, c, MB_CUR_MAX) < 0 || !is_valid_unicode(wc)) {
-	    mbtowc(NULL, NULL, 0);
+	    mbtowc_reset();
 	    *crep_len = bad_mbchar_len;
 	    strncpy(crep, bad_mbchar, *crep_len);
 	} else {
 	    *crep_len = wctomb(crep, wc);

 	    if (*crep_len < 0) {
-		wctomb(NULL, 0);
+		wctomb_reset();
 		*crep_len = 0;
 	    }
 	}
@@ -311,7 +321,7 @@ int mbwidth(const char *c)
 	int width;

 	if (mbtowc(&wc, c, MB_CUR_MAX) < 0) {
-	    mbtowc(NULL, NULL, 0);
+	    mbtowc_reset();
 	    wc = bad_wchar;
 	}

@@ -356,7 +366,7 @@ char *make_mbchar(long chr, int *chr_mb_len)

 	/* Reject invalid Unicode characters. */
 	if (*chr_mb_len < 0 || !is_valid_unicode((wchar_t)chr)) {
-	    wctomb(NULL, 0);
+	    wctomb_reset();
 	    *chr_mb_len = 0;
 	}
    } else {
@@ -388,7 +398,7 @@ int parse_mbchar(const char *buf, char *chr, size_t *col)
 	/* If buf contains an invalid multibyte character, only
 	 * interpret buf's first byte. */
 	if (buf_mb_len < 0) {
-	    mblen(NULL, 0);
+	    IGNORE_CALL_RESULT(mblen(NULL, 0));
 	    buf_mb_len = 1;
 	} else if (buf_mb_len == 0)
 	    buf_mb_len++;
@@ -545,7 +555,7 @@ int mbstrncasecmp(const char *s1, const char *s2, size_t n)
 	    s1_mb_len = parse_mbchar(s1, s1_mb, NULL);

 	    if (mbtowc(&ws1, s1_mb, s1_mb_len) < 0) {
-		mbtowc(NULL, NULL, 0);
+		mbtowc_reset();
 		ws1 = (unsigned char)*s1_mb;
 		bad_s1_mb = TRUE;
 	    }
@@ -553,7 +563,7 @@ int mbstrncasecmp(const char *s1, const char *s2, size_t n)
 	    s2_mb_len = parse_mbchar(s2, s2_mb, NULL);

 	    if (mbtowc(&ws2, s2_mb, s2_mb_len) < 0) {
-		mbtowc(NULL, NULL, 0);
+		mbtowc_reset();
 		ws2 = (unsigned char)*s2_mb;
 		bad_s2_mb = TRUE;
 	    }
@@ -781,7 +791,7 @@ char *mbstrchr(const char *s, const char *c)
 	int c_mb_len = mbtowc(&wc, c, MB_CUR_MAX);

 	if (c_mb_len < 0) {
-	    mbtowc(NULL, NULL, 0);
+	    mbtowc_reset();
 	    wc = (unsigned char)*c;
 	    bad_c_mb = TRUE;
 	}
@@ -790,7 +800,7 @@ char *mbstrchr(const char *s, const char *c)
 	    int s_mb_len = parse_mbchar(s, s_mb, NULL);

 	    if (mbtowc(&ws, s_mb, s_mb_len) < 0) {
-		mbtowc(NULL, NULL, 0);
+		mbtowc_reset();
 		ws = (unsigned char)*s;
 		bad_s_mb = TRUE;
 	    }
--- a/src/color.c
+++ b/src/color.c
@@ -2,7 +2,7 @@
 /**************************************************************************
 *   color.c                                                              *
 *                                                                        *
- *   Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2007               *
+ *   Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009   *
 *   Free Software Foundation, Inc.                                       *
 *   This program is free software; you can redistribute it and/or modify *
 *   it under the terms of the GNU General Public License as published by *
--- a/src/cut.c
+++ b/src/cut.c
@@ -2,8 +2,8 @@
 /**************************************************************************
 *   cut.c                                                                *
 *                                                                        *
- *   Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007   *
- *   Free Software Foundation, Inc.                                       *
+ *   Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007,  *
+ *   2008, 2009 Free Software Foundation, Inc.                            *
 *   This program is free software; you can redistribute it and/or modify *
 *   it under the terms of the GNU General Public License as published by *
 *   the Free Software Foundation; either version 3, or (at your option)  *
--- a/src/files.c
+++ b/src/files.c
@@ -2,8 +2,8 @@
 /**************************************************************************
 *   files.c                                                              *
 *                                                                        *
- *   Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007   *
- *   Free Software Foundation, Inc.                                       *
+ *   Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007,  *
+ *   2008, 2009 Free Software Foundation, Inc.                            *
 *   This program is free software; you can redistribute it and/or modify *
 *   it under the terms of the GNU General Public License as published by *
 *   the Free Software Foundation; either version 3, or (at your option)  *
@@ -146,7 +146,7 @@ void open_buffer(const char *filename, bool undoable)
    /* If we have a non-new file, read it in.  Then, if the buffer has
     * no stat, update the stat, if applicable. */
    if (rc > 0) {
-	read_file(f, rc, filename, undoable);
+	read_file(f, rc, filename, undoable, new_buffer);
 #ifndef NANO_TINY
 	if (openfile->current_stat == NULL) {
 	    openfile->current_stat =
@@ -196,7 +196,7 @@ void replace_buffer(const char *filename)

    /* If we have a non-new file, read it in. */
    if (rc > 0)
-	read_file(f, rc, filename, FALSE);
+	read_file(f, rc, filename, FALSE, TRUE);

    /* Move back to the beginning of the first line of the buffer. */
    openfile->current = openfile->fileage;
@@ -309,7 +309,7 @@ int is_file_writable(const char *filename)
    if (ISSET(VIEW_MODE))
 	return TRUE;

-    assert(filename != NULL && f != NULL);
+    assert(filename != NULL);

    /* Get the specified file's full path. */
    full_filename = get_full_path(filename);
@@ -390,9 +390,9 @@ filestruct *read_line(char *buf, filestruct *prevnode, bool
 /* Read an open file into the current buffer.  f should be set to the
 * open file, and filename should be set to the name of the file.
 * undoable  means do we want to create undo records to try and undo this.
- * Will also attempt to check file writability if fd > 0
+ * Will also attempt to check file writability if fd > 0 and checkwritable == TRUE
 */
-void read_file(FILE *f, int fd, const char *filename, bool undoable)
+void read_file(FILE *f, int fd, const char *filename, bool undoable, bool checkwritable)
 {
    size_t num_lines = 0;
 	/* The number of lines in the file. */
@@ -514,7 +514,7 @@ void read_file(FILE *f, int fd, const char *filename, bool undoable)
    if (ferror(f))
 	nperror(filename);
    fclose(f);
-    if (fd > 0) {
+    if (fd > 0 && checkwritable) {
 	close(fd);
 	writable = is_file_writable(filename);
    }
@@ -1190,7 +1190,7 @@ char *get_full_path(const char *origpath)
 	    /* Finally, go back to the path specified in d_here,
 	     * where we were before.  We don't check for a chdir()
 	     * error, since we can do nothing if we get one. */
-	    chdir(d_here);
+	    IGNORE_CALL_RESULT(chdir(d_here));

 	    /* Free d_here, since we're done using it. */
 	    free(d_here);
@@ -1500,6 +1500,13 @@ bool write_file(const char *name, FILE *f_open, bool tmp, append_type
    realexists = (stat(realname, &st) != -1);

 #ifndef NANO_TINY
+    /* if we have not stat()d this file before (say, the user just
+     * specified it interactively), use the info we just got from
+     * stat()ing or else we will chase null pointers when we do
+     * modtime checks, preserve file times, etc. during backup */
+    if (openfile->current_stat == NULL && realexists)
+	openfile->current_stat = &st;
+
    /* We backup only if the backup toggle is set, the file isn't
     * temporary, and the file already exists.  Furthermore, if we
     * aren't appending, prepending, or writing a selection, we backup
@@ -2118,6 +2125,7 @@ bool do_writeout(bool exiting)
 		    }
 		}
 #ifndef NANO_TINY
+
 		if (name_exists && openfile->current_stat && openfile->current_stat->st_mtime < st.st_mtime) {
 		    i = do_yesno_prompt(FALSE,
 			_("File was modified since you opened it, continue saving ? "));
--- a/src/global.c
+++ b/src/global.c
@@ -2,8 +2,8 @@
 /**************************************************************************
 *   global.c                                                             *
 *                                                                        *
- *   Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007   *
- *   Free Software Foundation, Inc.                                       *
+ *   Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007,  *
+ *   2008, 2009 Free Software Foundation, Inc.                            *
 *   This program is free software; you can redistribute it and/or modify *
 *   it under the terms of the GNU General Public License as published by *
 *   the Free Software Foundation; either version 3, or (at your option)  *
@@ -214,7 +214,7 @@ size_t length_of_list(int menu)
 }

 /* Set type of function based on the string */
-function_type strtokeytype(char *str)
+function_type strtokeytype(const char *str)
 {
    if (str[0] ==  'M' || str[0] == 'm')
        return META;
@@ -289,7 +289,7 @@ const sc *first_sc_for(int menu, short func) {

 /* Add a string to the new shortcut list implementation
   Allows updates to existing entries in the list */
-void add_to_sclist(int menu, char *scstring, short func, int toggle, int execute)
+void add_to_sclist(int menu, const char *scstring, short func, int toggle, int execute)
 {
    sc *s;

@@ -315,7 +315,7 @@ void add_to_sclist(int menu, char *scstring, short func, int toggle, int execute
    s->type = strtokeytype(scstring);
    s->menu = menu;
    s->toggle = toggle;
-    s->keystr = scstring;
+    s->keystr = (char *) scstring;
    s->scfunc = func;
    s->execute = execute;
    assign_keyinfo(s);
@@ -411,7 +411,10 @@ void print_sclist(void)


 /* Stuff we need to make at least static here so we can access it below */
+/* TRANSLATORS: Try to keep the next five strings at most 10 characters. */
 const char *cancel_msg = N_("Cancel");
+const char *replace_msg = N_("Replace");
+const char *no_replace_msg = N_("No Replace");

 #ifndef NANO_TINY
 const char *case_sens_msg = N_("Case Sens");
@@ -447,8 +450,6 @@ const char *ext_cmd_msg = "";
 /* TRANSLATORS: Try to keep the next five strings at most 10 characters. */
 const char *prev_history_msg = N_("PrevHstory");
 const char *next_history_msg = N_("NextHstory");
-const char *replace_msg = N_("Replace");
-const char *no_replace_msg = N_("No Replace");
 const char *gototext_msg = N_("Go To Text");
 /* TRANSLATORS: Try to keep the next three strings at most 12 characters. */
 const char *whereis_next_msg = N_("WhereIs Next");
@@ -490,7 +491,9 @@ void shortcut_init(bool unjustify)
    const char *fulljstify_msg = N_("FullJstify");
 #endif
    const char *refresh_msg = N_("Refresh");
+#ifndef NANO_TINY
    const char *insert_file_msg =  N_("Insert File");
+#endif
    const char *go_to_line_msg = N_("Go To Line");

 #ifndef DISABLE_JUSTIFY
@@ -635,8 +638,9 @@ void shortcut_init(bool unjustify)
 	N_("Go to the first file in the list");
    const char *nano_lastfile_msg =
 	N_("Go to the last file in the list");
+    const char *nano_forwardfile_msg = N_("Go to the next file in the list");
+    const char *nano_backfile_msg = N_("Go to the previous file in the list");
    const char *nano_gotodir_msg = N_("Go to directory");
-
 #endif
 #endif /* !DISABLE_HELP */

@@ -652,8 +656,9 @@ void shortcut_init(bool unjustify)
        free(f);
    }

-    add_to_funcs(DO_HELP_VOID, MALL, get_help_msg, IFSCHELP(nano_help_msg),
-	FALSE, VIEW);
+    add_to_funcs(DO_HELP_VOID,
+	(MMAIN|MWHEREIS|MREPLACE|MREPLACE2|MGOTOLINE|MWRITEFILE|MINSERTFILE|MEXTCMD|MSPELL|MBROWSER|MWHEREISFILE|MGOTODIR),
+	get_help_msg, IFSCHELP(nano_help_msg), FALSE, VIEW);

    add_to_funcs( CANCEL_MSG,
 	(MWHEREIS|MREPLACE|MREPLACE2|MGOTOLINE|MWRITEFILE|MINSERTFILE|MEXTCMD|MSPELL|MWHEREISFILE|MGOTODIR|MYESNO),
@@ -666,8 +671,6 @@ void shortcut_init(bool unjustify)
 #endif
 	exit_msg, IFSCHELP(nano_exit_msg), FALSE, VIEW);

-    add_to_funcs(DO_EXIT, MHELP, exit_msg, IFSCHELP(nano_exit_msg), FALSE, VIEW);
-
 #ifndef DISABLE_BROWSER
    add_to_funcs(DO_EXIT, MBROWSER, exit_msg, IFSCHELP(nano_exitbrowser_msg), FALSE, VIEW);
 #endif
@@ -699,9 +702,9 @@ void shortcut_init(bool unjustify)
    add_to_funcs(DO_SEARCH, MMAIN|MBROWSER, whereis_msg,
 	IFSCHELP(nano_whereis_msg), FALSE, VIEW);

-    add_to_funcs(DO_PAGE_UP, MMAIN|MHELP,
+    add_to_funcs(DO_PAGE_UP, MMAIN|MHELP|MBROWSER,
 	prev_page_msg, IFSCHELP(nano_prevpage_msg), FALSE, VIEW);
-    add_to_funcs(DO_PAGE_DOWN, MMAIN|MHELP,
+    add_to_funcs(DO_PAGE_DOWN, MMAIN|MHELP|MBROWSER,
 	next_page_msg, IFSCHELP(nano_nextpage_msg), TRUE, VIEW);


@@ -736,11 +739,11 @@ void shortcut_init(bool unjustify)
 #endif

    add_to_funcs(DO_FIRST_LINE,
-	(MMAIN|MWHEREIS|MREPLACE|MREPLACE2|MGOTOLINE|MHELP),
+	(MMAIN|MWHEREIS|MREPLACE|MREPLACE2|MGOTOLINE),
 	first_line_msg, IFSCHELP(nano_firstline_msg), FALSE, VIEW);

    add_to_funcs(DO_LAST_LINE,
-	(MMAIN|MWHEREIS|MREPLACE|MREPLACE2|MGOTOLINE|MHELP),
+	(MMAIN|MWHEREIS|MREPLACE|MREPLACE2|MGOTOLINE),
 	last_line_msg, IFSCHELP(nano_lastline_msg), TRUE, VIEW);


@@ -790,18 +793,24 @@ void shortcut_init(bool unjustify)

 #endif

-    add_to_funcs(DO_PAGE_UP, MBROWSER,
-	prev_page_msg, IFSCHELP(nano_prevpage_msg), FALSE, VIEW);
-    add_to_funcs(DO_PAGE_DOWN, MBROWSER,
-	next_page_msg, IFSCHELP(nano_nextpage_msg), TRUE, VIEW);
-
-
-    add_to_funcs(DO_RIGHT, (MMAIN|MBROWSER), N_("Forward"), IFSCHELP(nano_forward_msg),
+    add_to_funcs(DO_RIGHT, MMAIN, N_("Forward"), IFSCHELP(nano_forward_msg),
 	FALSE, VIEW);
+
+#ifndef DISABLE_BROWSER
+    add_to_funcs(DO_RIGHT, MBROWSER, N_("Forward"), IFSCHELP(nano_forwardfile_msg),
+	FALSE, VIEW);
+#endif
+
    add_to_funcs(DO_RIGHT, MALL, "", "", FALSE, VIEW);

-    add_to_funcs(DO_LEFT, (MMAIN|MBROWSER), N_("Back"), IFSCHELP(nano_back_msg),
+    add_to_funcs(DO_LEFT, MMAIN, N_("Back"), IFSCHELP(nano_back_msg),
 	FALSE, VIEW);
+
+#ifndef DISABLE_BROWSER
+    add_to_funcs(DO_LEFT, MBROWSER, N_("Back"), IFSCHELP(nano_backfile_msg),
+	FALSE, VIEW);
+#endif
+
    add_to_funcs(DO_LEFT, MALL, "", "", FALSE, VIEW);

 #ifndef NANO_TINY
@@ -998,6 +1007,10 @@ void shortcut_init(bool unjustify)
 #ifndef DISABLE_HELP
    add_to_funcs( REFRESH_MSG, MHELP,
 	refresh_msg, nano_refresh_msg, FALSE, VIEW);
+
+    add_to_funcs(DO_EXIT, MHELP, exit_msg, IFSCHELP(nano_exit_msg), FALSE, VIEW);
+
+
 #endif

 #ifndef DISABLE_BROWSER
@@ -1016,12 +1029,15 @@ void shortcut_init(bool unjustify)

    currmenu = MMAIN;

-    add_to_sclist(MALL, "^G", DO_HELP_VOID, 0, TRUE);
-    add_to_sclist(MALL, "F1", DO_HELP_VOID, 0, TRUE);
+    add_to_sclist(MMAIN|MWHEREIS|MREPLACE|MREPLACE2|MGOTOLINE|MWRITEFILE|MINSERTFILE|MEXTCMD|MSPELL|MBROWSER|MWHEREISFILE|MGOTODIR,
+	"^G", DO_HELP_VOID, 0, TRUE);
+    add_to_sclist(MMAIN|MWHEREIS|MREPLACE|MREPLACE2|MGOTOLINE|MWRITEFILE|MINSERTFILE|MEXTCMD|MSPELL|MBROWSER|MWHEREISFILE|MGOTODIR,
+	"F1", DO_HELP_VOID, 0, TRUE);
    add_to_sclist(MMAIN|MHELP|MBROWSER, "^X", DO_EXIT, 0, TRUE);
    add_to_sclist(MMAIN|MHELP|MBROWSER, "F2", DO_EXIT, 0, TRUE);
    add_to_sclist(MMAIN, "^_", DO_GOTOLINECOLUMN_VOID, 0, TRUE);
    add_to_sclist(MMAIN, "F13", DO_GOTOLINECOLUMN_VOID, 0, TRUE);
+    add_to_sclist(MMAIN, "M-G", DO_GOTOLINECOLUMN_VOID, 0, TRUE);
    add_to_sclist(MMAIN, "^O", DO_WRITEOUT_VOID, 0, TRUE);
    add_to_sclist(MMAIN, "F3", DO_WRITEOUT_VOID, 0, TRUE);
 #ifndef DISABLE_JUSTIFY
@@ -1049,9 +1065,6 @@ void shortcut_init(bool unjustify)
    add_to_sclist(MMAIN, "^T", DO_SPELL, 0, TRUE);
    add_to_sclist(MMAIN, "F12", DO_SPELL, 0, TRUE);
 #endif
-    add_to_sclist(MMAIN, "^_", DO_GOTOLINECOLUMN_VOID, 0, TRUE);
-    add_to_sclist(MMAIN, "F13", DO_GOTOLINECOLUMN_VOID, 0, TRUE);
-    add_to_sclist(MMAIN, "M-G", DO_GOTOLINECOLUMN_VOID, 0, TRUE);
    add_to_sclist(MMAIN, "^\\", DO_REPLACE, 0, TRUE);
    add_to_sclist(MMAIN, "F14", DO_REPLACE, 0, TRUE);
    add_to_sclist(MMAIN, "M-R", DO_REPLACE, 0, TRUE);
@@ -1062,8 +1075,8 @@ void shortcut_init(bool unjustify)
    add_to_sclist(MMAIN, "^^", DO_MARK, 0, TRUE);
    add_to_sclist(MMAIN, "F15", DO_MARK, 0, TRUE);
    add_to_sclist(MMAIN, "M-A", DO_MARK, 0, TRUE);
-    add_to_sclist(MALL, "M-W", DO_RESEARCH, 0, TRUE);
-    add_to_sclist(MALL, "F16", DO_RESEARCH, 0, TRUE);
+    add_to_sclist(MMAIN|MBROWSER, "M-W", DO_RESEARCH, 0, TRUE);
+    add_to_sclist(MMAIN|MBROWSER, "F16", DO_RESEARCH, 0, TRUE);
    add_to_sclist(MMAIN, "M-^", DO_COPY_TEXT, 0, TRUE);
    add_to_sclist(MMAIN, "M-6", DO_COPY_TEXT, 0, TRUE);
    add_to_sclist(MMAIN, "M-}", DO_INDENT_VOID, 0, TRUE);
@@ -1081,10 +1094,10 @@ void shortcut_init(bool unjustify)
    add_to_sclist(MALL, "kleft", DO_LEFT, 0, TRUE);
    add_to_sclist(MMAIN, "^Q", XON_COMPLAINT, 0, TRUE);
    add_to_sclist(MMAIN, "^S", XOFF_COMPLAINT, 0, TRUE);
-    add_to_sclist(MMAIN|MBROWSER, "^P", DO_UP_VOID, 0, TRUE);
-    add_to_sclist(MMAIN|MBROWSER, "kup", DO_UP_VOID, 0, TRUE);
-    add_to_sclist(MMAIN|MBROWSER, "^N", DO_DOWN_VOID, 0, TRUE);
-    add_to_sclist(MMAIN|MBROWSER, "kdown", DO_DOWN_VOID, 0, TRUE);
+    add_to_sclist(MMAIN|MHELP|MBROWSER, "^P", DO_UP_VOID, 0, TRUE);
+    add_to_sclist(MMAIN|MHELP|MBROWSER, "kup", DO_UP_VOID, 0, TRUE);
+    add_to_sclist(MMAIN|MHELP|MBROWSER, "^N", DO_DOWN_VOID, 0, TRUE);
+    add_to_sclist(MMAIN|MHELP|MBROWSER, "kdown", DO_DOWN_VOID, 0, TRUE);
    add_to_sclist(MALL, "^A", DO_HOME, 0, TRUE);
    add_to_sclist(MALL, "khome", DO_HOME, 0, TRUE);
    add_to_sclist(MALL, "^E", DO_END, 0, TRUE);
@@ -1129,6 +1142,9 @@ void shortcut_init(bool unjustify)
    add_to_sclist(MBROWSER|MWHEREISFILE, "M-|",  FIRST_FILE_MSG, 0, TRUE);
    add_to_sclist(MBROWSER|MWHEREISFILE, "M-/",  LAST_FILE_MSG, 0, TRUE);
    add_to_sclist(MBROWSER|MWHEREISFILE, "M-?",  LAST_FILE_MSG, 0, TRUE);
+    add_to_sclist(MBROWSER|MWHEREISFILE, "^_",  GOTO_DIR_MSG, 0, TRUE);
+    add_to_sclist(MBROWSER|MWHEREISFILE, "F13",  GOTO_DIR_MSG, 0, TRUE);
+    add_to_sclist(MBROWSER|MWHEREISFILE, "M-G",  GOTO_DIR_MSG, 0, TRUE);
 #ifndef NANO_TINY
    add_to_sclist(MMAIN, "M-]", DO_FIND_BRACKET, 0, TRUE);
    add_to_sclist(MMAIN, "M--", DO_SCROLL_UP, 0, TRUE);
@@ -1344,7 +1360,7 @@ const subnfunc *sctofunc(sc *s)
 #ifndef NANO_TINY
 /* Now lets come up with a single (hopefully)
   function to get a string for each flag */
-char *flagtostr(int flag)
+const char *flagtostr(int flag)
 {
   switch (flag) {
        case NO_HELP:
--- a/src/help.c
+++ b/src/help.c
@@ -2,8 +2,8 @@
 /**************************************************************************
 *   help.c                                                               *
 *                                                                        *
- *   Copyright (C) 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007         *
- *   Free Software Foundation, Inc.                                       *
+ *   Copyright (C) 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008,  *
+ *   2009 Free Software Foundation, Inc.                                  *
 *   This program is free software; you can redistribute it and/or modify *
 *   it under the terms of the GNU General Public License as published by *
 *   the Free Software Foundation; either version 3, or (at your option)  *
--- a/src/move.c
+++ b/src/move.c
@@ -2,8 +2,8 @@
 /**************************************************************************
 *   move.c                                                               *
 *                                                                        *
- *   Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007   *
- *   Free Software Foundation, Inc.                                       *
+ *   Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007,  *
+ *   2008, 2009 Free Software Foundation, Inc.                            *
 *   This program is free software; you can redistribute it and/or modify *
 *   it under the terms of the GNU General Public License as published by *
 *   the Free Software Foundation; either version 3, or (at your option)  *
@@ -50,18 +50,20 @@ void do_last_line(void)
 /* Move up one page. */
 void do_page_up(void)
 {
-    int i;
+    int i, skipped = 0;

    /* If there's less than a page of text left on the screen, put the
     * cursor at the beginning of the first line of the file, and then
     * update the edit window. */
-    if (openfile->current->lineno <= editwinrows - 2) {
+    if (openfile->current->lineno == 1 || (!ISSET(SOFTWRAP) &&
+	openfile->current->lineno <= editwinrows - 2)) {
 	do_first_line();
 	return;
    }

    /* If we're not in smooth scrolling mode, put the cursor at the
     * beginning of the top line of the edit window, as Pico does. */
+
 #ifndef NANO_TINY
    if (!ISSET(SMOOTH_SCROLL)) {
 #endif
@@ -71,15 +73,28 @@ void do_page_up(void)
    }
 #endif

-    for (i = editwinrows - 2; i > 0 && openfile->current !=
-	openfile->fileage; i--)
+    for (i = editwinrows - 2; i - skipped > 0 && openfile->current !=
+	openfile->fileage; i--) {
 	openfile->current = openfile->current->prev;
+	if (ISSET(SOFTWRAP) && openfile->current) {
+	    skipped += strlenpt(openfile->current->data) / COLS;
+#ifdef DEBUG
+    fprintf(stderr, "do_page_up: i = %d, skipped = %d based on line %ld len %d\n", i, (unsigned long) skipped, 
+openfile->current->lineno, strlenpt(openfile->current->data));
+#endif
+	}
+    }

    openfile->current_x = actual_x(openfile->current->data,
 	openfile->placewewant);

+#ifdef DEBUG
+    fprintf(stderr, "do_page_up: openfile->current->lineno = %lu, skipped = %d\n", (unsigned long) openfile->current->lineno, skipped);
+#endif
+
    /* Scroll the edit window up a page. */
-    edit_scroll(UP_DIR, editwinrows - 2);
+    openfile->current_y = 0;
+    edit_update(NONE);
 }

 /* Move down one page. */
@@ -107,15 +122,11 @@ void do_page_down(void)
    }
 #endif

-#ifdef DEBUG
-    fprintf(stderr, "do_page_down: maxrows = %d\n", maxrows);
-#endif
-
    for (i = maxrows - 2; i > 0 && openfile->current !=
 	openfile->filebot; i--) {
 	openfile->current = openfile->current->next;
 #ifdef DEBUG
-    fprintf(stderr, "do_page_down: moving to line %d\n", openfile->current->lineno);
+    fprintf(stderr, "do_page_down: moving to line %lu\n", (unsigned long) openfile->current->lineno);
 #endif

    }
@@ -124,7 +135,8 @@ void do_page_down(void)
 	openfile->placewewant);

    /* Scroll the edit window down a page. */
-    edit_scroll(DOWN_DIR, maxrows - 2);
+    openfile->current_y = 0;
+    edit_update(NONE);
 }

 #ifndef DISABLE_JUSTIFY
@@ -512,7 +524,7 @@ void do_up(
 #ifndef NANO_TINY
 		(ISSET(SMOOTH_SCROLL) || scroll_only) ? 1 :
 #endif
-		editwinrows / 2);
+		editwinrows / 2 + 1);

    /* If we're below the first line of the edit window, update the
     * line we were on before and the line we're on now.  The former
@@ -568,17 +580,7 @@ void do_down(
 	openfile->placewewant);

    if (ISSET(SOFTWRAP)) {
-	filestruct *foo;
-	ssize_t extracuzsoft = 0;
-
-	for (foo = openfile->edittop; foo
-		&& foo->lineno - openfile->edittop->lineno + extracuzsoft < editwinrows;
-		foo = foo->next) {
-	    extracuzsoft += strlenpt(foo->data) / (COLS - 1);
-	    if (foo == openfile->current)
-		break;
-	}
-	if (foo && foo->lineno - openfile->edittop->lineno + extracuzsoft >= editwinrows)
+	if (openfile->current->lineno - openfile->edittop->lineno >= maxrows)
 	    onlastline = TRUE;
    }

@@ -591,13 +593,15 @@ void do_down(
 #ifndef NANO_TINY
 	|| scroll_only
 #endif
-	)
+	) {
 	edit_scroll(DOWN_DIR,
 #ifndef NANO_TINY
 		(ISSET(SMOOTH_SCROLL) || scroll_only) ? 1 :
 #endif
-		editwinrows / 2);
+		editwinrows / 2 + 1);

+	edit_refresh_needed = TRUE;
+    }
    /* If we're above the last line of the edit window, update the line
     * we were on before and the line we're on now.  The former needs to
     * be redrawn if we're not on the first page, and the latter needs
--- a/src/nano.c
+++ b/src/nano.c
@@ -2,8 +2,8 @@
 /**************************************************************************
 *   nano.c                                                               *
 *                                                                        *
- *   Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007   *
- *   Free Software Foundation, Inc.                                       *
+ *   Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007,  *
+ *   2008, 2009 Free Software Foundation, Inc.                            *
 *   This program is free software; you can redistribute it and/or modify *
 *   it under the terms of the GNU General Public License as published by *
 *   the Free Software Foundation; either version 3, or (at your option)  *
@@ -394,11 +394,7 @@ void move_to_filestruct(filestruct **file_top, filestruct **file_bot,
    /* If the top of the edit window was inside the old partition, put
     * it in range of current. */
    if (edittop_inside)
-	edit_update(
-#ifndef NANO_TINY
-		ISSET(SMOOTH_SCROLL) ? NONE :
-#endif
-		CENTER);
+	edit_update(NONE);

    /* Renumber starting with the beginning line of the old
     * partition. */
@@ -522,6 +518,7 @@ openfilestruct *make_new_opennode(void)
    newnode->edittop = NULL;
    newnode->current = NULL;
 #ifndef NANO_TINY
+    newnode->current_stat = NULL;
    newnode->last_action = OTHER;
 #endif

@@ -638,7 +635,11 @@ void die(const char *msg, ...)
 	if (filepart != NULL)
 	    unpartition_filestruct(&filepart);

-	die_save_file(openfile->filename, openfile->current_stat);
+	die_save_file(openfile->filename
+#ifndef NANO_TINY
+		, openfile->current_stat
+#endif
+		);
    }

 #ifdef ENABLE_MULTIBUFFER
@@ -651,7 +652,11 @@ void die(const char *msg, ...)

 	    /* Save the current file buffer if it's been modified. */
 	    if (openfile->modified)
-		die_save_file(openfile->filename, openfile->current_stat);
+		die_save_file(openfile->filename
+#ifndef NANO_TINY
+			, openfile->current_stat
+#endif
+			);
 	}
    }
 #endif
@@ -662,7 +667,11 @@ void die(const char *msg, ...)

 /* Save the current file under the name spacified in die_filename, which
 * is modified to be unique if necessary. */
-void die_save_file(const char *die_filename, struct stat *die_stat)
+void die_save_file(const char *die_filename
+#ifndef NANO_TINY
+	, struct stat *die_stat
+#endif
+	)
 {
    char *retval;
    bool failed = TRUE;
@@ -691,6 +700,7 @@ void die_save_file(const char *die_filename, struct stat *die_stat)
 	fprintf(stderr, _("\nBuffer not written: %s\n"),
 		_("Too many backup files?"));

+#ifndef NANO_TINY
    /* Try and chmod/chown the save file to the values of the original file, but
       dont worry if it fails because we're supposed to be bailing as fast
       as possible. */
@@ -699,6 +709,7 @@ void die_save_file(const char *die_filename, struct stat *die_stat)
 	shush = chmod(retval, die_stat->st_mode);
 	shush = chown(retval, die_stat->st_uid, die_stat->st_gid);
    }
+#endif

    free(retval);
 }
@@ -926,8 +937,8 @@ void version(void)
 {
    printf(_(" GNU nano version %s (compiled %s, %s)\n"), VERSION,
 	__TIME__, __DATE__);
-    printf(" (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007\n");
-    printf(" Free Software Foundation, Inc.\n");
+    printf(" (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007,\n");
+    printf(" 2008, 2009 Free Software Foundation, Inc.\n");
    printf(
 	_(" Email: nano@nano-editor.org	Web: http://www.nano-editor.org/"));
    printf(_("\n Compiled options:"));
@@ -1069,7 +1080,7 @@ void finish_stdin_pager(void)
       if (f == NULL)
        nperror("fopen");

-    read_file(f, 0, "stdin", TRUE);
+    read_file(f, 0, "stdin", TRUE, FALSE);
    ttystdin = open("/dev/tty", O_RDONLY);
    if (!ttystdin)
        die(_("Couldn't reopen stdin from keyboard, sorry\n"));
@@ -1174,11 +1185,9 @@ RETSIGTYPE do_suspend(int signal)
    disable_mouse_support();
 #endif

-    /* Blank the screen, and move the cursor to the last line of the
-     * screen. */
-    erase();
+    /* Move the cursor to the last line of the screen. */
    move(LINES - 1, 0);
-    refresh();
+    endwin();

    /* Display our helpful message. */
    printf(_("Use \"fg\" to return to nano.\n"));
@@ -1617,10 +1626,11 @@ int do_input(bool *meta_key, bool *func_key, bool *s_or_t, bool
 #endif
 				iso_me_harder_funcmap(s->scfunc);
 #ifdef ENABLE_COLOR
-				if (!f->viewok && openfile->syntax != NULL
+				if (f && !f->viewok && openfile->syntax != NULL
 					&& openfile->syntax->nmultis > 0) {
 				    reset_multis(openfile->current, FALSE);
 				}
+#endif
 				if (edit_refresh_needed) {
 #ifdef DEBUG
 	    			    fprintf(stderr, "running edit_refresh() as edit_refresh_needed is true\n");
@@ -1629,7 +1639,6 @@ int do_input(bool *meta_key, bool *func_key, bool *s_or_t, bool
 				    edit_refresh_needed = FALSE;
 				}

-#endif
 			    }
 			}
 		    }
@@ -1743,7 +1752,7 @@ int do_mouse(void)
 void alloc_multidata_if_needed(filestruct *fileptr)
 {
    if (!fileptr->multidata)
-	fileptr->multidata = nmalloc(openfile->syntax->nmultis * sizeof(short));
+	fileptr->multidata = (short *) nmalloc(openfile->syntax->nmultis * sizeof(short));
 }

 /* Precalculate the multi-line start and end regex info so we can speed up
@@ -1885,17 +1894,15 @@ precalc_cleanup:
 * TRUE. */
 void do_output(char *output, size_t output_len, bool allow_cntrls)
 {
-    size_t current_len, i = 0;
-    bool do_refresh = FALSE;
-	/* Do we have to call edit_refresh(), or can we get away with
-	 * just update_line()? */
-
+    size_t current_len, orig_lenpt, i = 0;
    char *char_buf = charalloc(mb_cur_max());
    int char_buf_len;

    assert(openfile->current != NULL && openfile->current->data != NULL);

    current_len = strlen(openfile->current->data);
+    if (ISSET(SOFTWRAP))
+	orig_lenpt = strlenpt(openfile->current->data);

    while (i < output_len) {
 	/* If allow_cntrls is TRUE, convert nulls and newlines
@@ -1959,26 +1966,25 @@ void do_output(char *output, size_t output_len, bool allow_cntrls)

 #ifndef DISABLE_WRAPPING
 	/* If we're wrapping text, we need to call edit_refresh(). */
-	if (!ISSET(NO_WRAP)) {
-	    bool do_refresh_save = do_refresh;
-
-	    do_refresh = do_wrap(openfile->current, FALSE);
-
-	    /* If we needed to call edit_refresh() before this, we'll
-	     * still need to after this. */
-	    if (do_refresh_save)
-		do_refresh = TRUE;
-	}
+	if (!ISSET(NO_WRAP))
+	    if (do_wrap(openfile->current, FALSE))
+		edit_refresh_needed = TRUE;
 #endif

 #ifdef ENABLE_COLOR
 	/* If color syntaxes are available and turned on, we need to
 	 * call edit_refresh(). */
 	if (openfile->colorstrings != NULL && !ISSET(NO_COLOR_SYNTAX))
-	    do_refresh = TRUE;
+	    edit_refresh_needed = TRUE;
 #endif
    }

+    /* Well we might also need a full refresh if we've changed the 
+       line length to be a new multiple of COLS */
+    if (ISSET(SOFTWRAP) && edit_refresh_needed == FALSE)
+	if (strlenpt(openfile->current->data) / COLS  != orig_lenpt / COLS)
+	    edit_refresh_needed = TRUE;
+
    free(char_buf);

    openfile->placewewant = xplustabs();
@@ -1987,7 +1993,7 @@ void do_output(char *output, size_t output_len, bool allow_cntrls)
 #ifdef ENABLE_COLOR
    reset_multis(openfile->current, FALSE);
 #endif
-    if (do_refresh) {
+    if (edit_refresh_needed == TRUE) {
 	edit_refresh();
 	edit_refresh_needed = FALSE;
    } else
@@ -2404,10 +2410,12 @@ int main(int argc, char **argv)
 #endif
 #endif /* ENABLE_NANORC */

+#ifndef DISABLE_WRAPPING
    /* 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);
+#endif

    /* If we're using bold text instead of reverse video text, set it up
     * now. */
--- a/src/nano.h
+++ b/src/nano.h
@@ -2,8 +2,8 @@
 /**************************************************************************
 *   nano.h                                                               *
 *                                                                        *
- *   Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007   *
- *   Free Software Foundation, Inc.                                       *
+ *   Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007,  *
+ *   2008, 2009 Free Software Foundation, Inc.                            *
 *   This program is free software; you can redistribute it and/or modify *
 *   it under the terms of the GNU General Public License as published by *
 *   the Free Software Foundation; either version 3, or (at your option)  *
@@ -54,6 +54,9 @@
 #include <stdarg.h>
 #endif

+/* Suppress warnings for __attribute__((warn_unused_result)) */
+#define IGNORE_CALL_RESULT(call) do { if (call) {} } while(0)
+
 /* Macros for flags. */
 #define FLAGOFF(flag) ((flag) / (sizeof(unsigned) * 8))
 #define FLAGMASK(flag) (1 << ((flag) % (sizeof(unsigned) * 8)))
--- a/src/prompt.c
+++ b/src/prompt.c
@@ -2,8 +2,8 @@
 /**************************************************************************
 *   prompt.c                                                             *
 *                                                                        *
- *   Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007   *
- *   Free Software Foundation, Inc.                                       *
+ *   Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007,  *
+ *   2008, 2009 Free Software Foundation, Inc.                            *
 *   This program is free software; you can redistribute it and/or modify *
 *   it under the terms of the GNU General Public License as published by *
 *   the Free Software Foundation; either version 3, or (at your option)  *
@@ -229,7 +229,7 @@ int do_statusbar_input(bool *meta_key, bool *func_key, bool *have_shortcut,
 		f = sctofunc((sc *) s);
 		if (s->scfunc != 0 &&  s->execute == TRUE) {
 			*ran_func = TRUE;
-		    if (!ISSET(VIEW_MODE) || f->viewok)
+		    if (f && (!ISSET(VIEW_MODE) || (f->viewok)))
 		        iso_me_harder_funcmap(f->scfunc);
 		}
 		*finished = TRUE;
@@ -1070,7 +1070,6 @@ fprintf(stderr, "get_prompt_string: answer = \"%s\", statusbar_x = %lu\n", answe
 		}
 	} else
 #endif /* !NANO_TINY */
-#ifndef DISABLE_HELP
 	if (s && s->scfunc == DO_HELP_VOID) {
 		update_statusbar_line(answer, statusbar_x);

@@ -1082,7 +1081,6 @@ fprintf(stderr, "get_prompt_string: answer = \"%s\", statusbar_x = %lu\n", answe
 		 * prompt. */
 		finished = FALSE;
 	}
-#endif

 	/* If we have a shortcut with an associated function, break out
 	 * if we're finished after running or trying to run the
--- a/src/proto.h
+++ b/src/proto.h
@@ -2,8 +2,8 @@
 /**************************************************************************
 *   proto.h                                                              *
 *                                                                        *
- *   Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007   *
- *   Free Software Foundation, Inc.                                       *
+ *   Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007,  *
+ *   2008, 2009 Free Software Foundation, Inc.                            *
 *   This program is free software; you can redistribute it and/or modify *
 *   it under the terms of the GNU General Public License as published by *
 *   the Free Software Foundation; either version 3, or (at your option)  *
@@ -271,7 +271,7 @@ bool close_buffer(void);
 #endif
 filestruct *read_line(char *buf, filestruct *prevnode, bool
 	*first_line_ins, size_t buf_len);
-void read_file(FILE *f, int fd, const char *filename, bool undoable);
+void read_file(FILE *f, int fd, const char *filename, bool undoable, bool checkwritable);
 int open_file(const char *filename, bool newfie, FILE **f);
 char *get_next_filename(const char *name, const char *suffix);
 void do_insertfile(
@@ -428,7 +428,11 @@ void free_openfilestruct(openfilestruct *src);
 void print_view_warning(void);
 void finish(void);
 void die(const char *msg, ...);
-void die_save_file(const char *die_filename, struct stat *die_stat);
+void die_save_file(const char *die_filename
+#ifndef NANO_TINY
+	, struct stat *die_stat
+#endif
+	);
 void window_init(void);
 #ifndef DISABLE_MOUSE
 void disable_mouse_support(void);
@@ -779,12 +783,12 @@ void display_main_list(void);
 void do_cursorpos(bool constant);
 void do_cursorpos_void(void);
 void do_replace_highlight(bool highlight, const char *word);
-char *flagtostr(int flag);
+const char *flagtostr(int flag);
 const subnfunc *sctofunc(sc *s);
 const subnfunc *getfuncfromkey(WINDOW *win);
 void print_sclist(void);
 sc *strtosc(int menu, char *input);
-function_type strtokeytype(char *str);
+function_type strtokeytype(const char *str);
 int strtomenu(char *input);
 void assign_keyinfo(sc *s);
 void xon_complaint(void);
@@ -792,35 +796,36 @@ void xoff_complaint(void);
 int sc_seq_or (short func, int defaultval);
 void do_suspend_void(void);

-const char *cancel_msg;
+extern const char *cancel_msg;
 #ifndef NANO_TINY
-const char *case_sens_msg;
-const char *backwards_msg;
-const char *prev_history_msg;
-const char *next_history_msg;
+extern const char *case_sens_msg;
+extern const char *backwards_msg;
+extern const char *prev_history_msg;
+extern const char *next_history_msg;
 #endif
-const char *replace_msg;
-const char *no_replace_msg;
-const char *go_to_line_msg;
-const char *whereis_next_msg;
-const char *first_file_msg;
-const char *last_file_msg;
-const char *goto_dir_msg;
-const char *ext_cmd_msg;
-const char *to_files_msg;
-const char *dos_format_msg;
-const char *mac_format_msg;
-const char *append_msg;
-const char *prepend_msg;
-const char *backup_file_msg;
-const char *gototext_msg;
-const char *new_buffer_msg;
+extern const char *replace_msg;
+extern const char *no_replace_msg;
+extern const char *go_to_line_msg;
+extern const char *whereis_next_msg;
+extern const char *first_file_msg;
+extern const char *last_file_msg;
+extern const char *goto_dir_msg;
+extern const char *ext_cmd_msg;
+extern const char *to_files_msg;
+extern const char *dos_format_msg;
+extern const char *mac_format_msg;
+extern const char *append_msg;
+extern const char *prepend_msg;
+extern const char *backup_file_msg;
+extern const char *gototext_msg;
+extern const char *new_buffer_msg;
+
 void iso_me_harder_funcmap(short func);
 void enable_nodelay(void);
 void disable_nodelay(void);

 #ifdef HAVE_REGEX_H
-const char *regexp_msg;
+extern const char *regexp_msg;
 #endif

 #ifdef NANO_EXTRA
--- a/src/rcfile.c
+++ b/src/rcfile.c
@@ -2,7 +2,7 @@
 /**************************************************************************
 *   rcfile.c                                                             *
 *                                                                        *
- *   Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2007               *
+ *   Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009   *
 *   Free Software Foundation, Inc.                                       *
 *   This program is free software; you can redistribute it and/or modify *
 *   it under the terms of the GNU General Public License as published by *
@@ -892,7 +892,7 @@ void parse_rcfile(FILE *rcstream
 {
    char *buf = NULL;
    ssize_t len;
-    size_t n;
+    size_t n = 0;

    while ((len = getline(&buf, &n, rcstream)) > 0) {
 	char *ptr, *keyword, *option;
--- a/src/search.c
+++ b/src/search.c
@@ -2,8 +2,8 @@
 /**************************************************************************
 *   search.c                                                             *
 *                                                                        *
- *   Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007   *
- *   Free Software Foundation, Inc.                                       *
+ *   Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007,  *
+ *   2008, 2009 Free Software Foundation, Inc.                            *
 *   This program is free software; you can redistribute it and/or modify *
 *   it under the terms of the GNU General Public License as published by *
 *   the Free Software Foundation; either version 3, or (at your option)  *
@@ -1357,7 +1357,7 @@ void update_history(filestruct **h, const char *s)
    assert(hage != NULL && hbot != NULL);

    /* If this string is already in the history, delete it. */
-    p = find_history(*hage, *hbot, s, (size_t)-1);
+    p = find_history(*hage, *hbot, s, strlen(s));

    if (p != NULL) {
 	filestruct *foo, *bar;
--- a/src/text.c
+++ b/src/text.c
@@ -2,8 +2,8 @@
 /**************************************************************************
 *   text.c                                                               *
 *                                                                        *
- *   Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007   *
- *   Free Software Foundation, Inc.                                       *
+ *   Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007,  *
+ *   2008, 2009 Free Software Foundation, Inc.                            *
 *   This program is free software; you can redistribute it and/or modify *
 *   it under the terms of the GNU General Public License as published by *
 *   the Free Software Foundation; either version 3, or (at your option)  *
@@ -66,9 +66,7 @@ void do_mark(void)
 /* Delete the character under the cursor. */
 void do_delete(void)
 {
-    bool do_refresh = FALSE;
-	/* Do we have to call edit_refresh(), or can we get away with
-	 * just update_line()? */
+    size_t orig_lenpt = 0;

 #ifndef NANO_TINY
    update_undo(DEL);
@@ -86,6 +84,9 @@ void do_delete(void)

 	assert(openfile->current_x < strlen(openfile->current->data));

+	if (ISSET(SOFTWRAP))
+	    orig_lenpt = strlenpt(openfile->current->data);
+
 	/* Let's get dangerous. */
 	charmove(&openfile->current->data[openfile->current_x],
 		&openfile->current->data[openfile->current_x +
@@ -108,7 +109,7 @@ void do_delete(void)
 	/* If we're deleting at the end of a line, we need to call
 	 * edit_refresh(). */
 	if (openfile->current->data[openfile->current_x] == '\0')
-	    do_refresh = TRUE;
+	    edit_refresh_needed = TRUE;

 	openfile->current->data = charealloc(openfile->current->data,
 		openfile->current_x + strlen(foo->data) + 1);
@@ -138,11 +139,13 @@ void do_delete(void)
    } else
 	return;

+    if (ISSET(SOFTWRAP) && edit_refresh_needed == FALSE)
+	if (strlenpt(openfile->current->data) / COLS != orig_lenpt / COLS)
+	    edit_refresh_needed  = TRUE;
+
    set_modified();

-    if (do_refresh)
-	edit_refresh_needed = TRUE;
-    else
+    if (edit_refresh_needed  == FALSE)
 	update_line(openfile->current, openfile->current_x);
 }

@@ -181,7 +184,7 @@ void do_tab(void)
 	free(output);
    } else {
 #endif
-	do_output("\t", 1, TRUE);
+	do_output((char *) "\t", 1, TRUE);
 #ifndef NANO_TINY
    }
 #endif
@@ -481,9 +484,10 @@ void do_undo(void)
 	if (u->xflags == UNDO_DEL_BACKSPACE)
 	    openfile->current_x += strlen(u->strdata);
 	break;
+#ifndef DISABLE_WRAPPING
    case SPLIT:
 	undidmsg = _("line wrap");
-	f->data = nrealloc(f->data, strlen(f->data) + strlen(u->strdata) + 1);
+	f->data = (char *) nrealloc(f->data, strlen(f->data) + strlen(u->strdata) + 1);
 	strcpy(&f->data[strlen(f->data) - 1], u->strdata);
 	if (u->strdata2 != NULL)
 	    f->next->data = mallocstrcpy(f->next->data, u->strdata2);
@@ -494,6 +498,7 @@ void do_undo(void)
 	}
 	renumber(f);
 	break;
+#endif /* DISABLE_WRAPPING */
    case UNSPLIT:
 	undidmsg = _("line join");
 	t = make_new_node(f);
@@ -517,7 +522,7 @@ void do_undo(void)
 	undidmsg = _("line break");
 	if (f->next) {
 	    filestruct *foo = f->next;
-	    f->data = nrealloc(f->data, strlen(f->data) + strlen(f->next->data) + 1);
+	    f->data = (char *) nrealloc(f->data, strlen(f->data) + strlen(f->next->data) + 1);
 	    strcat(f->data,  f->next->data);
 	    unlink_node(foo);
 	    delete_node(foo);
@@ -618,6 +623,7 @@ void do_redo(void)
 	do_gotolinecolumn(u->lineno, u->begin+1, FALSE, FALSE, FALSE, FALSE);
 	do_enter(TRUE);
 	break;
+#ifndef DISABLE_WRAPPING
    case SPLIT:
 	undidmsg = _("line wrap");
 	if (u->xflags & UNDO_SPLIT_MADENEW)
@@ -625,6 +631,7 @@ void do_redo(void)
        do_wrap(f, TRUE);
 	renumber(f);
 	break;
+#endif /* DISABLE_WRAPPING */
    case UNSPLIT:
 	undidmsg = _("line join");
 	len = strlen(f->data) + strlen(u->strdata + 1);
@@ -765,7 +772,7 @@ bool execute_command(const char *command)
     * arguments. */
    shellenv = getenv("SHELL");
    if (shellenv == NULL)
-	shellenv = "/bin/sh";
+	shellenv = (char *) "/bin/sh";

    /* Fork a child. */
    if ((pid = fork()) == 0) {
@@ -812,7 +819,7 @@ bool execute_command(const char *command)
    if (f == NULL)
 	nperror("fdopen");

-    read_file(f, 0, "stdin", TRUE);
+    read_file(f, 0, "stdin", TRUE, FALSE);

    if (wait(NULL) == -1)
 	nperror("wait");
@@ -859,7 +866,7 @@ void add_undo(undo_type current_action)
    }

    /* Allocate and initialize a new undo type */
-    u = nmalloc(sizeof(undo));
+    u = (undo *) nmalloc(sizeof(undo));
    u->type = current_action;
    u->lineno = fs->current->lineno;
    u->begin = fs->current_x;
@@ -900,6 +907,7 @@ void add_undo(undo_type current_action)
 	    u->strdata = data;
 	}
 	break;
+#ifndef DISABLE_WRAPPING
    case SPLIT:
 	wrap_loc = break_line(openfile->current->data, fill
 #ifndef DISABLE_HELP
@@ -913,6 +921,7 @@ void add_undo(undo_type current_action)
 	    u->strdata2 = mallocstrcpy(NULL, fs->current->next->data);
 	u->begin = wrap_loc;
 	break;
+#endif /* DISABLE_WRAPPING */
    case INSERT:
    case REPLACE:
 	data = mallocstrcpy(NULL, fs->current->data);
@@ -993,7 +1002,7 @@ void update_undo(undo_type action)
 			fs->current->data, (unsigned long) fs->current_x, u->begin);
 #endif
        len = strlen(u->strdata) + 2;
-        data = nrealloc((void *) u->strdata, len * sizeof(char *));
+        data = (char *) nrealloc((void *) u->strdata, len * sizeof(char *));
        data[len-2] = fs->current->data[fs->current_x];
        data[len-1] = '\0';
        u->strdata = (char *) data;
@@ -1058,11 +1067,13 @@ void update_undo(undo_type action)
    case INSERT:
 	u->mark_begin_lineno = openfile->current->lineno;
 	break;
+#ifndef DISABLE_WRAPPING
    case SPLIT:
 	/* This will only be called if we made a completely new line,
 	   and as such we should note that so we can destroy it later */
 	u->xflags = UNDO_SPLIT_MADENEW;
 	break;
+#endif /* DISABLE_WRAPPING */
    case UNSPLIT:
 	/* These cases are handled by the earlier check for a new line and action */
    case ENTER:
--- a/src/utils.c
+++ b/src/utils.c
@@ -2,8 +2,8 @@
 /**************************************************************************
 *   utils.c                                                              *
 *                                                                        *
- *   Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007   *
- *   Free Software Foundation, Inc.                                       *
+ *   Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007,  *
+ *   2008, 2009 Free Software Foundation, Inc.                            *
 *   This program is free software; you can redistribute it and/or modify *
 *   it under the terms of the GNU General Public License as published by *
 *   the Free Software Foundation; either version 3, or (at your option)  *
--- a/src/winio.c
+++ b/src/winio.c
@@ -2,8 +2,8 @@
 /**************************************************************************
 *   winio.c                                                              *
 *                                                                        *
- *   Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007   *
- *   Free Software Foundation, Inc.                                       *
+ *   Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007,  *
+ *   2008, 2009 Free Software Foundation, Inc.                            *
 *   This program is free software; you can redistribute it and/or modify *
 *   it under the terms of the GNU General Public License as published by *
 *   the Free Software Foundation; either version 3, or (at your option)  *
@@ -2495,7 +2495,7 @@ void edit_draw(filestruct *fileptr, const char *converted, int
        if (fileptr->multidata == NULL && openfile->syntax
 		&& openfile->syntax->nmultis > 0) {
 	    int i;
-	    fileptr->multidata = nmalloc(openfile->syntax->nmultis * sizeof(short));
+	    fileptr->multidata = (short *) nmalloc(openfile->syntax->nmultis * sizeof(short));
            for (i = 0; i < openfile->syntax->nmultis; i++)
 		fileptr->multidata[i] = -1;	/* Assue this applies until we know otherwise */
 	}
@@ -2935,7 +2935,7 @@ bool need_vertical_update(size_t pww_save)
 }

 /* When edittop changes, try and figure out how many lines
- * we really have to work with (i.e. set maxrows) 
+ * we really have to work with (i.e. set maxrows)
 */
 void compute_maxrows(void)
 {
@@ -2949,7 +2949,8 @@ void compute_maxrows(void)

    maxrows = 0;
    for (n = 0; n < editwinrows && foo; n++) {
-	maxrows += 1 - strlenpt(foo->data) / COLS;
+	maxrows ++;
+	n += strlenpt(foo->data) / COLS;
 	foo = foo->next;
    }

@@ -2987,12 +2988,9 @@ void edit_scroll(scroll_dir direction, ssize_t nlines)
 #ifdef DEBUG
 	   fprintf(stderr, "Softwrap: Entering check for extracuzsoft\n");
 #endif
-	for (i = editwinrows, foo = openfile->edittop; foo && i > 0; i--, foo = foo->next) {
-	    ssize_t len = strlenpt(foo->data) / COLS;
-	    if (len > 0)
-	        do_redraw = TRUE;
-	    i -= len;
-	}
+	for (i = maxrows, foo = openfile->edittop; foo && i > 0; i--, foo = foo->next)
+	    ;
+
 	if (foo) {
 	   extracuzsoft += strlenpt(foo->data) / COLS;
 #ifdef DEBUG
@@ -3000,7 +2998,6 @@ void edit_scroll(scroll_dir direction, ssize_t nlines)
 		(unsigned long) strlenpt(foo->data), (unsigned long) foo->lineno);
 #endif

-
 	    /* Now account for whether the edittop line itself is >COLS, if scrolling down */
 	   for (foo = openfile->edittop; foo && extracuzsoft > 0; nlines++) {
 		extracuzsoft -= 1 + strlenpt(foo->data) / COLS;
@@ -3012,13 +3009,6 @@ void edit_scroll(scroll_dir direction, ssize_t nlines)
 		foo = foo->next;
 	    }
 	}
-    } else if (ISSET(SOFTWRAP) && direction == UP_DIR) {
-	for (foo = openfile->edittop, i = editwinrows; foo && i > 0; i--, foo = foo->prev) {
-	    if (strlenpt(foo->data) / COLS > 0) {
-		do_redraw = TRUE;
-		break;
-	    }
-	}
    }

    /* Part 1: nlines is the number of lines we're going to scroll the
@@ -3037,9 +3027,15 @@ void edit_scroll(scroll_dir direction, ssize_t nlines)
 		break;
 	    openfile->edittop = openfile->edittop->next;
 	}
+	/* Don't over-scroll on long lines */
+	if (ISSET(SOFTWRAP)) {
+	    ssize_t len = strlenpt(openfile->edittop->data) / COLS;
+	    i -=  len;
+	    if (len > 0)
+		do_redraw = TRUE;
+	}
    }

-    compute_maxrows();
    /* Limit nlines to the number of lines we could scroll. */
    nlines -= i;

@@ -3048,7 +3044,7 @@ void edit_scroll(scroll_dir direction, ssize_t nlines)
     * call edit_refresh() beforehand if we need to. */
    if (nlines == 0 || do_redraw || nlines >= editwinrows) {
 	if (do_redraw || nlines >= editwinrows)
-	    edit_refresh();
+	    edit_refresh_needed = TRUE;
 	return;
    }

@@ -3124,6 +3120,10 @@ void edit_redraw(filestruct *old_current, size_t pww_save)
 	openfile->edittop->lineno || openfile->current->lineno >=
 	openfile->edittop->lineno + maxrows) {

+#ifdef DEBUG
+    fprintf(stderr, "edit_redraw(): line %lu was offscreen, oldcurrent = %lu edittop = %lu", openfile->current->lineno,
+                    old_current->lineno, openfile->edittop->lineno);
+#endif
 	filestruct *old_edittop = openfile->edittop;
 	ssize_t nlines;

@@ -3156,28 +3156,13 @@ void edit_redraw(filestruct *old_current, size_t pww_save)
 	/* Put edittop in range of current, get the difference in lines
 	 * between the original edittop and the current edittop, and
 	 * then restore the original edittop. */
-	edit_update(
-#ifndef NANO_TINY
-		ISSET(SMOOTH_SCROLL) ? NONE :
-#endif
-		CENTER);
-
-	nlines = openfile->edittop->lineno - old_edittop->lineno;
-
-	openfile->edittop = old_edittop;
+	edit_update(CENTER);

 	/* Update old_current if we're not on the same page as
 	 * before. */
 	if (do_redraw)
 	    update_line(old_current, 0);

-	/* Scroll the edit window up or down until edittop is in range
-	 * of current. */
-	if (nlines < 0)
-	    edit_scroll(UP_DIR, -nlines);
-	else
-	    edit_scroll(DOWN_DIR, nlines);
-
 #ifndef NANO_TINY
 	/* If the mark is on, update all the lines between the old first
 	 * line or old last line of the edit window (depending on
@@ -3239,11 +3224,7 @@ void edit_refresh(void)

 	/* Put the top line of the edit window in range of the current
 	 * line. */
-	edit_update(
-#ifndef NANO_TINY
-		ISSET(SMOOTH_SCROLL) ? NONE :
-#endif
-		CENTER);
+	edit_update(CENTER);
    }

    foo = openfile->edittop;
@@ -3283,22 +3264,26 @@ void edit_update(update_type location)
     * screen as before, or at the top or bottom of the screen if
     * edittop is beyond either. */
    if (location == CENTER)
-	goal = maxrows / 2;
+	goal = editwinrows / 2;
    else {
 	goal = openfile->current_y;

 	/* Limit goal to (editwinrows - 1) lines maximum. */
-	if (goal > maxrows - 1)
-	    goal = maxrows - 1;
+	if (goal > editwinrows - 1)
+	    goal = editwinrows - 1;
    }

    for (; goal > 0 && foo->prev != NULL; goal--) {
-	if (ISSET(SOFTWRAP))
-	    goal -= 1 + strlenpt(foo->data) / COLS;
 	foo = foo->prev;
+	if (ISSET(SOFTWRAP) && foo)
+	    goal -= strlenpt(foo->data) / COLS;
    }
    openfile->edittop = foo;
+#ifdef DEBUG
+    fprintf(stderr, "edit_udpate(), setting edittop to lineno %d\n", openfile->edittop->lineno);
+#endif
    compute_maxrows();
+    edit_refresh_needed = TRUE;
 }

 /* Unconditionally redraw the entire screen. */
Author	SHA1	Message	Date
Chris Allegretta	3eacb857a1	GNU nano 2.2.2 release git-svn-id: svn://svn.savannah.gnu.org/nano/trunk/nano@4478 35c25a1d-7b9e-4130-9fde-d3aeb78583b8	2010-01-18 03:47:40 +00:00
Chris Allegretta	2466d933c9	Compile fix with current_stat. Not sure how I missed that. git-svn-id: svn://svn.savannah.gnu.org/nano/trunk/nano@4477 35c25a1d-7b9e-4130-9fde-d3aeb78583b8	2010-01-18 03:43:24 +00:00
Chris Allegretta	4e621b5f6b	Missed ChangeLog entry frm previous, must have been from wrong cwd git-svn-id: svn://svn.savannah.gnu.org/nano/trunk/nano@4476 35c25a1d-7b9e-4130-9fde-d3aeb78583b8	2010-01-18 00:24:09 +00:00
Chris Allegretta	b916f5cd8b	2010-01-17 Chris Allegretta <chrisa@asty.org> * nano.c (main), prompt.c (do_statusbar_input): Handle problems with an unmapped function due to key rebinding, fixes crashes on FreeBSD repoted by Eitan Adler <eitanadlerlist@gmail.com>. git-svn-id: svn://svn.savannah.gnu.org/nano/trunk/nano@4475 35c25a1d-7b9e-4130-9fde-d3aeb78583b8	2010-01-17 05:30:22 +00:00
Chris Allegretta	6cf05d487f	2010-01-14 Chris Allegretta <chrisa@asty.org> * files.c (do_writeout): Fix for crash / incorrect external modification warning due to earlier fix in r4467. git-svn-id: svn://svn.savannah.gnu.org/nano/trunk/nano@4474 35c25a1d-7b9e-4130-9fde-d3aeb78583b8	2010-01-14 06:32:37 +00:00
Chris Allegretta	1a7a91b779	2010-01-12 Chris Allegretta <chrisa@asty.org> * move.c (do_page_up, do_page_down): Fix issues with not enough scrolling down/up and cursor centering. * winio.c (edit_scroll): Remove lots of needless checking of line length for soft wrapping code. * winio.c (edit_update) - Remove extra code for when updating with old_current outside of the new buffer boundary and centering issues. git-svn-id: svn://svn.savannah.gnu.org/nano/trunk/nano@4473 35c25a1d-7b9e-4130-9fde-d3aeb78583b8	2010-01-13 03:21:19 +00:00
Chris Allegretta	df8c3debc8	2010-01-05 Tito <farmatito@tiscali.it> * search.c (update_history) - Fix bad length check causing search crash on armel platform. git-svn-id: svn://svn.savannah.gnu.org/nano/trunk/nano@4472 35c25a1d-7b9e-4130-9fde-d3aeb78583b8	2010-01-05 23:35:50 +00:00
Chris Allegretta	374216fe22	2010-01-04 Chris Allegretta <chrisa@asty.org> * winio.c: edit_update, edit_redraw - Fix search not scrolling to the middle of the screen (reported by alpha@qzx.com) and places where we rely on maxrows but should not. git-svn-id: svn://svn.savannah.gnu.org/nano/trunk/nano@4471 35c25a1d-7b9e-4130-9fde-d3aeb78583b8	2010-01-04 19:00:55 +00:00
Jordi Mallach	fc6ef3e1e8	doc/man/nano.1: Avoid a groff warning by prepending a zero-width space to a line starting with '. git-svn-id: svn://svn.savannah.gnu.org/nano/trunk/nano@4470 35c25a1d-7b9e-4130-9fde-d3aeb78583b8	2009-12-26 01:58:50 +00:00
Chris Allegretta	8d41fb8c3e	2009-12-22 Chris Allegretta <chrisa@asty.org> * files.c (write_file): Fix compatibility with previous stat fix and tiny mode. 2009-12-22 David Lawrence Ramsey <pooka109@gmail.com> * global.c: Add new strings for forward/back in the file browser. New variables nano_forwardfile_msg and nano_backfile_msg. git-svn-id: svn://svn.savannah.gnu.org/nano/trunk/nano@4469 35c25a1d-7b9e-4130-9fde-d3aeb78583b8	2009-12-23 05:03:09 +00:00
Chris Allegretta	3c7dda6e7e	2009-12-20 Chris Allegretta <chrisa@asty.org> * files.c (is_file_writable): remove assert check for f, since it's not initialized at the time. Fixes Savannah bug 28309, reported by Zoltan Kovacs. git-svn-id: svn://svn.savannah.gnu.org/nano/trunk/nano@4468 35c25a1d-7b9e-4130-9fde-d3aeb78583b8	2009-12-20 05:55:41 +00:00
Chris Allegretta	869aca4392	2009-12-20 Brian Szymanski <skibrianski via Savannah> * src/files.c (write_file): Check stat struct exists, and if not use just obtained stat data. Fixes Ubuntu bug 471568, "reproducible crash in nano on trying to save to a file different than the one specified on the command line". git-svn-id: svn://svn.savannah.gnu.org/nano/trunk/nano@4467 35c25a1d-7b9e-4130-9fde-d3aeb78583b8	2009-12-20 05:46:35 +00:00
Chris Allegretta	d9be86f45b	2009-12-15 Chris Allegretta <chrisa@asty.org> * doc/nanorc.sample.in - Remove erroneous 'set suspendenable' as it's actually a key binding (e.g. 'bind M-Z suspendenable all') and not a settable flag. Fixes Savannah bug 28299 reported by Mike Frysinger. git-svn-id: svn://svn.savannah.gnu.org/nano/trunk/nano@4466 35c25a1d-7b9e-4130-9fde-d3aeb78583b8	2009-12-15 18:07:17 +00:00
Chris Allegretta	9c0716a73a	Oh snap, back to SVN. git-svn-id: svn://svn.savannah.gnu.org/nano/trunk/nano@4465 35c25a1d-7b9e-4130-9fde-d3aeb78583b8	2009-12-13 05:03:24 +00:00
Chris Allegretta	560a8cd0ec	GNU nano 2.2.1 release git-svn-id: svn://svn.savannah.gnu.org/nano/trunk/nano@4463 35c25a1d-7b9e-4130-9fde-d3aeb78583b8	2009-12-13 03:31:00 +00:00
Chris Allegretta	a8bc492b8a	2009-12-12 Chris Allegretta <chrisa@asty.org> * text.c (do_delete), nano.c (do_output): Add check for length of current line before and after adding/deleting text, and do full refresh if it is now a different multiple of COLS. Also get rid of superfluous do_refresh vars now that we have edit_refresh_needed. git-svn-id: svn://svn.savannah.gnu.org/nano/trunk/nano@4462 35c25a1d-7b9e-4130-9fde-d3aeb78583b8	2009-12-12 22:21:20 +00:00
Chris Allegretta	f387f33083	2009-12-07 David Lawrence Ramsey <pooka109@gmail.com> * global.c (shortcut_init), browser.c (do_browser): Fix M-W not being bound to research in either main menu or browser. git-svn-id: svn://svn.savannah.gnu.org/nano/trunk/nano@4461 35c25a1d-7b9e-4130-9fde-d3aeb78583b8	2009-12-09 17:09:37 +00:00
Chris Allegretta	2c7b506fbc	2009-12-09 Chris Allegretta <chrisa@asty.org> * files.c (read_file) - Add parameter for whether we should even try to check file writability, as the message is useless when we're inserting into an existing buffer. Fixes Savannah bug 28219. git-svn-id: svn://svn.savannah.gnu.org/nano/trunk/nano@4460 35c25a1d-7b9e-4130-9fde-d3aeb78583b8	2009-12-09 16:51:43 +00:00
Chris Allegretta	5b25e07744	2009-12-07 David Lawrence Ramsey <pooka109@gmail.com> * global.c (shortcut_init): Many fixes for keybindings code oversights, including restore page up/down and GotoDir to browser, * browser.c (do_browser): Fix breaking out of a submenu (e.g. gotodir) breaks out of browser altogether. * doc/nanorc.sample.in: Add missing entries for fortran/ObjC/OCaml entries. git-svn-id: svn://svn.savannah.gnu.org/nano/trunk/nano@4459 35c25a1d-7b9e-4130-9fde-d3aeb78583b8	2009-12-07 12:34:23 +00:00
Chris Allegretta	b27b3a18a9	2009-12-03 David Lawrence Ramsey <pooka109@gmail.com> * global.c (shortcut_init) - Remove help shortcut from help shortcut list :-) Tweaked to reorder exit shortcut to end of list to not mess up prev/next shortcut symmetry. git-svn-id: svn://svn.savannah.gnu.org/nano/trunk/nano@4458 35c25a1d-7b9e-4130-9fde-d3aeb78583b8	2009-12-04 04:29:55 +00:00
Chris Allegretta	96466166f1	2009-12-03 Eitan Adler <eitanadlerlist@gmail.com> * doc/syntax/makefile.nanorc - Fix poor regex for all alpha characters which sometimes leads to error messages, reported by gibboris@gmail.com. git-svn-id: svn://svn.savannah.gnu.org/nano/trunk/nano@4457 35c25a1d-7b9e-4130-9fde-d3aeb78583b8	2009-12-04 03:46:04 +00:00
Chris Allegretta	671b2d974c	Add --disable-wrapping to nano-regress git-svn-id: svn://svn.savannah.gnu.org/nano/trunk/nano@4456 35c25a1d-7b9e-4130-9fde-d3aeb78583b8	2009-12-03 03:20:24 +00:00
Chris Allegretta	c9f0799791	2009-12-02 Chris Allegretta <chrisa@asty.org> * text.c (add_undo, do_undo, do_redo) - Do not execute cases for SPLIT when DISABLE_WRAPPING is defined. Fixes Savannah bug 28151 (anon). git-svn-id: svn://svn.savannah.gnu.org/nano/trunk/nano@4455 35c25a1d-7b9e-4130-9fde-d3aeb78583b8	2009-12-03 03:12:00 +00:00
Jordi Mallach	42a390416e	Fix escaping of hyphens for the -$ option. git-svn-id: svn://svn.savannah.gnu.org/nano/trunk/nano@4454 35c25a1d-7b9e-4130-9fde-d3aeb78583b8	2009-12-02 22:47:57 +00:00
Chris Allegretta	8a07a96eef	2009-12-01 David Lawrence Ramsey <pooka109@gmail.com> * Update documentation for 2.2 features including sample nanorc file, texinfo file, man pages, UPGRADE file, and update copyright noticed for the current year. git-svn-id: svn://svn.savannah.gnu.org/nano/trunk/nano@4453 35c25a1d-7b9e-4130-9fde-d3aeb78583b8	2009-12-02 03:36:22 +00:00
Chris Allegretta	a97cb819f2	2009-12-01 Kamil Dudka <kdudka@redhat.com> * chars.c, file.c - Better handle unused results for things like mbtowc(), new macro IGNORE_CALL_RESULT. 2009-12-01 Chris Allegretta <chrisa@asty.org> * global.c (shortcut_init) - Remove redundant entries for ^Y/^V reported by Christian Weisgerber. * doc/man/nanorc.5 - Fix typo in Meta documentation, reported by gibboris@gmail.com. 2009-11-29 David Lawrence Ramsey <pooka109@gmail.com> * global.c (shortcut_init) - Add support for ^P and ^N in the help menu. git-svn-id: svn://svn.savannah.gnu.org/nano/trunk/nano@4452 35c25a1d-7b9e-4130-9fde-d3aeb78583b8	2009-12-02 03:24:18 +00:00
Chris Allegretta	cb9a5bed8e	GNU nano 2.2.0 release git-svn-id: svn://svn.savannah.gnu.org/nano/trunk/nano@4450 35c25a1d-7b9e-4130-9fde-d3aeb78583b8	2009-11-30 05:26:30 +00:00
Chris Allegretta	b43f6912f3	2009-11-29 David Lawrence Ramsey <pooka109@gmail.com> * global.c: Fix replace and insert file initializations for proper compilation options. * nano.c (do_suspend): Update comments to reflect actual code path, bad Chris and thanks for noticing Jordi. * configure.ac: Fix typos git-svn-id: svn://svn.savannah.gnu.org/nano/trunk/nano@4449 35c25a1d-7b9e-4130-9fde-d3aeb78583b8	2009-11-29 06:24:10 +00:00
Chris Allegretta	5a018f0d3a	2009-11-29 Chris Allegretta <chrisa@asty.org> * prompt.c (get_prompt_string) - Universally handle help key when is disabled. Fixes Savannah bug 28117 by David Lawrence Ramsey <pooka109@gmail.com>. * chars.c, files.c: Add junk vars to silence the compiler. Sigh. 2009-11-29 David Lawrence Ramsey <pooka109@gmail.com> * Change several *chars to const char, additional cleanups and casts to make compilers happier. git-svn-id: svn://svn.savannah.gnu.org/nano/trunk/nano@4448 35c25a1d-7b9e-4130-9fde-d3aeb78583b8	2009-11-29 06:13:22 +00:00
Chris Allegretta	752830573a	* doc/dyntax/makefile.nanorc - Sample Makefile highlighting based on wiki.linuxhelp.net version. git-svn-id: svn://svn.savannah.gnu.org/nano/trunk/nano@4447 35c25a1d-7b9e-4130-9fde-d3aeb78583b8	2009-11-28 04:11:04 +00:00
Chris Allegretta	daaf468c93	2009-11-27 Chris Allegretta <chrisa@asty.org> * nano.c (do_suspend): Don't clear the screen but do move the cursor down to the last line first in an effort to not corrupt the screen, which contradicts Pico but is consistent with almost all other text editors. Fixes Savannah bug 28110/Debian bug 460510 reported by Tim Connors <reportbug@rather.puzzling.org>. git-svn-id: svn://svn.savannah.gnu.org/nano/trunk/nano@4446 35c25a1d-7b9e-4130-9fde-d3aeb78583b8	2009-11-28 03:01:30 +00:00
Chris Allegretta	dcf5cbbf6a	* rcfile.c (parse_rcfile), initialize size argument to getline(), fixes crash on FreeBSD reported by Eitan Adler <eitanadlerlist@gmail.com>. git-svn-id: svn://svn.savannah.gnu.org/nano/trunk/nano@4445 35c25a1d-7b9e-4130-9fde-d3aeb78583b8	2009-11-27 05:09:56 +00:00
Chris Allegretta	3b830ee194	2009-11-26 Chris Allegretta <chrisa@asty.org> * winio.c (edit_scroll): Adjust for long lines when scrolling. git-svn-id: svn://svn.savannah.gnu.org/nano/trunk/nano@4444 35c25a1d-7b9e-4130-9fde-d3aeb78583b8	2009-11-27 03:04:59 +00:00
Chris Allegretta	d753efdb55	2009-11-26 Jordi Mallach <jordi@gnu.org> * doc/man/*: Update all man pages to escape unescapred hyphens. git-svn-id: svn://svn.savannah.gnu.org/nano/trunk/nano@4443 35c25a1d-7b9e-4130-9fde-d3aeb78583b8	2009-11-27 02:50:12 +00:00
Chris Allegretta	c9199e9e9a	Simplify logic in do_down() since we now have maxrows to rely on. git-svn-id: svn://svn.savannah.gnu.org/nano/trunk/nano@4442 35c25a1d-7b9e-4130-9fde-d3aeb78583b8	2009-11-26 18:23:00 +00:00
Chris Allegretta	e2df2c899d	2009-11-24 Chris Allegretta <chrisa@asty.org> * move.c (do_page_up, do_page_down): Make these functions work better with soft line wrapping. * winio.c (compute_maxrows): Make maxrows calculation more accurate when all lines are > COLS. git-svn-id: svn://svn.savannah.gnu.org/nano/trunk/nano@4441 35c25a1d-7b9e-4130-9fde-d3aeb78583b8	2009-11-24 17:15:53 +00:00
Chris Allegretta	c82f038855	Part 2 of David's fixes for David's bug 71 fix git-svn-id: svn://svn.savannah.gnu.org/nano/trunk/nano@4440 35c25a1d-7b9e-4130-9fde-d3aeb78583b8	2009-11-22 23:23:31 +00:00
Chris Allegretta	8b6f6fcc1b	2009-11-22 Chris Allegretta <chrisa@asty.org> * nano.c (main): Allow edit_refresh_needed to take effect when using --enable-tiny (fixes Savannah bug 28076 reported by David Lawrence Ramsey). 2009-11-22 David Lawrence Ramsey <pooka109@gmail.com> * nano.c (move_to_filestruct): Fix bug 71 (cut at top of line recenters) * Fix compilation with --enable-tiny git-svn-id: svn://svn.savannah.gnu.org/nano/trunk/nano@4439 35c25a1d-7b9e-4130-9fde-d3aeb78583b8	2009-11-22 21:35:56 +00:00
Chris Allegretta	0bff84ef9c	2009-11-22 Mike Frysinger <vapier@gentoo.org> * doc/syntax/gentoo.nanorc: Tweak comment highlighting. git-svn-id: svn://svn.savannah.gnu.org/nano/trunk/nano@4438 35c25a1d-7b9e-4130-9fde-d3aeb78583b8	2009-11-22 16:36:53 +00:00
Chris Allegretta	6277f59d24	Back to SVN! git-svn-id: svn://svn.savannah.gnu.org/nano/trunk/nano@4437 35c25a1d-7b9e-4130-9fde-d3aeb78583b8	2009-11-22 02:52:23 +00:00