GNU nano 2.0.1

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

AUTHORS

@@ -4,10 +4,10 @@ nano editor.  Please see the ChangeLog for specific changes by author.
 -------------------------------------------------------------------------
 
 Chris Allegretta <chrisa@asty.org>
-	* Original program author, stable series maintainer.
+	* Original program author, former stable series maintainer.
 
 David Lawrence Ramsey <pooka109@cox.net>
-	* Development series maintainer.  Multiple buffer support,
+	* Current stable series maintainer.  Multiple buffer support,
 	  operating dir (-o) option, bug fixes for display routines,
 	  wrapping code, spelling fixes, const mode, parts of the UTF-8
 	  support, and various other fixes.

ChangeLog

@@ -1,3 +1,86 @@
+GNU nano 2.0.1 - 2006.11.20
+- General:
+	- Miscellaneous comment fixes. (DLR)
+	- Fix copyright notices to not abbreviate the year list using a
+	  range.  Changes to do_credits() and all source files. (DLR)
+- files.c:
+  get_full_path()
+	- Remove unneeded assert. (DLR)
+	- Fix problem where only paths would be returned when both paths
+	  and filenames should have been. (DLR)
+  do_writeout()
+	- For consistency, when saving a file with no name, don't allow
+	  overwriting an existing file when in restricted mode. (DLR)
+	- Fix problem where a file could sometimes be overwritten
+	  without a warning prompt. (DLR)
+- winio.c:
+  do_replace_highlight()
+	- Include the code to display zero-length matches even when
+	  regex.h isn't found, as it can also be used to display
+	  zero-length Unicode characters. (DLR)
+- doc/rnano.1, doc/fr/rnano.1:
+	- Add missing "(C)" to the copyright notice in the comments.
+	  (DLR)
+- doc/nano.texi:
+	- Remove unneeded "." from the copyright notice in the comments.
+	  (DLR)
+- NEWS:
+	- Add missing entries for nano 1.0.2 and 1.0.3, since 1.1.0
+	  includes their changes. (DLR)
+
+GNU nano 2.0.0 - 2006.11.06
+- General:
+	- Miscellaneous comment fixes. (DLR)
+	- Add syntax for POV-Ray files.  New file doc/syntax/pov.nanorc;
+	  changes to doc/nanorc.sample.in and doc/syntax/Makefile.am.
+	  (Donnie Berkholz, minor tweaks by DLR)
+- AUTHORS:
+	- Update for the 2.0 branch of nano. (DLR)
+- nano.spec.in:
+	- Update links for the 2.0 branch of nano. (DLR)
+	- Update for newer RPM-based distributions. (DLR, adapted from
+	  the nano 1.3.12-1.1.spec file in Fedora Rawhide)
+	- Delete the changelog section, as it hasn't been kept up to
+	  date, and all its changes are documented here in any case.
+	  (DLR)
+- doc/faq.html:
+	- Update links for the 2.0 branch of nano. (DLR)
+- doc/nano.1, doc/nanorc.5, doc/rnano.1:
+	- Add minor wording fixes. (DLR)
+- doc/man/fr/nano.1, doc/man/fr/nanorc.5, doc/man/fr/rnano.1:
+	- Updated manpage translations by Jean-Philippe Guérard.
+- doc/nano.texi:
+	- Add minor wording and punctuation fixes. (DLR)
+
+GNU nano 1.9.99pre3 - 2006.10.25
+- chars.c:
+  nstrncasecmp()
+	- When returning, use the "?" operator instead of an if/else
+	  clause. (DLR)
+- cut.c:
+  do_cut_text()
+	- When uncutting text in the process of copying it, always set
+	  placewewant, as do_uncut_text() does, so that the current line
+	  is always updated properly. (DLR)
+- files.c:
+  input_tab()
+	- Since the field precision operator used in the sprintf() uses
+	  ints and not size_t's, replace it with two strncpy()s, which
+	  use size_t's, and a null termination. (DLR)
+- help.c:
+  parse_help_input()
+	- Add 'E' and 'e' as aliases for Exit, for consistency with the
+	  file browser. (DLR)
+- m4/ac_define_dir.m4:
+	- Import the latest version of this file from
+	  http://autoconf-archive.cryp.to/ac_define_dir.m4. (DLR)
+- doc/faq.html:
+	- Update the question in section 4.13 to match the version of it
+	  in the answer section. (DLR)
+- doc/syntax/c.nanorc:
+	- Simplify "undef", "ifn?def", "elif", and "else" in the
+	  preprocessor regexes. (DLR)
+
 GNU nano 1.9.99pre2 - 2006.10.02
 - General:
 	- Miscellaneous comment fixes. (DLR)
@@ -541,7 +624,7 @@ GNU nano 1.3.12 - 2006.06.26
 	  have fewer than 24 columns, for consistency with the toggle
 	  help text. (DLR, suggested by Benno Schulenberg)
   parse_help_input()
-	- Add Space and - as aliases for PageDown and PageUp, for
+	- Add Space and '-' as aliases for PageDown and PageUp, for
 	  consistency with the file browser. (DLR, suggested by Benno
 	  Schulenberg)
 	- Remove redundant key checks. (DLR)

NEWS

@@ -1,3 +1,34 @@
+2006.11.20 - GNU nano 2.0.1 emerges from its cocoon.  This release
+		contains several bugfixes: saving one file over another
+		will now always warn about overwriting it, overwriting
+		a file is no longer possible when saving a new file in
+		restricted mode, and zero-length Unicode characters are
+		now highlighted properly when nano is built without
+		regular expression support.  It also adds several minor
+		documentation updates.  Have fun with it.
+
+2006.11.06 - GNU nano 2.0.0 does its little dance.  This release adds
+		documentation updates and a few cosmetic tweaks.
+			For those who haven't been following nano 1.3
+		development, there are a ton of new features, including
+		support for UTF-8, moving to a specified line and column
+		instead of just a line, improved color syntax
+		highlighting, inserting previously untypeable characters
+		using "Verbatim Input" mode, and copying text into the
+		cutbuffer without cutting it.  There are also fixes for
+		some long-standing bugs, such as the "NumLock glitch"
+		from nano 1.2.x, and the inability to unjustify text
+		after resizing.  Finally, there are also a ton of
+		translation updates and new translations, as well as new
+		color syntaxes.  See the UPGRADE file for more
+		information, and enjoy the new stable release.
+
+2006.10.25 - GNU nano 1.9.99pre3 learns to appreciate life.  This
+		release fixes a bug where the screen sometimes wouldn't
+		be updated properly after copying text into the
+		cutbuffer, fixes a potential warning while compiling,
+		and fixes a few other minor inconsistencies.  Have fun.
+
 2006.10.02 - GNU nano 1.9.99pre2 crosses the threshold.  This release
 		fixes a few more bugs: cursor positioning after leaving
 		the statusbar prompt has been fixed, and verbatim input
@@ -528,6 +559,27 @@
 		introduce lots of bugs ;-)  Have fun with it, but be
 		careful, unstable means unstable.
 
+07/01/2001 - GNU nano 1.0.3 is the "mutt" release.  This release
+		features oodles of bug fixes with cutting text,
+		especially with the -k (cut to end) option.  There is
+		also a new suspend handler which should make nano play
+		better with mutt (the code for which came from mutt
+		itself; many many thanks to Jordi Mallach and Tom Lear
+		for working late into the night fixing this).  Nano now
+		also features mutt's case insensitive string compare
+		function for more speed and less memory usage.  Two new
+		translations are included, Ukrainian and Russian.
+	
+05/12/2001 - GNU nano 1.0.2 is the "just the bugfixes ma'am" release.
+		The most noticeable fixes are for display errors using
+		page up/down with the marker code, and view mode (-v)
+		not stopping the replace function.  Other fixes include
+		being able to use the arrow keys while holding down the
+		ctrl key in certain TERMs, and there are many
+		documentation updates and spelling tweaks.  We also have
+		a new Galician translation (provided by Jacobo Tarrío).
+		Have fun with it!
+
 04/06/2001 - GNU nano 1.0.1 is out there.  The only new feature is a
 		configure option for those who want to disable all word
 		wrapping from nano, --disable-wrapping.  Bug fixes this

TODO

@@ -34,6 +34,7 @@ For the next version:
   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 searching for and replacing newlines.
+- Allow soft wrapping as well as hard wrapping?
 
 Old requests:
 

configure.ac

@@ -19,7 +19,7 @@
 #
 # $Id$
 
-AC_INIT([GNU nano], [1.9.99pre2], [nano-devel@gnu.org], [nano])
+AC_INIT([GNU nano], [2.0.1], [nano-devel@gnu.org], [nano])
 AC_CONFIG_SRCDIR([src/nano.c])
 AC_CANONICAL_TARGET([])
 AM_INIT_AUTOMAKE

doc/faq.html

@@ -44,7 +44,7 @@
   <a href="#4.10b">4.10b. [version 1.1.99pre1 and later] Hey, the search string behavior has reverted, it's now like Pico, what happened to the consistency?</a><br>
   <a href="#4.11">4.11. How do I make nano my default editor (in Pine, mutt, etc.)?</a><br>
   <a href="#4.12">4.12. I've compiled nano with color support, but I don't see any color when I run it!</a><br>
-  <a href="#4.13">4.13. How do I select text for the clipboard in an X terminal when I'm running nano in one and nano's mouse support is turned on?</a></p></blockquote>
+  <a href="#4.13">4.13. How do I select text for or paste text from the clipboard in an X terminal when I'm running nano in one and nano's mouse support is turned on?</a></p></blockquote>
 <h2><a href="#5">5. Internationalization</a></h2>
 <blockquote><p><a href="#5.1">5.1. There's no translation for my language!</a><br>
   <a href="#5.2">5.2. I don't like the translation for &lt;x&gt; in my language. How can I fix it?</a><br>
@@ -84,9 +84,9 @@
 <h2><a name="1.5"></a>1.5. Why the name change from TIP?</h2>
 <blockquote><p>On January 10, 2000, TIP was officially renamed to nano because of a namespace conflict with another program called 'tip'. The original 'tip' program &quot;establishes a full duplex terminal connection to a remote host&quot;, and was included with many older Unix systems (and newer ones like Solaris). The conflict was not noticed at first because there is no 'tip' utility included with most GNU/Linux distributions (where nano was developed).</p></blockquote>
 <h2><a name="1.6"></a>1.6. What is the current version of nano?</h2>
-<blockquote><p>The current version of nano *should* be 1.9.99pre2. Of course you should always check the nano homepage to see what the latest and greatest version is.</p></blockquote>
+<blockquote><p>The current version of nano *should* be 2.0.1. Of course you should always check the nano homepage to see what the latest and greatest version is.</p></blockquote>
 <h2><a name="1.7"></a>1.7. I want to read the man page without having to download the program!</h2>
-<blockquote><p>Jeez, demanding, aren't we? Okay, look <a href="http://www.nano-editor.org/dist/v1.3/nano.1.html">here</a>.</p></blockquote>
+<blockquote><p>Jeez, demanding, aren't we? Okay, look <a href="http://www.nano-editor.org/dist/v2.0/nano.1.html">here</a>.</p></blockquote>
 <hr width="100%">
 <h1><a name="2"></a>2. Where to get GNU nano.</h1>
 <h2><a name="2.1"></a>2.1. FTP and WWW sites that carry nano.</h2>
@@ -247,7 +247,7 @@
   help-nano - <a href="http://mail.gnu.org/mailman/listinfo/help-nano/">http://mail.gnu.org/mailman/listinfo/help-nano/</a><br>
   nano-devel - <a href="http://mail.gnu.org/mailman/listinfo/nano-devel/">http://mail.gnu.org/mailman/listinfo/nano-devel/</a></p></blockquote>
 <h2><a name="7.2"></a>7.2. I want to send the development team a big load of cash (or just a thank you).</h2>
-<blockquote><p>That's fine. Send it <a href="mailto:nano-devel@gnu.org">our way</a>! Better yet, fix a <a href="http://www.nano-editor.org/dist/v1.3/BUGS">bug</a> in the program or implement a <a href="http://www.nano-editor.org/dist/v1.3/TODO">cool feature</a> and send us that instead (though cash is fine too).</p></blockquote>
+<blockquote><p>That's fine. Send it <a href="mailto:nano-devel@gnu.org">our way</a>! Better yet, fix a <a href="http://www.nano-editor.org/dist/v2.0/BUGS">bug</a> in the program or implement a <a href="http://www.nano-editor.org/dist/v2.0/TODO">cool feature</a> and send us that instead (though cash is fine too).</p></blockquote>
 <h2><a name="7.3"></a>7.3. How do I submit a patch?</h2>
 <blockquote><p>See Section <a href="#7.2">7.2</a>.</p></blockquote>
 <h2><a name="7.4"></a>7.4. How do I join the development team?</h2>
@@ -255,8 +255,9 @@
 <h2><a name="7.5"></a>7.5. Can I have CVS write access?</h2>
 <blockquote><p>Re-read Section <a href="#7.4">7.4</a> and you should know the answer.</p></blockquote>
 <h2><a name="8"></a>8. ChangeLog</h2>
-<blockquote>
-<p>2006/07/25 - Update section 5.3 again to not state &quot;the latest development version&quot; before 1.3.12, as it's no longer accurate. Also add some minor spacing fixes. (DLR)<br>
+<blockquote><p>2006/10/28 - Update various links for the 2.0 branch of nano. (DLR)<br>
+2006/10/06 - Update the question in section 4.13 to match the version of it in the answer section. (DLR)<br>
+2006/07/25 - Update section 5.3 again to not state &quot;the latest development version&quot; before 1.3.12, as it's no longer accurate. Also add some minor spacing fixes. (DLR)<br>
 2006/06/12 - Update section 5.3, due to the display fix for two-column Unicode characters. (DLR)<br>
 2006/06/05 - Add a new section 4.8, and move all section 4 entries after it down one number, to explain how to deal with glibc 2.2.3's crashes involving extended regular expressions. (DLR)<br>
 2006/06/04 - Add minor punctuation, wording, and typo fixes. (DLR)<br>

doc/man/fr/nano.1

@@ -15,7 +15,7 @@
 .\" AUCUNE garantie.
 .\"
 .\" $Id$
-.TH NANO 1 "version 1.9.99pre1" "28\ août\ 2006"
+.TH NANO 1 "version 2.0.0" "28\ octobre\ 2006"
 .\" Please adjust this date whenever revising the manpage.
 .\" Merci de modifier ces dates à chaque mise à jour de cette page.
 .\"
@@ -39,8 +39,8 @@ Pico, l'
 contentant pas de copier l'interface et l'ergonomie de Pico, il offre
 également certaines fonctions manquantes (ou désactivées par défaut)
 dans Pico. Ces fonctionnalités sont, par exemple, les fonctions de
-recherche et de remplacement, et la possibilité de sauter directement à un
-numéro de ligne.
+recherche et de remplacement, et la possibilité de sauter directement à 
+une ligne et à une colonne précise.
 
 .SH OPTIONS
 .TP
@@ -276,10 +276,10 @@ manuel a
 le système Debian (mais elle peut être utilisée par d'autres).
 
 .SH TRADUCTION
-Cette adaptation française a été réalisé par Jean-Philippe\ Guérard 
-<jean-philippe.guerard@tigreraye.org> le 28\ août\ 2006 à partir 
-de la version du 12\ juillet\ 2006 de la page de manuel de nano 
-1.9.99pre1. Cette page a été relue par Gérard Delafond.
+Cette adaptation française a été réalisée par Jean-Philippe\ Guérard 
+<jean-philippe.guerard@tigreraye.org> le 28\ octobre\ 2006 à partir 
+de la version du 28\ octobre\ 2006 de la page de manuel de nano 
+2.0.0. Cette page a été relue par Gérard Delafond.
 
 Un maximum de soin a été apporté lors de l'élaboration de cette
 traduction\ ; néanmoins, quelques imperfections peuvent subsister. Si

doc/man/fr/nanorc.5

@@ -15,7 +15,7 @@
 .\" AUCUNE garantie.
 .\"
 \" $Id$
-.TH NANORC 5 "version 1.9.99pre1" "28\ août\ 2006"
+.TH NANORC 5 "version 2.0.0" "28\ octobre\ 2006"
 .\" Please adjust this date whenever revising the manpage.
 .\" Merci de modifier ces dates à chaque mise à jour de cette page.
 
@@ -32,7 +32,7 @@ remplacer Pico, l'
 Pico, il offre également certaines fonctionnalités manquantes (ou 
 désactivées par défaut) de Pico. Ces fonctionnalités sont, par exemple, 
 les fonctions de recherche et de remplacement et la possibilité de 
-sauter directement à un numéro de ligne.
+sauter directement à une ligne et à une colonne précise.
 .PP
 Le fichier \fInanorc\fP contient les paramètres par défaut de 
 \fBnano\fP. Il ne doit pas être au format DOS ou Mac. Lors de son 
@@ -325,10 +325,10 @@ manuel a
 le système Debian (mais elle peut être utilisée par d'autres).
 
 .SH TRADUCTION
-Cette adaptation française a été réalisé par Jean-Philippe\ Guérard
-<jean-philippe.guerard@tigreraye.org> le 28\ août\ 2006 à partir de
-la version du 30\ juillet\ 2006 de la page de manuel de nanorc (pour la 
-version 1.9.99pre1 de nano). Cette page a été relue par Gérard 
+Cette adaptation française a été réalisée par Jean-Philippe\ Guérard
+<jean-philippe.guerard@tigreraye.org> le 28\ octobre\ 2006 à partir de
+la version du 28\ octobre\ 2006 de la page de manuel de nanorc (pour la 
+version 2.0.0 de nano). Cette page a été relue par Gérard 
 Delafond.
 
 Un maximum de soin a été apporté lors de l'élaboration de cette

doc/man/fr/rnano.1

@@ -1,5 +1,5 @@
 .\" Hey, EMACS: -*- nroff -*-
-.\" rnano.1 is Copyright 2005, 2006 by Thijs Kinkhorst
+.\" rnano.1 is Copyright (C) 2005, 2006 by Thijs Kinkhorst
 .\" <thijs@kinkhorst.com>; skeleton based on nano-tiny.1 by Jordi
 .\" Mallach <jordi@gnu.org>.
 .\"
@@ -16,7 +16,7 @@
 .\" AUCUNE garantie.
 .\"
 .\" $Id$
-.TH RNANO 1 "version 1.9.99pre1" "28\ août\ 20O6"
+.TH RNANO 1 "version 2.0.0" "28\ octobre\ 20O6"
 .\" Please adjust this date whenever revising the manpage.
 .\" Merci de modifier ces dates à chaque mise à jour de cette page.
 .\"
@@ -41,7 +41,7 @@ remplacer Pico, l'
 Pico, il offre également certaines fonctions manquantes (ou désactivées 
 par défaut) dans Pico. Ces fonctionnalités sont, par exemple, les 
 fonctions de recherche et de remplacement, et la possibilité de sauter 
-directement à un numéro de ligne.
+directement à une ligne et à une colonne précise..
 .PP
 \fBrnano\fP est une version de \fBnano\fP fonctionnant en mode 
 restreint, qui ne permet d'éditer que les fichiers indiqués et qui 
@@ -105,10 +105,10 @@ Thijs Kinkhorst <thijs@kinkhorst.com>, pour le syst
 elle peut être utilisée par d'autres).
 
 .SH TRADUCTION
-Cette adaptation française a été réalisé par Jean-Philippe\ Guérard
-<jean-philippe.guerard@tigreraye.org> le 28\ août\ 2006 à partir
-de la version du 12\ juillet\ 2006 de la page de manuel de rnano 
-(pour la version 1.9.99pre1 de nano).
+Cette adaptation française a été réalisée par Jean-Philippe\ Guérard
+<jean-philippe.guerard@tigreraye.org> le 28\ octobre\ 2006 à partir
+de la version du 28\ octobre\ 2006 de la page de manuel de rnano 
+(pour la version 2.0.0 de nano).
 
 Un maximum de soin a été apporté lors de l'élaboration de cette
 traduction\ ; néanmoins, quelques imperfections peuvent subsister. Si

doc/man/nano.1

@@ -7,7 +7,7 @@
 .\" warranty.
 .\"
 .\" $Id$
-.TH NANO 1 "version 1.9.99pre1" "July 12, 2006"
+.TH NANO 1 "version 2.0.0" "October 28, 2006"
 .\" Please adjust this date whenever revising the manpage.
 .\"
 
@@ -29,7 +29,7 @@ This manual page briefly documents the \fBnano\fP command.
 Pico, the default editor included in the non-free Pine package.  Rather
 than just copying Pico's look and feel, \fBnano\fP also implements some
 missing (or disabled by default) features in Pico, such as "search and
-replace" and "go to line number".
+replace" and "go to line and column number".
 
 .SH OPTIONS
 .TP

doc/man/nanorc.5

@@ -7,7 +7,7 @@
 .\" warranty.
 .\"
 .\" $Id$
-.TH NANORC 5 "version 1.9.99pre1" "July 30, 2006"
+.TH NANORC 5 "version 2.0.0" "October 28, 2006"
 .\" Please adjust this date whenever revising the manpage.
 .\"
 .SH NAME
@@ -19,7 +19,7 @@ This manual page briefly documents GNU \fBnano\fP's rcfile.
 Pico, the default editor included in the non-free Pine package.  Rather
 than just copying Pico's look and feel, \fBnano\fP also implements some
 missing (or disabled by default) features in Pico, such as "search and
-replace" and "go to line number".
+replace" and "go to line and column number".
 .PP
 The \fInanorc\fP file contains the default settings for \fBnano\fP.  It
 should not be in DOS or Mac format.  During startup, \fBnano\fP will

doc/man/rnano.1

@@ -1,5 +1,5 @@
 .\" Hey, EMACS: -*- nroff -*-
-.\" rnano.1 is Copyright 2005, 2006 by Thijs Kinkhorst
+.\" rnano.1 is Copyright (C) 2005, 2006 by Thijs Kinkhorst
 .\" <thijs@kinkhorst.com>; skeleton based on nano-tiny.1 by Jordi
 .\" Mallach <jordi@gnu.org>.
 .\"
@@ -8,7 +8,7 @@
 .\" warranty.
 .\"
 .\" $Id$
-.TH RNANO 1 "version 1.9.99pre1" "July 12, 2006"
+.TH RNANO 1 "version 2.0.0" "October 28, 2006"
 .\" Please adjust this date whenever revising the manpage.
 .\"
 .SH NAME
@@ -30,7 +30,7 @@ This manual page briefly documents the \fBrnano\fP command.
 Pico, the default editor included in the non-free Pine package. Rather
 than just copying Pico's look and feel, \fBnano\fP also implements some
 missing (or disabled by default) features in Pico, such as "search and
-replace" and "go to line number".
+replace" and "go to line and column number".
 .PP
 \fBrnano\fP is a restricted version of \fBnano\fP, which only edits
 specific files and doesn't allow the user access to the filesystem or a

doc/nanorc.sample.in

@@ -255,3 +255,6 @@
 
 ## Bourne shell scripts
 # include "@PKGDATADIR@/sh.nanorc"
+
+## POV-Ray
+# include "@PKGDATADIR@/pov.nanorc"

doc/syntax/Makefile.am

@@ -8,6 +8,7 @@ pkgdata_DATA =	asm.nanorc \
 		nanorc.nanorc \
 		patch.nanorc \
 		perl.nanorc \
+		pov.nanorc \
 		python.nanorc \
 		ruby.nanorc \
 		sh.nanorc \

doc/syntax/c.nanorc

@@ -8,7 +8,7 @@ color green "\<(class|namespace|template|public|protected|private|typename|this|
 color brightyellow "\<(for|if|while|do|else|case|default|switch)\>"
 color brightyellow "\<(try|throw|catch|operator|new|delete)\>"
 color magenta "\<(goto|continue|break|return)\>"
-color brightcyan "^[[:space:]]*#[[:space:]]*(define|undef|include|ifn?def|endif|elif|else|if|warning|error)"
+color brightcyan "^[[:space:]]*#[[:space:]]*(define|include|(un|ifn?)def|endif|el(if|se)|if|warning|error)"
 color brightmagenta "'([^'\]|(\\["'abfnrtv\\]))'" "'\\(([0-3]?[0-7]{1,2}))'" "'\\x[0-9A-Fa-f]{1,2}'"
 ##
 ## GCC builtins

doc/syntax/pov.nanorc

@@ -0,0 +1,15 @@
+## Here is an example for POV-Ray.
+##
+syntax "pov" "\.(pov|POV|povray|POVRAY)$"
+color brightcyan "^[[:space:]]*#[[:space:]]*(declare)"
+color brightyellow "\<(sphere|cylinder|translate|matrix|rotate|scale)\>"
+color brightyellow "\<(orthographic|location|up|right|direction|clipped_by)\>"
+color brightyellow "\<(fog_type|fog_offset|fog_alt|rgb|distance|transform)\>"
+color brightred "^\<(texture)\>"
+color brightred "\<(light_source|background)\>"
+color brightred "\<(fog|object|camera)\>"
+color green "(\{|\}|\(|\)|\;|\]|\[|`|\\|\$|<|>|!|=|&|\|)"
+color brightmagenta "\<(union|group|subgroup)\>"
+## Comment highlighting
+color brightblue "//.*"
+color brightblue start="/\*" end="\*/"

doc/texinfo/nano.texi

@@ -8,8 +8,8 @@
 @c Run 'makeinfo' rather than 'texinfo-format-buffer'.
 @smallbook
 @set EDITION 0.1
-@set VERSION 1.9.99pre1
-@set UPDATED 30 Jul 2006
+@set VERSION 2.0.0
+@set UPDATED 27 Oct 2006
 
 @dircategory Editors
 @direntry
@@ -23,7 +23,7 @@
 @titlepage
 @title GNU @code{nano}
 @subtitle a small and friendly text editor.
-@subtitle version 1.9.99pre1
+@subtitle version 2.0.0
 
 @author Chris Allegretta
 @page
@@ -34,7 +34,7 @@ editor.
 This manual is part of the GNU @code{nano} distribution.@*
 @sp4
 Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006 by Chris
-Allegretta.
+Allegretta
 
 This is free documentation, see the latest version of the GNU General
 Public License for copying conditions.  There is NO warranty.
@@ -64,8 +64,9 @@ editor.
 
 GNU @code{nano} is a small and friendly text editor.  Besides basic text
 editing, @code{nano} offers many extra features like an interactive
-search and replace, go to line number, auto-indentation, feature
-toggles, internationalization support, and filename tab completion.
+search and replace, go to line and column number, auto-indentation,
+feature toggles, internationalization support, and filename tab
+completion.
 
 @menu
 * Overview::
@@ -731,7 +732,7 @@ position of the cursor.
 
 @item Interactive Replace and Spell Checker
 It is worth noting that @code{nano}'s replace function is interactive,
-i.e, it does not stop after one search string is found and automatically
+i.e. it does not stop after one search string is found and automatically
 replace it.  The @code{nano} implementation will pause at each search
 string found and query whether to replace this instance or not.  The
 internal spell checker operates similarly.  Note that there is no way to
@@ -792,8 +793,8 @@ line option, which enables long line wrapping.
 
 @item --enable-tiny
 This option disables all the above.  It also disables some of the larger
-internals of the editor, like the marking code and the cut to line code.
-It also disables the function toggles.
+internals of the editor, like the marking code and the cut to end of
+line code.  It also disables the function toggles.
 
 @item --enable-debug
 Enable support for runtime debug output.  This can get pretty messy, so

m4/ac_define_dir.m4

@@ -13,9 +13,9 @@ dnl
 dnl @category Misc
 dnl @author Stepan Kasal <kasal@ucw.cz>
 dnl @author Andreas Schwab <schwab@suse.de>
-dnl @author Guido Draheim <guidod@gmx.de>
+dnl @author Guido U. Draheim <guidod@gmx.de>
 dnl @author Alexandre Oliva
-dnl @version 2005-07-29
+dnl @version 2006-10-13
 dnl @license AllPermissive
 
 AC_DEFUN([AC_DEFINE_DIR], [

nano.spec.in

@@ -1,45 +1,39 @@
 %define name	@PACKAGE@
-%define ver	@VERSION@
-%define rel	1
+%define version	@VERSION@
+%define release	1
 
 Summary	: Pico editor clone with enhancements
 Name		: %{name}
-Version		: %{ver}
-Release		: %{rel}
-Copyright	: GPL
-Group		: Console/Editors
+Version		: %{version}
+Release		: %{release}
+License		: GPL
+Group		: Applications/Editors
 URL		: http://www.nano-editor.org/
-Source		: http://www.nano-editor.org/dist/v1.3/%{name}-%{ver}.tar.gz
-BuildRoot	: /var/tmp/%{name}-buildroot
-Requires	: ncurses
+Source		: http://www.nano-editor.org/dist/v2.0/%{name}-%{version}.tar.gz
+BuildRoot	: %{_tmppath}/%{name}-%{version}-root
+BuildRequires	: autoconf, automake, gettext-devel, ncurses-devel
 
 %description
-GNU nano is a small and friendly text editor.  It aims to emulate the Pico
-text editor while also offering a few enhancements.
+GNU nano is a small and friendly text editor.  It aims to emulate the
+Pico text editor while also offering a few enhancements.
 
 %prep
 %setup -q
 
 %build
 %configure --enable-all
-make RPM_OPT_FLAGS="$RPM_OPT_FLAGS"
+make
 
 %install
-rm -rf "$RPM_BUILD_ROOT"
-make DESTDIR="$RPM_BUILD_ROOT" install
+rm -rf %{buildroot}
+make DESTDIR="%{buildroot}" install
 
 %files
 %defattr(-,root,root)
 %doc AUTHORS BUGS COPYING ChangeLog INSTALL NEWS README THANKS TODO doc/faq.html doc/nanorc.sample
 %{_bindir}/*
-%{_mandir}/*/*
+%{_mandir}/man*/*
+%{_mandir}/fr/man*/*
+%{_infodir}/nano.info*
 %{_datadir}/locale/*/LC_MESSAGES/nano.mo
 %{_datadir}/nano/*
-%{_infodir}/nano.info*
-
-%changelog
-* Sat Mar 30 2002 Chris Allegretta <chrisa@asty.org>
-- Accepted into main distribution
-- Added Packager and URL tage from original spec file.
-* Tue Mar 06 2002 Brett Pemberton <generica@email.com>
-- Initial spec-file

po/ChangeLog

@@ -1,10 +1,36 @@
+2006-10-25  Jordi Mallach  <jordi@gnu.org>
+
+	* fr.po: Updated French translation by Jean-Philippe Guérard.
+	* nb.po: Updated Norwegian bokmål translation by
+	Geir Helland.
+
+2006-10-16  Jordi Mallach  <jordi@gnu.org>
+
+	* gl.po: Updated Galician translation by
+	Francisco Javier Tsao Santín.
+
+2006-10-16  Jordi Mallach  <jordi@gnu.org>
+
+	* eu.po: Updated Basque translation by Mikel Olasagasti.
+
+2006-10-10  Jordi Mallach  <jordi@gnu.org>
+
+	* gl.po: Updated Galician translation by
+	Francisco Javier Tsao Santín.
+
+2006-10-02  Jordi Mallach  <jordi@gnu.org>
+
+	* pt_BR.po: Refetch the current nano 1.9.99pre0 pt_BR file from
+	the TP, as the latest file offered is apparently for 1.3.11pre1.
+
 2006-10-02  David Lawrence Ramsey  <pooka109@cox.net>
-	* pt_BR: Restore previous version of pt_BR, as it was for
+
+	* pt_BR.po: Restore previous version of pt_BR, as it was for
 	nano 1.9.99pre0, and the current version is for 1.3.11pre1.
 
 2006-09-27  Jordi Mallach  <jordi@gnu.org>
 
-	* pt_BR: Updated Brazilian Portuguese translation by
+	* pt_BR.po: Updated Brazilian Portuguese translation by
 	Joao Victor Duarte Martins.
 
 2006-09-10  David Lawrence Ramsey  <pooka109@cox.net>
@@ -17,7 +43,7 @@
 
 2006-09-02  Jordi Mallach  <jordi@gnu.org>
 
-	* pt_BR: Updated Brazilian Portuguese translation by
+	* pt_BR.po: Updated Brazilian Portuguese translation by
 	Joao Victor Duarte Martins.
 
 2006-09-01  Benno Schulenberg  <bensberg@justemail.net>
@@ -210,7 +236,7 @@
 
 2005-04-22  Jordi Mallach  <jordi@gnu.org>
 
-	* ca.po: Updated Norwegian bokmål translation by
+	* nb.po: Updated Norwegian bokmål translation by
 	Geir Helland.
 
 2005-04-20  Jordi Mallach  <jordi@gnu.org>

po/fr.po

@@ -11,7 +11,7 @@ msgstr ""
 "Project-Id-Version: nano 1.9.99pre0\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2006-08-19 07:34-0400\n"
-"PO-Revision-Date: 2006-08-28 00:52+0200\n"
+"PO-Revision-Date: 2006-10-16 23:32+0200\n"
 "Last-Translator: Jean-Philippe Guérard <jean-philippe.guerard@corbeaunoir.org>\n"
 "Language-Team: French <traduc@traduc.org>\n"
 "MIME-Version: 1.0\n"
@@ -2168,7 +2168,7 @@ msgstr "--syntax=<cha
 # File: src/nano.c, line: 791
 #: src/nano.c:792
 msgid "Syntax definition to use for coloring"
-msgstr "Définition de la syntaxe de colorisation"
+msgstr "Définit la syntaxe de colorisation"
 
 #
 # File: src/nano.c, line: 793

po/pt_BR.po

@@ -1,15 +1,15 @@
 # Portugueses Translation for the nano textual domain
 # Copyright (C) 2006 Free Software Foundation, Inc.
 # This file is distributed under the same license as the nano package.
-# Joao Victor Duarte Martins <jvdm@sdf.lonestar.org>, 2006.
+# J. Victor D. Martins <jvdm@sdf.lonestar.org>, 2006.
 #
 msgid ""
 msgstr ""
 "Project-Id-Version: nano 1.9.99pre0\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2006-08-19 07:34-0400\n"
-"PO-Revision-Date: 2006-09-02 12:06-0300\n"
-"Last-Translator: Joao Victor Duarte Martins <jvdm@sdf.lonestar.org>\n"
+"PO-Revision-Date: 2006-09-27 02:13-0300\n"
+"Last-Translator: J. Victor D. Martins <jvdm@sdf.lonestar.org>\n"
 "Language-Team: Brazilian Portuguese <ldp-br@bazar.conectiva.com.br>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=iso-8859-1\n"
@@ -1553,10 +1553,9 @@ msgstr "Falta o nome da cor"
 msgid "Background color \"%s\" cannot be bright"
 msgstr "Cor do fundo \"%s\" não pode ser clara"
 
-# regex?
 #: src/rcfile.c:503
 msgid "Missing regex string"
-msgstr "Falta string da regex"
+msgstr "Falta a expressão regular"
 
 #: src/rcfile.c:575
 msgid "\"start=\" requires a corresponding \"end=\""
@@ -1820,26 +1819,26 @@ msgstr "Obrigado por utilizar o nano!"
 #~ msgstr "Encontrar outro parenteses"
 
 #~ msgid "Make the current search/replace case (in)sensitive"
-#~ msgstr "Tornar a busca/substitução atual sensível a caixa"
+#~ msgstr "Tornar a busca/reposição atual sensível a caixa"
 
 #~ msgid "Make the current search/replace go backwards"
-#~ msgstr "Tornar a busca/substituição atual de trás pra frente"
+#~ msgstr "Tornar a busca/reposição atual ao contrário"
 
 #~ msgid "Prepend to the current file"
-#~ msgstr "Pré-Adicionar para a arquivo atual"
+#~ msgstr "Pre-adicionar ao arquivo atual"
 
 #~ msgid "Back up original file when saving"
 #~ msgstr "Fazer o bacape do arquivo original quando salvá-lo"
 
 #~ msgid "Insert into new buffer"
-#~ msgstr "Inserir no novo buffer"
+#~ msgstr "Inserir em um novo buffer"
 
 #~ msgid ""
 #~ "\n"
 #~ "Buffer not written to %s (too many backup files?)\n"
 #~ msgstr ""
 #~ "\n"
-#~ "Buffer não foi escrito no %s (muitos arquivos de bacape?)\n"
+#~ "Buffer não foi escrito no %s (talvez muitos arquivos de segurança?)\n"
 
 #~ msgid ""
 #~ " nano help text\n"
@@ -1851,23 +1850,9 @@ msgstr "Obrigado por utilizar o nano!"
 #~ msgstr ""
 #~ " texto de ajuda do nano\n"
 #~ "\n"
-#~ "O editor nano foi projetado para emular as funcionalidades e as facilidades de uso\n"
-#~ "do editor de texto UW Pico.  Existem quatro grandes seções no editor editor: A\n"
-#~ "linha superior mostra a versão do programa, o arquivo editado atualmente, e se\n"
-#~ "o arquivo foi modificado ou não.  A próxima é a a seção principal da tela do\n"
-#~ "editor, mostrando o arquivo que está sendo editado.  A linha de avisos é a\n"
-#~ "terceira apartir da última e mostra mensagens importantes.  As outras duas mostram\n"
-#~ "os atalhos mais comuns utilizados no editor.\n"
+#~ "O editor nano foi projetado para emular as funcionalidades e as facilidades de uso do editor de texto UW Pico.  Existem quatro grandes seções no editor editor: A linha superior mostra a versão do programa, o arquivo editado atualmente, e se o arquivo foi modificado ou não.  A próxima é a a seção principal da tela do editor, mostrando o arquivo que está sendo editado.  A linha de avisos é a terceira apartir da última e mostra mensagens importantes.  As outras duas mostram os atalhos mais comuns utilizados no editor.\n"
 #~ "\n"
-#~ " A notação para atalhos é a seguinte: Sequências de tecla-<Control> são grafadas\n"
-#~ "com o cirfunflexo (^) e podem ser inseridas tanto utilizando as teclas <Ctrl> ou\n"
-#~ "precionando <ESC> duas vezes.  Sequências com teclas de escape são grafadas\n"
-#~ "com o símbolo Meta (M) e podem tanto ser inseridas utilizando a telca <ESC>, <Alt>\n"
-#~ "ou tecla meta, dependendo da configuração do seu teclado.  Também precionando <ESC>\n"
-#~ "duas vezes ou digitando um número de três dígitos de 000 à 255 você irá inserir\n"
-#~ "um caractere correspondende ao respectivo código ASCII. Os seguintes atalhos de\n"
-#~ "teclado estão disponíveis na tela principal do editor.  Teclas alternativas são\n"
-#~ "mostradas entre parenteses:\n"
+#~ " A notação para atalhos é a seguinte: Sequências de tecla-<Control> são grafadas com o cirfunflexo (^) e podem ser inseridas tanto utilizando as teclas <Ctrl> ou precionando <ESC> duas vezes.  Sequências com teclas de escape são grafadas com o símbolo Meta (M) e podem tanto ser inseridas utilizando a telca <ESC>, <Alt> ou tecla meta, dependendo da configuração do seu teclado.  \"\n"
 #~ "\n"
 
 #~ msgid "Up"
@@ -1891,7 +1876,7 @@ msgstr "Obrigado por utilizar o nano!"
 #~ msgstr "+LINHA"
 
 #~ msgid "Do regular expression searches"
-#~ msgstr "Expressão regular procurada"
+#~ msgstr "Buscar por expressões regulares"
 
 #~ msgid "Set fill cols to (wrap lines at) #cols"
 #~ msgstr "Ajustar preenchimento de cols para (ajustar linhas em) #cols"

src/browser.c

@@ -2,8 +2,8 @@
 /**************************************************************************
  *   browser.c                                                            *
  *                                                                        *
- *   Copyright (C) 2001-2004 Chris Allegretta                             *
- *   Copyright (C) 2005-2006 David Lawrence Ramsey                        *
+ *   Copyright (C) 2001, 2002, 2003, 2004 Chris Allegretta                *
+ *   Copyright (C) 2005, 2006 David Lawrence Ramsey                       *
  *   This program is free software; you can redistribute it and/or modify *
  *   it under the terms of the GNU General Public License as published by *
  *   the Free Software Foundation; either version 2, or (at your option)  *

src/chars.c

@@ -2,8 +2,8 @@
 /**************************************************************************
  *   chars.c                                                              *
  *                                                                        *
- *   Copyright (C) 2001-2004 Chris Allegretta                             *
- *   Copyright (C) 2005-2006 David Lawrence Ramsey                        *
+ *   Copyright (C) 2001, 2002, 2003, 2004 Chris Allegretta                *
+ *   Copyright (C) 2005, 2006 David Lawrence Ramsey                       *
  *   This program is free software; you can redistribute it and/or modify *
  *   it under the terms of the GNU General Public License as published by *
  *   the Free Software Foundation; either version 2, or (at your option)  *
@@ -514,10 +514,7 @@ int nstrncasecmp(const char *s1, const char *s2, size_t n)
 	    break;
     }
 
-    if (n > 0)
-	return tolower(*s1) - tolower(*s2);
-    else
-	return 0;
+    return (n > 0) ? tolower(*s1) - tolower(*s2) : 0;
 }
 #endif
 
@@ -578,8 +575,9 @@ int mbstrncasecmp(const char *s1, const char *s2, size_t n)
  * from mutt 1.2.4i (lib.c).  Here is the notice from that file, with
  * the Free Software Foundation's address updated:
  *
- * Copyright (C) 1996-2000 Michael R. Elkins <me@cs.hmc.edu>
- * Copyright (C) 1999-2000 Thomas Roessler <roessler@guug.de>
+ * Copyright (C) 1996, 1997, 1998, 1999, 2000 Michael R. Elkins
+ * <me@cs.hmc.edu>
+ * Copyright (C) 1999, 2000 Thomas Roessler <roessler@guug.de>
  * 
  *     This program is free software; you can redistribute it
  *     and/or modify it under the terms of the GNU General Public
@@ -1026,8 +1024,7 @@ bool is_valid_mbstring(const char *s)
 
     return 
 #ifdef ENABLE_UTF8
-	use_utf8 ?
-	(mbstowcs(NULL, s, 0) != (size_t)-1) :
+	use_utf8 ? (mbstowcs(NULL, s, 0) != (size_t)-1) :
 #endif
 	TRUE;
 }

src/color.c

@@ -2,8 +2,8 @@
 /**************************************************************************
  *   color.c                                                              *
  *                                                                        *
- *   Copyright (C) 2001-2004 Chris Allegretta                             *
- *   Copyright (C) 2005-2006 David Lawrence Ramsey                        *
+ *   Copyright (C) 2001, 2002, 2003, 2004 Chris Allegretta                *
+ *   Copyright (C) 2005, 2006 David Lawrence Ramsey                       *
  *   This program is free software; you can redistribute it and/or modify *
  *   it under the terms of the GNU General Public License as published by *
  *   the Free Software Foundation; either version 2, or (at your option)  *

src/cut.c

@@ -2,8 +2,8 @@
 /**************************************************************************
  *   cut.c                                                                *
  *                                                                        *
- *   Copyright (C) 1999-2004 Chris Allegretta                             *
- *   Copyright (C) 2005-2006 David Lawrence Ramsey                        *
+ *   Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004 Chris Allegretta    *
+ *   Copyright (C) 2005, 2006 David Lawrence Ramsey                       *
  *   This program is free software; you can redistribute it and/or modify *
  *   it under the terms of the GNU General Public License as published by *
  *   the Free Software Foundation; either version 2, or (at your option)  *
@@ -194,6 +194,10 @@ void do_cut_text(
 		cb_save->data -= cb_save_len;
 	    } else
 		copy_from_filestruct(cutbuffer, cutbottom);
+
+	    /* Set the current place we want to where the text from the
+	     * cutbuffer ends. */
+	    openfile->placewewant = xplustabs();
 	}
 
 	/* Set NO_NEWLINES back to what it was before, since we're done

src/files.c

@@ -2,8 +2,8 @@
 /**************************************************************************
  *   files.c                                                              *
  *                                                                        *
- *   Copyright (C) 1999-2004 Chris Allegretta                             *
- *   Copyright (C) 2005-2006 David Lawrence Ramsey                        *
+ *   Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004 Chris Allegretta    *
+ *   Copyright (C) 2005, 2006 David Lawrence Ramsey                       *
  *   This program is free software; you can redistribute it and/or modify *
  *   it under the terms of the GNU General Public License as published by *
  *   the Free Software Foundation; either version 2, or (at your option)  *
@@ -954,13 +954,11 @@ char *get_full_path(const char *origpath)
 
     d_there = real_dir_from_tilde(origpath);
 
-    assert(d_there != NULL);
-
     /* If stat()ing d_there fails, assume that d_there refers to a new
      * file that hasn't been saved to disk yet.  Set path_only to TRUE
      * if d_there refers to a directory, and FALSE otherwise. */
-    path_only = stat(d_there, &fileinfo) == 0 &&
-	S_ISDIR(fileinfo.st_mode);
+    path_only = (stat(d_there, &fileinfo) != -1 &&
+	S_ISDIR(fileinfo.st_mode));
 
     /* If path_only is TRUE, make sure d_there ends in a slash. */
     if (path_only) {
@@ -988,8 +986,7 @@ char *get_full_path(const char *origpath)
 	if (!path_only)
 	    d_there_file = mallocstrcpy(NULL, last_slash + 1);
 
-	/* And remove the filename portion of the answer from
-	 * d_there. */
+	/* Remove the filename portion of the answer from d_there. */
 	null_at(&d_there, last_slash - d_there + 1);
 
 	/* Go to the path specified in d_there. */
@@ -1021,28 +1018,29 @@ char *get_full_path(const char *origpath)
 
 	    /* Finally, go back to the path specified in d_here,
 	     * where we were before.  We don't check for a chdir()
-	     * error, since we can do nothing then. */
+	     * error, since we can do nothing if we get one. */
 	    chdir(d_here);
 
 	    /* Free d_here, since we're done using it. */
 	    free(d_here);
 	}
-
-	/* At this point, if path_only is FALSE and d_there isn't NULL,
-	 * d_there contains the path portion of the answer and
-	 * d_there_file contains the filename portion of the answer.  If
-	 * this is the case, tack the latter onto the end of the former.
-	 * d_there will then contain the complete answer. */
-	if (!path_only && d_there != NULL) {
-	    d_there = charealloc(d_there, strlen(d_there) +
-		strlen(d_there_file) + 1);
-	    strcat(d_there, d_there_file);
- 	}
-
-	/* Free d_there_file, since we're done using it. */
-	free(d_there_file);
     }
 
+    /* At this point, if path_only is FALSE and d_there isn't NULL,
+     * d_there contains the path portion of the answer and d_there_file
+     * contains the filename portion of the answer.  If this is the
+     * case, tack the latter onto the end of the former.  d_there will
+     * then contain the complete answer. */
+    if (!path_only && d_there != NULL) {
+	d_there = charealloc(d_there, strlen(d_there) +
+		strlen(d_there_file) + 1);
+	strcat(d_there, d_there_file);
+    }
+
+    /* Free d_there_file, since we're done using it. */
+    if (d_there_file != NULL)
+	free(d_there_file);
+
     return d_there;
 }
 
@@ -1145,10 +1143,10 @@ void init_operating_dir(void)
  * so that tab completion will work. */
 bool check_operating_dir(const char *currpath, bool allow_tabcomp)
 {
-    /* The char *full_operating_dir is global for mem cleanup.  It
-     * should have already been initialized by init_operating_dir().
-     * Also, a relative operating directory path will only be handled
-     * properly if this is done. */
+    /* full_operating_dir is global for memory cleanup.  It should have
+     * already been initialized by init_operating_dir().  Also, a
+     * relative operating directory path will only be handled properly
+     * if this is done. */
 
     char *fullpath;
     bool retval = FALSE;
@@ -1763,7 +1761,7 @@ int do_writeout(bool exiting)
 
     ans = mallocstrcpy(NULL,
 #ifndef NANO_TINY
-	(openfile->mark_set && !exiting) ? "" :
+	(!exiting && openfile->mark_set) ? "" :
 #endif
 	openfile->filename);
 
@@ -1778,7 +1776,7 @@ int do_writeout(bool exiting)
 
 	backupstr = ISSET(BACKUP_FILE) ? _(" [Backup]") : "";
 
-	if (openfile->mark_set && !exiting)
+	if (!exiting && openfile->mark_set)
 	    msg = (append == PREPEND) ?
 		_("Prepend Selection to File") : (append == APPEND) ?
 		_("Append Selection to File") :
@@ -1869,42 +1867,59 @@ int do_writeout(bool exiting)
 		break;
 	    }
 #endif
-	    if (append == OVERWRITE && strcmp(answer,
-		openfile->filename) != 0) {
-		struct stat st;
 
-		if (!stat(answer, &st)) {
-		    i = do_yesno_prompt(FALSE,
-			_("File exists, OVERWRITE ? "));
-		    if (i == 0 || i == -1)
-			continue;
-		/* If we're using restricted mode, we aren't allowed to
-		 * change the name of a file once it has one, because
-		 * that would allow reading from or writing to files not
-		 * specified on the command line.  In this case, don't
-		 * bother showing the "Different Name" prompt. */
-		} else if (!ISSET(RESTRICTED) &&
+	    if (append == OVERWRITE) {
+		char *full_answer = get_full_path(answer);
+		char *full_filename = get_full_path(openfile->filename);
+		bool different_name = (strcmp(full_answer,
+			full_filename) != 0);
+		struct stat st;
+		bool name_exists;
+
+		free(full_filename);
+		free(full_answer);
+
+		name_exists = (stat(answer, &st) != -1);
+
+		if (different_name) {
+		    if (name_exists) {
+			/* If we're using restricted mode, we aren't
+			 * allowed to save a new file under the name of
+			 * an existing file. */
+			if (ISSET(RESTRICTED))
+			    continue;
+
+			i = do_yesno_prompt(FALSE,
+				_("File exists, OVERWRITE ? "));
+			if (i == 0 || i == -1)
+			    continue;
+		    /* If we're using restricted mode, we aren't allowed
+		     * to change the name of a file once it has one,
+		     * because that would allow reading from or writing
+		     * to files not specified on the command line. */
+		    } else if (!ISSET(RESTRICTED) &&
 			openfile->filename[0] != '\0'
 #ifndef NANO_TINY
 			&& (exiting || !openfile->mark_set)
 #endif
 			) {
-		    i = do_yesno_prompt(FALSE,
-			_("Save file under DIFFERENT NAME ? "));
-		    if (i == 0 || i == -1)
-			continue;
+			i = do_yesno_prompt(FALSE,
+				_("Save file under DIFFERENT NAME ? "));
+			if (i == 0 || i == -1)
+			    continue;
+		    }
 		}
 	    }
 
 #ifndef NANO_TINY
 	    /* Here's where we allow the selected text to be written to
 	     * a separate file.  If we're using restricted mode, this is
-	     * disabled since it allows reading from or writing to files
-	     * not specified on the command line. */
+	     * disabled, since it allows reading from or writing to
+	     * files not specified on the command line. */
 	    if (!ISSET(RESTRICTED) && !exiting && openfile->mark_set)
 		retval = write_marked_file(answer, NULL, FALSE, append);
 	    else
-#endif /* !NANO_TINY */
+#endif
 		retval = write_file(answer, NULL, FALSE, append, FALSE);
 
 	    break;
@@ -2239,16 +2254,17 @@ char *input_tab(char *buf, bool allow_files, size_t *place, bool
 	free(match2_mb);
 
 	mzero = charalloc(lastslash_len + common_len + 1);
-	sprintf(mzero, "%.*s%.*s", lastslash_len, buf, common_len,
-		matches[0]);
+
+	strncpy(mzero, buf, lastslash_len);
+	strncpy(mzero + lastslash_len, matches[0], common_len);
 
 	common_len += lastslash_len;
+	mzero[common_len] = '\0';
 
 	assert(common_len >= *place);
 
 	if (num_matches == 1 && is_dir(mzero)) {
-	    mzero[common_len] = '/';
-	    common_len++;
+	    mzero[common_len++] = '/';
 
 	    assert(common_len > *place);
 	}
@@ -2378,6 +2394,7 @@ char *histfilename(void)
 	strcpy(nanohist, homedir);
 	strcpy(nanohist + homelen, "/.nano_history");
     }
+
     return nanohist;
 }
 

src/global.c

@@ -2,8 +2,8 @@
 /**************************************************************************
  *   global.c                                                             *
  *                                                                        *
- *   Copyright (C) 1999-2004 Chris Allegretta                             *
- *   Copyright (C) 2005-2006 David Lawrence Ramsey                        *
+ *   Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004 Chris Allegretta    *
+ *   Copyright (C) 2005, 2006 David Lawrence Ramsey                       *
  *   This program is free software; you can redistribute it and/or modify *
  *   it under the terms of the GNU General Public License as published by *
  *   the Free Software Foundation; either version 2, or (at your option)  *

src/help.c

@@ -2,8 +2,8 @@
 /**************************************************************************
  *   help.c                                                               *
  *                                                                        *
- *   Copyright (C) 2000-2004 Chris Allegretta                             *
- *   Copyright (C) 2005-2006 David Lawrence Ramsey                        *
+ *   Copyright (C) 2000, 2001, 2002, 2003, 2004 Chris Allegretta          *
+ *   Copyright (C) 2005, 2006 David Lawrence Ramsey                       *
  *   This program is free software; you can redistribute it and/or modify *
  *   it under the terms of the GNU General Public License as published by *
  *   the Free Software Foundation; either version 2, or (at your option)  *
@@ -586,6 +586,8 @@ void parse_help_input(int *kbinput, bool *meta_key, bool *func_key)
 		break;
 	    /* Cancel is equivalent to Exit here. */
 	    case NANO_CANCEL_KEY:
+	    case 'E':
+	    case 'e':
 		*kbinput = NANO_EXIT_KEY;
 		break;
 	}

src/move.c

@@ -2,8 +2,8 @@
 /**************************************************************************
  *   move.c                                                               *
  *                                                                        *
- *   Copyright (C) 1999-2004 Chris Allegretta                             *
- *   Copyright (C) 2005-2006 David Lawrence Ramsey                        *
+ *   Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004 Chris Allegretta    *
+ *   Copyright (C) 2005, 2006 David Lawrence Ramsey                       *
  *   This program is free software; you can redistribute it and/or modify *
  *   it under the terms of the GNU General Public License as published by *
  *   the Free Software Foundation; either version 2, or (at your option)  *

src/nano.c

@@ -2,8 +2,8 @@
 /**************************************************************************
  *   nano.c                                                               *
  *                                                                        *
- *   Copyright (C) 1999-2004 Chris Allegretta                             *
- *   Copyright (C) 2005-2006 David Lawrence Ramsey                        *
+ *   Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004 Chris Allegretta    *
+ *   Copyright (C) 2005, 2006 David Lawrence Ramsey                       *
  *   This program is free software; you can redistribute it and/or modify *
  *   it under the terms of the GNU General Public License as published by *
  *   the Free Software Foundation; either version 2, or (at your option)  *
@@ -1922,7 +1922,7 @@ int main(int argc, char **argv)
 	}
     }
 
-    /* If the executable filename starts with 'r', we use restricted
+    /* If the executable filename starts with 'r', enable restricted
      * mode. */
     if (*(tail(argv[0])) == 'r')
 	SET(RESTRICTED);

src/nano.h

@@ -2,8 +2,8 @@
 /**************************************************************************
  *   nano.h                                                               *
  *                                                                        *
- *   Copyright (C) 1999-2004 Chris Allegretta                             *
- *   Copyright (C) 2005-2006 David Lawrence Ramsey                        *
+ *   Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004 Chris Allegretta    *
+ *   Copyright (C) 2005, 2006 David Lawrence Ramsey                       *
  *   This program is free software; you can redistribute it and/or modify *
  *   it under the terms of the GNU General Public License as published by *
  *   the Free Software Foundation; either version 2, or (at your option)  *

src/prompt.c

@@ -2,8 +2,8 @@
 /**************************************************************************
  *   prompt.c                                                             *
  *                                                                        *
- *   Copyright (C) 1999-2004 Chris Allegretta                             *
- *   Copyright (C) 2005-2006 David Lawrence Ramsey                        *
+ *   Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004 Chris Allegretta    *
+ *   Copyright (C) 2005, 2006 David Lawrence Ramsey                       *
  *   This program is free software; you can redistribute it and/or modify *
  *   it under the terms of the GNU General Public License as published by *
  *   the Free Software Foundation; either version 2, or (at your option)  *
@@ -999,7 +999,7 @@ int get_prompt_string(bool allow_tabs,
     wnoutrefresh(bottomwin);
 
     /* If we're using restricted mode, we aren't allowed to change the
-     * name of a file once it has one because that would allow writing
+     * name of a file once it has one, because that would allow writing
      * to files not specified on the command line.  In this case,
      * disable all keys that would change the text if the filename isn't
      * blank and we're at the "Write File" prompt. */

src/proto.h

@@ -2,8 +2,8 @@
 /**************************************************************************
  *   proto.h                                                              *
  *                                                                        *
- *   Copyright (C) 1999-2004 Chris Allegretta                             *
- *   Copyright (C) 2005-2006 David Lawrence Ramsey                        *
+ *   Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004 Chris Allegretta    *
+ *   Copyright (C) 2005, 2006 David Lawrence Ramsey                       *
  *   This program is free software; you can redistribute it and/or modify *
  *   it under the terms of the GNU General Public License as published by *
  *   the Free Software Foundation; either version 2, or (at your option)  *

src/rcfile.c

@@ -2,8 +2,8 @@
 /**************************************************************************
  *   rcfile.c                                                             *
  *                                                                        *
- *   Copyright (C) 2001-2004 Chris Allegretta                             *
- *   Copyright (C) 2005-2006 David Lawrence Ramsey                        *
+ *   Copyright (C) 2001, 2002, 2003, 2004 Chris Allegretta                *
+ *   Copyright (C) 2005, 2006 David Lawrence Ramsey                       *
  *   This program is free software; you can redistribute it and/or modify *
  *   it under the terms of the GNU General Public License as published by *
  *   the Free Software Foundation; either version 2, or (at your option)  *
@@ -204,7 +204,7 @@ char *parse_next_regex(char *ptr)
 	return NULL;
     }
 
-    /* Null terminate and advance ptr. */
+    /* Null-terminate and advance ptr. */
     *ptr++ = '\0';
 
     while (isblank(*ptr))

src/search.c

@@ -2,8 +2,8 @@
 /**************************************************************************
  *   search.c                                                             *
  *                                                                        *
- *   Copyright (C) 1999-2004 Chris Allegretta                             *
- *   Copyright (C) 2005-2006 David Lawrence Ramsey                        *
+ *   Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004 Chris Allegretta    *
+ *   Copyright (C) 2005, 2006 David Lawrence Ramsey                       *
  *   This program is free software; you can redistribute it and/or modify *
  *   it under the terms of the GNU General Public License as published by *
  *   the Free Software Foundation; either version 2, or (at your option)  *

src/text.c

@@ -2,8 +2,8 @@
 /**************************************************************************
  *   text.c                                                               *
  *                                                                        *
- *   Copyright (C) 1999-2004 Chris Allegretta                             *
- *   Copyright (C) 2005-2006 David Lawrence Ramsey                        *
+ *   Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004 Chris Allegretta    *
+ *   Copyright (C) 2005, 2006 David Lawrence Ramsey                       *
  *   This program is free software; you can redistribute it and/or modify *
  *   it under the terms of the GNU General Public License as published by *
  *   the Free Software Foundation; either version 2, or (at your option)  *
@@ -150,7 +150,7 @@ void do_delete(void)
 }
 
 /* Backspace over one character.  That is, move the cursor left one
- * character, and then delete the character there. */
+ * character, and then delete the character under the cursor. */
 void do_backspace(void)
 {
     if (openfile->current != openfile->fileage ||

src/utils.c

@@ -2,8 +2,8 @@
 /**************************************************************************
  *   utils.c                                                              *
  *                                                                        *
- *   Copyright (C) 1999-2004 Chris Allegretta                             *
- *   Copyright (C) 2005-2006 David Lawrence Ramsey                        *
+ *   Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004 Chris Allegretta    *
+ *   Copyright (C) 2005, 2006 David Lawrence Ramsey                       *
  *   This program is free software; you can redistribute it and/or modify *
  *   it under the terms of the GNU General Public License as published by *
  *   the Free Software Foundation; either version 2, or (at your option)  *
@@ -232,7 +232,7 @@ ssize_t ngetdelim(char **lineptr, size_t *n, int delim, FILE *stream)
 	*n += MAX_BUF_SIZE;
     }
 
-    /* Null terminate the buffer. */
+    /* Null-terminate the buffer. */
     null_at(lineptr, indx++);
     *n = indx;
 

src/winio.c

@@ -2,8 +2,8 @@
 /**************************************************************************
  *   winio.c                                                              *
  *                                                                        *
- *   Copyright (C) 1999-2004 Chris Allegretta                             *
- *   Copyright (C) 2005-2006 David Lawrence Ramsey                        *
+ *   Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004 Chris Allegretta    *
+ *   Copyright (C) 2005, 2006 David Lawrence Ramsey                       *
  *   This program is free software; you can redistribute it and/or modify *
  *   it under the terms of the GNU General Public License as published by *
  *   the Free Software Foundation; either version 2, or (at your option)  *
@@ -1974,7 +1974,7 @@ char *display_string(const char *buf, size_t start_col, size_t len, bool
 
     assert(alloc_len >= index + 1);
 
-    /* Null terminate converted. */
+    /* Null-terminate converted. */
     converted[index] = '\0';
 
     /* Make sure converted takes up no more than len columns. */
@@ -3124,12 +3124,10 @@ void do_replace_highlight(bool highlight, const char *word)
     if (highlight)
 	wattron(edit, reverse_attr);
 
-#ifdef HAVE_REGEX_H
-    /* This is so we can show zero-length regex matches. */
+    /* This is so we can show zero-length matches. */
     if (word_len == 0)
 	waddch(edit, ' ');
     else
-#endif
 	waddnstr(edit, word, actual_x(word, y));
 
     if (word_len > y)
@@ -3199,8 +3197,8 @@ void do_credits(void)
 	"",
 	"",
 	"",
-	"(c) 1999-2004 Chris Allegretta",
-	"(c) 2005-2006 David Lawrence Ramsey",
+	"(c) 1999, 2000, 2001, 2002, 2003, 2004 Chris Allegretta",
+	"(c) 2005, 2006 David Lawrence Ramsey",
 	"",
 	"",
 	"",