GNU nano 2.1.6 release

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

ChangeLog

@@ -1,3 +1,63 @@
+GNU nano 2.1.6 - 2008.10.03
+2008-10-03 Pascal Gentil <pascal.gentil@univ-rennes1.fr>
+	* fortran.nanorc: Sample python syntax highlighting file
+
+2008-09-30 Dirkjan Ochtman <dirkjan@ochtman.nl>
+	* python.nanorc: Small python syntax update
+
+2008-09-30 <bluestorm_dylc@hotmail.com>
+	* ocaml.nanorc: Sample OCaml syntax highlighting file
+
+2008-09-30 Dave Geering <dgeering@toshiba-tap.com>
+	* objc.nanorc: Sample Objective-C Syntax Hightlighting file
+
+2008-09-30 Chris Allegretta <chrisa@asty.org>
+        * configure.ac: Change extra, multibuffer, color and rcfile configure options to default to enabled
+          --enable-tiny will now disable these options as well
+	* python.nanorc, ruby.nanorc: Add header lines for python and ruby as well
+
+2008-09-21 Chris Allegretta <chrisa@asty.org>
+	* rcfile.c, color.c, nano.h: Add new capability for matching a syntax type by the "header" (1st line)
+	  of a file being edited.  Based on Savannah bug 24197 and inital proof of concept by Dave Geering 
+	  <dgeering@toshiba-tap.com>
+
+2008-09-16 Chris Allegretta <chrisa@asty.org>
+	* text.c: Add support for undoing a text uncut.  Split out the undo and redo of a text cut 
+	  in order to avoid code duplication.
+
+2008-09-06 Chris Allegretta <chrisa@asty.org>
+	* nano.c: Do call disable_signals at startup regardless, since under cygwin we can't generate
+	  ^C without it.
+
+GNU nano 2.1.5 - 2008.08.30
+2008-08-29 Chris Allegretta <chrisa@asty.org>
+	* configure.ac, color.c, rcfile.c, utils.c: 1st attempt at supporting systems which don't support
+	  GNU-style word boundaries.  New function fixbounds() to translate from GNU-style to 
+	  BSD-style, autoconf option GNU_WORDBOUNDS.
+	* nano-regress: New perl script to check for some of the more obvious issues with compilation
+	  issues with certain configure options.
+	* global.c, help.c, browser.c, files.c, proto.h: Fix several compipation and programmatic 
+	  issues with --disable-help, especially that do-writeout was treating ^G the same as ^M.
+
+2008-08-28 Chris Allegretta <chrisa@asty.org>
+	* configure.ac, rcfile.c:  Add support for an alternate rcfilename at configure time.  Maybe this
+	  should become a command line option some day, but I don't see the need currently.  Start of
+	  fix for Savannah bug #24128: Add nanorc support to win32 platform.
+
+2008-08-21 Chris Allegretta <chrisa@asty.org>
+	* text.c: Change error messages where we may possibly get into a bad state and urge
+	  the user to save when this happens.  Originally by Benno Schulenberg <bensberg@justemail.net>
+	* text.c (do_enter):  Fix issue when compiled with --enable-debug, fixes Savannah bug 24092.
+
+2008-08-08 Magnus Granberg <zorry@ume.nu> / Adam Conrad <?>
+	* files.c (write_file): Add needed flags to open() calls when writing out files.  Fixes Savannah bug 
+	  #23827: Compilation fails with -D_FORTIFY_SOURCE=2
+
+2008-08-08 Chris Allegretta <chrisa@asty.org>
+	* files.c (write_file): Check exit code of fclose(), since in certain out of space conditions the OS will
+	  happily report successful fwrite()s until you try and close the file.  Fix for Savannah bug
+	  #24000: no free space on partition - nano claims successful write - file empty 
+
 GNU nano 2.1.4 - 2008.08.09
 2008-08-08 Chris Allegretta <chrisa@asty.org>
 	* files.c (write_file): Do not go on and attempt to write the main file if writing the backup file failed,

NEWS

@@ -1,3 +1,30 @@
+2008.10.03 - GNU nano 2.1.6 was for new features before it was against
+		them.  This release includes more undo capability, 
+		several new syntax highlighting configurations including
+		Objective C, OCaml, and Fortran, and a new capability
+		to activate highlighting based on the 1st line of the
+		file being edited.  Also, the new default configure 
+		options now include color syntax highlighting, .nanorc
+		support, multibuffer and extras.  These items can still
+		be disabled and are not enabled with --enable-tiny.  Bug
+		fixes include better signal handling under Cygwin, and 
+		that's about it.  Again please remember to
+		submit bug reports via Savannah at 
+		http://savannah.gnu.org/bugs/?func=additem&group=nano
+		as undo functions certainly need more testing.  
+		Bon appetit.
+
+2008.08.30 - GNU nano 2.1.5 is ready to lead on day one.  This release
+		contains a better fix for incorrectly reported successful
+		writes on full filesystems, more helpful messages when
+		an internal error occurs in the undo code, and fixes for 
+		various combinations of configure-time options and 
+		compiler flags.  Also included is new support for 
+		changing the rc file name at configure time, and
+		using GNU-style regexes for word-boundaries on systems 
+		which do not support them natively, as well as the ever 
+		popular translation updates.  Rock the tarball.
+
 2008.08.09 - GNU nano 2.1.4 "I told you so!" is released.  This release
 		includes fixes for several severe issues with the new
 		undo/redo code.  Also the behavior of writing

configure.ac

@@ -20,7 +20,7 @@
 #
 # $Id$
 
-AC_INIT([GNU nano], [2.1.4], [nano-devel@gnu.org], [nano])
+AC_INIT([GNU nano], [2.1.6], [nano-devel@gnu.org], [nano])
 AC_CONFIG_SRCDIR([src/nano.c])
 AC_CANONICAL_TARGET([])
 AM_INIT_AUTOMAKE
@@ -64,12 +64,6 @@ if test x$debug_support != xyes; then
     AC_DEFINE(NDEBUG, 1, [Shut up assert warnings :-)])
 fi
 
-AC_ARG_ENABLE(extra,
-[  --enable-extra          Enable extra features, currently only easter eggs],
-[if test x$enableval = xyes; then
-    AC_DEFINE(NANO_EXTRA, 1, [Define this to enable extra stuff.]) extra_support=yes
-fi])
-
 AC_ARG_ENABLE(tiny,
 [  --enable-tiny           Disable features for the sake of size],
 [if test x$enableval = xyes; then
@@ -84,6 +78,16 @@ AC_ARG_ENABLE(tiny,
     AC_DEFINE(DISABLE_WRAPPING, 1, [Define this to disable all text wrapping.])
 fi])
 
+
+AC_ARG_ENABLE(extra,
+[  --disable-extra          Disable extra features, currently only easter eggs],
+[if test x$enableval != xno; then
+    AC_DEFINE(NANO_EXTRA, 1, [Define this to enable extra stuff.]) extra_support=yes
+fi], 
+    [if test x$enable_tiny != xyes; then
+        AC_DEFINE(NANO_EXTRA, 1, [Define this to enable extra stuff.]) extra_support=yes
+    fi])
+
 AC_ARG_ENABLE(browser,
 [  --disable-browser       Disable built-in file browser],
 [if test x$enableval != xyes; then
@@ -139,8 +143,8 @@ AC_ARG_ENABLE(wrapping-as-root,
 fi])
 
 AC_ARG_ENABLE(color,
-[  --enable-color          Enable color and syntax highlighting],
-[if test x$enableval = xyes; then
+[  --disable-color          Disable color and syntax highlighting],
+[if test x$enableval != xno; then
     if test x$ac_cv_header_regex_h = xyes; then
 	AC_DEFINE(ENABLE_NANORC, 1, [Define this to use .nanorc files.]) nanorc_support=yes
 	AC_DEFINE(ENABLE_COLOR, 1, [Define this to have syntax highlighting, requires regex.h and ENABLE_NANORC too!]) color_support=yes
@@ -148,32 +152,76 @@ AC_ARG_ENABLE(color,
 	AC_MSG_ERROR([
 *** The header file regex.h was not found.  If you wish to use color
 *** support this header file is required.  Please either install C
-*** libraries that include the regex.h file or do not call the configure
-*** script with --enable-color.])
+*** libraries that include the regex.h file or call the configure
+*** script with --disable-color.])
     fi
-fi])
+fi], [
+    if test x$enable_tiny != xyes; then
+	if test x$ac_cv_header_regex_h = xyes; then
+	    AC_DEFINE(ENABLE_NANORC, 1, [Define this to use .nanorc files.]) nanorc_support=yes
+	    AC_DEFINE(ENABLE_COLOR, 1, [Define this to have syntax highlighting, requires regex.h and ENABLE_NANORC too!]) color_support=yes	
+	else
+	    AC_MSG_ERROR([
+*** The header file regex.h was not found.  If you wish to use color
+*** support this header file is required.  Please either install C
+*** libraries that include the regex.h file or call the configure
+*** script with --disable-color.])
+	fi
+    fi
+])
 
 AC_ARG_ENABLE(multibuffer,
-[  --enable-multibuffer    Enable multiple file buffers],
-[if test x$enableval = xyes; then
+[  --disable-multibuffer    Disable multiple file buffers],
+[if test x$enableval != xno; then
     AC_DEFINE(ENABLE_MULTIBUFFER, 1, [Define this to enable multiple file buffers.]) multibuffer_support=yes
-fi])
+fi], 
+    [if test x$enable_tiny != xyes; then
+        AC_DEFINE(ENABLE_MULTIBUFFER, 1, [Define this to enable multiple file buffers.]) multibuffer_support=yes
+    fi])
 
 AC_ARG_ENABLE(nanorc,
-[  --enable-nanorc         Enable use of .nanorc files],
-[if test x$enableval = xyes; then
+[  --disable-nanorc         Disable use of .nanorc files],
+[if test x$enableval != xno; then
     AC_DEFINE(ENABLE_NANORC, 1, [Define this to use .nanorc files.]) nanorc_support=yes
-fi])
+fi], 
+    [if test x$enable_tiny != xyes; then
+        AC_DEFINE(ENABLE_NANORC, 1, [Define this to use .nanorc files.]) nanorc_support=yes
+    fi])
 
 AC_ARG_ENABLE(all,
-[  --enable-all            Enable ALL extra nano functionality (kitchen sink option)],
+[  --enable-all            Enable ALL extra nano functionality (ignored for compatibility as all options default to on)],
 [if test x$enableval = xyes; then
-    AC_DEFINE(ENABLE_NANORC, 1, [Define this to use .nanorc files.]) nanorc_support=yes
-    AC_DEFINE(ENABLE_COLOR, 1, [Define this to have syntax highlighting, requires regex.h and ENABLE_NANORC too!]) color_support=yes
-    AC_DEFINE(ENABLE_MULTIBUFFER, 1, [Define this to enable multiple file buffers.]) multibuffer_support=yes
-    AC_DEFINE(NANO_EXTRA, 1, [Define this to enable extra stuff.]) extra_support=yes
+    echo "--enable-all option no longer needed, ignoring for compatiblity"
 fi])
 
+if test x$color_support = xyes; then
+	# now check for the end of word boundary support (/< and />)
+	AC_MSG_CHECKING([for GNU-style word boundary regex support])
+	AC_TRY_RUN([
+#ifdef HAVE_SYS_TYPES_H
+#include <sys/types.h>
+#endif
+#include <regex.h>
+int main(void)
+{
+    regex_t r;
+    size_t nmatch;
+    regmatch_t pmatch;
+
+    if (regcomp(&r, "\\\\>", REG_EXTENDED|REG_NOSUB))
+        return 1;
+    if (regexec(&r, "word boundary", nmatch, &pmatch, 0))
+        return 1;
+    return 0;
+}],
+	AC_MSG_RESULT(yes)
+	AC_DEFINE(GNU_WORDBOUNDS, 1, [Define if the system supports GNU-style word boundaries in regexes.]) gnu_wordbounds=yes,
+	AC_MSG_RESULT(no),
+        AC_MSG_WARN([*** Can't check for gnu word boundary support when cross-compiling])
+)
+fi
+
+
 AC_MSG_CHECKING([whether to enable UTF-8 support])
 AC_ARG_ENABLE(utf8,
 [  --enable-utf8           Enable UTF-8 support],
@@ -387,6 +435,12 @@ fi
 AM_CONDITIONAL(USE_COLOR, test x$color_support = xyes)
 AM_CONDITIONAL(USE_NANORC, test x$nanorc_support = xyes)
 
+AC_ARG_ENABLE(altrcname,
+[  --enable-altrcname          Specify alternate rcfile name (default: .nanorc)],
+[if test x$enableval != no; then
+    AC_DEFINE_UNQUOTED(RCFILE_NAME, "$enableval", [Specify alternate rcfile name (default: .nanorc)]) rcfilename=$enableval
+fi])
+
 dnl Checks for functions.
 
 AC_CHECK_FUNCS(getdelim getline isblank strcasecmp strcasestr strncasecmp strnlen vsnprintf)

doc/syntax/Makefile.am

@@ -19,6 +19,9 @@ pkgdata_DATA =	asm.nanorc \
 		debian.nanorc \
 		awk.nanorc \
 		css.nanorc \
-		xml.nanorc
+		xml.nanorc \
+		ocaml.nanorc \
+		objc.nanorc \
+		fortran.nanorc
 
 EXTRA_DIST = $(pkgdata_DATA)

doc/syntax/fortran.nanorc

@@ -0,0 +1,41 @@
+## Here is an example for Fortran 90/95
+
+syntax "fortran" "\.(f|f90|f95)$" 
+
+#color red "\<[A-Z_]a[0-9A-Z_]+\>" 
+color red "\<[0-9]+\>" 
+
+icolor green "\<(action|advance|all|allocatable|allocated|any|apostrophe)\>"
+icolor green "\<(append|asis|assign|assignment|associated|character|common)\>"
+icolor green "\<(complex|data|default|delim|dimension|double precision)\>"
+icolor green "\<(elemental|epsilon|external|file|fmt|form|format|huge)\>"
+icolor green "\<(implicit|include|index|inquire|integer|intent|interface)\>"
+icolor green "\<(intrinsic|iostat|kind|logical|module|none|null|only)>"
+icolor green "\<(operator|optional|pack|parameter|pointer|position|private)\>"
+icolor green "\<(program|public|real|recl|recursive|selected_int_kind)\>"
+icolor green "\<(selected_real_kind|subroutine|status)\>"
+
+icolor cyan "\<(abs|achar|adjustl|adjustr|allocate|bit_size|call|char)\>" 
+icolor cyan "\<(close|contains|count|cpu_time|cshift|date_and_time)\>" 
+icolor cyan "\<(deallocate|digits|dot_product|eor|eoshift|function|iachar)\>" 
+icolor cyan "\<(iand|ibclr|ibits|ibset|ichar|ieor|iolength|ior|ishft|ishftc)\>" 
+icolor cyan "\<(lbound|len|len_trim|matmul|maxexponent|maxloc|maxval|merge)\>" 
+icolor cyan "\<(minexponent|minloc|minval|mvbits|namelist|nearest|nullify)\>" 
+icolor cyan "\<(open|pad|present|print|product|pure|quote|radix)\>" 
+icolor cyan "\<(random_number|random_seed|range|read|readwrite|replace)\>" 
+icolor cyan "\<(reshape|rewind|save|scan|sequence|shape|sign|size|spacing)\>" 
+icolor cyan "\<(spread|sum|system_clock|target|transfer|transpose|trim)\>" 
+icolor cyan "\<(ubound|unpack|verify|write|tiny|type|use|yes)\>"
+
+icolor yellow "\<(.and.|case|do|else|else?if|else?where|end|end?do|end?if)\>"
+icolor yellow "\<(end?select|.eqv.|forall|if|lge|lgt|lle|llt|.neqv.|.not.)\>"
+icolor yellow "\<(.or.|repeat|select case|then|where|while)\>"
+
+icolor magenta "\<(continue|cycle|exit|go?to|result|return)\>"
+
+## String highlighting.  
+icolor yellow "<[^= 	]*>" ""(\\.|[^"])*""
+
+## Comment highlighting
+icolor blue "!.*"
+

doc/syntax/nanorc.nanorc

@@ -5,7 +5,7 @@ syntax "nanorc" "\.?nanorc$"
 icolor brightwhite "^[[:space:]]*((un)?set|include|syntax|i?color).*$"
 ## Keywords
 icolor brightgreen "^[[:space:]]*(set|unset)[[:space:]]+(autoindent|backup|backupdir|backwards|boldtext|brackets|casesensitive|const|cut|fill|historylog|matchbrackets|morespace|mouse|multibuffer|noconvert|nofollow|nohelp|nonewlines|nowrap|operatingdir|preserve|punct)\>" "^[[:space:]]*(set|unset)[[:space:]]+(quickblank|quotestr|rebinddelete|rebindkeypad|regexp|smarthome|smooth|speller|suspend|tabsize|tabstospaces|tempfile|view|whitespace|wordbounds)\>"
-icolor green "^[[:space:]]*(set|unset|include|syntax)\>"
+icolor green "^[[:space:]]*(set|unset|include|syntax|header)\>"
 ## Colors
 icolor yellow "^[[:space:]]*i?color[[:space:]]*(bright)?(white|black|red|blue|green|yellow|magenta|cyan)?(,(white|black|red|blue|green|yellow|magenta|cyan))?\>"
 icolor magenta "^[[:space:]]*i?color\>" "\<(start|end)="

doc/syntax/objc.nanorc

@@ -0,0 +1,41 @@
+## Here is an example for C/C++/Obj-C.
+##
+syntax "m" "\.m$"
+
+
+## Stuffs
+color brightwhite "\<[A-Z_][0-9A-Z_]+\>" 
+color green "\<(float|double|BOOL|bool|char|int|short|long|id|sizeof|enum|void|static|const|struct|union|typedef|extern|(un)?signed|inline)\>"
+color green "\<[[:alpha:]_][[:alnum:]_]*_t\>"
+color green "\<(class|namespace|template|public|protected|private|typename|this|friend|virtual|using|mutable|volatile|register|explicit)\>"
+color brightgreen "\<(for|if|while|do|else|case|default|switch)\>"
+color brightgreen "\<(try|throw|catch|operator|new|delete)\>"
+color brightgreen "\<(goto|continue|break|return)\>"
+color brightgreen "@\<(en(code|d)|i(mplementation|nterface)|selector)\>"
+##
+## GCC builtins
+color cyan "__attribute__[[:space:]]*\(\([^)]*\)\)" "__(aligned|asm|builtin|hidden|inline|packed|restrict|section|typeof|weak)__"
+
+## Selector/method
+color brightmagenta "(^|[[:space:]])\[.*[[:space:]].*\]"
+color white ":[[:alnum:]]*"
+color magenta "[[:alnum:]]*:"
+color white "\[[^][:space:]]*\]"
+
+##
+## String highlighting.  You will in general want your comments and
+## strings to come last, because syntax highlighting rules will be
+## applied in the order they are read in.
+color brightblack "'([^'\]|(\\["'abfnrtv\\]))'" "'\\(([0-3]?[0-7]{1,2}))'" "'\\x[0-9A-Fa-f]{1,2}'"
+color brightblack "<[^= 	]*>" ""(\\.|[^"])*""
+color brightblue "@"(\\.|[^"])*""
+##
+## This string is VERY resource intensive!
+## color brightyellow start=""(\\.|[^"])*\\[[:space:]]*$" end="^(\\.|[^"])*""
+
+color brightblue "^[[:space:]]*#[[:space:]]*(define|include|import|(un|ifn?)def|endif|el(if|se)|if|warning|error)"
+
+## Comment highlighting
+color yellow "//.*"
+color yellow start="/\*" end="\*/"
+

doc/syntax/ocaml.nanorc

@@ -0,0 +1,27 @@
+# OCaml sample nanorc
+#
+syntax "ocaml" "\.mli?$"
+#uid
+color red "\<[A-Z][0-9a-z_]{2,}\>"
+#declarations
+color green "\<(let|val|method|in|and|rec|private|virtual|constraint)\>"
+#structure items
+color red "\<(type|open|class|module|exception|external)\>"
+#patterns
+color blue "\<(fun|function|functor|match|try|with)\>"
+#patterns-modifiers
+color yellow "\<(as|when|of)\>" 
+#conditions
+color cyan "\<(if|then|else)\>"
+#blocs
+color magenta "\<(begin|end|object|struct|sig|for|while|do|done|to|downto)\>"
+#constantes
+color green "\<(true|false)\>"
+#modules/classes
+color green "\<(include|inherit|initializer)\>"
+#expr modifiers
+color yellow "\<(new|ref|mutable|lazy|assert|raise)\>"
+#comments
+color white start="\(\*" end="\*\)"
+#strings (no multiline handling yet)
+color brightblack ""[^\"]*""

doc/syntax/perl.nanorc

@@ -1,6 +1,7 @@
 ## Here is an example for Perl.
 ##
 syntax "perl" "\.p[lm]$"
+header "^#!.*/perl[-0-9._]*"
 color red "\<(accept|alarm|atan2|bin(d|mode)|c(aller|h(dir|mod|op|own|root)|lose(dir)?|onnect|os|rypt)|d(bm(close|open)|efined|elete|ie|o|ump)|e(ach|of|val|x(ec|ists|it|p))|f(cntl|ileno|lock|ork))\>" "\<(get(c|login|peername|pgrp|ppid|priority|pwnam|(host|net|proto|serv)byname|pwuid|grgid|(host|net)byaddr|protobynumber|servbyport)|([gs]et|end)(pw|gr|host|net|proto|serv)ent|getsock(name|opt)|gmtime|goto|grep|hex|index|int|ioctl|join)\>" "\<(keys|kill|last|length|link|listen|local(time)?|log|lstat|m|mkdir|msg(ctl|get|snd|rcv)|next|oct|open(dir)?|ord|pack|pipe|pop|printf?|push|q|qq|qx|rand|re(ad(dir|link)?|cv|do|name|quire|set|turn|verse|winddir)|rindex|rmdir|s|scalar|seek(dir)?)\>" "\<(se(lect|mctl|mget|mop|nd|tpgrp|tpriority|tsockopt)|shift|shm(ctl|get|read|write)|shutdown|sin|sleep|socket(pair)?|sort|spli(ce|t)|sprintf|sqrt|srand|stat|study|substr|symlink|sys(call|read|tem|write)|tell(dir)?|time|tr(y)?|truncate|umask)\>" "\<(un(def|link|pack|shift)|utime|values|vec|wait(pid)?|wantarray|warn|write)\>"
 color magenta "\<(continue|else|elsif|do|for|foreach|if|unless|until|while|eq|ne|lt|gt|le|ge|cmp|x|my|sub|use|package|can|isa)\>"
 icolor cyan start="[$@%]" end="( |[^0-9A-Z_]|-)"

doc/syntax/python.nanorc

@@ -1,8 +1,9 @@
 ## Here is an example for Python.
 ##
 syntax "python" "\.py$"
+header "^#!.*/python[-0-9._]*"
 icolor brightblue "def [0-9A-Z_]+"
-color brightcyan "\<(and|assert|break|class|continue|def|del|elif|else|except|exec|finally|for|from|global|if|import|in|is|lambda|map|not|or|pass|print|raise|return|try|while)\>"
+color brightcyan "\<(and|as|assert|break|class|continue|def|del|elif|else|except|exec|finally|for|from|global|if|import|in|is|lambda|not|or|pass|print|raise|return|try|while|with|yield)\>"
 color brightgreen "['][^']*[^\\][']" "[']{3}.*[^\\][']{3}"
 color brightgreen "["][^"]*[^\\]["]" "["]{3}.*[^\\]["]{3}"
 color brightgreen start=""""[^"]" end=""""" start="'''[^']" end="'''"

doc/syntax/ruby.nanorc

@@ -1,6 +1,7 @@
 ## Here is an example for Ruby.
 ##
 syntax "ruby" "\.rb$"
+header "^#!.*/ruby[-0-9._]*"
 ## Asciibetical list of reserved words
 color yellow "\<(BEGIN|END|alias|and|begin|break|case|class|def|defined\?|do|else|elsif|end|ensure|false|for|if|in|module|next|nil|not|or|redo|rescue|retry|return|self|super|then|true|undef|unless|until|when|while|yield)\>"
 ## Constants

doc/syntax/sh.nanorc

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

nano-regress

@@ -0,0 +1,27 @@
+#!/usr/bin/perl
+use strict;
+
+sub combinations {
+  return [] unless @_;
+  my $first = shift;
+  my @rest = combinations(@_);
+  return @rest, map { [$first, @$_] } @rest;
+} 
+
+my @allargs=("--enable-debug", "--disable-extra", "--enable-tiny", "--disable-browser --disable-help --disable-mouse --disable-operatingdir --disable-speller", "--disable-multibuffer", "--disable-nanorc", "--with-slang");
+my @combos =  combinations(@allargs);
+
+my $i = 0;
+foreach my $name (@combos) {
+    my @args = @$name;
+    my $pct = $i / $#combos * 100;
+    printf "Trying with options: @args, %d%% done...\n", $pct;
+    if (system "(./configure @args && make clean all) >/dev/null 2>&1") {
+	print "Build failed for args: @args\n";
+	print "Try running make to reproduce\n";
+	exit(1);
+    }
+    $i++;
+}
+
+print "All options completed successfully!\n";

src/browser.c

@@ -173,8 +173,8 @@ char *do_browser(char *path, DIR *dir)
 		total_redraw();
 	} else if (f->scfunc == do_help_void) {
 #ifndef DISABLE_HELP
-		do_browser_help();
-		curs_set(0);
+	    do_browser_help();
+	    curs_set(0);
 #else
 		nano_disabled_msg();
 #endif
@@ -558,7 +558,9 @@ void parse_browser_input(int *kbinput, bool *meta_key, bool *func_key)
 		*kbinput = sc_seq_or(do_page_up, 0);
 		break;
 	    case '?':
+#ifndef DISABLE_HELP
 		*kbinput = sc_seq_or(do_help_void, 0);
+#endif
 		break;
 	    /* Cancel equivalent to Exit here. */
 	    case 'E':

src/color.c

@@ -131,7 +131,7 @@ void color_update(void)
 
     /* If we didn't specify a syntax override string, or if we did and
      * there was no syntax by that name, get the syntax based on the
-     * file extension. */
+     * file extension, and then look in the header. */
     if (openfile->colorstrings == NULL) {
 	for (tmpsyntax = syntaxes; tmpsyntax != NULL;
 		tmpsyntax = tmpsyntax->next) {
@@ -153,7 +153,7 @@ void color_update(void)
 		 * already. */
 		if (not_compiled) {
 		    e->ext = (regex_t *)nmalloc(sizeof(regex_t));
-		    regcomp(e->ext, e->ext_regex, REG_EXTENDED);
+		    regcomp(e->ext, fixbounds(e->ext_regex), REG_EXTENDED);
 		}
 
 		/* Set colorstrings if we matched the extension
@@ -174,8 +174,51 @@ void color_update(void)
 		}
 	    }
 	}
+
+	/* If we haven't matched anything yet, try the headers */
+	if (openfile->colorstrings == NULL) {
+#ifdef DEBUG
+	    fprintf(stderr, "No match for file extensions, looking at headers...\n");
+#endif
+	    for (tmpsyntax = syntaxes; tmpsyntax != NULL;
+		tmpsyntax = tmpsyntax->next) {
+		exttype *e;
+
+		for (e = tmpsyntax->headers; e != NULL; e = e->next) {
+		    bool not_compiled = (e->ext == NULL);
+
+		    /* e->ext_regex has already been checked for validity
+		     * elsewhere.  Compile its specified regex if we haven't
+		     * already. */
+		    if (not_compiled) {
+			e->ext = (regex_t *)nmalloc(sizeof(regex_t));
+			regcomp(e->ext, fixbounds(e->ext_regex), REG_EXTENDED);
+		    }
+
+		    /* Set colorstrings if we matched the extension
+		     * regex. */
+#ifdef DEBUG
+		fprintf(stderr, "Comparing header regex \"%s\" to fileage \"%s\"...\n", e->ext_regex, openfile->fileage->data);
+#endif
+		    if (regexec(e->ext, openfile->fileage->data, 0, NULL, 0) == 0)
+			openfile->colorstrings = tmpsyntax->color;
+
+		    if (openfile->colorstrings != NULL)
+			break;
+
+		    /* Decompile e->ext_regex's specified regex if we aren't
+		     * going to use it. */
+		    if (not_compiled) {
+			regfree(e->ext);
+			free(e->ext);
+			e->ext = NULL;
+		    }
+		}
+	    }
+	}
     }
 
+
     /* If we didn't get a syntax based on the file extension, and we
      * have a default syntax, use it. */
     if (openfile->colorstrings == NULL && defcolor != NULL)
@@ -188,13 +231,13 @@ void color_update(void)
 	 * regexes if we haven't already. */
 	if (tmpcolor->start == NULL) {
 	    tmpcolor->start = (regex_t *)nmalloc(sizeof(regex_t));
-	    regcomp(tmpcolor->start, tmpcolor->start_regex,
+	    regcomp(tmpcolor->start, fixbounds(tmpcolor->start_regex),
 		REG_EXTENDED | (tmpcolor->icase ? REG_ICASE : 0));
 	}
 
 	if (tmpcolor->end_regex != NULL && tmpcolor->end == NULL) {
 	    tmpcolor->end = (regex_t *)nmalloc(sizeof(regex_t));
-	    regcomp(tmpcolor->end, tmpcolor->end_regex,
+	    regcomp(tmpcolor->end, fixbounds(tmpcolor->end_regex),
 		REG_EXTENDED | (tmpcolor->icase ? REG_ICASE : 0));
 	}
     }

src/cut.c

@@ -260,6 +260,10 @@ void do_uncut_text(void)
     if (cutbuffer == NULL)
 	return;
 
+#ifndef NANO_TINY
+     update_undo(UNCUT);
+#endif
+
     /* Add a copy of the text in the cutbuffer to the current filestruct
      * at the current cursor position. */
     copy_from_filestruct(cutbuffer, cutbottom);

src/files.c

@@ -1588,7 +1588,7 @@ bool write_file(const char *name, FILE *f_open, bool tmp, append_type
 	}
 
 	if (f_open == NULL) {
-	    fd_source = open(realname, O_RDONLY | O_CREAT);
+	    fd_source = open(realname, O_RDONLY | O_CREAT, S_IRUSR | S_IWUSR);
 
 	    if (fd_source != -1) {
 		f_source = fdopen(fd_source, "rb");
@@ -1707,7 +1707,7 @@ bool write_file(const char *name, FILE *f_open, bool tmp, append_type
 	int fd_source;
 	FILE *f_source = NULL;
 
-	fd_source = open(tempname, O_RDONLY | O_CREAT);
+	fd_source = open(tempname, O_RDONLY | O_CREAT, S_IRUSR | S_IWUSR);
 
 	if (fd_source != -1) {
 	    f_source = fdopen(fd_source, "rb");
@@ -1728,8 +1728,11 @@ bool write_file(const char *name, FILE *f_open, bool tmp, append_type
 		strerror(errno));
 	    goto cleanup_and_exit;
 	}
-    } else
-	fclose(f);
+    } else if (fclose(f) != 0) {
+	    statusbar(_("Error writing %s: %s"), realname,
+		strerror(errno));
+	    goto cleanup_and_exit;
+    }
 
     if (!tmp && append == OVERWRITE) {
 	if (!nonamechange) {
@@ -1945,6 +1948,8 @@ bool do_writeout(bool exiting)
 	    } else if (s && s->scfunc == (void *) append_msg) {
 		append = (append == APPEND) ? OVERWRITE : APPEND;
 		continue;
+	    } else if (s && s->scfunc == do_help_void) {
+		continue;
 	    }
 
 #ifdef DEBUG

src/global.c

@@ -237,7 +237,7 @@ void add_to_funcs(void *func, int menus, const char *desc, const char *help,
     f->menus = menus;
     f->desc = desc;
     f->viewok = viewok;
-#ifndef NANO_TINY
+#ifndef DISABLE_HELP
     f->help = help;
     f->blank_after = blank_after;
 #endif
@@ -483,6 +483,9 @@ void shortcut_init(bool unjustify)
     const char *insert_file_msg =  N_("Insert File");
     const char *go_to_line_msg = N_("Go To Line");
 
+#ifndef DISABLE_JUSTIFY
+    const char *nano_justify_msg = N_("Justify the current paragraph");
+#endif
 #ifndef DISABLE_HELP
     /* TRANSLATORS: The next long series of strings are shortcut descriptions;
      * they are best kept shorter than 56 characters, but may be longer. */
@@ -497,9 +500,6 @@ void shortcut_init(bool unjustify)
 	;
     const char *nano_writeout_msg =
 	N_("Write the current file to disk");
-#ifndef DISABLE_JUSTIFY
-    const char *nano_justify_msg = N_("Justify the current paragraph");
-#endif
     const char *nano_insert_msg =
 	N_("Insert another file into the current one");
     const char *nano_whereis_msg =
@@ -642,10 +642,8 @@ void shortcut_init(bool unjustify)
         free(f);
     }
 
-#ifndef DISABLE_HELP
-    add_to_funcs(do_help_void, MALL, get_help_msg, nano_help_msg,
+    add_to_funcs(do_help_void, MALL, get_help_msg, IFSCHELP(nano_help_msg),
 	FALSE, VIEW);
-#endif
 
     add_to_funcs((void *) cancel_msg,
 	(MWHEREIS|MREPLACE|MREPLACE2|MGOTOLINE|MWRITEFILE|MINSERTFILE|MEXTCMD|MSPELL|MWHEREISFILE|MGOTODIR|MYESNO),
@@ -723,7 +721,7 @@ void shortcut_init(bool unjustify)
 #ifndef DISABLE_SPELLER
 	if (!ISSET(RESTRICTED))
 	    /* TRANSLATORS: Try to keep this at most 10 characters. */
-	    add_to_funcs(do_spell, MMAIN, N_("To Spell"), nano_spell_msg,
+	    add_to_funcs(do_spell, MMAIN, N_("To Spell"), IFSCHELP(nano_spell_msg),
 		TRUE, NOVIEW);
 #endif
 
@@ -758,25 +756,25 @@ void shortcut_init(bool unjustify)
 #ifndef NANO_TINY
 
     add_to_funcs(do_mark, MMAIN, N_("Mark Text"), 
-	nano_mark_msg, FALSE, VIEW);
+	IFSCHELP(nano_mark_msg), FALSE, VIEW);
 
     add_to_funcs(do_research, (MMAIN|MBROWSER), whereis_next_msg,
-	nano_whereis_next_msg, TRUE, VIEW);
+	IFSCHELP(nano_whereis_next_msg), TRUE, VIEW);
 
     add_to_funcs(do_copy_text, MMAIN, N_("Copy Text"),
-	nano_copy_msg, FALSE, NOVIEW);
+	IFSCHELP(nano_copy_msg), FALSE, NOVIEW);
 
     add_to_funcs(do_indent_void, MMAIN, N_("Indent Text"),
-	nano_indent_msg, FALSE, NOVIEW);
+	IFSCHELP(nano_indent_msg), FALSE, NOVIEW);
 
     add_to_funcs(do_unindent, MMAIN, N_("Unindent Text"),
-	nano_unindent_msg, FALSE, NOVIEW);
+	IFSCHELP(nano_unindent_msg), FALSE, NOVIEW);
 
     add_to_funcs(do_undo, MMAIN, N_("Undo"),
-	nano_undo_msg, FALSE, NOVIEW);
+	IFSCHELP(nano_undo_msg), FALSE, NOVIEW);
 
     add_to_funcs(do_redo, MMAIN, N_("Redo"),
-	nano_redo_msg, TRUE, NOVIEW);
+	IFSCHELP(nano_redo_msg), TRUE, NOVIEW);
 
 #endif
 
@@ -796,10 +794,10 @@ void shortcut_init(bool unjustify)
 
 #ifndef NANO_TINY
     add_to_funcs(do_next_word_void, MMAIN, N_("Next Word"),
-	nano_nextword_msg, FALSE, VIEW);
+	IFSCHELP(nano_nextword_msg), FALSE, VIEW);
 
     add_to_funcs(do_prev_word_void, MMAIN, N_("Prev Word"),
-	nano_prevword_msg, FALSE, VIEW);
+	IFSCHELP(nano_prevword_msg), FALSE, VIEW);
 #endif
 
     add_to_funcs(do_up_void, (MMAIN|MHELP|MBROWSER), N_("Prev Line"),
@@ -816,21 +814,21 @@ void shortcut_init(bool unjustify)
 
 #ifndef DISABLE_JUSTIFY
     add_to_funcs(do_para_begin_void, (MMAIN|MWHEREIS), beg_of_par_msg,
-	nano_parabegin_msg, FALSE, VIEW);
+	IFSCHELP(nano_parabegin_msg), FALSE, VIEW);
 
     add_to_funcs(do_para_end_void, (MMAIN|MWHEREIS), end_of_par_msg,
-	nano_paraend_msg, FALSE, VIEW);
+	IFSCHELP(nano_paraend_msg), FALSE, VIEW);
 #endif
 
 #ifndef NANO_TINY
     add_to_funcs(do_find_bracket, MMAIN, _("Find Other Bracket"),
-	nano_bracket_msg, FALSE, VIEW);
+	IFSCHELP(nano_bracket_msg), FALSE, VIEW);
 
     add_to_funcs(do_scroll_up, MMAIN, N_("Scroll Up"),
-	nano_scrollup_msg, FALSE, VIEW);
+	IFSCHELP(nano_scrollup_msg), FALSE, VIEW);
 
     add_to_funcs(do_scroll_down, MMAIN, N_("Scroll Down"),
-	nano_scrolldown_msg, FALSE, VIEW);
+	IFSCHELP(nano_scrolldown_msg), FALSE, VIEW);
 #endif
 
 #ifdef ENABLE_MULTIBUFFER
@@ -872,7 +870,7 @@ void shortcut_init(bool unjustify)
 
 #ifndef NANO_TINY
     add_to_funcs(do_cut_till_end, MMAIN, N_("CutTillEnd"),
-	nano_cut_till_end_msg, TRUE, NOVIEW);
+	IFSCHELP(nano_cut_till_end_msg), TRUE, NOVIEW);
 #endif
 
     add_to_funcs(xon_complaint, MMAIN, "", "", FALSE, VIEW);
@@ -880,12 +878,12 @@ void shortcut_init(bool unjustify)
 
 #ifndef DISABLE_JUSTIFY
     add_to_funcs(do_full_justify, (MMAIN|MWHEREIS), fulljstify_msg,
-	nano_fulljustify_msg, FALSE, NOVIEW);
+	IFSCHELP(nano_fulljustify_msg), FALSE, NOVIEW);
 #endif
 
 #ifndef NANO_TINY
     add_to_funcs(do_wordlinechar_count, MMAIN, N_("Word Count"),
-	nano_wordcount_msg, FALSE, VIEW);
+	IFSCHELP(nano_wordcount_msg), FALSE, VIEW);
 #endif
 
     add_to_funcs(total_refresh, (MMAIN|MHELP), refresh_msg, 
@@ -897,11 +895,11 @@ void shortcut_init(bool unjustify)
 #ifndef NANO_TINY
     add_to_funcs((void *) case_sens_msg,
 	(MWHEREIS|MREPLACE|MWHEREISFILE),
-	case_sens_msg, nano_case_msg, FALSE, VIEW);
+	case_sens_msg, IFSCHELP(nano_case_msg), FALSE, VIEW);
 
     add_to_funcs((void *) backwards_msg,
 	(MWHEREIS|MREPLACE|MWHEREISFILE),
-	backwards_msg, nano_reverse_msg, FALSE, VIEW);
+	backwards_msg, IFSCHELP(nano_reverse_msg), FALSE, VIEW);
 #endif
 
 #ifdef HAVE_REGEX_H
@@ -913,11 +911,11 @@ void shortcut_init(bool unjustify)
 #ifndef NANO_TINY
     add_to_funcs((void *) prev_history_msg,
 	(MWHEREIS|MREPLACE|MREPLACE2|MWHEREISFILE),
-	prev_history_msg, nano_prev_history_msg, FALSE, VIEW);
+	prev_history_msg, IFSCHELP(nano_prev_history_msg), FALSE, VIEW);
 
     add_to_funcs((void *) next_history_msg,
 	(MWHEREIS|MREPLACE|MREPLACE2|MWHEREISFILE),
-	next_history_msg, nano_next_history_msg, FALSE, VIEW);
+	next_history_msg, IFSCHELP(nano_next_history_msg), FALSE, VIEW);
 #endif
 
     add_to_funcs((void *) no_replace_msg, MREPLACE,
@@ -930,7 +928,7 @@ void shortcut_init(bool unjustify)
     if (!ISSET(RESTRICTED))
 	add_to_funcs((void *) to_files_msg,
 	    (MGOTOLINE|MINSERTFILE),
-	    to_files_msg, nano_tofiles_msg, FALSE, VIEW);
+	    to_files_msg, IFSCHELP(nano_tofiles_msg), FALSE, VIEW);
 #endif
 
 #ifndef NANO_TINY
@@ -942,23 +940,23 @@ void shortcut_init(bool unjustify)
      * backups are disabled. */
     if (!ISSET(RESTRICTED))
         add_to_funcs((void *) dos_format_msg, MWRITEFILE,
-            dos_format_msg, nano_dos_msg, FALSE, NOVIEW);
+            dos_format_msg, IFSCHELP(nano_dos_msg), FALSE, NOVIEW);
 
     if (!ISSET(RESTRICTED))
         add_to_funcs((void *) mac_format_msg, MWRITEFILE,
-            mac_format_msg, nano_mac_msg, FALSE, NOVIEW);
+            mac_format_msg, IFSCHELP(nano_mac_msg), FALSE, NOVIEW);
 
     if (!ISSET(RESTRICTED))
         add_to_funcs((void *) append_msg, MWRITEFILE,
-            append_msg, nano_append_msg, FALSE, NOVIEW);
+            append_msg, IFSCHELP(nano_append_msg), FALSE, NOVIEW);
 
     if (!ISSET(RESTRICTED))
         add_to_funcs((void *) prepend_msg, MWRITEFILE,
-            prepend_msg, nano_prepend_msg, FALSE, NOVIEW);
+            prepend_msg, IFSCHELP(nano_prepend_msg), FALSE, NOVIEW);
 
     if (!ISSET(RESTRICTED))
         add_to_funcs((void *) backup_file_msg, MWRITEFILE,
-            backup_file_msg, nano_backup_msg, FALSE, NOVIEW);
+            backup_file_msg, IFSCHELP(nano_backup_msg), FALSE, NOVIEW);
 #endif
 
 #ifndef NANO_TINY
@@ -966,14 +964,14 @@ void shortcut_init(bool unjustify)
      * It's useless since inserting files is disabled. */
     if (!ISSET(RESTRICTED))
         add_to_funcs((void *) ext_cmd_msg, MINSERTFILE,
-	    ext_cmd_msg, nano_execute_msg, FALSE, NOVIEW);
+	    ext_cmd_msg, IFSCHELP(nano_execute_msg), FALSE, NOVIEW);
 
 #ifdef ENABLE_MULTIBUFFER
     /* If we're using restricted mode, the multibuffer toggle is
      * disabled.  It's useless since inserting files is disabled. */
     if (!ISSET(RESTRICTED))
 	add_to_funcs((void *) new_buffer_msg, MINSERTFILE,
-	new_buffer_msg, nano_multibuffer_msg, FALSE, NOVIEW);
+	new_buffer_msg, IFSCHELP(nano_multibuffer_msg), FALSE, NOVIEW);
 #endif
 
     add_to_funcs((void *)  insert_file_msg, MEXTCMD,
@@ -981,7 +979,7 @@ void shortcut_init(bool unjustify)
 
 #ifdef ENABLE_MULTIBUFFER
      add_to_funcs((void *) new_buffer_msg, MEXTCMD,
-	new_buffer_msg, nano_multibuffer_msg, FALSE, NOVIEW);
+	new_buffer_msg, IFSCHELP(nano_multibuffer_msg), FALSE, NOVIEW);
 #endif
 #endif
 
@@ -994,22 +992,20 @@ void shortcut_init(bool unjustify)
 
     add_to_funcs((void *) first_file_msg,
 	(MBROWSER|MWHEREISFILE),
-	first_file_msg, nano_firstfile_msg, FALSE, VIEW);
+	first_file_msg, IFSCHELP(nano_firstfile_msg), FALSE, VIEW);
 
     add_to_funcs((void *) last_file_msg,
 	(MBROWSER|MWHEREISFILE),
-	last_file_msg, nano_lastfile_msg, FALSE, VIEW);
+	last_file_msg, IFSCHELP(nano_lastfile_msg), FALSE, VIEW);
 
     add_to_funcs((void *) goto_dir_msg, MBROWSER,
-	goto_dir_msg, nano_gotodir_msg, FALSE, VIEW);
+	goto_dir_msg, IFSCHELP(nano_gotodir_msg), FALSE, VIEW);
 #endif
 
     currmenu = MMAIN;
 
-#ifndef NANO_TINY
     add_to_sclist(MALL, "^G", do_help_void, 0, TRUE);
     add_to_sclist(MALL, "F1", do_help_void, 0, TRUE);
-#endif
     add_to_sclist(MMAIN|MHELP|MBROWSER, "^X", do_exit, 0, TRUE);
     add_to_sclist(MMAIN|MHELP|MBROWSER, "F2", do_exit, 0, TRUE);
     add_to_sclist(MMAIN, "^_", do_gotolinecolumn_void, 0, TRUE);

src/help.c

@@ -201,12 +201,6 @@ void do_help(void (*refresh_func)(void))
     help_text = NULL;
 }
 
-/* Start the help browser for the edit window. */
-void do_help_void(void)
-{
-    do_help(&edit_refresh);
-}
-
 #ifndef DISABLE_BROWSER
 /* Start the help browser for the file browser. */
 void do_browser_help(void)
@@ -552,3 +546,18 @@ size_t help_line_len(const char *ptr)
 }
 
 #endif /* !DISABLE_HELP */
+
+/* Start the help browser for the edit window. */
+void do_help_void(void)
+{
+
+#ifndef DISABLE_HELP
+    /* Start the help browser for the edit window. */
+    do_help(&edit_refresh);
+#else
+    if (currmenu == MMAIN)
+	nano_disabled_msg();
+    else
+	beep();
+#endif
+}

src/nano.c

@@ -1273,7 +1273,6 @@ void disable_extended_io(void)
     tcsetattr(0, TCSANOW, &term);
 }
 
-#ifdef USE_SLANG
 /* Disable interpretation of the special control keys in our terminal
  * settings. */
 void disable_signals(void)
@@ -1284,7 +1283,6 @@ void disable_signals(void)
     term.c_lflag &= ~ISIG;
     tcsetattr(0, TCSANOW, &term);
 }
-#endif
 
 #ifndef NANO_TINY
 /* Enable interpretation of the special control keys in our terminal
@@ -1351,8 +1349,8 @@ void terminal_init(void)
 	if (ISSET(PRESERVE))
 	    enable_flow_control();
 
-#ifdef USE_SLANG
 	disable_signals();
+#ifdef USE_SLANG
 	if (!ISSET(PRESERVE))
 	    disable_flow_control();
 

src/nano.h

@@ -242,6 +242,8 @@ typedef struct syntaxtype {
 	/* The name of this syntax. */
     exttype *extensions;
 	/* The list of extensions that this syntax applies to. */
+    exttype *headers;
+	/* Regexes to match on the 'header' (1st line) of the file */
     colortype *color;
 	/* The colors used in this syntax. */
     struct syntaxtype *next;

src/proto.h

@@ -343,12 +343,12 @@ void thanks_for_all_the_fish(void);
 #endif
 
 /* All functions in help.c. */
-#ifndef DISABLE_HELP
-void do_help(void (*refresh_func)(void));
-void do_help_void(void);
 #ifndef DISABLE_BROWSER
 void do_browser_help(void);
 #endif
+void do_help_void(void);
+#ifndef DISABLE_HELP
+void do_help(void (*refresh_func)(void));
 void help_init(void);
 void parse_help_input(int *kbinput, bool *meta_key, bool *func_key);
 size_t help_line_len(const char *ptr);
@@ -685,6 +685,7 @@ ssize_t ngetdelim(char **lineptr, size_t *n, int delim, FILE *stream);
 #endif
 #ifdef HAVE_REGEX_H
 bool regexp_bol_or_eol(const regex_t *preg, const char *string);
+const char *fixbounds(const char *r);
 #endif
 #ifndef DISABLE_SPELLER
 bool is_whole_word(size_t pos, const char *buf, const char *word);

src/rcfile.c

@@ -103,6 +103,8 @@ static char *nanorc = NULL;
 #ifdef ENABLE_COLOR
 static syntaxtype *endsyntax = NULL;
 	/* The end of the list of syntaxes. */
+static exttype *endheader = NULL;
+	/* End of header list */
 static colortype *endcolor = NULL;
 	/* The end of the color list for the current syntax. */
 #endif
@@ -217,19 +219,19 @@ char *parse_next_regex(char *ptr)
 bool nregcomp(const char *regex, int eflags)
 {
     regex_t preg;
-    int rc = regcomp(&preg, regex, REG_EXTENDED | eflags);
+    const char *r = fixbounds(regex);
+    int rc = regcomp(&preg, r, REG_EXTENDED | eflags);
 
     if (rc != 0) {
 	size_t len = regerror(rc, &preg, NULL, 0);
 	char *str = charalloc(len);
 
 	regerror(rc, &preg, str, len);
-	rcfile_error(N_("Bad regex \"%s\": %s"), regex, str);
+	rcfile_error(N_("Bad regex \"%s\": %s"), r, str);
 	free(str);
     }
 
     regfree(&preg);
-
     return (rc == 0);
 }
 
@@ -290,7 +292,9 @@ void parse_syntax(char *ptr)
     endsyntax->desc = mallocstrcpy(NULL, nameptr);
     endsyntax->color = NULL;
     endcolor = NULL;
+    endheader = NULL;
     endsyntax->extensions = NULL;
+    endsyntax->headers = NULL;
     endsyntax->next = NULL;
 
 #ifdef DEBUG
@@ -715,6 +719,71 @@ void parse_colors(char *ptr, bool icase)
 	}
     }
 }
+
+/* Parse the headers (1st line) of the file which may influence the regex used. */
+void parse_headers(char *ptr)
+{
+    char *h, *regstr;
+
+    assert(ptr != NULL);
+
+    if (syntaxes == NULL) {
+	rcfile_error(
+		N_("Cannot add a header regex without a syntax command"));
+	return;
+    }
+
+    if (*ptr == '\0') {
+	rcfile_error(N_("Missing regex string"));
+	return;
+    }
+
+    /* Now for the fun part.  Start adding regexes to individual strings
+     * in the colorstrings array, woo! */
+    while (ptr != NULL && *ptr != '\0') {
+	exttype *newheader;
+	    /* The new color structure. */
+	bool cancelled = FALSE;
+	    /* The start expression was bad. */
+
+	if (*ptr != '"') {
+	    rcfile_error(
+		N_("Regex strings must begin and end with a \" character"));
+	    ptr = parse_next_regex(ptr);
+	    continue;
+	}
+
+	ptr++;
+
+	regstr = ptr;
+	ptr = parse_next_regex(ptr);
+	if (ptr == NULL)
+	    break;
+
+	newheader = (exttype *)nmalloc(sizeof(exttype));
+
+	/* Save the regex string if it's valid */
+	if (nregcomp(regstr, 0)) {
+	    newheader->ext_regex = mallocstrcpy(NULL, regstr);
+	    newheader->ext = NULL;
+	    newheader->next = NULL;
+
+#ifdef DEBUG
+	     fprintf(stderr, "Starting a new header entry: %s\n", newheader->ext_regex);
+#endif
+
+	    if (endheader == NULL) {
+		endsyntax->headers = newheader;
+	    } else {
+		endheader->next = newheader;
+	    }
+
+	    endheader = newheader;
+	} else
+	    free(newheader);
+
+    }
+}
 #endif /* ENABLE_COLOR */
 
 /* Check whether the user has unmapped every shortcut for a
@@ -812,7 +881,9 @@ void parse_rcfile(FILE *rcstream
 		rcfile_error(N_("Syntax \"%s\" has no color commands"),
 			endsyntax->desc);
 	    parse_syntax(ptr);
-	} else if (strcasecmp(keyword, "color") == 0)
+	} else if (strcasecmp(keyword, "header") == 0)
+	    parse_headers(ptr);
+	else if (strcasecmp(keyword, "color") == 0)
 	    parse_colors(ptr, FALSE);
 	else if (strcasecmp(keyword, "icolor") == 0)
 	    parse_colors(ptr, TRUE);
@@ -1044,8 +1115,11 @@ void do_rcfile(void)
     if (homedir == NULL)
 	rcfile_error(N_("I can't find my home directory!  Wah!"));
     else {
-	nanorc = charealloc(nanorc, strlen(homedir) + 9);
-	sprintf(nanorc, "%s/.nanorc", homedir);
+#ifndef RCFILE_NAME
+#define RCFILE_NAME ".nanorc"
+#endif
+	nanorc = charealloc(nanorc, strlen(homedir) + strlen(RCFILE_NAME) + 2);
+	sprintf(nanorc, "%s/%s", homedir, RCFILE_NAME);
 
 	/* Don't open directories, character files, or block files. */
 	if (stat(nanorc, &rcinfo) != -1) {

src/text.c

@@ -364,6 +364,70 @@ void do_unindent(void)
     do_indent(-tabsize);
 }
 
+/* undo a cut, or re-do an uncut */
+void undo_cut(undo *u)
+{
+	cutbuffer = copy_filestruct(u->cutbuffer);
+
+        /* Compute cutbottom for the uncut using out copy */
+	for (cutbottom = cutbuffer; cutbottom->next != NULL; cutbottom = cutbottom->next)
+	    ;
+
+	/* Get to where we need to uncut from */
+	if (u->mark_set && u->mark_begin_lineno < u->lineno)
+	    do_gotolinecolumn(u->mark_begin_lineno, u->mark_begin_x+1, FALSE, FALSE, FALSE, FALSE);
+	else
+	    do_gotolinecolumn(u->lineno, u->begin+1, FALSE, FALSE, FALSE, FALSE);
+
+        copy_from_filestruct(cutbuffer, cutbottom);
+	free_filestruct(cutbuffer);
+	cutbuffer = NULL;
+
+}
+
+/* Re-do a cut, or undo an uncut */
+void redo_cut(undo *u) {
+    int i;
+    filestruct *t;
+
+	do_gotolinecolumn(u->lineno, u->begin+1, FALSE, FALSE, FALSE, FALSE);
+	openfile->mark_set = u->mark_set;
+	if (cutbuffer)
+	    free(cutbuffer);
+	cutbuffer = NULL;
+
+	/* Move ahead the same # lines we had if a marked cut */
+	if (u->mark_set) {
+	    for (i = 1, t = openfile->fileage; i != u->mark_begin_lineno; i++)
+		t = t->next;
+	    openfile->mark_begin = t;
+	} else if (!u->to_end) {
+	    /* Here we have a regular old potentially multi-line ^K cut.  We'll
+		need to trick nano into thinking it's a marked cut to cut more
+		than one line again */
+#ifdef DEBUG
+	    fprintf(stderr, "Undoing multi-^K cut, u->linescut = %d\n", u->linescut);
+#endif
+	    for (i = 0, t = openfile->current; i < u->linescut; i++) {
+
+#ifdef DEBUG
+	    fprintf(stderr, "Advancing, lineno  = %d, data = \"%s\"\n", t->lineno, t->data);
+#endif
+		t = t->next;
+	    }
+	    openfile->mark_begin = t;
+	    openfile->mark_begin_x = 0;
+	    openfile->mark_set = TRUE;
+	}
+
+	openfile->mark_begin_x = u->mark_begin_x;
+	do_cut_text(FALSE, u->to_end, TRUE);
+	openfile->mark_set = FALSE;
+        openfile->mark_begin = NULL;
+        openfile->mark_begin_x = 0;
+	edit_refresh();
+}
+
 /* Undo the last thing(s) we did */
 void do_undo(void)
 {
@@ -386,7 +450,7 @@ void do_undo(void)
         for (; f->next != NULL && f->lineno != u->lineno; f = f->next)
 	    ;
     if (f->lineno != u->lineno) {
-        statusbar(_("Couldnt match current undo line"));
+        statusbar(_("Internal error: can't match line %d.  Please save your work"), u->lineno);
 	return;
     }
 #ifdef DEBUG
@@ -443,21 +507,11 @@ void do_undo(void)
     case CUT:
     case CUTTOEND:
 	undidmsg = _("text cut");
-	cutbuffer = copy_filestruct(u->cutbuffer);
-
-        /* Compute cutbottom for the uncut using out copy */
-	for (cutbottom = cutbuffer; cutbottom->next != NULL; cutbottom = cutbottom->next)
-	    ;
-
-	/* Get to where we need to uncut from */
-	if (u->mark_set && u->mark_begin_lineno < u->lineno)
-	    do_gotolinecolumn(u->mark_begin_lineno, u->mark_begin_x+1, FALSE, FALSE, FALSE, FALSE);
-	else
-	    do_gotolinecolumn(u->lineno, u->begin+1, FALSE, FALSE, FALSE, FALSE);
-
-	do_uncut_text();
-	free_filestruct(cutbuffer);
-	cutbuffer = NULL;
+        undo_cut(u);
+	break;
+    case UNCUT:
+	undidmsg = _("text uncut");
+	redo_cut(u);
 	break;
     case INSERT:
 	undidmsg = _("text insert");
@@ -484,7 +538,7 @@ void do_undo(void)
 	f->data = data;
 	break;
     default:
-	undidmsg = _("wtf?");
+	undidmsg = _("Internal error: unknown type.  Please save your work");
 	break;
 
     }
@@ -509,7 +563,7 @@ void do_redo(void)
 	return;
     }
     if (u->next != openfile->current_undo) {
-	statusbar(_("Can't find previous undo to re-do, argh"));
+	statusbar(_("Internal error: Redo setup failed.  Please save your work"));
 	return;
     }
 
@@ -520,7 +574,7 @@ void do_redo(void)
         for (; f->next != NULL && f->lineno != u->lineno; f = f->next)
 	    ;
     if (f->lineno != u->lineno) {
-        statusbar(_("Couldnt match current undo line"));
+        statusbar(_("Internal error: can't match line %d.  Please save your work"), u->lineno);
 	return;
     }
 #ifdef DEBUG
@@ -576,43 +630,12 @@ void do_redo(void)
 	break;
     case CUT:
     case CUTTOEND:
-	undidmsg = _("line cut");
-	do_gotolinecolumn(u->lineno, u->begin+1, FALSE, FALSE, FALSE, FALSE);
-	openfile->mark_set = u->mark_set;
-	if (cutbuffer)
-	    free(cutbuffer);
-	cutbuffer = NULL;
-
-	/* Move ahead the same # lines we had if a marked cut */
-	if (u->mark_set) {
-	    for (i = 1, t = openfile->fileage; i != u->mark_begin_lineno; i++)
-		t = t->next;
-	    openfile->mark_begin = t;
-	} else if (!u->to_end) {
-	    /* Here we have a regular old potentially multi-line ^K cut.  We'll
-		need to trick nano into thinking it's a marked cut to cut more
-		than one line again */
-#ifdef DEBUG
-	    fprintf(stderr, "Undoing multi-^K cut, u->linescut = %d\n", u->linescut);
-#endif
-	    for (i = 0, t = openfile->current; i < u->linescut; i++) {
-
-#ifdef DEBUG
-	    fprintf(stderr, "Advancing, lineno  = %d, data = \"%s\"\n", t->lineno, t->data);
-#endif
-		t = t->next;
-	    }
-	    openfile->mark_begin = t;
-	    openfile->mark_begin_x = 0;
-	    openfile->mark_set = TRUE;
-	}
-
-	openfile->mark_begin_x = u->mark_begin_x;
-	do_cut_text(FALSE, u->to_end, TRUE);
-	openfile->mark_set = FALSE;
-        openfile->mark_begin = NULL;
-        openfile->mark_begin_x = 0;
-	edit_refresh();
+	undidmsg = _("text cut");
+	redo_cut(u);
+	break;
+    case UNCUT:
+	undidmsg = _("text uncut");
+	undo_cut(u);
 	break;
     case REPLACE:
 	undidmsg = _("text replace");
@@ -620,17 +643,14 @@ void do_redo(void)
 	u->strdata = f->data;
 	f->data = data;
 	break;
-     case INSERT:
+    case INSERT:
 	undidmsg = _("text insert");
-	cutbuffer = u->cutbuffer;
-	cutbottom = u->cutbottom;
 	do_gotolinecolumn(u->lineno, u->begin+1, FALSE, FALSE, FALSE, FALSE);
-	do_uncut_text();
-	cutbuffer = oldcutbuffer;
-	cutbottom = oldcutbottom;
+        copy_from_filestruct(u->cutbuffer, u->cutbottom);
+	openfile->placewewant = xplustabs();
 	break;
     default:
-	undidmsg = _("wtf?");
+	undidmsg = _("Internal error: unknown type.  Please save your work");
 	break;
 
     }
@@ -649,7 +669,7 @@ void do_enter(void)
     filestruct *newnode = make_new_node(openfile->current);
     size_t extra = 0;
 
-    assert(openfile->current != NULL && xopenfile->current->data != NULL);
+    assert(openfile->current != NULL && openfile->current->data != NULL);
 
 #ifndef NANO_TINY
     update_undo(SPLIT);
@@ -799,7 +819,7 @@ 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;
+    undo *u, *cutu;
     char *data;
     openfilestruct *fs = openfile;
 
@@ -832,6 +852,7 @@ void add_undo(undo_type current_action)
     u->strdata = NULL;
     u->cutbuffer = NULL;
     u->cutbottom  = NULL;
+    u->mark_set = 0;
     u->mark_begin_lineno = 0;
     u->mark_begin_x = 0;
     u->linescut = 0;
@@ -877,9 +898,23 @@ void add_undo(undo_type current_action)
 	u->to_end = (current_action == CUTTOEND);
 	break;
     case UNCUT:
+	for (cutu = u; cutu != NULL && cutu->type != CUT; cutu = cutu->next)
+	    ;
+	if (cutu->type == CUT) {
+	    u->cutbuffer = cutu->cutbuffer;
+	    u->cutbottom = cutu->cutbottom;
+	    if (!cutu->mark_set)
+		u->linescut = cutu->linescut;
+	    else {
+		filestruct *c;
+		for (c = u->cutbuffer; c != NULL; c = c->next)
+		    u->linescut++;
+	    }
+	} else
+	    statusbar(_("Internal error: can't setup uncut.  Please save your work."));
 	break;
     case OTHER:
-	statusbar(_("OOPS. Tried to add unknown thing to undo struct, I'd save your work"));
+	statusbar(_("Internal error: unknown type.  Please save your work."));
 	break;
     }
 
@@ -981,7 +1016,6 @@ void update_undo(undo_type action)
 	break;
     case CUT:
     case CUTTOEND:
-    case UNCUT:
 	if (u->cutbuffer)
 	    free(u->cutbuffer);
 	u->cutbuffer = copy_filestruct(cutbuffer);
@@ -989,6 +1023,7 @@ void update_undo(undo_type action)
 	u->linescut++;
 	break;
     case REPLACE:
+    case UNCUT:
 	add_undo(action);
 	break;
     case INSERT:

src/utils.c

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

src/winio.c

@@ -1697,7 +1697,12 @@ int get_mouseinput(int *mouse_x, int *mouse_y, bool allow_shortcuts)
 	    for (; j > 0; j--) {
 		if (f->next != NULL)
 		    f = f->next;
-                while (f->next != NULL && ((f->menus & currmenu) == 0 || strlen(f->help) == 0))
+
+                while (f->next != NULL && ((f->menus & currmenu) == 0
+#ifndef DISABLE_HELP
+                       || strlen(f->help) == 0
+#endif
+		))
 		     f = f->next;
 	    }