GNU nano 2.1.6 release

git-svn-id: svn://svn.savannah.gnu.org/nano/trunk/nano@4335 35c25a1d-7b9e-4130-9fde-d3aeb78583b8
2008-10-03 Pascal Gentil <pascal.gentil@univ-rennes1.fr>
2008-10-03 22:20:43 +00:00 · 2008-10-03 21:00:35 +00:00 · 2008-10-01 00:55:13 +00:00 · 2008-10-01 00:49:19 +00:00 · 2008-09-30 16:47:57 +00:00 · 2008-09-30 15:30:51 +00:00
68 changed files with 38685 additions and 25420 deletions
--- a/162
+++ b/162
@@ -1,7 +1,165 @@
+GNU nano 2.1.6 - 2008.10.03
+2008-10-03 Pascal Gentil <pascal.gentil@univ-rennes1.fr>
+	* fortran.nanorc: Sample python syntax highlighting file
+
+2008-09-30 Dirkjan Ochtman <dirkjan@ochtman.nl>
+	* python.nanorc: Small python syntax update
+
+2008-09-30 <bluestorm_dylc@hotmail.com>
+	* ocaml.nanorc: Sample OCaml syntax highlighting file
+
+2008-09-30 Dave Geering <dgeering@toshiba-tap.com>
+	* objc.nanorc: Sample Objective-C Syntax Hightlighting file
+
+2008-09-30 Chris Allegretta <chrisa@asty.org>
+        * configure.ac: Change extra, multibuffer, color and rcfile configure options to default to enabled
+          --enable-tiny will now disable these options as well
+	* python.nanorc, ruby.nanorc: Add header lines for python and ruby as well
+
+2008-09-21 Chris Allegretta <chrisa@asty.org>
+	* rcfile.c, color.c, nano.h: Add new capability for matching a syntax type by the "header" (1st line)
+	  of a file being edited.  Based on Savannah bug 24197 and inital proof of concept by Dave Geering 
+	  <dgeering@toshiba-tap.com>
+
+2008-09-16 Chris Allegretta <chrisa@asty.org>
+	* text.c: Add support for undoing a text uncut.  Split out the undo and redo of a text cut 
+	  in order to avoid code duplication.
+
+2008-09-06 Chris Allegretta <chrisa@asty.org>
+	* nano.c: Do call disable_signals at startup regardless, since under cygwin we can't generate
+	  ^C without it.
+
+GNU nano 2.1.5 - 2008.08.30
+2008-08-29 Chris Allegretta <chrisa@asty.org>
+	* configure.ac, color.c, rcfile.c, utils.c: 1st attempt at supporting systems which don't support
+	  GNU-style word boundaries.  New function fixbounds() to translate from GNU-style to 
+	  BSD-style, autoconf option GNU_WORDBOUNDS.
+	* nano-regress: New perl script to check for some of the more obvious issues with compilation
+	  issues with certain configure options.
+	* global.c, help.c, browser.c, files.c, proto.h: Fix several compipation and programmatic 
+	  issues with --disable-help, especially that do-writeout was treating ^G the same as ^M.
+
+2008-08-28 Chris Allegretta <chrisa@asty.org>
+	* configure.ac, rcfile.c:  Add support for an alternate rcfilename at configure time.  Maybe this
+	  should become a command line option some day, but I don't see the need currently.  Start of
+	  fix for Savannah bug #24128: Add nanorc support to win32 platform.
+
+2008-08-21 Chris Allegretta <chrisa@asty.org>
+	* text.c: Change error messages where we may possibly get into a bad state and urge
+	  the user to save when this happens.  Originally by Benno Schulenberg <bensberg@justemail.net>
+	* text.c (do_enter):  Fix issue when compiled with --enable-debug, fixes Savannah bug 24092.
+
+2008-08-08 Magnus Granberg <zorry@ume.nu> / Adam Conrad <?>
+	* files.c (write_file): Add needed flags to open() calls when writing out files.  Fixes Savannah bug 
+	  #23827: Compilation fails with -D_FORTIFY_SOURCE=2
+
+2008-08-08 Chris Allegretta <chrisa@asty.org>
+	* files.c (write_file): Check exit code of fclose(), since in certain out of space conditions the OS will
+	  happily report successful fwrite()s until you try and close the file.  Fix for Savannah bug
+	  #24000: no free space on partition - nano claims successful write - file empty 
+
+GNU nano 2.1.4 - 2008.08.09
+2008-08-08 Chris Allegretta <chrisa@asty.org>
+	* files.c (write_file): Do not go on and attempt to write the main file if writing the backup file failed,
+	  related to Savannah bug 24000.
+	* text.c (do_redo): Fix improperly restoring the text when redoing a line split.
+        * text.c (add_undo): Fix check for multi-line cut check skips adding other new legit events.
+
+2008-07-23 Chris Allegretta <chrisa@asty.org>
+	* text.c: Reset openfile-> to OTHER after an undo or redo so we don't mistakenly
+	  mistakenly think this is an update when it's really an add.  Also
+          Fix an extra ; after an if statement which makes nano try to free a struct which
+          may be NULL
+
+GNU nano 2.1.3 - 2008.08.04
+2008-07-23 Chris Allegretta <chrisa@asty.org>
+	* configure.ac: Add ncursesw dir to include path if lib detected
+
+2008-07-11 Mike Frysinger <vapier@gentoo.org>
+	* doc/nanorc.sample.in: Include the updates files in the default sample nanorc.
+
+2008-07-11 Fabian Groffen <grobian@gentoo.org>
+	* nano.c: Don't include langinfo.h if not using ENABLE_UTF8
+	  (Savannah patch 6565)
+
+2008-07-11 Mitsuya Shibata <mty.shibata@gmail.com>
+	* text.c: Fix crashing in help menu when using certain locales
+	  (Savannah bug 23751)
+
+2008-07-09 Chris Allegretta <chrisa@asty.org>
+        * nano.c/nano.h/global.c/text.c: New generalized undo code, currently
+	  just works for adding and deleting text and splitting and unsplitting lines.
+
+2008-06-29 Chris Allegretta <chrisa@asty.org>
+	* global.c: Fix for not having search history when --disable-justify is used
+	  (Savannah bug 23733)
+
+
+GNU nano 2.1.2 - 2008.06.24
+2008-06-24 Chris Allegretta <chrisa@asty.org>
+	* rcfile.c: Added function check_bad_binding() to look for sequences which
+	  shouldn't be bound, per Savannah bug 22674.
+
+2008-05-31 Chris Allegretta <chrisa@asty.org>
+	* prompt.c,search.c,global.c: Tentative fix for bug #23144: using arrow 
+	  keys in search buffer affects main window (by Mike Frysinger)
+
+2008-05-31 Chris Allegretta <chrisa@asty.org>
+	* global.c: Fix for Savannah bug #23442: left/right arrow keys 
+	  do not work with --enable-tiny (by Mike Frysinger)
+
+2008-05-31 Chris Allegretta <chrisa@asty.org>
+	* files.c,proto.h,text.c: Fix for conflicts with AIX curses
+	  variables, from William Jojo <jojowil@hvcc.edu>
+
+2008-05-31 Chris Allegretta <chrisa@asty.org>
+	* global.c: Fix for compile error when --disable-speller is used 
+	  (Savannah bug 23227 by Mike Frysinger)
+
+2008-05-31 Chris Allegretta <chrisa@asty.org>
+	* Fix for seg fault when window size too small, by 
+          Andreas Amann <andreas.amann@tyndall.ie>
+
+GNU nano 2.1.1 - 2008.04.01
+2008-05-31 Chris Allegretta <chrisa@asty.org>
+	* Added the following contributed files, by owner:
+	  Donnie Berkholz <dberkholz@gentoo.org>
+	    * Sample awk.nanorc
+	  Simon Rupf <simon.rupf@int-ag.ch>
+	    * Sample css.nanorc
+	  Josef 'Jupp' Schugt <jupp@rubyforge.org>
+	    * sample ruby.nanorc
+
+2008-03-31 Chris Allegretta <chrisa@asty.org>
+	* global.c: Fix for issues compiling with --enable-tiny and
+	  --enable-multibuffer, as reported by Mike Frysinger.
+	* files.c: Fix the fact that the insert file prompt text did not
+	  properly appears in tiny mode.
+
+2008-03-19  Benno Schulenberg <bensberg@justemail.net>
+	* help.c, nano.c: Fix toggle help not being translated, fix allocation
+	  issue.
+
+2008-03-19  Chris Allegretta <chrisa@asty.org>
+	* gloabl.c: Fix bracket matching sequence to be M-] not M-[, as reported
+	  Nick Warne <nick@ukfsn.org>.
+	* doc/syntax/Makefile.am - Actually include new syntaxes from Mike, etc
+	* debian.nanorc - New debian sources.list config since we're including
+	  gentoo, adapted from Milian Wolff <mail@milianw.de>
+
+2008-03-18  Mike Frysinger <vapier@gentoo.org>
+	* winio.c: Remove unneeded variable in parse_kbinput()
+	* rcfile.c: relocate check_vitals_mapped() function to just above 
+	  where it actually gets used and declare it "static void" in the process
+	* global.c: only declare nano_justify_msg when justify support is enabled
+	* php.nanorc: Php syntax highlighting config
+	* tcl.nanorc: Tcl syntax highlighting config
+	* gentoo.nanorc: Gentoo syntax highlighting config
+
 2008-03-17  Benno Schulenberg <bensberg@justemail.net>
-	* global.c - Fix incorrect first line jump messsage, fix
+	* global.c: Fix incorrect first line jump messsage, fix
 	  more comments to assist translators
-	* winio.c - Fix shortcut labels not being translated.
+	* winio.c: Fix shortcut labels not being translated.

 2008-03-17  Mike Frysinger <vapier@gentoo.org>
 	 * */.gitignore: Git ignore files for those running a local git
--- a/75
+++ b/75
@@ -1,4 +1,71 @@
-2008/03/18 - GNU nano 2.1.0 "under old mismanagement" is released.
+2008.10.03 - GNU nano 2.1.6 was for new features before it was against
+		them.  This release includes more undo capability, 
+		several new syntax highlighting configurations including
+		Objective C, OCaml, and Fortran, and a new capability
+		to activate highlighting based on the 1st line of the
+		file being edited.  Also, the new default configure 
+		options now include color syntax highlighting, .nanorc
+		support, multibuffer and extras.  These items can still
+		be disabled and are not enabled with --enable-tiny.  Bug
+		fixes include better signal handling under Cygwin, and 
+		that's about it.  Again please remember to
+		submit bug reports via Savannah at 
+		http://savannah.gnu.org/bugs/?func=additem&group=nano
+		as undo functions certainly need more testing.  
+		Bon appetit.
+
+2008.08.30 - GNU nano 2.1.5 is ready to lead on day one.  This release
+		contains a better fix for incorrectly reported successful
+		writes on full filesystems, more helpful messages when
+		an internal error occurs in the undo code, and fixes for 
+		various combinations of configure-time options and 
+		compiler flags.  Also included is new support for 
+		changing the rc file name at configure time, and
+		using GNU-style regexes for word-boundaries on systems 
+		which do not support them natively, as well as the ever 
+		popular translation updates.  Rock the tarball.
+
+2008.08.09 - GNU nano 2.1.4 "I told you so!" is released.  This release
+		includes fixes for several severe issues with the new
+		undo/redo code.  Also the behavior of writing
+		files when using backup mode has changed as well: if writing
+		the backup file fails, nano will not attempt to write the
+		current file.  This should help folks who enjoy "extreme
+		text editing" i.e. editing files on file systems which
+		are likely to run out of space; see Savannah bug 24000.
+		Have fun with it!
+
+2008.08.04 - GNY nano 2.1.3 "least stable version ever" is released.  This
+		release includes new (and experimental) undo and redo
+		functionality for most text operations.  The default 
+		key bindings are Meta-U for undo and Meta-E for redo, but
+		these can be remapped using the new 2.1 keybinding code.
+		Also included are some fixes for configuring using wide 
+		curses, crashing when invoking the help menu with 
+		certain locales, and not saving the search history when
+		compiled with configure options.
+
+2008.04.24 - GNU nano 2.1.2 "New York City" is released.  This release
+		contains fixes for binding bad keys, some 
+		configure-specific compilation failures, and more issues 
+		with the new input back end and in particular the status 
+		bar.  Also fixed are some long standing issues with 
+		compiling on AIX, and a segfault when making the terminal
+		window too small.  Rest in Peace Tim and George!
+
+2008.04.01 - GNU nano 2.1.1 wont get fooled again.  This release contains
+		fixes for the new user-rebindable keys (in particular
+		bracket match which was mis-bound), and various
+		problems with translations and configure-related 
+		compilation problems are now fixed as well.
+		It also contains new syntax highlighting 
+		definitions for TCL, PHP, Gentoo and Debian-related 
+		files, and some documentation updates as well. 
+		Please continue to send reports with the key 
+		binding code to the Savannah page
+		(https://savannah.gnu.org/bugs/?group=nano).
+		
+2008.03.18 - GNU nano 2.1.0 "under old mismanagement" is released.
 		This first release in the 2.1 development series
 		introduces rebinadble keys for most actions inside
                the editor.  Please see the nanorc(5) page for
@@ -8,7 +75,7 @@
 		https://savannah.gnu.org/bugs/?group=nano and
 		thanks for sticking with us!

-2007/12/20 - GNU nano 2.0.7 keeps its balance.  This release fixes
+2007.12.20- GNU nano 2.0.7 keeps its balance.  This release fixes
 		several bugs, among others: a segfault and several
 		cursor positioning problems when uncutting text or
 		inserting files into the current buffer; a problem where
@@ -30,12 +97,12 @@
 		under the GNU GPL version 3 or later and the GNU FDL
 		version 1.2 or later.  Have fun.

-2007/04/26 - GNU nano 2.0.6 "that was quick" is released.  This release
+2007.04.26- GNU nano 2.0.6 "that was quick" is released.  This release
 		fixes a potential segfault after justifying text marked
 		from the bottom up.  It also adds one more minor
 		documentation update.  Enjoy.

-2007/04/22 - GNU nano 2.0.5 braces for impact.  Among other things, this
+2007.04.22- GNU nano 2.0.5 braces for impact.  Among other things, this
 		release fixes various problems (including a segfault)
 		when trying to open or save a file in a directory
 		beginning with "~" that isn't a home directory; fixes a
--- a/configure.ac
+++ b/configure.ac
@@ -20,7 +20,7 @@
 #
 # $Id$

-AC_INIT([GNU nano], [2.1.0], [nano-devel@gnu.org], [nano])
+AC_INIT([GNU nano], [2.1.6], [nano-devel@gnu.org], [nano])
 AC_CONFIG_SRCDIR([src/nano.c])
 AC_CANONICAL_TARGET([])
 AM_INIT_AUTOMAKE
@@ -64,12 +64,6 @@ if test x$debug_support != xyes; then
    AC_DEFINE(NDEBUG, 1, [Shut up assert warnings :-)])
 fi

-AC_ARG_ENABLE(extra,
-[  --enable-extra          Enable extra features, currently only easter eggs],
-[if test x$enableval = xyes; then
-    AC_DEFINE(NANO_EXTRA, 1, [Define this to enable extra stuff.]) extra_support=yes
-fi])
-
 AC_ARG_ENABLE(tiny,
 [  --enable-tiny           Disable features for the sake of size],
 [if test x$enableval = xyes; then
@@ -84,6 +78,16 @@ AC_ARG_ENABLE(tiny,
    AC_DEFINE(DISABLE_WRAPPING, 1, [Define this to disable all text wrapping.])
 fi])

+
+AC_ARG_ENABLE(extra,
+[  --disable-extra          Disable extra features, currently only easter eggs],
+[if test x$enableval != xno; then
+    AC_DEFINE(NANO_EXTRA, 1, [Define this to enable extra stuff.]) extra_support=yes
+fi], 
+    [if test x$enable_tiny != xyes; then
+        AC_DEFINE(NANO_EXTRA, 1, [Define this to enable extra stuff.]) extra_support=yes
+    fi])
+
 AC_ARG_ENABLE(browser,
 [  --disable-browser       Disable built-in file browser],
 [if test x$enableval != xyes; then
@@ -139,8 +143,8 @@ AC_ARG_ENABLE(wrapping-as-root,
 fi])

 AC_ARG_ENABLE(color,
-[  --enable-color          Enable color and syntax highlighting],
-[if test x$enableval = xyes; then
+[  --disable-color          Disable color and syntax highlighting],
+[if test x$enableval != xno; then
    if test x$ac_cv_header_regex_h = xyes; then
 	AC_DEFINE(ENABLE_NANORC, 1, [Define this to use .nanorc files.]) nanorc_support=yes
 	AC_DEFINE(ENABLE_COLOR, 1, [Define this to have syntax highlighting, requires regex.h and ENABLE_NANORC too!]) color_support=yes
@@ -148,32 +152,76 @@ AC_ARG_ENABLE(color,
 	AC_MSG_ERROR([
 *** The header file regex.h was not found.  If you wish to use color
 *** support this header file is required.  Please either install C
-*** libraries that include the regex.h file or do not call the configure
-*** script with --enable-color.])
+*** libraries that include the regex.h file or call the configure
+*** script with --disable-color.])
    fi
-fi])
+fi], [
+    if test x$enable_tiny != xyes; then
+	if test x$ac_cv_header_regex_h = xyes; then
+	    AC_DEFINE(ENABLE_NANORC, 1, [Define this to use .nanorc files.]) nanorc_support=yes
+	    AC_DEFINE(ENABLE_COLOR, 1, [Define this to have syntax highlighting, requires regex.h and ENABLE_NANORC too!]) color_support=yes	
+	else
+	    AC_MSG_ERROR([
+*** The header file regex.h was not found.  If you wish to use color
+*** support this header file is required.  Please either install C
+*** libraries that include the regex.h file or call the configure
+*** script with --disable-color.])
+	fi
+    fi
+])

 AC_ARG_ENABLE(multibuffer,
-[  --enable-multibuffer    Enable multiple file buffers],
-[if test x$enableval = xyes; then
+[  --disable-multibuffer    Disable multiple file buffers],
+[if test x$enableval != xno; then
    AC_DEFINE(ENABLE_MULTIBUFFER, 1, [Define this to enable multiple file buffers.]) multibuffer_support=yes
-fi])
+fi], 
+    [if test x$enable_tiny != xyes; then
+        AC_DEFINE(ENABLE_MULTIBUFFER, 1, [Define this to enable multiple file buffers.]) multibuffer_support=yes
+    fi])

 AC_ARG_ENABLE(nanorc,
-[  --enable-nanorc         Enable use of .nanorc files],
-[if test x$enableval = xyes; then
+[  --disable-nanorc         Disable use of .nanorc files],
+[if test x$enableval != xno; then
    AC_DEFINE(ENABLE_NANORC, 1, [Define this to use .nanorc files.]) nanorc_support=yes
-fi])
+fi], 
+    [if test x$enable_tiny != xyes; then
+        AC_DEFINE(ENABLE_NANORC, 1, [Define this to use .nanorc files.]) nanorc_support=yes
+    fi])

 AC_ARG_ENABLE(all,
-[  --enable-all            Enable ALL extra nano functionality (kitchen sink option)],
+[  --enable-all            Enable ALL extra nano functionality (ignored for compatibility as all options default to on)],
 [if test x$enableval = xyes; then
-    AC_DEFINE(ENABLE_NANORC, 1, [Define this to use .nanorc files.]) nanorc_support=yes
-    AC_DEFINE(ENABLE_COLOR, 1, [Define this to have syntax highlighting, requires regex.h and ENABLE_NANORC too!]) color_support=yes
-    AC_DEFINE(ENABLE_MULTIBUFFER, 1, [Define this to enable multiple file buffers.]) multibuffer_support=yes
-    AC_DEFINE(NANO_EXTRA, 1, [Define this to enable extra stuff.]) extra_support=yes
+    echo "--enable-all option no longer needed, ignoring for compatiblity"
 fi])

+if test x$color_support = xyes; then
+	# now check for the end of word boundary support (/< and />)
+	AC_MSG_CHECKING([for GNU-style word boundary regex support])
+	AC_TRY_RUN([
+#ifdef HAVE_SYS_TYPES_H
+#include <sys/types.h>
+#endif
+#include <regex.h>
+int main(void)
+{
+    regex_t r;
+    size_t nmatch;
+    regmatch_t pmatch;
+
+    if (regcomp(&r, "\\\\>", REG_EXTENDED|REG_NOSUB))
+        return 1;
+    if (regexec(&r, "word boundary", nmatch, &pmatch, 0))
+        return 1;
+    return 0;
+}],
+	AC_MSG_RESULT(yes)
+	AC_DEFINE(GNU_WORDBOUNDS, 1, [Define if the system supports GNU-style word boundaries in regexes.]) gnu_wordbounds=yes,
+	AC_MSG_RESULT(no),
+        AC_MSG_WARN([*** Can't check for gnu word boundary support when cross-compiling])
+)
+fi
+
+
 AC_MSG_CHECKING([whether to enable UTF-8 support])
 AC_ARG_ENABLE(utf8,
 [  --enable-utf8           Enable UTF-8 support],
@@ -387,6 +435,12 @@ fi
 AM_CONDITIONAL(USE_COLOR, test x$color_support = xyes)
 AM_CONDITIONAL(USE_NANORC, test x$nanorc_support = xyes)

+AC_ARG_ENABLE(altrcname,
+[  --enable-altrcname          Specify alternate rcfile name (default: .nanorc)],
+[if test x$enableval != no; then
+    AC_DEFINE_UNQUOTED(RCFILE_NAME, "$enableval", [Specify alternate rcfile name (default: .nanorc)]) rcfilename=$enableval
+fi])
+
 dnl Checks for functions.

 AC_CHECK_FUNCS(getdelim getline isblank strcasecmp strcasestr strncasecmp strnlen vsnprintf)
@@ -417,7 +471,7 @@ if eval "test x$CURSES_LIB_NAME = x"; then
    AC_CHECK_HEADERS(ncurses.h)

    if test x$enable_utf8 != xno; then
-	AC_CHECK_LIB(ncursesw, get_wch, [CURSES_LIB="-lncursesw" CURSES_LIB_NAME=ncursesw CURSES_LIB_WIDE=yes])
+	AC_CHECK_LIB(ncursesw, get_wch, [CURSES_LIB="-lncursesw" CPPFLAGS="-I/usr/include/ncursesw $CPPFLAGS" CURSES_LIB_NAME=ncursesw CURSES_LIB_WIDE=yes])
    fi

    if eval "test x$CURSES_LIB_NAME = x"; then
--- a/doc/man/nanorc.5
+++ b/doc/man/nanorc.5
@@ -396,6 +396,12 @@ Count the number of words in the current buffer.
 .B refresh
 Refresh the screen.
 .TP
+.B undo
+Undo the text action peformed (add text, delete text, etc).
+.TP
+.B suspend
+Redo the last action which was undone.
+.TP
 .B suspend
 Suspend the editor (if the suspend function is enabled, see the 
 "suspendenable" entry below).
--- a/doc/nanorc.sample.in
+++ b/doc/nanorc.sample.in
@@ -222,6 +222,9 @@
 # bind M-A casesens search
 # bind ^S research main

+## Set this if your backspace key sends delete most of the time (2.1.3+)
+# bind kdel backspace all
+

 ## Nanorc files
 # include "@PKGDATADIR@/nanorc.nanorc"
@@ -229,9 +232,24 @@
 ## C/C++
 # include "@PKGDATADIR@/c.nanorc"

+## Cascading Style Sheets
+# include "@PKGDATADIR@/css.nanorc"
+
+## Debian files
+# include "@PKGDATADIR@/debian.nanorc"
+
+## Gentoo files
+# include "@PKGDATADIR@/gentoo.nanorc"
+
 ## HTML
 # include "@PKGDATADIR@/html.nanorc"

+## PHP
+# include "@PKGDATADIR@/php.nanorc"
+
+## TCL
+# include "@PKGDATADIR@/tcl.nanorc"
+
 ## TeX
 # include "@PKGDATADIR@/tex.nanorc"

@@ -259,6 +277,9 @@
 ## Java
 # include "@PKGDATADIR@/java.nanorc"

+## AWK
+# include "@PKGDATADIR@/awk.nanorc"
+
 ## Assembler
 # include "@PKGDATADIR@/asm.nanorc"

@@ -267,3 +288,6 @@

 ## POV-Ray
 # include "@PKGDATADIR@/pov.nanorc"
+
+## XML-type files
+# include "@PKGDATADIR@/xml.nanorc"
--- a/doc/syntax/Makefile.am
+++ b/doc/syntax/Makefile.am
@@ -12,6 +12,16 @@ pkgdata_DATA =	asm.nanorc \
 		python.nanorc \
 		ruby.nanorc \
 		sh.nanorc \
-		tex.nanorc
+		tex.nanorc \
+		tcl.nanorc \
+		php.nanorc \
+		gentoo.nanorc \
+		debian.nanorc \
+		awk.nanorc \
+		css.nanorc \
+		xml.nanorc \
+		ocaml.nanorc \
+		objc.nanorc \
+		fortran.nanorc

 EXTRA_DIST = $(pkgdata_DATA)
--- a/doc/syntax/awk.nanorc
+++ b/doc/syntax/awk.nanorc
@@ -0,0 +1,38 @@
+## Here is an example for awk.
+##
+syntax "awk" "\.awk$"
+## records
+icolor brightred "\$[0-9A-Z_!@#$*?-]+"
+## awk-set variables
+color red "\<(ARGC|ARGIND|ARGV|BINMODE|CONVFMT|ENVIRON|ERRNO|FIELDWIDTHS)\>"
+color red "\<(FILENAME|FNR|FS|IGNORECASE|LINT|NF|NR|OFMT|OFS|ORS)\>"
+color red "\<(PROCINFO|RS|RT|RSTART|RLENGTH|SUBSEP|TEXTDOMAIN)\>"
+## function declarations and special patterns
+color brightgreen "\<(function|extension|BEGIN|END)\>"
+## operators
+color green "(\{|\}|\(|\)|\;|\]|\[|\\|<|>|!|=|&|\+|-|\*|%|/|\?:|\^|\|)"
+## flow control
+color brightyellow "\<(for|if|while|do|else|in|delete|exit)\>"
+color brightyellow "\<(break|continue|return)\>"
+## I/O statements
+color brightgreen "\<(close|getline|next|nextfile|print|printf)\>"
+color brightgreen "\<(system|fflush)\>"
+## standard functions
+color magenta "\<(atan2|cos|exp|int|log|rand|sin|sqrt|srand)\>"
+color magenta "\<(asort|asorti|gensub|gsub|index|length|match)\>"
+color magenta "\<(split|sprintf|strtonum|sub|substr|tolower|toupper)\>"
+color magenta "\<(mktime|strftime|systime)\>"
+color magenta "\<(and|compl|lshift|or|rshift|xor)\>"
+color magenta "\<(bindtextdomain|dcgettext|dcngettext)\>"
+
+##
+## String highlighting.  You will in general want your comments and
+## strings to come last, because syntax highlighting rules will be
+## applied in the order they are read in.
+color brightyellow "<[^= 	]*>" ""(\\.|[^"])*""
+
+## Comment highlighting
+color brightblue "(^|[[:space:]])#.*$"
+
+## Trailing whitespace
+color ,green "[[:space:]]+$"
--- a/doc/syntax/css.nanorc
+++ b/doc/syntax/css.nanorc
@@ -0,0 +1,9 @@
+## Here is an example for css files.
+##
+syntax "css" "\.css$"
+color brightred     "."
+color brightyellow  start="\{" end="\}"
+color brightwhite   start=":" end="([;^\{]|$)"
+color brightblue    ":active|:focus|:hover|:link|:visited|:link|:after|:before|$"
+color brightblue    start="\/\*" end="\\*/"
+color green         ";|:|\{|\}"
--- a/doc/syntax/debian.nanorc
+++ b/doc/syntax/debian.nanorc
@@ -0,0 +1,20 @@
+## Here is an exmaple for apt's sources.list
+## Adapted from http://milianw.de/blog/Syntax-Highlighting-in-Nano
+## (mail@milianw.de).
+##
+syntax "apt/sources.list" "sources\.list(\.old|~)?$"
+# component
+color brightmagenta "^deb(-src)? ((http|file|ftp):/[^ ]+|cdrom:\[[^\]]+\]/|cdrom:\[[-a-zA-Z0-9\._\(\) ]+\]/) [^ ]+ .+$"
+# distribution
+color brightred "^deb(-src)? ((http|file|ftp):/[^ ]+|cdrom:\[[^\]]+\]/|cdrom:\[[-a-zA-Z0-9\._\(\) ]+\]/) [^ ]+"
+# URI
+color brightgreen "(http|file|ftp):/[^ ]+"
+# cdroms
+# [^\]] does not work...
+color brightgreen "cdrom:\[[-a-zA-Z0-9\._\(\) ]+\]/"
+# deb / deb-src
+color yellow "^deb"
+color yellow "^deb-src"
+# comments
+color brightblue "#.*"
+
--- a/doc/syntax/fortran.nanorc
+++ b/doc/syntax/fortran.nanorc
@@ -0,0 +1,41 @@
+## Here is an example for Fortran 90/95
+
+syntax "fortran" "\.(f|f90|f95)$" 
+
+#color red "\<[A-Z_]a[0-9A-Z_]+\>" 
+color red "\<[0-9]+\>" 
+
+icolor green "\<(action|advance|all|allocatable|allocated|any|apostrophe)\>"
+icolor green "\<(append|asis|assign|assignment|associated|character|common)\>"
+icolor green "\<(complex|data|default|delim|dimension|double precision)\>"
+icolor green "\<(elemental|epsilon|external|file|fmt|form|format|huge)\>"
+icolor green "\<(implicit|include|index|inquire|integer|intent|interface)\>"
+icolor green "\<(intrinsic|iostat|kind|logical|module|none|null|only)>"
+icolor green "\<(operator|optional|pack|parameter|pointer|position|private)\>"
+icolor green "\<(program|public|real|recl|recursive|selected_int_kind)\>"
+icolor green "\<(selected_real_kind|subroutine|status)\>"
+
+icolor cyan "\<(abs|achar|adjustl|adjustr|allocate|bit_size|call|char)\>" 
+icolor cyan "\<(close|contains|count|cpu_time|cshift|date_and_time)\>" 
+icolor cyan "\<(deallocate|digits|dot_product|eor|eoshift|function|iachar)\>" 
+icolor cyan "\<(iand|ibclr|ibits|ibset|ichar|ieor|iolength|ior|ishft|ishftc)\>" 
+icolor cyan "\<(lbound|len|len_trim|matmul|maxexponent|maxloc|maxval|merge)\>" 
+icolor cyan "\<(minexponent|minloc|minval|mvbits|namelist|nearest|nullify)\>" 
+icolor cyan "\<(open|pad|present|print|product|pure|quote|radix)\>" 
+icolor cyan "\<(random_number|random_seed|range|read|readwrite|replace)\>" 
+icolor cyan "\<(reshape|rewind|save|scan|sequence|shape|sign|size|spacing)\>" 
+icolor cyan "\<(spread|sum|system_clock|target|transfer|transpose|trim)\>" 
+icolor cyan "\<(ubound|unpack|verify|write|tiny|type|use|yes)\>"
+
+icolor yellow "\<(.and.|case|do|else|else?if|else?where|end|end?do|end?if)\>"
+icolor yellow "\<(end?select|.eqv.|forall|if|lge|lgt|lle|llt|.neqv.|.not.)\>"
+icolor yellow "\<(.or.|repeat|select case|then|where|while)\>"
+
+icolor magenta "\<(continue|cycle|exit|go?to|result|return)\>"
+
+## String highlighting.  
+icolor yellow "<[^= 	]*>" ""(\\.|[^"])*""
+
+## Comment highlighting
+icolor blue "!.*"
+
--- a/doc/syntax/gentoo.nanorc
+++ b/doc/syntax/gentoo.nanorc
@@ -0,0 +1,50 @@
+## Here is an example for Gentoo ebuilds/eclasses
+##
+syntax "ebuild" "\.e(build|class)$"
+## All the standard portage functions
+color brightgreen "^src_(unpack|compile|install|test)" "^pkg_(config|nofetch|setup|(pre|post)(inst|rm))"
+## Highlight bash related syntax
+color green "\<(case|do|done|elif|else|esac|exit|fi|for|function|if|in|local|read|return|select|shift|then|time|until|while|continue|break)\>"
+color green "(\{|\}|\(|\)|\;|\]|\[|`|\\|\$|<|>|!|=|&|\|)"
+color green "-(e|d|f|r|g|u|w|x|L)\>"
+color green "-(eq|ne|gt|lt|ge|le|s|n|z)\>"
+## Highlight variables ... official portage ones in red, all others in bright red
+color brightred "\$\{?[a-zA-Z_0-9]+\}?"
+color red "\<(ARCH|HOMEPAGE|DESCRIPTION|IUSE|SRC_URI|LICENSE|SLOT|KEYWORDS|FILESDIR|WORKDIR|(P|R)?DEPEND|PROVIDE|DISTDIR|RESTRICT|USERLAND)\>"
+color red "\<(S|D|T|PV|PF|P|PN|A)\>" "\<C(XX)?FLAGS\>" "\<LDFLAGS\>" "\<C(HOST|TARGET|BUILD)\>"
+## Highlight portage commands
+color magenta "\<use(_(with|enable))?\> [!a-zA-Z0-9_+ -]*" "inherit.*"
+color brightblue "\<e(begin|end|conf|install|make|warn|infon?|error|log|patch|new(group|user))\>"
+color brightblue "\<die\>" "\<use(_(with|enable))?\>" "\<inherit\>" "\<has\>" "\<(has|best)_version\>" "\<unpack\>"
+color brightblue "\<(do|new)(ins|s?bin|doc|lib(|\.so|\.a)|man|info|exe|initd|confd|envd|pam|menu|icon)\>"
+color brightblue "\<do(python|sed|dir|hard|sym|html|jar|mo)\>" "\<keepdir\>"
+color brightblue "prepall(|docs|info|man|strip)" "prep(info|lib|lib\.(so|a)|man|strip)"
+color brightblue "\<(|doc|ins|exe)into\>" "\<f(owners|perms)\>" "\<(exe|ins|dir)opts\>"
+## Highlight common commands used in ebuilds
+color blue "\<make\>" "\<(cat|cd|chmod|chown|cp|echo|env|export|grep|let|ln|mkdir|mv|rm|sed|set|tar|touch|unset)\>"
+## Highlight comments (doesnt work that well)
+color yellow "#.*$"
+## Highlight strings (doesnt work that well)
+color brightyellow ""(\\.|[^\"])*"" "'(\\.|[^'])*'"
+## Trailing space is bad!
+color ,green "[[:space:]]+$"
+
+## Here is an example for Portage control files
+##
+syntax "/etc/portage" "\.(keywords|mask|unmask|use)$"
+## Base text:
+color green "^.+$"
+## Use flags:
+color brightred "[[:space:]]+\+?[a-zA-Z0-9_-]+"
+color brightblue "[[:space:]]+-[a-zA-Z0-9_-]+"
+## Likely version numbers:
+color magenta "-[[:digit:]].*([[:space:]]|$)"
+## Accepted arches:
+color white "[~-]?\<(alpha|amd64|arm|hppa|ia64|mips|ppc|ppc64|s390|sh|sparc|x86|x86-fbsd)\>"
+color white "[[:space:]][~-]?\*"
+## Categories:
+color cyan "^[[:space:]]*.*/"
+## Masking regulators:
+color brightmagenta "^[[:space:]]*(=|~|<|<=|=<|>|>=|=>)"
+## Comments:
+color yellow "#.*$"
--- a/doc/syntax/nanorc.nanorc
+++ b/doc/syntax/nanorc.nanorc
@@ -5,7 +5,7 @@ syntax "nanorc" "\.?nanorc$"
 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 green "^[[:space:]]*(set|unset|include|syntax)\>"
+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))?\>"
 icolor magenta "^[[:space:]]*i?color\>" "\<(start|end)="
--- a/doc/syntax/objc.nanorc
+++ b/doc/syntax/objc.nanorc
@@ -0,0 +1,41 @@
+## Here is an example for C/C++/Obj-C.
+##
+syntax "m" "\.m$"
+
+
+## Stuffs
+color brightwhite "\<[A-Z_][0-9A-Z_]+\>" 
+color green "\<(float|double|BOOL|bool|char|int|short|long|id|sizeof|enum|void|static|const|struct|union|typedef|extern|(un)?signed|inline)\>"
+color green "\<[[:alpha:]_][[:alnum:]_]*_t\>"
+color green "\<(class|namespace|template|public|protected|private|typename|this|friend|virtual|using|mutable|volatile|register|explicit)\>"
+color brightgreen "\<(for|if|while|do|else|case|default|switch)\>"
+color brightgreen "\<(try|throw|catch|operator|new|delete)\>"
+color brightgreen "\<(goto|continue|break|return)\>"
+color brightgreen "@\<(en(code|d)|i(mplementation|nterface)|selector)\>"
+##
+## GCC builtins
+color cyan "__attribute__[[:space:]]*\(\([^)]*\)\)" "__(aligned|asm|builtin|hidden|inline|packed|restrict|section|typeof|weak)__"
+
+## Selector/method
+color brightmagenta "(^|[[:space:]])\[.*[[:space:]].*\]"
+color white ":[[:alnum:]]*"
+color magenta "[[:alnum:]]*:"
+color white "\[[^][:space:]]*\]"
+
+##
+## String highlighting.  You will in general want your comments and
+## strings to come last, because syntax highlighting rules will be
+## applied in the order they are read in.
+color brightblack "'([^'\]|(\\["'abfnrtv\\]))'" "'\\(([0-3]?[0-7]{1,2}))'" "'\\x[0-9A-Fa-f]{1,2}'"
+color brightblack "<[^= 	]*>" ""(\\.|[^"])*""
+color brightblue "@"(\\.|[^"])*""
+##
+## This string is VERY resource intensive!
+## color brightyellow start=""(\\.|[^"])*\\[[:space:]]*$" end="^(\\.|[^"])*""
+
+color brightblue "^[[:space:]]*#[[:space:]]*(define|include|import|(un|ifn?)def|endif|el(if|se)|if|warning|error)"
+
+## Comment highlighting
+color yellow "//.*"
+color yellow start="/\*" end="\*/"
+
--- a/doc/syntax/ocaml.nanorc
+++ b/doc/syntax/ocaml.nanorc
@@ -0,0 +1,27 @@
+# OCaml sample nanorc
+#
+syntax "ocaml" "\.mli?$"
+#uid
+color red "\<[A-Z][0-9a-z_]{2,}\>"
+#declarations
+color green "\<(let|val|method|in|and|rec|private|virtual|constraint)\>"
+#structure items
+color red "\<(type|open|class|module|exception|external)\>"
+#patterns
+color blue "\<(fun|function|functor|match|try|with)\>"
+#patterns-modifiers
+color yellow "\<(as|when|of)\>" 
+#conditions
+color cyan "\<(if|then|else)\>"
+#blocs
+color magenta "\<(begin|end|object|struct|sig|for|while|do|done|to|downto)\>"
+#constantes
+color green "\<(true|false)\>"
+#modules/classes
+color green "\<(include|inherit|initializer)\>"
+#expr modifiers
+color yellow "\<(new|ref|mutable|lazy|assert|raise)\>"
+#comments
+color white start="\(\*" end="\*\)"
+#strings (no multiline handling yet)
+color brightblack ""[^\"]*""
--- a/doc/syntax/perl.nanorc
+++ b/doc/syntax/perl.nanorc
@@ -1,6 +1,7 @@
 ## Here is an example for Perl.
 ##
 syntax "perl" "\.p[lm]$"
+header "^#!.*/perl[-0-9._]*"
 color red "\<(accept|alarm|atan2|bin(d|mode)|c(aller|h(dir|mod|op|own|root)|lose(dir)?|onnect|os|rypt)|d(bm(close|open)|efined|elete|ie|o|ump)|e(ach|of|val|x(ec|ists|it|p))|f(cntl|ileno|lock|ork))\>" "\<(get(c|login|peername|pgrp|ppid|priority|pwnam|(host|net|proto|serv)byname|pwuid|grgid|(host|net)byaddr|protobynumber|servbyport)|([gs]et|end)(pw|gr|host|net|proto|serv)ent|getsock(name|opt)|gmtime|goto|grep|hex|index|int|ioctl|join)\>" "\<(keys|kill|last|length|link|listen|local(time)?|log|lstat|m|mkdir|msg(ctl|get|snd|rcv)|next|oct|open(dir)?|ord|pack|pipe|pop|printf?|push|q|qq|qx|rand|re(ad(dir|link)?|cv|do|name|quire|set|turn|verse|winddir)|rindex|rmdir|s|scalar|seek(dir)?)\>" "\<(se(lect|mctl|mget|mop|nd|tpgrp|tpriority|tsockopt)|shift|shm(ctl|get|read|write)|shutdown|sin|sleep|socket(pair)?|sort|spli(ce|t)|sprintf|sqrt|srand|stat|study|substr|symlink|sys(call|read|tem|write)|tell(dir)?|time|tr(y)?|truncate|umask)\>" "\<(un(def|link|pack|shift)|utime|values|vec|wait(pid)?|wantarray|warn|write)\>"
 color magenta "\<(continue|else|elsif|do|for|foreach|if|unless|until|while|eq|ne|lt|gt|le|ge|cmp|x|my|sub|use|package|can|isa)\>"
 icolor cyan start="[$@%]" end="( |[^0-9A-Z_]|-)"
--- a/doc/syntax/php.nanorc
+++ b/doc/syntax/php.nanorc
@@ -0,0 +1,30 @@
+## Here is an example for PHP
+##
+syntax "php" "\.php[2345s~]?$"
+
+## php markings
+color brightgreen "(<\?(php)?|\?>)"
+
+## functions
+color white "\<[a-z_]*\("
+
+## types
+color green "\<(var|float|global|double|bool|char|int|enum|const)\>"
+
+## structure
+color brightyellow "\<(class|new|private|public|function|for|foreach|if|while|do|else|elseif|case|default|switch)\>"
+
+## control flow
+color magenta "\<(goto|continue|break|return)\>"
+
+## strings
+color brightyellow "<[^=       ]*>" ""(\.|[^"])*""
+
+## comments
+color brightblue "//.*"
+color brightblue start="/\*" end="\*/"
+#color blue start="<" end=">"
+#color red "&[^;[[:space:]]]*;"
+
+## Trailing whitespace
+color ,green "[[:space:]]+$"
--- a/doc/syntax/python.nanorc
+++ b/doc/syntax/python.nanorc
@@ -1,8 +1,9 @@
 ## Here is an example for Python.
 ##
 syntax "python" "\.py$"
+header "^#!.*/python[-0-9._]*"
 icolor brightblue "def [0-9A-Z_]+"
-color brightcyan "\<(and|assert|break|class|continue|def|del|elif|else|except|exec|finally|for|from|global|if|import|in|is|lambda|map|not|or|pass|print|raise|return|try|while)\>"
+color brightcyan "\<(and|as|assert|break|class|continue|def|del|elif|else|except|exec|finally|for|from|global|if|import|in|is|lambda|not|or|pass|print|raise|return|try|while|with|yield)\>"
 color brightgreen "['][^']*[^\\][']" "[']{3}.*[^\\][']{3}"
 color brightgreen "["][^"]*[^\\]["]" "["]{3}.*[^\\]["]{3}"
 color brightgreen start=""""[^"]" end=""""" start="'''[^']" end="'''"
--- a/doc/syntax/ruby.nanorc
+++ b/doc/syntax/ruby.nanorc
@@ -1,6 +1,7 @@
 ## Here is an example for Ruby.
 ##
 syntax "ruby" "\.rb$"
+header "^#!.*/ruby[-0-9._]*"
 ## Asciibetical list of reserved words
 color yellow "\<(BEGIN|END|alias|and|begin|break|case|class|def|defined\?|do|else|elsif|end|ensure|false|for|if|in|module|next|nil|not|or|redo|rescue|retry|return|self|super|then|true|undef|unless|until|when|while|yield)\>"
 ## Constants
--- a/doc/syntax/sh.nanorc
+++ b/doc/syntax/sh.nanorc
@@ -1,6 +1,7 @@
 ## Here is an example for Bourne shell scripts.
 ##
 syntax "sh" "\.sh$"
+header "^#!.*/(ba|k|pdk|)sh[-0-9_]*"
 icolor brightgreen "^[0-9A-Z_]+\(\)"
 color green "\<(case|do|done|elif|else|esac|exit|fi|for|function|if|in|local|read|return|select|shift|then|time|until|while)\>"
 color green "(\{|\}|\(|\)|\;|\]|\[|`|\\|\$|<|>|!|=|&|\|)"
--- a/doc/syntax/tcl.nanorc
+++ b/doc/syntax/tcl.nanorc
@@ -0,0 +1,16 @@
+syntax "tcl" "\.tcl$"
+
+## Standard Tcl [info commands]
+color green "\<(after|append|array|auto_execok|auto_import|auto_load|auto_load_index|auto_qualify|binary|break|case|catch|cd|clock|close|concat|continue|encoding|eof|error|eval|exec|exit|expr|fblocked|fconfigure|fcopy|file|fileevent|flush|for|foreach|format|gets|glob|global|history|if|incr|info|interp|join|lappend|lindex|linsert|list|llength|load|lrange|lreplace|lsearch|lset|lsort|namespace|open|package|pid|puts|pwd|read|regexp|regsub|rename|return|scan|seek|set|socket|source|split|string|subst|switch|tclLog|tell|time|trace|unknown|unset|update|uplevel|upvar|variable|vwait|while)\>"
+## Basic Tcl sub commands.
+color green "\<(array anymore|array donesearch|array exists|array get|array names|array nextelement|array set|array size|array startsearch|array statistics|array unset)\>"
+color green "\<(string bytelength|string compare|string equal|string first|string index|string is|string last|string length|string map|string match|string range|string repeat|string replace|string to|string tolower|string totitle|string toupper|string trim|string trimleft|string trimright|string will|string wordend|string wordstart)\>"
+## Extended TclX [info commands]
+color green "\<(alarm|auto_load_pkg|bsearch|catclose|catgets|catopen|ccollate|cconcat|cequal|chgrp|chmod|chown|chroot|cindex|clength|cmdtrace|commandloop|crange|csubstr|ctoken|ctype|dup|echo|execl|fcntl|flock|fork|fstat|ftruncate|funlock|host_info|id|infox|keyldel|keylget|keylkeys|keylset|kill|lassign|lcontain|lempty|lgets|link|lmatch|loadlibindex|loop|lvarcat|lvarpop|lvarpush|max|min|nice|pipe|profile|random|readdir|replicate|scancontext|scanfile|scanmatch|select|server_accept|server_create|signal|sleep|sync|system|tclx_findinit|tclx_fork|tclx_load_tndxs|tclx_sleep|tclx_system|tclx_wait|times|translit|try_eval|umask|wait)\>"
+## Syntax.
+color brightblue "proc[[:space:]]" "(\{|\})"
+color green "(\(|\)|\;|`|\\|\$|<|>|!|=|&|\|)"
+color brightyellow ""(\\.|[^"])*"" "'(\\.|[^'])*'"
+icolor brightred "\$\{?[0-9A-Z_!@#$*?-]+\}?"
+color ,green "[[:space:]]+$"
+color ,magenta "^([[:space:]]+|)#.*"
--- a/doc/syntax/xml.nanorc
+++ b/doc/syntax/xml.nanorc
@@ -0,0 +1,9 @@
+## Here is an example for xml files.
+##
+syntax "xml" "\.([jrs]html?|sgml?|xml|xslt?)$"
+color green  start="<" end=">"
+color cyan   "<[^> ]+"
+color cyan   ">"
+color yellow start="<!DOCTYPE" end="[/]?>"
+color yellow start="<!--" end="-->"
+color red    "&[^;]*;"
--- a/27
+++ b/27
@@ -0,0 +1,27 @@
+#!/usr/bin/perl
+use strict;
+
+sub combinations {
+  return [] unless @_;
+  my $first = shift;
+  my @rest = combinations(@_);
+  return @rest, map { [$first, @$_] } @rest;
+} 
+
+my @allargs=("--enable-debug", "--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;
+foreach my $name (@combos) {
+    my @args = @$name;
+    my $pct = $i / $#combos * 100;
+    printf "Trying with options: @args, %d%% done...\n", $pct;
+    if (system "(./configure @args && make clean all) >/dev/null 2>&1") {
+	print "Build failed for args: @args\n";
+	print "Try running make to reproduce\n";
+	exit(1);
+    }
+    $i++;
+}
+
+print "All options completed successfully!\n";
--- 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
@@ -173,8 +173,8 @@ char *do_browser(char *path, DIR *dir)
 		total_redraw();
 	} else if (f->scfunc == do_help_void) {
 #ifndef DISABLE_HELP
-		do_browser_help();
-		curs_set(0);
+	    do_browser_help();
+	    curs_set(0);
 #else
 		nano_disabled_msg();
 #endif
@@ -558,7 +558,9 @@ void parse_browser_input(int *kbinput, bool *meta_key, bool *func_key)
 		*kbinput = sc_seq_or(do_page_up, 0);
 		break;
 	    case '?':
+#ifndef DISABLE_HELP
 		*kbinput = sc_seq_or(do_help_void, 0);
+#endif
 		break;
 	    /* Cancel equivalent to Exit here. */
 	    case 'E':
--- a/src/color.c
+++ b/src/color.c
@@ -131,7 +131,7 @@ void color_update(void)

    /* If we didn't specify a syntax override string, or if we did and
     * there was no syntax by that name, get the syntax based on the
-     * file extension. */
+     * file extension, and then look in the header. */
    if (openfile->colorstrings == NULL) {
 	for (tmpsyntax = syntaxes; tmpsyntax != NULL;
 		tmpsyntax = tmpsyntax->next) {
@@ -153,7 +153,7 @@ void color_update(void)
 		 * already. */
 		if (not_compiled) {
 		    e->ext = (regex_t *)nmalloc(sizeof(regex_t));
-		    regcomp(e->ext, e->ext_regex, REG_EXTENDED);
+		    regcomp(e->ext, fixbounds(e->ext_regex), REG_EXTENDED);
 		}

 		/* Set colorstrings if we matched the extension
@@ -174,8 +174,51 @@ void color_update(void)
 		}
 	    }
 	}
+
+	/* If we haven't matched anything yet, try the headers */
+	if (openfile->colorstrings == NULL) {
+#ifdef DEBUG
+	    fprintf(stderr, "No match for file extensions, looking at headers...\n");
+#endif
+	    for (tmpsyntax = syntaxes; tmpsyntax != NULL;
+		tmpsyntax = tmpsyntax->next) {
+		exttype *e;
+
+		for (e = tmpsyntax->headers; e != NULL; e = e->next) {
+		    bool not_compiled = (e->ext == NULL);
+
+		    /* e->ext_regex has already been checked for validity
+		     * elsewhere.  Compile its specified regex if we haven't
+		     * already. */
+		    if (not_compiled) {
+			e->ext = (regex_t *)nmalloc(sizeof(regex_t));
+			regcomp(e->ext, fixbounds(e->ext_regex), REG_EXTENDED);
+		    }
+
+		    /* Set colorstrings if we matched the extension
+		     * regex. */
+#ifdef DEBUG
+		fprintf(stderr, "Comparing header regex \"%s\" to fileage \"%s\"...\n", e->ext_regex, openfile->fileage->data);
+#endif
+		    if (regexec(e->ext, openfile->fileage->data, 0, NULL, 0) == 0)
+			openfile->colorstrings = tmpsyntax->color;
+
+		    if (openfile->colorstrings != NULL)
+			break;
+
+		    /* Decompile e->ext_regex's specified regex if we aren't
+		     * going to use it. */
+		    if (not_compiled) {
+			regfree(e->ext);
+			free(e->ext);
+			e->ext = NULL;
+		    }
+		}
+	    }
+	}
    }

+
    /* If we didn't get a syntax based on the file extension, and we
     * have a default syntax, use it. */
    if (openfile->colorstrings == NULL && defcolor != NULL)
@@ -188,13 +231,13 @@ void color_update(void)
 	 * regexes if we haven't already. */
 	if (tmpcolor->start == NULL) {
 	    tmpcolor->start = (regex_t *)nmalloc(sizeof(regex_t));
-	    regcomp(tmpcolor->start, tmpcolor->start_regex,
+	    regcomp(tmpcolor->start, fixbounds(tmpcolor->start_regex),
 		REG_EXTENDED | (tmpcolor->icase ? REG_ICASE : 0));
 	}

 	if (tmpcolor->end_regex != NULL && tmpcolor->end == NULL) {
 	    tmpcolor->end = (regex_t *)nmalloc(sizeof(regex_t));
-	    regcomp(tmpcolor->end, tmpcolor->end_regex,
+	    regcomp(tmpcolor->end, fixbounds(tmpcolor->end_regex),
 		REG_EXTENDED | (tmpcolor->icase ? REG_ICASE : 0));
 	}
    }
--- a/src/cut.c
+++ b/src/cut.c
@@ -28,7 +28,6 @@

 static bool keep_cutbuffer = FALSE;
 	/* Should we keep the contents of the cutbuffer? */
-static filestruct *cutbottom = NULL;
 	/* Pointer to the end of the cutbuffer. */

 /* Indicate that we should no longer keep the contents of the
@@ -114,7 +113,7 @@ void cut_to_eof(void)
 * position to the end of the file into the cutbuffer. */
 void do_cut_text(
 #ifndef NANO_TINY
-	bool copy_text, bool cut_till_end
+	bool copy_text, bool cut_till_end, bool undoing
 #else
 	void
 #endif
@@ -163,6 +162,7 @@ void do_cut_text(
    keep_cutbuffer = TRUE;

 #ifndef NANO_TINY
+
    if (cut_till_end) {
 	/* If cut_till_end is TRUE, move all text up to the end of the
 	 * file into the cutbuffer. */
@@ -204,12 +204,14 @@ void do_cut_text(
 	 * disturbing the text. */
 	if (!old_no_newlines)
 	    UNSET(NO_NEWLINES);
-    } else
+    } else if (!undoing)
+	update_undo(CUT);
 #endif
 	/* Leave the text in the cutbuffer, and mark the file as
 	 * modified. */
 	set_modified();

+
    /* Update the screen. */
    edit_refresh();

@@ -221,9 +223,12 @@ void do_cut_text(
 /* Move text from the current filestruct into the cutbuffer. */
 void do_cut_text_void(void)
 {
+#ifndef NANO_TINY
+    add_undo(CUT);
+#endif
    do_cut_text(
 #ifndef NANO_TINY
-	FALSE, FALSE
+	FALSE, FALSE, FALSE
 #endif
 	);
 }
@@ -233,13 +238,16 @@ void do_cut_text_void(void)
 * back into the filestruct afterward. */
 void do_copy_text(void)
 {
-    do_cut_text(TRUE, FALSE);
+    do_cut_text(TRUE, FALSE, FALSE);
 }

 /* Cut from the current cursor position to the end of the file. */
 void do_cut_till_end(void)
 {
-    do_cut_text(FALSE, TRUE);
+#ifndef NANO_TINY
+    add_undo(CUTTOEND);
+#endif
+    do_cut_text(FALSE, TRUE, FALSE);
 }
 #endif /* !NANO_TINY */

@@ -252,6 +260,10 @@ void do_uncut_text(void)
    if (cutbuffer == NULL)
 	return;

+#ifndef NANO_TINY
+     update_undo(UNCUT);
+#endif
+
    /* Add a copy of the text in the cutbuffer to the current filestruct
     * at the current cursor position. */
    copy_from_filestruct(cutbuffer, cutbottom);
--- a/src/files.c
+++ b/src/files.c
@@ -75,6 +75,8 @@ void initialize_buffer(void)
    openfile->fmt = NIX_FILE;

    openfile->current_stat = NULL;
+    openfile->undotop = NULL;
+    openfile->current_undo = NULL;
 #endif
 #ifdef ENABLE_COLOR
    openfile->colorstrings = NULL;
@@ -99,7 +101,7 @@ void initialize_buffer_text(void)

 /* If it's not "", filename is a file to open.  We make a new buffer, if
 * necessary, and then open and read the file, if applicable. */
-void open_buffer(const char *filename)
+void open_buffer(const char *filename, bool undoable)
 {
    bool new_buffer = (openfile == NULL
 #ifdef ENABLE_MULTIBUFFER
@@ -140,7 +142,7 @@ void open_buffer(const char *filename)
    /* 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, filename);
+	read_file(f, filename, undoable);
 #ifndef NANO_TINY
 	if (openfile->current_stat == NULL) {
 	    openfile->current_stat =
@@ -190,7 +192,7 @@ void replace_buffer(const char *filename)

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

    /* Move back to the beginning of the first line of the buffer. */
    openfile->current = openfile->fileage;
@@ -337,8 +339,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. */
-void read_file(FILE *f, const char *filename)
+ * 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 */
+void read_file(FILE *f, const char *filename, bool undoable)
 {
    size_t num_lines = 0;
 	/* The number of lines in the file. */
@@ -369,6 +372,11 @@ void read_file(FILE *f, const char *filename)
    buf = charalloc(bufx);
    buf[0] = '\0';

+#ifndef NANO_TINY
+    if (undoable)
+	add_undo(INSERT);
+#endif
+
    if (openfile->current == openfile->fileage)
 	first_line_ins = TRUE;
    else
@@ -487,7 +495,7 @@ void read_file(FILE *f, const char *filename)
    /* If we didn't get a file and we don't already have one, open a
     * blank buffer. */
    if (fileptr == NULL)
-	open_buffer("");
+	open_buffer("", FALSE);

    /* Attach the file we got to the filestruct.  If we got a file of
     * zero bytes, don't do anything. */
@@ -559,6 +567,9 @@ void read_file(FILE *f, const char *filename)
    openfile->placewewant = xplustabs();

 #ifndef NANO_TINY
+    if (undoable)
+	update_undo(INSERT);
+
    if (format == 3)
 	statusbar(
 		P_("Read %lu line (Converted from DOS and Mac format)",
@@ -738,7 +749,9 @@ void do_insertfile(
 #endif
 		MINSERTFILE, ans,
 		&meta_key, &func_key,
+#ifndef NANO_TINY
 		NULL,
+#endif
 		edit_refresh, msg,
 #ifndef DISABLE_OPERATINGDIR
 		operating_dir != NULL && strcmp(operating_dir,
@@ -849,7 +862,7 @@ void do_insertfile(
 #ifdef ENABLE_MULTIBUFFER
 		if (ISSET(MULTIBUFFER))
 		    /* Open a blank buffer. */
-		    open_buffer("");
+		    open_buffer("", FALSE);
 #endif

 		/* Save the command's output in the current buffer. */
@@ -873,7 +886,7 @@ void do_insertfile(

 		/* Save the file specified in answer in the current
 		 * buffer. */
-		open_buffer(answer);
+		open_buffer(answer, TRUE);
 #ifndef NANO_TINY
 	    }
 #endif
@@ -1461,14 +1474,15 @@ bool write_file(const char *name, FILE *f_open, bool tmp, append_type
 	    free(backuptemp);
 	    backuptemp = get_next_filename(backupname, "~");
 	    if (*backuptemp == '\0') {
-		statusbar(_("Error writing %s: %s"), backupname,
+		statusbar(_("Error writing backup file %s: %s"), backupname,
 		    _("Too many backup files?"));
 		free(backuptemp);
 		free(backupname);
-		/* If we can't write to the backup, go on, since only
-		 * saving the original file is better than saving
-		 * nothing. */
-		goto skip_backup;
+		/* If we can't write to the backup, DONT go on, since
+		   whatever caused the backup file to fail (e.g. disk
+		   full may well cause the real file write to fail, which
+		   means we could lose both the backup and the original! */
+		goto cleanup_and_exit;
 	    } else {
 		free(backupname);
 		backupname = backuptemp;
@@ -1485,14 +1499,16 @@ bool write_file(const char *name, FILE *f_open, bool tmp, append_type

 	if (backup_file == NULL || chmod(backupname,
 		openfile->current_stat->st_mode) == -1) {
-	    statusbar(_("Error writing %s: %s"), backupname,
+	    statusbar(_("Error writing backup file %s: %s"), backupname,
 		strerror(errno));
 	    free(backupname);
 	    if (backup_file != NULL)
 		fclose(backup_file);
-	    /* If we can't write to the backup, go on, since only saving
-	     * the original file is better than saving nothing. */
-	    goto skip_backup;
+	    /* If we can't write to the backup, DONT go on, since
+	       whatever caused the backup file to fail (e.g. disk
+	       full may well cause the real file write to fail, which
+	       means we could lose both the backup and the original! */
+	    goto cleanup_and_exit;
 	}

 #ifdef DEBUG
@@ -1512,17 +1528,19 @@ bool write_file(const char *name, FILE *f_open, bool tmp, append_type
 			strerror(errno));
 		beep();
 	    } else
-		statusbar(_("Error writing %s: %s"), backupname,
+		statusbar(_("Error writing backup file %s: %s"), backupname,
 			strerror(errno));
-	    /* If we can't read from or write to the backup, go on,
-	     * since only saving the original file is better than saving
-	     * nothing. */
+	    /* If we can't write to the backup, DONT go on, since
+	       whatever caused the backup file to fail (e.g. disk
+	       full may well cause the real file write to fail, which
+	       means we could lose both the backup and the original! */
+	    goto cleanup_and_exit;
 	}

 	free(backupname);
    }

-  skip_backup:
+    skip_backup:
 #endif /* !NANO_TINY */

    /* If NOFOLLOW_SYMLINKS is set and the file is a link, we aren't
@@ -1570,7 +1588,7 @@ bool write_file(const char *name, FILE *f_open, bool tmp, append_type
 	}

 	if (f_open == NULL) {
-	    fd_source = open(realname, O_RDONLY | O_CREAT);
+	    fd_source = open(realname, O_RDONLY | O_CREAT, S_IRUSR | S_IWUSR);

 	    if (fd_source != -1) {
 		f_source = fdopen(fd_source, "rb");
@@ -1689,7 +1707,7 @@ bool write_file(const char *name, FILE *f_open, bool tmp, append_type
 	int fd_source;
 	FILE *f_source = NULL;

-	fd_source = open(tempname, O_RDONLY | O_CREAT);
+	fd_source = open(tempname, O_RDONLY | O_CREAT, S_IRUSR | S_IWUSR);

 	if (fd_source != -1) {
 	    f_source = fdopen(fd_source, "rb");
@@ -1710,8 +1728,11 @@ bool write_file(const char *name, FILE *f_open, bool tmp, append_type
 		strerror(errno));
 	    goto cleanup_and_exit;
 	}
-    } else
-	fclose(f);
+    } else if (fclose(f) != 0) {
+	    statusbar(_("Error writing %s: %s"), realname,
+		strerror(errno));
+	    goto cleanup_and_exit;
+    }

    if (!tmp && append == OVERWRITE) {
 	if (!nonamechange) {
@@ -1927,6 +1948,8 @@ bool do_writeout(bool exiting)
 	    } else if (s && s->scfunc == (void *) append_msg) {
 		append = (append == APPEND) ? OVERWRITE : APPEND;
 		continue;
+	    } else if (s && s->scfunc == do_help_void) {
+		continue;
 	    }

 #ifdef DEBUG
@@ -2393,7 +2416,7 @@ char *input_tab(char *buf, bool allow_files, size_t *place, bool
 	} else if (!*lastwastab || num_matches < 2)
 	    *lastwastab = TRUE;
 	else {
-	    int longest_name = 0, columns, editline = 0;
+	    int longest_name = 0, ncols, editline = 0;

 	    /* Now we show a list of the available choices. */
 	    assert(num_matches > 1);
@@ -2418,7 +2441,7 @@ char *input_tab(char *buf, bool allow_files, size_t *place, bool
 	    /* Each column will be (longest_name + 2) columns wide, i.e.
 	     * two spaces between columns, except that there will be
 	     * only one space after the last column. */
-	    columns = (COLS + 1) / (longest_name + 2);
+	    ncols = (COLS + 1) / (longest_name + 2);

 	    /* Blank the edit window, and print the matches out
 	     * there. */
@@ -2432,11 +2455,11 @@ char *input_tab(char *buf, bool allow_files, size_t *place, bool
 		char *disp;

 		wmove(edit, editline, (longest_name + 2) *
-			(match % columns));
+			(match % ncols));

-		if (match % columns == 0 &&
+		if (match % ncols == 0 &&
 			editline == editwinrows - 1 &&
-			num_matches - match > columns) {
+			num_matches - match > ncols) {
 		    waddstr(edit, _("(more)"));
 		    break;
 		}
@@ -2446,7 +2469,7 @@ char *input_tab(char *buf, bool allow_files, size_t *place, bool
 		waddstr(edit, disp);
 		free(disp);

-		if ((match + 1) % columns == 0)
+		if ((match + 1) % ncols == 0)
 		    editline++;
 	    }

--- a/src/global.c
+++ b/src/global.c
@@ -1,5 +1,4 @@
-/* $Id$ 
-*/
+/* $Id$ */
 /**************************************************************************
 *   global.c                                                             *
 *                                                                        *
@@ -22,11 +21,12 @@
 *                                                                        *
 **************************************************************************/

+#include "proto.h"
+
 #include <ctype.h>
 #include <string.h>
 #include <strings.h>
 #include "assert.h"
-#include "proto.h"

 /* Global variables. */
 #ifndef NANO_TINY
@@ -69,6 +69,7 @@ int editwinrows = 0;

 filestruct *cutbuffer = NULL;
 	/* The buffer where we store cut text. */
+filestruct *cutbottom = NULL;
 #ifndef DISABLE_JUSTIFY
 filestruct *jusbuffer = NULL;
 	/* The buffer where we store unjustified text. */
@@ -150,11 +151,6 @@ const shortcut *currshortcut;
 int currmenu;
 	/* The currently loaded menu */

-#ifndef NANO_TINY
-toggle *toggles = NULL;
-	/* The global toggle list. */
-#endif
-
 sc *sclist = NULL;
 	/* New shortcut key struct */
 subnfunc *allfuncs = NULL;
@@ -241,7 +237,7 @@ void add_to_funcs(void *func, int menus, const char *desc, const char *help,
    f->menus = menus;
    f->desc = desc;
    f->viewok = viewok;
-#ifndef NANO_TINY
+#ifndef DISABLE_HELP
    f->help = help;
    f->blank_after = blank_after;
 #endif
@@ -487,6 +483,9 @@ void shortcut_init(bool unjustify)
    const char *insert_file_msg =  N_("Insert File");
    const char *go_to_line_msg = N_("Go To Line");

+#ifndef DISABLE_JUSTIFY
+    const char *nano_justify_msg = N_("Justify the current paragraph");
+#endif
 #ifndef DISABLE_HELP
    /* TRANSLATORS: The next long series of strings are shortcut descriptions;
     * they are best kept shorter than 56 characters, but may be longer. */
@@ -501,7 +500,6 @@ void shortcut_init(bool unjustify)
 	;
    const char *nano_writeout_msg =
 	N_("Write the current file to disk");
-    const char *nano_justify_msg = N_("Justify the current paragraph");
    const char *nano_insert_msg =
 	N_("Insert another file into the current one");
    const char *nano_whereis_msg =
@@ -526,6 +524,8 @@ void shortcut_init(bool unjustify)
 	N_("Copy the current line and store it in the cutbuffer");
    const char *nano_indent_msg = N_("Indent the current line");
    const char *nano_unindent_msg = N_("Unindent the current line");
+    const char *nano_undo_msg = N_("Undo the last operation");
+    const char *nano_redo_msg = N_("Redo the last undone operation");
 #endif
    const char *nano_forward_msg = N_("Go forward one character");
    const char *nano_back_msg = N_("Go back one character");
@@ -642,10 +642,8 @@ void shortcut_init(bool unjustify)
        free(f);
    }

-#ifndef DISABLE_HELP
-    add_to_funcs(do_help_void, MALL, get_help_msg, nano_help_msg,
+    add_to_funcs(do_help_void, MALL, get_help_msg, IFSCHELP(nano_help_msg),
 	FALSE, VIEW);
-#endif

    add_to_funcs((void *) cancel_msg,
 	(MWHEREIS|MREPLACE|MREPLACE2|MGOTOLINE|MWRITEFILE|MINSERTFILE|MEXTCMD|MSPELL|MWHEREISFILE|MGOTODIR|MYESNO),
@@ -658,7 +656,11 @@ void shortcut_init(bool unjustify)
 #endif
 	exit_msg, IFSCHELP(nano_exit_msg), FALSE, VIEW);

-    add_to_funcs(do_exit, MBROWSER|MHELP, 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

    /* TRANSLATORS: Try to keep this at most 10 characters. */
    add_to_funcs(do_writeout_void, MMAIN, N_("WriteOut"),
@@ -692,6 +694,7 @@ void shortcut_init(bool unjustify)
    add_to_funcs(do_page_down, MMAIN|MHELP,
 	next_page_msg, IFSCHELP(nano_nextpage_msg), TRUE, VIEW);

+
    /* TRANSLATORS: Try to keep this at most 10 characters. */
    add_to_funcs(do_cut_text_void, MMAIN, N_("Cut Text"), IFSCHELP(nano_cut_msg),
 	FALSE, NOVIEW);
@@ -718,7 +721,7 @@ void shortcut_init(bool unjustify)
 #ifndef DISABLE_SPELLER
 	if (!ISSET(RESTRICTED))
 	    /* TRANSLATORS: Try to keep this at most 10 characters. */
-	    add_to_funcs(do_spell, MMAIN, N_("To Spell"), nano_spell_msg,
+	    add_to_funcs(do_spell, MMAIN, N_("To Spell"), IFSCHELP(nano_spell_msg),
 		TRUE, NOVIEW);
 #endif

@@ -753,19 +756,25 @@ void shortcut_init(bool unjustify)
 #ifndef NANO_TINY

    add_to_funcs(do_mark, MMAIN, N_("Mark Text"), 
-	nano_mark_msg, FALSE, VIEW);
+	IFSCHELP(nano_mark_msg), FALSE, VIEW);

    add_to_funcs(do_research, (MMAIN|MBROWSER), whereis_next_msg,
-	nano_whereis_next_msg, TRUE, VIEW);
+	IFSCHELP(nano_whereis_next_msg), TRUE, VIEW);

    add_to_funcs(do_copy_text, MMAIN, N_("Copy Text"),
-	nano_copy_msg, FALSE, NOVIEW);
+	IFSCHELP(nano_copy_msg), FALSE, NOVIEW);

    add_to_funcs(do_indent_void, MMAIN, N_("Indent Text"),
-	nano_indent_msg, FALSE, NOVIEW);
+	IFSCHELP(nano_indent_msg), FALSE, NOVIEW);

    add_to_funcs(do_unindent, MMAIN, N_("Unindent Text"),
-	nano_unindent_msg, TRUE, NOVIEW);
+	IFSCHELP(nano_unindent_msg), FALSE, NOVIEW);
+
+    add_to_funcs(do_undo, MMAIN, N_("Undo"),
+	IFSCHELP(nano_undo_msg), FALSE, NOVIEW);
+
+    add_to_funcs(do_redo, MMAIN, N_("Redo"),
+	IFSCHELP(nano_redo_msg), TRUE, NOVIEW);

 #endif

@@ -785,10 +794,10 @@ void shortcut_init(bool unjustify)

 #ifndef NANO_TINY
    add_to_funcs(do_next_word_void, MMAIN, N_("Next Word"),
-	nano_nextword_msg, FALSE, VIEW);
+	IFSCHELP(nano_nextword_msg), FALSE, VIEW);

    add_to_funcs(do_prev_word_void, MMAIN, N_("Prev Word"),
-	nano_prevword_msg, FALSE, VIEW);
+	IFSCHELP(nano_prevword_msg), FALSE, VIEW);
 #endif

    add_to_funcs(do_up_void, (MMAIN|MHELP|MBROWSER), N_("Prev Line"),
@@ -805,28 +814,28 @@ void shortcut_init(bool unjustify)

 #ifndef DISABLE_JUSTIFY
    add_to_funcs(do_para_begin_void, (MMAIN|MWHEREIS), beg_of_par_msg,
-	nano_parabegin_msg, FALSE, VIEW);
+	IFSCHELP(nano_parabegin_msg), FALSE, VIEW);

    add_to_funcs(do_para_end_void, (MMAIN|MWHEREIS), end_of_par_msg,
-	nano_paraend_msg, FALSE, VIEW);
+	IFSCHELP(nano_paraend_msg), FALSE, VIEW);
 #endif

 #ifndef NANO_TINY
    add_to_funcs(do_find_bracket, MMAIN, _("Find Other Bracket"),
-	nano_bracket_msg, FALSE, VIEW);
+	IFSCHELP(nano_bracket_msg), FALSE, VIEW);

    add_to_funcs(do_scroll_up, MMAIN, N_("Scroll Up"),
-	nano_scrollup_msg, FALSE, VIEW);
+	IFSCHELP(nano_scrollup_msg), FALSE, VIEW);

    add_to_funcs(do_scroll_down, MMAIN, N_("Scroll Down"),
-	nano_scrolldown_msg, FALSE, VIEW);
+	IFSCHELP(nano_scrolldown_msg), FALSE, VIEW);
 #endif

 #ifdef ENABLE_MULTIBUFFER
    add_to_funcs(switch_to_prev_buffer_void, MMAIN, _("Previous File"),
-	nano_prevfile_msg, FALSE, VIEW);
+	IFSCHELP(nano_prevfile_msg), FALSE, VIEW);
    add_to_funcs(switch_to_next_buffer_void, MMAIN, N_("Next File"),
-	nano_nextfile_msg, TRUE, VIEW);
+	IFSCHELP(nano_nextfile_msg), TRUE, VIEW);
 #endif

    add_to_funcs(do_verbatim_input, MMAIN, N_("Verbatim Input"),
@@ -861,7 +870,7 @@ void shortcut_init(bool unjustify)

 #ifndef NANO_TINY
    add_to_funcs(do_cut_till_end, MMAIN, N_("CutTillEnd"),
-	nano_cut_till_end_msg, TRUE, NOVIEW);
+	IFSCHELP(nano_cut_till_end_msg), TRUE, NOVIEW);
 #endif

    add_to_funcs(xon_complaint, MMAIN, "", "", FALSE, VIEW);
@@ -869,12 +878,12 @@ void shortcut_init(bool unjustify)

 #ifndef DISABLE_JUSTIFY
    add_to_funcs(do_full_justify, (MMAIN|MWHEREIS), fulljstify_msg,
-	nano_fulljustify_msg, FALSE, NOVIEW);
+	IFSCHELP(nano_fulljustify_msg), FALSE, NOVIEW);
 #endif

 #ifndef NANO_TINY
    add_to_funcs(do_wordlinechar_count, MMAIN, N_("Word Count"),
-	nano_wordcount_msg, FALSE, VIEW);
+	IFSCHELP(nano_wordcount_msg), FALSE, VIEW);
 #endif

    add_to_funcs(total_refresh, (MMAIN|MHELP), refresh_msg, 
@@ -886,11 +895,11 @@ void shortcut_init(bool unjustify)
 #ifndef NANO_TINY
    add_to_funcs((void *) case_sens_msg,
 	(MWHEREIS|MREPLACE|MWHEREISFILE),
-	case_sens_msg, nano_case_msg, FALSE, VIEW);
+	case_sens_msg, IFSCHELP(nano_case_msg), FALSE, VIEW);

    add_to_funcs((void *) backwards_msg,
 	(MWHEREIS|MREPLACE|MWHEREISFILE),
-	backwards_msg, nano_reverse_msg, FALSE, VIEW);
+	backwards_msg, IFSCHELP(nano_reverse_msg), FALSE, VIEW);
 #endif

 #ifdef HAVE_REGEX_H
@@ -902,11 +911,11 @@ void shortcut_init(bool unjustify)
 #ifndef NANO_TINY
    add_to_funcs((void *) prev_history_msg,
 	(MWHEREIS|MREPLACE|MREPLACE2|MWHEREISFILE),
-	prev_history_msg, nano_prev_history_msg, FALSE, VIEW);
+	prev_history_msg, IFSCHELP(nano_prev_history_msg), FALSE, VIEW);

    add_to_funcs((void *) next_history_msg,
 	(MWHEREIS|MREPLACE|MREPLACE2|MWHEREISFILE),
-	next_history_msg, nano_next_history_msg, FALSE, VIEW);
+	next_history_msg, IFSCHELP(nano_next_history_msg), FALSE, VIEW);
 #endif

    add_to_funcs((void *) no_replace_msg, MREPLACE,
@@ -919,7 +928,7 @@ void shortcut_init(bool unjustify)
    if (!ISSET(RESTRICTED))
 	add_to_funcs((void *) to_files_msg,
 	    (MGOTOLINE|MINSERTFILE),
-	    to_files_msg, nano_tofiles_msg, FALSE, VIEW);
+	    to_files_msg, IFSCHELP(nano_tofiles_msg), FALSE, VIEW);
 #endif

 #ifndef NANO_TINY
@@ -931,23 +940,23 @@ void shortcut_init(bool unjustify)
     * backups are disabled. */
    if (!ISSET(RESTRICTED))
        add_to_funcs((void *) dos_format_msg, MWRITEFILE,
-            dos_format_msg, nano_dos_msg, FALSE, NOVIEW);
+            dos_format_msg, IFSCHELP(nano_dos_msg), FALSE, NOVIEW);

    if (!ISSET(RESTRICTED))
        add_to_funcs((void *) mac_format_msg, MWRITEFILE,
-            mac_format_msg, nano_mac_msg, FALSE, NOVIEW);
+            mac_format_msg, IFSCHELP(nano_mac_msg), FALSE, NOVIEW);

    if (!ISSET(RESTRICTED))
        add_to_funcs((void *) append_msg, MWRITEFILE,
-            append_msg, nano_append_msg, FALSE, NOVIEW);
+            append_msg, IFSCHELP(nano_append_msg), FALSE, NOVIEW);

    if (!ISSET(RESTRICTED))
        add_to_funcs((void *) prepend_msg, MWRITEFILE,
-            prepend_msg, nano_prepend_msg, FALSE, NOVIEW);
+            prepend_msg, IFSCHELP(nano_prepend_msg), FALSE, NOVIEW);

    if (!ISSET(RESTRICTED))
        add_to_funcs((void *) backup_file_msg, MWRITEFILE,
-            backup_file_msg, nano_backup_msg, FALSE, NOVIEW);
+            backup_file_msg, IFSCHELP(nano_backup_msg), FALSE, NOVIEW);
 #endif

 #ifndef NANO_TINY
@@ -955,14 +964,14 @@ void shortcut_init(bool unjustify)
     * It's useless since inserting files is disabled. */
    if (!ISSET(RESTRICTED))
        add_to_funcs((void *) ext_cmd_msg, MINSERTFILE,
-	    ext_cmd_msg, nano_execute_msg, FALSE, NOVIEW);
+	    ext_cmd_msg, IFSCHELP(nano_execute_msg), FALSE, NOVIEW);

 #ifdef ENABLE_MULTIBUFFER
    /* If we're using restricted mode, the multibuffer toggle is
     * disabled.  It's useless since inserting files is disabled. */
    if (!ISSET(RESTRICTED))
 	add_to_funcs((void *) new_buffer_msg, MINSERTFILE,
-	new_buffer_msg, nano_multibuffer_msg, FALSE, NOVIEW);
+	new_buffer_msg, IFSCHELP(nano_multibuffer_msg), FALSE, NOVIEW);
 #endif

    add_to_funcs((void *)  insert_file_msg, MEXTCMD,
@@ -970,7 +979,7 @@ void shortcut_init(bool unjustify)

 #ifdef ENABLE_MULTIBUFFER
     add_to_funcs((void *) new_buffer_msg, MEXTCMD,
-	new_buffer_msg, nano_multibuffer_msg, FALSE, NOVIEW);
+	new_buffer_msg, IFSCHELP(nano_multibuffer_msg), FALSE, NOVIEW);
 #endif
 #endif

@@ -983,22 +992,20 @@ void shortcut_init(bool unjustify)

    add_to_funcs((void *) first_file_msg,
 	(MBROWSER|MWHEREISFILE),
-	first_file_msg, nano_firstfile_msg, FALSE, VIEW);
+	first_file_msg, IFSCHELP(nano_firstfile_msg), FALSE, VIEW);

    add_to_funcs((void *) last_file_msg,
 	(MBROWSER|MWHEREISFILE),
-	last_file_msg, nano_lastfile_msg, FALSE, VIEW);
+	last_file_msg, IFSCHELP(nano_lastfile_msg), FALSE, VIEW);

    add_to_funcs((void *) goto_dir_msg, MBROWSER,
-	goto_dir_msg, nano_gotodir_msg, FALSE, VIEW);
+	goto_dir_msg, IFSCHELP(nano_gotodir_msg), FALSE, VIEW);
 #endif

    currmenu = MMAIN;

-#ifndef NANO_TINY
    add_to_sclist(MALL, "^G", do_help_void, 0, TRUE);
    add_to_sclist(MALL, "F1", do_help_void, 0, TRUE);
-#endif
    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);
@@ -1026,7 +1033,7 @@ void shortcut_init(bool unjustify)
    add_to_sclist(MMAIN, "F10", do_uncut_text, 0, TRUE);
    add_to_sclist(MMAIN, "^C", do_cursorpos_void, 0, TRUE);
    add_to_sclist(MMAIN, "F11", do_cursorpos_void, 0, TRUE);
-#ifndef NANO_TINY
+#ifndef DISABLE_SPELLER
    add_to_sclist(MMAIN, "^T", do_spell, 0, TRUE);
    add_to_sclist(MMAIN, "F12", do_spell, 0, TRUE);
 #endif
@@ -1049,23 +1056,31 @@ void shortcut_init(bool unjustify)
    add_to_sclist(MMAIN, "M-6", do_copy_text, 0, TRUE);
    add_to_sclist(MMAIN, "M-}", do_indent_void, 0, TRUE);
    add_to_sclist(MMAIN, "M-{", do_unindent, 0, TRUE);
+    add_to_sclist(MMAIN, "M-U", do_undo, 0, TRUE);
+    add_to_sclist(MMAIN, "M-E", do_redo, 0, TRUE);
    add_to_sclist(MALL, "^F", do_right, 0, TRUE);
-    add_to_sclist(MALL, "kright", do_right, 0, TRUE);
    add_to_sclist(MALL, "^B", do_left, 0, TRUE);
-    add_to_sclist(MALL, "kleft", do_left, 0, TRUE);
    add_to_sclist(MMAIN, "^Space", do_next_word_void, 0, TRUE);
    add_to_sclist(MMAIN, "M-Space", do_prev_word_void, 0, TRUE);
 #endif
+    add_to_sclist(MALL, "kright", do_right, 0, TRUE);
+    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(MALL, "^P", do_up_void, 0, TRUE);
-    add_to_sclist(MALL, "kup", do_up_void, 0, TRUE);
-    add_to_sclist(MALL, "^N", do_down_void, 0, TRUE);
-    add_to_sclist(MALL, "kdown", do_down_void, 0, TRUE);
+    add_to_sclist(MMAIN, "^P", do_up_void, 0, TRUE);
+    add_to_sclist(MMAIN, "kup", do_up_void, 0, TRUE);
+    add_to_sclist(MMAIN, "^N", do_down_void, 0, TRUE);
+    add_to_sclist(MMAIN, "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);
    add_to_sclist(MALL, "kend", do_end, 0, TRUE);
+#ifndef NANO_TINY
+    add_to_sclist(MWHEREIS|MREPLACE|MREPLACE2|MWHEREISFILE, "^P", (void *) prev_history_msg, 0, FALSE);
+    add_to_sclist(MWHEREIS|MREPLACE|MREPLACE2|MWHEREISFILE, "kup", (void *) prev_history_msg, 0, FALSE);
+    add_to_sclist(MWHEREIS|MREPLACE|MREPLACE2|MWHEREISFILE, "^N", (void *) next_history_msg, 0, FALSE);
+    add_to_sclist(MWHEREIS|MREPLACE|MREPLACE2|MWHEREISFILE, "kdown", (void *) next_history_msg, 0, FALSE);
+#endif
 #ifndef DISABLE_JUSTIFY
    add_to_sclist(MWHEREIS|MREPLACE|MREPLACE2,
 	"^W", do_para_begin_void, 0, TRUE);
@@ -1101,7 +1116,7 @@ void shortcut_init(bool unjustify)
    add_to_sclist(MBROWSER|MWHEREISFILE, "M-/", (void *) last_file_msg, 0, TRUE);
    add_to_sclist(MBROWSER|MWHEREISFILE, "M-?", (void *) last_file_msg, 0, TRUE);
 #ifndef NANO_TINY
-    add_to_sclist(MMAIN, "M-[", do_find_bracket, 0, TRUE);
+    add_to_sclist(MMAIN, "M-]", do_find_bracket, 0, TRUE);
    add_to_sclist(MMAIN, "M--", do_scroll_up, 0, TRUE);
    add_to_sclist(MMAIN, "M-_", do_scroll_up, 0, TRUE);
    add_to_sclist(MMAIN, "M-+", do_scroll_down, 0, TRUE);
@@ -1321,6 +1336,10 @@ sc *strtosc(int menu, char *input)
 	s->scfunc = do_find_bracket;
    else if (!strcasecmp(input, "wordcount"))
 	s->scfunc = do_wordlinechar_count;
+    else if (!strcasecmp(input, "undo"))
+	s->scfunc = do_undo;
+    else if (!strcasecmp(input, "redo"))
+	s->scfunc = do_redo;
    else if (!strcasecmp(input, "prevhistory")) {
 	s->scfunc = (void *) prev_history_msg;
 	s->execute = FALSE;
@@ -1424,6 +1443,8 @@ sc *strtosc(int menu, char *input)
 	s->scfunc = do_enter;
    else if (!strcasecmp(input, "delete"))
 	s->scfunc = do_delete;
+    else if (!strcasecmp(input, "backspace"))
+	s->scfunc = do_backspace;
    else if (!strcasecmp(input, "refresh"))
 	s->scfunc = total_refresh;
    else if (!strcasecmp(input, "casesens")) {
@@ -1564,15 +1585,6 @@ void thanks_for_all_the_fish(void)
 #ifndef DISABLE_JUSTIFY
    if (jusbuffer != NULL)
 	free_filestruct(jusbuffer);
-#endif
-#ifndef NANO_TINY
-    /* Free the memory associated with each toggle. */
-    while (toggles != NULL) {
-	toggle *t = toggles;
-
-	toggles = toggles->next;
-	free(t);
-    }
 #endif
    /* Free the memory associated with each open file buffer. */
    if (openfile != NULL)
--- a/src/help.c
+++ b/src/help.c
@@ -201,12 +201,6 @@ void do_help(void (*refresh_func)(void))
    help_text = NULL;
 }

-/* Start the help browser for the edit window. */
-void do_help_void(void)
-{
-    do_help(&edit_refresh);
-}
-
 #ifndef DISABLE_BROWSER
 /* Start the help browser for the file browser. */
 void do_browser_help(void)
@@ -414,7 +408,7 @@ void help_init(void)

 	for (s = sclist; s != NULL; s = s->next)
            if (s->scfunc == (void *) do_toggle)
-		allocsize += strlen(flagtostr(s->toggle)) + endis_len + 9;
+		allocsize += strlen(_(flagtostr(s->toggle))) + endis_len + 9;

    }
 #endif
@@ -552,3 +546,18 @@ size_t help_line_len(const char *ptr)
 }

 #endif /* !DISABLE_HELP */
+
+/* Start the help browser for the edit window. */
+void do_help_void(void)
+{
+
+#ifndef DISABLE_HELP
+    /* Start the help browser for the edit window. */
+    do_help(&edit_refresh);
+#else
+    if (currmenu == MMAIN)
+	nano_disabled_msg();
+    else
+	beep();
+#endif
+}
--- a/src/nano.c
+++ b/src/nano.c
@@ -1,4 +1,4 @@
-/* $Id$ */
+/* $Id$ */ 
 /**************************************************************************
 *   nano.c                                                               *
 *                                                                        *
@@ -32,7 +32,9 @@
 #include <errno.h>
 #include <ctype.h>
 #include <locale.h>
+#ifdef ENABLE_UTF8
 #include <langinfo.h>
+#endif
 #include <termios.h>
 #ifdef HAVE_GETOPT_H
 #include <getopt.h>
@@ -502,6 +504,9 @@ openfilestruct *make_new_opennode(void)
    newnode->filebot = NULL;
    newnode->edittop = NULL;
    newnode->current = NULL;
+#ifndef NANO_TINY
+    newnode->last_action = OTHER;
+#endif

    return newnode;
 }
@@ -611,7 +616,7 @@ void die(const char *msg, ...)
    va_end(ap);

    /* Save the current file buffer if it's been modified. */
-    if (openfile->modified) {
+    if (openfile && openfile->modified) {
 	/* If we've partitioned the filestruct, unpartition it now. */
 	if (filepart != NULL)
 	    unpartition_filestruct(&filepart);
@@ -1250,7 +1255,7 @@ void do_toggle(int flag)
 	)
 	enabled = !enabled;

-    desc = flagtostr(flag);
+    desc = _(flagtostr(flag));
    statusbar("%s %s", desc, enabled ? _("enabled") :
 	_("disabled"));
 }
@@ -1268,7 +1273,6 @@ void disable_extended_io(void)
    tcsetattr(0, TCSANOW, &term);
 }

-#ifdef USE_SLANG
 /* Disable interpretation of the special control keys in our terminal
 * settings. */
 void disable_signals(void)
@@ -1279,7 +1283,6 @@ void disable_signals(void)
    term.c_lflag &= ~ISIG;
    tcsetattr(0, TCSANOW, &term);
 }
-#endif

 #ifndef NANO_TINY
 /* Enable interpretation of the special control keys in our terminal
@@ -1346,8 +1349,8 @@ void terminal_init(void)
 	if (ISSET(PRESERVE))
 	    enable_flow_control();

-#ifdef USE_SLANG
 	disable_signals();
+#ifdef USE_SLANG
 	if (!ISSET(PRESERVE))
 	    disable_flow_control();

@@ -1642,6 +1645,9 @@ void do_output(char *output, size_t output_len, bool allow_cntrls)
 	set_modified();

 #ifndef NANO_TINY
+	update_undo(ADD);
+
+
 	/* Note that current_x has not yet been incremented. */
 	if (openfile->mark_set && openfile->current ==
 		openfile->mark_begin && openfile->current_x <
@@ -2224,7 +2230,7 @@ int main(int argc, char **argv)
 		icol == 1)
 		parse_line_column(&argv[i][1], &iline, &icol);
 	    else {
-		open_buffer(argv[i]);
+		open_buffer(argv[i], FALSE);

 		if (iline > 1 || icol > 1) {
 		    do_gotolinecolumn(iline, icol, FALSE, FALSE, FALSE,
@@ -2241,14 +2247,14 @@ int main(int argc, char **argv)
     * buffer or a new buffer, depending on whether multibuffer mode is
     * enabled. */
    if (optind < argc)
-	open_buffer(argv[optind]);
+	open_buffer(argv[optind], FALSE);

    /* We didn't open any files if all the command line arguments were
     * invalid files like directories or if there were no command line
     * arguments given.  In this case, we have to load a blank buffer.
     * Also, we unset view mode to allow editing. */
    if (openfile == NULL) {
-	open_buffer("");
+	open_buffer("", FALSE);
 	UNSET(VIEW_MODE);
    }

--- a/src/nano.h
+++ b/src/nano.h
@@ -169,6 +169,10 @@ typedef enum {
    CONTROL, META, FKEY, RAW
 }  function_type;

+typedef enum {
+    ADD, DEL, REPLACE, SPLIT, UNSPLIT, CUT, CUTTOEND, UNCUT, INSERT, OTHER
+} undo_type;
+
 /* Structure types. */
 typedef struct filestruct {
    char *data;
@@ -238,6 +242,8 @@ typedef struct syntaxtype {
 	/* The name of this syntax. */
    exttype *extensions;
 	/* The list of extensions that this syntax applies to. */
+    exttype *headers;
+	/* Regexes to match on the 'header' (1st line) of the file */
    colortype *color;
 	/* The colors used in this syntax. */
    struct syntaxtype *next;
@@ -245,6 +251,40 @@ typedef struct syntaxtype {
 } syntaxtype;
 #endif /* ENABLE_COLOR */

+#ifndef NANO_TINY
+typedef struct undo {
+    ssize_t lineno;
+    undo_type type;
+	/* What type of undo was this */
+    int begin;
+	/* Where did this  action begin or end */
+    char *strdata;
+	/* String type data we will use for ccopying the affected line back */
+    int xflags;
+	/* Some flag data we need */
+
+    /* Cut specific stuff we need */
+    filestruct *cutbuffer;
+	/* Copy of the cutbuffer */
+    filestruct *cutbottom;
+	/* Copy of cutbottom */
+    bool mark_set;
+	/* was the marker set when we cut */
+    bool to_end;
+	/* was this a cut to end */
+    ssize_t mark_begin_lineno;
+	/* copy copy copy */
+    ssize_t mark_begin_x;
+	/* Another shadow variable */
+    ssize_t linescut;
+	/* How many lines we cut on a straight non-marked non-to-end cut */
+    struct undo *next;
+} undo;
+
+
+#endif /* NANO_TINY */
+
+
 typedef struct openfilestruct {
    char *filename;
 	/* The current file's name. */
@@ -278,6 +318,11 @@ typedef struct openfilestruct {
 	/* The current file's format. */
    struct stat *current_stat;
 	/* The current file's stat. */
+    undo *undotop;
+	/* Top of the undo list */
+    undo *current_undo;
+	/* The current (i.e. n ext) level of undo */
+    undo_type last_action;
 #endif
 #ifdef ENABLE_COLOR
    colortype *colorstrings;
@@ -318,25 +363,6 @@ typedef struct shortcut {
 	/* Next shortcut. */
 } shortcut;

-#ifndef NANO_TINY
-typedef struct toggle {
-   int val;
-	/* The sequence to toggle the key.  We should only need one. */
-   const char *desc;
-	/* The description of the toggle, e.g. "Cut to end"; we'll
-	 * append Enabled or Disabled to it. */
-#ifndef DISABLE_HELP
-   bool blank_after;
-	/* Whether there should be a blank line after the description of
-	 * the toggle. */
-#endif
-   long flag;
-	/* Which flag actually gets toggled. */
-   struct toggle *next;
-	/* Next toggle. */
-} toggle;
-#endif
-
 #ifdef ENABLE_NANORC
 typedef struct rcoption {
   const char *name;
@@ -667,6 +693,11 @@ typedef struct subnfunc {
 #define TOGGLE_BACKWARDS_KEY		NANO_META_B
 #define TOGGLE_DOS_KEY			NANO_META_D
 #define TOGGLE_MAC_KEY			NANO_META_M
+
+/* Extra bits for the undo function */
+#define UNDO_DEL_DEL		(1<<0)
+#define UNDO_DEL_BACKSPACE	(1<<1)
+
 #endif /* !NANO_TINY */

 #define VIEW TRUE
--- a/src/prompt.c
+++ b/src/prompt.c
@@ -1010,7 +1010,7 @@ fprintf(stderr, "get_prompt_string: answer = \"%s\", statusbar_x = %d\n", answer
 	} else 
 #endif /* !DISABLE_TABCOMP */
 #ifndef NANO_TINY
-	if (s && s->scfunc == do_up_void) {
+	if (s && s->scfunc == (void *) prev_history_msg) {
 		if (history_list != NULL) {
 		    /* If we're scrolling up at the bottom of the
 		     * history list and answer isn't blank, save answer
@@ -1038,7 +1038,7 @@ fprintf(stderr, "get_prompt_string: answer = \"%s\", statusbar_x = %d\n", answer
 		     * statusbar prompt. */
 		    finished = FALSE;
 		}
-	} else if (s && s->scfunc == do_down_void) {
+	} else if (s && s->scfunc == (void *) next_history_msg) {
 		if (history_list != NULL) {
 		    /* Get the newer search from the history list and
 		     * save it in answer.  If there is no newer search,
--- a/src/proto.h
+++ b/src/proto.h
@@ -47,6 +47,7 @@ extern WINDOW *bottomwin;
 extern int editwinrows;

 extern filestruct *cutbuffer;
+extern filestruct *cutbottom;
 #ifndef DISABLE_JUSTIFY
 extern filestruct *jusbuffer;
 #endif
@@ -60,6 +61,7 @@ extern char *matchbrackets;
 #if !defined(NANO_TINY) && defined(ENABLE_NANORC)
 extern char *whitespace;
 extern int whitespace_len[2];
+extern undo_type last_action;
 #endif

 #ifndef DISABLE_JUSTIFY
@@ -100,9 +102,6 @@ extern char *syntaxstr;

 extern const shortcut *currshortcut;
 extern int currmenu;
-#ifndef NANO_TINY
-extern toggle *toggles;
-#endif

 #ifndef NANO_TINY
 extern filestruct *search_history;
@@ -240,7 +239,7 @@ void cut_to_eof(void);
 #endif
 void do_cut_text(
 #ifndef NANO_TINY
-	bool copy_text, bool cut_till_end
+	bool copy_text, bool cut_till_end, bool undoing
 #else
 	void
 #endif
@@ -256,7 +255,7 @@ void do_uncut_text(void);
 void make_new_buffer(void);
 void initialize_buffer(void);
 void initialize_buffer_text(void);
-void open_buffer(const char *filename);
+void open_buffer(const char *filename, bool undoable);
 #ifndef DISABLE_SPELLER
 void replace_buffer(const char *filename);
 #endif
@@ -269,7 +268,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, const char *filename);
+void read_file(FILE *f, const char *filename, bool undoable);
 int open_file(const char *filename, bool newfie, FILE **f);
 char *get_next_filename(const char *name, const char *suffix);
 void do_insertfile(
@@ -344,12 +343,12 @@ void thanks_for_all_the_fish(void);
 #endif

 /* All functions in help.c. */
-#ifndef DISABLE_HELP
-void do_help(void (*refresh_func)(void));
-void do_help_void(void);
 #ifndef DISABLE_BROWSER
 void do_browser_help(void);
 #endif
+void do_help_void(void);
+#ifndef DISABLE_HELP
+void do_help(void (*refresh_func)(void));
 void help_init(void);
 void parse_help_input(int *kbinput, bool *meta_key, bool *func_key);
 size_t help_line_len(const char *ptr);
@@ -619,6 +618,8 @@ void do_tab(void);
 void do_indent(ssize_t cols);
 void do_indent_void(void);
 void do_unindent(void);
+void do_undo(void);
+void do_redo(void);
 #endif
 void do_enter(void);
 #ifndef NANO_TINY
@@ -632,7 +633,7 @@ bool do_wrap(filestruct *line);
 #if !defined(DISABLE_HELP) || !defined(DISABLE_WRAPJUSTIFY)
 ssize_t break_line(const char *line, ssize_t goal
 #ifndef DISABLE_HELP
-	, bool newline
+	, bool newln
 #endif
 	);
 #endif
@@ -684,6 +685,7 @@ ssize_t ngetdelim(char **lineptr, size_t *n, int delim, FILE *stream);
 #endif
 #ifdef HAVE_REGEX_H
 bool regexp_bol_or_eol(const regex_t *preg, const char *string);
+const char *fixbounds(const char *r);
 #endif
 #ifndef DISABLE_SPELLER
 bool is_whole_word(size_t pos, const char *buf, const char *word);
@@ -706,8 +708,11 @@ void new_magicline(void);
 void remove_magicline(void);
 void mark_order(const filestruct **top, size_t *top_x, const filestruct
 	**bot, size_t *bot_x, bool *right_side_up);
+void add_undo(undo_type current_action);
+void update_undo(undo_type action);
 #endif
 size_t get_totsize(const filestruct *begin, const filestruct *end);
+filestruct *fsfromline(ssize_t lineno);
 #ifdef DEBUG
 void dump_filestruct(const filestruct *inptr);
 void dump_filestruct_reverse(void);
@@ -739,9 +744,6 @@ int get_mouseinput(int *mouse_x, int *mouse_y, bool allow_shortcuts);
 const sc *get_shortcut(int menu, int *kbinput, bool
 	*meta_key, bool *func_key);
 const sc *first_sc_for(int menu, void *func);
-#ifndef NANO_TINY
-const toggle *get_toggle(int kbinput, bool meta_key);
-#endif
 void blank_line(WINDOW *win, int y, int x, int n);
 void blank_titlebar(void);
 void blank_topbar(void);
@@ -788,6 +790,8 @@ 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;
 #endif
 const char *replace_msg;
 const char *no_replace_msg;
--- a/src/rcfile.c
+++ b/src/rcfile.c
@@ -103,6 +103,8 @@ static char *nanorc = NULL;
 #ifdef ENABLE_COLOR
 static syntaxtype *endsyntax = NULL;
 	/* The end of the list of syntaxes. */
+static exttype *endheader = NULL;
+	/* End of header list */
 static colortype *endcolor = NULL;
 	/* The end of the color list for the current syntax. */
 #endif
@@ -217,19 +219,19 @@ char *parse_next_regex(char *ptr)
 bool nregcomp(const char *regex, int eflags)
 {
    regex_t preg;
-    int rc = regcomp(&preg, regex, REG_EXTENDED | eflags);
+    const char *r = fixbounds(regex);
+    int rc = regcomp(&preg, r, REG_EXTENDED | eflags);

    if (rc != 0) {
 	size_t len = regerror(rc, &preg, NULL, 0);
 	char *str = charalloc(len);

 	regerror(rc, &preg, str, len);
-	rcfile_error(N_("Bad regex \"%s\": %s"), regex, str);
+	rcfile_error(N_("Bad regex \"%s\": %s"), r, str);
 	free(str);
    }

    regfree(&preg);
-
    return (rc == 0);
 }

@@ -290,7 +292,9 @@ void parse_syntax(char *ptr)
    endsyntax->desc = mallocstrcpy(NULL, nameptr);
    endsyntax->color = NULL;
    endcolor = NULL;
+    endheader = NULL;
    endsyntax->extensions = NULL;
+    endsyntax->headers = NULL;
    endsyntax->next = NULL;

 #ifdef DEBUG
@@ -347,6 +351,20 @@ void parse_syntax(char *ptr)
    }
 }

+int check_bad_binding(sc *s)
+{
+#define BADLISTLEN 1
+    int badtypes[BADLISTLEN] = {META};
+    int badseqs[BADLISTLEN] = { 91 };
+    int i;
+
+    for (i = 0; i < BADLISTLEN; i++)
+        if (s->type == badtypes[i] && s->seq == badseqs[i])
+	    return 1;
+
+    return 0;
+}
+
 void parse_keybinding(char *ptr)
 {
    char *keyptr = NULL, *keycopy = NULL, *funcptr = NULL, *menuptr = NULL;
@@ -366,7 +384,7 @@ void parse_keybinding(char *ptr)
    for (i = 0; i < strlen(keycopy); i++)
 	keycopy[i] = toupper(keycopy[i]);

-    if (keycopy[0] != 'M' && keycopy[0] != '^' && keycopy[0] != 'F') {
+    if (keycopy[0] != 'M' && keycopy[0] != '^' && keycopy[0] != 'F' && keycopy[0] != 'K') {
 	rcfile_error(
 		N_("keybindings must begin with \"^\", \"M\", or \"F\"\n"));
 	return;
@@ -405,9 +423,11 @@ void parse_keybinding(char *ptr)
 		N_("Could not map name \"%s\" to a function\n"), funcptr);
 	return;
    }
+
+
 #ifdef DEBUG
    fprintf(stderr, "newsc now address %d, menu func assigned = %d, menu = %d\n",
-	(int) newsc, (int) newsc->scfunc, menu);
+	&newsc, &newsc->scfunc, menu);
 #endif


@@ -420,6 +440,13 @@ void parse_keybinding(char *ptr)
    fprintf(stderr, "s->seq = \"%d\"\n", newsc->seq);
 #endif

+    if (check_bad_binding(newsc)) {
+	rcfile_error(
+		N_("Sorry, keystr \"%s\" is an illegal binding\n"), newsc->keystr);
+	return;
+    }
+
+
    /* now let's have some fun.  Try and delete the other entries
       we found for the same menu, then make this new new
       beginning */
@@ -478,6 +505,10 @@ void parse_include(char *ptr)
    nanorc = full_option;
    lineno = 0;

+#ifdef DEBUG
+    fprintf(stderr, "Parsing file \"%s\"\n", full_option);
+#endif
+
    parse_rcfile(rcstream
 #ifdef ENABLE_COLOR
 	, TRUE
@@ -688,8 +719,99 @@ void parse_colors(char *ptr, bool icase)
 	}
    }
 }
+
+/* Parse the headers (1st line) of the file which may influence the regex used. */
+void parse_headers(char *ptr)
+{
+    char *h, *regstr;
+
+    assert(ptr != NULL);
+
+    if (syntaxes == NULL) {
+	rcfile_error(
+		N_("Cannot add a header regex without a syntax command"));
+	return;
+    }
+
+    if (*ptr == '\0') {
+	rcfile_error(N_("Missing regex string"));
+	return;
+    }
+
+    /* Now for the fun part.  Start adding regexes to individual strings
+     * in the colorstrings array, woo! */
+    while (ptr != NULL && *ptr != '\0') {
+	exttype *newheader;
+	    /* The new color structure. */
+	bool cancelled = FALSE;
+	    /* The start expression was bad. */
+
+	if (*ptr != '"') {
+	    rcfile_error(
+		N_("Regex strings must begin and end with a \" character"));
+	    ptr = parse_next_regex(ptr);
+	    continue;
+	}
+
+	ptr++;
+
+	regstr = ptr;
+	ptr = parse_next_regex(ptr);
+	if (ptr == NULL)
+	    break;
+
+	newheader = (exttype *)nmalloc(sizeof(exttype));
+
+	/* Save the regex string if it's valid */
+	if (nregcomp(regstr, 0)) {
+	    newheader->ext_regex = mallocstrcpy(NULL, regstr);
+	    newheader->ext = NULL;
+	    newheader->next = NULL;
+
+#ifdef DEBUG
+	     fprintf(stderr, "Starting a new header entry: %s\n", newheader->ext_regex);
+#endif
+
+	    if (endheader == NULL) {
+		endsyntax->headers = newheader;
+	    } else {
+		endheader->next = newheader;
+	    }
+
+	    endheader = newheader;
+	} else
+	    free(newheader);
+
+    }
+}
 #endif /* ENABLE_COLOR */

+/* Check whether the user has unmapped every shortcut for a
+sequence we consider 'vital', like the exit function */
+static void check_vitals_mapped(void)
+{
+    subnfunc *f;
+    int v;
+#define VITALS 5
+    void *vitals[VITALS] = { do_exit, do_exit, (void *) cancel_msg, (void *) cancel_msg, (void *) cancel_msg };
+    int inmenus[VITALS] = { MMAIN, MHELP, MWHEREIS, MREPLACE, MGOTOLINE };
+
+    for  (v = 0; v < VITALS; v++) {
+       for (f = allfuncs; f != NULL; f = f->next) {
+           if (f->scfunc == vitals[v] && f->menus & inmenus[v]) {
+               const sc *s = first_sc_for(inmenus[v], f->scfunc);
+               if (!s) {
+                   rcfile_error(N_("Fatal error: no keys mapped for function \"%s\""),
+                       f->desc);
+                   fprintf(stderr, N_("Exiting.  Please use nano with the -I option if needed to adjust your nanorc settings\n"));
+                   exit(1);
+               }
+           break;
+           }
+       }
+    }
+}
+
 /* Parse the rcfile, once it has been opened successfully at rcstream,
 * and close it afterwards.  If syntax_only is TRUE, only allow the file
 * to contain color syntax commands: syntax, color, and icolor. */
@@ -759,7 +881,9 @@ void parse_rcfile(FILE *rcstream
 		rcfile_error(N_("Syntax \"%s\" has no color commands"),
 			endsyntax->desc);
 	    parse_syntax(ptr);
-	} else if (strcasecmp(keyword, "color") == 0)
+	} else if (strcasecmp(keyword, "header") == 0)
+	    parse_headers(ptr);
+	else if (strcasecmp(keyword, "color") == 0)
 	    parse_colors(ptr, FALSE);
 	else if (strcasecmp(keyword, "icolor") == 0)
 	    parse_colors(ptr, TRUE);
@@ -965,6 +1089,10 @@ void do_rcfile(void)
 		_("\"%s\" is a device file"), nanorc);
    }

+#ifdef DEBUG
+    fprintf(stderr, "Parsing file \"%s\"\n", nanorc);
+#endif
+
    /* Try to open the system-wide nanorc. */
    rcstream = fopen(nanorc, "rb");
    if (rcstream != NULL)
@@ -987,8 +1115,11 @@ void do_rcfile(void)
    if (homedir == NULL)
 	rcfile_error(N_("I can't find my home directory!  Wah!"));
    else {
-	nanorc = charealloc(nanorc, strlen(homedir) + 9);
-	sprintf(nanorc, "%s/.nanorc", homedir);
+#ifndef RCFILE_NAME
+#define RCFILE_NAME ".nanorc"
+#endif
+	nanorc = charealloc(nanorc, strlen(homedir) + strlen(RCFILE_NAME) + 2);
+	sprintf(nanorc, "%s/%s", homedir, RCFILE_NAME);

 	/* Don't open directories, character files, or block files. */
 	if (stat(nanorc, &rcinfo) != -1) {
@@ -1022,30 +1153,4 @@ void do_rcfile(void)
 #endif
 }

-/* Check whether the user has unmapped every shortcut for a
-sequence we consider 'vital', like the exit function */
-int check_vitals_mapped(void)
-{
-    subnfunc *f;
-    int v;
-#define VITALS 5
-    void *vitals[VITALS] = { do_exit, do_exit, (void *) cancel_msg, (void *) cancel_msg, (void *) cancel_msg };
-    int inmenus[VITALS] = { MMAIN, MHELP, MWHEREIS, MREPLACE, MGOTOLINE };
-
-    for  (v = 0; v < VITALS; v++) {
-	for (f = allfuncs; f != NULL; f = f->next) {
-	    if (f->scfunc == vitals[v] && f->menus & inmenus[v]) {
-		const sc *s = first_sc_for(inmenus[v], f->scfunc);
-		if (!s) {
-		    rcfile_error(N_("Fatal error: no keys mapped for function \"%s\""),
-			f->desc);
-		    fprintf(stderr, N_("Exiting.  Please use nano with the -I option if needed to adjust your nanorc settings\n"));
-		    exit(1);
-		}
-	    break;
-	    }
-	}
-    }
-}
-
 #endif /* ENABLE_NANORC */
--- a/src/search.c
+++ b/src/search.c
@@ -788,6 +788,9 @@ ssize_t do_replace_loop(
 	    char *copy;
 	    size_t length_change;

+#ifndef NANO_TINY
+	    update_undo(REPLACE);
+#endif
 	    if (i == 2)
 		replaceall = TRUE;

--- a/src/text.c
+++ b/src/text.c
@@ -1,4 +1,4 @@
-/* $Id$ */
+/* $Id$ */ 
 /**************************************************************************
 *   text.c                                                               *
 *                                                                        *
@@ -70,6 +70,10 @@ void do_delete(void)
 	/* Do we have to call edit_refresh(), or can we get away with
 	 * just update_line()? */

+#ifndef NANO_TINY
+    update_undo(DEL);
+#endif
+
    assert(openfile->current != NULL && openfile->current->data != NULL && openfile->current_x <= strlen(openfile->current->data));

    openfile->placewewant = xplustabs();
@@ -359,6 +363,304 @@ void do_unindent(void)
 {
    do_indent(-tabsize);
 }
+
+/* undo a cut, or re-do an uncut */
+void undo_cut(undo *u)
+{
+	cutbuffer = copy_filestruct(u->cutbuffer);
+
+        /* Compute cutbottom for the uncut using out copy */
+	for (cutbottom = cutbuffer; cutbottom->next != NULL; cutbottom = cutbottom->next)
+	    ;
+
+	/* Get to where we need to uncut from */
+	if (u->mark_set && u->mark_begin_lineno < u->lineno)
+	    do_gotolinecolumn(u->mark_begin_lineno, u->mark_begin_x+1, FALSE, FALSE, FALSE, FALSE);
+	else
+	    do_gotolinecolumn(u->lineno, u->begin+1, FALSE, FALSE, FALSE, FALSE);
+
+        copy_from_filestruct(cutbuffer, cutbottom);
+	free_filestruct(cutbuffer);
+	cutbuffer = NULL;
+
+}
+
+/* Re-do a cut, or undo an uncut */
+void redo_cut(undo *u) {
+    int i;
+    filestruct *t;
+
+	do_gotolinecolumn(u->lineno, u->begin+1, FALSE, FALSE, FALSE, FALSE);
+	openfile->mark_set = u->mark_set;
+	if (cutbuffer)
+	    free(cutbuffer);
+	cutbuffer = NULL;
+
+	/* Move ahead the same # lines we had if a marked cut */
+	if (u->mark_set) {
+	    for (i = 1, t = openfile->fileage; i != u->mark_begin_lineno; i++)
+		t = t->next;
+	    openfile->mark_begin = t;
+	} else if (!u->to_end) {
+	    /* Here we have a regular old potentially multi-line ^K cut.  We'll
+		need to trick nano into thinking it's a marked cut to cut more
+		than one line again */
+#ifdef DEBUG
+	    fprintf(stderr, "Undoing multi-^K cut, u->linescut = %d\n", u->linescut);
+#endif
+	    for (i = 0, t = openfile->current; i < u->linescut; i++) {
+
+#ifdef DEBUG
+	    fprintf(stderr, "Advancing, lineno  = %d, data = \"%s\"\n", t->lineno, t->data);
+#endif
+		t = t->next;
+	    }
+	    openfile->mark_begin = t;
+	    openfile->mark_begin_x = 0;
+	    openfile->mark_set = TRUE;
+	}
+
+	openfile->mark_begin_x = u->mark_begin_x;
+	do_cut_text(FALSE, u->to_end, TRUE);
+	openfile->mark_set = FALSE;
+        openfile->mark_begin = NULL;
+        openfile->mark_begin_x = 0;
+	edit_refresh();
+}
+
+/* Undo the last thing(s) we did */
+void do_undo(void)
+{
+    undo *u = openfile->current_undo;
+    filestruct *f = openfile->current, *t;
+    int len = 0;
+    char *undidmsg, *data;
+    filestruct *oldcutbuffer = cutbuffer, *oldcutbottom = cutbottom;
+
+    if (!u) {
+	statusbar(_("Nothing in undo buffer!"));
+	return;
+    }
+
+
+    if (u->lineno <= f->lineno)
+        for (; f->prev != NULL && f->lineno != u->lineno; f = f->prev)
+	    ;
+    else
+        for (; f->next != NULL && f->lineno != u->lineno; f = f->next)
+	    ;
+    if (f->lineno != u->lineno) {
+        statusbar(_("Internal error: can't match line %d.  Please save your work"), u->lineno);
+	return;
+    }
+#ifdef DEBUG
+    fprintf(stderr, "data we're about to undo = \"%s\"\n", f->data);
+    fprintf(stderr, "Undo running for type %d\n", u->type);
+#endif
+
+    openfile->current_x = u->begin;
+    switch(u->type) {
+    case ADD:
+	undidmsg = _("text add");
+	len = strlen(f->data) - strlen(u->strdata) + 1;
+        data = charalloc(len);
+        strncpy(data, f->data, u->begin);
+	strcpy(&data[u->begin], &f->data[u->begin + strlen(u->strdata)]);
+	free(f->data);
+	f->data = data;
+	break;
+    case DEL:
+	undidmsg = _("text delete");
+	len = strlen(f->data) + strlen(u->strdata) + 1;
+	data = charalloc(len);
+
+	strncpy(data, f->data, u->begin);
+	strcpy(&data[u->begin], u->strdata);
+	strcpy(&data[u->begin + strlen(u->strdata)], &f->data[u->begin]);
+	free(f->data);
+	f->data = data;
+	if (u->xflags == UNDO_DEL_BACKSPACE)
+	    openfile->current_x += strlen(u->strdata);
+	break;
+    case SPLIT:
+	undidmsg = _("line split");
+	free(f->data);
+	f->data = mallocstrcpy(NULL, u->strdata);
+	if (f->next != NULL) {
+	    filestruct *tmp = f->next;
+	    unlink_node(tmp);
+	    delete_node(tmp);
+	}
+	renumber(f);
+	break;
+    case UNSPLIT:
+	undidmsg = _("line join");
+	t = make_new_node(f);
+	t->data = mallocstrcpy(NULL, u->strdata);
+	data = mallocstrncpy(NULL, f->data, u->begin);
+	data[u->begin] = '\0';
+	free(f->data);
+	f->data = data;
+	splice_node(f, t, f->next);
+	renumber(f);
+	break;
+    case CUT:
+    case CUTTOEND:
+	undidmsg = _("text cut");
+        undo_cut(u);
+	break;
+    case UNCUT:
+	undidmsg = _("text uncut");
+	redo_cut(u);
+	break;
+    case INSERT:
+	undidmsg = _("text insert");
+	cutbuffer = NULL;
+	cutbottom = NULL;
+	/* When we updated mark_begin_lineno in update_undo, it was effectively how many line
+	   were inserted due to being partitioned before read_file was called.  So we
+	   add its value here */
+	openfile->mark_begin = fsfromline(u->lineno + u->mark_begin_lineno - 1);
+	openfile->mark_begin_x = 0;
+	openfile->mark_set = TRUE;
+	do_gotolinecolumn(u->lineno, u->begin+1, FALSE, FALSE, FALSE, FALSE);
+	cut_marked();
+	u->cutbuffer = cutbuffer;
+	u->cutbottom = cutbottom;
+	cutbuffer = oldcutbuffer;
+	cutbottom = oldcutbottom;
+	openfile->mark_set = FALSE;
+	break;
+    case REPLACE:
+	undidmsg = _("text replace");
+	data = u->strdata;
+	u->strdata = f->data;
+	f->data = data;
+	break;
+    default:
+	undidmsg = _("Internal error: unknown type.  Please save your work");
+	break;
+
+    }
+    do_gotolinecolumn(u->lineno, u->begin, FALSE, FALSE, FALSE, TRUE);
+    statusbar(_("Undid action (%s)"), undidmsg);
+    openfile->current_undo = openfile->current_undo->next;
+    openfile->last_action = OTHER;
+}
+
+void do_redo(void)
+{
+    undo *u = openfile->undotop;
+    filestruct *f = openfile->current, *t;
+    filestruct *oldcutbuffer = cutbuffer, *oldcutbottom = cutbottom;
+    int len = 0, i;
+    char *undidmsg, *data;
+
+    for (; u != NULL && u->next != openfile->current_undo; u = u->next)
+	;
+    if (!u) {
+	statusbar(_("Nothing to re-do!"));
+	return;
+    }
+    if (u->next != openfile->current_undo) {
+	statusbar(_("Internal error: Redo setup failed.  Please save your work"));
+	return;
+    }
+
+    if (u->lineno <= f->lineno)
+        for (; f->prev != NULL && f->lineno != u->lineno; f = f->prev)
+	    ;
+    else
+        for (; f->next != NULL && f->lineno != u->lineno; f = f->next)
+	    ;
+    if (f->lineno != u->lineno) {
+        statusbar(_("Internal error: can't match line %d.  Please save your work"), u->lineno);
+	return;
+    }
+#ifdef DEBUG
+    fprintf(stderr, "data we're about to redo = \"%s\"\n", f->data);
+    fprintf(stderr, "Redo running for type %d\n", u->type);
+#endif
+
+    switch(u->type) {
+    case ADD:
+	undidmsg = _("text add");
+	len = strlen(f->data) + strlen(u->strdata) + 1;
+        data = charalloc(len);
+	strncpy(data, f->data, u->begin);
+	strcpy(&data[u->begin], u->strdata);
+	strcpy(&data[u->begin + strlen(u->strdata)], &f->data[u->begin]);
+	free(f->data);
+	f->data = data;
+	break;
+    case DEL:
+	undidmsg = _("text delete");
+	len = strlen(f->data) + strlen(u->strdata) + 1;
+	data = charalloc(len);
+        strncpy(data, f->data, u->begin);
+	strcpy(&data[u->begin], &f->data[u->begin + strlen(u->strdata)]);
+	free(f->data);
+	f->data = data;
+	break;
+    case SPLIT:
+	undidmsg = _("line split");
+	t = make_new_node(f);
+	t->data = mallocstrcpy(NULL, &u->strdata[u->begin]);
+	data = mallocstrncpy(NULL, f->data, u->begin);
+	data[u->begin] = '\0';
+	free(f->data);
+	f->data = data;
+	splice_node(f, t, f->next);
+	renumber(f);
+	break;
+    case UNSPLIT:
+	undidmsg = _("line join");
+	len = strlen(f->data) + strlen(u->strdata + 1);
+	data = charalloc(len);
+	strcpy(data, f->data);
+	strcat(data, u->strdata);
+	free(f->data);
+	f->data = data;
+	if (f->next != NULL) {
+	    filestruct *tmp = f->next;
+	    unlink_node(tmp);
+	    delete_node(tmp);
+	}
+	renumber(f);
+	break;
+    case CUT:
+    case CUTTOEND:
+	undidmsg = _("text cut");
+	redo_cut(u);
+	break;
+    case UNCUT:
+	undidmsg = _("text uncut");
+	undo_cut(u);
+	break;
+    case REPLACE:
+	undidmsg = _("text replace");
+	data = u->strdata;
+	u->strdata = f->data;
+	f->data = data;
+	break;
+    case INSERT:
+	undidmsg = _("text insert");
+	do_gotolinecolumn(u->lineno, u->begin+1, FALSE, FALSE, FALSE, FALSE);
+        copy_from_filestruct(u->cutbuffer, u->cutbottom);
+	openfile->placewewant = xplustabs();
+	break;
+    default:
+	undidmsg = _("Internal error: unknown type.  Please save your work");
+	break;
+
+    }
+    do_gotolinecolumn(u->lineno, u->begin, FALSE, FALSE, FALSE, TRUE);
+    statusbar(_("Redid action (%s)"), undidmsg);
+
+    openfile->current_undo = u;
+    openfile->last_action = OTHER;
+
+}
 #endif /* !NANO_TINY */

 /* Someone hits Enter *gasp!* */
@@ -370,6 +672,9 @@ void do_enter(void)
    assert(openfile->current != NULL && openfile->current->data != NULL);

 #ifndef NANO_TINY
+    update_undo(SPLIT);
+
+
    /* Do auto-indenting, like the neolithic Turbo Pascal editor. */
    if (ISSET(AUTOINDENT)) {
 	/* If we are breaking the line in the indentation, the new
@@ -495,7 +800,7 @@ bool execute_command(const char *command)
    if (f == NULL)
 	nperror("fdopen");

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

    if (wait(NULL) == -1)
 	nperror("wait");
@@ -510,6 +815,238 @@ bool execute_command(const char *command)

    return TRUE;
 }
+
+/* Add a new undo struct to the top of the current pile */
+void add_undo(undo_type current_action)
+{
+    undo *u, *cutu;
+    char *data;
+    openfilestruct *fs = openfile;
+
+    /* Ugh, if we were called while cutting not-to-end, non-marked and on the same lineno,
+       we need to  abort here */
+    u = fs->current_undo;
+    if (current_action == CUT && u && u->type == CUT 
+	&& !u->mark_set && u->lineno == fs->current->lineno)
+	return;
+
+    /* Blow away the old undo stack if we are starting from the middle */
+    while (fs->undotop != NULL && fs->undotop != fs->current_undo) {
+	undo *u2 = fs->undotop;
+	fs->undotop = fs->undotop->next;
+	if (u2->strdata != NULL)
+	    free(u2->strdata);
+	if (u2->cutbuffer)
+	    free_filestruct(u2->cutbuffer);
+	free(u2);
+    }
+
+    /* Allocate and initialize a new undo type */
+    u = nmalloc(sizeof(undo));
+    u->type = current_action;
+    u->lineno = fs->current->lineno;
+    u->begin = fs->current_x;
+    u->next = fs->undotop;
+    fs->undotop = u;
+    fs->current_undo = u;
+    u->strdata = NULL;
+    u->cutbuffer = NULL;
+    u->cutbottom  = NULL;
+    u->mark_set = 0;
+    u->mark_begin_lineno = 0;
+    u->mark_begin_x = 0;
+    u->linescut = 0;
+    u->xflags = 0;
+
+    switch (u->type) {
+    /* We need to start copying data into the undo buffer or we wont be able
+       to restore it later */
+    case ADD:
+        data = charalloc(2);
+        data[0] = fs->current->data[fs->current_x];
+        data[1] = '\0';
+        u->strdata = data;
+	break;
+    case DEL:
+	if (u->begin != strlen(fs->current->data)) {
+            data = mallocstrncpy(NULL, &fs->current->data[u->begin], 2);
+            data[1] = '\0';
+            u->strdata = data;
+	    break;
+	}
+	/* Else purposely fall into unsplit code */
+	current_action = u->type = UNSPLIT;
+    case UNSPLIT:
+	if (fs->current->next) {
+	    data = mallocstrcpy(NULL, fs->current->next->data);
+	    u->strdata = data;
+	}
+	break;
+    case INSERT:
+    case SPLIT:
+    case REPLACE:
+	data = mallocstrcpy(NULL, fs->current->data);
+	u->strdata = data;
+	break;
+    case CUT:
+    case CUTTOEND:
+	u->mark_set = openfile->mark_set;
+	if (u->mark_set) {
+	    u->mark_begin_lineno = openfile->mark_begin->lineno;
+	    u->mark_begin_x = openfile->mark_begin_x;
+	}
+	u->to_end = (current_action == CUTTOEND);
+	break;
+    case UNCUT:
+	for (cutu = u; cutu != NULL && cutu->type != CUT; cutu = cutu->next)
+	    ;
+	if (cutu->type == CUT) {
+	    u->cutbuffer = cutu->cutbuffer;
+	    u->cutbottom = cutu->cutbottom;
+	    if (!cutu->mark_set)
+		u->linescut = cutu->linescut;
+	    else {
+		filestruct *c;
+		for (c = u->cutbuffer; c != NULL; c = c->next)
+		    u->linescut++;
+	    }
+	} else
+	    statusbar(_("Internal error: can't setup uncut.  Please save your work."));
+	break;
+    case OTHER:
+	statusbar(_("Internal error: unknown type.  Please save your work."));
+	break;
+    }
+
+#ifdef DEBUG
+    fprintf(stderr, "fs->current->data = \"%s\", current_x = %d, u->begin = %d, type = %d\n",
+			fs->current->data,  fs->current_x, u->begin, current_action);
+    fprintf(stderr, "left update_add...\n");
+#endif
+    fs->last_action = current_action;
+}
+
+/* Update an undo item, or determine whether a new one
+   is really needed and bounce the data to add_undo
+   instead.  The latter functionality just feels
+   gimmicky and may just be more hassle than
+   it's worth, so it should be axed if needed. */
+void update_undo(undo_type action)
+{
+    undo *u;
+    char *data;
+    int len = 0;
+    openfilestruct *fs = openfile;
+
+#ifdef DEBUG
+        fprintf(stderr, "action = %d, fs->last_action = %d,  openfile->current->lineno = %d",
+		action, fs->last_action, openfile->current->lineno);
+	if (fs->current_undo)
+	    fprintf(stderr, "fs->current_undo->lineno = %d\n",  fs->current_undo->lineno);
+	else
+	    fprintf(stderr, "\n");
+#endif
+
+    /* Change to an add if we're not using the same undo struct
+       that we should be using */
+    if (action != fs->last_action
+	|| (action != CUT && action != CUTTOEND && action != INSERT
+	    && openfile->current->lineno != fs->current_undo->lineno)) {
+        add_undo(action);
+	return;
+    }
+
+    assert(fs->undotop != NULL);
+    u = fs->undotop;
+
+    switch (u->type) {
+    case ADD:
+#ifdef DEBUG
+        fprintf(stderr, "fs->current->data = \"%s\", current_x = %d, u->begin = %d\n",
+			fs->current->data,  fs->current_x, u->begin);
+#endif
+        len = strlen(u->strdata) + 2;
+        data = nrealloc((void *) u->strdata, len * sizeof(char *));
+        data[len-2] = fs->current->data[fs->current_x];
+        data[len-1] = '\0';
+        u->strdata = (char *) data;
+#ifdef DEBUG
+	fprintf(stderr, "current undo data now \"%s\"\n", u->strdata);
+#endif
+	break;
+    case DEL:
+	len = strlen(u->strdata) + 2;
+	assert(len > 2);
+        if (fs->current_x == u->begin) {
+	    /* They're deleting */
+	    if (!u->xflags)
+		u->xflags = UNDO_DEL_DEL;
+	    else if (u->xflags != UNDO_DEL_DEL) {
+		add_undo(action);
+		return;
+	    }
+	    data = charalloc(len);
+	    strcpy(data, u->strdata);
+	    data[len-2] = fs->current->data[fs->current_x];;
+	    data[len-1] = '\0';
+	    free(u->strdata);
+	    u->strdata = data;
+	} else if (fs->current_x == u->begin - 1) {
+	    /* They're backspacing */
+	    if (!u->xflags)
+		u->xflags = UNDO_DEL_BACKSPACE;
+	    else if (u->xflags != UNDO_DEL_BACKSPACE) {
+		add_undo(action);
+		return;
+	    }
+	    data = charalloc(len);
+	    data[0] = fs->current->data[fs->current_x];
+	    strcpy(&data[1], u->strdata);
+	    free(u->strdata);
+	    u->strdata = data;
+	    u->begin--;
+	} else {
+	    /* They deleted something else on the line */
+	    add_undo(DEL);
+	    return;
+	}
+#ifdef DEBUG
+	fprintf(stderr, "current undo data now \"%s\"\nu->begin = %d\n", u->strdata, u->begin);
+#endif
+	break;
+    case CUT:
+    case CUTTOEND:
+	if (u->cutbuffer)
+	    free(u->cutbuffer);
+	u->cutbuffer = copy_filestruct(cutbuffer);
+	u->cutbottom = cutbottom;
+	u->linescut++;
+	break;
+    case REPLACE:
+    case UNCUT:
+	add_undo(action);
+	break;
+    case INSERT:
+	u->mark_begin_lineno = openfile->current->lineno;
+    case SPLIT:
+    case UNSPLIT:
+	/* These cases are handled by the earlier check for a new line and action */
+    case OTHER:
+	break;
+    }
+
+#ifdef DEBUG
+    fprintf(stderr, "Done in udpate_undo (type was %d)\n", action);
+#endif
+    if (fs->last_action != action) {
+#ifdef DEBUG
+	fprintf(stderr, "Starting add_undo for new action as it does not match last_action\n");
+#endif
+	add_undo(action);
+    }
+    fs->last_action = action;
+}
+
 #endif /* !NANO_TINY */

 #ifndef DISABLE_WRAPPING
@@ -761,7 +1298,7 @@ bool do_wrap(filestruct *line)
 * blank, as does a '\n' if newline is TRUE. */
 ssize_t break_line(const char *line, ssize_t goal
 #ifndef DISABLE_HELP
-	, bool newline
+	, bool newln
 #endif
 	)
 {
@@ -781,13 +1318,13 @@ ssize_t break_line(const char *line, ssize_t goal

 	if (is_blank_mbchar(line)
 #ifndef DISABLE_HELP
-		|| (newline && *line == '\n')
+		|| (newln && *line == '\n')
 #endif
 		) {
 	    blank_loc = cur_loc;

 #ifndef DISABLE_HELP
-	    if (newline && *line == '\n')
+	    if (newln && *line == '\n')
 		break;
 #endif
 	}
@@ -800,6 +1337,15 @@ ssize_t break_line(const char *line, ssize_t goal
 	/* In fact, the whole line displays shorter than goal. */
 	return cur_loc;

+#ifndef DISABLE_HELP
+    if (newln && blank_loc <= 0) {
+       /* If blank was not found or was found only first character,
+        * force line break. */
+       cur_loc -= line_len;
+       return cur_loc;
+    }
+#endif
+
    if (blank_loc == -1) {
 	/* No blank was found that was short enough. */
 	bool found_blank = FALSE;
@@ -810,7 +1356,7 @@ ssize_t break_line(const char *line, ssize_t goal

 	    if (is_blank_mbchar(line)
 #ifndef DISABLE_HELP
-		|| (newline && *line == '\n')
+		|| (newln && *line == '\n')
 #endif
 		) {
 		if (!found_blank)
@@ -834,11 +1380,11 @@ ssize_t break_line(const char *line, ssize_t goal

    while (*line != '\0' && (is_blank_mbchar(line)
 #ifndef DISABLE_HELP
-	|| (newline && *line == '\n')
+	|| (newln && *line == '\n')
 #endif
 	)) {
 #ifndef DISABLE_HELP
-	if (newline && *line == '\n')
+	if (newln && *line == '\n')
 	    break;
 #endif

@@ -2365,7 +2911,7 @@ void do_spell(void)
 void do_wordlinechar_count(void)
 {
    size_t words = 0, chars = 0;
-    ssize_t lines = 0;
+    ssize_t nlines = 0;
    size_t current_x_save = openfile->current_x;
    size_t pww_save = openfile->placewewant;
    filestruct *current_save = openfile->current;
@@ -2400,7 +2946,7 @@ void do_wordlinechar_count(void)
    /* Get the total line and character counts, as "wc -l"  and "wc -c"
     * do, but get the latter in multibyte characters. */
    if (old_mark_set) {
-	lines = openfile->filebot->lineno -
+	nlines = openfile->filebot->lineno -
 		openfile->fileage->lineno + 1;
 	chars = get_totsize(openfile->fileage, openfile->filebot);

@@ -2409,7 +2955,7 @@ void do_wordlinechar_count(void)
 	unpartition_filestruct(&filepart);
 	openfile->mark_set = TRUE;
    } else {
-	lines = openfile->filebot->lineno;
+	nlines = openfile->filebot->lineno;
 	chars = openfile->totsize;
    }

@@ -2421,7 +2967,7 @@ void do_wordlinechar_count(void)
    /* Display the total word, line, and character counts on the
     * statusbar. */
    statusbar(_("%sWords: %lu  Lines: %ld  Chars: %lu"), old_mark_set ?
-	_("In Selection:  ") : "", (unsigned long)words, (long)lines,
+	_("In Selection:  ") : "", (unsigned long)words, (long)nlines,
 	(unsigned long)chars);
 }
 #endif /* !NANO_TINY */
@@ -2464,3 +3010,4 @@ void do_verbatim_input(void)

    free(output);
 }
+
--- a/src/utils.c
+++ b/src/utils.c
@@ -253,6 +253,42 @@ bool regexp_bol_or_eol(const regex_t *preg, const char *string)
 	regexec(preg, string, 0, NULL, REG_NOTBOL | REG_NOTEOL) ==
 	REG_NOMATCH);
 }
+
+/* Fix the regex if we're on platforms which requires an adjustment
+ * from GNU-style to BSD-style word boundaries.  */
+const char *fixbounds(const char *r) {
+#ifndef GNU_WORDBOUNDS
+    int i, j = 0;
+    char *r2 = charalloc(strlen(r) * 5);
+    char *r3;
+
+#ifdef DEBUG
+    fprintf(stderr, "fixbounds(): Start string = \"%s\"\n", r);
+#endif
+
+    for (i = 0; i < strlen(r); i++) {
+        if (r[i] != '\0' && r[i] == '\\' && (r[i+1] == '>' || r[i+1] == '<')) {
+            strcpy(&r2[j], "[[:");
+            r2[j+3] = r[i+1];
+            strcpy(&r2[j+4], ":]]");
+            i++;
+            j += 6;
+        } else
+            r2[j] = r[i];
+        j++;
+    }
+    r2[j] = '\0';
+    r3 = mallocstrcpy(NULL, r2);
+    free(r2);
+#ifdef DEBUG
+    fprintf(stderr, "fixbounds(): Ending string = \"%s\"\n", r3);
+#endif
+    return (const char *) r3;
+#endif
+
+    return r;
+}
+
 #endif

 #ifndef DISABLE_SPELLER
@@ -586,6 +622,23 @@ size_t get_totsize(const filestruct *begin, const filestruct *end)
    return totsize;
 }

+/* Get back a pointer given a line number in the current openfilestruct */
+filestruct *fsfromline(ssize_t lineno)
+{
+    filestruct *f = openfile->current;
+
+    if (lineno <= openfile->current->lineno)
+	for (; f->lineno != lineno && f != openfile->fileage; f = f->prev)
+	   ;
+    else
+        for (; f->lineno != lineno && f->next != NULL; f = f->next)
+	    ;
+
+    if (f->lineno != lineno)
+	f = NULL;
+    return f;
+}
+
 #ifdef DEBUG
 /* Dump the filestruct inptr to stderr. */
 void dump_filestruct(const filestruct *inptr)
--- a/src/winio.c
+++ b/src/winio.c
@@ -329,7 +329,6 @@ int parse_kbinput(WINDOW *win, bool *meta_key, bool *func_key)

    *meta_key = FALSE;
    *func_key = FALSE;
-    const sc *s;

    /* Read in a character. */
    while ((kbinput = get_input(win, 1)) == NULL);
@@ -1698,7 +1697,12 @@ int get_mouseinput(int *mouse_x, int *mouse_y, bool allow_shortcuts)
 	    for (; j > 0; j--) {
 		if (f->next != NULL)
 		    f = f->next;
-                while (f->next != NULL && ((f->menus & currmenu) == 0 || strlen(f->help) == 0))
+
+                while (f->next != NULL && ((f->menus & currmenu) == 0
+#ifndef DISABLE_HELP
+                       || strlen(f->help) == 0
+#endif
+		))
 		     f = f->next;
 	    }
Author	SHA1	Message	Date
Chris Allegretta	8f0a921fc1	GNU nano 2.1.6 release git-svn-id: svn://svn.savannah.gnu.org/nano/trunk/nano@4335 35c25a1d-7b9e-4130-9fde-d3aeb78583b8	2008-10-03 22:20:43 +00:00
Chris Allegretta	513157dfa0	2008-10-03 Pascal Gentil <pascal.gentil@univ-rennes1.fr> * fortran.nanorc: Sample python syntax highlighting file git-svn-id: svn://svn.savannah.gnu.org/nano/trunk/nano@4334 35c25a1d-7b9e-4130-9fde-d3aeb78583b8	2008-10-03 21:00:35 +00:00
Chris Allegretta	fa195e6d5d	2009-09-30 Dirkjan Ochtman <dirkjan@ochtman.nl> * python.nanorc: Small python syntax update git-svn-id: svn://svn.savannah.gnu.org/nano/trunk/nano@4333 35c25a1d-7b9e-4130-9fde-d3aeb78583b8	2008-10-01 00:55:13 +00:00
Chris Allegretta	215eb3645e	2008-09-30 <bluestorm_dylc@hotmail.com> * ocaml.nanorc: Sample OCaml syntax highlighting file 2008-09-30 Dave Geering <dgeering@toshiba-tap.com> * objc.nanorc: Sample Objective-C Syntax Hightlighting file git-svn-id: svn://svn.savannah.gnu.org/nano/trunk/nano@4332 35c25a1d-7b9e-4130-9fde-d3aeb78583b8	2008-10-01 00:49:19 +00:00
Chris Allegretta	83c3f951f6	make --enable-tiny disable the new enabled-by-default options as that's presumably the expected behavior git-svn-id: svn://svn.savannah.gnu.org/nano/trunk/nano@4331 35c25a1d-7b9e-4130-9fde-d3aeb78583b8	2008-09-30 16:47:57 +00:00
Chris Allegretta	025548ad29	* configure.ac: Change extra, multibuffer, color and rcfile to default to enabled I'm sure no one will complain about this :-P git-svn-id: svn://svn.savannah.gnu.org/nano/trunk/nano@4330 35c25a1d-7b9e-4130-9fde-d3aeb78583b8	2008-09-30 15:30:51 +00:00
Chris Allegretta	8227d419bb	2008-09-30 Chris Allegretta <chrisa@asty.org> * python.nanorc, ruby.nanorc: Add header lines for python and ruby as well git-svn-id: svn://svn.savannah.gnu.org/nano/trunk/nano@4329 35c25a1d-7b9e-4130-9fde-d3aeb78583b8	2008-09-30 14:30:33 +00:00
Chris Allegretta	f30c1390c7	2008-09-21 Chris Allegretta <chrisa@asty.org> * rcfile.c, color.c, nano.h: Add new capability for matching a syntax type by the "header" (1st line) of a file being edited. Based on Savannah bug 24197 and inital proof of concept by Dave Geering <dgeering@toshiba-tap.com> git-svn-id: svn://svn.savannah.gnu.org/nano/trunk/nano@4328 35c25a1d-7b9e-4130-9fde-d3aeb78583b8	2008-09-21 23:02:30 +00:00
Chris Allegretta	b549f3761a	2008-09-16 Chris Allegretta <chrisa@asty.org> * text.c: Add support for undoing a text uncut. Split out the undo and redo of a text cut in order to avoid code duplication. git-svn-id: svn://svn.savannah.gnu.org/nano/trunk/nano@4327 35c25a1d-7b9e-4130-9fde-d3aeb78583b8	2008-09-16 21:35:19 +00:00
Chris Allegretta	e137f12e5e	* nano.c: Do call disable_signals at startup regardless, since under cygwin we can't generate ^C without it. git-svn-id: svn://svn.savannah.gnu.org/nano/trunk/nano@4326 35c25a1d-7b9e-4130-9fde-d3aeb78583b8	2008-09-06 06:52:47 +00:00
Chris Allegretta	86cab67339	Back to svn! git-svn-id: svn://svn.savannah.gnu.org/nano/trunk/nano@4321 35c25a1d-7b9e-4130-9fde-d3aeb78583b8	2008-08-30 21:59:23 +00:00
Chris Allegretta	566635ec16	GNU nano 2.1.5 release git-svn-id: svn://svn.savannah.gnu.org/nano/trunk/nano@4319 35c25a1d-7b9e-4130-9fde-d3aeb78583b8	2008-08-30 21:40:33 +00:00
Chris Allegretta	95a9de0d3f	Move the wordbounds check down so it will happen if either --enable-all or --enable-color git-svn-id: svn://svn.savannah.gnu.org/nano/trunk/nano@4318 35c25a1d-7b9e-4130-9fde-d3aeb78583b8	2008-08-30 21:32:55 +00:00
Chris Allegretta	1d77823f79	* global.c, help.c, browser.c, files.c, proto.h: Fix several compipation and programmatic issues with --disable-help, especially that do-writeout was treating ^G the same as ^M. git-svn-id: svn://svn.savannah.gnu.org/nano/trunk/nano@4317 35c25a1d-7b9e-4130-9fde-d3aeb78583b8	2008-08-30 21:00:00 +00:00
Chris Allegretta	874969be81	* nano-regress: New perl script to check for some of the more obvious issues with compilation issues with certain configure options. git-svn-id: svn://svn.savannah.gnu.org/nano/trunk/nano@4316 35c25a1d-7b9e-4130-9fde-d3aeb78583b8	2008-08-30 20:33:32 +00:00
Chris Allegretta	6b83e5290c	2008-08-29 Chris Allegretta <chrisa@asty.org> * configure.ac, color.c, rcfile.c, utils.c: 1st attempt at supporting systems which don't support GNU-style word boundaries. New function fixbounds() to translate from GNU-style to BSD-style, autoconf option GNU_WORDBOUNDS. git-svn-id: svn://svn.savannah.gnu.org/nano/trunk/nano@4315 35c25a1d-7b9e-4130-9fde-d3aeb78583b8	2008-08-30 05:16:20 +00:00
Chris Allegretta	faeeb5bd7e	2008-08-28 Chris Allegretta <chrisa@asty.org> * configure.ac, rcfile.c: Add support for an alternate rcfilename at configure time. Maybe this should become a command line option some day, but I don't see the need currently. Start of fix for Savannah bug #24128: Add nanorc support to win32 platform. git-svn-id: svn://svn.savannah.gnu.org/nano/trunk/nano@4314 35c25a1d-7b9e-4130-9fde-d3aeb78583b8	2008-08-28 06:13:05 +00:00
Chris Allegretta	dc7136a082	* text.c (do_enter): Fix issue when compiled with --enable-debug, fixes Savannah bug 24092. git-svn-id: svn://svn.savannah.gnu.org/nano/trunk/nano@4309 35c25a1d-7b9e-4130-9fde-d3aeb78583b8	2008-08-21 04:24:25 +00:00
Chris Allegretta	77bf1b5197	2008-08-21 Chris Allegretta <chrisa@asty.org> * text.c: Change error messages where we may possibly get into a bad state and urge the user to save when this happens. Originally by Benno Schulenberg <bensberg@justemail.net> git-svn-id: svn://svn.savannah.gnu.org/nano/trunk/nano@4308 35c25a1d-7b9e-4130-9fde-d3aeb78583b8	2008-08-21 04:21:06 +00:00
Chris Allegretta	90ad8e20b9	2008-08-08 Magnus Granberg <zorry@ume.nu> / Adam Conrad <?> * files.c: (write_file): Add needed flags to open() calls when writing out files. Fixes Savannah bug #23827: Compilation fails with -D_FORTIFY_SOURCE=2 git-svn-id: svn://svn.savannah.gnu.org/nano/trunk/nano@4306 35c25a1d-7b9e-4130-9fde-d3aeb78583b8	2008-08-17 16:25:40 +00:00
Chris Allegretta	2cc58882f6	* files.c (write_file): Check exit code of fclose(), since in certain out of space conditions the OS will happily report successful fwrite()s until you try and close the file. Fix for Savannah bug #24000: no free space on partition - nano claims successful write - file empty git-svn-id: svn://svn.savannah.gnu.org/nano/trunk/nano@4304 35c25a1d-7b9e-4130-9fde-d3aeb78583b8	2008-08-16 23:54:15 +00:00
Chris Allegretta	93f2ea1194	Back to svn. git-svn-id: svn://svn.savannah.gnu.org/nano/trunk/nano@4303 35c25a1d-7b9e-4130-9fde-d3aeb78583b8	2008-08-09 19:50:34 +00:00
Chris Allegretta	d2780eca94	GNU nano 2.1.4 release. git-svn-id: svn://svn.savannah.gnu.org/nano/trunk/nano@4301 35c25a1d-7b9e-4130-9fde-d3aeb78583b8	2008-08-09 10:25:22 +00:00
Chris Allegretta	80ea9c5de9	* text.c (add_undo): Fix check for multi-line cut check skips adding other new legit events. git-svn-id: svn://svn.savannah.gnu.org/nano/trunk/nano@4300 35c25a1d-7b9e-4130-9fde-d3aeb78583b8	2008-08-09 10:08:33 +00:00
Chris Allegretta	b08b38680d	Re-add the skip_backup label since we do still need it in one case. git-svn-id: svn://svn.savannah.gnu.org/nano/trunk/nano@4299 35c25a1d-7b9e-4130-9fde-d3aeb78583b8	2008-08-09 09:31:33 +00:00
Chris Allegretta	5c27d723c9	* text.c (do_redo): Fix improperly restoring the text when redoing a line split. git-svn-id: svn://svn.savannah.gnu.org/nano/trunk/nano@4298 35c25a1d-7b9e-4130-9fde-d3aeb78583b8	2008-08-09 09:28:07 +00:00
Chris Allegretta	447f1b4b75	* files.c: Do not go on and attempt to write the main file if writing the backup file failed, related to Savannah bug 24000. git-svn-id: svn://svn.savannah.gnu.org/nano/trunk/nano@4297 35c25a1d-7b9e-4130-9fde-d3aeb78583b8	2008-08-09 03:39:10 +00:00
Chris Allegretta	6f681c1be2	* text.c: Reset openfile-> to OTHER after an undo or redo so we don't mistakenly mistakenly think this is an update when it's really an add. Also Fix an extra ; after an if statement which makes nano try to free a struct which may be NULL git-svn-id: svn://svn.savannah.gnu.org/nano/trunk/nano@4296 35c25a1d-7b9e-4130-9fde-d3aeb78583b8	2008-08-08 03:02:03 +00:00
Chris Allegretta	a50d0e35f7	Back to SVN version git-svn-id: svn://svn.savannah.gnu.org/nano/trunk/nano@4295 35c25a1d-7b9e-4130-9fde-d3aeb78583b8	2008-08-05 02:38:40 +00:00
Chris Allegretta	599c559b3c	GNU nano 2.1.3 release git-svn-id: svn://svn.savannah.gnu.org/nano/trunk/nano@4293 35c25a1d-7b9e-4130-9fde-d3aeb78583b8	2008-08-05 01:35:42 +00:00
Chris Allegretta	ea577874ef	- Add redo of an insert - Fix bug in fsfromlineno - Tiny cleanups in undo git-svn-id: svn://svn.savannah.gnu.org/nano/trunk/nano@4292 35c25a1d-7b9e-4130-9fde-d3aeb78583b8	2008-08-03 20:19:42 +00:00
Chris Allegretta	14c8620e0b	- Change add_undo and current_undo to only take action arg, as openfilestruct arg is always openfile - Add ability to undo a file/cmd insert, needed to add undoable flag to read_file and open_buffer as a result git-svn-id: svn://svn.savannah.gnu.org/nano/trunk/nano@4291 35c25a1d-7b9e-4130-9fde-d3aeb78583b8	2008-08-03 04:48:05 +00:00
Chris Allegretta	3c1131a5b3	- Add very basic undo for text replace. - Fix lots of warnings whe using -Wall - Fix some comments git-svn-id: svn://svn.savannah.gnu.org/nano/trunk/nano@4290 35c25a1d-7b9e-4130-9fde-d3aeb78583b8	2008-08-02 22:31:01 +00:00
Chris Allegretta	015c74093a	Allow current undo code to compile with NANO_TINY git-svn-id: svn://svn.savannah.gnu.org/nano/trunk/nano@4289 35c25a1d-7b9e-4130-9fde-d3aeb78583b8	2008-08-02 14:39:42 +00:00
Chris Allegretta	d31ddb789f	Allow basic multi-^K cuts to be redone properly. Code getting uglier by the second. git-svn-id: svn://svn.savannah.gnu.org/nano/trunk/nano@4288 35c25a1d-7b9e-4130-9fde-d3aeb78583b8	2008-08-01 07:29:06 +00:00
Chris Allegretta	8f76112084	- When undoing a cut, set cutbuffer to NULL after freeing the current one - When updating a normal consecutive ^K cut, bail from add_undo since it's not an add, and in update_undo free the old cutbuffer before copying it again. git-svn-id: svn://svn.savannah.gnu.org/nano/trunk/nano@4287 35c25a1d-7b9e-4130-9fde-d3aeb78583b8	2008-08-01 06:52:15 +00:00
Chris Allegretta	1f37c4514d	When redoing a text add, actually copy the beginning of the line back! git-svn-id: svn://svn.savannah.gnu.org/nano/trunk/nano@4286 35c25a1d-7b9e-4130-9fde-d3aeb78583b8	2008-08-01 04:11:57 +00:00
Chris Allegretta	91a1862eed	Add undoing argument to do_cut_text as we don't want to be messing around with the undo contents when we're in the middle of an undo. git-svn-id: svn://svn.savannah.gnu.org/nano/trunk/nano@4285 35c25a1d-7b9e-4130-9fde-d3aeb78583b8	2008-08-01 03:50:20 +00:00
Chris Allegretta	e418b694b6	* configure.ac: Add ncursesw dir to include path if lib detected git-svn-id: svn://svn.savannah.gnu.org/nano/trunk/nano@4284 35c25a1d-7b9e-4130-9fde-d3aeb78583b8	2008-07-31 17:01:47 +00:00
Chris Allegretta	12dc8cae80	Commit back some undo/redo rewrites git-svn-id: svn://svn.savannah.gnu.org/nano/trunk/nano@4283 35c25a1d-7b9e-4130-9fde-d3aeb78583b8	2008-07-31 04:24:04 +00:00
Chris Allegretta	0b499d465b	Add xflags to undo struct so we can add extra info to the undo process (e.g. backspace vs delete) Fix redo of a line join. git-svn-id: svn://svn.savannah.gnu.org/nano/trunk/nano@4282 35c25a1d-7b9e-4130-9fde-d3aeb78583b8	2008-07-14 07:18:22 +00:00
Chris Allegretta	fa406949ec	Allow backspace to be bound to keys in .nanorc Allow kdel to be rebound Add note about rebinding kdel to backspace for those using OSX or PuTTY to connect to remote Linux machines in nanorc.sample.in When undoing text deletes, move current_x to proper location git-svn-id: svn://svn.savannah.gnu.org/nano/trunk/nano@4281 35c25a1d-7b9e-4130-9fde-d3aeb78583b8	2008-07-13 16:44:19 +00:00
Chris Allegretta	70859f4a5b	Add ability to rebind the (still unfinished) undo and redo functions in case anyone is interested in testing it out early. Add to nanorc.5 also. git-svn-id: svn://svn.savannah.gnu.org/nano/trunk/nano@4280 35c25a1d-7b9e-4130-9fde-d3aeb78583b8	2008-07-13 01:36:06 +00:00
Chris Allegretta	9fb13fb8f0	2008-07-11 Mike Frysinger <vapier@gentoo.org> * doc/nanorc.sample.in: Include the updates files in the default sample nanorc. git-svn-id: svn://svn.savannah.gnu.org/nano/trunk/nano@4279 35c25a1d-7b9e-4130-9fde-d3aeb78583b8	2008-07-12 02:52:08 +00:00
Chris Allegretta	274142cb10	Clean up some unused variables from old undo implementation. git-svn-id: svn://svn.savannah.gnu.org/nano/trunk/nano@4278 35c25a1d-7b9e-4130-9fde-d3aeb78583b8	2008-07-12 02:48:20 +00:00
Chris Allegretta	b8576780bf	2008-07-11 Fabian Groffen <grobian@gentoo.org> * nano.c: Don't include langinfo.h if not using ENABLE_UTF8 (Savannah patch 6565) git-svn-id: svn://svn.savannah.gnu.org/nano/trunk/nano@4277 35c25a1d-7b9e-4130-9fde-d3aeb78583b8	2008-07-12 02:32:19 +00:00
Chris Allegretta	a9dea9859d	2008-07-11 Michael Haubenwallner <michael.haubenwallner@salomon.at> * global.c: include proto.h earlier in file to fix AIX compilation (Savannah patch 6559) git-svn-id: svn://svn.savannah.gnu.org/nano/trunk/nano@4275 35c25a1d-7b9e-4130-9fde-d3aeb78583b8	2008-07-12 02:20:16 +00:00
Chris Allegretta	a855fa2acc	2008-07-11 Michael Haubenwallner <michael.haubenwallner@salomon.at> * global.c: include proto.h earlier in file to fix AIX compilation (Savannah patch 6559) git-svn-id: svn://svn.savannah.gnu.org/nano/trunk/nano@4274 35c25a1d-7b9e-4130-9fde-d3aeb78583b8	2008-07-12 02:13:22 +00:00
Chris Allegretta	09b8124859	Savannah bug 23751: Segfault when viewing help using Japanese locale Fix break_line crashing when using certain locales from Mitsuya Shibata git-svn-id: svn://svn.savannah.gnu.org/nano/trunk/nano@4272 35c25a1d-7b9e-4130-9fde-d3aeb78583b8	2008-07-12 01:54:49 +00:00
Chris Allegretta	07fcc4c973	Add beginning undo feature, since I want to start fixing bugs from savannah and don't want to manager another checking, and the code basically works for some operations. git-svn-id: svn://svn.savannah.gnu.org/nano/trunk/nano@4271 35c25a1d-7b9e-4130-9fde-d3aeb78583b8	2008-07-10 20:13:04 +00:00
Chris Allegretta	1347f22c95	Fix for 23733: search history broken with nano-2.1.1+ git-svn-id: svn://svn.savannah.gnu.org/nano/trunk/nano@4270 35c25a1d-7b9e-4130-9fde-d3aeb78583b8	2008-06-29 06:22:31 +00:00
Chris Allegretta	9015f187a5	Back to SVN git-svn-id: svn://svn.savannah.gnu.org/nano/trunk/nano@4269 35c25a1d-7b9e-4130-9fde-d3aeb78583b8	2008-06-25 03:42:28 +00:00
Chris Allegretta	2c367bff01	GNU nano 2.1.2 release. git-svn-id: svn://svn.savannah.gnu.org/nano/trunk/nano@4267 35c25a1d-7b9e-4130-9fde-d3aeb78583b8	2008-06-25 03:35:15 +00:00
Chris Allegretta	47a7ac2313	Add ChangeLog update for previous fix, argh. git-svn-id: svn://svn.savannah.gnu.org/nano/trunk/nano@4266 35c25a1d-7b9e-4130-9fde-d3aeb78583b8	2008-06-25 03:09:10 +00:00
Chris Allegretta	fb41a0780d	Add function check_bad_binding to check ppl arent binding things they shouldn, though currently its only one entry long ('meta-[') git-svn-id: svn://svn.savannah.gnu.org/nano/trunk/nano@4265 35c25a1d-7b9e-4130-9fde-d3aeb78583b8	2008-06-25 03:06:11 +00:00
Chris Allegretta	1b6ed07543	Add a fix for bug #23144 that actually works (several bugs in one here) git-svn-id: svn://svn.savannah.gnu.org/nano/trunk/nano@4264 35c25a1d-7b9e-4130-9fde-d3aeb78583b8	2008-06-03 08:09:05 +00:00
Chris Allegretta	1371fb6326	Tentative fix for bug #23144 : using arrow keys in search buffer affects main window git-svn-id: svn://svn.savannah.gnu.org/nano/trunk/nano@4263 35c25a1d-7b9e-4130-9fde-d3aeb78583b8	2008-06-03 06:21:31 +00:00
Chris Allegretta	3daeeebf91	Fix for Savannah bug #23442 : left/right arrow keys do not work with --enable-tiny git-svn-id: svn://svn.savannah.gnu.org/nano/trunk/nano@4262 35c25a1d-7b9e-4130-9fde-d3aeb78583b8	2008-06-03 05:55:04 +00:00
Chris Allegretta	8b6461fc80	files.c,proto.h,text.c: Fix for conflicts with AIX curses variables, from William Jojo <jojowil@hvcc.edu> git-svn-id: svn://svn.savannah.gnu.org/nano/trunk/nano@4260 35c25a1d-7b9e-4130-9fde-d3aeb78583b8	2008-05-31 23:09:40 +00:00
Chris Allegretta	506af6fbfb	global.c: Fix for compile error when --disable-speller is used (Savannah bug 23227 by Mike Frysinger) git-svn-id: svn://svn.savannah.gnu.org/nano/trunk/nano@4259 35c25a1d-7b9e-4130-9fde-d3aeb78583b8	2008-05-31 22:49:55 +00:00
Chris Allegretta	f9cf36264c	Minor formatting issue and trying to test why my writes are failing to the svn tree in 2.0. git-svn-id: svn://svn.savannah.gnu.org/nano/trunk/nano@4257 35c25a1d-7b9e-4130-9fde-d3aeb78583b8	2008-05-31 22:33:32 +00:00
Chris Allegretta	e67bf806bd	Fix for segfault when window size is too small by Andreas Amann <andreas.amann@tyndall.ie> git-svn-id: svn://svn.savannah.gnu.org/nano/trunk/nano@4256 35c25a1d-7b9e-4130-9fde-d3aeb78583b8	2008-05-31 22:23:16 +00:00
Chris Allegretta	ed505f5893	Makefile changes for the included files and updated Changelog git-svn-id: svn://svn.savannah.gnu.org/nano/trunk/nano@4255 35c25a1d-7b9e-4130-9fde-d3aeb78583b8	2008-05-31 21:59:53 +00:00
Chris Allegretta	deb34f2779	New syntax highlighting from Mike F. Credits: awk.nanorc by Donnie Berkholz <dberkholz@gentoo.org> css.nanorc by Simon Rupf <simon.rupf@int-ag.ch> xml.nanorc by Josef 'Jupp' Schugt <jupp@rubyforge.org> Slight tweak by chrisa on the CSS file to make the brightwhite section end on line boundary due to matching too greedily on valid CSS (see digg's css/111/global.css as an example) git-svn-id: svn://svn.savannah.gnu.org/nano/trunk/nano@4254 35c25a1d-7b9e-4130-9fde-d3aeb78583b8	2008-05-31 21:55:21 +00:00
Chris Allegretta	c73d07102b	Minor formatting issue in NEWS for 2.1.1 git-svn-id: svn://svn.savannah.gnu.org/nano/trunk/nano@4253 35c25a1d-7b9e-4130-9fde-d3aeb78583b8	2008-04-02 04:35:39 +00:00
Chris Allegretta	9eb7fc6762	Back to SVN git-svn-id: svn://svn.savannah.gnu.org/nano/trunk/nano@4252 35c25a1d-7b9e-4130-9fde-d3aeb78583b8	2008-04-02 04:21:31 +00:00
Chris Allegretta	9ba66065da	Add the newa, argh git-svn-id: svn://svn.savannah.gnu.org/nano/trunk/nano@4250 35c25a1d-7b9e-4130-9fde-d3aeb78583b8	2008-04-02 04:08:24 +00:00
Chris Allegretta	33a8b4e9ae	GNU nano 2.1.1 release git-svn-id: svn://svn.savannah.gnu.org/nano/trunk/nano@4249 35c25a1d-7b9e-4130-9fde-d3aeb78583b8	2008-04-02 04:08:09 +00:00
Chris Allegretta	2cca48380d	Fix for bug #22780 : build failure with --enable-multibuffer --enable-tiny Plus make the actual prompt work with --enable-tiny when inserting files. git-svn-id: svn://svn.savannah.gnu.org/nano/trunk/nano@4248 35c25a1d-7b9e-4130-9fde-d3aeb78583b8	2008-03-31 06:25:14 +00:00
Chris Allegretta	b04248c548	Benno's latest fixes for help menu translations. git-svn-id: svn://svn.savannah.gnu.org/nano/trunk/nano@4247 35c25a1d-7b9e-4130-9fde-d3aeb78583b8	2008-03-20 05:56:46 +00:00
Chris Allegretta	8a59f254ea	Wow, I somehow did not run into the "invalid range" error until after I committed, how does that work? Anyway, fix the range error message for debian.nanorc. git-svn-id: svn://svn.savannah.gnu.org/nano/trunk/nano@4246 35c25a1d-7b9e-4130-9fde-d3aeb78583b8	2008-03-20 05:52:08 +00:00
Chris Allegretta	cc60c3a767	Add some rc file name debugging Add debian nanorc example Fix that previous entries as well as new one need Makefile.am entries git-svn-id: svn://svn.savannah.gnu.org/nano/trunk/nano@4245 35c25a1d-7b9e-4130-9fde-d3aeb78583b8	2008-03-20 05:41:00 +00:00
Chris Allegretta	2ea0b8fa03	Fix default bracket match shortcut git-svn-id: svn://svn.savannah.gnu.org/nano/trunk/nano@4244 35c25a1d-7b9e-4130-9fde-d3aeb78583b8	2008-03-20 04:57:46 +00:00
Chris Allegretta	dcd19c955f	Fix for my fix for Mike's fix...dont add menu item refencing nano_exitbrowser_msg when using DISABLE_BROWSER git-svn-id: svn://svn.savannah.gnu.org/nano/trunk/nano@4243 35c25a1d-7b9e-4130-9fde-d3aeb78583b8	2008-03-20 04:51:26 +00:00
Chris Allegretta	90ee8ee494	Add Mike F's latest patches for 2.1.0 and new syntax configs for tcl, php and gentoo. git-svn-id: svn://svn.savannah.gnu.org/nano/trunk/nano@4242 35c25a1d-7b9e-4130-9fde-d3aeb78583b8	2008-03-20 04:45:55 +00:00
Chris Allegretta	690e7df997	Back to svn git-svn-id: svn://svn.savannah.gnu.org/nano/trunk/nano@4241 35c25a1d-7b9e-4130-9fde-d3aeb78583b8	2008-03-19 03:41:48 +00:00
Chris Allegretta	a1941d2a70	Gah, upgrate the translations for 2.1.0 git-svn-id: svn://svn.savannah.gnu.org/nano/trunk/nano@4240 35c25a1d-7b9e-4130-9fde-d3aeb78583b8	2008-03-19 03:32:25 +00:00