GNU nano 2.1.10 release

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

ChangeLog

@@ -1,3 +1,32 @@
+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

NEWS

@@ -1,3 +1,14 @@
+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 

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.9], [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,59 @@ 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

doc/man/Makefile.am

@@ -16,18 +16,18 @@ BUILT_SOURCES = nano.1.html rnano.1.html
 endif
 endif
 
-if GROFF_HTML
 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 

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

@@ -189,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

@@ -202,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

nano-regress

@@ -16,10 +16,11 @@ foreach my $name (@combos) {
     my @args = @$name;
     my $pct = $i / $#combos * 100;
     printf "Trying with options: @args, %d%% done...\n", $pct;
-    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/global.c

@@ -36,6 +36,9 @@ sigjmp_buf jump_buf;
 bool jump_buf_main = FALSE;
 	/* Have we set jump_buf so that we return to main() after a
 	 * SIGWINCH? */
+bool use_undo = FALSE;
+	/* Are we actually using the undo code - disabled by default
+	   as the undo code is too unstable */
 #endif
 
 #ifndef DISABLE_WRAPJUSTIFY
@@ -232,7 +235,7 @@ void add_to_funcs(short func, int menus, const char *desc, const char *help,
     subnfunc *f;
 
     if (allfuncs == NULL) {
-	allfuncs = nmalloc(sizeof(subnfunc));
+	allfuncs = (subnfunc *) nmalloc(sizeof(subnfunc));
 	f = allfuncs;
     } else {
 	for (f = allfuncs; f->next != NULL; f = f->next)
@@ -292,7 +295,7 @@ void add_to_sclist(int menu, char *scstring, short func, int toggle, int execute
     sc *s;
 
     if (sclist == NULL) {
-	sclist = nmalloc(sizeof(sc));
+	sclist = (sc *) nmalloc(sizeof(sc));
 	s = sclist;
         s->next = NULL;
     } else {
@@ -778,11 +781,13 @@ void shortcut_init(bool unjustify)
     add_to_funcs(DO_UNINDENT, MMAIN, N_("Unindent Text"),
 	IFSCHELP(nano_unindent_msg), FALSE, NOVIEW);
 
-    add_to_funcs(DO_UNDO, MMAIN, N_("Undo"),
-	IFSCHELP(nano_undo_msg), FALSE, NOVIEW);
+    if (use_undo) {
+	add_to_funcs(DO_UNDO, MMAIN, N_("Undo"),
+	    IFSCHELP(nano_undo_msg), FALSE, NOVIEW);
 
-    add_to_funcs(DO_REDO, MMAIN, N_("Redo"),
-	IFSCHELP(nano_redo_msg), TRUE, NOVIEW);
+	add_to_funcs(DO_REDO, MMAIN, N_("Redo"),
+	    IFSCHELP(nano_redo_msg), TRUE, NOVIEW);
+    }
 
 #endif
 
@@ -1064,8 +1069,10 @@ void shortcut_init(bool unjustify)
     add_to_sclist(MMAIN, "M-6", DO_COPY_TEXT, 0, TRUE);
     add_to_sclist(MMAIN, "M-}", DO_INDENT_VOID, 0, TRUE);
     add_to_sclist(MMAIN, "M-{", DO_UNINDENT, 0, TRUE);
-    add_to_sclist(MMAIN, "M-U", DO_UNDO, 0, TRUE);
-    add_to_sclist(MMAIN, "M-E", DO_REDO, 0, TRUE);
+    if (use_undo) {
+	add_to_sclist(MMAIN, "M-U", DO_UNDO, 0, TRUE);
+ 	add_to_sclist(MMAIN, "M-E", DO_REDO, 0, TRUE);
+    }
     add_to_sclist(MALL, "^F", DO_RIGHT, 0, TRUE);
     add_to_sclist(MALL, "^B", DO_LEFT, 0, TRUE);
     add_to_sclist(MMAIN, "^Space", DO_NEXT_WORD_VOID, 0, TRUE);
@@ -1214,7 +1221,7 @@ void iso_me_harder_funcmap(short func)
     else if (func == DO_RIGHT)
 	do_right();
     else if (func == DO_ENTER)
-	do_enter();
+	do_enter(FALSE);
     else if (func == DO_EXIT)
 	do_exit();
     else if (func == DO_FIRST_LINE)

src/nano.c

@@ -891,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"));
@@ -1853,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;
 	    }
@@ -1909,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. */
@@ -2012,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'},
@@ -2053,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:pqr:s:tvwxz",
+		"h?ABC:DEFHIKLNOQ:RST:UVWY:abcdefgijklmo:pqr:s:tuvwxz",
 		long_options, NULL)
 #else
 	getopt(argc, argv,
-		"h?ABC:DEFHIKLNOQ:RST:UVWY:abcdefgijklmo:pqr:s:tvwxz")
+		"h?ABC:DEFHIKLNOQ:RST:UVWY:abcdefgijklmo:pqr:s:tuvwxz")
 #endif
 		) != -1) {
 	switch (optchr) {
@@ -2206,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;

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,7 +180,7 @@ typedef enum {
 }  function_type;
 
 typedef enum {
-    ADD, DEL, REPLACE, SPLIT, UNSPLIT, CUT, UNCUT, INSERT, OTHER
+    ADD, DEL, REPLACE, SPLIT, UNSPLIT, CUT, UNCUT, ENTER, INSERT, OTHER
 } undo_type;
 
 #ifdef ENABLE_COLOR
@@ -282,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 */
 
@@ -720,6 +732,7 @@ 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

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
-bool nodelay_mode;
+extern bool nodelay_mode;
 extern char *answer;
 
 extern ssize_t tabsize;
@@ -624,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
@@ -811,11 +812,6 @@ 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);

src/rcfile.c

@@ -89,6 +89,7 @@ static const rcoption rcopts[] = {
     {"smarthome", SMART_HOME},
     {"smooth", SMOOTH_SCROLL},
     {"tabstospaces", TABS_TO_SPACES},
+    {"undo", 0},
     {"whitespace", 0},
     {"wordbounds", WORD_BOUNDS},
 #endif
@@ -416,6 +417,7 @@ void parse_keybinding(char *ptr)
 	return;
     }
 
+    menu = strtomenu(menuptr);
     newsc = strtosc(menu, funcptr);
     if (newsc == NULL) {
 	rcfile_error(
@@ -423,7 +425,6 @@ void parse_keybinding(char *ptr)
 	return;
     }
 
-    menu = strtomenu(menuptr);
     if (menu < 1) {
 	rcfile_error(
 		N_("Could not map name \"%s\" to a menu"), menuptr);
@@ -908,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

src/text.c

@@ -360,21 +360,25 @@ 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;
 
 }
 
@@ -383,40 +387,44 @@ void redo_cut(undo *u) {
     int i;
     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 */
-	    for (c = u->cutbuffer, t = openfile->current; c->next != NULL && t->next != NULL; ) {
+    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
-		c = c->next;
-		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_needed = 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_needed = TRUE;
 }
 
 /* Undo the last thing(s) we did */
@@ -474,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;
@@ -503,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;
@@ -527,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;
@@ -541,7 +563,7 @@ void do_undo(void)
 void do_redo(void)
 {
     undo *u = openfile->undotop;
-    filestruct *f = openfile->current, *t;
+    filestruct *f = openfile->current;
     int len = 0;
     char *undidmsg, *data;
 
@@ -591,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:
@@ -652,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;
@@ -660,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. */
@@ -811,6 +835,10 @@ void add_undo(undo_type current_action)
     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 */
@@ -839,6 +867,7 @@ 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;
@@ -871,8 +900,20 @@ 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;
@@ -894,6 +935,8 @@ void add_undo(undo_type current_action)
 	    u->cutbottom = last_cutu->cutbottom;
 	}
 	break;
+    case ENTER:
+	break;
     case OTHER:
 	statusbar(_("Internal error: unknown type.  Please save your work."));
 	break;
@@ -902,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;
 }
@@ -919,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);
@@ -931,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 != INSERT
+	|| (action != CUT && action != INSERT && action != SPLIT
 	    && openfile->current->lineno != fs->current_undo->lineno)) {
         add_undo(action);
 	return;
@@ -1011,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;
     }
@@ -1043,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. */
@@ -1108,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)) {
@@ -1202,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);