GNU nano 2.1.11 release

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

ChangeLog

@@ -1,3 +1,41 @@
+GNU nano 2.1.11 - 2009.09.14
+2009-09-12 Chris Allegretta <chrisa@asty.org>
+	* winio.c (edit_update) - properly update edittop when using soft wrapping.
+	  Fixes lack of centering for searching for off-screen answers, found by 
+	  Hannes <mr_creosote@mutantwatch.de>.
+
+2009-09-03 Chris Allegretta <chrisa@asty.org>
+	* global.c (shortcut_init): Fix up/down keys not responding in the file browser,
+	  discovered by Hannes <mr_creosote@mutantwatch.de>.
+	* move.c (do_up) - Fix another scrolling issue with softwrap when the
+	  cursor is beyond COLS, discovered by Hannes <mr_creosote@mutantwatch.de>.
+
+2009-09-02 Chris Allegretta <chrisa@asty.org>
+	* Attempt to check file writability and emit a warning on the status bar
+	  if nano doesn't think the file can be written to.  Feature originally
+	  requested by Damien Jolders <madamien@skullsquad.com> et al.
+
+2009-08-29 Chris Allegretta <chrisa@asty.org>
+	* Fix more soft wrapping issues, particularly with scrolling,
+	  discovered by Hannes <mr_creosote@mutantwatch.de>.
+
+2009-08-19 Chris Allegretta <chrisa@asty.org>
+	* Fix issue with soft wrapping not displaying the last character of each line,
+	  fixed bug discovered by Hannes <mr_creosote@mutantwatch.de>.
+
+2009-08-17 Mike Frysinger <vapier@gentoo.org>
+	* doc/syntax/(gentoo|sh|tcl).nanorc: Fix problems with empty regexes on POSIX.
+	  Fixes Savannah bug 27175.
+
+2009-08-17 Chris Allegretta <chrisa@asty.org>
+	* Initial soft line wrapping implementation.  Command line flags
+	  -$ or --softwrap.  
+	* nano.c, text.c: Clean up some fprintf warnings in debug mode due to printing
+	  a size_t without using the zd specifier.
+2009-08-13 Chris Allegretta <chrisa@asty.org>
+	* New global flag implementation courtesy of Adam Wysocki <gophi@arcabit.pl>, allows
+ 	  previous undo flag to be implemented consistent with other flags.
+
 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. 

NEWS

@@ -1,3 +1,18 @@
+2009.09.14 - GNU nano 2.1.11 is on very thin ice, very thin ice, very thin
+		ice.  This release includes two new features: first, nano
+		will check whether the current file is writable when it
+		is opened, and warn if it is not on the status bar. Secondly,
+		a new soft-wrapping (AKA full line display) option is 
+		available, which will attempt to fully display the contents
+		of lines longer than the width of the screen without the
+		usual truncation and a '$' symbol at the end of the line.
+		It can be enabled via Meta-$ inside the editor, via the 
+		-$ or --softwrap command line flags, or "set softwrap" 
+		in your .nanorc).  As always please report any bugs to the 
+		nano Savannah project page
+		(http://savannah.gnu.org/bugs/?func=additem&group=nano)
+		Remember: data loss happens, back up your files.
+
 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

TODO

@@ -24,7 +24,6 @@ For the future (no targeted version, catch-all)
   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?
 - Fix handling of bad/incomplete UTF-8 sequences to display one Unicode
   FFFD (Replacement Character) per sequence instead of one per byte.
 
@@ -48,6 +47,7 @@ For version 2.2:
 - 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]
+- Allow soft wrapping as well as hard wrapping? [DONE]
 
 For version 2.0:
 - UTF-8 support. [DONE]

configure.ac

@@ -20,7 +20,7 @@
 #
 # $Id$
 
-AC_INIT([GNU nano], [2.1.10], [nano-devel@gnu.org], [nano])
+AC_INIT([GNU nano], [2.1.11], [nano-devel@gnu.org], [nano])
 AC_CONFIG_SRCDIR([src/nano.c])
 AC_CANONICAL_TARGET([])
 AM_INIT_AUTOMAKE

doc/man/nano.1

@@ -205,6 +205,13 @@ Disable help screen at bottom of editor.
 .B \-z (\-\-suspend)
 Enable suspend ability.
 .TP
+.B \-$ (\-\-softwrap)
+Enable 'soft wrapping'.  Nano will attempt to display lines the entire 
+contents of a line, even if it is longer than the screen width.
+Since '$' normally refers to a variable in the Unix shell, you should
+specify this option last when using other options (e.g. 'nano -wS$') 
+or pass it separately (e.g. 'nano -wS -$'). 
+.TP
 .B \-a, \-b, \-e, \-f, \-g, \-j
 Ignored, for compatibility with Pico.
 

doc/man/nanorc.5

@@ -185,6 +185,9 @@ line.
 .B set/unset smooth
 Use smooth scrolling by default.
 .TP
+.B set/unset softwrap
+Enable soft line wrapping for easier viewing of very long lones.
+.TP
 .B set speller "\fIspellprog\fP"
 Use spelling checker \fIspellprog\fP instead of the built-in one, which
 calls \fIspell\fP.
@@ -208,6 +211,9 @@ Enable experimental generic-purpose undo code.
 .B set/unset view
 Disallow file modification.
 .TP
+.B set/unset softwrap
+Enable soft line wrapping for easier viewing of very long lones.
+.TP
 .B set whitespace "\fIstring\fP"
 Set the two characters used to display the first characters of tabs and
 spaces.  They must be single-column characters.

doc/nanorc.sample.in

@@ -170,6 +170,12 @@
 ## characters as parts of words.
 # set wordbounds
 
+## Enable the new (EXPERIMENTAL) generic undo code, not just for line cuts
+# set undo
+
+## Enable soft line wrapping (AKA full line display)
+# set softwrap
+
 
 ## Color setup
 ##

doc/syntax/gentoo.nanorc

@@ -20,10 +20,10 @@ color brightblue "\<e(begin|end|conf|install|make|qmake[34]|ant|(qa)?warn|infon?
 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|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|gamesdirs)"
-color brightblue "\<(|doc|ins|exe)into\>" "\<(f|games)(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\>" "\<(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)

doc/syntax/sh.nanorc

@@ -1,7 +1,7 @@
 ## Here is an example for Bourne shell scripts.
 ##
 syntax "sh" "\.sh$"
-header "^#!.*/(ba|k|pdk|)sh[-0-9_]*"
+header "^#!.*/(ba|k|pdk)?sh[-0-9_]*"
 icolor brightgreen "^[0-9A-Z_]+\(\)"
 color green "\<(case|do|done|elif|else|esac|exit|fi|for|function|if|in|local|read|return|select|shift|then|time|until|while)\>"
 color green "(\{|\}|\(|\)|\;|\]|\[|`|\\|\$|<|>|!|=|&|\|)"

doc/syntax/tcl.nanorc

@@ -13,4 +13,4 @@ color green "(\(|\)|\;|`|\\|\$|<|>|!|=|&|\|)"
 color brightyellow ""(\\.|[^"])*"" "'(\\.|[^'])*'"
 icolor brightred "\$\{?[0-9A-Z_!@#$*?-]+\}?"
 color ,green "[[:space:]]+$"
-color ,magenta "^([[:space:]]+|)#.*"
+color ,magenta "^[[:space:]]*#.*"

src/files.c

@@ -145,8 +145,8 @@ void open_buffer(const char *filename, bool undoable)
 
     /* If we have a non-new file, read it in.  Then, if the buffer has
      * no stat, update the stat, if applicable. */
-    if (rc == 0) {
-	read_file(f, filename, undoable);
+    if (rc > 0) {
+	read_file(f, rc, filename, undoable);
 #ifndef NANO_TINY
 	if (openfile->current_stat == NULL) {
 	    openfile->current_stat =
@@ -195,8 +195,8 @@ void replace_buffer(const char *filename)
     initialize_buffer_text();
 
     /* If we have a non-new file, read it in. */
-    if (rc == 0)
-	read_file(f, filename, FALSE);
+    if (rc > 0)
+	read_file(f, rc, filename, FALSE);
 
     /* Move back to the beginning of the first line of the buffer. */
     openfile->current = openfile->fileage;
@@ -348,8 +348,10 @@ filestruct *read_line(char *buf, filestruct *prevnode, bool
 
 /* Read an open file into the current buffer.  f should be set to the
  * open file, and filename should be set to the name of the file.
-   undoable  means do we want to create undo records to try and undo this */
-void read_file(FILE *f, const char *filename, bool undoable)
+ * undoable  means do we want to create undo records to try and undo this.
+ * Will also attempt to check file writability if fd > 0
+ */
+void read_file(FILE *f, int fd, const char *filename, bool undoable)
 {
     size_t num_lines = 0;
 	/* The number of lines in the file. */
@@ -370,6 +372,8 @@ void read_file(FILE *f, const char *filename, bool undoable)
     int input_int;
 	/* The current value we read from the file, whether an input
 	 * character or EOF. */
+    bool writable = TRUE;
+	/* Is the file writable (if we care) */
 #ifndef NANO_TINY
     int format = 0;
 	/* 0 = *nix, 1 = DOS, 2 = Mac, 3 = both DOS and Mac. */
@@ -469,6 +473,11 @@ void read_file(FILE *f, const char *filename, bool undoable)
     if (ferror(f))
 	nperror(filename);
     fclose(f);
+    if (fd > 0) {
+	int closecode = close(fd);
+	fprintf(stderr, "Closecode = %d\n", closecode);
+	writable = is_file_writable(filename);
+    }
 
 #ifndef NANO_TINY
     /* If file conversion isn't disabled and the last character in this
@@ -578,24 +587,45 @@ void read_file(FILE *f, const char *filename, bool undoable)
     if (undoable)
 	update_undo(INSERT);
 
-    if (format == 3)
-	statusbar(
+    if (format == 3) {
+	if (writable)
+	    statusbar(
 		P_("Read %lu line (Converted from DOS and Mac format)",
 		"Read %lu lines (Converted from DOS and Mac format)",
 		(unsigned long)num_lines), (unsigned long)num_lines);
-    else if (format == 2) {
+	else
+	    statusbar(
+		P_("Read %lu line (Converted from DOS and Mac format - Warning: No write permission)",
+		"Read %lu lines (Converted from DOS and Mac format - Warning: No write permission)",
+		(unsigned long)num_lines), (unsigned long)num_lines);
+    } else if (format == 2) {
 	openfile->fmt = MAC_FILE;
-	statusbar(P_("Read %lu line (Converted from Mac format)",
+	if (writable)
+	    statusbar(P_("Read %lu line (Converted from Mac format)",
 		"Read %lu lines (Converted from Mac format)",
 		(unsigned long)num_lines), (unsigned long)num_lines);
+	else
+	    statusbar(P_("Read %lu line (Converted from Mac format - Warning: No write permission)",
+		"Read %lu lines (Converted from Mac format - Warning: No write permission)",
+		(unsigned long)num_lines), (unsigned long)num_lines);
     } else if (format == 1) {
 	openfile->fmt = DOS_FILE;
-	statusbar(P_("Read %lu line (Converted from DOS format)",
+	if (writable)
+	    statusbar(P_("Read %lu line (Converted from DOS format)",
 		"Read %lu lines (Converted from DOS format)",
 		(unsigned long)num_lines), (unsigned long)num_lines);
+	else
+	    statusbar(P_("Read %lu line (Converted from DOS format - Warning: No write permission)",
+		"Read %lu lines (Converted from DOS format - Warning: No write permission)",
+		(unsigned long)num_lines), (unsigned long)num_lines);
     } else
 #endif
-	statusbar(P_("Read %lu line", "Read %lu lines",
+	if (writable)
+	    statusbar(P_("Read %lu line", "Read %lu lines",
+		(unsigned long)num_lines), (unsigned long)num_lines);
+	else
+	    statusbar(P_("Read %lu line ( Warning: No write permission)",
+		"Read %lu lines (Warning: No write permission)",
 		(unsigned long)num_lines), (unsigned long)num_lines);
 }
 
@@ -603,9 +633,9 @@ void read_file(FILE *f, const char *filename, bool undoable)
  * "New File" if the file is missing.  Otherwise, say "[filename] not
  * found".
  *
- * Return -2 if we say "New File", -1 if the file isn't opened, and 0
- * otherwise.  The file might still have an error while reading with a 0
- * return value.  *f is set to the opened file. */
+ * Return -2 if we say "New File", -1 if the file isn't opened, and the
+ * fd opened otherwise.  The file might still have an error while reading 
+ * with a 0 return value.  *f is set to the opened file. */
 int open_file(const char *filename, bool newfie, FILE **f)
 {
     struct stat fileinfo, fileinfo2;
@@ -668,9 +698,51 @@ int open_file(const char *filename, bool newfie, FILE **f)
 
     free(full_filename);
 
-    return 0;
+    return fd;
 }
 
+/* A bit of a copy and paste from open_file(), is_file_writable()
+ * just checks whether the file is appendable as a quick
+ * permissions check, and we tend to err on the side of permissiveness
+ * (reporting TRUE when it might be wrong) to not fluster users
+ * editing on odd filesystems by printing incorrect warnings.
+ */
+int is_file_writable(const char *filename)
+{
+    struct stat fileinfo, fileinfo2;
+    int fd;
+    FILE *f;
+    char *full_filename;
+    bool ans = TRUE;
+
+
+    if (ISSET(VIEW_MODE))
+	return TRUE;
+
+    assert(filename != NULL && f != NULL);
+
+    /* Get the specified file's full path. */
+    full_filename = get_full_path(filename);
+
+    /* 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 ((fd = open(full_filename, O_WRONLY | O_CREAT | O_APPEND, S_IRUSR |
+                S_IWUSR | S_IRGRP | S_IWGRP | S_IROTH | S_IWOTH)) == -1
+	|| (f = fdopen(fd, "a")) == NULL)
+	ans = FALSE;
+    else
+        fclose(f);
+    close(fd);
+
+    free(full_filename);
+    return ans;
+}
+
+
 /* This function will return the name of the first available extension
  * of a filename (starting with [name][suffix], then [name][suffix].1,
  * etc.).  Memory is allocated for the return value.  If no writable

src/global.c

@@ -36,9 +36,6 @@ 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
@@ -55,7 +52,7 @@ char *last_search = NULL;
 char *last_replace = NULL;
 	/* The last replacement string we searched for. */
 
-long flags = 0;
+unsigned flags[4] = {0, 0, 0, 0};
 	/* Our flag containing the states of all global options. */
 WINDOW *topwin;
 	/* The top portion of the window, where we display the version
@@ -781,7 +778,7 @@ void shortcut_init(bool unjustify)
     add_to_funcs(DO_UNINDENT, MMAIN, N_("Unindent Text"),
 	IFSCHELP(nano_unindent_msg), FALSE, NOVIEW);
 
-    if (use_undo) {
+    if (ISSET(UNDOABLE)) {
 	add_to_funcs(DO_UNDO, MMAIN, N_("Undo"),
 	    IFSCHELP(nano_undo_msg), FALSE, NOVIEW);
 
@@ -1069,7 +1066,7 @@ 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);
-    if (use_undo) {
+    if (ISSET(UNDOABLE)) {
 	add_to_sclist(MMAIN, "M-U", DO_UNDO, 0, TRUE);
  	add_to_sclist(MMAIN, "M-E", DO_REDO, 0, TRUE);
     }
@@ -1082,10 +1079,10 @@ void shortcut_init(bool unjustify)
     add_to_sclist(MALL, "kleft", DO_LEFT, 0, TRUE);
     add_to_sclist(MMAIN, "^Q", XON_COMPLAINT, 0, TRUE);
     add_to_sclist(MMAIN, "^S", XOFF_COMPLAINT, 0, TRUE);
-    add_to_sclist(MMAIN, "^P", DO_UP_VOID, 0, TRUE);
-    add_to_sclist(MMAIN, "kup", DO_UP_VOID, 0, TRUE);
-    add_to_sclist(MMAIN, "^N", DO_DOWN_VOID, 0, TRUE);
-    add_to_sclist(MMAIN, "kdown", DO_DOWN_VOID, 0, TRUE);
+    add_to_sclist(MMAIN|MBROWSER, "^P", DO_UP_VOID, 0, TRUE);
+    add_to_sclist(MMAIN|MBROWSER, "kup", DO_UP_VOID, 0, TRUE);
+    add_to_sclist(MMAIN|MBROWSER, "^N", DO_DOWN_VOID, 0, TRUE);
+    add_to_sclist(MMAIN|MBROWSER, "kdown", DO_DOWN_VOID, 0, TRUE);
     add_to_sclist(MALL, "^A", DO_HOME, 0, TRUE);
     add_to_sclist(MALL, "khome", DO_HOME, 0, TRUE);
     add_to_sclist(MALL, "^E", DO_END, 0, TRUE);
@@ -1167,6 +1164,7 @@ void shortcut_init(bool unjustify)
     add_to_sclist(MMAIN, "M-M", DO_TOGGLE, USE_MOUSE, TRUE);
     add_to_sclist(MMAIN, "M-N", DO_TOGGLE, NO_CONVERT, TRUE);
     add_to_sclist(MMAIN, "M-Z", DO_TOGGLE, SUSPEND, TRUE);
+    add_to_sclist(MMAIN, "M-$", DO_TOGGLE, SOFTWRAP, TRUE);
 #endif
     add_to_sclist(MGOTOLINE, "^T",  GOTOTEXT_MSG, 0, FALSE);
     add_to_sclist(MINSERTFILE|MEXTCMD, "M-F",  NEW_BUFFER_MSG, 0, FALSE);
@@ -1379,6 +1377,8 @@ char *flagtostr(int flag)
             return N_("No conversion from DOS/Mac format");
         case SUSPEND:
             return N_("Suspension");
+        case SOFTWRAP:
+            return N_("Soft line wrapping");
         default:
             return "?????";
     }

src/move.c

@@ -488,7 +488,7 @@ void do_up(
 	)
 	return;
 
-    assert(openfile->current_y == openfile->current->lineno - openfile->edittop->lineno);
+    assert(ISSET(SOFTWRAP) || openfile->current_y == openfile->current->lineno - openfile->edittop->lineno);
 
     /* Move the current line of the edit window up. */
     openfile->current = openfile->current->prev;
@@ -500,7 +500,7 @@ void do_up(
      * smooth scrolling mode, or up half a page if we're not.  If
      * scroll_only is TRUE, scroll the edit window up one line
      * unconditionally. */
-    if (openfile->current_y == 0
+    if (openfile->current_y == 0 || (ISSET(SOFTWRAP) && openfile->edittop->lineno == openfile->current->next->lineno)
 #ifndef NANO_TINY
 	|| scroll_only
 #endif
@@ -550,23 +550,41 @@ void do_down(
 #endif
 	)
 {
+    bool onlastline = FALSE;
+
     /* If we're at the bottom of the file, get out. */
     if (openfile->current == openfile->filebot)
 	return;
 
-    assert(openfile->current_y == openfile->current->lineno - openfile->edittop->lineno);
+
+    assert(ISSET(SOFTWRAP) || openfile->current_y == openfile->current->lineno - openfile->edittop->lineno);
 
     /* Move the current line of the edit window down. */
     openfile->current = openfile->current->next;
     openfile->current_x = actual_x(openfile->current->data,
 	openfile->placewewant);
 
+    if (ISSET(SOFTWRAP)) {
+	filestruct *foo;
+	ssize_t extracuzsoft = 0;
+
+	for (foo = openfile->edittop; foo
+		&& foo->lineno - openfile->edittop->lineno + extracuzsoft < editwinrows;
+		foo = foo->next) {
+	    extracuzsoft += strlenpt(foo->data) / (COLS - 1);
+	    if (foo == openfile->current)
+		break;
+	}
+	if (foo && foo->lineno - openfile->edittop->lineno + extracuzsoft >= editwinrows)
+	    onlastline = TRUE;
+    }
+
     /* If scroll_only is FALSE and if we're on the first line of the
      * edit window, scroll the edit window down one line if we're in
      * smooth scrolling mode, or down half a page if we're not.  If
      * scroll_only is TRUE, scroll the edit window down one line
      * unconditionally. */
-    if (openfile->current_y == editwinrows - 1
+    if (onlastline || openfile->current_y == editwinrows - 1
 #ifndef NANO_TINY
 	|| scroll_only
 #endif
@@ -581,7 +599,7 @@ void do_down(
      * we were on before and the line we're on now.  The former needs to
      * be redrawn if we're not on the first page, and the latter needs
      * to be drawn unconditionally. */
-    if (openfile->current_y < editwinrows - 1) {
+    if (ISSET(SOFTWRAP) || openfile->current_y < editwinrows - 1) {
 	if (need_vertical_update(0))
 	    update_line(openfile->current->prev, 0);
 	update_line(openfile->current, openfile->current_x);

src/nano.c

@@ -901,6 +901,7 @@ void usage(void)
 #endif
     print_opt("-x", "--nohelp", N_("Don't show the two help lines"));
     print_opt("-z", "--suspend", N_("Enable suspension"));
+    print_opt("-$", "--softwrap", N_("Enable soft line wrapping"));
 
     /* This is a special case. */
     print_opt("-a, -b, -e,", "", NULL);
@@ -1059,7 +1060,7 @@ void finish_stdin_pager(void)
        if (f == NULL)
         nperror("fopen");
 
-    read_file(f, "stdin", TRUE);
+    read_file(f, 0, "stdin", TRUE);
     ttystdin = open("/dev/tty", O_RDONLY);
     if (!ttystdin)
         die(_("Couldn't reopen stdin from keyboard, sorry\n"));
@@ -1333,6 +1334,9 @@ void do_toggle(int flag)
 	    edit_refresh();
 	    break;
 #endif
+	case SOFTWRAP:
+	    total_refresh();
+	    break;
     }
 
     enabled = ISSET(flag);
@@ -1733,7 +1737,7 @@ void precalc_multicolorinfo(void)
 
 
 #ifdef DEBUG
-	    fprintf(stderr, "working on lineno %d\n", fileptr->lineno);
+	    fprintf(stderr, "working on lineno %zd\n", fileptr->lineno);
 #endif
 
 		alloc_multidata_if_needed(fileptr);
@@ -1766,7 +1770,7 @@ void precalc_multicolorinfo(void)
 		    for (endptr = fileptr->next; endptr != NULL; endptr = endptr->next) {
 
 #ifdef DEBUG
-	    fprintf(stderr, "advancing to line %d to find end...\n", endptr->lineno);
+	    fprintf(stderr, "advancing to line %zd to find end...\n", endptr->lineno);
 #endif
 			/* Check for keyboard input  again */
 			if ((cur_check = time(NULL)) - last_check > 1) {
@@ -1794,18 +1798,18 @@ void precalc_multicolorinfo(void)
 			lines in between and the ends properly */
 		    fileptr->multidata[tmpcolor->id] |= CENDAFTER;
 #ifdef DEBUG
-		    fprintf(stderr, "marking line %d as CENDAFTER\n", fileptr->lineno);
+		    fprintf(stderr, "marking line %zd 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);
+			fprintf(stderr, "marking intermediary line %zd as CWHOLELINE\n", fileptr->lineno);
 #endif
 		    }
 		    alloc_multidata_if_needed(endptr);
 #ifdef DEBUG
-		    fprintf(stderr, "marking line %d as BEGINBEFORE\n", fileptr->lineno);
+		    fprintf(stderr, "marking line %zd 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.
@@ -1813,12 +1817,12 @@ void precalc_multicolorinfo(void)
 		    fileptr = endptr;
 		    startx = endmatch.rm_eo;
 #ifdef DEBUG
-		    fprintf(stderr, "jumping to line %d pos %d to continue\n", endptr->lineno, startx);
+		    fprintf(stderr, "jumping to line %zd 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);
+		    fprintf(stderr, "no start found on line %zd, continuing\n", fileptr->lineno);
 #endif
 		    fileptr->multidata[tmpcolor->id] = CNONE;
 		    continue;
@@ -2020,6 +2024,7 @@ int main(int argc, char **argv)
 	{"wordbounds", 0, NULL, 'W'},
 	{"autoindent", 0, NULL, 'i'},
 	{"cut", 0, NULL, 'k'},
+	{"softwrap", 0, NULL, '$'},
 #endif
 	{NULL, 0, NULL, 0}
     };
@@ -2058,11 +2063,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:tuvwxz",
+		"h?ABC:DEFHIKLNOQ:RST:UVWY:abcdefgijklmo:pqr:s:tuvwxz$",
 		long_options, NULL)
 #else
 	getopt(argc, argv,
-		"h?ABC:DEFHIKLNOQ:RST:UVWY:abcdefgijklmo:pqr:s:tuvwxz")
+		"h?ABC:DEFHIKLNOQ:RST:UVWY:abcdefgijklmo:pqr:s:tuvwxz$")
 #endif
 		) != -1) {
 	switch (optchr) {
@@ -2213,7 +2218,7 @@ int main(int argc, char **argv)
 		break;
 #ifndef NANO_TINY
 	    case 'u':
-		use_undo = TRUE;
+		SET(UNDOABLE);
 		break;
 #endif
 	    case 'v':
@@ -2230,6 +2235,11 @@ int main(int argc, char **argv)
 	    case 'z':
 		SET(SUSPEND);
 		break;
+#ifndef NANO_TINY
+	    case '$':
+		SET(SOFTWRAP);
+		break;
+#endif
 	    default:
 		usage();
 	}
@@ -2277,7 +2287,10 @@ int main(int argc, char **argv)
 	char *alt_speller_cpy = alt_speller;
 #endif
 	ssize_t tabsize_cpy = tabsize;
-	long flags_cpy = flags;
+	unsigned flags_cpy[sizeof(flags) / sizeof(flags[0])];
+	size_t i;
+
+	memcpy(flags_cpy, flags, sizeof(flags_cpy));
 
 #ifndef DISABLE_OPERATINGDIR
 	operating_dir = NULL;
@@ -2329,7 +2342,9 @@ int main(int argc, char **argv)
 #endif
 	if (tabsize_cpy != -1)
 	    tabsize = tabsize_cpy;
-	flags |= flags_cpy;
+
+	for (i = 0; i < sizeof(flags) / sizeof(flags[0]); i++)
+	    flags[i] |= flags_cpy[i];
     }
 #ifdef DISABLE_ROOTWRAPPING
     /* If we don't have any rcfiles, --disable-wrapping-as-root is used,

src/nano.h

@@ -55,10 +55,13 @@
 #endif
 
 /* Macros for flags. */
-#define SET(bit) flags |= bit
-#define UNSET(bit) flags &= ~bit
-#define ISSET(bit) ((flags & bit) != 0)
-#define TOGGLE(bit) flags ^= bit
+#define FLAGOFF(flag) ((flag) / (sizeof(unsigned) * 8))
+#define FLAGMASK(flag) (1 << ((flag) % (sizeof(unsigned) * 8)))
+#define FLAGS(flag) flags[FLAGOFF(flag)]
+#define SET(flag) FLAGS(flag) |= FLAGMASK(flag)
+#define UNSET(flag) FLAGS(flag) &= ~FLAGMASK(flag)
+#define ISSET(flag) ((FLAGS(flag) & FLAGMASK(flag)) != 0)
+#define TOGGLE(flag) FLAGS(flag) ^= FLAGMASK(flag)
 
 /* Macros for character allocation and more. */
 #define charalloc(howmuch) (char *)nmalloc((howmuch) * sizeof(char))
@@ -450,40 +453,45 @@ typedef struct subnfunc {
 } subnfunc;
 
 
-/* Bitwise flags so that we can save space (or, more correctly, not
- * waste it). */
-#define CASE_SENSITIVE			(1<<0)
-#define CONST_UPDATE			(1<<1)
-#define NO_HELP				(1<<2)
-#define NOFOLLOW_SYMLINKS		(1<<3)
-#define SUSPEND				(1<<4)
-#define NO_WRAP				(1<<5)
-#define AUTOINDENT			(1<<6)
-#define VIEW_MODE			(1<<7)
-#define USE_MOUSE			(1<<8)
-#define USE_REGEXP			(1<<9)
-#define TEMP_FILE			(1<<10)
-#define CUT_TO_END			(1<<11)
-#define BACKWARDS_SEARCH		(1<<12)
-#define MULTIBUFFER			(1<<13)
-#define SMOOTH_SCROLL			(1<<14)
-#define REBIND_DELETE			(1<<15)
-#define REBIND_KEYPAD			(1<<16)
-#define NO_CONVERT			(1<<17)
-#define BACKUP_FILE			(1<<18)
-#define NO_COLOR_SYNTAX			(1<<19)
-#define PRESERVE			(1<<20)
-#define HISTORYLOG			(1<<21)
-#define RESTRICTED			(1<<22)
-#define SMART_HOME			(1<<23)
-#define WHITESPACE_DISPLAY		(1<<24)
-#define MORE_SPACE			(1<<25)
-#define TABS_TO_SPACES			(1<<26)
-#define QUICK_BLANK			(1<<27)
-#define WORD_BOUNDS			(1<<28)
-#define NO_NEWLINES			(1<<29)
-#define BOLD_TEXT			(1<<30)
-#define QUIET				(1<<31)
+/* Enumeration to be used in flags table. See FLAGBIT and FLAGOFF 
+ * definitions. */
+enum
+{
+    CASE_SENSITIVE,
+    CONST_UPDATE,
+    NO_HELP,
+    NOFOLLOW_SYMLINKS,
+    SUSPEND,
+    NO_WRAP,
+    AUTOINDENT,
+    VIEW_MODE,
+    USE_MOUSE,
+    USE_REGEXP,
+    TEMP_FILE,
+    CUT_TO_END,
+    BACKWARDS_SEARCH,
+    MULTIBUFFER,
+    SMOOTH_SCROLL,
+    REBIND_DELETE,
+    REBIND_KEYPAD,
+    NO_CONVERT,
+    BACKUP_FILE,
+    NO_COLOR_SYNTAX,
+    PRESERVE,
+    HISTORYLOG,
+    RESTRICTED,
+    SMART_HOME,
+    WHITESPACE_DISPLAY,
+    MORE_SPACE,
+    TABS_TO_SPACES,
+    QUICK_BLANK,
+    WORD_BOUNDS,
+    NO_NEWLINES,
+    BOLD_TEXT,
+    QUIET,
+    UNDOABLE,
+    SOFTWRAP,
+};
 
 /* Flags for which menus in which a given function should be present */
 #define MMAIN				(1<<0)

src/proto.h

@@ -41,7 +41,7 @@ extern ssize_t wrap_at;
 extern char *last_search;
 extern char *last_replace;
 
-extern long flags;
+extern unsigned flags[4];
 extern WINDOW *topwin;
 extern WINDOW *edit;
 extern WINDOW *bottomwin;
@@ -270,7 +270,7 @@ bool close_buffer(void);
 #endif
 filestruct *read_line(char *buf, filestruct *prevnode, bool
 	*first_line_ins, size_t buf_len);
-void read_file(FILE *f, const char *filename, bool undoable);
+void read_file(FILE *f, int fd, const char *filename, bool undoable);
 int open_file(const char *filename, bool newfie, FILE **f);
 char *get_next_filename(const char *name, const char *suffix);
 void do_insertfile(
@@ -765,7 +765,7 @@ void onekey(const char *keystroke, const char *desc, size_t len);
 void reset_cursor(void);
 void edit_draw(filestruct *fileptr, const char *converted, int
 	line, size_t start);
-void update_line(filestruct *fileptr, size_t index);
+int 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);

src/rcfile.c

@@ -92,6 +92,7 @@ static const rcoption rcopts[] = {
     {"undo", 0},
     {"whitespace", 0},
     {"wordbounds", WORD_BOUNDS},
+    {"softwrap", SOFTWRAP},
 #endif
     {NULL, 0}
 };
@@ -909,15 +910,6 @@ 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

@@ -409,7 +409,7 @@ void redo_cut(undo *u) {
 	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  = %zd, data = \"%s\"\n", t->lineno, t->data);
 #endif
 	    c = c->next;
 	    t = t->next;
@@ -812,7 +812,7 @@ bool execute_command(const char *command)
     if (f == NULL)
 	nperror("fdopen");
 
-    read_file(f, "stdin", TRUE);
+    read_file(f, 0, "stdin", TRUE);
 
     if (wait(NULL) == -1)
 	nperror("wait");
@@ -837,7 +837,7 @@ void add_undo(undo_type current_action)
     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)
+    if (!ISSET(UNDOABLE))
 	return;
 
     /* Ugh, if we were called while cutting not-to-end, non-marked and on the same lineno,
@@ -943,7 +943,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",
+    fprintf(stderr, "fs->current->data = \"%s\", current_x = %zd, u->begin = %d, type = %d\n",
 			fs->current->data,  fs->current_x, u->begin, current_action);
     fprintf(stderr, "left add_undo...\n");
 #endif
@@ -962,14 +962,14 @@ void update_undo(undo_type action)
     int len = 0;
     openfilestruct *fs = openfile;
 
-    if (!use_undo)
+    if (!ISSET(UNDOABLE))
 	return;
 
 #ifdef DEBUG
-        fprintf(stderr, "action = %d, fs->last_action = %d,  openfile->current->lineno = %d",
+        fprintf(stderr, "action = %d, fs->last_action = %d,  openfile->current->lineno = %zd",
 		action, fs->last_action, openfile->current->lineno);
 	if (fs->current_undo)
-	    fprintf(stderr, "fs->current_undo->lineno = %d\n",  fs->current_undo->lineno);
+	    fprintf(stderr, "fs->current_undo->lineno = %zd\n",  fs->current_undo->lineno);
 	else
 	    fprintf(stderr, "\n");
 #endif
@@ -989,7 +989,7 @@ void update_undo(undo_type action)
     switch (u->type) {
     case ADD:
 #ifdef DEBUG
-        fprintf(stderr, "fs->current->data = \"%s\", current_x = %d, u->begin = %d\n",
+        fprintf(stderr, "fs->current->data = \"%s\", current_x = %zd, u->begin = %d\n",
 			fs->current->data,  fs->current_x, u->begin);
 #endif
         len = strlen(u->strdata) + 2;

src/winio.c

@@ -2426,6 +2426,7 @@ void onekey(const char *keystroke, const char *desc, size_t len)
  * in the edit window at (current_y, current_x). */
 void reset_cursor(void)
 {
+    size_t xpt;
     /* If we haven't opened any files yet, put the cursor in the top
      * left corner of the edit window and get out. */
     if (openfile == NULL) {
@@ -2433,13 +2434,24 @@ void reset_cursor(void)
 	return;
     }
 
-    openfile->current_y = openfile->current->lineno -
-	openfile->edittop->lineno;
-    if (openfile->current_y < editwinrows) {
-	size_t xpt = xplustabs();
+    xpt = xplustabs();
 
-	wmove(edit, openfile->current_y, xpt - get_page_start(xpt));
-     }
+    if (ISSET(SOFTWRAP)) {
+	openfile->current_y = 0;
+	filestruct *tmp;
+	for (tmp = openfile->edittop; tmp && tmp != openfile->current; tmp = tmp->next)
+	    openfile->current_y += 1 + strlenpt(tmp->data) / (COLS - 1);
+
+	openfile->current_y += xplustabs() / (COLS - 1);
+	if (openfile->current_y < editwinrows)
+	    wmove(edit, openfile->current_y, xpt % (COLS - 1));
+    } else {
+	openfile->current_y = openfile->current->lineno -
+	    openfile->edittop->lineno;
+
+	if (openfile->current_y < editwinrows)
+	    wmove(edit, openfile->current_y, xpt - get_page_start(xpt));
+    }
 }
 
 /* edit_draw() takes care of the job of actually painting a line into
@@ -2813,19 +2825,28 @@ void edit_draw(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(filestruct *fileptr, size_t index)
+ * fileptr->data[index].  Likely arguments are current_x or zero.
+ * Returns: Number of additiona lines consumed (needed for SOFTWRAP)
+ */
+int update_line(filestruct *fileptr, size_t index)
 {
-    int line;
+    int line = 0;
+    int extralinesused = 0;
 	/* The line in the edit window that we want to update. */
     char *converted;
 	/* fileptr->data converted to have tabs and control characters
 	 * expanded. */
     size_t page_start;
+    filestruct *tmp;
 
     assert(fileptr != NULL);
 
-    line = fileptr->lineno - openfile->edittop->lineno;
+    if (ISSET(SOFTWRAP)) {
+	for (tmp = openfile->edittop; tmp && tmp != fileptr; tmp = tmp->next) {
+	    line += 1 + (strlenpt(tmp->data) / COLS);
+	}
+    } else
+	line = fileptr->lineno - openfile->edittop->lineno;
 
     if (line < 0 || line >= editwinrows)
 	return;
@@ -2835,7 +2856,10 @@ void update_line(filestruct *fileptr, size_t index)
 
     /* Next, convert variables that index the line to their equivalent
      * positions in the expanded line. */
-    index = strnlenpt(fileptr->data, index);
+    if (ISSET(SOFTWRAP))
+	index = 0;
+    else
+	index = strnlenpt(fileptr->data, index);
     page_start = get_page_start(index);
 
     /* Expand the line, replacing tabs with spaces, and control
@@ -2846,10 +2870,31 @@ void update_line(filestruct *fileptr, size_t index)
     edit_draw(fileptr, converted, line, page_start);
     free(converted);
 
-    if (page_start > 0)
-	mvwaddch(edit, line, 0, '$');
-    if (strlenpt(fileptr->data) > page_start + COLS)
-	mvwaddch(edit, line, COLS - 1, '$');
+    if (!ISSET(SOFTWRAP)) {
+	if (page_start > 0)
+	    mvwaddch(edit, line, 0, '$');
+	if (strlenpt(fileptr->data) > page_start + COLS)
+	    mvwaddch(edit, line, COLS - 1, '$');
+    } else {
+        int full_length = strlenpt(fileptr->data);
+	for (index += COLS - 1; index < full_length && line < editwinrows; index += COLS - 1) {
+	    line++;
+#ifdef DEBUG
+	    fprintf(stderr, "update_line(): Softwrap code, moving to %d\n", line);
+#endif
+ 	    blank_line(edit, line, 0, COLS);
+
+	    /* Expand the line, replacing tabs with spaces, and control
+ 	     * characters with their displayed forms. */
+	    converted = display_string(fileptr->data, index, COLS, TRUE);
+
+	    /* Paint the line. */
+	    edit_draw(fileptr, converted, line, index);
+ 	    free(converted);
+	    extralinesused++;
+	}
+    }
+    return extralinesused;
 }
 
 /* Return TRUE if we need an update after moving horizontally, and FALSE
@@ -2886,14 +2931,58 @@ bool need_vertical_update(size_t pww_save)
  * also assume that scrollok(edit) is FALSE. */
 void edit_scroll(scroll_dir direction, ssize_t nlines)
 {
-    bool do_redraw = need_vertical_update(0);
     filestruct *foo;
-    ssize_t i;
+    ssize_t i, extracuzsoft = 0;
+    bool do_redraw = FALSE;
 
     /* Don't bother scrolling less than one line. */
     if (nlines < 1)
 	return;
 
+    if (need_vertical_update(0))
+	do_redraw = TRUE;
+
+
+    /* If using soft wrapping, we want to scroll down enough to display the entire next
+        line, if possible... */
+    if (ISSET(SOFTWRAP) && direction == DOWN_DIR) {
+#ifdef DEBUG
+	   fprintf(stderr, "Softwrap: Entering check for extracuzsoft\n");
+#endif
+	for (i = editwinrows, foo = openfile->edittop; foo && i > 0; i--, foo = foo->next) {
+	    ssize_t len = strlenpt(foo->data) / (COLS - 1);
+	    if (len > 0)
+	        do_redraw = TRUE;
+	    i -= len;
+	}
+	if (foo) {
+	   extracuzsoft += strlenpt(foo->data) / (COLS - 1);
+#ifdef DEBUG
+	   fprintf(stderr, "Setting extracuzsoft to %zd due to strlen %zd of line %zd\n", extracuzsoft,
+		strlenpt(foo->data), foo->lineno);
+#endif
+
+
+	    /* Now account for whether the edittop line itself is >COLS, if scrolling down */
+	   for (foo = openfile->edittop; foo && extracuzsoft > 0; nlines++) {
+		extracuzsoft -= strlenpt(foo->data) / (COLS - 1) + 1;
+#ifdef DEBUG
+ 		fprintf(stderr, "Edittop adjustment, setting nlines to %zd\n", nlines);
+#endif
+		if (foo == openfile->filebot)
+		    break;
+		foo = foo->next;
+	    }
+	}
+    } else if (ISSET(SOFTWRAP) && direction == UP_DIR) {
+	for (foo = openfile->edittop, i = editwinrows; foo && i > 0; i--, foo = foo->prev) {
+	    if (strlenpt(foo->data) / (COLS - 1) > 0) {
+		do_redraw = TRUE;
+		break;
+	    }
+	}
+    }
+
     /* Part 1: nlines is the number of lines we're going to scroll the
      * text of the edit window. */
 
@@ -2918,7 +3007,7 @@ void edit_scroll(scroll_dir direction, ssize_t nlines)
     /* Don't bother scrolling zero lines or more than the number of
      * lines in the edit window minus one; in both cases, get out, and
      * call edit_refresh() beforehand if we need to. */
-    if (nlines == 0 || nlines >= editwinrows) {
+    if (nlines == 0 || do_redraw || nlines >= editwinrows) {
 	if (do_redraw || nlines >= editwinrows)
 	    edit_refresh();
 	return;
@@ -2987,6 +3076,7 @@ void edit_redraw(filestruct *old_current, size_t pww_save)
     bool do_redraw = need_vertical_update(0) ||
 	need_vertical_update(pww_save);
     filestruct *foo = NULL;
+    ssize_t i = 0, extracuzsoft = 0;
 
     /* If either old_current or current is offscreen, scroll the edit
      * window until it's onscreen and get out. */
@@ -2995,6 +3085,7 @@ void edit_redraw(filestruct *old_current, size_t pww_save)
 	editwinrows || openfile->current->lineno <
 	openfile->edittop->lineno || openfile->current->lineno >=
 	openfile->edittop->lineno + editwinrows) {
+
 	filestruct *old_edittop = openfile->edittop;
 	ssize_t nlines;
 
@@ -3115,7 +3206,7 @@ void edit_refresh(void)
 #endif
 
     for (nlines = 0; nlines < editwinrows && foo != NULL; nlines++) {
-	update_line(foo, (foo == openfile->current) ?
+	nlines += update_line(foo, (foo == openfile->current) ?
 		openfile->current_x : 0);
 	foo = foo->next;
     }
@@ -3154,9 +3245,11 @@ void edit_update(update_type location)
 	    goal = editwinrows - 1;
     }
 
-    for (; goal > 0 && foo->prev != NULL; goal--)
+    for (; goal > 0 && foo->prev != NULL; goal--) {
+	if (ISSET(SOFTWRAP))
+	    goal -= strlenpt(foo->data) / (COLS - 1);
 	foo = foo->prev;
-
+    }
     openfile->edittop = foo;
 }