GNU nano 2.0.0

git-svn-id: svn://svn.savannah.gnu.org/nano/trunk/nano@3933 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,27 @@
+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()
@@ -19,7 +43,7 @@ GNU nano 1.9.99pre3 - 2006.10.25
 	  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.
+	  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)

NEWS

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

configure.ac

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

doc/faq.html

@@ -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.99pre3. 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.0. 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,7 +255,8 @@
 <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/10/06 - Update the question in section 4.13 to match the version of it in the answer section. (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>

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

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

@@ -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/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
@@ -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

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

src/nano.c

@@ -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/rcfile.c

@@ -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/utils.c

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

@@ -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. */