GNU nano 2.1.10 release

git-svn-id: svn://svn.savannah.gnu.org/nano/trunk/nano@4398 35c25a1d-7b9e-4130-9fde-d3aeb78583b8

BUGS

@@ -1,6 +1,5 @@
 ** Open BUGS **
 - Cutting the line at the top of the screen recenters to center (71)
-- Many menu items are probably missing from the new backend (73)
 
 ** Fixed BUGS **
 - Marked cutting sometimes leaves a newline in the file unintelligently,
@@ -143,6 +142,7 @@
 - Trying to insert a file of 0 bytes will hang nano (70) [FIXED].
 - Meta-space and ^Space are not yet handled  in new backend code (77) [FIXED]
 - F-keys do not work with new shortcut backend (72) [FIXED]
+- Many menu items are probably missing from the new backend (73) [FIXED]
 - Need a 'check-vitals-mapped' function to check that the end used didn't
   unbind all the keys for exit or cancel before starting up the editor (74) [FIXED]
 - Browser and prompt code still implement old switch on raw key input instead
@@ -154,6 +154,8 @@
   page up/down, insert, and unbinds all other control and F keys for it,
   nano will do the wrong thing when reading the key which is normally
   assigned to it (79 - may not be worth fixing) [FIXED]
+- Segfault editing at COLS presumably due to new color syntax 
+  highlighting (80) [FIXED]
 
 
 $Id$

ChangeLog

@@ -1,3 +1,133 @@
+GNU nano 2.1.10 - 2009.07.28
+2009-07-27 Chris Allegretta <chrisa@asty.org>
+	* text.c (undo_cut, redo_cut): Don't actually try and undo/redo an empty cut, i.e. the magicline. 
+	  Fixes crash on cutting last line discovered by Eitan Adler <eitanadlerlist@gmail.com>.
+
+2009-07-11 Chris Allegretta <chrisa@asty.org>
+	* nano-regress: Small tweaks
+	* Change undo code to off unless unabled via a command line option (-u/--undo).  Until this code
+	  stabilizes this is the only responsible way to treat it.
+
+2009-03-08 Chris Allegretta <chrisa@asty.org>
+	* TODO - Break out some targets for various features into 2.2 
+	  and 2.4 series for things which are feasible.
+
+2009-02-28 Chris Allegretta <chrisa@asty.org>
+	* configure.ac: Add check for whether _XOPEN_SOURCE_EXTENDED is needed for
+	  curses to work w/color.  Fixes compilation on HP-UX with older GCC, 
+	  reported by jay.krell@cornell.edu.
+
+2009-02-23 Eitan Adler <eitanadlerlist@gmail.com>
+	* doc/man/Makefile.am: Fix make variable substitution to be more portable
+
+2009-02-23 Chris Allegretta <chrisa@asty.org>
+	* rcfile.c (parse_keybinding) - Define a var before tryung to use it.  Whoops!
+	* fix some redefinitions causing compiler warnings, from Eitan Adler.  Other
+	  (hopefully) fixes for uncasted malloc()s, reported by the same.
+	* doc/man/fr/Makefile.am: Add groff check fix to fr files.
+
+GNU nano 2.1.9 - 2009.02.16
+2009-02-16 Chris Allegretta <chrisa@asty.org>
+	* Add new argument to reset_multis for force redraws without attempting to
+	  guess whether we need to, for functions that we don't have good info about
+	  the text state.  New utility function color.c:reset_multis_for_id().  
+
+2009-02-15 Chris Allegretta <chrisa@asty.org>
+	* configure.ac, doc/man/Makefile.am - Add check for HTML output support in GNU
+	  groff.  Fixes Savannah bug #24461: build traps on groff.  Also, add installation
+	  of html-ized man pages to $datadir/nano/man-html, since we should probably
+	  install files we went to all the trouble of generating.
+
+2009-02-14 Chris Allegretta <chrisa@asty.org>
+        * nano.c (precalc_multicolorinfo) - Add debugging so we have a better clue if further
+          issues arise.   Also start at the beginning of later lines when trying to match the
+          end of a multi-line regex.  Fixes more overly aggressive highlighting found by 
+          Mike Frysinger.  Finally, advance to the match end for performance.
+
+2009-02-11 Chris Allegretta <chrisa@asty.org>
+	* nanorc.c (parse_include): Do call real_dir_from_tilde() on included
+	  files in .nanorc, but still avoiding bug #25297.  Fixes ~ and ~user
+	  specifications for nanorc include files, as reported by Eitan Adler.
+
+2009-02-09 Chris Allegretta <chrisa@asty.org>
+	* New option -q, --quiet, rcfile option "quiet" implemented.  Skips printing
+	  errors about the rcfile and asking user to press enter.  Also, nano should
+	  now only ask for one enter press when there is an error when not using -q.
+	  Based on discussion between Eitan Adler and Mike Frysinger.
+	* rcfile.c (parse_keybinding) -  Significant cleanups and fixes for 
+	  detecting and reporting errors in key bindings code.
+
+2009-02-08 Chris Allegretta <chrisa@asty.org>
+	* Make reset_multidata reset more lines, since contrary to previous problems the
+	  syntax highlting is now too *un*ambitious, causing display glitches when
+	  deleting a regex boundary.
+	* Add more multidata initliazers for new buffers and 'magic lines'.  Fixes segfaults
+	  with syntax highlighting in new buffers, initially reported by Mike Frysinger.
+
+GNU nano 2.1.8 - 2009.02.07
+2009-02-06 Chris Allegretta <chrisa@asty.org>
+	* rcfile.c (parse_include): Abort on being unable to open an included rcfile.  Fixes
+	  Savannah bug 25490, nanorc: "include"ing a file which doesn't exist causes nano to segfault.
+
+2009-02-05 Chris Allegretta <chrisa@asty.org>
+	* More color syntax speedups:  Determine in reset_multis() whether we really need to call
+	  edit_refresh().  Additional global var edit_refresh_needed() to hopefully reduce
+	  repeated calls to the function.  New helper funcs reset_multis_before() and 
+	  reset_multis_after().
+
+2009-02-02 Chris Allegretta <chrisa@asty.org>
+	* New color precalculation code for mult-line regexes.  New function precalc_multicolorinfo(),
+	  new structure multidata for keeping track of where regexes start/stop.  More 
+	  performance improvements forthcoming.
+
+2009-01-29 Chris Allegretta <chrisa@asty.org>
+	* nano.c (move_to_filestruct) - properky initialize new fileage for multiswatching, sigh.
+	  Fix cut sefaults discovered by Mike Frysinger.
+
+2009-01-29 Chris Allegretta <chrisa@asty.org>
+	* nano.c (main): Add support for nano acting like a pager when invoked with - as first
+	  file argument.
+
+2009-01-28 Davide Pesavento <davidepesa@gmail.com>
+	* doc/syntax/gentoo.nanorc: Updates from David and Mike Frysinger.
+
+2009-01-25 Chris Allegretta <chrisa@asty.org>
+	* files.c (open_file), nanorc.c (parse_include): Don't get_full_path on 
+	  included rc files, due to it potentially impacting the ability
+	  to read files in nano's cwd().  Fixes Savnanah bug #25297 reported by Mike 
+	  Frysinger)
+
+2009-01-24 Chris Allegretta <chrisa@asty.org>
+	* First pass at some caching of caching color info.  Right now it's only for
+	  multi-line regexes but this may not be enough to increase performance.
+	* Add interruptability to search functions.  New functions enable_nodelay and
+	  disable_nodelay and changes to the routines to handle checking for pending
+	  searches.  Fixes Savnnah bug 24946: Need interrrupt for search.
+
+2009-01-19 Chris Allegretta <chrisa@asty.org>
+	* Change function definitions to shorts instead of (void *)s.  New mapping function
+          iso_me_harder_funcmap().  Fixes compilation complaints with -pedantic, 
+	  reported by Eitan Adler <eitanadlerlist@gmail.com>.
+
+GNU nano 2.1.7 - 2008.11.10
+2008-10-20 Chris Allegretta <chrisa@asty.org>
+	* files.c (do_writeout): Add check for file modification when saving
+	  the file so the user can at least know they may be blowing away changes.
+
+2008-10-14 Chris Allegretta <chrisa@asty.org>
+	* nanorc.5: Fix redo man page entry and update explanation, reported by
+	  Eitan Adler <eitanadlerlist@gmail.com>
+	* global.c (shortcut_init), search.c (search_init): Fix add_to_sclist for ^W^T so
+	  invalid messages will display properly.  Fixes Savannah bug 24507.
+
+2008-10-13 Chris Allegretta <chrisa@asty.org>
+	* Remove CUTTOEND as an undo type as it's unneeded, fix u->to_end logic in undo struct.
+	* undo.c (update_undo): Don't free cutbuffer if NULL, fix for Savannah bug #24499
+
+2008-10-04 Chris Allegretta <chrisa@asty.org>
+	* cut.c (Add_undo): Save last cut undo information so it can be used for next uncut, fixes
+	  Savannah bug 24183.
+
 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

NEWS

@@ -1,3 +1,53 @@
+2009.07.28 - GNU nano 2.1.10 "Ellie" is released.  This version includes
+		various fixes for portability including some older HP-UX
+		compiler combos, various compiler warnings, and some crash
+		fixes in the undo code.  On the topic of the latter item,
+		the undo code is now marked as experimental since it can
+		cause severe stability and memory issues, and thus now 
+		requires a flag (-u, --undo) in order to enable it.  
+		Please feel free to continue to test the undo code and 
+		thanks again for using nano for your text editing needs.
+		Go team Nano!
+
+2009.02.16 - GNU nano 2.1.9 wonders what all that glass is doing on the
+		floor!  This release is primarily meant as a less buggy 
+		version of 2.1.8, particularly for issues with the new 
+		sped-up syntax highlighting code.  Other fixes include 
+		configure-time detection of groff HTML support before 
+		attempting to generate the HTML version of man pages, 
+		and using ~ or ~username syntax in .nanorc should now 
+		work again.  Also, nano will now only ask for one 
+		acknowledgement of errors it encounters when parsing 
+		nanorc files, and a new flag -q (--quiet) will silence 
+		these messages altogether.  Give it a go, and happy 
+		birthday lenny!
+
+2009.02.07 - GNU nano 2.1.8 "unsafe at any speed" is released.  This
+		release include some long overdue performance 
+		improvements in syntax color highlighting, the ability
+		to abort running searches (useful mainly when
+		editing very large files) and the ability to use nano
+		like a pager for viewing standard input (i.e. "nano -").
+		Additionally, there are gentoo syntax highlighting 
+		updates and fixes for issues with reading files 
+		in a directory with strange parent directory permissions. 
+		The key bindings code was also substantially changed 
+		in order to be more ISO-C compatible.  Be sure to use 
+		the Savannah page not only for bug reports but for any 
+		features you would like to see before the next stable 
+		series is released.  Have fun with it!
+		
+
+2008.11.10 - GNU nano 2.1.7 "Effingham" is ready to make good on those
+		campaign promises of lower bug rates and 50% more pie.
+		This release includes a new check for external
+		modifications when saving a file, some code and 
+		documentation cleanups, and more bug fixes for 
+		the new undo code (but we continue to welcome your bug
+		reports via the Savananh bug page at 
+		http://savannah.gnu.org/bugs/?func=additem&group=nano.
+		Come get some.
+
 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

TODO

@@ -1,9 +1,9 @@
 TODO file (? means the feature may be implemented, but not definitely)
 ------------------------------------------------------------------------
 
-For the next version:
-- Undo/Redo keys (M-U and M-E)?
-- Rebindable keys?
+For the future (no targeted version, catch-all)
+- Compatibility with vi/emacs status files so we can let other editors 
+  know we're in a file?
 - FriBidi support?
 - Port to DJGPP?
 - Make matching bracket searches sophisticated enough to skip over
@@ -11,37 +11,43 @@ For the next version:
 - Allow indentation of marked text by spaces as well as tabs?
 - Allow indentation to add just enough columns to reach the nearest
   multiple of tabsize, rather than always adding tabsize columns?
-- Allow piping marked text to an external command and replacing it with
-  the command's output (as the internal spell checker already does with
-  the "spell" command)?
-- Rewrite the nano FAQ in SGML.
 - Allow conversion between different character sets.  Maybe use glib's
   iconv() if the system's iconv() is inadequate, since we already use
   glib's vsnprintf() if the system lacks vsnprintf()?
-- Handle window resizes better.  After we resize, we should stay
-  wherever we were before we resized, as Pico does.
-- Fix problems with color syntaxes' highlighting lines too aggressively.
 - Allow color syntaxes to apply to more than just color, so that we can
   e.g. specify a different alternate spell checker depending on which
   file type we have open.
-- Allow color syntaxes to be selected based on more than just filename
-  extension, e.g. through libmagic?
-- Allow text searches in the help browser.
+- Allow even better file type detection than we have currently, e.g. 
+  through libmagic?
 - Allow setting marks (saved positions, not to be confused with the mark
   set via Ctrl-^) at various lines and/or columns in the buffer, and
-  allow movement between them with a single keystroke.
-- Add the ability to move to different lines of the screen with a single
-  keystroke, e.g. M-` (M-~) to go to the top line, M-& (M-7) to go to
-  the center line, and M-' (M-") to go to the last line.
+  allow movement between them with a single keystroke? (we're running 
+  out of keystrokes)
 - Allow searching for and replacing newlines.
 - Allow soft wrapping as well as hard wrapping?
-- Detect when we're pasting text, so that we can handle it differently
-  from normal typing?
-- Make pasting text work as fast as it does in Pico.
 - Fix handling of bad/incomplete UTF-8 sequences to display one Unicode
   FFFD (Replacement Character) per sequence instead of one per byte.
 
-Old requests:
+For version 2.4:
+- Allow text searches in the help browser.
+- Handle window resizes better.  After we resize, we should stay
+  wherever we were before we resized, as Pico does.
+- Add the ability to move to different lines of the screen with a single
+  keystroke, e.g. M-` (M-~) to go to the top line, M-& (M-7) to go to
+  the center line, and M-' (M-") to go to the last line.
+- Detect when we're pasting text, so that we can handle it differently
+  (i.e. faster than currently with screen redraws)
+- Allow piping marked text to an external command and replacing it with
+  the command's output (as the internal spell checker already does with
+  the "spell" command)?
+
+For version 2.2:
+- Rebindable keys? [DONE]
+- Undo/Redo keys (M-U and M-E)? [DONE]
+- Fix problems with color syntaxes' highlighting lines too aggressively [DONE]
+- Allow nano to work like a pager (read from stdin) [DONE]
+- Allow color syntaxes to be selected based on more than just filename
+  extension, [DONE]
 
 For version 2.0:
 - UTF-8 support. [DONE]

configure.ac

@@ -20,7 +20,7 @@
 #
 # $Id$
 
-AC_INIT([GNU nano], [2.1.6], [nano-devel@gnu.org], [nano])
+AC_INIT([GNU nano], [2.1.10], [nano-devel@gnu.org], [nano])
 AC_CONFIG_SRCDIR([src/nano.c])
 AC_CANONICAL_TARGET([])
 AM_INIT_AUTOMAKE
@@ -50,7 +50,7 @@ AC_DEFINE_DIR([PKGDATADIR], [pkgdatadir], [Where data are placed to.])
 dnl Checks for header files.
 
 AC_HEADER_STDC
-AC_CHECK_HEADERS(getopt.h libintl.h limits.h regex.h sys/param.h wchar.h wctype.h)
+AC_CHECK_HEADERS(getopt.h libintl.h limits.h regex.h sys/param.h wchar.h wctype.h stdarg.h)
 
 dnl Checks for options.
 
@@ -144,7 +144,7 @@ fi])
 
 AC_ARG_ENABLE(color,
 [  --disable-color          Disable color and syntax highlighting],
-[if test x$enableval != xno; then
+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
@@ -155,7 +155,7 @@ AC_ARG_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
@@ -168,7 +168,7 @@ fi], [
 *** script with --disable-color.])
 	fi
     fi
-])
+)
 
 AC_ARG_ENABLE(multibuffer,
 [  --disable-multibuffer    Disable multiple file buffers],
@@ -194,34 +194,6 @@ AC_ARG_ENABLE(all,
     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],
@@ -464,7 +436,6 @@ dnl Checks for library functions.
 AC_TYPE_SIGNAL
 AC_FUNC_VPRINTF
 AC_CHECK_FUNCS(getopt_long)
-
 dnl Checks for libraries.
 
 if eval "test x$CURSES_LIB_NAME = x"; then
@@ -545,6 +516,74 @@ else
     fi
 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-style word boundary support when cross-compiling])
+)
+#    if test x$CURSES_LIB_NAME = xcurses; then
+	AC_MSG_CHECKING([whether _XOPEN_SOURCE_EXTENDED is needed])
+	AC_TRY_RUN([
+#include <curses.h>
+int main(void)
+{
+    int testcolor = COLOR_WHITE;
+    return 0;
+}], AC_MSG_RESULT(no),
+        AC_TRY_RUN([
+#ifndef _XOPEN_SOURCE_EXTENDED
+#define _XOPEN_SOURCE_EXTENDED 1
+#endif
+#include <curses.h>
+int main(void)
+{
+    int testcolor = COLOR_WHITE;
+    return 0;
+}],
+	AC_DEFINE(NEED_XOPEN_SOURCE_EXTENDED, 1, [Define this if you need the _XOPEN_SOURCE_EXTENDED macro for color support])
+	AC_MSG_RESULT(yes),
+	AC_MSG_RESULT(not sure)
+	AC_MSG_WARN([*** Couldn't successfully compile basic color test with or without _XOPEN_SOURCE_EXTENDED])
+	AC_MSG_WARN([*** This build may not compile. Consider configuring with --disable-color or installing ncurses])),
+	AC_MSG_WARN([*** Can't check need for _XOPEN_SOURCE_EXTENDED when cross-compiling]))
+    fi
+#fi
+
+# Check for groff html support
+AC_MSG_CHECKING([for HTML support in groff])
+groff -t -mandoc -Thtml </dev/null >/dev/null
+if test $? -ne 0 ; then 
+    echo "no"
+    echo "*** Will not generate HTML version of man pages  ***"
+    echo "*** Consider installing a newer version of groff with HTML support ***"
+    groff_html_support=no
+else
+    echo "yes"
+    groff_html_support=yes
+fi
+AM_CONDITIONAL(GROFF_HTML, test x$groff_html_support = xyes)
+
+
 AC_CONFIG_FILES([
 Makefile
 doc/Makefile

doc/man/Makefile.am

@@ -6,20 +6,30 @@ endif
 
 if USE_NANORC
 man_MANS = nano.1 nanorc.5 rnano.1
+if GROFF_HTML
 BUILT_SOURCES = nano.1.html nanorc.5.html rnano.1.html
+endif
 else
 man_MANS = nano.1 rnano.1
+if GROFF_HTML
 BUILT_SOURCES = nano.1.html rnano.1.html
 endif
+endif
 
 nano_man_mans = nano.1 nanorc.5 rnano.1
+if GROFF_HTML
+htmlman_DATA = nano.1.html nanorc.5.html rnano.1.html
+htmlmandir = $(datadir)/nano/man-html
 nano_built_sources = nano.1.html nanorc.5.html rnano.1.html
 
 nano.1.html: nano.1
-	groff -t -mandoc -Thtml < $< > $@
+	groff -t -mandoc -Thtml < $? > $@
 nanorc.5.html: nanorc.5
-	groff -t -mandoc -Thtml < $< > $@
+	groff -t -mandoc -Thtml < $? > $@
 rnano.1.html: rnano.1
-	groff -t -mandoc -Thtml < $< > $@
+	groff -t -mandoc -Thtml < $? > $@
 
 EXTRA_DIST = $(nano_man_mans) $(nano_built_sources)
+else 
+EXTRA_DIST = $(nano_man_mans)
+endif

doc/man/fr/Makefile.am

@@ -2,20 +2,32 @@ mandir = @mandir@/fr
 
 if USE_NANORC
 man_MANS = nano.1 nanorc.5 rnano.1
+if GROFF_HTML
 BUILT_SOURCES = nano.1.html nanorc.5.html rnano.1.html
+endif
 else
 man_MANS = nano.1 rnano.1
+if GROFF_HTML
 BUILT_SOURCES = nano.1.html rnano.1.html
 endif
+endif
 
 nano_man_mans = nano.1 nanorc.5 rnano.1
+if GROFF_HTML
+htmlman_DATA = nano.1.html nanorc.5.html rnano.1.html
+htmlmandir = $(datadir)/nano/man-html/fr
+
 nano_built_sources = nano.1.html nanorc.5.html rnano.1.html
 
 nano.1.html: nano.1
-	groff -t -mandoc -Thtml < $< > $@
+	groff -t -mandoc -Thtml < $? > $@
 nanorc.5.html: nanorc.5
-	groff -t -mandoc -Thtml < $< > $@
+	groff -t -mandoc -Thtml < $? > $@
 rnano.1.html: rnano.1
-	groff -t -mandoc -Thtml < $< > $@
+	groff -t -mandoc -Thtml < $? > $@
 
 EXTRA_DIST = $(nano_man_mans) $(nano_built_sources)
+else
+EXTRA_DIST = $(nano_man_mans)
+endif
+

doc/man/nano.1

@@ -172,6 +172,10 @@ chroot.
 Preserve the XON and XOFF sequences (^Q and ^S) so they will be caught
 by the terminal.
 .TP
+.B \-q (\-\-quiet)
+Do not report errors in the nanorc file and ask them to
+be acknowledged by pressing enter at startup.
+.TP
 .B \-r \fIcols\fP (\-\-fill=\fIcols\fP)
 Wrap lines at column \fIcols\fP.  If this value is 0 or less, wrapping
 will occur at the width of the screen less \fIcols\fP columns, allowing
@@ -185,6 +189,10 @@ Enable alternative spell checker command.
 Always save changed buffer without prompting.  Same as Pico's \fB-t\fP
 option.
 .TP
+.B \-u (\-\-undo)
+Enable experimental generic-purpose undo code.  By default, the undo and redo
+shortcuts are Meta-U and Meta-E, respectively.
+.TP
 .B \-v (\-\-view)
 View file (read only) mode.
 .TP

doc/man/nanorc.5

@@ -145,6 +145,11 @@ paragraphs.  They cannot contain blank characters.  Only closing
 punctuation, optionally followed by closing brackets, can end sentences.
 The default value is "\fI!.?\fP".
 .TP
+.B set/unset quiet
+\fBnano\fP will not report errors in the nanorc file and ask them to 
+be acknowledged by pressing enter at startup.  If this is used it should
+be placed at the top of the file to be fully effective.
+.TP
 .B set/unset quickblank
 Do quick statusbar blanking.  Statusbar messages will disappear after 1
 keystroke instead of 25.
@@ -197,6 +202,9 @@ Convert typed tabs to spaces.
 .B set/unset tempfile
 Save automatically on exit, don't prompt.
 .TP
+.B set/unset undo
+Enable experimental generic-purpose undo code.
+.TP
 .B set/unset view
 Disallow file modification.
 .TP
@@ -399,8 +407,8 @@ Refresh the screen.
 .B undo
 Undo the text action peformed (add text, delete text, etc).
 .TP
-.B suspend
-Redo the last action which was undone.
+.B redo
+"Re-do" the last undone action (i.e. undo an undo)
 .TP
 .B suspend
 Suspend the editor (if the suspend function is enabled, see the 

doc/syntax/gentoo.nanorc

@@ -2,26 +2,30 @@
 ##
 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))"
+color brightgreen "^src_(unpack|prepare|configure|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 "\<(declare|eval|exec|let)\>"
 color green "(\{|\}|\(|\)|\;|\]|\[|`|\\|\$|<|>|!|=|&|\|)"
-color green "-(e|d|f|r|g|u|w|x|L)\>"
+color green "-[edfgruwxL]\>"
 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)\>"
+color red "\<(EAPI|ARCH|HOMEPAGE|DESCRIPTION|IUSE|SRC_URI|LICENSE|SLOT|KEYWORDS|(P|R)?DEPEND|PROVIDE|PROPERTIES|RESTRICT|USERLAND)\>"
+color red "\<(S|D|T|PV|PF|P|PN|PR|PVR|A|CATEGORY|DISTDIR|FILESDIR|ROOT|WORKDIR)\>" "\<(AS|C(PP|XX)?|LD)FLAGS\>" "\<C(HOST|TARGET|BUILD)\>"
+color red "\<QA_((TEXTRELS|EXECSTACK|WX_LOAD)(_[a-zA-Z_0-9]+)?|DT_HASH|PRESTRIPPED)\>" "\<WANT_AUTO(CONF|MAKE)\>" "\<AT_M4DIR\>"
 ## 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 "\<e(begin|end|conf|install|make|qmake[34]|ant|(qa)?warn|infon?|error|log|patch|new(group|user))\>"
+color brightblue "\<e(pause|beep|mktemp|(cvs|svn)_clean|punt_cxx)\>" "\<e(aclocal|auto(reconf|header|conf|make))\>"
+color brightblue "\<built_with_use\>" "\<make_desktop_entry\>" "\<unpack(_(makeself|pdv))?\>"
+color brightblue "\<die\>" "\<use(_(with|enable))?\>" "\<inherit\>" "\<has\>" "\<(has|best)_version\>"
+color brightblue "\<(do|new)(ins|(games)?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\>"
+color brightblue "prepall(|docs|info|man|strip)" "prep(info|lib|lib\.(so|a)|man|strip|gamesdirs)"
+color brightblue "\<(|doc|ins|exe)into\>" "\<(f|games)(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)\>"
+color blue "\<make\>" "\<(awk|cat|cd|chmod|chown|cp|echo|env|export|find|e?grep|ln|mkdir|mv|rm|sed|set|tar|touch|unset|xargs)\>"
 ## Highlight comments (doesnt work that well)
 color yellow "#.*$"
 ## Highlight strings (doesnt work that well)
@@ -31,17 +35,18 @@ color ,green "[[:space:]]+$"
 
 ## Here is an example for Portage control files
 ##
-syntax "/etc/portage" "\.(keywords|mask|unmask|use)$"
+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:
+## Likely version and slot numbers:
 color magenta "-[[:digit:]].*([[:space:]]|$)"
+color magenta ":[^[:space:]]+([[:space:]]|$)"
 ## Accepted arches:
-color white "[~-]?\<(alpha|amd64|arm|hppa|ia64|mips|ppc|ppc64|s390|sh|sparc|x86|x86-fbsd)\>"
-color white "[[:space:]][~-]?\*"
+color white "[~-]?\<(alpha|amd64|arm|hppa|ia64|mips|ppc|ppc64|s390|sh|sparc(-fbsd)?|x86(-fbsd)?)\>"
+color white "[[:space:]][*~-]?\*"
 ## Categories:
 color cyan "^[[:space:]]*.*/"
 ## Masking regulators:

nano-regress

@@ -8,7 +8,7 @@ sub 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 @allargs=("--enable-debug", "--disable-justify", "--disable-extra", "--enable-tiny", "--disable-browser --disable-help --disable-mouse --disable-operatingdir --disable-speller", "--disable-multibuffer", "--disable-nanorc", "--with-slang");
 my @combos =  combinations(@allargs);
 
 my $i = 0;
@@ -16,9 +16,11 @@ 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") {
+    my $cmd = "./configure @args && make clean all";
+    system("($cmd) >/dev/null 2>&1");
+    if ($? != 0)  {
 	print "Build failed for args: @args\n";
-	print "Try running make to reproduce\n";
+	print "To reproduce, run:\n $cmd\n";
 	exit(1);
     }
     $i++;

src/browser.c

@@ -156,7 +156,7 @@ char *do_browser(char *path, DIR *dir)
 			 * time, put back the Enter key so that it's
 			 * read in. */
 			if (old_selected == selected)
-			    unget_kbinput(sc_seq_or(do_enter, 0), FALSE, FALSE);
+			    unget_kbinput(sc_seq_or(DO_ENTER, 0), FALSE, FALSE);
 		    }
 	}
 #endif /* !DISABLE_MOUSE */
@@ -169,9 +169,9 @@ char *do_browser(char *path, DIR *dir)
         if (!f)
             break;
 
-	if (f->scfunc == total_refresh) {
+	if (f->scfunc == TOTAL_REFRESH) {
 		total_redraw();
-	} else if (f->scfunc == do_help_void) {
+	} else if (f->scfunc == DO_HELP_VOID) {
 #ifndef DISABLE_HELP
 	    do_browser_help();
 	    curs_set(0);
@@ -179,33 +179,33 @@ char *do_browser(char *path, DIR *dir)
 		nano_disabled_msg();
 #endif
 	    /* Search for a filename. */
-	} else if (f->scfunc == do_search) {
+	} else if (f->scfunc == DO_SEARCH) {
 		curs_set(1);
 		do_filesearch();
 		curs_set(0);
 	    /* Search for another filename. */
-	} else if (f->scfunc == (void *) whereis_next_msg) {
+	} else if (f->scfunc ==  WHEREIS_NEXT_MSG) {
 		do_fileresearch();
-	} else if (f->scfunc == do_page_up) {
+	} else if (f->scfunc == DO_PAGE_UP) {
 		if (selected >= (editwinrows + fileline % editwinrows) *
 			width)
 		    selected -= (editwinrows + fileline % editwinrows) *
 			width;
 		else
 		    selected = 0;
-	} else if (f->scfunc == do_page_down) {
+	} else if (f->scfunc == DO_PAGE_DOWN) {
 		selected += (editwinrows - fileline % editwinrows) *
 			width;
 		if (selected > filelist_len - 1)
 		    selected = filelist_len - 1;
-	} else if (f->scfunc == (void *) first_file_msg) {
+	} else if (f->scfunc ==  FIRST_FILE_MSG) {
 		if (meta_key)
 		    selected = 0;
-	} else if (f->scfunc == (void *) last_file_msg) {
+	} else if (f->scfunc ==  LAST_FILE_MSG) {
 		if (meta_key)
 		    selected = filelist_len - 1;
 	    /* Go to a specific directory. */
-	} else if (f->scfunc == (void *) goto_dir_msg) {
+	} else if (f->scfunc ==  GOTO_DIR_MSG) {
 		curs_set(1);
 
 		i = do_prompt(TRUE,
@@ -238,7 +238,7 @@ char *do_browser(char *path, DIR *dir)
 		     * answer in ans, so that the file list is displayed
 		     * again, the prompt is displayed again, and what we
 		     * typed before at the prompt is displayed again. */
-		    unget_kbinput(sc_seq_or(do_gotolinecolumn_void, 0), FALSE, FALSE);
+		    unget_kbinput(sc_seq_or(DO_GOTOLINECOLUMN_VOID, 0), FALSE, FALSE);
 		    ans = mallocstrcpy(ans, answer);
 		    break;
 		}
@@ -285,19 +285,19 @@ char *do_browser(char *path, DIR *dir)
 		free(path);
 		path = new_path;
 		goto change_browser_directory;
-	} else if (f->scfunc == do_up_void) {
+	} else if (f->scfunc == DO_UP_VOID) {
 		if (selected >= width)
 		    selected -= width;
-	} else if (f->scfunc == do_left) {
+	} else if (f->scfunc == DO_LEFT) {
 		if (selected > 0)
 		    selected--;
-	} else if (f->scfunc == do_down_void) {
+	} else if (f->scfunc == DO_DOWN_VOID) {
 		if (selected + width <= filelist_len - 1)
 		    selected += width;
-	} else if (f->scfunc == do_right) {
+	} else if (f->scfunc == DO_RIGHT) {
 		if (selected < filelist_len - 1)
 		    selected++;
-	} else if (f->scfunc == do_enter) {
+	} else if (f->scfunc == DO_ENTER) {
 		/* We can't move up from "/". */
 		if (strcmp(filelist[selected], "/..") == 0) {
 		    statusbar(_("Can't move up a directory"));
@@ -355,7 +355,7 @@ char *do_browser(char *path, DIR *dir)
 		/* Start over again with the new path value. */
 		goto change_browser_directory;
 	    /* Abort the file browser. */
-	} else if (f->scfunc == do_exit) {
+	} else if (f->scfunc == DO_EXIT) {
 		abort = TRUE;
 	}
     }
@@ -552,32 +552,32 @@ void parse_browser_input(int *kbinput, bool *meta_key, bool *func_key)
     if (!*meta_key) {
 	switch (*kbinput) {
 	    case ' ':
-		*kbinput = sc_seq_or(do_page_down, 0);
+		*kbinput = sc_seq_or(DO_PAGE_DOWN, 0);
 		break;
 	    case '-':
-		*kbinput = sc_seq_or(do_page_up, 0);
+		*kbinput = sc_seq_or(DO_PAGE_UP, 0);
 		break;
 	    case '?':
 #ifndef DISABLE_HELP
-		*kbinput = sc_seq_or(do_help_void, 0);
+		*kbinput = sc_seq_or(DO_HELP_VOID, 0);
 #endif
 		break;
 	    /* Cancel equivalent to Exit here. */
 	    case 'E':
 	    case 'e':
-		*kbinput = sc_seq_or(do_exit, 0);
+		*kbinput = sc_seq_or(DO_EXIT, 0);
 		break;
 	    case 'G':
 	    case 'g':
-		*kbinput = sc_seq_or((void *) goto_dir_msg, 0);
+		*kbinput = sc_seq_or(GOTO_DIR_MSG, 0);
 		break;
 	    case 'S':
 	    case 's':
-		*kbinput = sc_seq_or(do_enter, 0);
+		*kbinput = sc_seq_or(DO_ENTER, 0);
 		break;
 	    case 'W':
 	    case 'w':
-		*kbinput = sc_seq_or(do_search, 0);
+		*kbinput = sc_seq_or(DO_SEARCH, 0);
 		break;
 	}
     }
@@ -841,18 +841,18 @@ int filesearch_init(void)
 #endif
 	} else
 #ifndef NANO_TINY
-	if (s && s->scfunc == (void *) case_sens_msg) {
+	if (s && s->scfunc == CASE_SENS_MSG) {
 		TOGGLE(CASE_SENSITIVE);
 		backupstring = mallocstrcpy(backupstring, answer);
 		return 1;
-	} else if (s && s->scfunc == (void *) backwards_msg) {
+	} else if (s && s->scfunc == BACKWARDS_MSG) {
 		TOGGLE(BACKWARDS_SEARCH);
 		backupstring = mallocstrcpy(backupstring, answer);
 		return 1;
 	} else
 #endif
 #ifdef HAVE_REGEX_H
-	if (s && s->scfunc == (void *) regexp_msg) {
+	if (s && s->scfunc ==  REGEXP_MSG) {
 		TOGGLE(USE_REGEXP);
 		backupstring = mallocstrcpy(backupstring, answer);
 		return 1;

src/color.c

@@ -105,11 +105,13 @@ void color_init(void)
 /* Update the color information based on the current filename. */
 void color_update(void)
 {
-    const syntaxtype *tmpsyntax;
+    syntaxtype *tmpsyntax;
+    syntaxtype *defsyntax = NULL;
     colortype *tmpcolor, *defcolor = NULL;
 
     assert(openfile != NULL);
 
+    openfile->syntax = NULL;
     openfile->colorstrings = NULL;
 
     /* If we specified a syntax override string, use it. */
@@ -121,8 +123,10 @@ void color_update(void)
 
 	for (tmpsyntax = syntaxes; tmpsyntax != NULL;
 		tmpsyntax = tmpsyntax->next) {
-	    if (strcmp(tmpsyntax->desc, syntaxstr) == 0)
+	    if (strcmp(tmpsyntax->desc, syntaxstr) == 0) {
+		openfile->syntax = tmpsyntax;
 		openfile->colorstrings = tmpsyntax->color;
+	    }
 
 	    if (openfile->colorstrings != NULL)
 		break;
@@ -141,6 +145,7 @@ void color_update(void)
 	     * extensions, which we've checked for elsewhere.  Skip over
 	     * it here, but keep track of its color regexes. */
 	    if (strcmp(tmpsyntax->desc, "default") == 0) {
+		defsyntax = tmpsyntax;
 		defcolor = tmpsyntax->color;
 		continue;
 	    }
@@ -159,8 +164,10 @@ void color_update(void)
 		/* Set colorstrings if we matched the extension
 		 * regex. */
 		if (regexec(e->ext, openfile->filename, 0, NULL,
-			0) == 0)
+			0) == 0) {
+		    openfile->syntax = tmpsyntax;
 		    openfile->colorstrings = tmpsyntax->color;
+		}
 
 		if (openfile->colorstrings != NULL)
 		    break;
@@ -200,8 +207,10 @@ void color_update(void)
 #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)
+		    if (regexec(e->ext, openfile->fileage->data, 0, NULL, 0) == 0) {
+			openfile->syntax = tmpsyntax;
 			openfile->colorstrings = tmpsyntax->color;
+		    }
 
 		    if (openfile->colorstrings != NULL)
 			break;
@@ -221,8 +230,10 @@ void color_update(void)
 
     /* 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)
+    if (openfile->colorstrings == NULL && defcolor != NULL) {
+	openfile->syntax = defsyntax;
 	openfile->colorstrings = defcolor;
+    }
 
     for (tmpcolor = openfile->colorstrings; tmpcolor != NULL;
 	tmpcolor = tmpcolor->next) {
@@ -243,4 +254,107 @@ void color_update(void)
     }
 }
 
+/* Reset the multicolor info cache for records for any lines which need
+   to be recalculated */
+void reset_multis_after(filestruct *fileptr, int mindex)
+{
+    filestruct *oof;
+    for (oof = fileptr->next; oof != NULL; oof = oof->next) {
+	alloc_multidata_if_needed(oof);
+	if (oof->multidata == NULL)
+	    continue;
+	if (oof->multidata[mindex] != CNONE)
+	    oof->multidata[mindex] = -1;
+	else
+	    break;
+    }
+    for (; oof != NULL; oof = oof->next) {
+	alloc_multidata_if_needed(oof);
+	if (oof->multidata == NULL)
+	    continue;
+	if (oof->multidata[mindex] == CNONE)
+	    oof->multidata[mindex] = -1;
+	else
+	    break;
+    }
+    edit_refresh_needed = TRUE;
+}
+
+void reset_multis_before(filestruct *fileptr, int mindex)
+{
+    filestruct *oof;
+    for (oof = fileptr->prev; oof != NULL; oof = oof->prev) {
+	alloc_multidata_if_needed(oof);
+	if (oof->multidata == NULL)
+	    continue;
+	if (oof->multidata[mindex] != CNONE)
+	    oof->multidata[mindex] = -1;
+	else
+	    break;
+    }
+    for (; oof != NULL; oof = oof->prev) {
+	alloc_multidata_if_needed(oof);
+	if (oof->multidata == NULL)
+	    continue;
+	if (oof->multidata[mindex] == CNONE)
+	    oof->multidata[mindex] = -1;
+	else
+	    break;
+    }
+
+    edit_refresh_needed = TRUE;
+}
+
+/* Reset one multiline regex info */
+void reset_multis_for_id(filestruct *fileptr, int num)
+{
+    reset_multis_before(fileptr, num);
+    reset_multis_after(fileptr, num);
+    fileptr->multidata[num] = -1;
+}
+
+/* Reset multi line strings around a filestruct ptr, trying to be smart about stopping
+   force = reset everything regardless, useful when we don't know how much screen state
+           has changed  */
+void reset_multis(filestruct *fileptr, bool force)
+{
+    int nobegin, noend;
+    regmatch_t startmatch, endmatch;
+    const colortype *tmpcolor = openfile->colorstrings;
+
+    if (!openfile->syntax)
+	return;
+
+    for (; tmpcolor != NULL; tmpcolor = tmpcolor->next) {
+
+	/* If it's not a multi-line regex, amscray */
+	if (tmpcolor->end == NULL)
+	    continue;
+
+	alloc_multidata_if_needed(fileptr);
+	if (force == TRUE) {
+	    reset_multis_for_id(fileptr, tmpcolor->id);
+	    continue;
+	}
+
+	/* Figure out where the first begin and end are to determine if
+	   things changed drastically for the precalculated multi values */
+        nobegin = regexec(tmpcolor->start, fileptr->data, 1, &startmatch, 0);
+        noend = regexec(tmpcolor->end, fileptr->data, 1, &endmatch, 0);
+	if (fileptr->multidata[tmpcolor->id] ==  CWHOLELINE) {
+	    if (nobegin && noend)
+		continue;
+	} else if (fileptr->multidata[tmpcolor->id] == CNONE) {
+	    if (nobegin && noend)
+		continue;
+	}  else if (fileptr->multidata[tmpcolor->id] & CBEGINBEFORE && !noend
+	  && (nobegin || endmatch.rm_eo > startmatch.rm_eo)) {
+	    reset_multis_after(fileptr, tmpcolor->id);
+	    continue;
+	}
+
+	/* If we got here assume the worst */
+	reset_multis_for_id(fileptr, tmpcolor->id);
+    }
+}
 #endif /* ENABLE_COLOR */

src/cut.c

@@ -211,9 +211,12 @@ void do_cut_text(
 	 * modified. */
 	set_modified();
 
-
     /* Update the screen. */
-    edit_refresh();
+    edit_refresh_needed = TRUE;
+
+#ifdef ENABLE_COLOR
+    reset_multis(openfile->current, FALSE);
+#endif
 
 #ifdef DEBUG
     dump_filestruct(cutbuffer);
@@ -245,7 +248,7 @@ void do_copy_text(void)
 void do_cut_till_end(void)
 {
 #ifndef NANO_TINY
-    add_undo(CUTTOEND);
+    add_undo(CUT);
 #endif
     do_cut_text(FALSE, TRUE, FALSE);
 }
@@ -276,7 +279,11 @@ void do_uncut_text(void)
     set_modified();
 
     /* Update the screen. */
-    edit_refresh();
+    edit_refresh_needed = TRUE;
+
+#ifdef ENABLE_COLOR
+    reset_multis(openfile->current, FALSE);
+#endif
 
 #ifdef DEBUG
     dump_filestruct_reverse();

src/files.c

@@ -96,6 +96,10 @@ void initialize_buffer_text(void)
     openfile->edittop = openfile->fileage;
     openfile->current = openfile->fileage;
 
+#ifdef ENABLE_COLOR
+    openfile->fileage->multidata = NULL;
+#endif
+
     openfile->totsize = 0;
 }
 
@@ -311,6 +315,10 @@ filestruct *read_line(char *buf, filestruct *prevnode, bool
 	fileptr->data[buf_len - 1] = '\0';
 #endif
 
+#ifdef ENABLE_COLOR
+	fileptr->multidata = NULL;
+#endif
+
     if (*first_line_ins) {
 	/* Special case: We're inserting with the cursor on the first
 	 * line. */
@@ -600,7 +608,7 @@ void read_file(FILE *f, const char *filename, bool undoable)
  * return value.  *f is set to the opened file. */
 int open_file(const char *filename, bool newfie, FILE **f)
 {
-    struct stat fileinfo;
+    struct stat fileinfo, fileinfo2;
     int fd;
     char *full_filename;
 
@@ -609,10 +617,21 @@ int open_file(const char *filename, bool newfie, FILE **f)
     /* Get the specified file's full path. */
     full_filename = get_full_path(filename);
 
-    if (full_filename == NULL)
+    /* Okay, if we can't stat the path due to a component's
+       permissions, just try the relative one */
+    if (full_filename == NULL 
+	|| (stat(full_filename, &fileinfo) == -1 && stat(filename, &fileinfo2) != -1))
 	full_filename = mallocstrcpy(NULL, filename);
 
     if (stat(full_filename, &fileinfo) == -1) {
+	/* Well, maybe we can open the file even if the OS
+	   says its not there */
+        if ((fd = open(filename, O_RDONLY)) != -1) {
+	    statusbar(_("Reading File"));
+	    free(full_filename);
+	    return 0;
+	}
+
 	if (newfie) {
 	    statusbar(_("New File"));
 	    return -2;
@@ -780,14 +799,14 @@ void do_insertfile(
 #ifndef NANO_TINY
 #ifdef ENABLE_MULTIBUFFER
 
-	    if (s && s->scfunc == (void *) new_buffer_msg) {
+	    if (s && s->scfunc == NEW_BUFFER_MSG) {
 		/* Don't allow toggling if we're in view mode. */
 		if (!ISSET(VIEW_MODE))
 		    TOGGLE(MULTIBUFFER);
 		continue;
 	    } else
 #endif
-	    if (s && s->scfunc == (void *) ext_cmd_msg) {
+	    if (s && s->scfunc == EXT_CMD_MSG) {
 		execute = !execute;
 		continue;
 	    }
@@ -797,7 +816,7 @@ void do_insertfile(
 #endif /* !NANO_TINY */
 
 #ifndef DISABLE_BROWSER
-	    if (s && s->scfunc == (void *) to_files_msg) {
+	    if (s && s->scfunc == TO_FILES_MSG) {
 		char *tmp = do_browse_from(answer);
 
 		if (tmp == NULL)
@@ -1917,7 +1936,7 @@ bool do_writeout(bool exiting)
             s = get_shortcut(currmenu, &i, &meta_key, &func_key);
 
 #ifndef DISABLE_BROWSER
-	    if (s && s->scfunc == (void *) to_files_msg) {
+	    if (s && s->scfunc == TO_FILES_MSG) {
 		char *tmp = do_browse_from(answer);
 
 		if (tmp == NULL)
@@ -1929,26 +1948,26 @@ bool do_writeout(bool exiting)
 	    } else
 #endif /* !DISABLE_BROWSER */
 #ifndef NANO_TINY
-	    if (s && s->scfunc == (void *) dos_format_msg) {
+	    if (s && s->scfunc ==  DOS_FORMAT_MSG) {
 		openfile->fmt = (openfile->fmt == DOS_FILE) ? NIX_FILE :
 			DOS_FILE;
 		continue;
-	    } else if (s && s->scfunc == (void *) mac_format_msg) {
+	    } else if (s && s->scfunc ==  MAC_FORMAT_MSG) {
 		openfile->fmt = (openfile->fmt == MAC_FILE) ? NIX_FILE :
 			MAC_FILE;
 		continue;
-	    } else if (s && s->scfunc == (void *) backup_file_msg) {
+	    } else if (s && s->scfunc ==  BACKUP_FILE_MSG) {
 		TOGGLE(BACKUP_FILE);
 		continue;
 	    } else
 #endif /* !NANO_TINY */
-	    if (s && s->scfunc == (void *) prepend_msg) {
+	    if (s && s->scfunc ==  PREPEND_MSG) {
 		append = (append == PREPEND) ? OVERWRITE : PREPEND;
 		continue;
-	    } else if (s && s->scfunc == (void *) append_msg) {
+	    } else if (s && s->scfunc ==  APPEND_MSG) {
 		append = (append == APPEND) ? OVERWRITE : APPEND;
 		continue;
-	    } else if (s && s->scfunc == do_help_void) {
+	    } else if (s && s->scfunc == DO_HELP_VOID) {
 		continue;
 	    }
 
@@ -2028,6 +2047,15 @@ bool do_writeout(bool exiting)
 			    continue;
 		    }
 		}
+#ifndef NANO_TINY
+		if (openfile->current_stat && openfile->current_stat->st_mtime < st.st_mtime) {
+		    i = do_yesno_prompt(FALSE,
+			_("File was modified since you opened it, continue saving ? "));
+		    if (i == 0 || i == -1)
+			continue;
+		}
+#endif
+
 	    }
 
 	    /* Convert newlines to nulls, just before we save the

src/help.c

@@ -145,35 +145,35 @@ void do_help(void (*refresh_func)(void))
 	if (!f)
 	    continue;
 
-	  if (f->scfunc == total_refresh) {
+	  if (f->scfunc == TOTAL_REFRESH) {
 		total_redraw();
 		break;
-	} else if (f->scfunc == do_page_up) {
+	} else if (f->scfunc == DO_PAGE_UP) {
 		if (line > editwinrows - 2)
 		    line -= editwinrows - 2;
 		else
 		    line = 0;
-	} else if (f->scfunc == do_page_down) {
+	} else if (f->scfunc == DO_PAGE_DOWN) {
 		if (line + (editwinrows - 1) < last_line)
 		    line += editwinrows - 2;
-	} else if (f->scfunc == do_up_void) {
+	} else if (f->scfunc == DO_UP_VOID) {
 		if (line > 0)
 		    line--;
-	} else if (f->scfunc == do_down_void) {
+	} else if (f->scfunc == DO_DOWN_VOID) {
 		if (line + (editwinrows - 1) < last_line)
 		    line++;
-	} else if (f->scfunc == do_first_line) {
+	} else if (f->scfunc == DO_FIRST_LINE) {
 		if (meta_key)
 		    line = 0;
 		break;
-	} else if (f->scfunc == do_last_line) {
+	} else if (f->scfunc == DO_LAST_LINE) {
 		if (meta_key) {
 		    if (line + (editwinrows - 1) < last_line)
 			line = last_line - (editwinrows - 1);
 		}
 		break;
 	    /* Abort the help browser. */
-	} else if (f->scfunc == do_exit) {
+	} else if (f->scfunc == DO_EXIT) {
 		abort = TRUE;
 		break;
 	}
@@ -407,7 +407,7 @@ void help_init(void)
 	size_t endis_len = strlen(_("enable/disable"));
 
 	for (s = sclist; s != NULL; s = s->next)
-            if (s->scfunc == (void *) do_toggle)
+            if (s->scfunc ==  DO_TOGGLE)
 		allocsize += strlen(_(flagtostr(s->toggle))) + endis_len + 9;
 
     }
@@ -478,7 +478,7 @@ void help_init(void)
     /* And the toggles... */
     if (currmenu == MMAIN)
         for (s = sclist; s != NULL; s = s->next)
-            if (s->scfunc == (void *) do_toggle)
+            if (s->scfunc ==  DO_TOGGLE)
 		ptr += sprintf(ptr, "(%s)\t\t\t%s %s\n",
 		    s->keystr, _(flagtostr(s->toggle)), _("enable/disable"));
 
@@ -507,15 +507,15 @@ void parse_help_input(int *kbinput, bool *meta_key, bool *func_key)
 	switch (*kbinput) {
 	    /* For consistency with the file browser. */
 	    case ' ':
-		*kbinput = sc_seq_or(do_page_up, 0);
+		*kbinput = sc_seq_or(DO_PAGE_UP, 0);
 		break;
 	    case '-':
-		*kbinput = sc_seq_or(do_page_down, 0);;
+		*kbinput = sc_seq_or(DO_PAGE_DOWN, 0);;
 		break;
 	    /* Cancel is equivalent to Exit here. */
 	    case 'E':
 	    case 'e':
-		*kbinput = sc_seq_or(do_exit, 0);;
+		*kbinput = sc_seq_or(DO_EXIT, 0);;
 		break;
 	}
     }

src/move.c

@@ -29,7 +29,7 @@
 /* Move to the first line of the file. */
 void do_first_line(void)
 {
-    const filestruct *current_save = openfile->current;
+    filestruct *current_save = openfile->current;
     size_t pww_save = openfile->placewewant;
 
     openfile->current = openfile->fileage;
@@ -42,7 +42,7 @@ void do_first_line(void)
 /* Move to the last line of the file. */
 void do_last_line(void)
 {
-    const filestruct *current_save = openfile->current;
+    filestruct *current_save = openfile->current;
     size_t pww_save = openfile->placewewant;
 
     openfile->current = openfile->filebot;
@@ -130,7 +130,7 @@ void do_page_down(void)
  * afterwards. */
 void do_para_begin(bool allow_update)
 {
-    const filestruct *current_save = openfile->current;
+    filestruct *current_save = openfile->current;
     const size_t pww_save = openfile->placewewant;
 
     if (openfile->current != openfile->fileage) {
@@ -162,7 +162,7 @@ void do_para_begin_void(void)
  * paragraph or isn't in a paragraph. */
 void do_para_end(bool allow_update)
 {
-    const filestruct *const current_save = openfile->current;
+    filestruct *const current_save = openfile->current;
     const size_t pww_save = openfile->placewewant;
 
     while (openfile->current != openfile->filebot &&
@@ -206,7 +206,7 @@ void do_para_end_void(void)
 bool do_next_word(bool allow_punct, bool allow_update)
 {
     size_t pww_save = openfile->placewewant;
-    const filestruct *current_save = openfile->current;
+    filestruct *current_save = openfile->current;
     char *char_mb;
     int char_mb_len;
     bool end_line = FALSE, started_on_word = FALSE;
@@ -301,7 +301,7 @@ void do_next_word_void(void)
 bool do_prev_word(bool allow_punct, bool allow_update)
 {
     size_t pww_save = openfile->placewewant;
-    const filestruct *current_save = openfile->current;
+    filestruct *current_save = openfile->current;
     char *char_mb;
     int char_mb_len;
     bool begin_line = FALSE, started_on_word = FALSE;

src/nano.c

@@ -32,6 +32,7 @@
 #include <errno.h>
 #include <ctype.h>
 #include <locale.h>
+#include <time.h>
 #ifdef ENABLE_UTF8
 #include <langinfo.h>
 #endif
@@ -67,6 +68,10 @@ filestruct *make_new_node(filestruct *prevnode)
     newnode->next = NULL;
     newnode->lineno = (prevnode != NULL) ? prevnode->lineno + 1 : 1;
 
+#ifdef ENABLE_COLOR
+    newnode->multidata = NULL;
+#endif
+
     return newnode;
 }
 
@@ -83,6 +88,9 @@ filestruct *copy_node(const filestruct *src)
     dst->next = src->next;
     dst->prev = src->prev;
     dst->lineno = src->lineno;
+#ifdef ENABLE_COLOR
+    dst->multidata = NULL;
+#endif
 
     return dst;
 }
@@ -119,6 +127,11 @@ void delete_node(filestruct *fileptr)
     if (fileptr->data != NULL)
 	free(fileptr->data);
 
+#ifdef ENABLE_COLOR
+    if (fileptr->multidata)
+	free(fileptr->multidata);
+#endif
+
     free(fileptr);
 }
 
@@ -356,6 +369,10 @@ void move_to_filestruct(filestruct **file_top, filestruct **file_bot,
     openfile->fileage->data = mallocstrcpy(NULL, "");
     openfile->filebot = openfile->fileage;
 
+#ifdef ENABLE_COLOR
+    openfile->fileage->multidata = NULL;
+#endif
+
     /* Restore the current line and cursor position.  If the mark begins
      * inside the partition, set the beginning of the mark to where the
      * saved text used to start. */
@@ -862,6 +879,8 @@ void usage(void)
 #endif
     print_opt("-p", "--preserve",
 	N_("Preserve XON (^Q) and XOFF (^S) keys"));
+    print_opt("-q", "--quiet",
+	N_("Silently ignore startup issues like rc file errors"));
 #ifndef DISABLE_WRAPJUSTIFY
     print_opt(_("-r <#cols>"), _("--fill=<#cols>"),
 	N_("Set wrapping point at column #cols"));
@@ -872,6 +891,10 @@ void usage(void)
 #endif
     print_opt("-t", "--tempfile",
 	N_("Auto save on exit, don't prompt"));
+#ifndef NANO_TINY
+    print_opt("-u", "--undo", N_("Allow generic undo [EXPERIMENTAL]"));
+#endif
+
     print_opt("-v", "--view", N_("View mode (read-only)"));
 #ifndef DISABLE_WRAPPING
     print_opt("-w", "--nowrap", N_("Don't wrap long lines"));
@@ -1019,6 +1042,75 @@ void do_exit(void)
     display_main_list();
 }
 
+
+
+static struct sigaction pager_oldaction, pager_newaction;  /* Original and temporary handlers for SIGINT. */
+static bool pager_sig_failed = FALSE; /* Did sigaction() fail without changing the signal handlers? */
+
+/* Things which need to be run regardless of whether
+   we finished the stdin pipe correctly or not */
+void finish_stdin_pager(void)
+{
+    FILE *f;
+    int ttystdin;
+
+    /* Read whatever we did get from stdin */
+    f = fopen("/dev/stdin", "rb");
+       if (f == NULL)
+        nperror("fopen");
+
+    read_file(f, "stdin", TRUE);
+    ttystdin = open("/dev/tty", O_RDONLY);
+    if (!ttystdin)
+        die(_("Couldn't reopen stdin from keyboard, sorry\n"));
+
+    dup2(ttystdin,0);
+    close(ttystdin);
+    tcgetattr(0, &oldterm);
+    if (!pager_sig_failed && sigaction(SIGINT, &pager_oldaction, NULL) == -1)
+        nperror("sigaction");
+    terminal_init();
+    doupdate();
+}
+
+
+/* Cancel reading from stdin like a pager */
+RETSIGTYPE cancel_stdin_pager(int signal)
+{
+    /* Currently do nothing, just handle the intr silently */
+}
+
+/* Let nano read stdin for the first file at least */
+void stdin_pager(void)
+{
+    endwin();
+    tcsetattr(0, TCSANOW, &oldterm);
+    fprintf(stderr, _("Reading from stdin, ^C to abort\n"));
+
+    /* Set things up so that Ctrl-C will cancel the new process. */
+    /* Enable interpretation of the special control keys so that we get
+     * SIGINT when Ctrl-C is pressed. */
+#ifndef NANO_TINY
+    enable_signals();
+#endif
+
+    if (sigaction(SIGINT, NULL, &pager_newaction) == -1) {
+	pager_sig_failed = TRUE;
+	nperror("sigaction");
+    } else {
+	pager_newaction.sa_handler = cancel_stdin_pager;
+	if (sigaction(SIGINT, &pager_newaction, &pager_oldaction) == -1) {
+	    pager_sig_failed = TRUE;
+	    nperror("sigaction");
+	}
+    }
+ 
+    open_buffer("", FALSE);
+    finish_stdin_pager();
+}
+
+
+
 /* Initialize the signal handlers. */
 void signal_init(void)
 {
@@ -1439,6 +1531,7 @@ int do_input(bool *meta_key, bool *func_key, bool *s_or_t, bool
 		kbinput = (int *)nrealloc(kbinput, kbinput_len *
 			sizeof(int));
 		kbinput[kbinput_len - 1] = input;
+
 	    }
 	}
 
@@ -1453,7 +1546,7 @@ int do_input(bool *meta_key, bool *func_key, bool *s_or_t, bool
 	     * for verbatim input, turn off prepending of wrapped
 	     * text. */
 	    if (have_shortcut && (!have_shortcut || s == NULL || s->scfunc !=
-		do_verbatim_input))
+		DO_VERBATIM_INPUT))
 		wrap_reset();
 #endif
 
@@ -1488,26 +1581,44 @@ int do_input(bool *meta_key, bool *func_key, bool *s_or_t, bool
 		default:
 		    /* If the function associated with this shortcut is
 		     * cutting or copying text, indicate this. */
-		    if (s->scfunc == do_cut_text_void
+		    if (s->scfunc == DO_CUT_TEXT_VOID
 #ifndef NANO_TINY
-			|| s->scfunc == do_copy_text || s->scfunc ==
-			do_cut_till_end
+			|| s->scfunc == DO_COPY_TEXT || s->scfunc ==
+			DO_CUT_TILL_END
 #endif
 			)
 			cut_copy = TRUE;
 
-		    if (s->scfunc != NULL) {
+		    if (s->scfunc != 0) {
 			const subnfunc *f = sctofunc((sc *) s);
 			*ran_func = TRUE;
 			if (ISSET(VIEW_MODE) && f && !f->viewok)
 			    print_view_warning();
-			else
+			else {
 #ifndef NANO_TINY
-			    if (s->scfunc == (void *) do_toggle)
+			    if (s->scfunc ==  DO_TOGGLE)
 				do_toggle(s->toggle);
-			    else
+			    else {
+#else
+			    {
 #endif
-				s->scfunc();
+				iso_me_harder_funcmap(s->scfunc);
+#ifdef ENABLE_COLOR
+				if (!f->viewok && openfile->syntax != NULL
+					&& openfile->syntax->nmultis > 0) {
+				    reset_multis(openfile->current, FALSE);
+				}
+				if (edit_refresh_needed) {
+#ifdef DEBUG
+	    			    fprintf(stderr, "running edit_refresh() as edit_refresh_needed is true\n");
+#endif
+				    edit_refresh();
+				    edit_refresh_needed = FALSE;
+				}
+
+#endif
+			    }
+			}
 		    }
 		    *finished = TRUE;
 		    break;
@@ -1546,7 +1657,7 @@ int do_mouse(void)
 	bool sameline;
 	    /* Did they click on the line with the cursor?  If they
 	     * clicked on the cursor, we set the mark. */
-	const filestruct *current_save = openfile->current;
+	filestruct *current_save = openfile->current;
 	size_t current_x_save = openfile->current_x;
 	size_t pww_save = openfile->placewewant;
 
@@ -1579,6 +1690,147 @@ int do_mouse(void)
 }
 #endif /* !DISABLE_MOUSE */
 
+#ifdef ENABLE_COLOR
+void alloc_multidata_if_needed(filestruct *fileptr)
+{
+    if (!fileptr->multidata)
+	fileptr->multidata = nmalloc(openfile->syntax->nmultis * sizeof(short));
+}
+
+/* Precalculate the multi-line start and end regex info so we can speed up
+   rendering (with any hope at all...) */
+void precalc_multicolorinfo(void)
+{
+#ifdef DEBUG
+	    fprintf(stderr, "entering precalc_multicolorinfo()\n");
+#endif
+    if (openfile->colorstrings != NULL && !ISSET(NO_COLOR_SYNTAX)) {
+	const colortype *tmpcolor = openfile->colorstrings;
+	regmatch_t startmatch, endmatch;
+	filestruct *fileptr, *endptr;
+	time_t last_check = time(NULL), cur_check = 0;
+
+	/* Let us get keypresses to see if the user is trying to
+	   start editing.  We may want to throw up a statusbar
+	   message before starting this later if it takes
+	   too long to do this routine.  For now silently
+	   abort if they hit a key */
+ 	nodelay(edit, FALSE);
+
+	for (; tmpcolor != NULL; tmpcolor = tmpcolor->next) {
+
+	    /* If it's not a multi-line regex, amscray */
+	    if (tmpcolor->end == NULL)
+		continue;
+#ifdef DEBUG
+	    fprintf(stderr, "working on color id %d\n", tmpcolor->id);
+#endif
+
+
+	    for (fileptr = openfile->fileage; fileptr != NULL; fileptr = fileptr->next) {
+		int startx = 0;
+		int nostart = 0;
+
+
+#ifdef DEBUG
+	    fprintf(stderr, "working on lineno %d\n", fileptr->lineno);
+#endif
+
+		alloc_multidata_if_needed(fileptr);
+
+		if ((cur_check = time(NULL)) - last_check > 1) {
+		    last_check = cur_check;
+		    if (wgetch(edit) != ERR)
+	   		goto precalc_cleanup;
+		}
+
+		while ((nostart = regexec(tmpcolor->start, &fileptr->data[startx], 1, &startmatch, 0))  == 0) {
+		    /* Look for end and start marking how many lines are encompassed
+		       whcih should speed up rendering later */
+		    startx += startmatch.rm_eo;
+#ifdef DEBUG
+		    fprintf(stderr, "match found at pos %d...", startx);
+#endif
+
+		    /* Look on this line first for end */
+		    if (regexec(tmpcolor->end, &fileptr->data[startx], 1, &endmatch, 0)  == 0) {
+			startx += endmatch.rm_eo;
+			fileptr->multidata[tmpcolor->id] |= CSTARTENDHERE;
+#ifdef DEBUG
+	    fprintf(stderr, "end found on this line\n");
+#endif
+			continue;
+		    }
+
+		    /* Nice, we didn't find the end regex on this line.  Let's start looking for it */
+		    for (endptr = fileptr->next; endptr != NULL; endptr = endptr->next) {
+
+#ifdef DEBUG
+	    fprintf(stderr, "advancing to line %d to find end...\n", endptr->lineno);
+#endif
+			/* Check for keyboard input  again */
+			if ((cur_check = time(NULL)) - last_check > 1) {
+			    last_check = cur_check;
+			    if (wgetch(edit) != ERR)
+		   		goto precalc_cleanup;
+			}
+			if (regexec(tmpcolor->end, endptr->data, 1, &endmatch, 0) == 0)
+			   break;
+		    }
+
+		    if (endptr == NULL) {
+#ifdef DEBUG
+	    		fprintf(stderr, "no end found, breaking out\n");
+#endif
+			break;
+		    }
+
+
+#ifdef DEBUG
+		    fprintf(stderr, "end found\n");
+#endif
+
+		    /* We found it, we found it, la la la la la.  Mark all the
+			lines in between and the ends properly */
+		    fileptr->multidata[tmpcolor->id] |= CENDAFTER;
+#ifdef DEBUG
+		    fprintf(stderr, "marking line %d as CENDAFTER\n", fileptr->lineno);
+#endif
+		    for (fileptr = fileptr->next; fileptr != endptr; fileptr = fileptr->next) {
+			alloc_multidata_if_needed(fileptr);
+			fileptr->multidata[tmpcolor->id] = CWHOLELINE;
+#ifdef DEBUG
+			fprintf(stderr, "marking intermediary line %d as CWHOLELINE\n", fileptr->lineno);
+#endif
+		    }
+		    alloc_multidata_if_needed(endptr);
+#ifdef DEBUG
+		    fprintf(stderr, "marking line %d as BEGINBEFORE\n", fileptr->lineno);
+#endif
+		    endptr->multidata[tmpcolor->id] |= CBEGINBEFORE;
+		    /* We should be able to skip all the way to the line of the match.
+			This may introduce more bugs but it's the Right Thing to do */
+		    fileptr = endptr;
+		    startx = endmatch.rm_eo;
+#ifdef DEBUG
+		    fprintf(stderr, "jumping to line %d pos %d to continue\n", endptr->lineno, startx);
+#endif
+		}
+		if (nostart && startx == 0) {
+#ifdef DEBUG
+		    fprintf(stderr, "no start found on line %d, continuing\n", fileptr->lineno);
+#endif
+		    fileptr->multidata[tmpcolor->id] = CNONE;
+		    continue;
+		}
+	    }
+	}
+    }
+precalc_cleanup:
+    nodelay(edit, FALSE);
+}
+#endif /* ENABLE_COLOR */
+
 /* The user typed output_len multibyte characters.  Add them to the edit
  * buffer, filtering out all ASCII control characters if allow_cntrls is
  * TRUE. */
@@ -1605,7 +1857,7 @@ void do_output(char *output, size_t output_len, bool allow_cntrls)
 		output[i] = '\n';
 	    /* Newline to Enter, if needed. */
 	    else if (output[i] == '\n') {
-		do_enter();
+		do_enter(FALSE);
 		i++;
 		continue;
 	    }
@@ -1647,7 +1899,6 @@ void do_output(char *output, size_t output_len, bool allow_cntrls)
 #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 <
@@ -1662,7 +1913,7 @@ void do_output(char *output, size_t output_len, bool allow_cntrls)
 	if (!ISSET(NO_WRAP)) {
 	    bool do_refresh_save = do_refresh;
 
-	    do_refresh = do_wrap(openfile->current);
+	    do_refresh = do_wrap(openfile->current, FALSE);
 
 	    /* If we needed to call edit_refresh() before this, we'll
 	     * still need to after this. */
@@ -1683,9 +1934,14 @@ void do_output(char *output, size_t output_len, bool allow_cntrls)
 
     openfile->placewewant = xplustabs();
 
-    if (do_refresh)
+
+#ifdef ENABLE_COLOR
+    reset_multis(openfile->current, FALSE);
+#endif
+    if (do_refresh) {
 	edit_refresh();
-    else
+	edit_refresh_needed = FALSE;
+    } else
 	update_line(openfile->current, openfile->current_x);
 }
 
@@ -1737,6 +1993,7 @@ int main(int argc, char **argv)
 	{"operatingdir", 1, NULL, 'o'},
 #endif
 	{"preserve", 0, NULL, 'p'},
+	{"quiet", 0, NULL, 'q'},
 #ifndef DISABLE_WRAPJUSTIFY
 	{"fill", 1, NULL, 'r'},
 #endif
@@ -1759,6 +2016,7 @@ int main(int argc, char **argv)
 	{"noconvert", 0, NULL, 'N'},
 	{"smooth", 0, NULL, 'S'},
 	{"quickblank", 0, NULL, 'U'},
+	{"undo", 0, NULL, 'u'},
 	{"wordbounds", 0, NULL, 'W'},
 	{"autoindent", 0, NULL, 'i'},
 	{"cut", 0, NULL, 'k'},
@@ -1800,11 +2058,11 @@ int main(int argc, char **argv)
     while ((optchr =
 #ifdef HAVE_GETOPT_LONG
 	getopt_long(argc, argv,
-		"h?ABC:DEFHIKLNOQ:RST:UVWY:abcdefgijklmo:pr:s:tvwxz",
+		"h?ABC:DEFHIKLNOQ:RST:UVWY:abcdefgijklmo:pqr:s:tuvwxz",
 		long_options, NULL)
 #else
 	getopt(argc, argv,
-		"h?ABC:DEFHIKLNOQ:RST:UVWY:abcdefgijklmo:pr:s:tvwxz")
+		"h?ABC:DEFHIKLNOQ:RST:UVWY:abcdefgijklmo:pqr:s:tuvwxz")
 #endif
 		) != -1) {
 	switch (optchr) {
@@ -1932,6 +2190,9 @@ int main(int argc, char **argv)
 	    case 'p':
 		SET(PRESERVE);
 		break;
+	    case 'q':
+		SET(QUIET);
+		break;
 #ifndef DISABLE_WRAPJUSTIFY
 	    case 'r':
 		if (!parse_num(optarg, &wrap_at)) {
@@ -1950,6 +2211,11 @@ int main(int argc, char **argv)
 	    case 't':
 		SET(TEMP_FILE);
 		break;
+#ifndef NANO_TINY
+	    case 'u':
+		use_undo = TRUE;
+		break;
+#endif
 	    case 'v':
 		SET(VIEW_MODE);
 		break;
@@ -2212,6 +2478,12 @@ int main(int argc, char **argv)
 	optind++;
     }
 
+    if (optind < argc && !strcmp(argv[optind], "-")) {
+	stdin_pager();
+	set_modified();
+	optind++;
+    }
+
 #ifdef ENABLE_MULTIBUFFER
     old_multibuffer = ISSET(MULTIBUFFER);
     SET(MULTIBUFFER);
@@ -2267,6 +2539,11 @@ int main(int argc, char **argv)
     fprintf(stderr, "Main: top and bottom win\n");
 #endif
 
+#ifdef ENABLE_COLOR
+    if (openfile->syntax && openfile->syntax->nmultis > 0)
+	precalc_multicolorinfo();
+#endif
+
     if (startline > 1 || startcol > 1)
 	do_gotolinecolumn(startline, startcol, FALSE, FALSE, FALSE,
 		FALSE);
@@ -2313,3 +2590,4 @@ int main(int argc, char **argv)
     /* We should never get here. */
     assert(FALSE);
 }
+

src/nano.h

@@ -28,6 +28,12 @@
 #include <config.h>
 #endif
 
+#ifdef NEED_XOPEN_SOURCE_EXTENDED
+#ifndef _XOPEN_SOURCE_EXTENDED
+#define _XOPEN_SOURCE_EXTENDED 1
+#endif /* _XOPEN_SOURCE_EXTENDED */
+#endif /* NEED_XOPEN_SOURCE_EXTENDED */
+
 #ifdef __TANDEM
 /* Tandem NonStop Kernel support. */
 #include <floss.h>
@@ -44,6 +50,10 @@
 #include <sys/param.h>
 #endif
 
+#ifdef HAVE_STDARG_H
+#include <stdarg.h>
+#endif
+
 /* Macros for flags. */
 #define SET(bit) flags |= bit
 #define UNSET(bit) flags &= ~bit
@@ -170,39 +180,9 @@ typedef enum {
 }  function_type;
 
 typedef enum {
-    ADD, DEL, REPLACE, SPLIT, UNSPLIT, CUT, CUTTOEND, UNCUT, INSERT, OTHER
+    ADD, DEL, REPLACE, SPLIT, UNSPLIT, CUT, UNCUT, ENTER, INSERT, OTHER
 } undo_type;
 
-/* Structure types. */
-typedef struct filestruct {
-    char *data;
-	/* The text of this line. */
-    ssize_t lineno;
-	/* The number of this line. */
-    struct filestruct *next;
-	/* Next node. */
-    struct filestruct *prev;
-	/* Previous node. */
-} filestruct;
-
-typedef struct partition {
-    filestruct *fileage;
-	/* The top line of this portion of the file. */
-    filestruct *top_prev;
-	/* The line before the top line of this portion of the file. */
-    char *top_data;
-	/* The text before the beginning of the top line of this portion
-	 * of the file. */
-    filestruct *filebot;
-	/* The bottom line of this portion of the file. */
-    filestruct *bot_next;
-	/* The line after the bottom line of this portion of the
-	 * file. */
-    char *bot_data;
-	/* The text after the end of the bottom line of this portion of
-	 * the file. */
-} partition;
-
 #ifdef ENABLE_COLOR
 typedef struct colortype {
     short fg;
@@ -226,6 +206,8 @@ typedef struct colortype {
 	/* The compiled end (if any) of the regex string. */
     struct colortype *next;
 	/* Next set of colors. */
+     int id;
+	/* basic id for assigning to lines later */
 } colortype;
 
 typedef struct exttype {
@@ -246,11 +228,61 @@ typedef struct syntaxtype {
 	/* Regexes to match on the 'header' (1st line) of the file */
     colortype *color;
 	/* The colors used in this syntax. */
+    int nmultis;
+	/* How many multi line strings this syntax has */
     struct syntaxtype *next;
 	/* Next syntax. */
 } syntaxtype;
+
+#define CNONE 		(1<<1)
+	/* Yay, regex doesn't apply to this line at all! */
+#define CBEGINBEFORE 	(1<<2)
+	/* regex starts on an earlier line, ends on this one */
+#define CENDAFTER 	(1<<3)
+	/* regex sraers on this line and ends on a later one */
+#define CWHOLELINE 	(1<<4)
+	/* whole line engulfed by the regex  start < me, end > me */
+#define CSTARTENDHERE 	(1<<5)
+	/* regex starts and ends within this line */
+#define CWTF		(1<<6)
+	/* Something else */
+
 #endif /* ENABLE_COLOR */
 
+
+/* Structure types. */
+typedef struct filestruct {
+    char *data;
+	/* The text of this line. */
+    ssize_t lineno;
+	/* The number of this line. */
+    struct filestruct *next;
+	/* Next node. */
+    struct filestruct *prev;
+	/* Previous node. */
+#ifdef ENABLE_COLOR
+    short *multidata;		/* Array of which multi-line regexes apply to this line */
+#endif
+} filestruct;
+
+typedef struct partition {
+    filestruct *fileage;
+	/* The top line of this portion of the file. */
+    filestruct *top_prev;
+	/* The line before the top line of this portion of the file. */
+    char *top_data;
+	/* The text before the beginning of the top line of this portion
+	 * of the file. */
+    filestruct *filebot;
+	/* The bottom line of this portion of the file. */
+    filestruct *bot_next;
+	/* The line after the bottom line of this portion of the
+	 * file. */
+    char *bot_data;
+	/* The text after the end of the bottom line of this portion of
+	 * the file. */
+} partition;
+
 #ifndef NANO_TINY
 typedef struct undo {
     ssize_t lineno;
@@ -260,6 +292,8 @@ typedef struct undo {
 	/* Where did this  action begin or end */
     char *strdata;
 	/* String type data we will use for ccopying the affected line back */
+    char *strdata2;
+	/* Sigh, need this too it looks like */
     int xflags;
 	/* Some flag data we need */
 
@@ -276,8 +310,6 @@ typedef struct undo {
 	/* 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;
 
@@ -325,6 +357,8 @@ typedef struct openfilestruct {
     undo_type last_action;
 #endif
 #ifdef ENABLE_COLOR
+    syntaxtype *syntax;
+	/* The  syntax struct for this file, if any */
     colortype *colorstrings;
 	/* The current file's associated colors. */
 #endif
@@ -382,7 +416,7 @@ typedef struct sc {
         /* The actual sequence to check on the the type is determined */
     int menu;
         /* What list does this apply to */
-    void (*scfunc)(void);
+    short scfunc;
         /* The function we're going to run */
     int toggle;
         /* If a toggle, what we're toggling */
@@ -394,7 +428,7 @@ typedef struct sc {
 } sc;
 
 typedef struct subnfunc {
-   void (*scfunc)(void);
+    short scfunc;
 	/* What function is this */
     int menus;
 	/* In what menus does this function applu */
@@ -449,6 +483,7 @@ typedef struct subnfunc {
 #define WORD_BOUNDS			(1<<28)
 #define NO_NEWLINES			(1<<29)
 #define BOLD_TEXT			(1<<30)
+#define QUIET				(1<<31)
 
 /* Flags for which menus in which a given function should be present */
 #define MMAIN				(1<<0)
@@ -697,9 +732,169 @@ typedef struct subnfunc {
 /* Extra bits for the undo function */
 #define UNDO_DEL_DEL		(1<<0)
 #define UNDO_DEL_BACKSPACE	(1<<1)
+#define UNDO_SPLIT_MADENEW	(1<<2)
+
+/* Since in ISO C you can't pass around function pointers anymore,
+  let's make some integer macros for function names, and then I
+  can go cut my wrists after writing the big switch statement
+  that will necessitate. */
 
 #endif /* !NANO_TINY */
 
+#define CASE_SENS_MSG 1
+#define BACKWARDS_MSG 2
+#define REGEXP_MSG 3
+#define WHEREIS_NEXT_MSG 4
+#define FIRST_FILE_MSG 5
+#define LAST_FILE_MSG 6
+#define GOTO_DIR_MSG 7
+#define TOTAL_REFRESH 8
+#define DO_HELP_VOID 9
+#define DO_SEARCH 10
+#define DO_PAGE_UP 11
+#define DO_PAGE_DOWN 12
+#define DO_UP_VOID 13
+#define DO_LEFT 14
+#define DO_DOWN_VOID 15
+#define DO_RIGHT 16
+#define DO_ENTER 17
+#define DO_EXIT 18
+#define NEW_BUFFER_MSG 19
+#define EXT_CMD_MSG 20
+#define TO_FILES_MSG 21
+#define DOS_FORMAT_MSG 23
+#define MAC_FORMAT_MSG 24
+#define BACKUP_FILE_MSG 25
+#define PREPEND_MSG 26
+#define APPEND_MSG 27
+#define DO_FIRST_LINE 28
+#define DO_LAST_LINE 29
+#define DO_TOGGLE 30
+#define GOTOTEXT_MSG 31
+#define NO_REPLACE_MSG 32
+#define DO_BACKSPACE 33
+#define DO_DELETE 34
+#define DO_TAB 35
+#define DO_VERBATIM_INPUT 36
+#define SWITCH_TO_NEXT_BUFFER_VOID 37
+#define SWITCH_TO_PREV_BUFFER_VOID 38
+#define DO_END 39
+#define DO_HOME 40
+#define NEXT_HISTORY_MSG 41
+#define PREV_HISTORY_MSG 42
+#define DO_REDO 43
+#define DO_UNDO 44
+#define DO_WORDLINECHAR_COUNT 45
+#define DO_FIND_BRACKET 46
+#define DO_PREV_WORD_VOID 47
+#define DO_SUSPEND_VOID 48
+#define CANCEL_MSG 49
+#define DO_WRITEOUT_VOID 50
+#define DO_INSERTFILE_VOID 51
+#define DO_CUT_TEXT_VOID 52
+#define DO_UNCUT_TEXT 53
+#define DO_CURSORPOS_VOID 54
+#define DO_GOTOLINECOLUMN_VOID 55
+#define DO_REPLACE 56
+#define DO_JUSTIFY_VOID 57
+#define DO_PARA_BEGIN_VOID 58
+#define DO_PARA_END_VOID 59
+#define DO_FULL_JUSTIFY 60
+#define DO_MARK 61
+#define DO_RESEARCH 62
+#define DO_COPY_TEXT 63
+#define DO_INDENT_VOID 64
+#define DO_UNINDENT 65
+#define DO_SCROLL_UP 66
+#define DO_SCROLL_DOWN 67
+#define DO_NEXT_WORD_VOID 68
+#define DO_CUT_TILL_END 69
+#define NANO_GOTODIR_MSG 70
+#define NANO_LASTFILE_MSG 71
+#define NANO_FIRSTFILE_MSG 72
+#define INSERT_FILE_MSG 73
+#define NANO_MULTIBUFFER_MSG 74
+#define NANO_EXECUTE_MSG 75
+#define NANO_BACKUP_MSG 76
+#define NANO_PREPEND_MSG 77
+#define NANO_APPEND_MSG 78
+#define NANO_MAC_MSG 79
+#define NANO_DOS_MSG 80
+#define NANO_TOFILES_MSG 81
+#define NANO_NEXT_HISTORY_MSG 82
+#define NANO_PREV_HISTORY_MSG 83
+#define NANO_REGEXP_MSG 84
+#define NANO_REVERSE_MSG 85
+#define NANO_CASE_MSG 86
+#define NANO_SUSPEND_MSG 87
+#define SUSPEND_MSG 88
+#define NANO_REFRESH_MSG 89
+#define REFRESH_MSG 90
+#define NANO_WORDCOUNT_MSG 91
+#define NANO_FULLJUSTIFY_MSG 92
+#define FULLJSTIFY_MSG 93
+#define XOFF_COMPLAINT 94
+#define XON_COMPLAINT 95
+#define NANO_CUT_TILL_END_MSG 96
+#define NANO_BACKSPACE_MSG 97
+#define NANO_DELETE_MSG 98
+#define NANO_ENTER_MSG 99
+#define NANO_TAB_MSG 100
+#define NANO_VERBATIM_MSG 101
+#define NANO_NEXTFILE_MSG 102
+#define NANO_PREVFILE_MSG 103
+#define NANO_SCROLLDOWN_MSG 104
+#define NANO_SCROLLUP_MSG 105
+#define NANO_BRACKET_MSG 106
+#define NANO_PARAEND_MSG 107
+#define END_OF_PAR_MSG 108
+#define NANO_PARABEGIN_MSG 109
+#define BEG_OF_PAR_MSG 110
+#define NANO_END_MSG 111
+#define NANO_HOME_MSG 112
+#define NANO_NEXTLINE_MSG 113
+#define NANO_PREVLINE_MSG 114
+#define NANO_PREVWORD_MSG 115
+#define NANO_NEXTWORD_MSG 116
+#define NANO_BACK_MSG 117
+#define NANO_FORWARD_MSG 118
+#define NANO_REDO_MSG 119
+#define NANO_UNDO_MSG 120
+#define NANO_UNINDENT_MSG 121
+#define NANO_INDENT_MSG 122
+#define NANO_COPY_MSG 123
+#define NANO_WHEREIS_NEXT_MSG 124
+#define NANO_MARK_MSG 125
+#define NANO_REPLACE_MSG 126
+#define REPLACE_MSG 127
+#define NANO_GOTOLINE_MSG 128
+#define NANO_LASTLINE_MSG 129
+#define NANO_FIRSTLINE_MSG 130
+#define NANO_SPELL_MSG 131
+#define DO_SPELL 132
+#define NANO_CURSORPOS_MSG 133
+#define NANO_UNCUT_MSG 134
+#define GET_HELP_MSG 135
+#define NANO_HELP_MSG 136
+#define NANO_CANCEL_MSG 137
+#define NANO_EXIT_MSG 138
+#define EXIT_MSG 139
+#define NANO_EXITBROWSER_MSG 140
+#define NANO_WRITEOUT_MSG 141
+#define NANO_DISABLED_MSG 142
+#define NANO_INSERT_MSG 143
+#define WHEREIS_MSG 144
+#define NANO_WHEREIS_MSG 145
+#define NANO_PREVPAGE_MSG 146
+#define NANO_NEXTPAGE_MSG 147
+#define NANO_CUT_MSG 148
+#define DO_CUT_TEXT 149
+#define DO_NEXT_WORD 150
+#define DO_PREV_WORD 151
+
+
+
+
 #define VIEW TRUE
 #define NOVIEW FALSE
 

src/prompt.c

@@ -152,38 +152,38 @@ int do_statusbar_input(bool *meta_key, bool *func_key, bool *have_shortcut,
 	}
 
 	if (*have_shortcut) {
-	    if (s->scfunc == do_tab || s->scfunc == do_enter)
+	    if (s->scfunc == DO_TAB || s->scfunc == DO_ENTER)
 		;
-	    else if (s->scfunc == total_refresh)
+	    else if (s->scfunc == TOTAL_REFRESH)
 		total_statusbar_refresh(refresh_func);
-            else if (s->scfunc == (void *) do_cut_text) {
+            else if (s->scfunc ==  DO_CUT_TEXT) {
 		/* If we're using restricted mode, the filename
 		 * isn't blank, and we're at the "Write File"
 		 * prompt, disable Cut. */
 		if (!ISSET(RESTRICTED) || openfile->filename[0] ==
 			'\0' || currmenu != MWRITEFILE)
 		    do_statusbar_cut_text();
-	    } else if (s->scfunc == do_right)
+	    } else if (s->scfunc == DO_RIGHT)
 		do_statusbar_right();
-	    else if (s->scfunc == do_left)
+	    else if (s->scfunc == DO_LEFT)
 		do_statusbar_left();
 
 #ifndef NANO_TINY
-	    else if (s->scfunc == (void *) do_next_word)
+	    else if (s->scfunc ==  DO_NEXT_WORD)
 		do_statusbar_next_word(FALSE);
-	    else if (s->scfunc == (void *) do_prev_word)
+	    else if (s->scfunc ==  DO_PREV_WORD)
 		    do_statusbar_prev_word(FALSE);
 #endif
-	    else if (s->scfunc == do_home)
+	    else if (s->scfunc == DO_HOME)
 		    do_statusbar_home();
-	    else if (s->scfunc == do_end)
+	    else if (s->scfunc == DO_END)
 		    do_statusbar_end();
 
 #ifndef NANO_TINY
-	    else if (s->scfunc == do_find_bracket)
+	    else if (s->scfunc == DO_FIND_BRACKET)
 		do_statusbar_find_bracket();
 #endif
-	    else if (s->scfunc == do_verbatim_input) {
+	    else if (s->scfunc == DO_VERBATIM_INPUT) {
 		    /* If we're using restricted mode, the filename
 		     * isn't blank, and we're at the "Write File"
 	   	     * prompt, disable verbatim input. */
@@ -201,18 +201,18 @@ int do_statusbar_input(bool *meta_key, bool *func_key, bool *have_shortcut,
 			     * to indicate that we're done. */
 			    if (got_enter) {
 				get_input(NULL, 1);
-				input = sc_seq_or(do_enter, 0);
+				input = sc_seq_or(DO_ENTER, 0);
 				*finished = TRUE;
 			    }
 		    }
-	    } else if (s->scfunc == do_delete) {
+	    } else if (s->scfunc == DO_DELETE) {
 		/* If we're using restricted mode, the filename
 		 * isn't blank, and we're at the "Write File"
 		 * prompt, disable Delete. */
 		if (!ISSET(RESTRICTED) || openfile->filename[0] ==
 			'\0' || currmenu != MWRITEFILE)
 		    do_statusbar_delete();
-	    } else if (s->scfunc == do_backspace) {
+	    } else if (s->scfunc == DO_BACKSPACE) {
 		/* If we're using restricted mode, the filename
 		 * isn't blank, and we're at the "Write File"
 		 * prompt, disable Backspace. */
@@ -227,10 +227,10 @@ int do_statusbar_input(bool *meta_key, bool *func_key, bool *have_shortcut,
 	     * associated functions. */
 
 		f = sctofunc((sc *) s);
-		if (s->scfunc != NULL &&  s->execute == TRUE) {
+		if (s->scfunc != 0 &&  s->execute == TRUE) {
 			*ran_func = TRUE;
 		    if (!ISSET(VIEW_MODE) || f->viewok)
-		        f->scfunc();
+		        iso_me_harder_funcmap(f->scfunc);
 		}
 		*finished = TRUE;
 	    }
@@ -979,19 +979,19 @@ fprintf(stderr, "get_prompt_string: answer = \"%s\", statusbar_x = %d\n", answer
 	s = get_shortcut(currmenu, &kbinput, meta_key, func_key);
 
 	if (s)
-	    if (s->scfunc == (void *) cancel_msg || s->scfunc == do_enter)
+	    if (s->scfunc ==  CANCEL_MSG || s->scfunc == DO_ENTER)
 		break;
 
 #ifndef DISABLE_TABCOMP
-	if (s && s->scfunc != do_tab)
+	if (s && s->scfunc != DO_TAB)
 	    tabbed = FALSE;
 #endif
 
 #ifndef DISABLE_TABCOMP
 #ifndef NANO_TINY
-	if (s && s->scfunc == do_tab) {
+	if (s && s->scfunc == DO_TAB) {
 		if (history_list != NULL) {
-		    if (last_kbinput != sc_seq_or(do_tab, NANO_CONTROL_I))
+		    if (last_kbinput != sc_seq_or(DO_TAB, NANO_CONTROL_I))
 			complete_len = strlen(answer);
 
 		    if (complete_len > 0) {
@@ -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 == (void *) prev_history_msg) {
+	if (s && s->scfunc ==  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 == (void *) next_history_msg) {
+	} else if (s && s->scfunc ==  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,
@@ -1071,7 +1071,7 @@ fprintf(stderr, "get_prompt_string: answer = \"%s\", statusbar_x = %d\n", answer
 	} else
 #endif /* !NANO_TINY */
 #ifndef DISABLE_HELP
-	if (s && s->scfunc == do_help_void) {
+	if (s && s->scfunc == DO_HELP_VOID) {
 		update_statusbar_line(answer, statusbar_x);
 
 		/* This key has a shortcut list entry when it's used to
@@ -1116,7 +1116,7 @@ fprintf(stderr, "get_prompt_string: answer = \"%s\", statusbar_x = %d\n", answer
      * we've finished putting in an answer, reset the statusbar cursor
      * position too. */
     if (s) {
-	if (s->scfunc == (void *) cancel_msg || s->scfunc == do_enter ||
+	if (s->scfunc ==  CANCEL_MSG || s->scfunc == DO_ENTER ||
 	ran_func) {
 	    statusbar_x = old_statusbar_x;
 	    statusbar_pww = old_pww;
@@ -1203,9 +1203,9 @@ int do_prompt(bool allow_tabs,
 
     /* If we left the prompt via Cancel or Enter, set the return value
      * properly. */
-    if (s && s->scfunc == (void *) cancel_msg)
+    if (s && s->scfunc ==  CANCEL_MSG)
 	retval = -1;
-    else if (s && s->scfunc == do_enter)
+    else if (s && s->scfunc == DO_ENTER)
 	retval = (*answer == '\0') ? -2 : 0;
 
     blank_statusbar();
@@ -1313,7 +1313,7 @@ int do_yesno_prompt(bool all, const char *msg)
 	kbinput = get_kbinput(bottomwin, &meta_key, &func_key);
 	s = get_shortcut(currmenu, &kbinput, &meta_key, &func_key);
 
-	if (s && s->scfunc == (void *) cancel_msg)
+	if (s && s->scfunc ==  CANCEL_MSG)
 	    ok = -1;
 #ifndef DISABLE_MOUSE
 	else if (kbinput == KEY_MOUSE) {
@@ -1345,7 +1345,7 @@ int do_yesno_prompt(bool all, const char *msg)
 		}
 	}
 #endif /* !DISABLE_MOUSE */
-	else if  (s && s->scfunc == total_refresh) {
+	else if  (s && s->scfunc == TOTAL_REFRESH) {
 	    total_redraw();
 	    continue;
 	} else {

src/proto.h

@@ -30,6 +30,7 @@
 #ifndef NANO_TINY
 extern sigjmp_buf jump_buf;
 extern bool jump_buf_main;
+extern bool use_undo;
 #endif
 
 #ifndef DISABLE_WRAPJUSTIFY
@@ -76,7 +77,7 @@ extern char *quoteerr;
 extern size_t quotelen;
 #endif
 #endif
-
+extern bool nodelay_mode;
 extern char *answer;
 
 extern ssize_t tabsize;
@@ -100,6 +101,7 @@ extern syntaxtype *syntaxes;
 extern char *syntaxstr;
 #endif
 
+extern bool edit_refresh_needed;
 extern const shortcut *currshortcut;
 extern int currmenu;
 
@@ -542,6 +544,8 @@ void parse_syntax(char *ptr);
 void parse_include(char *ptr);
 short color_to_short(const char *colorname, bool *bright);
 void parse_colors(char *ptr, bool icase);
+void reset_multis(filestruct *fileptr, bool force);
+void alloc_multidata_if_needed(filestruct *fileptr);
 #endif
 void parse_rcfile(FILE *rcstream
 #ifdef ENABLE_COLOR
@@ -621,14 +625,14 @@ void do_unindent(void);
 void do_undo(void);
 void do_redo(void);
 #endif
-void do_enter(void);
+void do_enter(bool undoing);
 #ifndef NANO_TINY
 RETSIGTYPE cancel_command(int signal);
 bool execute_command(const char *command);
 #endif
 #ifndef DISABLE_WRAPPING
 void wrap_reset(void);
-bool do_wrap(filestruct *line);
+bool do_wrap(filestruct *line, bool undoing);
 #endif
 #if !defined(DISABLE_HELP) || !defined(DISABLE_WRAPJUSTIFY)
 ssize_t break_line(const char *line, ssize_t goal
@@ -743,7 +747,7 @@ int get_mouseinput(int *mouse_x, int *mouse_y, bool allow_shortcuts);
 #endif
 const sc *get_shortcut(int menu, int *kbinput, bool
 	*meta_key, bool *func_key);
-const sc *first_sc_for(int menu, void *func);
+const sc *first_sc_for(int menu, short func);
 void blank_line(WINDOW *win, int y, int x, int n);
 void blank_titlebar(void);
 void blank_topbar(void);
@@ -759,13 +763,13 @@ void statusbar(const char *msg, ...);
 void bottombars(int menu);
 void onekey(const char *keystroke, const char *desc, size_t len);
 void reset_cursor(void);
-void edit_draw(const filestruct *fileptr, const char *converted, int
+void edit_draw(filestruct *fileptr, const char *converted, int
 	line, size_t start);
-void update_line(const filestruct *fileptr, size_t index);
+void update_line(filestruct *fileptr, size_t index);
 bool need_horizontal_update(size_t pww_save);
 bool need_vertical_update(size_t pww_save);
 void edit_scroll(scroll_dir direction, ssize_t nlines);
-void edit_redraw(const filestruct *old_current, size_t pww_save);
+void edit_redraw(filestruct *old_current, size_t pww_save);
 void edit_refresh(void);
 void edit_update(update_type location);
 void total_redraw(void);
@@ -776,6 +780,7 @@ void do_cursorpos_void(void);
 void do_replace_highlight(bool highlight, const char *word);
 char *flagtostr(int flag);
 const subnfunc *sctofunc(sc *s);
+const subnfunc *getfuncfromkey(WINDOW *win);
 void print_sclist(void);
 sc *strtosc(int menu, char *input);
 function_type strtokeytype(char *str);
@@ -783,7 +788,7 @@ int strtomenu(char *input);
 void assign_keyinfo(sc *s);
 void xon_complaint(void);
 void xoff_complaint(void);
-int sc_seq_or (void *func, int defaultval);
+int sc_seq_or (short func, int defaultval);
 void do_suspend_void(void);
 
 const char *cancel_msg;
@@ -807,13 +812,11 @@ const char *mac_format_msg;
 const char *append_msg;
 const char *prepend_msg;
 const char *backup_file_msg;
-const char *dos_format_msg;
-const char *mac_format_msg;
-const char *append_msg;
-const char *prepend_msg;
-const char *backup_file_msg;
 const char *gototext_msg;
 const char *new_buffer_msg;
+void iso_me_harder_funcmap(short func);
+void enable_nodelay(void);
+void disable_nodelay(void);
 
 #ifdef HAVE_REGEX_H
 const char *regexp_msg;

src/rcfile.c

@@ -84,10 +84,12 @@ static const rcoption rcopts[] = {
     {"historylog", HISTORYLOG},
     {"matchbrackets", 0},
     {"noconvert", NO_CONVERT},
+    {"quiet", QUIET},
     {"quickblank", QUICK_BLANK},
     {"smarthome", SMART_HOME},
     {"smooth", SMOOTH_SCROLL},
     {"tabstospaces", TABS_TO_SPACES},
+    {"undo", 0},
     {"whitespace", 0},
     {"wordbounds", WORD_BOUNDS},
 #endif
@@ -107,6 +109,7 @@ static exttype *endheader = NULL;
 	/* End of header list */
 static colortype *endcolor = NULL;
 	/* The end of the color list for the current syntax. */
+
 #endif
 
 /* We have an error in some part of the rcfile.  Print the error message
@@ -116,6 +119,9 @@ void rcfile_error(const char *msg, ...)
 {
     va_list ap;
 
+    if (ISSET(QUIET))
+	return;
+
     fprintf(stderr, "\n");
     if (lineno > 0) {
 	errors = TRUE;
@@ -296,6 +302,7 @@ void parse_syntax(char *ptr)
     endsyntax->extensions = NULL;
     endsyntax->headers = NULL;
     endsyntax->next = NULL;
+    endsyntax->nmultis = 0;
 
 #ifdef DEBUG
     fprintf(stderr, "Starting a new syntax type: \"%s\"\n", nameptr);
@@ -386,48 +393,48 @@ void parse_keybinding(char *ptr)
 
     if (keycopy[0] != 'M' && keycopy[0] != '^' && keycopy[0] != 'F' && keycopy[0] != 'K') {
 	rcfile_error(
-		N_("keybindings must begin with \"^\", \"M\", or \"F\"\n"));
+		N_("keybindings must begin with \"^\", \"M\", or \"F\""));
 	return;
     }
 
     funcptr = ptr;
     ptr = parse_next_word(ptr);
 
-    if (funcptr == NULL) {
+    if (!strcmp(funcptr, "")) {
 	rcfile_error(
-		N_("Must specify function to bind key to\n"));
+		N_("Must specify function to bind key to"));
 	return;
     }
 
     menuptr = ptr;
     ptr = parse_next_word(ptr);
 
-    if (menuptr == NULL) {
+    if (!strcmp(menuptr, "")) {
 	rcfile_error(
 		/* Note to translators, do not translate the word "all"
 		   in the sentence below, everything else is fine */
-		N_("Must specify menu bind key to (or \"all\")\n"));
+		N_("Must specify menu to bind key to (or \"all\")"));
 	return;
     }
 
     menu = strtomenu(menuptr);
-    if (menu < 1) {
-	rcfile_error(
-		N_("Could not map name \"%s\" to a menu\n"), menuptr);
-	return;
-    }
-
     newsc = strtosc(menu, funcptr);
     if (newsc == NULL) {
 	rcfile_error(
-		N_("Could not map name \"%s\" to a function\n"), funcptr);
+		N_("Could not map name \"%s\" to a function"), funcptr);
+	return;
+    }
+
+    if (menu < 1) {
+	rcfile_error(
+		N_("Could not map name \"%s\" to a menu"), menuptr);
 	return;
     }
 
 
 #ifdef DEBUG
     fprintf(stderr, "newsc now address %d, menu func assigned = %d, menu = %d\n",
-	&newsc, &newsc->scfunc, menu);
+	&newsc, newsc->scfunc, menu);
 #endif
 
 
@@ -442,7 +449,7 @@ void parse_keybinding(char *ptr)
 
     if (check_bad_binding(newsc)) {
 	rcfile_error(
-		N_("Sorry, keystr \"%s\" is an illegal binding\n"), newsc->keystr);
+		N_("Sorry, keystr \"%s\" is an illegal binding"), newsc->keystr);
 	return;
     }
 
@@ -468,7 +475,7 @@ void parse_include(char *ptr)
 {
     struct stat rcinfo;
     FILE *rcstream;
-    char *option, *full_option, *nanorc_save = nanorc;
+    char *option, *nanorc_save = nanorc, *expanded;
     size_t lineno_save = lineno;
 
     option = ptr;
@@ -476,37 +483,35 @@ void parse_include(char *ptr)
 	option++;
     ptr = parse_argument(ptr);
 
-    /* Get the specified file's full path. */
-    full_option = get_full_path(option);
-
-    if (full_option == NULL)
-	full_option = mallocstrcpy(NULL, option);
+    /* Can't get the specified file's full path cause it may screw up
+	our cwd depending on the parent dirs' permissions, (see Savannah bug 25297) */
 
     /* Don't open directories, character files, or block files. */
-    if (stat(full_option, &rcinfo) != -1) {
+    if (stat(option, &rcinfo) != -1) {
 	if (S_ISDIR(rcinfo.st_mode) || S_ISCHR(rcinfo.st_mode) ||
 		S_ISBLK(rcinfo.st_mode)) {
 	    rcfile_error(S_ISDIR(rcinfo.st_mode) ?
 		_("\"%s\" is a directory") :
 		_("\"%s\" is a device file"), option);
-	    goto cleanup_include;
 	}
     }
 
+    expanded = real_dir_from_tilde(option);
+
     /* Open the new syntax file. */
-    if ((rcstream = fopen(full_option, "rb")) == NULL) {
-	rcfile_error(_("Error reading %s: %s"), option,
+    if ((rcstream = fopen(expanded, "rb")) == NULL) {
+	rcfile_error(_("Error reading %s: %s"), expanded,
 		strerror(errno));
-	goto cleanup_include;
+	return;
     }
 
     /* Use the name and line number position of the new syntax file
      * while parsing it, so we can know where any errors in it are. */
-    nanorc = full_option;
+    nanorc = expanded;
     lineno = 0;
 
 #ifdef DEBUG
-    fprintf(stderr, "Parsing file \"%s\"\n", full_option);
+    fprintf(stderr, "Parsing file \"%s\" (expanded from \"%s\")\n", expanded, option);
 #endif
 
     parse_rcfile(rcstream
@@ -520,8 +525,6 @@ void parse_include(char *ptr)
     nanorc = nanorc_save;
     lineno = lineno_save;
 
-  cleanup_include:
-    free(full_option);
 }
 
 /* Return the short value corresponding to the color named in colorname,
@@ -716,6 +719,10 @@ void parse_colors(char *ptr, bool icase)
 	    /* Save the ending regex string if it's valid. */
 	    newcolor->end_regex = (nregcomp(fgstr, icase ? REG_ICASE :
 		0)) ? mallocstrcpy(NULL, fgstr) : NULL;
+
+	    /* Lame way to skip another static counter */
+            newcolor->id = endsyntax->nmultis;
+            endsyntax->nmultis++;
 	}
     }
 }
@@ -723,7 +730,7 @@ 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;
+    char *regstr;
 
     assert(ptr != NULL);
 
@@ -743,8 +750,6 @@ void parse_headers(char *ptr)
     while (ptr != NULL && *ptr != '\0') {
 	exttype *newheader;
 	    /* The new color structure. */
-	bool cancelled = FALSE;
-	    /* The start expression was bad. */
 
 	if (*ptr != '"') {
 	    rcfile_error(
@@ -793,7 +798,7 @@ 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 };
+    short vitals[VITALS] = { DO_EXIT, DO_EXIT, CANCEL_MSG, CANCEL_MSG, CANCEL_MSG };
     int inmenus[VITALS] = { MMAIN, MHELP, MWHEREIS, MREPLACE, MGOTOLINE };
 
     for  (v = 0; v < VITALS; v++) {
@@ -904,6 +909,15 @@ void parse_rcfile(FILE *rcstream
 	option = ptr;
 	ptr = parse_next_word(ptr);
 
+#ifndef NANO_TINY
+	/* FIXME: Hack which should go away ASAP */
+	if (strcasecmp(option,  "undo") == 0) {
+	    use_undo = TRUE;
+	    shortcut_init(0);
+	    continue;
+	}
+#endif
+
 	for (i = 0; rcopts[i].name != NULL; i++) {
 	    if (strcasecmp(option, rcopts[i].name) == 0) {
 #ifdef DEBUG
@@ -1059,15 +1073,6 @@ void parse_rcfile(FILE *rcstream
     lineno = 0;
 
     check_vitals_mapped();
-
-    if (errors) {
-	errors = FALSE;
-	fprintf(stderr,
-		_("\nPress Enter to continue starting nano.\n"));
-	while (getchar() != '\n')
-	    ;
-    }
-
     return;
 }
 
@@ -1148,6 +1153,14 @@ void do_rcfile(void)
     free(nanorc);
     nanorc = NULL;
 
+    if (errors && !ISSET(QUIET)) {
+	errors = FALSE;
+	fprintf(stderr,
+		_("\nPress Enter to continue starting nano.\n"));
+	while (getchar() != '\n')
+	    ;
+    }
+
 #ifdef ENABLE_COLOR
     set_colorpairs();
 #endif

src/search.c

@@ -28,6 +28,7 @@
 #include <unistd.h>
 #include <ctype.h>
 #include <errno.h>
+#include <time.h>
 
 static bool search_last_line = FALSE;
 	/* Have we gone past the last line while searching? */
@@ -137,7 +138,7 @@ int search_init(bool replacing, bool use_answer)
     int i = 0;
     char *buf;
     sc *s;
-    void *func = NULL;
+    char func = 0;
     bool meta_key = FALSE, func_key = FALSE;
     static char *backupstring = NULL;
 	/* The search string we'll be using. */
@@ -235,31 +236,32 @@ int search_init(bool replacing, bool use_answer)
 #endif
 		;
 #ifndef NANO_TINY
-	} else if (func == (void *) case_sens_msg) {
+	} else if (func == CASE_SENS_MSG) {
 		TOGGLE(CASE_SENSITIVE);
 		backupstring = mallocstrcpy(backupstring, answer);
 		return 1;
-	} else if (func == (void *) backwards_msg) {
+	} else if (func == BACKWARDS_MSG) {
 		TOGGLE(BACKWARDS_SEARCH);
 		backupstring = mallocstrcpy(backupstring, answer);
 		return 1;
 #endif
 #ifdef HAVE_REGEX_H
-	} else if (func == (void *) regexp_msg) {
+	} else if (func == REGEXP_MSG) {
 		TOGGLE(USE_REGEXP);
 		backupstring = mallocstrcpy(backupstring, answer);
 		return 1;
 #endif
-	} else if (func == (void *) do_replace || 
-	  func == (void *) no_replace_msg) {
+	} else if (func == DO_REPLACE || 
+	  func == NO_REPLACE_MSG) {
 		backupstring = mallocstrcpy(backupstring, answer);
 		return -2;	/* Call the opposite search function. */
-	} else if (func == (void *) go_to_line_msg) {
+	} else if (func == DO_GOTOLINECOLUMN_VOID) {
 		do_gotolinecolumn(openfile->current->lineno,
 			openfile->placewewant + 1, TRUE, TRUE, FALSE,
 			TRUE);
 				/* Put answer up on the statusbar and
 				 * fall through. */
+		return 3;
 	} else {
 		return -1;
 	}
@@ -287,6 +289,8 @@ bool findnextstr(
     ssize_t current_y_find = openfile->current_y;
     filestruct *fileptr = openfile->current;
     const char *rev_start = fileptr->data, *found = NULL;
+    const subnfunc *f;
+    time_t lastkbcheck = time(NULL);
 
     /* rev_start might end up 1 character before the start or after the
      * end of the line.  This won't be a problem because strstrwrapper()
@@ -301,7 +305,17 @@ bool findnextstr(
 	openfile->current_x + 1;
 
     /* Look for needle in the current line we're searching. */
+    enable_nodelay();
     while (TRUE) {
+        if (time(NULL) - lastkbcheck > 1) {
+            lastkbcheck = time(NULL);
+	    f = getfuncfromkey(edit);
+            if (f && f->scfunc == CANCEL_MSG) {
+		statusbar(_("Cancelled"));
+		return FALSE;
+	    }
+	}
+
 	found = strstrwrapper(fileptr->data, needle, rev_start);
 
 	/* We've found a potential match. */
@@ -347,6 +361,7 @@ bool findnextstr(
 	/* We've finished processing the file, so get out. */
 	if (search_last_line) {
 	    not_found_msg(needle);
+            disable_nodelay();
 	    return FALSE;
 	}
 
@@ -404,9 +419,11 @@ bool findnextstr(
 #endif
 	) {
 	not_found_msg(needle);
+	disable_nodelay();
 	return FALSE;
     }
 
+    disable_nodelay();
     /* We've definitely found something. */
     openfile->current = fileptr;
     openfile->current_x = current_x_find;
@@ -702,6 +719,9 @@ ssize_t do_replace_loop(
 	filepart = partition_filestruct(top, top_x, bot, bot_x);
 	openfile->edittop = openfile->fileage;
 	openfile->mark_set = FALSE;
+#ifdef ENABLE_COLOR
+	reset_multis(openfile->current, TRUE);
+#endif
 	edit_refresh();
     }
 #endif
@@ -846,6 +866,10 @@ ssize_t do_replace_loop(
 	    free(openfile->current->data);
 	    openfile->current->data = copy;
 
+#ifdef ENABLE_COLOR
+	reset_multis(openfile->current, TRUE);
+#endif
+	edit_refresh();
 	    if (!replaceall) {
 #ifdef ENABLE_COLOR
 		/* If color syntaxes are available and turned on, we
@@ -1020,7 +1044,7 @@ void do_gotolinecolumn(ssize_t line, ssize_t column, bool use_answer,
 
 
 	s = get_shortcut(currmenu, &i, &meta_key, &func_key);
-	if (s && s->scfunc == (void *) gototext_msg) {
+	if (s && s->scfunc ==  GOTOTEXT_MSG) {
 	    /* Keep answer up on the statusbar. */
 	    search_init(TRUE, TRUE);
 

src/text.c

@@ -140,15 +140,8 @@ void do_delete(void)
 
     set_modified();
 
-#ifdef ENABLE_COLOR
-    /* If color syntaxes are available and turned on, we need to call
-     * edit_refresh(). */
-    if (openfile->colorstrings != NULL && !ISSET(NO_COLOR_SYNTAX))
-	do_refresh = TRUE;
-#endif
-
     if (do_refresh)
-	edit_refresh();
+	edit_refresh_needed = TRUE;
     else
 	update_line(openfile->current, openfile->current_x);
 }
@@ -346,7 +339,7 @@ void do_indent(ssize_t cols)
 	set_modified();
 
 	/* Update the screen. */
-	edit_refresh();
+	edit_refresh_needed = TRUE;
     }
 }
 
@@ -367,65 +360,71 @@ void do_unindent(void)
 /* undo a cut, or re-do an uncut */
 void undo_cut(undo *u)
 {
-	cutbuffer = copy_filestruct(u->cutbuffer);
+    /* If we cut the magicline may was well not crash :/ */
+    if (!u->cutbuffer)
+	return;
 
-        /* Compute cutbottom for the uncut using out copy */
-	for (cutbottom = cutbuffer; cutbottom->next != NULL; cutbottom = cutbottom->next)
-	    ;
+    cutbuffer = copy_filestruct(u->cutbuffer);
 
-	/* 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);
+    /* Compute cutbottom for the uncut using out copy */
+    for (cutbottom = cutbuffer; cutbottom->next != NULL; cutbottom = cutbottom->next)
+	;
 
-        copy_from_filestruct(cutbuffer, cutbottom);
-	free_filestruct(cutbuffer);
-	cutbuffer = NULL;
+    /* 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;
+    filestruct *t, *c;
 
-	do_gotolinecolumn(u->lineno, u->begin+1, FALSE, FALSE, FALSE, FALSE);
-	openfile->mark_set = u->mark_set;
-	if (cutbuffer)
-	    free(cutbuffer);
-	cutbuffer = NULL;
+    /* If we cut the magicline may was well not crash :/ */
+    if (!u->cutbuffer)
+	return;
 
-	/* 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++) {
+    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 */
+	for (c = u->cutbuffer, t = openfile->current; c->next != NULL && t->next != NULL; ) {
 
 #ifdef DEBUG
-	    fprintf(stderr, "Advancing, lineno  = %d, data = \"%s\"\n", t->lineno, t->data);
+	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;
-	}
+	    c = c->next;
+	    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();
+    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_needed = TRUE;
 }
 
 /* Undo the last thing(s) we did */
@@ -483,13 +482,15 @@ void do_undo(void)
 	    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);
+	undidmsg = _("line wrap");
+	f->data = nrealloc(f->data, strlen(f->data) + strlen(u->strdata) + 1);
+	strcpy(&f->data[strlen(f->data) - 1], u->strdata);
+	if (u->strdata2 != NULL)
+	    f->next->data = mallocstrcpy(f->next->data, u->strdata2);
+	else {
+	    filestruct *foo = openfile->current->next;
+	    unlink_node(foo);
+	    delete_node(foo);
 	}
 	renumber(f);
 	break;
@@ -505,7 +506,6 @@ void do_undo(void)
 	renumber(f);
 	break;
     case CUT:
-    case CUTTOEND:
 	undidmsg = _("text cut");
         undo_cut(u);
 	break;
@@ -513,6 +513,16 @@ void do_undo(void)
 	undidmsg = _("text uncut");
 	redo_cut(u);
 	break;
+    case ENTER:
+	undidmsg = _("line break");
+	if (f->next) {
+	    filestruct *foo = f->next;
+	    f->data = nrealloc(f->data, strlen(f->data) + strlen(f->next->data) + 1);
+	    strcat(f->data,  f->next->data);
+	    unlink_node(foo);
+	    delete_node(foo);
+	}
+	break;
     case INSERT:
 	undidmsg = _("text insert");
 	cutbuffer = NULL;
@@ -537,11 +547,13 @@ void do_undo(void)
 	u->strdata = f->data;
 	f->data = data;
 	break;
+
     default:
 	undidmsg = _("Internal error: unknown type.  Please save your work");
 	break;
 
     }
+    renumber(f);
     do_gotolinecolumn(u->lineno, u->begin, FALSE, FALSE, FALSE, TRUE);
     statusbar(_("Undid action (%s)"), undidmsg);
     openfile->current_undo = openfile->current_undo->next;
@@ -551,9 +563,8 @@ void do_undo(void)
 void do_redo(void)
 {
     undo *u = openfile->undotop;
-    filestruct *f = openfile->current, *t;
-    filestruct *oldcutbuffer = cutbuffer, *oldcutbottom = cutbottom;
-    int len = 0, i;
+    filestruct *f = openfile->current;
+    int len = 0;
     char *undidmsg, *data;
 
     for (; u != NULL && u->next != openfile->current_undo; u = u->next)
@@ -602,15 +613,16 @@ void do_redo(void)
 	free(f->data);
 	f->data = data;
 	break;
+    case ENTER:
+	undidmsg = _("line break");
+	do_gotolinecolumn(u->lineno, u->begin+1, FALSE, FALSE, FALSE, FALSE);
+	do_enter(TRUE);
+	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);
+	undidmsg = _("line wrap");
+	if (u->xflags & UNDO_SPLIT_MADENEW)
+	    prepend_wrap = TRUE;
+        do_wrap(f, TRUE);
 	renumber(f);
 	break;
     case UNSPLIT:
@@ -629,7 +641,6 @@ void do_redo(void)
 	renumber(f);
 	break;
     case CUT:
-    case CUTTOEND:
 	undidmsg = _("text cut");
 	redo_cut(u);
 	break;
@@ -664,7 +675,7 @@ void do_redo(void)
 #endif /* !NANO_TINY */
 
 /* Someone hits Enter *gasp!* */
-void do_enter(void)
+void do_enter(bool undoing)
 {
     filestruct *newnode = make_new_node(openfile->current);
     size_t extra = 0;
@@ -672,7 +683,8 @@ void do_enter(void)
     assert(openfile->current != NULL && openfile->current->data != NULL);
 
 #ifndef NANO_TINY
-    update_undo(SPLIT);
+    if (!undoing)
+	add_undo(ENTER);
 
 
     /* Do auto-indenting, like the neolithic Turbo Pascal editor. */
@@ -719,7 +731,7 @@ void do_enter(void)
 
     openfile->placewewant = xplustabs();
 
-    edit_refresh();
+    edit_refresh_needed = TRUE;
 }
 
 #ifndef NANO_TINY
@@ -819,9 +831,14 @@ bool execute_command(const char *command)
 /* Add a new undo struct to the top of the current pile */
 void add_undo(undo_type current_action)
 {
-    undo *u, *cutu;
+    undo *u;
     char *data;
     openfilestruct *fs = openfile;
+    static undo *last_cutu = NULL; /* Last thing we cut to set up the undo for uncut */
+    ssize_t wrap_loc;	/* For calculating split beginning */
+
+    if (!use_undo)
+	return;
 
     /* Ugh, if we were called while cutting not-to-end, non-marked and on the same lineno,
        we need to  abort here */
@@ -850,13 +867,14 @@ void add_undo(undo_type current_action)
     fs->undotop = u;
     fs->current_undo = u;
     u->strdata = NULL;
+    u->strdata2 = 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;
+    u->to_end = FALSE;
 
     switch (u->type) {
     /* We need to start copying data into the undo buffer or we wont be able
@@ -882,36 +900,42 @@ void add_undo(undo_type current_action)
 	    u->strdata = data;
 	}
 	break;
-    case INSERT:
     case SPLIT:
+	wrap_loc = break_line(openfile->current->data, fill
+#ifndef DISABLE_HELP
+	, FALSE
+#endif
+	);
+	u->strdata = mallocstrcpy(NULL, &openfile->current->data[wrap_loc]);
+	/* Don't both saving the next line if we're not prepending as a new line
+	   will be created */
+	if (prepend_wrap)
+	    u->strdata2 = mallocstrcpy(NULL, fs->current->next->data);
+	u->begin = wrap_loc;
+	break;
+    case INSERT:
     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);
+	u->to_end = (ISSET(CUT_TO_END)) ? TRUE : FALSE;
+	last_cutu = u;
 	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
+	if (!last_cutu)
 	    statusbar(_("Internal error: can't setup uncut.  Please save your work."));
+	else if (last_cutu->type == CUT) {
+	    u->cutbuffer = last_cutu->cutbuffer;
+	    u->cutbottom = last_cutu->cutbottom;
+	}
+	break;
+    case ENTER:
 	break;
     case OTHER:
 	statusbar(_("Internal error: unknown type.  Please save your work."));
@@ -921,7 +945,7 @@ void add_undo(undo_type current_action)
 #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");
+    fprintf(stderr, "left add_undo...\n");
 #endif
     fs->last_action = current_action;
 }
@@ -938,6 +962,9 @@ void update_undo(undo_type action)
     int len = 0;
     openfilestruct *fs = openfile;
 
+    if (!use_undo)
+	return;
+
 #ifdef DEBUG
         fprintf(stderr, "action = %d, fs->last_action = %d,  openfile->current->lineno = %d",
 		action, fs->last_action, openfile->current->lineno);
@@ -950,7 +977,7 @@ void update_undo(undo_type action)
     /* 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
+	|| (action != CUT && action != INSERT && action != SPLIT
 	    && openfile->current->lineno != fs->current_undo->lineno)) {
         add_undo(action);
 	return;
@@ -1015,12 +1042,14 @@ void update_undo(undo_type action)
 #endif
 	break;
     case CUT:
-    case CUTTOEND:
+	if (!cutbuffer)
+	    break;
 	if (u->cutbuffer)
 	    free(u->cutbuffer);
 	u->cutbuffer = copy_filestruct(cutbuffer);
-	u->cutbottom = cutbottom;
-	u->linescut++;
+        /* Compute cutbottom for the uncut using out copy */
+        for (u->cutbottom = u->cutbuffer; u->cutbottom->next != NULL; u->cutbottom = u->cutbottom->next)
+            ;
 	break;
     case REPLACE:
     case UNCUT:
@@ -1028,9 +1057,15 @@ void update_undo(undo_type action)
 	break;
     case INSERT:
 	u->mark_begin_lineno = openfile->current->lineno;
+	break;
     case SPLIT:
+	/* This will only be called if we made a completely new line,
+	   and as such we should note that so we can destroy it later */
+	u->xflags = UNDO_SPLIT_MADENEW;
+	break;
     case UNSPLIT:
 	/* These cases are handled by the earlier check for a new line and action */
+    case ENTER:
     case OTHER:
 	break;
     }
@@ -1060,7 +1095,7 @@ void wrap_reset(void)
 /* We wrap the given line.  Precondition: we assume the cursor has been
  * moved forward since the last typed character.  Return TRUE if we
  * wrapped, and FALSE otherwise. */
-bool do_wrap(filestruct *line)
+bool do_wrap(filestruct *line, bool undoing)
 {
     size_t line_len;
 	/* The length of the line we wrap. */
@@ -1125,6 +1160,9 @@ bool do_wrap(filestruct *line)
 	return FALSE;
 
 #ifndef NANO_TINY
+    if (!undoing)
+	add_undo(SPLIT);
+
     /* If autoindent is turned on, and we're on the character just after
      * the indentation, we don't wrap. */
     if (ISSET(AUTOINDENT)) {
@@ -1219,6 +1257,8 @@ bool do_wrap(filestruct *line)
     null_at(&line->data, wrap_loc);
 
     if (prepending) {
+	if (!undoing)
+	    update_undo(SPLIT);
 	/* If we're prepending, copy the text from the next line, minus
 	 * the indentation that we already copied above. */
 	strcat(new_line, next_line);
@@ -1966,7 +2006,7 @@ void do_justify(bool full_justify)
 		last_par_line = openfile->filebot;
 		break;
 	    } else {
-		edit_refresh();
+		edit_refresh_needed = TRUE;
 		return;
 	    }
 	}
@@ -2230,7 +2270,7 @@ void do_justify(bool full_justify)
 	&finished, FALSE);
     s = get_shortcut(currmenu, &kbinput, &meta_key, &func_key);
 
-    if (s && s->scfunc == do_uncut_text) {
+    if (s && s->scfunc == DO_UNCUT_TEXT) {
 	/* Splice the justify buffer back into the file, but only if we
 	 * actually justified something. */
 	if (first_par_line != NULL) {
@@ -2278,7 +2318,7 @@ void do_justify(bool full_justify)
 
 	    if (!openfile->modified)
 		titlebar(NULL);
-	    edit_refresh();
+	    edit_refresh_needed = TRUE;
 	}
     } else {
 	unget_kbinput(kbinput, meta_key, func_key);
@@ -2631,7 +2671,7 @@ const char *do_int_speller(const char *tempfile_name)
 
     free(read_buff);
     search_replace_abort();
-    edit_refresh();
+    edit_refresh_needed = TRUE;
 
     /* Process the end of the spell process. */
     waitpid(pid_spell, &spell_status, 0);

src/utils.c

@@ -183,14 +183,7 @@ void sunder(char *str)
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
  * 02110-1301, USA. */
 
-#if !defined(NANO_TINY) && defined(ENABLE_NANORC)
-#ifndef HAVE_GETLINE
-/* This function is equivalent to getline(). */
-ssize_t ngetline(char **lineptr, size_t *n, FILE *stream)
-{
-    return getdelim(lineptr, n, '\n', stream);
-}
-#endif
+#ifdef ENABLE_NANORC
 
 #ifndef HAVE_GETDELIM
 /* This function is equivalent to getdelim(). */
@@ -242,7 +235,15 @@ ssize_t ngetdelim(char **lineptr, size_t *n, int delim, FILE *stream)
     return (c == EOF && (indx - 1) == 0) ? -1 : indx - 1;
 }
 #endif
-#endif /* !NANO_TINY && ENABLE_NANORC */
+
+#ifndef HAVE_GETLINE
+/* This function is equivalent to getline(). */
+ssize_t ngetline(char **lineptr, size_t *n, FILE *stream)
+{
+    return getdelim(lineptr, n, '\n', stream);
+}
+#endif
+#endif /* ENABLE_NANORC */
 
 #ifdef HAVE_REGEX_H
 /* Do the compiled regex in preg and the regex in string match the
@@ -541,6 +542,9 @@ void new_magicline(void)
     openfile->filebot->next->prev = openfile->filebot;
     openfile->filebot->next->next = NULL;
     openfile->filebot->next->lineno = openfile->filebot->lineno + 1;
+#ifdef ENABLE_COLOR
+    openfile->filebot->next->multidata = NULL;
+#endif
     openfile->filebot = openfile->filebot->next;
     openfile->totsize++;
 }

src/winio.c

@@ -1,4 +1,3 @@
-
 /* $Id$ */
 /**************************************************************************
  *   winio.c                                                              *
@@ -123,17 +122,21 @@ void get_key_buffer(WINDOW *win)
     doupdate();
 
     errcount = 0;
-    while ((input = wgetch(win)) == ERR) {
-	errcount++;
+    if (nodelay_mode) {
+	if ((input =  wgetch(win)) == ERR)
+           return;
+    } else
+	while ((input = wgetch(win)) == ERR) {
+	    errcount++;
 
-	/* If we've failed to get a character MAX_BUF_SIZE times in a
-	 * row, assume that the input source we were using is gone and
-	 * die gracefully.  We could check if errno is set to EIO
-	 * ("Input/output error") and die gracefully in that case, but
-	 * it's not always set properly.  Argh. */
-	if (errcount == MAX_BUF_SIZE)
-	    handle_hupterm(0);
-    }
+	    /* If we've failed to get a character MAX_BUF_SIZE times in a
+	     * row, assume that the input source we were using is gone and
+	     * die gracefully.  We could check if errno is set to EIO
+	     * ("Input/output error") and die gracefully in that case, but
+	     * it's not always set properly.  Argh. */
+	    if (errcount == MAX_BUF_SIZE)
+		handle_hupterm(0);
+	}
 
 #ifndef NANO_TINY
     allow_pending_sigwinch(FALSE);
@@ -331,7 +334,12 @@ int parse_kbinput(WINDOW *win, bool *meta_key, bool *func_key)
     *func_key = FALSE;
 
     /* Read in a character. */
-    while ((kbinput = get_input(win, 1)) == NULL);
+    if (nodelay_mode) {
+	kbinput = get_input(win, 1);
+	if (kbinput == 0)
+	    return 0;
+    } else
+	while ((kbinput = get_input(win, 1)) == NULL);
 
     switch (*kbinput) {
 	case ERR:
@@ -489,36 +497,36 @@ int parse_kbinput(WINDOW *win, bool *meta_key, bool *func_key)
     if (retval != ERR) {
 	switch (retval) {
 	    case NANO_CONTROL_8:
-		retval = ISSET(REBIND_DELETE) ? sc_seq_or(do_delete, 0) :
-			sc_seq_or(do_backspace, 0);
+		retval = ISSET(REBIND_DELETE) ? sc_seq_or(DO_DELETE, 0) :
+			sc_seq_or(DO_BACKSPACE, 0);
 		break;
 	    case KEY_DOWN:
 #ifdef KEY_SDOWN
 	    /* ncurses and Slang don't support KEY_SDOWN. */
 	    case KEY_SDOWN:
 #endif
-		retval = sc_seq_or((void *) do_down_void, *kbinput);
+		retval = sc_seq_or(DO_DOWN_VOID, *kbinput);
 		break;
 	    case KEY_UP:
 #ifdef KEY_SUP
 	    /* ncurses and Slang don't support KEY_SUP. */
 	    case KEY_SUP:
 #endif
-		retval = sc_seq_or((void *) do_up_void, *kbinput);
+		retval = sc_seq_or(DO_UP_VOID, *kbinput);
 		break;
 	    case KEY_LEFT:
 #ifdef KEY_SLEFT
 	    /* Slang doesn't support KEY_SLEFT. */
 	    case KEY_SLEFT:
 #endif
-		retval = sc_seq_or((void *) do_left, *kbinput);
+		retval = sc_seq_or(DO_LEFT, *kbinput);
 		break;
 	    case KEY_RIGHT:
 #ifdef KEY_SRIGHT
 	    /* Slang doesn't support KEY_SRIGHT. */
 	    case KEY_SRIGHT:
 #endif
-		retval = sc_seq_or((void *) do_right, *kbinput);
+		retval = sc_seq_or(DO_RIGHT, *kbinput);
 		break;
 #ifdef KEY_SHOME
 	    /* HP-UX 10-11 and Slang don't support KEY_SHOME. */
@@ -526,36 +534,36 @@ int parse_kbinput(WINDOW *win, bool *meta_key, bool *func_key)
 #endif
 	    case KEY_A1:	/* Home (7) on numeric keypad with
 				 * NumLock off. */
-		retval = sc_seq_or((void *) do_home, *kbinput);
+		retval = sc_seq_or(DO_HOME, *kbinput);
 		break;
 	    case KEY_BACKSPACE:
-		retval = sc_seq_or((void *) do_backspace, *kbinput);
+		retval = sc_seq_or(DO_BACKSPACE, *kbinput);
 		break;
 #ifdef KEY_SDC
 	    /* Slang doesn't support KEY_SDC. */
 	    case KEY_SDC:
 		if (ISSET(REBIND_DELETE))
-		   retval = sc_seq_or((void *) do_delete, *kbinput);
+		   retval = sc_seq_or(DO_DELETE, *kbinput);
 		else
-		   retval = sc_seq_or((void *) do_backspace, *kbinput);
+		   retval = sc_seq_or(DO_BACKSPACE, *kbinput);
 		break;
 #endif
 #ifdef KEY_SIC
 	    /* Slang doesn't support KEY_SIC. */
 	    case KEY_SIC:
-		retval = sc_seq_or((void *) do_insertfile_void, *kbinput);
+		retval = sc_seq_or(DO_INSERTFILE_VOID, *kbinput);
 		break;
 #endif
 	    case KEY_C3:	/* PageDown (4) on numeric keypad with
 				 * NumLock off. */
-		retval = sc_seq_or((void *) do_page_down, *kbinput);
+		retval = sc_seq_or(DO_PAGE_DOWN, *kbinput);
 		break;
 	    case KEY_A3:	/* PageUp (9) on numeric keypad with
 				 * NumLock off. */
-		retval = sc_seq_or((void *) do_page_up, *kbinput);
+		retval = sc_seq_or(DO_PAGE_UP, *kbinput);
 		break;
 	    case KEY_ENTER:
-		retval = sc_seq_or((void *) do_enter, *kbinput);
+		retval = sc_seq_or(DO_ENTER, *kbinput);
 		break;
 	    case KEY_B2:	/* Center (5) on numeric keypad with
 				 * NumLock off. */
@@ -567,7 +575,7 @@ int parse_kbinput(WINDOW *win, bool *meta_key, bool *func_key)
 	    /* HP-UX 10-11 and Slang don't support KEY_SEND. */
 	    case KEY_SEND:
 #endif
-		retval = sc_seq_or((void *) do_end, *kbinput);
+		retval = sc_seq_or(DO_END, *kbinput);
 		break;
 #ifdef KEY_BEG
 	    /* Slang doesn't support KEY_BEG. */
@@ -583,7 +591,7 @@ int parse_kbinput(WINDOW *win, bool *meta_key, bool *func_key)
 	    /* Slang doesn't support KEY_SCANCEL. */
 	    case KEY_SCANCEL:
 #endif
-		retval = first_sc_for(currmenu, (void *) cancel_msg)->seq;
+		retval = first_sc_for(currmenu, CANCEL_MSG)->seq;
 		break;
 #endif
 #ifdef KEY_SBEG
@@ -596,13 +604,13 @@ int parse_kbinput(WINDOW *win, bool *meta_key, bool *func_key)
 #ifdef KEY_SSUSPEND
 	    /* Slang doesn't support KEY_SSUSPEND. */
 	    case KEY_SSUSPEND:
-		retval = sc_seq_or(do_suspend_void, 0);
+		retval = sc_seq_or(DO_SUSPEND_VOID, 0);
 		break;
 #endif
 #ifdef KEY_SUSPEND
 	    /* Slang doesn't support KEY_SUSPEND. */
 	    case KEY_SUSPEND:
-		retval =  sc_seq_or(do_suspend_void, 0);
+		retval =  sc_seq_or(DO_SUSPEND_VOID, 0);
 		break;
 #endif
 #ifdef PDCURSES
@@ -750,15 +758,15 @@ int get_escape_seq_kbinput(const int *seq, size_t seq_len)
 			retval = KEY_B2;
 			break;
 		    case 'F': /* Esc O F == End on xterm/Terminal. */
-			retval = sc_seq_or(do_end, 0);
+			retval = sc_seq_or(DO_END, 0);
 			break;
 		    case 'H': /* Esc O H == Home on xterm/Terminal. */
-			retval = sc_seq_or(do_home, 0);;
+			retval = sc_seq_or(DO_HOME, 0);;
 			break;
 		    case 'M': /* Esc O M == Enter on numeric keypad with
 			       * NumLock off on VT100/VT220/VT320/xterm/
 			       * rxvt/Eterm. */
-			retval = sc_seq_or(do_home, 0);;
+			retval = sc_seq_or(DO_HOME, 0);;
 			break;
 		    case 'P': /* Esc O P == F1 on VT100/VT220/VT320/Mach
 			       * console. */
@@ -823,7 +831,7 @@ int get_escape_seq_kbinput(const int *seq, size_t seq_len)
 		    case 'n': /* Esc O n == Delete (.) on numeric keypad
 			       * with NumLock off on VT100/VT220/VT320/
 			       * xterm/rxvt/Eterm/Terminal. */
-			retval = sc_seq_or(do_delete, 0);;
+			retval = sc_seq_or(DO_DELETE, 0);;
 			break;
 		    case 'o': /* Esc O o == '/' on numeric keypad with
 			       * NumLock off on VT100/VT220/VT320/xterm/
@@ -833,27 +841,27 @@ int get_escape_seq_kbinput(const int *seq, size_t seq_len)
 		    case 'p': /* Esc O p == Insert (0) on numeric keypad
 			       * with NumLock off on VT100/VT220/VT320/
 			       * rxvt/Eterm/Terminal. */
-			retval = sc_seq_or(do_insertfile_void, 0);;
+			retval = sc_seq_or(DO_INSERTFILE_VOID, 0);;
 			break;
 		    case 'q': /* Esc O q == End (1) on numeric keypad
 			       * with NumLock off on VT100/VT220/VT320/
 			       * rxvt/Eterm/Terminal. */
-			retval = sc_seq_or(do_end, 0);;
+			retval = sc_seq_or(DO_END, 0);;
 			break;
 		    case 'r': /* Esc O r == Down (2) on numeric keypad
 			       * with NumLock off on VT100/VT220/VT320/
 			       * rxvt/Eterm/Terminal. */
-			retval = sc_seq_or(do_down_void, 0);;
+			retval = sc_seq_or(DO_DOWN_VOID, 0);;
 			break;
 		    case 's': /* Esc O s == PageDown (3) on numeric
 			       * keypad with NumLock off on VT100/VT220/
 			       * VT320/rxvt/Eterm/Terminal. */
-			retval = sc_seq_or(do_page_down, 0);;
+			retval = sc_seq_or(DO_PAGE_DOWN, 0);;
 			break;
 		    case 't': /* Esc O t == Left (4) on numeric keypad
 			       * with NumLock off on VT100/VT220/VT320/
 			       * rxvt/Eterm/Terminal. */
-			retval = sc_seq_or(do_left, 0);;
+			retval = sc_seq_or(DO_LEFT, 0);;
 			break;
 		    case 'u': /* Esc O u == Center (5) on numeric keypad
 			       * with NumLock off on VT100/VT220/VT320/
@@ -863,22 +871,22 @@ int get_escape_seq_kbinput(const int *seq, size_t seq_len)
 		    case 'v': /* Esc O v == Right (6) on numeric keypad
 			       * with NumLock off on VT100/VT220/VT320/
 			       * rxvt/Eterm/Terminal. */
-			retval = sc_seq_or(do_right, 0);
+			retval = sc_seq_or(DO_RIGHT, 0);
 			break;
 		    case 'w': /* Esc O w == Home (7) on numeric keypad
 			       * with NumLock off on VT100/VT220/VT320/
 			       * rxvt/Eterm/Terminal. */
-			retval = sc_seq_or(do_home, 0);;
+			retval = sc_seq_or(DO_HOME, 0);
 			break;
 		    case 'x': /* Esc O x == Up (8) on numeric keypad
 			       * with NumLock off on VT100/VT220/VT320/
 			       * rxvt/Eterm/Terminal. */
-			retval = sc_seq_or(do_up_void, 0);;
+			retval = sc_seq_or(DO_UP_VOID, 0);
 			break;
 		    case 'y': /* Esc O y == PageUp (9) on numeric keypad
 			       * with NumLock off on VT100/VT220/VT320/
 			       * rxvt/Eterm/Terminal. */
-			retval = sc_seq_or(do_up, 0);;
+			retval = sc_seq_or(DO_PAGE_UP, 0);
 			break;
 		}
 		break;
@@ -972,7 +980,7 @@ int get_escape_seq_kbinput(const int *seq, size_t seq_len)
 				    break;
 				default: /* Esc [ 1 ~ == Home on
 					  * VT320/Linux console. */
-				    retval = sc_seq_or(do_home, 0);;
+				    retval = sc_seq_or(DO_HOME, 0);;
 				    break;
 			    }
 			}
@@ -1023,40 +1031,40 @@ int get_escape_seq_kbinput(const int *seq, size_t seq_len)
 				default: /* Esc [ 2 ~ == Insert on
 					  * VT220/VT320/Linux console/
 					  * xterm/Terminal. */
-				    retval = sc_seq_or(do_insertfile_void, 0);;
+				    retval = sc_seq_or(DO_INSERTFILE_VOID, 0);;
 				    break;
 			    }
 			}
 			break;
 		    case '3': /* Esc [ 3 ~ == Delete on VT220/VT320/
 			       * Linux console/xterm/Terminal. */
-			retval = sc_seq_or(do_delete, 0);;
+			retval = sc_seq_or(DO_DELETE, 0);;
 			break;
 		    case '4': /* Esc [ 4 ~ == End on VT220/VT320/Linux
 			       * console/xterm. */
-			retval = sc_seq_or(do_end, 0);;
+			retval = sc_seq_or(DO_END, 0);;
 			break;
 		    case '5': /* Esc [ 5 ~ == PageUp on VT220/VT320/
 			       * Linux console/xterm/Terminal;
 			       * Esc [ 5 ^ == PageUp on Eterm. */
-			retval = sc_seq_or(do_page_up, 0);;
+			retval = sc_seq_or(DO_PAGE_UP, 0);;
 			break;
 		    case '6': /* Esc [ 6 ~ == PageDown on VT220/VT320/
 			       * Linux console/xterm/Terminal;
 			        * Esc [ 6 ^ == PageDown on Eterm. */
-			retval = sc_seq_or(do_page_down, 0);;
+			retval = sc_seq_or(DO_PAGE_DOWN, 0);;
 			break;
 		    case '7': /* Esc [ 7 ~ == Home on rxvt. */
-			retval = sc_seq_or(do_home, 0);
+			retval = sc_seq_or(DO_HOME, 0);
 			break;
 		    case '8': /* Esc [ 8 ~ == End on rxvt. */
-			retval = sc_seq_or(do_end, 0);
+			retval = sc_seq_or(DO_END, 0);
 			break;
 		    case '9': /* Esc [ 9 == Delete on Mach console. */
-			retval = sc_seq_or(do_delete, 0);;
+			retval = sc_seq_or(DO_DELETE, 0);;
 			break;
 		    case '@': /* Esc [ @ == Insert on Mach console. */
-			retval = sc_seq_or(do_insertfile_void, 0);;
+			retval = sc_seq_or(DO_INSERTFILE_VOID, 0);;
 			break;
 		    case 'A': /* Esc [ A == Up on ANSI/VT220/Linux
 			       * console/FreeBSD console/Mach console/
@@ -1079,23 +1087,23 @@ int get_escape_seq_kbinput(const int *seq, size_t seq_len)
 			break;
 		    case 'F': /* Esc [ F == End on FreeBSD
 			       * console/Eterm. */
-			retval = sc_seq_or(do_end, 0);
+			retval = sc_seq_or(DO_END, 0);
 			break;
 		    case 'G': /* Esc [ G == PageDown on FreeBSD
 			       * console. */
-			retval = sc_seq_or(do_page_down, 0);
+			retval = sc_seq_or(DO_PAGE_DOWN, 0);
 			break;
 		    case 'H': /* Esc [ H == Home on ANSI/VT220/FreeBSD
 			       * console/Mach console/Eterm. */
-			retval = sc_seq_or(do_home, 0);
+			retval = sc_seq_or(DO_HOME, 0);
 			break;
 		    case 'I': /* Esc [ I == PageUp on FreeBSD
 			       * console. */
-			retval = sc_seq_or(do_page_up, 0);
+			retval = sc_seq_or(DO_PAGE_UP, 0);
 			break;
 		    case 'L': /* Esc [ L == Insert on ANSI/FreeBSD
 			       * console. */
-			retval = sc_seq_or(do_insertfile_void, 0);
+			retval = sc_seq_or(DO_INSERTFILE_VOID, 0);
 			break;
 		    case 'M': /* Esc [ M == F1 on FreeBSD console. */
 			retval = KEY_F(1);
@@ -1143,10 +1151,10 @@ int get_escape_seq_kbinput(const int *seq, size_t seq_len)
 			retval = KEY_F(8);
 			break;
 		    case 'U': /* Esc [ U == PageDown on Mach console. */
-			retval = sc_seq_or(do_page_down, 0);
+			retval = sc_seq_or(DO_PAGE_DOWN, 0);
 			break;
 		    case 'V': /* Esc [ V == PageUp on Mach console. */
-			retval = sc_seq_or(do_page_up, 0);
+			retval = sc_seq_or(DO_PAGE_UP, 0);
 			break;
 		    case 'W': /* Esc [ W == F11 on FreeBSD console. */
 			retval = KEY_F(11);
@@ -1155,7 +1163,7 @@ int get_escape_seq_kbinput(const int *seq, size_t seq_len)
 			retval = KEY_F(12);
 			break;
 		    case 'Y': /* Esc [ Y == End on Mach console. */
-			retval = sc_seq_or(do_end, 0);
+			retval = sc_seq_or(DO_END, 0);
 			break;
 		    case 'Z': /* Esc [ Z == F14 on FreeBSD console. */
 			retval = KEY_F(14);
@@ -1212,13 +1220,13 @@ int get_escape_seq_abcd(int kbinput)
 {
     switch (tolower(kbinput)) {
 	case 'a':
-	    return sc_seq_or(do_up_void, 0);;
+	    return sc_seq_or(DO_UP_VOID, 0);;
 	case 'b':
-	    return sc_seq_or(do_down_void, 0);;
+	    return sc_seq_or(DO_DOWN_VOID, 0);;
 	case 'c':
-	    return sc_seq_or(do_right, 0);;
+	    return sc_seq_or(DO_RIGHT, 0);;
 	case 'd':
-	    return sc_seq_or(do_left, 0);;
+	    return sc_seq_or(DO_LEFT, 0);;
 	default:
 	    return ERR;
     }
@@ -1709,7 +1717,7 @@ int get_mouseinput(int *mouse_x, int *mouse_y, bool allow_shortcuts)
 
 	    /* And put back the equivalent key. */
 	    if (f != NULL) {
-                const sc *s = first_sc_for(currmenu, (void *) f->scfunc);
+                const sc *s = first_sc_for(currmenu, f->scfunc);
 		if (s != NULL)
 		    unget_kbinput(s->seq, s->type == META, FALSE);
 	    }
@@ -1738,7 +1746,7 @@ int get_mouseinput(int *mouse_x, int *mouse_y, bool allow_shortcuts)
 	     * wheel is equivalent to moving down three lines. */
 	    for (i = 0; i < 3; i++)
 		unget_kbinput((mevent.bstate & BUTTON4_PRESSED) ?
-			 sc_seq_or(do_up_void, 0) : sc_seq_or(do_down_void, 0);, FALSE,
+			 sc_seq_or(do_up_void, 0) : sc_seq_or(DO_DOWN_VOID, 0);, FALSE,
 			FALSE);
 
 	    return 1;
@@ -1790,6 +1798,32 @@ const sc *get_shortcut(int menu, int *kbinput, bool
     return NULL;
 }
 
+
+/* Try to get a function back from a window.  Just a wrapper so
+   functions to need to create function_key meta_key blah blah 
+    mmenu - what menu name to look through for valid funcs */
+const subnfunc *getfuncfromkey(WINDOW *win)
+{
+    int kbinput;
+    bool func_key = FALSE, meta_key = FALSE;
+    const sc *s;
+    const subnfunc *f;
+
+    kbinput = parse_kbinput(win, &meta_key, &func_key);
+    if (kbinput == 0)
+	return NULL;
+
+    s = get_shortcut(currmenu, &kbinput, &meta_key, &func_key);
+    if (!s)
+	return NULL;
+
+    f = sctofunc((sc *) s);
+    return f;
+
+}
+
+
+
 /* Move to (x, y) in win, and display a line of n spaces with the
  * current attributes. */
 void blank_line(WINDOW *win, int y, int x, int n)
@@ -2416,7 +2450,7 @@ void reset_cursor(void)
  * character of this page.  That is, the first character of converted
  * corresponds to character number actual_x(fileptr->data, start) of the
  * line. */
-void edit_draw(const filestruct *fileptr, const char *converted, int
+void edit_draw(filestruct *fileptr, const char *converted, int
 	line, size_t start)
 {
 #if !defined(NANO_TINY) || defined(ENABLE_COLOR)
@@ -2444,6 +2478,14 @@ void edit_draw(const filestruct *fileptr, const char *converted, int
     if (openfile->colorstrings != NULL && !ISSET(NO_COLOR_SYNTAX)) {
 	const colortype *tmpcolor = openfile->colorstrings;
 
+	/* Set up multi-line color data for this line if it's not yet calculated  */
+        if (fileptr->multidata == NULL && openfile->syntax
+		&& openfile->syntax->nmultis > 0) {
+ 	    int i;
+	    fileptr->multidata = nmalloc(openfile->syntax->nmultis * sizeof(short));
+            for (i = 0; i < openfile->syntax->nmultis; i++)
+		fileptr->multidata[i] = -1;	/* Assue this applies until we know otherwise */
+	}
 	for (; tmpcolor != NULL; tmpcolor = tmpcolor->next) {
 	    int x_start;
 		/* Starting column for mvwaddnstr.  Zero-based. */
@@ -2509,7 +2551,7 @@ void edit_draw(const filestruct *fileptr, const char *converted, int
 		    }
 		    k = startmatch.rm_eo;
 		}
-	    } else {
+	    } else if (fileptr->multidata != NULL && fileptr->multidata[tmpcolor->id] != CNONE) {
 		/* This is a multi-line regex.  There are two steps.
 		 * First, we have to see if the beginning of the line is
 		 * colored by a start on an earlier line, and an end on
@@ -2526,6 +2568,22 @@ void edit_draw(const filestruct *fileptr, const char *converted, int
 		regoff_t start_col;
 		    /* Where it starts in that line. */
 		const filestruct *end_line;
+		short md = fileptr->multidata[tmpcolor->id];
+
+		if (md == -1)
+		    fileptr->multidata[tmpcolor->id] = CNONE; /* until we find out otherwise */
+		else if (md == CNONE)
+		    continue;
+		else if (md == CWHOLELINE) {
+		    mvwaddnstr(edit, line, 0, converted, -1);
+		    continue;
+		} else if (md == CBEGINBEFORE) {
+		    regexec(tmpcolor->end, fileptr->data, 1, &endmatch, 0);
+		    paintlen = actual_x(converted, strnlenpt(fileptr->data,
+			endmatch.rm_eo) - start);
+		    mvwaddnstr(edit, line, 0, converted, paintlen);
+		    continue;
+		}
 
 		while (start_line != NULL && regexec(tmpcolor->start,
 			start_line->data, 1, &startmatch, 0) ==
@@ -2589,15 +2647,16 @@ void edit_draw(const filestruct *fileptr, const char *converted, int
 		     * expanded location of the end of the match minus
 		     * the expanded location of the beginning of the
 		     * page. */
-		    if (end_line != fileptr)
+		    if (end_line != fileptr) {
 			paintlen = -1;
-		    else
+			fileptr->multidata[tmpcolor->id] = CWHOLELINE;
+		    } else {
 			paintlen = actual_x(converted,
 				strnlenpt(fileptr->data,
 				endmatch.rm_eo) - start);
-
+			fileptr->multidata[tmpcolor->id] = CBEGINBEFORE;
+		    }
 		    mvwaddnstr(edit, line, 0, converted, paintlen);
-
   step_two:
 		    /* Second step, we look for starts on this line. */
 		    start_col = 0;
@@ -2642,6 +2701,9 @@ void edit_draw(const filestruct *fileptr, const char *converted, int
 
 				mvwaddnstr(edit, line, x_start,
 					converted + index, paintlen);
+				if (paintlen > 0)
+				    fileptr->multidata[tmpcolor->id] = CSTARTENDHERE;
+
 			    }
 			} else {
 			    /* There is no end on this line.  But we
@@ -2662,6 +2724,7 @@ void edit_draw(const filestruct *fileptr, const char *converted, int
 				/* We painted to the end of the line, so
 				 * don't bother checking any more
 				 * starts. */
+				fileptr->multidata[tmpcolor->id] = CENDAFTER;
 				break;
 			    }
 			}
@@ -2751,7 +2814,7 @@ void edit_draw(const filestruct *fileptr, const char *converted, int
 /* Just update one line in the edit buffer.  This is basically a wrapper
  * for edit_draw().  The line will be displayed starting with
  * fileptr->data[index].  Likely arguments are current_x or zero. */
-void update_line(const filestruct *fileptr, size_t index)
+void update_line(filestruct *fileptr, size_t index)
 {
     int line;
 	/* The line in the edit window that we want to update. */
@@ -2824,7 +2887,7 @@ bool need_vertical_update(size_t pww_save)
 void edit_scroll(scroll_dir direction, ssize_t nlines)
 {
     bool do_redraw = need_vertical_update(0);
-    const filestruct *foo;
+    filestruct *foo;
     ssize_t i;
 
     /* Don't bother scrolling less than one line. */
@@ -2919,11 +2982,11 @@ void edit_scroll(scroll_dir direction, ssize_t nlines)
 
 /* Update any lines between old_current and current that need to be
  * updated.  Use this if we've moved without changing any text. */
-void edit_redraw(const filestruct *old_current, size_t pww_save)
+void edit_redraw(filestruct *old_current, size_t pww_save)
 {
     bool do_redraw = need_vertical_update(0) ||
 	need_vertical_update(pww_save);
-    const filestruct *foo = NULL;
+    filestruct *foo = NULL;
 
     /* If either old_current or current is offscreen, scroll the edit
      * window until it's onscreen and get out. */
@@ -3031,7 +3094,7 @@ void edit_redraw(const filestruct *old_current, size_t pww_save)
  * if we've moved and changed text. */
 void edit_refresh(void)
 {
-    const filestruct *foo;
+    filestruct *foo;
     int nlines;
 
     if (openfile->current->lineno < openfile->edittop->lineno ||
@@ -3183,6 +3246,19 @@ void do_cursorpos_void(void)
     do_cursorpos(FALSE);
 }
 
+void enable_nodelay(void)
+{
+   nodelay_mode = TRUE;
+   nodelay(edit, TRUE);
+}
+
+void disable_nodelay(void)
+{
+   nodelay_mode = FALSE;
+   nodelay(edit, FALSE);
+}
+
+
 /* Highlight the current word being replaced or spell checked.  We
  * expect word to have tabs and control characters expanded. */
 void do_replace_highlight(bool highlight, const char *word)