GNU nano 2.5.3 release

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

.cvsignore

@@ -1,25 +0,0 @@
-ABOUT-NLS
-COPYING
-INSTALL
-Makefile
-Makefile.in
-aclocal.m4
-autom4te.cache
-confdefs.h
-config.cache
-config.h
-config.h.in
-config.log
-config.status
-config.rpath
-configure
-config.guess
-config.sub
-depcomp
-install-sh
-missing
-mkinstalldirs
-nano.spec
-stamp-h
-stamp-h.in
-stamp-h1

.gitignore

@@ -0,0 +1,34 @@
+*~
+*.bak
+*.o
+.deps
+.libs
+Makefile
+Makefile.in
+
+core
+.gdb_history
+.gdbinit
+
+/ABOUT-NLS
+/INSTALL
+/aclocal.m4
+/autom4te.cache
+/compile
+/config.cache
+/config.guess
+/config.h
+/config.h.in
+/config.log
+/config.rpath
+/config.status
+/config.sub
+/configure
+/depcomp
+/install-sh
+/missing
+/mkinstalldirs
+/stamp-h1
+
+/nano.spec
+/src/nano

AUTHORS

@@ -1,16 +1,15 @@
-$Id$
-This file lists people who have made significant contribution to the
+This file lists people who have made significant contributions to the
 nano editor.  Please see the ChangeLog for specific changes by author.
 -------------------------------------------------------------------------
 
 Chris Allegretta <chrisa@asty.org>
-	* Original program author, former stable series maintainer.
+	* Original program author, former and current maintainer.
 
-David Lawrence Ramsey <pooka109@cox.net>
-	* Current stable series maintainer.  Multiple buffer support,
+David Lawrence Ramsey <pooka109@gmail.com>
+	* Former 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.
+	  wrapping code, spelling fixes, const mode, parts of the
+	  UTF-8 support, and various other fixes.
 
 Jordi Mallach <jordi@gnu.org>
 	* Debian package maintainer, fellow bug squasher.
@@ -23,8 +22,8 @@ Adam Rogoyski <rogoyski@cs.utexas.edu>
 
 Robert Siemborski <rjs3@andrew.cmu.edu>
 	* Miscellaneous cut, display, replace, and other bug fixes,
-	  original and new "magic line" code, read_line() function, new
-	  edit display routines.
+	  original and new "magic line" code, read_line() function,
+	  new edit display routines.
 
 Rocco Corsi <rocco.corsi@sympatico.ca>
 	* Internal spelling code, many optimizations and bug fixes for
@@ -41,3 +40,10 @@ Mike Frysinger <vapier@gentoo.org>
 	  --enable-utf8/--disable-utf8 configure options for ncurses,
 	  many new color regexes and improvements to existing color
 	  regexes for nanorc.sample, and miscellaneous bug fixes.
+
+Mark Majeres <mark@engine12.com>
+	* A functional undo/redo system, and coloring nano's interface.
+
+Benno Schulenberg <bensberg@justemail.net>
+	* A bunch of small bug fixes, the cutword routines, some extra
+	  key bindings.  Current maintainer.

BUGS

@@ -1,143 +0,0 @@
-** Open BUGS **
-
-** Fixed BUGS **
-- Marked cutting sometimes leaves a newline in the file unintelligently,
-  such as when all of a line is selected but the mark doesn't proceed to
-  the new line. (8) [FIXED/IRRELEVANT]
-- Certains are not lined up properly when there are tabs in them at 
-  certain col values. (9) [FIXED]
-- edit_refresh() and update_line() do not handle selecting text when the
-  cursor is beyond COLS (10) [FIXED]
-- No way to do a replace with the empty string (11) [FIXED, yay!]
-- Spelling support is not elegant like Pico's integration of the 'spell'
-  program.  nano only uses ispell (for now) (12) [FIXED]
-- Moving to the end of a line when close to a multiple of COLS and at
-  least COLS * 2 does not make the screen jump early like it would for
-  if we were around COLS (bugs in edit_refresh, update_line) (13)
-  [FIXED, mostly]
-- When at the very bottom of the edit window, do_wrap() goes berserk and
-  puts the cursor somewhere bad; subsequent keystrokes crash the program
-  (14) [FIXED, mostly]
-- Doing a replacement of a substring of the replace string (e.g.
-  replacing "ed" with "fred" causes an infinite loop). (15) [FIXED]
-- Cutting a file with marked text and both marker ends on the same line
-  causes a random segfault (16) [FIXED]
-- Cutting more than one line resets the KEEP_CUTBUFFER flag in 0.9.3.
-  Error is in bitwise assignment (nano.h). (17) [FIXED]
-- The wrapping code does not work right for lines like the following:
- *                                                                     *
-  Error is in do_wrap, must be rewritten. (18) [FIXED]
-- nano fails to follow symlinks, even though -l isn't being used (20).
-  [Bug in global flag init, FIXED]
-- When using --help or --version, the SIGINT character gets lost. (21)
-  [FIXED]
-- edit_refresh() and update_line() (and related functions) have 
-  trouble when a tab is the character that is the boundary at COLS (23)
-  [FIXED]
-- There is an off-by-one error in keeping track of totsize.  It is
-  caused by the fact that we count the newline at the end when we read
-  in a file but we do not, in fact, display this newline.  This should
-  go away implicitly when the "Magic Line" returns, but it is noted here
-  for documentation's sake. (24) [FIXED]
-- In replace with completely adjacent strings, every other search string
-  will be missed (try replace ':' in a string like ':::::::::') (28)
-  [FIXED]
-- If nano opens a read-only file with the --tempfile option, and a
-  change is made to the buffer, and a write is attempted, nano will not
-  give you a dialog about not being able to write the file, and it will
-  not let the user exit (29, discovered by Joshua Jensen) [FIXED]
-- Using nano -k, marked text is not cut properly. (31) [FIXED]
-- Invoking -t or -k has the effect of invoking both options. (32)
-  [FIXED]
-- totsize becomes incorrect after word-wrapping (25) [FIXED]
-- Wrapping a line with autoindent mode sometimes causes a segfault (19)
-  [FIXED]
-- When inserting files, the display sometimes fails to display properly
-  until a pageup/down occurs (22) [FIXED]
-- In search/replace code, there is too much refreshing in bottomwin (26)
-  [FIXED]
-- In replace, there is no way to accept the default replace string. (27)
-  [FIXED]
-- Using nano -t, user can not exit until a filename is given via ^O.
-  (30) [FIXED]
-- totsize problems still abound in do_justify (33) [FIXED]
-- Using -k, cut text is not pasted properly. (34) [FIXED].
-- Using -k, pasted text is not updated properly if it goes beyond
-  editbot. (35) [FIXED]
-- Doing a cut with -k can screw up the filestruct; fault is in cutting
-  code. (36) [FIXED]
-- Hitting enter on the magic line makes new lines, but they are not
-  written out to disk when saved..... (37). [FIXED]
-- Page up and page down do not work the same way as in Pico (# of
-  lines). (38) [FIXED]
-- When doing a search and the marker is set, the screen does not always
-  properly update the inverted text (39). [FIXED]
-- Searches for a string that only exists on one line multiple times will
-  fail after finding the last occurrence (discovered by Ken Tyler) (40).
-  [FIXED]
-- Meta-Z is currently broken to toggle suspend.  I guess I still don't
-  know signals very well =-) (41) [FIXED].
-- Unable to cut the entire file using the marker (discovered by Ken
-  Tyler) (42). [FIXED]
-- The keypad does not work when nano runs in the Gnome terminal (43).
-  [FIXED]
-- When reading in a file, if the file is a directory, the contents of
-  the file being edited are blown away (discovered by  Chris Pimlot)
-  (44). [FIXED]
-- In certain terms, nano will leave a "ghost" of screen upon exit when
-  called from inside mutt (among other settings) (45). [FIXED]
-- In replace, hitting the Goto line shortcut key does nothing after a
-  search string is entered (discovered by Rocco Corsi) (46) [FIXED].
-- When typing in a string in search or replace and hitting
-  CASE_SENSITIVE or the other search string, the current string edit is
-  blown away in favor of the last stored search (47) [FIXED]
-- If nano fails to open a file when it starts up, doing almost anything
-  causes a segfault (discovered by Ben Roberts) (48). [FIXED]
-- In certain terminals, nano would not work properly with keypad().
-  Turned out to be the silly timeout(0) call, which is completely
-  unneeded, anyway. (49) [FIXED]
-- With less than a page of text, doing a page down will move the current
-  line to the top of the screen, which it shouldn't do. (50) [FIXED]
-- With PDCurses, running Meta-X turns off the keypad. (51) [FIXED]
-- Resizing the window completely screws up the display if in any other
-  mode than normal editing (help screen, search and replace, file
-  browser...) (52) [FIXED]
-- Alt speller argument (-s, --speller) does not take a string argument
-  of more than one word. (53) [FIXED].
-- Cut to end cutting (-k) causes segfaults (try cutting "- Backup making
-  (filename~)?" line in TODO file) (discovered by
-  higuita@cadernoverde.com) (54) [FIXED].
-- When using autoindent (-i), wrapped text does not get autoindented
-  (55, discovered by Mark Senior) [FIXED].
-- When using -R (regex) and -p (Pico mode), subsequent searches after
-  the first fail if no string is entered (56) [FIXED].
-- Page down on a file of editwinrows fails (again). Reported by Ryan
-  Krebs (57) [FIXED].
-- File browser aborts on Solaris in qsort() call. (Reported by Matthias
-  Andree) (58) [FIXED].
-- Can modify the current file in view mode with ^W^R (discovered by
-  Rocco Corsi) (58) [FIXED].
-- When page up is used after two page downs, the screen doesn't update
-  properly (discovered by David Lawrence Ramsey) (59) [FIXED].
-- On BSD systems, marked cutting and paste often screws up the last line
-  in the cutbuffer (discovered by Barry Pederson) (60) [FIXED]
-- Blank lines are not kept when cutting with -k (discovered by Rocco)
-  (61) [FIXED].
-- nano will not suspend properly inside of mutt (62) [FIXED].
-- When switching from Pico mode to normal mode, the previous search is
-  not displayed until cancelling the search (63) [FIXED].
-- If you change search options but don't change the search string in
-  normal mode, hitting Enter causes the search/replace to abort (64)
-  (Jordi Mallach) [FIXED].
-- Cutting one line of text causes the screen to recenter the line
-  (reported and fixed by David Lawrence Ramsey) (65) [FIXED].
-- When cutting marked text including the bottom of the file, a new
-  "magic line" is not created" (reported by David Lawrence Ramsey, fixed
-  by David Lawrence Ramsey & Chris) (66) [FIXED].
-- ^C does not work after a suspend in tcsh (discovered by Trevor Cordes)
-  (68) [FIXED].
-- Home and End control keys (^A, ^E) do not always work in filename
-  prompt (bug found by Ian Turner) (69) [1.0 series only] [FIXED].
-- Trying to insert a file of 0 bytes will hang nano (70) [FIXED].
-
-$Id$

COPYING

@@ -0,0 +1,676 @@
+
+		    GNU GENERAL PUBLIC LICENSE
+		       Version 3, 29 June 2007
+
+ Copyright (C) 2007 Free Software Foundation, Inc. <http://fsf.org/>
+ Everyone is permitted to copy and distribute verbatim copies
+ of this license document, but changing it is not allowed.
+
+			    Preamble
+
+  The GNU General Public License is a free, copyleft license for
+software and other kinds of works.
+
+  The licenses for most software and other practical works are designed
+to take away your freedom to share and change the works.  By contrast,
+the GNU General Public License is intended to guarantee your freedom to
+share and change all versions of a program--to make sure it remains free
+software for all its users.  We, the Free Software Foundation, use the
+GNU General Public License for most of our software; it applies also to
+any other work released this way by its authors.  You can apply it to
+your programs, too.
+
+  When we speak of free software, we are referring to freedom, not
+price.  Our General Public Licenses are designed to make sure that you
+have the freedom to distribute copies of free software (and charge for
+them if you wish), that you receive source code or can get it if you
+want it, that you can change the software or use pieces of it in new
+free programs, and that you know you can do these things.
+
+  To protect your rights, we need to prevent others from denying you
+these rights or asking you to surrender the rights.  Therefore, you have
+certain responsibilities if you distribute copies of the software, or if
+you modify it: responsibilities to respect the freedom of others.
+
+  For example, if you distribute copies of such a program, whether
+gratis or for a fee, you must pass on to the recipients the same
+freedoms that you received.  You must make sure that they, too, receive
+or can get the source code.  And you must show them these terms so they
+know their rights.
+
+  Developers that use the GNU GPL protect your rights with two steps:
+(1) assert copyright on the software, and (2) offer you this License
+giving you legal permission to copy, distribute and/or modify it.
+
+  For the developers' and authors' protection, the GPL clearly explains
+that there is no warranty for this free software.  For both users' and
+authors' sake, the GPL requires that modified versions be marked as
+changed, so that their problems will not be attributed erroneously to
+authors of previous versions.
+
+  Some devices are designed to deny users access to install or run
+modified versions of the software inside them, although the manufacturer
+can do so.  This is fundamentally incompatible with the aim of
+protecting users' freedom to change the software.  The systematic
+pattern of such abuse occurs in the area of products for individuals to
+use, which is precisely where it is most unacceptable.  Therefore, we
+have designed this version of the GPL to prohibit the practice for those
+products.  If such problems arise substantially in other domains, we
+stand ready to extend this provision to those domains in future versions
+of the GPL, as needed to protect the freedom of users.
+
+  Finally, every program is threatened constantly by software patents.
+States should not allow patents to restrict development and use of
+software on general-purpose computers, but in those that do, we wish to
+avoid the special danger that patents applied to a free program could
+make it effectively proprietary.  To prevent this, the GPL assures that
+patents cannot be used to render the program non-free.
+
+  The precise terms and conditions for copying, distribution and
+modification follow.
+
+		       TERMS AND CONDITIONS
+
+  0. Definitions.
+
+  "This License" refers to version 3 of the GNU General Public License.
+
+  "Copyright" also means copyright-like laws that apply to other kinds of
+works, such as semiconductor masks.
+ 
+  "The Program" refers to any copyrightable work licensed under this
+License.  Each licensee is addressed as "you".  "Licensees" and
+"recipients" may be individuals or organizations.
+
+  To "modify" a work means to copy from or adapt all or part of the work
+in a fashion requiring copyright permission, other than the making of an
+exact copy.  The resulting work is called a "modified version" of the
+earlier work or a work "based on" the earlier work.
+
+  A "covered work" means either the unmodified Program or a work based
+on the Program.
+
+  To "propagate" a work means to do anything with it that, without
+permission, would make you directly or secondarily liable for
+infringement under applicable copyright law, except executing it on a
+computer or modifying a private copy.  Propagation includes copying,
+distribution (with or without modification), making available to the
+public, and in some countries other activities as well.
+
+  To "convey" a work means any kind of propagation that enables other
+parties to make or receive copies.  Mere interaction with a user through
+a computer network, with no transfer of a copy, is not conveying.
+
+  An interactive user interface displays "Appropriate Legal Notices"
+to the extent that it includes a convenient and prominently visible
+feature that (1) displays an appropriate copyright notice, and (2)
+tells the user that there is no warranty for the work (except to the
+extent that warranties are provided), that licensees may convey the
+work under this License, and how to view a copy of this License.  If
+the interface presents a list of user commands or options, such as a
+menu, a prominent item in the list meets this criterion.
+
+  1. Source Code.
+
+  The "source code" for a work means the preferred form of the work
+for making modifications to it.  "Object code" means any non-source
+form of a work.
+
+  A "Standard Interface" means an interface that either is an official
+standard defined by a recognized standards body, or, in the case of
+interfaces specified for a particular programming language, one that
+is widely used among developers working in that language.
+
+  The "System Libraries" of an executable work include anything, other
+than the work as a whole, that (a) is included in the normal form of
+packaging a Major Component, but which is not part of that Major
+Component, and (b) serves only to enable use of the work with that
+Major Component, or to implement a Standard Interface for which an
+implementation is available to the public in source code form.  A
+"Major Component", in this context, means a major essential component
+(kernel, window system, and so on) of the specific operating system
+(if any) on which the executable work runs, or a compiler used to
+produce the work, or an object code interpreter used to run it.
+
+  The "Corresponding Source" for a work in object code form means all
+the source code needed to generate, install, and (for an executable
+work) run the object code and to modify the work, including scripts to
+control those activities.  However, it does not include the work's
+System Libraries, or general-purpose tools or generally available free
+programs which are used unmodified in performing those activities but
+which are not part of the work.  For example, Corresponding Source
+includes interface definition files associated with source files for
+the work, and the source code for shared libraries and dynamically
+linked subprograms that the work is specifically designed to require,
+such as by intimate data communication or control flow between those
+subprograms and other parts of the work.
+
+  The Corresponding Source need not include anything that users
+can regenerate automatically from other parts of the Corresponding
+Source.
+
+  The Corresponding Source for a work in source code form is that
+same work.
+
+  2. Basic Permissions.
+
+  All rights granted under this License are granted for the term of
+copyright on the Program, and are irrevocable provided the stated
+conditions are met.  This License explicitly affirms your unlimited
+permission to run the unmodified Program.  The output from running a
+covered work is covered by this License only if the output, given its
+content, constitutes a covered work.  This License acknowledges your
+rights of fair use or other equivalent, as provided by copyright law.
+
+  You may make, run and propagate covered works that you do not
+convey, without conditions so long as your license otherwise remains
+in force.  You may convey covered works to others for the sole purpose
+of having them make modifications exclusively for you, or provide you
+with facilities for running those works, provided that you comply with
+the terms of this License in conveying all material for which you do
+not control copyright.  Those thus making or running the covered works
+for you must do so exclusively on your behalf, under your direction
+and control, on terms that prohibit them from making any copies of
+your copyrighted material outside their relationship with you.
+
+  Conveying under any other circumstances is permitted solely under
+the conditions stated below.  Sublicensing is not allowed; section 10
+makes it unnecessary.
+
+  3. Protecting Users' Legal Rights From Anti-Circumvention Law.
+
+  No covered work shall be deemed part of an effective technological
+measure under any applicable law fulfilling obligations under article
+11 of the WIPO copyright treaty adopted on 20 December 1996, or
+similar laws prohibiting or restricting circumvention of such
+measures.
+
+  When you convey a covered work, you waive any legal power to forbid
+circumvention of technological measures to the extent such circumvention
+is effected by exercising rights under this License with respect to
+the covered work, and you disclaim any intention to limit operation or
+modification of the work as a means of enforcing, against the work's
+users, your or third parties' legal rights to forbid circumvention of
+technological measures.
+
+  4. Conveying Verbatim Copies.
+
+  You may convey verbatim copies of the Program's source code as you
+receive it, in any medium, provided that you conspicuously and
+appropriately publish on each copy an appropriate copyright notice;
+keep intact all notices stating that this License and any
+non-permissive terms added in accord with section 7 apply to the code;
+keep intact all notices of the absence of any warranty; and give all
+recipients a copy of this License along with the Program.
+
+  You may charge any price or no price for each copy that you convey,
+and you may offer support or warranty protection for a fee.
+
+  5. Conveying Modified Source Versions.
+
+  You may convey a work based on the Program, or the modifications to
+produce it from the Program, in the form of source code under the
+terms of section 4, provided that you also meet all of these conditions:
+
+    a) The work must carry prominent notices stating that you modified
+    it, and giving a relevant date.
+
+    b) The work must carry prominent notices stating that it is
+    released under this License and any conditions added under section
+    7.  This requirement modifies the requirement in section 4 to
+    "keep intact all notices".
+
+    c) You must license the entire work, as a whole, under this
+    License to anyone who comes into possession of a copy.  This
+    License will therefore apply, along with any applicable section 7
+    additional terms, to the whole of the work, and all its parts,
+    regardless of how they are packaged.  This License gives no
+    permission to license the work in any other way, but it does not
+    invalidate such permission if you have separately received it.
+
+    d) If the work has interactive user interfaces, each must display
+    Appropriate Legal Notices; however, if the Program has interactive
+    interfaces that do not display Appropriate Legal Notices, your
+    work need not make them do so.
+
+  A compilation of a covered work with other separate and independent
+works, which are not by their nature extensions of the covered work,
+and which are not combined with it such as to form a larger program,
+in or on a volume of a storage or distribution medium, is called an
+"aggregate" if the compilation and its resulting copyright are not
+used to limit the access or legal rights of the compilation's users
+beyond what the individual works permit.  Inclusion of a covered work
+in an aggregate does not cause this License to apply to the other
+parts of the aggregate.
+
+  6. Conveying Non-Source Forms.
+
+  You may convey a covered work in object code form under the terms
+of sections 4 and 5, provided that you also convey the
+machine-readable Corresponding Source under the terms of this License,
+in one of these ways:
+
+    a) Convey the object code in, or embodied in, a physical product
+    (including a physical distribution medium), accompanied by the
+    Corresponding Source fixed on a durable physical medium
+    customarily used for software interchange.
+
+    b) Convey the object code in, or embodied in, a physical product
+    (including a physical distribution medium), accompanied by a
+    written offer, valid for at least three years and valid for as
+    long as you offer spare parts or customer support for that product
+    model, to give anyone who possesses the object code either (1) a
+    copy of the Corresponding Source for all the software in the
+    product that is covered by this License, on a durable physical
+    medium customarily used for software interchange, for a price no
+    more than your reasonable cost of physically performing this
+    conveying of source, or (2) access to copy the
+    Corresponding Source from a network server at no charge.
+
+    c) Convey individual copies of the object code with a copy of the
+    written offer to provide the Corresponding Source.  This
+    alternative is allowed only occasionally and noncommercially, and
+    only if you received the object code with such an offer, in accord
+    with subsection 6b.
+
+    d) Convey the object code by offering access from a designated
+    place (gratis or for a charge), and offer equivalent access to the
+    Corresponding Source in the same way through the same place at no
+    further charge.  You need not require recipients to copy the
+    Corresponding Source along with the object code.  If the place to
+    copy the object code is a network server, the Corresponding Source
+    may be on a different server (operated by you or a third party)
+    that supports equivalent copying facilities, provided you maintain
+    clear directions next to the object code saying where to find the
+    Corresponding Source.  Regardless of what server hosts the
+    Corresponding Source, you remain obligated to ensure that it is
+    available for as long as needed to satisfy these requirements.
+
+    e) Convey the object code using peer-to-peer transmission, provided
+    you inform other peers where the object code and Corresponding
+    Source of the work are being offered to the general public at no
+    charge under subsection 6d.
+
+  A separable portion of the object code, whose source code is excluded
+from the Corresponding Source as a System Library, need not be
+included in conveying the object code work.
+
+  A "User Product" is either (1) a "consumer product", which means any
+tangible personal property which is normally used for personal, family,
+or household purposes, or (2) anything designed or sold for incorporation
+into a dwelling.  In determining whether a product is a consumer product,
+doubtful cases shall be resolved in favor of coverage.  For a particular
+product received by a particular user, "normally used" refers to a
+typical or common use of that class of product, regardless of the status
+of the particular user or of the way in which the particular user
+actually uses, or expects or is expected to use, the product.  A product
+is a consumer product regardless of whether the product has substantial
+commercial, industrial or non-consumer uses, unless such uses represent
+the only significant mode of use of the product.
+
+  "Installation Information" for a User Product means any methods,
+procedures, authorization keys, or other information required to install
+and execute modified versions of a covered work in that User Product from
+a modified version of its Corresponding Source.  The information must
+suffice to ensure that the continued functioning of the modified object
+code is in no case prevented or interfered with solely because
+modification has been made.
+
+  If you convey an object code work under this section in, or with, or
+specifically for use in, a User Product, and the conveying occurs as
+part of a transaction in which the right of possession and use of the
+User Product is transferred to the recipient in perpetuity or for a
+fixed term (regardless of how the transaction is characterized), the
+Corresponding Source conveyed under this section must be accompanied
+by the Installation Information.  But this requirement does not apply
+if neither you nor any third party retains the ability to install
+modified object code on the User Product (for example, the work has
+been installed in ROM).
+
+  The requirement to provide Installation Information does not include a
+requirement to continue to provide support service, warranty, or updates
+for a work that has been modified or installed by the recipient, or for
+the User Product in which it has been modified or installed.  Access to a
+network may be denied when the modification itself materially and
+adversely affects the operation of the network or violates the rules and
+protocols for communication across the network.
+
+  Corresponding Source conveyed, and Installation Information provided,
+in accord with this section must be in a format that is publicly
+documented (and with an implementation available to the public in
+source code form), and must require no special password or key for
+unpacking, reading or copying.
+
+  7. Additional Terms.
+
+  "Additional permissions" are terms that supplement the terms of this
+License by making exceptions from one or more of its conditions.
+Additional permissions that are applicable to the entire Program shall
+be treated as though they were included in this License, to the extent
+that they are valid under applicable law.  If additional permissions
+apply only to part of the Program, that part may be used separately
+under those permissions, but the entire Program remains governed by
+this License without regard to the additional permissions.
+
+  When you convey a copy of a covered work, you may at your option
+remove any additional permissions from that copy, or from any part of
+it.  (Additional permissions may be written to require their own
+removal in certain cases when you modify the work.)  You may place
+additional permissions on material, added by you to a covered work,
+for which you have or can give appropriate copyright permission.
+
+  Notwithstanding any other provision of this License, for material you
+add to a covered work, you may (if authorized by the copyright holders of
+that material) supplement the terms of this License with terms:
+
+    a) Disclaiming warranty or limiting liability differently from the
+    terms of sections 15 and 16 of this License; or
+
+    b) Requiring preservation of specified reasonable legal notices or
+    author attributions in that material or in the Appropriate Legal
+    Notices displayed by works containing it; or
+
+    c) Prohibiting misrepresentation of the origin of that material, or
+    requiring that modified versions of such material be marked in
+    reasonable ways as different from the original version; or
+
+    d) Limiting the use for publicity purposes of names of licensors or
+    authors of the material; or
+
+    e) Declining to grant rights under trademark law for use of some
+    trade names, trademarks, or service marks; or
+
+    f) Requiring indemnification of licensors and authors of that
+    material by anyone who conveys the material (or modified versions of
+    it) with contractual assumptions of liability to the recipient, for
+    any liability that these contractual assumptions directly impose on
+    those licensors and authors.
+
+  All other non-permissive additional terms are considered "further
+restrictions" within the meaning of section 10.  If the Program as you
+received it, or any part of it, contains a notice stating that it is
+governed by this License along with a term that is a further
+restriction, you may remove that term.  If a license document contains
+a further restriction but permits relicensing or conveying under this
+License, you may add to a covered work material governed by the terms
+of that license document, provided that the further restriction does
+not survive such relicensing or conveying.
+
+  If you add terms to a covered work in accord with this section, you
+must place, in the relevant source files, a statement of the
+additional terms that apply to those files, or a notice indicating
+where to find the applicable terms.
+
+  Additional terms, permissive or non-permissive, may be stated in the
+form of a separately written license, or stated as exceptions;
+the above requirements apply either way.
+
+  8. Termination.
+
+  You may not propagate or modify a covered work except as expressly
+provided under this License.  Any attempt otherwise to propagate or
+modify it is void, and will automatically terminate your rights under
+this License (including any patent licenses granted under the third
+paragraph of section 11).
+
+  However, if you cease all violation of this License, then your
+license from a particular copyright holder is reinstated (a)
+provisionally, unless and until the copyright holder explicitly and
+finally terminates your license, and (b) permanently, if the copyright
+holder fails to notify you of the violation by some reasonable means
+prior to 60 days after the cessation.
+
+  Moreover, your license from a particular copyright holder is
+reinstated permanently if the copyright holder notifies you of the
+violation by some reasonable means, this is the first time you have
+received notice of violation of this License (for any work) from that
+copyright holder, and you cure the violation prior to 30 days after
+your receipt of the notice.
+
+  Termination of your rights under this section does not terminate the
+licenses of parties who have received copies or rights from you under
+this License.  If your rights have been terminated and not permanently
+reinstated, you do not qualify to receive new licenses for the same
+material under section 10.
+
+  9. Acceptance Not Required for Having Copies.
+
+  You are not required to accept this License in order to receive or
+run a copy of the Program.  Ancillary propagation of a covered work
+occurring solely as a consequence of using peer-to-peer transmission
+to receive a copy likewise does not require acceptance.  However,
+nothing other than this License grants you permission to propagate or
+modify any covered work.  These actions infringe copyright if you do
+not accept this License.  Therefore, by modifying or propagating a
+covered work, you indicate your acceptance of this License to do so.
+
+  10. Automatic Licensing of Downstream Recipients.
+
+  Each time you convey a covered work, the recipient automatically
+receives a license from the original licensors, to run, modify and
+propagate that work, subject to this License.  You are not responsible
+for enforcing compliance by third parties with this License.
+
+  An "entity transaction" is a transaction transferring control of an
+organization, or substantially all assets of one, or subdividing an
+organization, or merging organizations.  If propagation of a covered
+work results from an entity transaction, each party to that
+transaction who receives a copy of the work also receives whatever
+licenses to the work the party's predecessor in interest had or could
+give under the previous paragraph, plus a right to possession of the
+Corresponding Source of the work from the predecessor in interest, if
+the predecessor has it or can get it with reasonable efforts.
+
+  You may not impose any further restrictions on the exercise of the
+rights granted or affirmed under this License.  For example, you may
+not impose a license fee, royalty, or other charge for exercise of
+rights granted under this License, and you may not initiate litigation
+(including a cross-claim or counterclaim in a lawsuit) alleging that
+any patent claim is infringed by making, using, selling, offering for
+sale, or importing the Program or any portion of it.
+
+  11. Patents.
+
+  A "contributor" is a copyright holder who authorizes use under this
+License of the Program or a work on which the Program is based.  The
+work thus licensed is called the contributor's "contributor version".
+
+  A contributor's "essential patent claims" are all patent claims
+owned or controlled by the contributor, whether already acquired or
+hereafter acquired, that would be infringed by some manner, permitted
+by this License, of making, using, or selling its contributor version,
+but do not include claims that would be infringed only as a
+consequence of further modification of the contributor version.  For
+purposes of this definition, "control" includes the right to grant
+patent sublicenses in a manner consistent with the requirements of
+this License.
+
+  Each contributor grants you a non-exclusive, worldwide, royalty-free
+patent license under the contributor's essential patent claims, to
+make, use, sell, offer for sale, import and otherwise run, modify and
+propagate the contents of its contributor version.
+
+  In the following three paragraphs, a "patent license" is any express
+agreement or commitment, however denominated, not to enforce a patent
+(such as an express permission to practice a patent or covenant not to
+sue for patent infringement).  To "grant" such a patent license to a
+party means to make such an agreement or commitment not to enforce a
+patent against the party.
+
+  If you convey a covered work, knowingly relying on a patent license,
+and the Corresponding Source of the work is not available for anyone
+to copy, free of charge and under the terms of this License, through a
+publicly available network server or other readily accessible means,
+then you must either (1) cause the Corresponding Source to be so
+available, or (2) arrange to deprive yourself of the benefit of the
+patent license for this particular work, or (3) arrange, in a manner
+consistent with the requirements of this License, to extend the patent
+license to downstream recipients.  "Knowingly relying" means you have
+actual knowledge that, but for the patent license, your conveying the
+covered work in a country, or your recipient's use of the covered work
+in a country, would infringe one or more identifiable patents in that
+country that you have reason to believe are valid.
+  
+  If, pursuant to or in connection with a single transaction or
+arrangement, you convey, or propagate by procuring conveyance of, a
+covered work, and grant a patent license to some of the parties
+receiving the covered work authorizing them to use, propagate, modify
+or convey a specific copy of the covered work, then the patent license
+you grant is automatically extended to all recipients of the covered
+work and works based on it.
+
+  A patent license is "discriminatory" if it does not include within
+the scope of its coverage, prohibits the exercise of, or is
+conditioned on the non-exercise of one or more of the rights that are
+specifically granted under this License.  You may not convey a covered
+work if you are a party to an arrangement with a third party that is
+in the business of distributing software, under which you make payment
+to the third party based on the extent of your activity of conveying
+the work, and under which the third party grants, to any of the
+parties who would receive the covered work from you, a discriminatory
+patent license (a) in connection with copies of the covered work
+conveyed by you (or copies made from those copies), or (b) primarily
+for and in connection with specific products or compilations that
+contain the covered work, unless you entered into that arrangement,
+or that patent license was granted, prior to 28 March 2007.
+
+  Nothing in this License shall be construed as excluding or limiting
+any implied license or other defenses to infringement that may
+otherwise be available to you under applicable patent law.
+
+  12. No Surrender of Others' Freedom.
+
+  If conditions are imposed on you (whether by court order, agreement or
+otherwise) that contradict the conditions of this License, they do not
+excuse you from the conditions of this License.  If you cannot convey a
+covered work so as to satisfy simultaneously your obligations under this
+License and any other pertinent obligations, then as a consequence you may
+not convey it at all.  For example, if you agree to terms that obligate you
+to collect a royalty for further conveying from those to whom you convey
+the Program, the only way you could satisfy both those terms and this
+License would be to refrain entirely from conveying the Program.
+
+  13. Use with the GNU Affero General Public License.
+
+  Notwithstanding any other provision of this License, you have
+permission to link or combine any covered work with a work licensed
+under version 3 of the GNU Affero General Public License into a single
+combined work, and to convey the resulting work.  The terms of this
+License will continue to apply to the part which is the covered work,
+but the special requirements of the GNU Affero General Public License,
+section 13, concerning interaction through a network will apply to the
+combination as such.
+
+  14. Revised Versions of this License.
+
+  The Free Software Foundation may publish revised and/or new versions of
+the GNU General Public License from time to time.  Such new versions will
+be similar in spirit to the present version, but may differ in detail to
+address new problems or concerns.
+
+  Each version is given a distinguishing version number.  If the
+Program specifies that a certain numbered version of the GNU General
+Public License "or any later version" applies to it, you have the
+option of following the terms and conditions either of that numbered
+version or of any later version published by the Free Software
+Foundation.  If the Program does not specify a version number of the
+GNU General Public License, you may choose any version ever published
+by the Free Software Foundation.
+
+  If the Program specifies that a proxy can decide which future
+versions of the GNU General Public License can be used, that proxy's
+public statement of acceptance of a version permanently authorizes you
+to choose that version for the Program.
+
+  Later license versions may give you additional or different
+permissions.  However, no additional obligations are imposed on any
+author or copyright holder as a result of your choosing to follow a
+later version.
+
+  15. Disclaimer of Warranty.
+
+  THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY
+APPLICABLE LAW.  EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT
+HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY
+OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO,
+THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+PURPOSE.  THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM
+IS WITH YOU.  SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF
+ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
+
+  16. Limitation of Liability.
+
+  IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
+WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS
+THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY
+GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE
+USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF
+DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD
+PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS),
+EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF
+SUCH DAMAGES.
+
+  17. Interpretation of Sections 15 and 16.
+
+  If the disclaimer of warranty and limitation of liability provided
+above cannot be given local legal effect according to their terms,
+reviewing courts shall apply local law that most closely approximates
+an absolute waiver of all civil liability in connection with the
+Program, unless a warranty or assumption of liability accompanies a
+copy of the Program in return for a fee.
+
+		     END OF TERMS AND CONDITIONS
+
+	    How to Apply These Terms to Your New Programs
+
+  If you develop a new program, and you want it to be of the greatest
+possible use to the public, the best way to achieve this is to make it
+free software which everyone can redistribute and change under these terms.
+
+  To do so, attach the following notices to the program.  It is safest
+to attach them to the start of each source file to most effectively
+state the exclusion of warranty; and each file should have at least
+the "copyright" line and a pointer to where the full notice is found.
+
+    <one line to give the program's name and a brief idea of what it does.>
+    Copyright (C) <year>  <name of author>
+
+    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 3 of the License, or
+    (at your option) any later version.
+
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+Also add information on how to contact you by electronic and paper mail.
+
+  If the program does terminal interaction, make it output a short
+notice like this when it starts in an interactive mode:
+
+    <program>  Copyright (C) <year>  <name of author>
+    This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
+    This is free software, and you are welcome to redistribute it
+    under certain conditions; type `show c' for details.
+
+The hypothetical commands `show w' and `show c' should show the appropriate
+parts of the General Public License.  Of course, your program's commands
+might be different; for a GUI interface, you would use an "about box".
+
+  You should also get your employer (if you work as a programmer) or school,
+if any, to sign a "copyright disclaimer" for the program, if necessary.
+For more information on this, and how to apply and follow the GNU GPL, see
+<http://www.gnu.org/licenses/>.
+
+  The GNU General Public License does not permit incorporating your program
+into proprietary programs.  If your program is a subroutine library, you
+may consider it more useful to permit linking proprietary applications with
+the library.  If this is what you want to do, use the GNU Lesser General
+Public License instead of this License.  But first, please read
+<http://www.gnu.org/philosophy/why-not-lgpl.html>.
+

COPYING.DOC

@@ -0,0 +1,397 @@
+		GNU Free Documentation License
+		  Version 1.2, November 2002
+
+
+ Copyright (C) 2000,2001,2002  Free Software Foundation, Inc.
+     51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+ Everyone is permitted to copy and distribute verbatim copies
+ of this license document, but changing it is not allowed.
+
+
+0. PREAMBLE
+
+The purpose of this License is to make a manual, textbook, or other
+functional and useful document "free" in the sense of freedom: to
+assure everyone the effective freedom to copy and redistribute it,
+with or without modifying it, either commercially or noncommercially.
+Secondarily, this License preserves for the author and publisher a way
+to get credit for their work, while not being considered responsible
+for modifications made by others.
+
+This License is a kind of "copyleft", which means that derivative
+works of the document must themselves be free in the same sense.  It
+complements the GNU General Public License, which is a copyleft
+license designed for free software.
+
+We have designed this License in order to use it for manuals for free
+software, because free software needs free documentation: a free
+program should come with manuals providing the same freedoms that the
+software does.  But this License is not limited to software manuals;
+it can be used for any textual work, regardless of subject matter or
+whether it is published as a printed book.  We recommend this License
+principally for works whose purpose is instruction or reference.
+
+
+1. APPLICABILITY AND DEFINITIONS
+
+This License applies to any manual or other work, in any medium, that
+contains a notice placed by the copyright holder saying it can be
+distributed under the terms of this License.  Such a notice grants a
+world-wide, royalty-free license, unlimited in duration, to use that
+work under the conditions stated herein.  The "Document", below,
+refers to any such manual or work.  Any member of the public is a
+licensee, and is addressed as "you".  You accept the license if you
+copy, modify or distribute the work in a way requiring permission
+under copyright law.
+
+A "Modified Version" of the Document means any work containing the
+Document or a portion of it, either copied verbatim, or with
+modifications and/or translated into another language.
+
+A "Secondary Section" is a named appendix or a front-matter section of
+the Document that deals exclusively with the relationship of the
+publishers or authors of the Document to the Document's overall subject
+(or to related matters) and contains nothing that could fall directly
+within that overall subject.  (Thus, if the Document is in part a
+textbook of mathematics, a Secondary Section may not explain any
+mathematics.)  The relationship could be a matter of historical
+connection with the subject or with related matters, or of legal,
+commercial, philosophical, ethical or political position regarding
+them.
+
+The "Invariant Sections" are certain Secondary Sections whose titles
+are designated, as being those of Invariant Sections, in the notice
+that says that the Document is released under this License.  If a
+section does not fit the above definition of Secondary then it is not
+allowed to be designated as Invariant.  The Document may contain zero
+Invariant Sections.  If the Document does not identify any Invariant
+Sections then there are none.
+
+The "Cover Texts" are certain short passages of text that are listed,
+as Front-Cover Texts or Back-Cover Texts, in the notice that says that
+the Document is released under this License.  A Front-Cover Text may
+be at most 5 words, and a Back-Cover Text may be at most 25 words.
+
+A "Transparent" copy of the Document means a machine-readable copy,
+represented in a format whose specification is available to the
+general public, that is suitable for revising the document
+straightforwardly with generic text editors or (for images composed of
+pixels) generic paint programs or (for drawings) some widely available
+drawing editor, and that is suitable for input to text formatters or
+for automatic translation to a variety of formats suitable for input
+to text formatters.  A copy made in an otherwise Transparent file
+format whose markup, or absence of markup, has been arranged to thwart
+or discourage subsequent modification by readers is not Transparent.
+An image format is not Transparent if used for any substantial amount
+of text.  A copy that is not "Transparent" is called "Opaque".
+
+Examples of suitable formats for Transparent copies include plain
+ASCII without markup, Texinfo input format, LaTeX input format, SGML
+or XML using a publicly available DTD, and standard-conforming simple
+HTML, PostScript or PDF designed for human modification.  Examples of
+transparent image formats include PNG, XCF and JPG.  Opaque formats
+include proprietary formats that can be read and edited only by
+proprietary word processors, SGML or XML for which the DTD and/or
+processing tools are not generally available, and the
+machine-generated HTML, PostScript or PDF produced by some word
+processors for output purposes only.
+
+The "Title Page" means, for a printed book, the title page itself,
+plus such following pages as are needed to hold, legibly, the material
+this License requires to appear in the title page.  For works in
+formats which do not have any title page as such, "Title Page" means
+the text near the most prominent appearance of the work's title,
+preceding the beginning of the body of the text.
+
+A section "Entitled XYZ" means a named subunit of the Document whose
+title either is precisely XYZ or contains XYZ in parentheses following
+text that translates XYZ in another language.  (Here XYZ stands for a
+specific section name mentioned below, such as "Acknowledgements",
+"Dedications", "Endorsements", or "History".)  To "Preserve the Title"
+of such a section when you modify the Document means that it remains a
+section "Entitled XYZ" according to this definition.
+
+The Document may include Warranty Disclaimers next to the notice which
+states that this License applies to the Document.  These Warranty
+Disclaimers are considered to be included by reference in this
+License, but only as regards disclaiming warranties: any other
+implication that these Warranty Disclaimers may have is void and has
+no effect on the meaning of this License.
+
+
+2. VERBATIM COPYING
+
+You may copy and distribute the Document in any medium, either
+commercially or noncommercially, provided that this License, the
+copyright notices, and the license notice saying this License applies
+to the Document are reproduced in all copies, and that you add no other
+conditions whatsoever to those of this License.  You may not use
+technical measures to obstruct or control the reading or further
+copying of the copies you make or distribute.  However, you may accept
+compensation in exchange for copies.  If you distribute a large enough
+number of copies you must also follow the conditions in section 3.
+
+You may also lend copies, under the same conditions stated above, and
+you may publicly display copies.
+
+
+3. COPYING IN QUANTITY
+
+If you publish printed copies (or copies in media that commonly have
+printed covers) of the Document, numbering more than 100, and the
+Document's license notice requires Cover Texts, you must enclose the
+copies in covers that carry, clearly and legibly, all these Cover
+Texts: Front-Cover Texts on the front cover, and Back-Cover Texts on
+the back cover.  Both covers must also clearly and legibly identify
+you as the publisher of these copies.  The front cover must present
+the full title with all words of the title equally prominent and
+visible.  You may add other material on the covers in addition.
+Copying with changes limited to the covers, as long as they preserve
+the title of the Document and satisfy these conditions, can be treated
+as verbatim copying in other respects.
+
+If the required texts for either cover are too voluminous to fit
+legibly, you should put the first ones listed (as many as fit
+reasonably) on the actual cover, and continue the rest onto adjacent
+pages.
+
+If you publish or distribute Opaque copies of the Document numbering
+more than 100, you must either include a machine-readable Transparent
+copy along with each Opaque copy, or state in or with each Opaque copy
+a computer-network location from which the general network-using
+public has access to download using public-standard network protocols
+a complete Transparent copy of the Document, free of added material.
+If you use the latter option, you must take reasonably prudent steps,
+when you begin distribution of Opaque copies in quantity, to ensure
+that this Transparent copy will remain thus accessible at the stated
+location until at least one year after the last time you distribute an
+Opaque copy (directly or through your agents or retailers) of that
+edition to the public.
+
+It is requested, but not required, that you contact the authors of the
+Document well before redistributing any large number of copies, to give
+them a chance to provide you with an updated version of the Document.
+
+
+4. MODIFICATIONS
+
+You may copy and distribute a Modified Version of the Document under
+the conditions of sections 2 and 3 above, provided that you release
+the Modified Version under precisely this License, with the Modified
+Version filling the role of the Document, thus licensing distribution
+and modification of the Modified Version to whoever possesses a copy
+of it.  In addition, you must do these things in the Modified Version:
+
+A. Use in the Title Page (and on the covers, if any) a title distinct
+   from that of the Document, and from those of previous versions
+   (which should, if there were any, be listed in the History section
+   of the Document).  You may use the same title as a previous version
+   if the original publisher of that version gives permission.
+B. List on the Title Page, as authors, one or more persons or entities
+   responsible for authorship of the modifications in the Modified
+   Version, together with at least five of the principal authors of the
+   Document (all of its principal authors, if it has fewer than five),
+   unless they release you from this requirement.
+C. State on the Title page the name of the publisher of the
+   Modified Version, as the publisher.
+D. Preserve all the copyright notices of the Document.
+E. Add an appropriate copyright notice for your modifications
+   adjacent to the other copyright notices.
+F. Include, immediately after the copyright notices, a license notice
+   giving the public permission to use the Modified Version under the
+   terms of this License, in the form shown in the Addendum below.
+G. Preserve in that license notice the full lists of Invariant Sections
+   and required Cover Texts given in the Document's license notice.
+H. Include an unaltered copy of this License.
+I. Preserve the section Entitled "History", Preserve its Title, and add
+   to it an item stating at least the title, year, new authors, and
+   publisher of the Modified Version as given on the Title Page.  If
+   there is no section Entitled "History" in the Document, create one
+   stating the title, year, authors, and publisher of the Document as
+   given on its Title Page, then add an item describing the Modified
+   Version as stated in the previous sentence.
+J. Preserve the network location, if any, given in the Document for
+   public access to a Transparent copy of the Document, and likewise
+   the network locations given in the Document for previous versions
+   it was based on.  These may be placed in the "History" section.
+   You may omit a network location for a work that was published at
+   least four years before the Document itself, or if the original
+   publisher of the version it refers to gives permission.
+K. For any section Entitled "Acknowledgements" or "Dedications",
+   Preserve the Title of the section, and preserve in the section all
+   the substance and tone of each of the contributor acknowledgements
+   and/or dedications given therein.
+L. Preserve all the Invariant Sections of the Document,
+   unaltered in their text and in their titles.  Section numbers
+   or the equivalent are not considered part of the section titles.
+M. Delete any section Entitled "Endorsements".  Such a section
+   may not be included in the Modified Version.
+N. Do not retitle any existing section to be Entitled "Endorsements"
+   or to conflict in title with any Invariant Section.
+O. Preserve any Warranty Disclaimers.
+
+If the Modified Version includes new front-matter sections or
+appendices that qualify as Secondary Sections and contain no material
+copied from the Document, you may at your option designate some or all
+of these sections as invariant.  To do this, add their titles to the
+list of Invariant Sections in the Modified Version's license notice.
+These titles must be distinct from any other section titles.
+
+You may add a section Entitled "Endorsements", provided it contains
+nothing but endorsements of your Modified Version by various
+parties--for example, statements of peer review or that the text has
+been approved by an organization as the authoritative definition of a
+standard.
+
+You may add a passage of up to five words as a Front-Cover Text, and a
+passage of up to 25 words as a Back-Cover Text, to the end of the list
+of Cover Texts in the Modified Version.  Only one passage of
+Front-Cover Text and one of Back-Cover Text may be added by (or
+through arrangements made by) any one entity.  If the Document already
+includes a cover text for the same cover, previously added by you or
+by arrangement made by the same entity you are acting on behalf of,
+you may not add another; but you may replace the old one, on explicit
+permission from the previous publisher that added the old one.
+
+The author(s) and publisher(s) of the Document do not by this License
+give permission to use their names for publicity for or to assert or
+imply endorsement of any Modified Version.
+
+
+5. COMBINING DOCUMENTS
+
+You may combine the Document with other documents released under this
+License, under the terms defined in section 4 above for modified
+versions, provided that you include in the combination all of the
+Invariant Sections of all of the original documents, unmodified, and
+list them all as Invariant Sections of your combined work in its
+license notice, and that you preserve all their Warranty Disclaimers.
+
+The combined work need only contain one copy of this License, and
+multiple identical Invariant Sections may be replaced with a single
+copy.  If there are multiple Invariant Sections with the same name but
+different contents, make the title of each such section unique by
+adding at the end of it, in parentheses, the name of the original
+author or publisher of that section if known, or else a unique number.
+Make the same adjustment to the section titles in the list of
+Invariant Sections in the license notice of the combined work.
+
+In the combination, you must combine any sections Entitled "History"
+in the various original documents, forming one section Entitled
+"History"; likewise combine any sections Entitled "Acknowledgements",
+and any sections Entitled "Dedications".  You must delete all sections
+Entitled "Endorsements".
+
+
+6. COLLECTIONS OF DOCUMENTS
+
+You may make a collection consisting of the Document and other documents
+released under this License, and replace the individual copies of this
+License in the various documents with a single copy that is included in
+the collection, provided that you follow the rules of this License for
+verbatim copying of each of the documents in all other respects.
+
+You may extract a single document from such a collection, and distribute
+it individually under this License, provided you insert a copy of this
+License into the extracted document, and follow this License in all
+other respects regarding verbatim copying of that document.
+
+
+7. AGGREGATION WITH INDEPENDENT WORKS
+
+A compilation of the Document or its derivatives with other separate
+and independent documents or works, in or on a volume of a storage or
+distribution medium, is called an "aggregate" if the copyright
+resulting from the compilation is not used to limit the legal rights
+of the compilation's users beyond what the individual works permit.
+When the Document is included in an aggregate, this License does not
+apply to the other works in the aggregate which are not themselves
+derivative works of the Document.
+
+If the Cover Text requirement of section 3 is applicable to these
+copies of the Document, then if the Document is less than one half of
+the entire aggregate, the Document's Cover Texts may be placed on
+covers that bracket the Document within the aggregate, or the
+electronic equivalent of covers if the Document is in electronic form.
+Otherwise they must appear on printed covers that bracket the whole
+aggregate.
+
+
+8. TRANSLATION
+
+Translation is considered a kind of modification, so you may
+distribute translations of the Document under the terms of section 4.
+Replacing Invariant Sections with translations requires special
+permission from their copyright holders, but you may include
+translations of some or all Invariant Sections in addition to the
+original versions of these Invariant Sections.  You may include a
+translation of this License, and all the license notices in the
+Document, and any Warranty Disclaimers, provided that you also include
+the original English version of this License and the original versions
+of those notices and disclaimers.  In case of a disagreement between
+the translation and the original version of this License or a notice
+or disclaimer, the original version will prevail.
+
+If a section in the Document is Entitled "Acknowledgements",
+"Dedications", or "History", the requirement (section 4) to Preserve
+its Title (section 1) will typically require changing the actual
+title.
+
+
+9. TERMINATION
+
+You may not copy, modify, sublicense, or distribute the Document except
+as expressly provided for under this License.  Any other attempt to
+copy, modify, sublicense or distribute the Document is void, and will
+automatically terminate your rights under this License.  However,
+parties who have received copies, or rights, from you under this
+License will not have their licenses terminated so long as such
+parties remain in full compliance.
+
+
+10. FUTURE REVISIONS OF THIS LICENSE
+
+The Free Software Foundation may publish new, revised versions
+of the GNU Free Documentation License from time to time.  Such new
+versions will be similar in spirit to the present version, but may
+differ in detail to address new problems or concerns.  See
+http://www.gnu.org/copyleft/.
+
+Each version of the License is given a distinguishing version number.
+If the Document specifies that a particular numbered version of this
+License "or any later version" applies to it, you have the option of
+following the terms and conditions either of that specified version or
+of any later version that has been published (not as a draft) by the
+Free Software Foundation.  If the Document does not specify a version
+number of this License, you may choose any version ever published (not
+as a draft) by the Free Software Foundation.
+
+
+ADDENDUM: How to use this License for your documents
+
+To use this License in a document you have written, include a copy of
+the License in the document and put the following copyright and
+license notices just after the title page:
+
+    Copyright (c)  YEAR  YOUR NAME.
+    Permission is granted to copy, distribute and/or modify this document
+    under the terms of the GNU Free Documentation License, Version 1.2
+    or any later version published by the Free Software Foundation;
+    with no Invariant Sections, no Front-Cover Texts, and no Back-Cover Texts.
+    A copy of the license is included in the section entitled "GNU
+    Free Documentation License".
+
+If you have Invariant Sections, Front-Cover Texts and Back-Cover Texts,
+replace the "with...Texts." line with this:
+
+    with the Invariant Sections being LIST THEIR TITLES, with the
+    Front-Cover Texts being LIST, and with the Back-Cover Texts being LIST.
+
+If you have Invariant Sections without Cover Texts, or some other
+combination of the three, merge those two alternatives to suit the
+situation.
+
+If your document contains nontrivial examples of program code, we
+recommend releasing these examples in parallel under your choice of
+free software license, such as the GNU General Public License,
+to permit their use in free software.

Makefile.am

@@ -3,8 +3,6 @@ AUTOMAKE_OPTIONS = gnu no-dependencies
 
 SUBDIRS = doc m4 po src
 
-EXTRA_DIST = ABOUT-NLS AUTHORS BUGS COPYING ChangeLog INSTALL NEWS \
-		README THANKS TODO UPGRADE config.rpath install-sh \
-		missing mkinstalldirs nano.spec
+EXTRA_DIST = ChangeLog.pre-2.1 README.SVN UPGRADE nano.spec
 
 ACLOCAL_AMFLAGS = -I m4

README

@@ -6,24 +6,24 @@ Overview
      The nano project was started because of a few "problems" with the
      wonderfully easy-to-use and friendly Pico text editor.
 
-     First and foremost is its license: the Pine suite does not use the
-     GPL or a GPL-friendly license, and has unclear restrictions on
+     First and foremost was its license: the Pine suite does not use
+     the GPL or a GPL-friendly license, and has unclear restrictions on
      redistribution.  Because of this, Pine and Pico are not included
-     with many GNU/Linux distributions.  Also, other features (like go
-     to line number or search and replace) were unavailable until
-     recently or require a command line flag.  Yuck.
+     with many GNU/Linux distributions.  Also, other features (like
+     go-to-line-number or search-and-replace) were unavailable until
+     recently or require a command-line flag.  Yuck.
 
      nano aims to solve these problems by emulating the functionality of
      Pico as closely as possible while addressing the problems above and
-     perhaps providing other extra functionality.
+     providing other extra functionality.
 
-     The nano editor is now an official GNU package.  For more
-     information on GNU and the Free Software Foundation, please see
-     http://www.gnu.org.
+     The nano editor is an official GNU package.  For more information on
+     GNU and the Free Software Foundation, please see http://www.gnu.org/.
 
 How to compile and install nano
 
      Download the nano source code, then:
+
      tar zxvf nano-x.y.z.tar.gz
      cd nano-x.y.z
      ./configure
@@ -32,41 +32,41 @@ How to compile and install nano
 
      It's that simple.  Use --prefix with configure to override the
      default installation directory of /usr/local.
-     
-     If you configured with the "--enable-nanorc" option, after
-     installation you might copy the doc/nanorc.sample to your home
-     directory, rename it to ".nanorc", and then edit it according to
-     your taste.
+
+     If you haven't configured with the "--disable-nanorc" option, after
+     installation you may want to copy the doc/nanorc.sample to your
+     home directory, rename it to ".nanorc", and then edit it according
+     to your taste.
 
 Web Page
 
 	http://www.nano-editor.org/
 
-Mailing List and Bug Reports
+Mailing Lists and Bug Reports
 
 	Savannah hosts all the nano-related mailing-lists.
 
-	+ info-nano@gnu.org is a very low traffic list
-	  used to announce new nano versions or other important
-	  information about the project.
+	+ info-nano@gnu.org is a very low traffic list used to announce
+	  new nano versions or other important information about the
+	  project.
 	+ help-nano@gnu.org is for those seeking to get help without
-	  wanting to hear about the technical details of its
-	  development.
-	+ nano-devel@gnu.org is the list used by the people
-	  that make nano and a general development discussion list, with
-	  moderate traffic.
+	  wanting to hear about the technical details of its development.
+	+ nano-devel@gnu.org is the list used by the people that make
+	  nano and a general development discussion list, with moderate
+	  traffic.
 
-	To subscribe, send email to nano-<name>-request@gnu.org with a
+	To subscribe, send email to <name>-request@gnu.org with a
 	subject of "subscribe", where <name> is the list you want to
 	subscribe to.
 
-	For general bug reports, send a description of the problem to
-	nano@nano-editor.org or directly to the development list.
+	For general bug reports, please file a description of the problem
+	on the Savannah bug tracker page for nano
+	(https://savannah.gnu.org/bugs/?group=nano).  The issue may have
+	already been reported, and we are better able to track the state
+	of the issue and whom to notify when fixed, the more the bug
+	tracker is used.
 
 Current Status
 
-	GNU nano has reached its third stable milestone, 2.0.x.
-
-   Chris Allegretta (chrisa@asty.org)
-
-$Id$
+	GNU nano has reached its sixth milestone, 2.5.x.  This is now a
+	"rolling" release: bug fixing and development go hand in hand.

README.SVN

@@ -1,7 +1,7 @@
 INSTRUCTIONS TO COMPILE AND INSTALL NANO CVS VERSIONS
 =====================================================
 
-GNU nano is available from CVS, but building this needs a bit more care
+GNU nano is available from SVN, but building this needs a bit more care
 than the official stable and unstable tarballs.
 
 
@@ -16,8 +16,7 @@ packages:
 - gettext  (version >= 0.11.5)
 - groff    (version >= 1.12)
 - texinfo  (version >= 4.0)
-- cvs
-- ssh (with support for the SSH version 2 protocol)
+- subversion (aka svn)
 - glib 2.x (if your system doesn't have vsnprintf(), which the configure
   script will check for)
 - make, gcc and the normal development libraries (curses or slang, etc.)
@@ -30,23 +29,15 @@ to use UTF-8.
 Download the source
 -------------------
 
-First, you need to set up cvs to download the CVS tree using ssh.  If
-you're using a Bourne shell (e.g. bash or sh), do
+To obtain the current nano development code (called 'trunk'), use the
+following command.  It will create a copy of the files in a subdirectory
+of your current working directory called 'nano':
 
-    $ export CVS_RSH=ssh
+    $ svn co svn://svn.savannah.gnu.org/nano/trunk/nano
 
-If you're using a C shell (e.g. tcsh or csh), do
+If you want to download the stable SVN branch instead, use:
 
-    $ setenv CVS_RSH ssh
-
-After that's set up, cd to your src directory and use the following
-command to download the CVS tree:
-
-    $ cvs -z3 -d:pserver:anonymous@cvs.savannah.gnu.org:/sources/nano checkout nano
-
-If you want to download the stable CVS branch, add "-r nano_1_2_branch":
-
-    $ cvs -z3 -d:pserver:anonymous@cvs.savannah.gnu.org:/sources/nano checkout -r nano_1_2_branch nano
+    $ svn co svn://svn.savannah.gnu.org/nano/branches/nano_2_2_branch/nano
 
 
 Generate the configure script
@@ -91,4 +82,5 @@ you'll need to run that "make install" command with root privileges.
 Problems?
 ---------
 
-Please submit any bugs in the CVS branch to nano-devel@gnu.org.
+Please submit any bugs in the SVN branch using the Savannah project's
+bug tracker (https://savannah.gnu.org/bugs/?group=nano).

THANKS

@@ -2,52 +2,85 @@ The following people have helped GNU nano in some way or another.
 If we missed you here, let us know!
 
 
-Sharuzzaman Ahmat Raslan <sharuzzaman@excite.com>
-						Malay translator
-Laurentiu Buzdugan <buzdugan@voyager.net>	Romanian translator
-CHAO Wei-Lun <chaoweilun@pcmail.com.tw>		Traditional Chinese translator
-Ricardo Cárdenes Medina <ricardo@conisys.com>	Spanish translator
-Marco Colombo <magicdice@inwind.it>		Italian translator
-Yavor Doganov <yavor@doganov.org>		Bulgarian translator
-Karl Eichwalder <keichwa@gmx.net>		German translator
-Doruk Fisek <dfisek@fisek.com.tr>		Turkish translator
-Jean-Philippe Guérard <jean-philippe.guerard@laposte.net>
-						French translator
-Geir Helland					Norwegian bokmål translator
-Tedi Heriyanto <tedi_h@gmx.net>			Indonesian translator
-Václav Haisman <V.Haisman@sh.cvut.cz>		Czech translator
-Szabolcs Horvath <horvaths@janus.gimsz.sulinet.hu>
-						Hungarian translator
-Kalle Kivimaa <kalle.kivimaa@iki.fi>		Finnish Translator
-Eivind Kjørstad <ekj@vestdata.no>		Norwegian nynorsk translator
-Florian König <floki@bigfoot.com>		German translator
-Wojciech Kotwica <wkotwica@post.pl>		Polish translator
-Clement Laforet <clem_laf@wanadoo.fr>		French translator
-Gergely Nagy <algernon@debian.org>		Hungarian translator
-Kalle Olavi Niemitalo <kon@iki.fi>		Finnish Translator
-Claudio Neves <cneves@nextis.com>		Brazilian Portuguese translator
-Daniel Nylander <po@danielnylander.se>		Swedish Translator
-Michael Piefel <piefel@informatik.hu-berlin.de> German translator
-Sergey A. Ribalchenko <fisher@obu.ck.ua>	Russian, Ukrainian translator
-Michel Robitaille <robitail@IRO.UMontreal.CA>	French translator
-Christian Rose <menthos@menthos.com>		Swedish translator
-Stig E Sandoe <stig@ii.uib.no>			Norwegian bokmål translator
-Benno Schulenberg <benno@nietvergeten.nl>	Dutch translator
-Danilo Segan <dsegan@gmx.net>			Serbian translator
-Keld Simonsen <keld@dkuug.dk>			Danish translator
-Guus Sliepen <guus@nl.linux.org>		Dutch translator
-Cezary Sliwa <sliwa@cft.edu.pl>			Polish translator
-Pierre Tane <tanep@bigfoot.com>			French translator
-Jacobo Tarrío <jtarrio@trasno.net>		Galician translator
-Kjetil Torgrim Homme <kjetilho@linpro.no>	Norwegian nynorsk translator
-Miquel Vidal <miquel@sindominio.net>		Catalan translator
-Phan Vinh Thinh <teppi82@gmail.com>		Vietnamese translator
-Pauli Virtanen <pauli.virtanen@saunalahti.fi>	Finnish translator
-Peio Ziarsolo <peio@sindominio.net>		Basque translator
+Translations:
+============
+Sharuzzaman Ahmat Raslan <sharuzzaman@excite.com>	Malay
+Josef Andersson <josef.andersson@fripost.org>		Swedish
+Laurentiu Buzdugan <buzdugan@voyager.net>		Romanian
+Mario Blättermann <mario.blaettermann@gmail.com>	German
+Ricardo Cárdenes Medina <ricardo@conisys.com>		Spanish
+Antonio Ceballos <aceballos@gmail.com>			Spanish
+Wei-Lun CHAO <chaoweilun@pcmail.com.tw>			Chinese (traditional)
+Yuri Chornoivan <yurchor@ukr.net>			Ukrainian
+Marco Colombo <magicdice@inwind.it>			Italian
+Mihai Cristescu <mihai.cristescu@archlinux.info>	Romanian
+Yavor Doganov <yavor@doganov.org>			Bulgarian
+Karl Eichwalder <keichwa@gmx.net>			German
+A. Murat EREN <meren@comu.edu.tr>			Turkish
+Rafael Ferreira <rafael.f.f1@gmail.com>			Brazilian Portuguese
+Doruk Fisek <dfisek@fisek.com.tr>			Turkish
+Pavel Fric <pavelfric@seznam.cz>			Czech
+Jorge González <aloriel@gmail.com>			Spanish
+Jean-Philippe Guérard <jean-philippe.guerard@laposte.net>  French
+Geir Helland <pjallabais@users.sourceforge.net>		Norwegian Bokmål
+Tedi Heriyanto <tedi_h@gmx.net>				Indonesian
+Václav Haisman <V.Haisman@sh.cvut.cz>			Czech
+Kjetil Torgrim Homme <kjetilho@linpro.no>		Norwegian Nynorsk
+Szabolcs Horvath <horvaths@janus.gimsz.sulinet.hu>	Hungarian
+Jorma Karvonen <karvonen.jorma@gmail.com>		Finnish
+Gabor Kelemen <kelemeng@gnome.hu>			Hungarian
+Kalle Kivimaa <kalle.kivimaa@iki.fi>			Finnish
+Eivind Kjørstad <ekj@vestdata.no>			Norwegian Nynorsk
+Florian König <floki@bigfoot.com>			German
+Klemen Košir <klemen913@gmail.com>			Slovenian
+Wojciech Kotwica <wkotwica@post.pl>			Polish
+Ask Hjorth Larsen <asklarsen@gmail.com>			Danish
+Clement Laforet <clem_laf@wanadoo.fr>			French
+LI Daobing <lidaobing@gmail.com>			Chinese (simplified)
+Jordi Mallach <jordi@gnu.org>				Catalan
+João Victor Duarte Martins <jvdm@sdf.lonestar.org>	Brazilian Portuguese
+Pavel Maryanov <acid@jack.kiev.ua>			Russian
+Daniele Medri <madrid@linux.it>				Italian
+Gergely Nagy <algernon@debian.org>			Hungarian
+Kalle Olavi Niemitalo <kon@iki.fi>			Finnish
+Мирослав Николић <miroslavnikolic@rocketmail.com>	Serbian
+Claudio Neves <cneves@nextis.com>			Brazilian Portuguese
+Daniel Nylander <po@danielnylander.se>			Swedish
+Mikel Olasagasti <hey_neken@mundurat.net>		Basque
+Michael Piefel <piefel@informatik.hu-berlin.de>		German
+Sergey Poznyakoff <gray@gnu.org>			Polish
+Božidar Putanec <bozidarp@yahoo.com>			Croatian
+Trần Ngọc Quân <vnwildman@gmail.com>			Vietnamese
+Sergey A. Ribalchenko <fisher@obu.ck.ua>		Ukrainian and Russian
+Michel Robitaille <robitail@IRO.UMontreal.CA>		French
+Christian Rose <menthos@menthos.com>			Swedish
+Dimitriy Ryazantcev <DJm00n@mail.ru>			Russian
+Stig E Sandø <stig@ii.uib.no>				Norwegian Bokmål
+Kevin Patrick Scannell <kscanne@gmail.com>		Irish
+Benno Schulenberg <benno@vertaalt.nl>			Dutch and Esperanto
+Danilo Segan <dsegan@gmx.net>				Serbian
+Clytie Siddall <clytie@riverland.net.au>		Vietnamese
+Keld Simonsen <keld@dkuug.dk>				Danish
+Guus Sliepen <guus@nl.linux.org>			Dutch
+Cezary Sliwa <sliwa@cft.edu.pl>				Polish
+Johnny A. Solbu <johnny@solbu.net>			Norwegian Bokmål
+Pierre Tane <tanep@bigfoot.com>				French
+Yasuaki Taniguchi <yasuakit@gmail.com>			Japanese
+Jacobo Tarrío <jtarrio@trasno.net>			Galician
+Francisco Javier Tsao Santín <tsao@members.fsf.org>	Galician
+Miquel Vidal <miquel@sindominio.net>			Catalan
+Phan Vinh Thinh <teppi82@gmail.com>			Vietnamese
+Pauli Virtanen <pauli.virtanen@saunalahti.fi>		Finnish
+Aron Xu <happyaron.xu@gmail.com>			Chinese (simplified)
+Peio Ziarsolo <peio@sindominio.net>			Basque
+Anton Zinoviev <zinoviev@debian.org>			Bulgarian
 
+
+Other stuff:
+===========
 Ben Armstrong <synrg@sanctuary.nslug.ns.ca>	Negative -r value idea, code
 Thomas Dickey <dickey@herndon4.his.com>		Curses help and advice
-Sven Guckes <guckes@math.fu-berlin.de>		Advice and Advocacy
+Sven Guckes <guckes@math.fu-berlin.de>		Advice and advocacy
 Thijs Kinkhorst <thijs@kinkhorst.com>		rnano.1 manpage
 Jim Knoble <jmknoble@pobox.com>			Pico compat for browser
 Ryan Krebs <fluffy@highwire.stanford.edu>	Many bug fixes and testing
@@ -58,5 +91,3 @@ Neil Parks <nparks@acsmail.com>			Bug reports and fixes
 Jeremy Robichaud <robicj@yahoo.com>		Beta tester
 Bill Soudan <wes0472@rit.edu>			Regex code, etc
 Ken Tyler <kent@werple.net.au>			Search fixes and more
-
-$Id$

TODO

@@ -1,9 +1,7 @@
 TODO file (? means the feature may be implemented, but not definitely)
 ------------------------------------------------------------------------
 
-For the next version:
-- Undo/Redo keys (M-U and M-E)?
-- Rebindable keys?
+For the future (no targeted version, catch-all)
 - FriBidi support?
 - Port to DJGPP?
 - Make matching bracket searches sophisticated enough to skip over
@@ -11,32 +9,48 @@ For the next version:
 - Allow indentation of marked text by spaces as well as tabs?
 - Allow indentation to add just enough columns to reach the nearest
   multiple of tabsize, rather than always adding tabsize columns?
-- Allow piping marked text to an external command and replacing it with
-  the command's output (as the internal spell checker already does with
-  the "spell" command)?
-- Rewrite the nano FAQ in SGML.
 - Allow conversion between different character sets.  Maybe use glib's
   iconv() if the system's iconv() is inadequate, since we already use
   glib's vsnprintf() if the system lacks vsnprintf()?
-- Handle window resizes better.  After we resize, we should stay
-  wherever we were before we resized, as Pico does.
-- Fix problems with color syntaxes' highlighting lines too aggressively.
 - Allow color syntaxes to apply to more than just color, so that we can
   e.g. specify a different alternate spell checker depending on which
   file type we have open.
-- Allow color syntaxes to be selected based on more than just filename
-  extension, e.g. through libmagic?
-- Allow text searches in the help browser.
 - Allow setting marks (saved positions, not to be confused with the mark
   set via Ctrl-^) at various lines and/or columns in the buffer, and
-  allow movement between them with a single keystroke.
+  allow movement between them with a single keystroke? (We're running
+  out of keystrokes, though.)
+- Allow searching for and replacing newlines.
+- Fix handling of bad/incomplete UTF-8 sequences to display one Unicode
+  FFFD (Replacement Character) per sequence instead of one per byte.
+
+For version 2.6:
+- New regression framework built on expect.
+- Allow text searches in the help viewer.
 - Add the ability to move to different lines of the screen with a single
   keystroke, e.g. M-` (M-~) to go to the top line, M-& (M-7) to go to
   the center line, and M-' (M-") to go to the last line.
-- Allow searching for and replacing newlines.
-- Allow soft wrapping as well as hard wrapping?
+- Detect when we're pasting text, so that we can handle it differently
+  (i.e. faster than currently with screen redraws).
+- Allow piping marked text to an external command and replacing it with
+  the command's output (as the internal spell checker already does with
+  the "spell" command)?
 
-Old requests:
+For version 2.4:
+- Handle window resizes better.  After we've resized, we should stay
+  wherever we were before we resized, as Pico does. [DONE]
+- Allow even better file-type detection than we have currently, e.g.
+  through libmagic. [DONE]
+- Compatibility with vim status files to let other editors know we're
+  in a file. [DONE]
+
+For version 2.2:
+- Rebindable keys? [DONE]
+- Undo/Redo keys (M-U and M-E)? [DONE]
+- Fix problems with color syntaxes' highlighting lines too aggressively [DONE]
+- Allow nano to work like a pager (read from stdin) [DONE]
+- Allow color syntaxes to be selected based on more than just filename
+  extension, [DONE]
+- Allow soft wrapping as well as hard wrapping? [DONE]
 
 For version 2.0:
 - UTF-8 support. [DONE]

UPGRADE

@@ -1,6 +1,22 @@
 GNU nano upgrading information
 ==============================
 
+Visible changes since 2.0
+-------------------------
+* Editor Features
+  - The ability to rebind (reassign) keys using the nanorc.
+  - The ability to read standard input like a pager ("nano -").
+  - Color syntax highlighting can be set by the first line of a file.
+  - The ability to silence nanorc error messages (-q).
+  - Undo/redo operations (-u).
+  - Soft wrapping of text (-$).
+
+* File Handling
+  - Better handling of backup files: if nano can't write a backup file,
+    it won't try to write the original file afterward.
+  - Emergency savefiles retain ownerships and permissions when possible.
+  - Performance improvements in color syntax highlighting.
+
 Visible changes since 1.2
 -------------------------
 * Editor Features

configure.ac

@@ -1,10 +1,11 @@
 # Configuration for GNU nano - a small and user-friendly text editor
 #
-# Copyright (C) 1999, 2000, 2001, 2002, 2003 Free Software Foundation, Inc.
+# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007,
+# 2008, 2009, 2010, 2011, 2013, 2014 Free Software Foundation, Inc.
 #
 # GNU nano 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) any
+# Free Software Foundation; either version 3, or (at your option) any
 # later version.
 #
 # GNU nano is distributed in the hope that it will be useful, but
@@ -19,13 +20,15 @@
 #
 # $Id$
 
-AC_INIT([GNU nano], [2.0.2], [nano-devel@gnu.org], [nano])
+AC_INIT([GNU nano], [2.5.3], [nano-devel@gnu.org], [nano])
 AC_CONFIG_SRCDIR([src/nano.c])
-AC_CANONICAL_TARGET([])
+AC_CANONICAL_HOST
 AM_INIT_AUTOMAKE
 AC_CONFIG_HEADERS([config.h])
 
-AC_PREREQ(2.54)
+dnl Make sure the ONCE macros are available.
+
+AC_PREREQ(2.61)
 
 dnl Checks for programs.
 
@@ -34,6 +37,7 @@ AC_PROG_CC
 AC_PROG_LN_S
 AC_ISC_POSIX
 AC_SYS_LARGEFILE
+PKG_PROG_PKG_CONFIG
 
 dnl Internationalization macros.
 
@@ -48,146 +52,196 @@ AC_DEFINE_DIR([PKGDATADIR], [pkgdatadir], [Where data are placed to.])
 
 dnl Checks for header files.
 
-AC_HEADER_STDC
-AC_CHECK_HEADERS(getopt.h libintl.h limits.h regex.h sys/param.h wchar.h wctype.h)
+AC_CHECK_HEADERS(getopt.h libintl.h limits.h regex.h sys/param.h wchar.h wctype.h stdarg.h)
 
 dnl Checks for options.
 
-AC_ARG_ENABLE(debug, 
-[  --enable-debug          Enable debugging (disabled by default)],
-[if test x$enableval = xyes; then
-    AC_DEFINE(DEBUG, 1, [Define this to enable debug messages and assert warnings.]) debug_support=yes
-fi])
+AC_ARG_ENABLE(browser,
+AS_HELP_STRING([--disable-browser], [Disable built-in file browser]))
+if test "x$enable_browser" = xno; then
+    AC_DEFINE(DISABLE_BROWSER, 1, [Define this to disable the built-in file browser.])
+fi
 
-if test x$debug_support != xyes; then
-    AC_DEFINE(NDEBUG, 1, [Shut up assert warnings :-)])
+AC_ARG_ENABLE(color,
+AS_HELP_STRING([--disable-color], [Disable color and syntax highlighting]))
+if test "x$enable_nanorc" = xno; then
+    if test "x$enable_color" = xyes; then
+	AC_MSG_ERROR([--enable-color cannot work with --disable-nanorc])
+    else
+	# Disabling nanorc silently disables color support.
+	enable_color=no
+    fi
+fi
+if test "x$enable_color" = xno; then
+    AC_DEFINE(DISABLE_COLOR, 1, [Define this to disable syntax highlighting.])
+else
+    if test x$ac_cv_header_regex_h != xyes; then
+	AC_MSG_ERROR([
+*** The header file regex.h was not found.  If you wish to have
+*** 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.])
+    else
+	color_support=yes
+    fi
 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
-    AC_DEFINE(NANO_TINY, 1, [Define this to make the nano executable as small as possible.]) tiny_support=yes
-    AC_DEFINE(DISABLE_BROWSER, 1, [Define this to disable the built-in file browser.])
-    AC_DEFINE(DISABLE_HELP, 1, [Define this to disable the help text display.])
-    AC_DEFINE(DISABLE_JUSTIFY, 1, [Define this to disable the justify routines.])
-    AC_DEFINE(DISABLE_MOUSE, 1, [Define this to disable the mouse functions.])
-    AC_DEFINE(DISABLE_OPERATINGDIR, 1, [Define this to disable the setting of the operating directory (chroot of sorts).])
-    AC_DEFINE(DISABLE_SPELLER, 1, [Define this to disable the spell checker functions.])
-    AC_DEFINE(DISABLE_TABCOMP, 1, [Define to disable the tab completion functions for files and search strings.])
-    AC_DEFINE(DISABLE_WRAPPING, 1, [Define this to disable all text wrapping.])
-fi])
-
-AC_ARG_ENABLE(browser,
-[  --disable-browser       Disable built-in file browser],
-[if test x$enableval != xyes; then
-    AC_DEFINE(DISABLE_BROWSER, 1, [Define this to disable the built-in file browser.])
-fi])
+AS_HELP_STRING([--disable-extra], [Disable extra features, currently only easter eggs]))
+if test "x$enable_extra" = xno; then
+    AC_DEFINE(DISABLE_EXTRA, 1, [Define this to disable extra stuff.])
+fi
 
 AC_ARG_ENABLE(help,
-[  --disable-help          Disable help functions],
-[if test x$enableval != xyes; then
+AS_HELP_STRING([--disable-help], [Disable help functions]))
+if test "x$enable_help" = xno; then
     AC_DEFINE(DISABLE_HELP, 1, [Define this to disable the help text display.])
-fi])
+fi
+
+AC_ARG_ENABLE(histories,
+AS_HELP_STRING([--disable-histories], [Disable search and position histories]))
+if test "x$enable_histories" = xno; then
+    AC_DEFINE(DISABLE_HISTORIES, 1, [Define this to disable search and position histories.])
+fi
 
 AC_ARG_ENABLE(justify,
-[  --disable-justify       Disable justify/unjustify functions],
-[if test x$enableval != xyes; then
-    AC_DEFINE(DISABLE_JUSTIFY, 1, [Define this to disable the justify routines.]) 
-fi])
+AS_HELP_STRING([--disable-justify], [Disable justify/unjustify functions]))
+if test "x$enable_justify" = xno; then
+    AC_DEFINE(DISABLE_JUSTIFY, 1, [Define this to disable the justify routines.])
+fi
+
+AC_ARG_ENABLE(libmagic,
+AS_HELP_STRING([--disable-libmagic], [Disable detection of file types via libmagic]))
 
 AC_ARG_ENABLE(mouse,
-[  --disable-mouse         Disable mouse support (and -m flag)],
-[if test x$enableval != xyes; then
+AS_HELP_STRING([--disable-mouse], [Disable mouse support (and -m flag)]))
+if test "x$enable_mouse" = xno; then
     AC_DEFINE(DISABLE_MOUSE, 1, [Define this to disable the mouse support.])
-fi])
-
-AC_ARG_ENABLE(operatingdir,
-[  --disable-operatingdir  Disable setting of operating directory (chroot of sorts)],
-[if test x$enableval != xyes; then
-    AC_DEFINE(DISABLE_OPERATINGDIR, 1, [Define this to disable the setting of the operating directory (chroot of sorts).])
-fi])
-
-AC_ARG_ENABLE(speller,
-[  --disable-speller       Disable spell checker functions],
-[if test x$enableval != xyes; then
-    AC_DEFINE(DISABLE_SPELLER, 1, [Define this to disable the spell checker functions.])
-fi])
-
-AC_ARG_ENABLE(tabcomp,
-[  --disable-tabcomp       Disable tab completion functions],
-[if test x$enableval != xyes; then
-    AC_DEFINE(DISABLE_TABCOMP, 1, [Define to disable the tab completion functions for files and search strings.]) 
-fi])
-
-AC_ARG_ENABLE(wrapping,
-[  --disable-wrapping      Disable all wrapping of text (and -w flag)],
-[if test x$enableval != xyes; then
-    AC_DEFINE(DISABLE_WRAPPING, 1, [Define this to disable all text wrapping.])
-fi])
-
-AC_ARG_ENABLE(wrapping-as-root,
-[  --disable-wrapping-as-root  Disable wrapping of text as root by default],
-[if test x$enableval != xyes; then
-    AC_DEFINE(DISABLE_ROOTWRAPPING, 1, [Define this to disable text wrapping as root by default.])
-fi])
-
-AC_ARG_ENABLE(color,
-[  --enable-color          Enable color and syntax highlighting],
-[if test x$enableval = 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 do not call the configure
-*** script with --enable-color.])
-    fi
-fi])
+fi
 
 AC_ARG_ENABLE(multibuffer,
-[  --enable-multibuffer    Enable multiple file buffers],
-[if test x$enableval = xyes; then
-    AC_DEFINE(ENABLE_MULTIBUFFER, 1, [Define this to enable multiple file buffers.]) multibuffer_support=yes
-fi])
+AS_HELP_STRING([--disable-multibuffer], [Disable multiple file buffers]))
+if test "x$enable_multibuffer" = xno; then
+    AC_DEFINE(DISABLE_MULTIBUFFER, 1, [Define this to disable multiple file buffers.])
+fi
 
 AC_ARG_ENABLE(nanorc,
-[  --enable-nanorc         Enable use of .nanorc files],
-[if test x$enableval = xyes; then
-    AC_DEFINE(ENABLE_NANORC, 1, [Define this to use .nanorc files.]) nanorc_support=yes
-fi])
+AS_HELP_STRING([--disable-nanorc], [Disable use of .nanorc files]))
+if test "x$enable_nanorc" = xno; then
+    AC_DEFINE(DISABLE_NANORC, 1, [Define this to disable the use of .nanorc files.])
+else
+    nanorc_support=yes
+fi
 
-AC_ARG_ENABLE(all,
-[  --enable-all            Enable ALL extra nano functionality (kitchen sink option)],
-[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
-fi])
+AC_ARG_ENABLE(operatingdir,
+AS_HELP_STRING([--disable-operatingdir], [Disable setting of operating directory (chroot of sorts)]))
+if test "x$enable_operatingdir" = xno; then
+    AC_DEFINE(DISABLE_OPERATINGDIR, 1, [Define this to disable the setting of the operating directory (chroot of sorts).])
+fi
+
+AC_ARG_ENABLE(speller,
+AS_HELP_STRING([--disable-speller], [Disable spell checker functions]))
+if test "x$enable_speller" = xno; then
+    AC_DEFINE(DISABLE_SPELLER, 1, [Define this to disable the spell checker functions.])
+fi
+
+AC_ARG_ENABLE(tabcomp,
+AS_HELP_STRING([--disable-tabcomp], [Disable tab completion functions]))
+if test "x$enable_tabcomp" = xno; then
+    AC_DEFINE(DISABLE_TABCOMP, 1, [Define this to disable the tab completion functions for files and search strings.])
+fi
+
+AC_ARG_ENABLE(wrapping,
+AS_HELP_STRING([--disable-wrapping], [Disable all wrapping of text (and -w flag)]))
+if test "x$enable_wrapping" = xno; then
+    AC_DEFINE(DISABLE_WRAPPING, 1, [Define this to disable all text wrapping.])
+fi
+
+AC_ARG_ENABLE(wrapping-as-root,
+AS_HELP_STRING([--disable-wrapping-as-root], [Disable wrapping of text as root by default]))
+if test "x$enable_wrapping_as_root" = xno; then
+    AC_DEFINE(DISABLE_ROOTWRAPPING, 1, [Define this to disable text wrapping as root by default.])
+fi
+
+AC_ARG_ENABLE(debug,
+AS_HELP_STRING([--enable-debug], [Enable debugging (disabled by default)]))
+if test "x$enable_debug" = xyes; then
+    AC_DEFINE(DEBUG, 1, [Define this to enable debug messages and assert warnings.])
+else
+    AC_DEFINE(NDEBUG, 1, [Shut up assert warnings :-)])
+fi
+
+AC_ARG_ENABLE(tiny,
+AS_HELP_STRING([--enable-tiny], [Disable features for the sake of size]))
+if test "x$enable_tiny" = xyes; then
+    AC_DEFINE(NANO_TINY, 1, [Define this to make the nano executable as small as possible.])
+    if test "x$enable_browser" != xyes; then
+	AC_DEFINE(DISABLE_BROWSER, 1, [Define this to disable the built-in file browser.])
+    fi
+    if test "x$enable_color" != xyes; then
+	AC_DEFINE(DISABLE_COLOR, 1, [Define this to disable syntax highlighting.])
+	color_support=no
+    else
+	if test "x$enable_nanorc" != xyes; then
+	    AC_MSG_ERROR([--enable-color with --enable-tiny cannot work without --enable-nanorc])
+	fi
+    fi
+    if test "x$enable_extra" != xyes; then
+	AC_DEFINE(DISABLE_EXTRA, 1, [Define this to disable extra stuff.])
+    fi
+    if test "x$enable_help" != xyes; then
+	AC_DEFINE(DISABLE_HELP, 1, [Define this to disable the help text display.])
+    fi
+    if test "x$enable_histories" != xyes; then
+	AC_DEFINE(DISABLE_HISTORIES, 1, [Define this to disable search and position histories.])
+    fi
+    if test "x$enable_justify" != xyes; then
+	AC_DEFINE(DISABLE_JUSTIFY, 1, [Define this to disable the justify routines.])
+    fi
+    if test "x$enable_libmagic" != xyes; then
+	enable_libmagic=no
+    fi
+    if test "x$enable_mouse" != xyes; then
+	AC_DEFINE(DISABLE_MOUSE, 1, [Define this to disable the mouse support.])
+    fi
+    if test "x$enable_multibuffer" != xyes; then
+	AC_DEFINE(DISABLE_MULTIBUFFER, 1, [Define this to disable multiple file buffers.])
+    fi
+    if test "x$enable_nanorc" != xyes; then
+	AC_DEFINE(DISABLE_NANORC, 1, [Define this to disable the use of .nanorc files.])
+    fi
+    if test "x$enable_operatingdir" != xyes; then
+	AC_DEFINE(DISABLE_OPERATINGDIR, 1, [Define this to disable the setting of the operating directory (chroot of sorts).])
+    fi
+    if test "x$enable_speller" != xyes; then
+	AC_DEFINE(DISABLE_SPELLER, 1, [Define this to disable the spell checker functions.])
+    fi
+    if test "x$enable_tabcomp" != xyes; then
+	AC_DEFINE(DISABLE_TABCOMP, 1, [Define this to disable the tab completion functions for files and search strings.])
+    fi
+    if test "x$enable_wrapping" != xyes; then
+	AC_DEFINE(DISABLE_WRAPPING, 1, [Define this to disable all text wrapping.])
+    fi
+fi
+
+AM_CONDITIONAL(USE_COLOR, test x$color_support = xyes)
+AM_CONDITIONAL(USE_NANORC, test x$nanorc_support = xyes)
 
 AC_MSG_CHECKING([whether to enable UTF-8 support])
-AC_ARG_ENABLE(utf8,
-[  --enable-utf8           Enable UTF-8 support],
-[if test x$enableval = xyes; then
-    enable_utf8=yes
-else
-    enable_utf8=no
-fi],
-[enable_utf8=auto])
-AC_MSG_RESULT($enable_utf8)
+AC_ARG_ENABLE(utf8, AS_HELP_STRING([--enable-utf8], [Enable UTF-8 support]))
+AC_MSG_RESULT(${enable_utf8:-auto})
+
+AC_ARG_ENABLE(altrcname,
+AS_HELP_STRING([--enable-altrcname], [Specify an alternate rcfile name (default: .nanorc)]),
+[if test x$enableval != no; then
+    AC_DEFINE_UNQUOTED(RCFILE_NAME, "$enableval", [Specify an alternate rcfile name (default: .nanorc).]) rcfilename=$enableval
+fi])
+
 
 AC_MSG_CHECKING([whether to use slang])
 CURSES_LIB_NAME=""
 AC_ARG_WITH(slang,
-[  --with-slang[=DIR]      Use the slang library instead of curses],
+AS_HELP_STRING([--with-slang[=DIR]], [Use the slang library instead of curses]),
 [    case "$with_slang" in
     no)
 	AC_MSG_RESULT(no)
@@ -196,12 +250,12 @@ AC_ARG_WITH(slang,
 	AC_MSG_RESULT(yes)
 
 	if test x$with_slang != xyes; then
-	    # Add additional search path
+	    # Add additional search path.
 	    LDFLAGS="-L$with_slang/lib $LDFLAGS"
 	    CPPFLAGS="-I$with_slang/include $CPPFLAGS"
 	fi
 
-	if test x$enable_utf8 != xno; then
+	if test "x$enable_utf8" != xno; then
 	    AC_CHECK_HEADER(slcurses.h,
 		AC_MSG_CHECKING([for SLutf8_enable in -lslang])
 		_libs=$LIBS
@@ -214,7 +268,7 @@ int main(void)
     return 0;
 }],
 		    [AC_MSG_RESULT(yes)
-		    AC_DEFINE(USE_SLANG, 1, [Define to use the slang wrappers for curses instead of native curses.]) slang_support=yes
+		    AC_DEFINE(USE_SLANG, 1, [Define this to use the slang wrappers for curses instead of native curses.])
 		    CURSES_LIB_WIDE=yes
 		    if test x$with_slang != xyes; then
 			CURSES_LIB="-L${with_slang}/lib -lslang"
@@ -224,7 +278,7 @@ int main(void)
 		    CURSES_LIB_NAME=slang],
 		    [AC_MSG_RESULT(no)
 
-		    # We might need the term library
+		    # We might need the term library.
 		    for termlib in ncurses curses termcap terminfo termlib; do
 			AC_CHECK_LIB([${termlib}], tputs, [tcap="-l$termlib"])
 			test -n "$tcap" && break
@@ -240,7 +294,7 @@ int main(void)
     return 0;
 }],
 			[AC_MSG_RESULT(yes)
-			AC_DEFINE(USE_SLANG, 1, [Define to use the slang wrappers for curses instead of native curses.]) slang_support=yes
+			AC_DEFINE(USE_SLANG, 1, [Define this to use the slang wrappers for curses instead of native curses.])
 			CURSES_LIB_WIDE=yes
 			if test x$with_slang != xyes; then
 			    CURSES_LIB="-L${with_slang}/lib -lslang $tcap"
@@ -250,7 +304,7 @@ int main(void)
 			CURSES_LIB_NAME=slang],
 			[AC_MSG_RESULT(no)
 
-			# We might need the math library
+			# We might need the math library.
 			AC_MSG_CHECKING([for SLutf8_enable in -lslang $tcap -lm])
 			LIBS="$LIBS -lm"
 			AC_TRY_RUN([
@@ -261,7 +315,7 @@ int main(void)
     return 0;
 }],
 			    [AC_MSG_RESULT(yes)
-			    AC_DEFINE(USE_SLANG, 1, [Define to use the slang wrappers for curses instead of native curses.]) slang_support=yes
+			    AC_DEFINE(USE_SLANG, 1, [Define this to use the slang wrappers for curses instead of native curses.])
 			    CURSES_LIB_WIDE=yes
 			    if test x$with_slang != xyes; then
 				CURSES_LIB="-L${with_slang}/lib -lslang $tcap -lm"
@@ -281,8 +335,8 @@ int main(void)
 	fi
 
 	if eval "test x$CURSES_LIB_NAME = x"; then
-	    # Reset libs if the above slang tests failed
-	    if test x$enable_utf8 != xno; then
+	    # Reset libs if the above slang tests failed.
+	    if test "x$enable_utf8" != xno; then
 		LIBS=$_libs
 	    fi
 
@@ -298,7 +352,7 @@ int main(void)
     return 0;
 }],
 		    [AC_MSG_RESULT(yes)
-		    AC_DEFINE(USE_SLANG, 1, [Define to use the slang wrappers for curses instead of native curses.]) slang_support=yes
+		    AC_DEFINE(USE_SLANG, 1, [Define this to use the slang wrappers for curses instead of native curses.])
 		    if test x$with_slang != xyes; then
 			CURSES_LIB="-L${with_slang}/lib -lslang"
 		    else
@@ -307,7 +361,7 @@ int main(void)
 		    CURSES_LIB_NAME=slang],
 		    [AC_MSG_RESULT(no)
 
-		    # We might need the term library
+		    # We might need the term library.
 		    for termlib in ncurses curses termcap terminfo termlib; do
 			AC_CHECK_LIB([${termlib}], tputs, [tcap="-l$termlib"])
 			test -n "$tcap" && break
@@ -323,7 +377,7 @@ int main(void)
     return 0;
 }],
 			[AC_MSG_RESULT(yes)
-			AC_DEFINE(USE_SLANG, 1, [Define to use the slang wrappers for curses instead of native curses.]) slang_support=yes
+			AC_DEFINE(USE_SLANG, 1, [Define this to use the slang wrappers for curses instead of native curses.])
 			if test x$with_slang != xyes; then
 			    CURSES_LIB="-L${with_slang}/lib -lslang $tcap"
 			else
@@ -332,7 +386,7 @@ int main(void)
 			CURSES_LIB_NAME=slang],
 			[AC_MSG_RESULT(no)
 
-			# We might need the math library
+			# We might need the math library.
 			AC_MSG_CHECKING([for SLtt_initialize in -lslang $tcap -lm])
 			LIBS="$LIBS -lm"
 			AC_TRY_RUN([
@@ -343,7 +397,7 @@ int main(void)
     return 0;
 }],
 			    [AC_MSG_RESULT(yes)
-			    AC_DEFINE(USE_SLANG, 1, [Define to use the slang wrappers for curses instead of native curses.]) slang_support=yes
+			    AC_DEFINE(USE_SLANG, 1, [Define this to use the slang wrappers for curses instead of native curses.])
 			    if test x$with_slang != xyes; then
 				CURSES_LIB="-L${with_slang}/lib -lslang $tcap -lm"
 			    else
@@ -371,39 +425,79 @@ int main(void)
 	;;
     esac], [AC_MSG_RESULT(no)])
 
-AM_CONDITIONAL(USE_COLOR, test x$color_support = xyes)
 
 dnl Checks for functions.
 
-AC_CHECK_FUNCS(getdelim getline isblank strcasecmp strcasestr strncasecmp strnlen vsnprintf)
+AC_CHECK_FUNCS(getdelim getline isblank strcasecmp strcasestr strncasecmp strnlen snprintf vsnprintf)
 
-if test x$enable_utf8 != xno; then
-    AC_CHECK_FUNCS(iswalnum iswblank iswpunct iswspace mblen mbstowcs mbtowc wctomb wcwidth)
+if test "x$enable_utf8" != xno; then
+    AC_CHECK_FUNCS(iswalnum iswblank iswpunct iswspace nl_langinfo mblen mbstowcs mbtowc wctomb wcwidth)
+fi
+
+if test x$ac_cv_func_snprintf = xno; then
+    AM_PATH_GLIB_2_0(2.0.0,,
+	AC_MSG_ERROR([
+*** snprintf() not found.  GLIB 2.x not found either.
+*** You should install the GLIB 2.x library which can
+*** be found at http://ftp.gtk.org/.]),
+	glib)
 fi
 
 if test x$ac_cv_func_vsnprintf = xno; then
     AM_PATH_GLIB_2_0(2.0.0,,
 	AC_MSG_ERROR([
-*** vsnprintf() not found.  GLIB 2.x not found either.  You should
-*** install the GLIB 2.x library which can be found at
-*** ftp://ftp.gtk.org/.]),
+*** vsnprintf() not found.  GLIB 2.x not found either.
+*** You should install the GLIB 2.x library which can
+*** be found at http://ftp.gtk.org/.]),
 	glib)
 fi
 
 dnl Checks for typedefs, structures, and compiler characteristics.
 
+dnl Checks for available flags.
+
+AX_CHECK_COMPILE_FLAG([-Wall], [CFLAGS="$CFLAGS -Wall"], [], [])
+
 dnl Checks for library functions.
+
 AC_TYPE_SIGNAL
 AC_FUNC_VPRINTF
 AC_CHECK_FUNCS(getopt_long)
 
 dnl Checks for libraries.
 
+if eval "test x$CURSES_LIB_NAME = x"; then
+    if test "x$enable_utf8" != xno; then
+	PKG_CHECK_MODULES([NCURSESW], [ncursesw], [
+	    CURSES_LIB=$NCURSESW_LIBS
+	    CPPFLAGS="$NCURSESW_CFLAGS $CPPFLAGS"
+	    CURSES_LIB_NAME=ncursesw
+	    CURSES_LIB_WIDE=yes
+	], [:])
+    else
+	PKG_CHECK_MODULES([NCURSES], [ncurses], [
+	    CURSES_LIB=$NCURSES_LIBS
+	    CPPFLAGS="$NCURSES_CFLAGS $CPPFLAGS"
+	    CURSES_LIB_NAME=ncurses
+	], [:])
+    fi
+fi
+
 if eval "test x$CURSES_LIB_NAME = x"; then
     AC_CHECK_HEADERS(ncurses.h)
 
-    if test x$enable_utf8 != xno; then
-	AC_CHECK_LIB(ncursesw, get_wch, [CURSES_LIB="-lncursesw" CURSES_LIB_NAME=ncursesw CURSES_LIB_WIDE=yes])
+    if test "x$enable_utf8" != xno; then
+	OLDLIBS="$LIBS"
+	AC_CHECK_TOOL(NCURSESW_CONFIG, ncursesw5-config, no)
+	if test "x$NCURSESW_CONFIG" != xno; then
+	    CURSES_LIB=`$NCURSESW_CONFIG --libs`
+	    LIBS="$CURSES_LIB $LIBS"
+	    CPPFLAGS="`$NCURSESW_CONFIG --cflags` $CPPFLAGS"
+	    AC_CHECK_LIB(ncursesw, get_wch, [CURSES_LIB_NAME=ncursesw CURSES_LIB_WIDE=yes])
+	else
+	    AC_CHECK_LIB(ncursesw, get_wch, [CURSES_LIB="-lncursesw" CURSES_LIB_NAME=ncursesw CURSES_LIB_WIDE=yes])
+	fi
+	LIBS="$OLDLIBS"
     fi
 
     if eval "test x$CURSES_LIB_NAME = x"; then
@@ -414,12 +508,12 @@ fi
 if eval "test x$CURSES_LIB_NAME = x"; then
     AC_CHECK_HEADERS(curses.h)
 
-    if test x$enable_utf8 != xno; then
+    if test "x$enable_utf8" != xno; then
 	AC_CHECK_LIB(curses, get_wch, [CURSES_LIB="-lcurses" CURSES_LIB_NAME=curses CURSES_LIB_WIDE=yes])
     fi
 
     if eval "test x$CURSES_LIB_NAME = x"; then
-	 AC_CHECK_LIB(curses, initscr, [CURSES_LIB="-lcurses" CURSES_LIB_NAME=curses])
+	AC_CHECK_LIB(curses, initscr, [CURSES_LIB="-lcurses" CURSES_LIB_NAME=curses])
     fi
 fi
 
@@ -433,6 +527,7 @@ else
 fi
 
 AC_CHECK_LIB([$CURSES_LIB_NAME], use_default_colors, AC_DEFINE(HAVE_USE_DEFAULT_COLORS, 1, [Define this if your curses library has the use_default_colors() command.]))
+AC_CHECK_LIB([$CURSES_LIB_NAME], key_defined, AC_DEFINE(HAVE_KEY_DEFINED, 1, [Define this if your curses library has the key_defined() command.]))
 
 dnl Parse any configure options.
 
@@ -447,26 +542,27 @@ if test "x$GLIB_LIBS" != "x"; then
     LDFLAGS="$LDFLAGS $GLIB_LIBS"
 fi
 
-if test x$enable_utf8 != xno && \
+if test "x$enable_utf8" != xno && \
     test x$CURSES_LIB_WIDE = xyes && \
     test x$ac_cv_func_iswalnum = xyes && \
     test x$ac_cv_func_iswpunct = xyes && \
     (test x$ac_cv_func_iswblank = xyes || test x$ac_cv_func_iswspace = xyes) && \
+    test x$ac_cv_func_nl_langinfo = xyes && \
     test x$ac_cv_func_mblen = xyes && \
     test x$ac_cv_func_mbstowcs = xyes && \
     test x$ac_cv_func_mbtowc = xyes && \
     test x$ac_cv_func_wctomb = xyes && \
     test x$ac_cv_func_wcwidth = xyes; then
-	AC_DEFINE(ENABLE_UTF8, 1, [Define this if your system has sufficient UTF-8 support (a wide curses library, iswalnum(), iswpunct(), iswblank() or iswspace(), mblen(), mbstowcs(), mbtowc(), wctomb(), and wcwidth()).])
+	AC_DEFINE(ENABLE_UTF8, 1, [Define this if your system has sufficient UTF-8 support (a wide curses library, iswalnum(), iswpunct(), iswblank() or iswspace(), nl_langinfo, mblen(), mbstowcs(), mbtowc(), wctomb(), and wcwidth()).])
 else
-    if test x$enable_utf8 = xyes; then
+    if test "x$enable_utf8" = xyes; then
 	AC_MSG_ERROR([
 *** UTF-8 support was requested, but insufficient UTF-8 support was
 *** detected in your curses and/or C libraries.  Please verify that your
 *** slang was built with UTF-8 support or your curses was built with
 *** wide character support, and that your C library was built with wide
 *** character support.])
-    elif test x$enable_utf8 != xno; then
+    elif test "x$enable_utf8" != xno; then
 	AC_MSG_WARN([
 *** Insufficient UTF-8 support was detected in your curses and/or C
 *** libraries.  If you want UTF-8 support, please verify that your slang
@@ -476,6 +572,116 @@ else
     fi
 fi
 
+if test x$color_support = xyes; then
+	# Now check for the end-of-word boundary support (/< and />).
+	AC_MSG_CHECKING([for GNU-style word boundary regex support])
+
+	AC_ARG_WITH(wordbounds,
+        AS_HELP_STRING([--with-wordbounds], [Use GNU-style word boundary delimiters]),
+	[ case "$with_wordbounds" in
+	    no)
+		AC_MSG_RESULT(no)
+		;;
+	    *)
+		AC_MSG_RESULT(yes)
+		# We explicitly don't check if the user forced the option, because
+		# this is needed for cross compilers and we can't test the target.
+		AC_DEFINE(GNU_WORDBOUNDS, 1, [Define this if the system supports GNU-style word boundaries in regexes.]) gnu_wordbounds=yes,
+		;;
+	  esac
+	], [
+	    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 this if the system supports GNU-style word boundaries in regexes.]) gnu_wordbounds=yes,
+	    AC_MSG_RESULT(no),
+	    AC_MSG_WARN([*** Can't check for GNU-style word boundary support when cross-compiling])
+	)
+])
+
+#    if test x$CURSES_LIB_NAME = xcurses; then
+	AC_MSG_CHECKING([whether _XOPEN_SOURCE_EXTENDED is needed])
+	AC_TRY_RUN([
+#include <curses.h>
+int main(void)
+{
+    int testcolor = COLOR_WHITE;
+    return 0;
+}], AC_MSG_RESULT(no),
+        AC_TRY_RUN([
+#ifndef _XOPEN_SOURCE_EXTENDED
+#define _XOPEN_SOURCE_EXTENDED 1
+#endif
+#include <curses.h>
+int main(void)
+{
+    int testcolor = COLOR_WHITE;
+    return 0;
+}],
+	AC_DEFINE(NEED_XOPEN_SOURCE_EXTENDED, 1, [Define this if you need the _XOPEN_SOURCE_EXTENDED macro for color support])
+	AC_MSG_RESULT(yes),
+	AC_MSG_RESULT(not sure)
+	AC_MSG_WARN([*** Couldn't successfully compile basic color test with or without _XOPEN_SOURCE_EXTENDED])
+	AC_MSG_WARN([*** This build may not compile. Consider configuring with --disable-color or installing ncurses])),
+	AC_MSG_WARN([*** Can't check need for _XOPEN_SOURCE_EXTENDED when cross-compiling]))
+    fi
+#fi
+
+AC_MSG_CHECKING([whether LINES and COLS can be redefined])
+AC_TRY_RUN([
+#include <curses.h>
+int main(void)
+{
+    LINES = 80;
+    COLS = 25;
+    return 0;
+}],
+AC_DEFINE(REDEFINING_MACROS_OK, 1, [Define this if you know your curses library allows LINES and COLS to be redefined to deal with a resizing bug])
+AC_MSG_RESULT(yes),
+AC_MSG_RESULT(no),
+AC_MSG_WARN([*** Can't check for macro redefinability when cross-compiling]))
+
+AS_IF([test "x$enable_libmagic" != "xno"], [
+  AC_CHECK_HEADERS([magic.h])
+  AC_CHECK_LIB(magic, magic_open)
+  AC_CHECK_HEADERS([zlib.h])
+  AC_CHECK_LIB(z, inflate)
+])
+
+# Check for groff html support.
+AC_MSG_CHECKING([for HTML support in groff])
+groff -t -mandoc -Thtml </dev/null >/dev/null
+if test $? -ne 0 ; then
+    AC_MSG_RESULT([no])
+    AC_MSG_WARN([*** Will not generate HTML version of man pages  ***
+*** Consider installing a newer version of groff with HTML support ***])
+    groff_html_support=no
+else
+    AC_MSG_RESULT([yes])
+    groff_html_support=yes
+fi
+AM_CONDITIONAL(GROFF_HTML, test x$groff_html_support = xyes)
+
+# Check for the availability of makeinfo.
+AC_CHECK_PROG(haveit, makeinfo, yes, no)
+AM_CONDITIONAL(HAVE_MAKEINFO, test x$haveit = xyes)
+
+
 AC_CONFIG_FILES([
 Makefile
 doc/Makefile

doc/.cvsignore

@@ -1,3 +0,0 @@
-Makefile
-Makefile.in
-nanorc.sample

doc/.gitignore

@@ -0,0 +1 @@
+/nanorc.sample

doc/Makefile.am

@@ -1,7 +1,11 @@
-if USE_COLOR
-SUBDIRS = man syntax texinfo
-else
-SUBDIRS = man texinfo
+SUBDIRS = man
+
+if HAVE_MAKEINFO
+SUBDIRS += texinfo
 endif
 
-EXTRA_DIST = faq.html
+if USE_COLOR
+SUBDIRS += syntax
+endif
+
+dist_html_DATA = faq.html

doc/faq.html

@@ -19,17 +19,17 @@
 <blockquote><p><a href="#2.1">2.1. FTP and WWW sites that carry nano.</a><br>
   <a href="#2.2">2.2. RedHat and derivatives (.rpm) packages.</a><br>
   <a href="#2.3">2.3. Debian (.deb) packages.</a><br>
-  <a href="#2.4">2.4. By CVS (for the brave).</a></p></blockquote>
+  <a href="#2.4">2.4. By subversion (for the brave).</a></p></blockquote>
 <h2><a href="#3">3. Installation and Configuration</a></h2>
 <blockquote><p><a href="#3.1">3.1. How do I install the RPM or DEB package?</a><br>
   <a href="#3.2">3.2. Compiling from source: WHAT THE HECK DO I DO NOW?</a><br>
   <a href="#3.3">3.3. Why does everything go into /usr/local?</a><br>
-  <a href="#3.4">3.4. I get errors about 'bindtextdomain','gettext', and/or 'gettextdomain'. What can I do about it?</a><br>
   <a href="#3.5">3.5. nano should automatically run strip on the binary when installing it!</a><br>
   <a href="#3.6">3.6. How can I make the executable smaller? This is too bloated!</a><br>
   <a href="#3.7">3.7. Tell me more about this multibuffer stuff!</a><br>
   <a href="#3.8">3.8. Tell me more about this verbatim input stuff!</a><br>
-  <a href="#3.9">3.9. How do I make a .nanorc file that nano will read when I start it?</a></p></blockquote>
+  <a href="#3.9a">3.9a. How do I make a .nanorc file that nano will read when I start it?</a><br>
+  <a href="#3.9b">3.9b. How about in Win32?</a></p></blockquote>
 <h2><a href="#4">4. Running</a></h2>
 <blockquote><p><a href="#4.1">4.1. How do I open a file with a name beginning with '+' from the command line?</a><br>
   <a href="#4.2">4.2. Ack! My Backspace/Delete/Enter/Meta/double bucky key doesn't seem to work! What can I do?</a><br>
@@ -44,7 +44,9 @@
   <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 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>
+  <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><br>
+  <a href="#4.14">4.14. When I paste text into a document, each line gets indented further than the last. Why does nano do this, and how can I avoid it?</a><br>
+  <a href="#4.15">4.15. On startup I get a message that says "Detected a legacy nano history file".  Now older nano versions can't find my search history!</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>
@@ -52,21 +54,19 @@
 <h2><a href="#6">6. Advocacy and Licensing</a></h2>
 <blockquote><p><a href="#6.1">6.1. Why should I use nano instead of Pico?</a><br>
   <a href="#6.2">6.2. Why should I use Pico instead of nano?</a><br>
-  <a href="#6.3">6.3. What is so bad about the Pine license?</a><br>
-  <a href="#6.4">6.4. Okay, well what mail program should I use then?</a><br>
-  <a href="#6.5">6.5. Why doesn't UW simply change their license?</a><br>
-  <a href="#6.6">6.6. What if tomorrow UW changes the license to be truly Free Software?</a></p></blockquote>
+  <a href="#6.3">6.3. What is so bad about the older Pine license?</a><br>
+  <a href="#6.4">6.4. Okay, well, what mail program should I use then?</a></p></blockquote>
 <h2><a href="#7">7. Miscellaneous</a></h2>
 <blockquote><p><a href="#7.1">7.1. nano-related mailing lists.</a><br>
   <a href="#7.2">7.2. I want to send the development team a big load of cash (or just a thank you).</a><br>
-  <a href="#7.3">7.3. How do I submit a patch?</a><br>
+  <a href="#7.3">7.3. How do I submit a bug report or patch?</a><br>
   <a href="#7.4">7.4. How do I join the development team?</a><br>
-  <a href="#7.5">7.5. Can I have CVS write access?</a></p></blockquote>
+  <a href="#7.5">7.5. Can I have write access to the subversion tree?</a></p></blockquote>
 <h2><a href="#8">8. ChangeLog</a></h2>
 <hr width="100%">
 <h1><a name="1"></a>1. General</h1>
 <h2><a name="1.1"></a>1.1 About this FAQ</h2>
-<blockquote><p>This FAQ was originally written and maintained by Chris Allegretta &lt;<a href="mailto:chrisa@asty.org">chrisa@asty.org</a>&gt;, who also happens to be the creator of nano. It is currently maintained by David Lawrence Ramsey &lt;<a href="mailto:pooka109@cox.net">pooka109@cox.net</a>&gt;. Maybe someone else will volunteer to maintain this FAQ someday, who knows...</p></blockquote>
+<blockquote><p>This FAQ was originally written and maintained by Chris Allegretta &lt;<a href="mailto:chrisa@asty.org">chrisa@asty.org</a>&gt;, who also happens to be the creator of nano. It was then maintained by David Lawrence Ramsey &lt;<a href="mailto:pooka109@gmail.com">pooka109@gmail.com</a>&gt;. Maybe someone else will volunteer to maintain this FAQ someday, who knows...</p></blockquote>
 <h2><a name="1.2"></a>1.2. How do I contribute to it?</h2>
 <blockquote><p>Your best bet is to send it to the nano email address, <a href="mailto:nano@nano-editor.org">nano@nano-editor.org</a> and if it is useful enough it will be included in future versions.</p></blockquote>
 <h2><a name="1.3"></a>1.3. What is GNU nano?</h2>
@@ -76,7 +76,7 @@
   <p><b>In the beginning...</b></p>
   <p>For years Pine was THE program used to read email on a Unix system. The Pico text editor is the portion of the program one would use to compose his or her mail messages. Many beginners to Unix flocked to Pico and Pine because of their well organized, easy to use interfaces. With the proliferation of GNU/Linux in the mid to late 90's, many University students became intimately familiar with the strengths (and weaknesses) of Pine and Pico.</p>
   <p><b>Then came Debian...</b></p>
-  <p>The <a href="http://www.debian.org/">Debian GNU/Linux</a> distribution, known for its strict standards in distributing truly &quot;free&quot; software (i.e. software with no restrictions on redistribution), would not include a binary package for Pine or Pico. Many people had a serious dilemma: they loved these programs, but they were not truly free software in the <a href="http://www.gnu.org/philosophy/free-sw.html">GNU</a> sense of the word.</p>
+  <p>The <a href="http://www.debian.org/">Debian GNU/Linux</a> distribution, known for its strict standards in distributing truly &quot;free&quot; software (i.e. software with no restrictions on redistribution), would not include a binary package for Pine or Pico. Many people had a serious dilemma: they loved these programs, but the versions available at the time were not truly free software in the <a href="http://www.gnu.org/philosophy/free-sw.html">GNU</a> sense of the word.</p>
   <p><b>The event...</b></p>
   <p>It was in late 1999 when Chris Allegretta (our hero) was yet again complaining to himself about the less-than-perfect license Pico was distributed under, the 1000 makefiles that came with it and how just a few small improvements could make it the Best Editor in the World (TM). Having been a convert from Slackware to Debian, he missed having a simple binary package that included Pine and Pico, and had grown tired of downloading them himself.</p>
   <p>Finally something snapped inside and Chris coded and hacked like a madman for many hours straight one weekend to make a (barely usable) Pico clone, at the time called TIP (Tip Isn't Pico). The program could not be invoked without a filename, could not save files, had no help text display, spell checker, and so forth. But over time it improved, and with the help of a few great coders it matured to the (hopefully) stable state it is today.</p>
@@ -84,47 +84,43 @@
 <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 2.0.2. Of course, you should always check the nano homepage to see what the latest and greatest version is.</p></blockquote>
+<blockquote><p>The current stable version of nano *should* be 2.4.2. Of course, you should always check the <a href="http://www.nano-editor.org/">nano homepage</a> 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/v2.0/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.4/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>
 <blockquote><p>The nano distribution can be downloaded at the following fine web and ftp sites:</p>
   <ul>
     <li><a href="http://www.nano-editor.org/dist/">http://www.nano-editor.org/dist/</a></li>
-    <li><a href="http://www.ewtoo.org/~astyanax/nano/dist/">http://www.ewtoo.org/~astyanax/nano/dist/</a></li>
     <li><a href="ftp://ftp.gnu.org/pub/gnu/nano/">ftp://ftp.gnu.org/pub/gnu/nano/</a></li>
   </ul>
 </blockquote>
 <h2><a name="2.2"></a>2.2. RedHat and derivatives (.rpm) packages.</h2>
 <blockquote>
   <ul>
-    <li><a href="http://www.nano-editor.org/dist/v1.2/RPMS/">http://www.nano-editor.org/dist/v1.2/RPMS/</a></li>
-    <li><a href="http://www.ewtoo.org/~astyanax/nano/dist/v1.2/RPMS/">http://www.ewtoo.org/~astyanax/nano/dist/v1.2/RPMS/</a></li>
+    <li><a href="http://www.nano-editor.org/dist/v2.2/RPMS/">http://www.nano-editor.org/dist/v2.2/RPMS/</a></li>
   </ul>
 </blockquote>
 <h2><a name="2.3"></a>2.3. Debian (.deb) packages.</h2>
 <blockquote><p>Debian users can check out the current nano packages for:</p>
   <ul>
-    <li><a href="http://packages.debian.org/stable/editors/nano.html">stable</a></li>
-    <li><a href="http://packages.debian.org/testing/editors/nano.html">testing</a></li>
-    <li><a href="http://packages.debian.org/unstable/editors/nano.html">unstable</a></li>
+    <li><a href="http://packages.debian.org/stable/editors/nano">stable</a></li>
+    <li><a href="http://packages.debian.org/testing/editors/nano">testing</a></li>
+    <li><a href="http://packages.debian.org/unstable/editors/nano">unstable</a></li>
   </ul>
   <p>You can also have a look at the <a href="ftp://ftp.debian.org/debian/pool/main/n/nano/">Package Pool</a> to see all the available binary and source packages.</p>
-  <p>Note that versions &lt; 0.9.10 are probably not for those wanting to get serious work done, so if you are using Debian 2.2, check that you have updated to 2.2r3, which comes with nano 0.9.23. If you're tracking unstable, you probably have the newest version already.</p></blockquote>
-<h2><a name="2.4"></a>2.4. By CVS (for the brave).</h2>
-<blockquote><p>For the 'bleeding edge' current version of nano, you can use CVS to download the current source code. <b>Note:</b> believe it or not, by downloading code that has not yet stabilized into an official release, there could quite possibly be bugs, in fact the code may not even compile! Anyway, see <a href="http://savannah.gnu.org/cvs/?group=nano">the nano CVS page</a> for info on anonymous CVS access to the nano source.</p></blockquote>
+</blockquote>
+<h2><a name="2.4"></a>2.4. By subversion (for the brave).</h2>
+<blockquote><p>For the 'bleeding edge' current version of nano, you can use subversion to download the current source code. <b>Note:</b> believe it or not, by downloading code that has not yet stabilized into an official release, there could quite possibly be bugs, in fact the code may not even compile! Anyway, see <a href="http://svn.savannah.gnu.org/viewvc/trunk/nano/README.SVN?root=nano&view=markup">the nano SVN document</a> for info on anonymous SVN access to the nano source.</p></blockquote>
 <hr width="100%">
 <h1><a name="3"></a>3. Installation and Configuration</h1>
-<h2><a name="3.1"></a>3.1. How do install the RPM or DEB package?</h2>
+<h2><a name="3.1"></a>3.1. How do I install the RPM or DEB package?</h2>
 <blockquote><p>It's simple really! As root, type <b>rpm -Uvh nano-x.y.z-1.i386.rpm</b> if you have a RedHat-ish system or <b>dpkg -i nano_x.y.z-1.deb</b> if you have a Debian-ish system, where <b>x.y.z</b> is the release of nano. There are other programs to install packages, and if you wish to use those, knock yourself out.</p></blockquote>
 <h2><a name="3.2"></a>3.2. Compiling from source: WHAT THE HECK DO I DO NOW?</h2>
 <blockquote><p>Okay, take a deep breath, this really isn't hard. Unpack the nano source with a command like:</p>
-  <p><b>tar -zxvf nano-x.y.z.tar.gz</b></p>
-  <p>If you get error messages about the -z option, try this:</p>
-  <p><b>gzip -dc nano-x.y.z.tar.gz | tar xvf -</b></p>
-  <p>(again, where x.y.z is the version number in question). Then you need to run configure with any options you might want (if any).</p>
+  <p><b>tar -xvf nano-x.y.z.tar.gz</b></p>
+  <p>Then you need to run <b>configure</b> with any options you might want (if any).</p>
   <p>The average case is this:</p>
   <p><b>cd nano-x.y.z/</b><br>
   <b>./configure</b><br>
@@ -134,67 +130,69 @@
 <blockquote><p>Well, that's what the <b>configure</b> script defaults to. If you wish to change this, simply do this:</p>
   <p><b>./configure --prefix=/usr</b></p>
   <p>to put nano into /usr/bin when you run <b>make install</b>.</p></blockquote>
-<h2><a name="3.4"></a>3.4. I get errors about 'bindtextdomain', 'gettext', and/or 'gettextdomain'. What can I do about it?</h2>
-<blockquote><p>Try doing a <b>./configure --with-included-gettext</b> and see if that solves your problem. You may need to do a <b>make clean; make</b> to get it to work fully.</p></blockquote>
 <h2><a name="3.5"></a>3.5. nano should automatically run strip on the binary when installing it!</h2>
 <blockquote><p>Actually, it does, but you have to use <b>make install-strip</b>. The default make install does not, and will not, run strip automatically.</p></blockquote>
 <h2><a name="3.6"></a>3.6. How can I make the executable smaller? This is too bloated!</h2>
 <blockquote><p>Actually, there are several parts of the editor that can be disabled. You can pass arguments to the <b>configure</b> script that disable certain features. Here's a brief list:</p>
   <pre>
-  <b>--disable-tabcomp</b>       Disable tab completion functions
-  <b>--disable-justify</b>       Disable justify/unjustify functions
-  <b>--disable-speller</b>       Disable spell checker functions
+  <b>--disable-browser</b>       Disable the built-in file browser
+  <b>--disable-color</b>         Disable color and syntax highlighting
+  <b>--disable-extra</b>         Disable extra features (currently only an easter egg)
   <b>--disable-help</b>          Disable help functions
-  <b>--disable-browser</b>       Disable built-in file browser
-  <b>--disable-wrapping</b>      Disable all wrapping of text (and -w flag)
-  <b>--disable-mouse</b>         Disable mouse support (and -m flag)
-  <b>--disable-operatingdir</b>  Disable setting of operating directory</pre>
-  <p>There's also the <b>--enable-tiny</b> option which disables everything above, as well as some larger chunks of the program (like the marker code that you use Control-^ to select with). Also, if you know you aren't going to be using other languages you can use <b>--disable-nls</b> to disable internationalization and save a few K to a few dozen K depending on if you have locale support on your system. And finally there's always good old <b>strip</b> to strip all debugging code and code that exists in libraries on your system.</p>
-  <p>If, on the other hand, you can't live without bells and whistles, you could try:</p>
-  <pre>
-  <b>--enable-extra</b>          Enable extra features, currently only easter eggs
-  <b>--enable-nanorc</b>         Enable use of .nanorc files
-  <b>--enable-color</b>          Enable color and syntax highlighting
-  <b>--enable-multibuffer</b>    Enable having multiple file buffers open
-  <b>--enable-all</b>            Enable all of the above features
-  <b>--disable-wrapping-as-root</b>
-                          Disable text wrapping by default when the user is
-                          root</pre></blockquote>
+  <b>--disable-histories</b>     Disable the saving of search strings and cursor positions
+  <b>--disable-justify</b>       Disable justify/unjustify functions
+  <b>--disable-libmagic</b>      Disable the use of libmagic for determining a file's syntax
+  <b>--disable-mouse</b>         Disable mouse support
+  <b>--disable-multibuffer</b>   Disable having multiple file buffers open
+  <b>--disable-nanorc</b>        Disable the use of .nanorc files
+  <b>--disable-operatingdir</b>  Disable the setting of an operating directory
+  <b>--disable-speller</b>       Disable spell checker functions
+  <b>--disable-tabcomp</b>       Disable tab completion functions
+  <b>--disable-wrapping</b>      Disable all hard-wrapping of text</pre>
+  <p>There's also the <b>--enable-tiny</b> option which disables everything above, as well as some larger chunks of the program (like the marker code that you use with Control-^ to select text). Also, if you know you aren't going to be using other languages you can use <b>--disable-nls</b> to disable internationalization and save a few K to a few dozen K depending on if you have locale support on your system. And finally there's always good old <b>strip</b> to strip all debugging code and code that exists in libraries on your system.</p>
+  <p>With <b>--disable-wrapping-as-root</b> you can disable any hard-wrapping by default when the user is root, useful to prevent accidentally changing long lines in system configuration files.</p>
+</blockquote>
 <h2><a name="3.7"></a>3.7. Tell me more about this multibuffer stuff!</h2>
-<blockquote><p>To use multiple file buffers, you must be using nano 1.1.0 or newer, and you must have configured nano with <b>--enable-multibuffer</b> (use nano -V to check). Then when you want to enable inserting a file into its own buffer instead of into the current file, just hit <b>Meta-F</b>, then insert the file as normal with <b>^R</b>. If you always want files to be loaded into their own buffers, use the <b>--multibuffer</b> or <b>-F</b> flag when you invoke nano.</p>
+<blockquote><p>To use multiple file buffers, you must be using nano 1.1.0 or newer, and you must not have configured it with <b>--disable-multibuffer</b> nor with <b>--enable-tiny</b> (use <b>nano -V</b> to check the compilation options). Then when you want to insert a file into its own buffer instead of into the current file, just hit <b>Meta-F</b>, then insert the file as normal with <b>^R</b>. If you always want files to be loaded into their own buffers, use the <b>--multibuffer</b> or <b>-F</b> flag when you invoke nano.</p>
   <p>You can move between the buffers you have open with the <b>Meta-&lt;</b> and <b>Meta-&gt;</b> keys, or more easily with <b>Meta-,</b> and <b>Meta-.</b> (clear as mud, right? =-). When you have more than one file buffer open, the ^X shortcut will say &quot;Close&quot;, instead of the normal &quot;Exit&quot; when only one buffer is open.</p></blockquote>
 <h2><a name="3.8"></a>3.8. Tell me more about this verbatim input stuff!</h2>
-<blockquote><p>To use verbatim input, you must be using nano 1.3.1 or newer. When you want to insert a literal character into the file you're editing, such as a control character that nano usually treats as a command, first press <b>Meta-V</b>. (If you're not at a prompt, you'll get the message &quot;Verbatim Input&quot;.) Then press the key(s) that generate the character you want.</p>
-  <p>Alternatively, if you've enabled Unicode support (see section <a href="#5.3">5.3</a>), you can press <b>Meta-V</b> and then type a six-digit hexadecimal code from 000000 to 10FFFF (case-insensitive), and the character with the corresponding value will be inserted instead. The prompt will change to &quot;Unicode Input&quot; when you do this.</p></blockquote>
-<h2><a name="3.9"></a>3.9. How do I make a .nanorc file that nano will read when I start it?</h2>
-<blockquote><p>It's not hard at all! But, your version of nano must have been compiled with <b>--enable-nanorc</b>, and again must be version 1.1.12 or newer (use nano -V to check your version and compiled features). Then simply copy the <b>nanorc.sample</b> that came with the nano source or your nano package (most likely in /usr/doc/nano) to .nanorc in your home directory. If you didn't get one, the syntax is simple. Flags are turned on and off by using the word <b>set</b> and the getopt_long flag for the feature, for example &quot;set nowrap&quot; or &quot;set suspend&quot;.</p></blockquote>
+<blockquote><p>To use verbatim input, you must be using nano 1.3.1 or newer. When you want to insert a literal character into the file you're editing, such as a control character that nano usually treats as a command, first press <b>Meta-V</b> (if you're not at a prompt, you'll get the message &quot;Verbatim Input&quot;), then press the key(s) that generate the character you want.</p>
+  <p>Alternatively, if you've enabled Unicode support (see section <a href="#5.3">5.3</a>), you can press <b>Meta-V</b> and then type a six-digit hexadecimal code (from 000000 to 10FFFF, case-insensitive), and the character with the corresponding value will be inserted instead. The prompt will change to &quot;Unicode Input&quot; when you do this.</p></blockquote>
+<h2><a name="3.9a"></a>3.9a. How do I make a .nanorc file that nano will read when I start it?</h2>
+<blockquote><p>It's not hard at all! But, your version of nano must <b>not</b> have been compiled with <b>--disable-nanorc</b>, and must be version 1.1.12 or newer (use nano -V to check your version and compiled features). Then simply copy the <b>nanorc.sample</b> that came with the nano source or your nano package (most likely in /usr/doc/nano) to .nanorc in your home directory. If you didn't get one, the syntax is simple. Flags are turned on and off by using the words <b>set</b> and <b>unset</b> plus the long option name for the feature. For example, &quot;set nowrap&quot; or &quot;set smarthome&quot;.</p></blockquote>
+<h2><a name="3.9b"></a>3.9b. How about in Win32?</h2>
+<blockquote><p>If you're using the official nano .zip file and have extracted all the files, you should take the file nano.rc and place it somewhere on your Win32 system (for example, if you have write permission to do so, at the top of C:\).  Then you must create an Environment variable called HOME which points to the directory where you put nano.rc.  In Windows XP, you can get to Environment variables by right-clicking "My Computer" either on the desktop or in the Start Menu, and selecting Properties.  This should bring up the System Properties panel.  Then click the Advanced Tab, and there should be a button called Environment Variables.  Click that to bring up the Environment Variables section. Now, under User Variables you should be able to click the New button, and make a new Variables Name called HOME, with the Variable Value of whatever path you copied nano.rc into (just the directory name; don't add nano.rc onto the end).</p>
+<p>We're still working on documentation for enabling syntax highlighting on Win32; please bear with us.</p>
+<p>Note that the nano.rc file must remain Unix-formatted in order for nano to understand it.  In other words, you should probably use only nano to edit its config file.  Other programs like Wordpad and Notepad will convert the file to DOS format when saving, and the latter does not even properly read Unix-formatted files to begin with.</p></blockquote>
 <hr width="100%">
 <h1><a name="4"></a>4. Running</h1>
 <h2><a name="4.1"></a>4.1. How do I open a file with a name beginning with '+' from the command line?</h2>
-<blockquote><p>If a command line option that begins with '+' is followed by another option, the former is always treated as a starting line number and the latter is always treated as a filename. If a command line option that begins with '+' isn't followed by another option, it's always treated as a filename. Examples:</p>
+<blockquote><p>If a command-line option that begins with '+' is followed by another option, the former is always treated as a starting line and column number, and the latter is always treated as a filename. If a command-line option that begins with '+' isn't followed by another option, it's always treated as a filename. Examples:</p>
   <p>To open '+filename.txt' starting on line 1: <b>nano +filename.txt</b><br>
   To open '+filename.txt' starting on line 10: <b>nano +10 +filename.txt</b><br>
-  To open '+filename.txt' starting on line 1 and 'filename.txt' starting on line 10 (if nano has been compiled with multibuffer support): <b>nano +1 +filename.txt +20 filename.txt</b></p></blockquote>
+  To open '+filename.txt' starting on line 1, column 20: <b>nano +,20 +filename.txt</b><br>
+  To open '+filename.txt' starting on line 10, column 20: <b>nano +10,20 +filename.txt</b><br>
+  To open '+filename.txt' starting on line 1 and 'filename.txt' starting on line 40 (if nano has been compiled with multibuffer support): <b>nano +1 +filename.txt +40 filename.txt</b></p></blockquote>
 <h2><a name="4.2"></a>4.2. Ack! My Backspace/Delete/Enter/Meta/double bucky key doesn't seem to work! What can I do?</h2>
 <blockquote><p>Try setting your $TERM variable to 'vt100'. nano doesn't yet support every term entry under the sun.</p>
   <p>Bourne shell users (bash and sh): <b>export TERM=vt100</b><br>
   C Shell users (tcsh and csh): <b>setenv TERM vt100</b></p></blockquote>
 <h2><a name="4.3"></a>4.3. Ack! My numeric keypad's keys don't work properly when NumLock is off! What can I do?</h2>
-<blockquote><p>You can use the <b>-K</b> or <b>--rebindkeypad</b> options on the command line, or add the line <b>set rebindkeypad</b> to your .nanorc. However, nano's mouse support won't work properly if you do any of these things.</p></blockquote>
+<blockquote><p>You can use the <b>-K</b> or <b>--rebindkeypad</b> option on the command line, or add the line <b>set rebindkeypad</b> to your .nanorc. However, nano's mouse support won't work properly if you do any of these things.</p></blockquote>
 <h2><a name="4.4"></a>4.4. Ack! When I hold down a Meta key combination for a while, the character of the held key gets inserted now and then. What gives?</h2>
 <blockquote><p>This is a bug in the terminal, not in nano. When a key is repeating faster than nano can process it, the keyboard buffer becomes full and starts dropping incoming keystrokes. Unfortunately, it doesn't just drop whole keystrokes; it can also drop parts of multibyte key combinations, resulting in nano's receiving a wrong key.</p></blockquote>
 <h2><a name="4.5"></a>4.5. How do I type the F13-F16 keys shown in the help browser? My keyboard only has F1-F12!</h2>
 <blockquote><p>It depends on the terminal type you're using. On some terminals, such as the FreeBSD console, xterm, konsole, and gnome-terminal, Shift-F1 to Shift-F4 will generate F13 to F16. On other terminals, such as the Linux console, rxvt, and Eterm, Shift-F3 to Shift-F6 will generate F13 to F16.</p></blockquote>
 <h2><a name="4.6"></a>4.6. nano crashes when I type &lt;insert keystroke here&gt;!</h2>
-<blockquote><p>If you aren't trying some bizarre keystroke combination with some bizarre $TERM entry, chances are you have found a bug. You are welcome to submit it to the <a href="mailto:nano-devel@gnu.org">nano-devel</a> list or to <a href="mailto:nano@nano-editor.org">nano@nano-editor.org</a>.</p></blockquote>
+<blockquote><p>If you aren't trying some bizarre keystroke combination with some bizarre $TERM entry, chances are you have found a bug. You are welcome to submit it to the <a href="mailto:nano-devel@gnu.org">nano-devel</a> list or in the <a href="https://savannah.gnu.org/bugs/?group=nano">bug tracker</a> on Savannah.</p></blockquote>
 <h2><a name="4.7"></a>4.7. nano crashes when I resize my window. How can I fix that?</h2>
-<blockquote><p>Older versions of nano had this problem, please upgrade to a newer version (at least 0.9.9 would be great, 0.9.12 is recommended).</p></blockquote>
+<blockquote><p>Older versions of nano had this problem, please upgrade to a newer version (at least 0.9.9, but 2.4.2 is recommended).</p></blockquote>
 <h2><a name="4.8"></a>4.8. [version 1.3.12 and later] I'm using glibc 2.2.3, and nano crashes when I use color support or do regular expression searches. How can I fix that?</h2>
 <blockquote><p>It's a bug in glibc 2.2.3. You should upgrade to at least glibc 2.2.4.</p></blockquote>
 <h2><a name="4.9"></a>4.9. [version 1.1.12 and earlier] Why does nano show ^\ in the shortcut list instead of ^J?</h2>
-<blockquote><p>The help (^G) and justify (^J) function were among the last to be written. To show the improvements that nano had over Pico (go to line # and replace), ^_ and ^\ were put on the shortcut list. Later, ^G came back in place of ^_ as it proved to be very valuable for new Unix users. If you use the <b>-p</b> option to nano (or hit Meta-P) you will get the same shortcuts at the bottom as Pico.</p></blockquote>
+<blockquote><p>The help (^G) and justify (^J) functions were among the last to be written. To show the improvements that nano had over Pico (go to line number, and replace), ^_ and ^\ were put on the shortcut list. Later, ^G came back in place of ^_ as it proved to be very valuable for new Unix users.</p></blockquote>
 <h2><a name="4.10a"></a>4.10a. [version 1.1.12 and earlier] When I type in a search string, the string I last searched for is already in front of my cursor! What happened?!</h2>
-<blockquote><p>In nano version 0.9.20, the default is to have a completely consistent user interface across all user input functions. This means that regardless of whether you're being asked for a filename to insert or write, or a string to search for, the previous value is already inserted before the cursor. If you prefer the old behavior, use the Pico emulation mode (-p or --pico) or just hit Meta-P while in nano (see the ^G help text for more details).</p></blockquote>
+<blockquote><p>Since nano version 0.9.20, the default was to have a completely consistent user interface across all user input functions. This means that regardless of whether you're being asked for a filename to insert or write, or a string to search for, the previous value is already inserted before the cursor.</p></blockquote>
 <h2><a name="4.10b"></a>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?</h2>
 <blockquote><p>It was decided that consistency was nice, but people are used to Pico's inconsistent behavior. Also, in version 1.1.99pre1, search and replace history was introduced. If you wish to edit your previous search/replace entry (or any previous entry), you can do so by hitting the up arrow to cycle through your history. This method allows the best of both worlds: You don't need to erase the previous string if you want to enter a new one, but you can with one keystroke recall previous entries for editing. Therefore there is now no "Pico mode", nano is and has always been a Pico <b>clone</b>, and clones by default should be compatible.</p></blockquote>
 <h2><a name="4.11"></a>4.11. How do I make nano my default editor (in Pine, mutt, etc.)?</h2>
@@ -202,7 +200,7 @@
   <p><b>export EDITOR=/usr/local/bin/nano</b></p>
   <p>or, if you use tcsh, put this in your <b>.cshrc</b> file:</p>
   <p><b>setenv EDITOR /usr/local/bin/nano</b></p>
-  <p>Change /usr/local/bin/nano to wherever nano is installed on your system. Type &quot;which nano&quot; to find out. This will not take effect until the next time you login. So log out and back in again.</p>
+  <p>Change /usr/local/bin/nano to wherever nano is installed on your system. Type &quot;which nano&quot; to find out. This will not take effect until the next time you log in. So log out and back in again.</p>
   <p>Then, on top of that, if you use Pine, you must go into setup (type <b>S</b> at the main menu), and then configure (type <b>C</b>). Hit Enter on the lines that say:</p>
   <p><b>[ ] enable-alternate-editor-cmd</b><br>
   <b>[ ] enable-alternate-editor-implicitly</b></p>
@@ -211,50 +209,69 @@
   <p><b>my_hdr X-Composer: nano x.y.z</b></p>
   <p>Again, replace x.y.z with the version of nano you use.</p></blockquote>
 <h2><a name="4.12"></a>4.12. I've compiled nano with color support, but I don't see any color when I run it!</h2>
-<blockquote><p>If you want nano to actually use color, you have to specify the color configurations you want it to use in your .nanorc. Some example configurations are in the <b>nanorc.sample</b> that comes with the nano source or your nano package. See Section <a href="#3.9">3.9</a>.</p></blockquote>
+<blockquote><p>If you want nano to actually use color, you have to specify the color configurations you want it to use in your .nanorc. Several example configurations are in the <b>doc/syntax</b> subdirectory of the nano source, which are normally installed to <b>/usr/local/share/nano</b>. To enable all of them, uncomment the line <b># include "/usr/local/share/nano/*.nanorc"</b> in your nanorc. See also section <a href="#3.9a">3.9a</a>.</p></blockquote>
 <h2><a name="4.13"></a>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?</h2>
 <blockquote><p>Try holding down the Shift key and selecting or pasting the text as you normally would.</p></blockquote>
+<h2><a name="4.14"></a>4.14. When I paste text into a document, each line gets indented further than the last. Why does nano do this, and how can I avoid it?</h2>
+<blockquote><p>You have the autoindent feature turned on. Hit Meta-I to turn it off, paste your text, and then hit Meta-I again to turn it back on.</p></blockquote>
+<h2><a name="4.15"></a>4.15. On startup I get a message that says "Detected a legacy nano history file".  Now older nano versions can't find my search history!</h2>
+<blockquote><p>In nano 2.3.0, cursor-position history was introduced, and both history files now reside under a .nano directory in your home.  nano was trying to move this file into the new location so it could continue to use it.  This means that if you try and use an earlier version of nano, it will be unable to see your current search history.  To fix this, run the following commands:<br>
+  <p><b>mv ~/.nano/search_history ~/.nano_history</b><br>
+  <b>ln -sf ~/.nano_history ~/.nano/search_history</b></p>
+</p></blockquote>
 <hr width="100%">
 <h1><a name="5"></a>5. Internationalization</h1>
 <h2><a name="5.1"></a>5.1. There's no translation for my language!</h2>
-<blockquote><p>On June of 2001, GNU nano entered the <a href="http://www.iro.umontreal.ca/translation/HTML/">Free Translation Project</a> and since then, translations should be managed from there.</p>
-  <p>If there isn't a translation for your language, you could ask <a href="http://www.iro.umontreal.ca/translation/HTML/teams.html">your language team</a> to translate nano, or better still, join your team and do it yourself. Joining a team is easy. You just need to ask the <a href="mailto:translation@iro.umontreal.ca">TP coordinator</a> to add you to your team, and send a <a href="http://www.iro.umontreal.ca/translation/HTML/disclaim.html">translation disclaimer to the FSF</a> (this is necessary as nano is an official GNU package, but it does <b>not</b> mean that you transfer the rights of your work to the FSF, it's just so the FSF can legally manage them).</p>
-  <p>In any case, translating nano is very easy. Just grab the <b>nano.pot</b> file from the latest and greatest nano distribution (it's in the <b>po/</b> directory) and translate each line into your native language on the <b>msgstr</b> line. When you're done, you should send it to the TP's central po repository.</p></blockquote>
+<blockquote><p>On June of 2001, GNU nano entered the <a href="http://translationproject.org/html/welcome.html">Translation Project</a> and since then, translations should be managed from there.</p>
+  <p>If there isn't a translation for your language, you could ask <a href="http://translationproject.org/team/">your language team</a> to translate nano, or better still, join that team and do it yourself. Joining a team is easy. You just need to ask the team leader to add you, and then send a <a href="http://translationproject.org/disclaim.txt">translation disclaimer to the FSF</a> (this is necessary as nano is an official GNU package, but it does <b>not</b> mean that you transfer the rights of your work to the FSF, it's just so the FSF can legally manage them).</p>
+  <p>In any case, translating nano is very easy. Just grab the latest <b>nano.pot</b> file listed on <a href="http://translationproject.org/domain/nano.html">nano's page</a> at the TP, and translate each <b>msgid</b> line into your native language on the <b>msgstr</b> line. When you're done, you should send it to the TP's central po repository.</p></blockquote>
 <h2><a name="5.2"></a>5.2. I don't like the translation for &lt;x&gt; in my language. How can I fix it?</h2>
-<blockquote><p>The best way would probably be to e-mail the person listed in the <code>Last-Translator:</code> field in the <b>&lt;your_language&gt;.po</b> file with your suggested corrections and they can make the changes reach the nano-devel list.</p></blockquote>
+<blockquote><p>The best way would probably be to send an e-mail to the team's mailing listed mentione in the <code>Language-Team:</code> field in the <b>&lt;your_language&gt;.po</b> file with your suggested corrections, and then they can make the changes reach the nano-devel list.</p></blockquote>
 <h2><a name="5.3"></a>5.3. What is the status of Unicode support?</h2>
 <blockquote><p>In version 1.3.12 or later, Unicode should be usable. With your terminal, locale (LC_ALL and similar environment variables), and encoding configured to properly support UTF-8, you should be able to enter and save Unicode text.</p></blockquote>
 <hr width="100%">
 <h1><a name="6"></a>6. Advocacy and Licensing</h1>
 <h2><a name="6.1"></a>6.1. Why should I use nano instead of Pico?</h2>
-<blockquote><p>There are many reasons to use nano instead of Pico, a more complete list can be found at the <a href="http://www.nano-editor.org/">nano homepage</a>.</p></blockquote>
+<blockquote><p>There are many reasons to use nano instead of Pico. A more complete list can be found at the <a href="http://www.nano-editor.org/">nano homepage</a>.</p></blockquote>
 <h2><a name="6.2"></a>6.2. Why should I use Pico instead of nano?</h2>
-<blockquote><p>Again, check out the <a href="http://www.nano-editor.org/">nano homepage</a> for a good summary of reasons. It really is a matter of personal preference as to which editor you should use. If you're the type of person who likes using the original version of a program, then Pico is the editor for you. If you're looking for a few more features and a 'better' license as far as adding your own changes (sacrificing mailer integration with Pine), nano is the way to go.</p></blockquote>
-<h2><a name="6.3"></a>6.3. What is so bad about the Pine license?</h2>
-<blockquote><p>The U of W license for Pine and Pico is not considered truly Free Software according to both the Free Software Foundation and the <a href="http://www.debian.org/social_contract#guidelines">Debian Free Software Guidelines</a>. The main problem regards the limitations on distributing derived works: according to UW, you can distribute their software, and you can modify it, but you can not do both, i.e. distribute modified binaries.</p></blockquote>
-<h2><a name="6.4"></a>6.4. Okay, well what mail program should I use then?</h2>
-<blockquote><p>If you are looking to use a Free Software program similar to Pine and emacs is not your thing, you should definitely take a look at <a href="http://www.mutt.org/">mutt</a>. It is a full-screen, console based mail program that actually has a lot more flexibility than Pine, but has a keymap included in the distribution that allows you to use the same keystrokes as Pine would to send and receive mail. It's also licensed under the GPL.</p></blockquote>
-<h2><a name="6.5"></a>6.5. Why doesn't UW simply change their license?</h2>
-<blockquote><p>You're really not asking the right person here. I (Chris) waited a long time to see if UW would change their license because of the amount of high quality software being released and developed under the GPL without being taken advantage of by malicious corporate entities or other baddies, but no such luck so far.</p></blockquote>
-<h2><a name="6.6"></a>6.6. What if tomorrow UW changes the license to be truly Free Software?</h2>
-<blockquote><p>Honestly nothing would make me happier than to see that happen. nano would continue to be developed independently until such time as Pico had all the features nano did or the projects merged. That just does not seem very likely given that there has been no sign of any changes in the past few years in a positive direction.</p></blockquote>
+<blockquote><p>Again, check out the <a href="http://www.nano-editor.org/">nano homepage</a> for a good summary of reasons. It really is a matter of personal preference as to which editor you should use. If you're the type of person who likes using the original version of a program, then Pico is the editor for you. If you don't mind sacrificing mailer integration with Pine, and are looking for a few more features, as well as a 'better' license in terms of adding your own changes, nano is the way to go.</p><p>Note that the last of these no longer applies to the new version of Pine, <a href="http://www.washington.edu/alpine/">Alpine</a>, which is under the Apache License, version 2.0.</p></blockquote>
+<h2><a name="6.3"></a>6.3. What is so bad about the older Pine license?</h2>
+<blockquote><p>The U of W license for older versions of Pine and Pico is not considered truly Free Software according to both the Free Software Foundation and the <a href="http://www.debian.org/social_contract#guidelines">Debian Free Software Guidelines</a>. The main problem regards the limitations on distributing derived works: according to UW, you can distribute their software, and you can modify it, but you can not do both, i.e. distribute modified binaries.</p></blockquote>
+<h2><a name="6.4"></a>6.4. Okay, well, what mail program should I use then?</h2>
+<blockquote><p>If you are looking to use a Free Software program similar to Pine, and Emacs is not your thing, you should definitely take a look at <a href="http://www.mutt.org/">mutt</a>. It is a full-screen, console based mail program that actually has a lot more flexibility than Pine, but has a keymap included in the distribution that allows you to use the same keystrokes as Pine would to send and receive mail. It's also under the GNU General Public License, version 2.0.<P>
+Of course, due to the license change you can now use the <A HREF="http://www.washington.edu/alpine/">Alpine distribution</A> of PINE as it is now considered Free Software, but you would be sacrificing many of nano's features to do so.</p></blockquote>
 <hr width="100%">
 <h1><a name="7"></a>7. Miscellaneous</h1>
 <h2><a name="7.1"></a>7.1. nano-related mailing lists.</h2>
-<blockquote><p>There are three mailing lists for nano hosted at <a href="http://savannah.gnu.org/">Savannah</a>, info-nano, help-nano and nano-devel. info-nano is a very low traffic list where new versions of nano are announced (surprise!). help-nano is for getting help with the editor without needing to hear all of the development issues surrounding it. nano-devel is a normally low, sometimes high traffic list for discussing the present and future development of nano. Here are links to where you can sign up for a given list:</p>
+<blockquote><p>There are three mailing lists for nano hosted at <a href="http://savannah.gnu.org/">Savannah</a>: info-nano, help-nano and nano-devel. info-nano is a very low traffic list where new versions of nano are announced (surprise!). help-nano is for getting help with the editor without needing to hear all of the development issues surrounding it. nano-devel is a normally low, sometimes high traffic list for discussing the present and future development of nano. Here are links to where you can sign up for a given list:</p>
   <p>info-nano - <a href="http://mail.gnu.org/mailman/listinfo/info-nano/">http://mail.gnu.org/mailman/listinfo/info-nano/</a><br>
   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/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>
+<blockquote><p>That's fine. Send it <a href="mailto:nano-devel@gnu.org">our way</a>! Better yet, fix a <a href="https://savannah.gnu.org/bugs/?group=nano">bug</a> in the program or implement a <a href="http://www.nano-editor.org/dist/v2.3/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 bug report or patch?</h2>
+<blockquote>
+<p>The best place to submit bugs is to the <a href="https://savannah.gnu.org/bugs/?group=nano">Savannah bug tracker</a> as you can check whether the bug you are submitting has already been submitted.
+<p>Please submit patches for nano via the <a href="https://savannah.gnu.org/patch/?group=nano">Savannah project's patch manager</a> for the nano project.</p></blockquote>
 <h2><a name="7.4"></a>7.4. How do I join the development team?</h2>
-<blockquote><p>The easiest way is to consistently send in good patches that add some needed functionality, fix a bug or two and/or make the program more optimized/efficient. Then ask nicely and you will probably be added to the Savannah development list and be given CVS write access after awhile. There is a lot of responsibility that goes along with being a team member, so don't think it's just something to add to your resume.</p></blockquote>
-<h2><a name="7.5"></a>7.5. Can I have CVS write access?</h2>
+<blockquote><p>The easiest way is to consistently send in good patches that add some needed functionality, fix a bug or two, and/or make the program more optimized/efficient. Then ask nicely and you will probably be added to the Savannah development list and be given SVN write access after a while. There is a lot of responsibility that goes along with being a team member, so don't think it's just something to add to your resume.</p></blockquote>
+<h2><a name="7.5"></a>7.5. Can I have write access to the subversion tree?</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/11/25 - Add miscellaneous wording and capitalization fixes. (DLR)<br>
+<blockquote><p>
+2015/07/18 - More small fixes and updates. (Benno)<br>
+2014/04/24 - A bunch of small fixes and updates. (Benno)<br>
+2009/11/30 - Update various bits for nano 2.2.x. (DLR)<br>
+2009/11/18 - Typo fix. (j.mader@gmail.com)<br>
+2008/03/16 - Update docs to refer to subversion instead of CVS, add more words about Alpine, and refer to Savannah for bugs and patches. (chrisa)<br>
+2007/12/21 - Update maintainer information. (DLR)<br>
+2007/12/09 - Add minor punctuation and wording fixes, and update various sections to account for Alpine. (DLR)<br>
+2007/08/26 - Update links to the Free Translation Project. (DLR)<br>
+2007/07/29 - Update RPM links for nano 2.0.x. (DLR)<br>
+2007/04/18 - Add a new section 4.14 to explain how autoindent affects pasted text. (John M. Gabriele, minor tweaks by DLR)<br>
+2007/04/04 - Update email address. (DLR)<br>
+2007/01/01 - Update section 4.1 to describe how to open files with names beginning with '+' at specified columns as well as lines. (DLR)<br>
+2006/11/25 - Add miscellaneous wording and capitalization fixes. (DLR)<br>
 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>

doc/man/.gitignore

@@ -1,5 +1,3 @@
-Makefile
-Makefile.in
 nano.1.html
 nanorc.5.html
 rnano.1.html

doc/man/Makefile.am

@@ -1,18 +1,28 @@
-if USE_NLS
-SUBDIRS = fr
-else
 SUBDIRS =
+BUILT_SOURCES =
+
+if USE_NLS
+SUBDIRS += fr
 endif
 
-man_MANS = nano.1 nanorc.5 rnano.1
+dist_man_MANS = nano.1 rnano.1
+html_pages = nano.1.html rnano.1.html
 
-BUILT_SOURCES = nano.1.html nanorc.5.html rnano.1.html
+if USE_NANORC
+dist_man_MANS += nanorc.5
+html_pages += nanorc.5.html
+endif
 
 nano.1.html: nano.1
-	cat $< | groff -t -mandoc -Thtml > $@
+	groff -t -mandoc -Thtml < $? > $@
 nanorc.5.html: nanorc.5
-	cat $< | groff -t -mandoc -Thtml > $@
+	groff -t -mandoc -Thtml < $? > $@
 rnano.1.html: rnano.1
-	cat $< | groff -t -mandoc -Thtml > $@
+	groff -t -mandoc -Thtml < $? > $@
 
-EXTRA_DIST = $(man_MANS) $(BUILT_SOURCES)
+if GROFF_HTML
+BUILT_SOURCES += $(html_pages)
+dist_html_DATA = $(html_pages)
+endif
+
+EXTRA_DIST = $(BUILT_SOURCES)

doc/man/fr/.cvsignore

@@ -1,5 +0,0 @@
-Makefile
-Makefile.in
-nano.1.html
-nanorc.5.html
-rnano.1.html

doc/man/fr/Makefile.am

@@ -1,14 +1,26 @@
-man_MANS = nano.1 nanorc.5 rnano.1
-
 mandir = @mandir@/fr
+htmldir = @htmldir@/fr
 
-BUILT_SOURCES = nano.1.html nanorc.5.html rnano.1.html
+BUILT_SOURCES =
+
+dist_man_MANS = nano.1 rnano.1
+html_pages = nano.1.html rnano.1.html
+
+if USE_NANORC
+dist_man_MANS += nanorc.5
+html_pages += nanorc.5.html
+endif
 
 nano.1.html: nano.1
-	cat $< | groff -t -mandoc -Thtml > $@
+	groff -t -mandoc -Thtml < $? > $@
 nanorc.5.html: nanorc.5
-	cat $< | groff -t -mandoc -Thtml > $@
+	groff -t -mandoc -Thtml < $? > $@
 rnano.1.html: rnano.1
-	cat $< | groff -t -mandoc -Thtml > $@
+	groff -t -mandoc -Thtml < $? > $@
 
-EXTRA_DIST = $(man_MANS) $(BUILT_SOURCES)
+if GROFF_HTML
+BUILT_SOURCES += $(html_pages)
+dist_html_DATA = $(html_pages)
+endif
+
+EXTRA_DIST = $(BUILT_SOURCES)

doc/man/fr/nano.1

@@ -1,87 +1,120 @@
 .\" Hey, EMACS: -*- nroff -*-
-.\" nano.1 is copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005,
-.\" 2006 by Chris Allegretta <chrisa@asty.org>
+.\" Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007
+.\" Free Software Foundation, Inc.
 .\"
-.\" Adaptation française (c) 2003-2006 par
-.\" Jean-Philippe Guérard <jean-philippe.guerard@tigreraye.org>.
+.\" Le travail d'adaptation française de cette page de manuel a été
+.\" réalisé par Jean-Philippe Guérard, en 2003, 2004, 2005, 2006 et 2007.
+.\" Ce travail d'adaptation est dans le domaine public. Attention, la
+.\" page traduite reste soumise au droit d'auteur de ses auteurs
+.\" originaux.
 .\"
-.\" This is free documentation, see the latest version of the GNU
-.\" General Public License for copying conditions.  There is NO
-.\" warranty.
+.\" The French translation of this document is a public domain work of
+.\" Jean-Philippe Guérard. This translation work was made in 2003, 2004,
+.\" 2005, 2006 and 2007. The translated man page in itself is still
+.\" subject to the copyright of its original authors.
 .\"
-.\" Ce document est libre. Reportez-vous à la dernière version de la
-.\" licence publique générale GNU (GNU GPL) pour connaître ses
-.\" conditions d'utilisation. Ce document est distribué sans
-.\" AUCUNE garantie.
+.\" This document is dual-licensed.  You may distribute and/or modify it
+.\" under the terms of either of the following licenses:
+.\"
+.\" * The GNU General Public License, as published by the Free Software
+.\"   Foundation, version 3 or (at your option) any later version.  You
+.\"   should have received a copy of the GNU General Public License
+.\"   along with this program.  If not, see
+.\"   <http://www.gnu.org/licenses/>.
+.\"
+.\" * The GNU Free Documentation License, as published by the Free
+.\"   Software Foundation, version 1.2 or (at your option) any later
+.\"   version, with no Invariant Sections, no Front-Cover Texts, and no
+.\"   Back-Cover Texts.  You should have received a copy of the GNU Free
+.\"   Documentation License along with this program.  If not, see
+.\"   <http://www.gnu.org/licenses/>.
+.\"
+.\" Ce document est publié sous une double licence. Vous pouvez
+.\" le distribuer et le modifier selon les termes de l'une des deux
+.\" licences ci-dessous :
+.\"
+.\" * La Licence publique générale GNU (GNU GPL) version 3 ou, à
+.\"   votre choix, supérieure, telle que publiée par la Free 
+.\"   Software Foundation. Vous devriez avoir reçu une copie de la 
+.\"   Licence publique générale GNU avec ce programme. Si ce n'est pas 
+.\"   le cas, consultez <http://www.gnu.org/licenses/>.
+.\"
+.\" * La Licence de documentation libre GNU (GNU FDL), version 1.2 ou,
+.\"   à votre choix, supérieure, telle que publiée par la Free
+.\"   Software Foundation, sans section invariante, ni texte de
+.\"   première ou de quatrième de couverture. Vous devriez avoir reçu 
+.\"   une copie de la Licence de documentation libre GNU avec ce 
+.\"   programme. Si ce n'est pas le cas, consultez 
+.\"   <http://www.gnu.org/licenses/>.
 .\"
 .\" $Id$
-.TH NANO 1 "version 2.0.0" "28\ octobre\ 2006"
+.TH NANO 1 "version 2.0.0" "29\ novembre\ 2007"
 .\" Please adjust this date whenever revising the manpage.
-.\" Merci de modifier ces dates à chaque mise à jour de cette page.
+.\" Merci de modifier ces dates à chaque mise à jour de cette page.
 .\"
 
 .SH NOM
-nano \- NAno un NOuvel éditeur, un clone libre et amélioré de Pico
+nano \- NAno un NOuvel éditeur, un clone libre et amélioré de Pico
 
 .SH SYNOPSIS
 .B nano
-.I [OPTIONS]\ [[\+LIGNE,COLONNE]\ FICHIER]...
+.I [OPTIONS]\ [[+LIGNE,COLONNE]\ FICHIER]...
 .br
 
 .SH DESCRIPTION
-Cette page de manuel décrit brièvement la commande \fBnano\fR.
+Cette page de manuel décrit brièvement la commande \fBnano\fR.
 .PP
 .\" TeX users may be more comfortable with the \fB<whatever>\fP and
 .\" \fI<whatever>\fP escape sequences to invoke bold face and italics,
 .\" respectively.
-\fBnano\fR est un éditeur petit, sympathique et libre, qui vise à remplacer
-Pico, l'éditeur par défaut du logiciel non libre Pine. \fBnano\fR ne se
+\fBnano\fR est un éditeur petit, sympathique et libre, qui vise à remplacer
+Pico, l'éditeur par défaut du logiciel non libre Pine. \fBnano\fR ne se
 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 à 
-une ligne et à une colonne précise.
+é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 à 
+une ligne et à une colonne précise.
 
 .SH OPTIONS
 .TP
-.B \+\fILIGNE\fP,\fICOLONNE\fP
-Démarre avec le curseur positionné à la colonne \fICOLONNE\fP de 
-la ligne \fILIGNE\fR (l'un des deux, au moins, devant être spécifié) au 
-lieu de démarrer à la colonne\ 1, ligne\ 1.
+.B +\fILIGNE\fP,\fICOLONNE\fP
+Démarre avec le curseur positionné à la colonne \fICOLONNE\fP de 
+la ligne \fILIGNE\fR (l'un des deux, au moins, devant être spécifié) au 
+lieu de démarrer à la colonne\ 1, ligne\ 1.
 .TP
 .B \-?
-Identique à \fB-h (\-\-help)\fP.
+Identique à \fB\-h (\-\-help)\fP.
 .TP
 .B \-A (\-\-smarthome)
-Rend plus malin le fonctionnement de la touche «\ Début\ ». Lorsque l'on
-appuie sur cette touche à n'importe quel endroit excepté au tout début
-du texte d'une ligne (i.\ e. au premier caractère non blanc), le curseur
-se positionnera au début du texte de la ligne (qu'il soit en avant ou en
-arrière). Si le curseur est déjà là, il se placera au vrai début de la
+Rend plus malin le fonctionnement de la touche «\ Début\ ». Lorsque l'on
+appuie sur cette touche à n'importe quel endroit excepté au tout début
+du texte d'une ligne (i.\ e. au premier caractère non blanc), le curseur
+se positionnera au début du texte de la ligne (qu'il soit en avant ou en
+arrière). Si le curseur est déjà là, il se placera au vrai début de la
 ligne.
 .TP
 .B \-B (\-\-backup)
-Lors de l'écriture d'un fichier, crée une copie de sécurité de la
-version précédente, en ajoutant un tilde (~) au nom du fichier.
+Lors de l'écriture d'un fichier, crée une copie de sécurité de la
+version précédente, en ajoutant un tilde (~) au nom du fichier.
 .TP
 .B \-D (\-\-boldtext)
-Utilise des caractères gras à la place de la vidéo inverse.
+Utilise des caractères gras à la place de la vidéo inverse.
 .TP
-.B \-C \fIrépertoire\fP (\-\-backupdir=\fIrépertoire\fP)
-Définit le répertoire utilisé par \fBnano\fP pour enregistrer les copies 
-de sécurité uniques si celles-ci sont activées.
+.B \-C \fIrépertoire\fP (\-\-backupdir=\fIrépertoire\fP)
+Définit le répertoire utilisé par \fBnano\fP pour enregistrer les copies 
+de sécurité uniques si celles-ci sont activées.
 .TP
 .B \-E (\-\-tabstospaces)
 Convertit les tabulations clavier en espaces.
 .TP
 .B \-F (\-\-multibuffer)
-Active le mode multi-espace, autorisant l'édition simultanée de 
+Active le mode multi-espace, autorisant l'édition simultanée de 
 plusieurs fichiers, si ce mode est disponible.
 .TP
 .B \-H (\-\-historylog)
-Enregistre les chaînes ayant fait l'objet d'une recherche ou d'un
+Enregistre les chaînes ayant fait l'objet d'une recherche ou d'un
 remplacement dans le fichier \fI~/.nano_history\fR afin de permettre leur
-réutilisation. Ceci n'est possible que si \fBnano\fR est configuré pour
+réutilisation. Ceci n'est possible que si \fBnano\fR est configuré pour
 utiliser les fichiers nanorc.
 .TP
 .B \-I (\-\-ignorercfiles)
@@ -89,63 +122,63 @@ Ne pas utiliser pas les fichiers \fISYSCONFDIR/nanorc\fR et
 \fI~/.nanorc\fR (si \fBnano\fR est capable de les utiliser).
 .TP
 .B \-K (\-\-rebindkeypad)
-Interprète les touches du pavé numérique afin qu'elles fonctionnent 
+Interprète les touches du pavé numérique afin qu'elles fonctionnent 
 toutes correctement. Vous ne devriez utiliser cette option que si ce 
 n'est pas le cas, car nano ne sera plus capable d'utiliser la souris 
-correctement lorsque cette option sera activée.
+correctement lorsque cette option sera activée.
 .TP
 .B \-L (\-\-nonewlines)
-Ne pas ajouter de passage à la ligne à la fin des fichiers.
+Ne pas ajouter de passage à la ligne à la fin des fichiers.
 .TP
 .B \-N (\-\-noconvert)
-Désactive la conversion automatique des fichiers depuis les formats Mac et
+Désactive la conversion automatique des fichiers depuis les formats Mac et
 DOS.
 .TP
 .B \-O (\-\-morespace)
-Utiliser la ligne blanche située sous la ligne de titre comme
-espace supplémentaire d'édition.
+Utiliser la ligne blanche située sous la ligne de titre comme
+espace supplémentaire d'édition.
 .TP
-.B \-Q \fIchaîne\fP (\-\-quotestr=\fIchaîne\fP)
-Définit le préfixe par défaut des citations. Nano utilise ce préfixe
-pour réaliser une justification correcte des citations. Si nano est
-capable d'utiliser des expressions rationnelles, le préfixe par défaut
+.B \-Q \fIchaîne\fP (\-\-quotestr=\fIchaîne\fP)
+Définit le préfixe par défaut des citations. Nano utilise ce préfixe
+pour réaliser une justification correcte des citations. Si nano est
+capable d'utiliser des expressions rationnelles, le préfixe par défaut
 sera "\fI^([\ \\t]*[#:>\\|}])+\fP", sinon, ce sera "\fI>\ \fP". Dans 
-l'expression rationnelle précédente, «\ \fI\\t\fP\ » représente une 
+l'expression rationnelle précédente, «\ \fI\\t\fP\ » représente une 
 tabulation.
 .TP
 .B \-R (\-\-restricted)
-Mode restreint\ : aucune lecture ou écriture de fichiers non indiqués 
+Mode restreint\ : aucune lecture ou écriture de fichiers non indiqués 
 sur la ligne de commande, pas de lecture des fichiers nanorc, 
-interdiction de suspendre, interdiction d'ajouter au début, à la fin, 
-de sauvegarder un fichier ayant déjà un nom sous un nom différent, 
-d'utiliser une copie de sécurité ou le correcteur orthographique. Cette 
-option peut aussi être activée en appelant \fBnano\fP sous un nom 
-commençant par «\ r\ » (par exemple «\ rnano\ »).
+interdiction de suspendre, interdiction d'ajouter au début, à la fin, 
+de sauvegarder un fichier ayant déjà un nom sous un nom différent, 
+d'utiliser une copie de sécurité ou le correcteur orthographique. Cette 
+option peut aussi être activée en appelant \fBnano\fP sous un nom 
+commençant par «\ r\ » (par exemple «\ rnano\ »).
 .TP
 .B \-S (\-\-smooth)
-Active le défilement progressif. Le texte défilera ligne-par-ligne au lieu
-de défiler morceau-par-morceau.
+Active le défilement progressif. Le texte défilera ligne-par-ligne au lieu
+de défiler morceau-par-morceau.
 .TP
 .B \-T \fInombre\fP (\-\-tabsize=\fInombre\fP)
-Définit la taille (largeur) des tabulations en nombre de colonnes. Le 
-nombre indiqué doit être strictement supérieur à 0. La valeur par défaut 
+Définit la taille (largeur) des tabulations en nombre de colonnes. Le 
+nombre indiqué doit être strictement supérieur à 0. La valeur par défaut 
 est de 8.
 .TP
 .B \-U (\-\-quickblank)
-Effacement rapide de la ligne d'état. Les messages affichés par la ligne 
-d'état disparaîtront après une frappe clavier au lieu de 25. Notez que
+Effacement rapide de la ligne d'état. Les messages affichés par la ligne 
+d'état disparaîtront après une frappe clavier au lieu de 25. Notez que
 l'option \fB-c\fP prend le pas sur cette option.
 .TP
 .B \-V (\-\-version)
-Affiche la version, puis s'arrête.
+Affiche la version, puis s'arrête.
 .TP
 .B \-W (\-\-wordbounds)
-Détection plus précise des limites de mots, obtenue en considérant les 
-caractères de ponctuation comme faisant partie des mots.
+Détection plus précise des limites de mots, obtenue en considérant les 
+caractères de ponctuation comme faisant partie des mots.
 .TP
-.B \-Y \fIchaîne\fP (\-\-syntax=\fIchaîne\fP)
+.B \-Y \fIchaîne\fP (\-\-syntax=\fIchaîne\fP)
 Indique quel mode de colorisation syntaxique adopter, parmi les modes
-définis dans le fichier \fI.nanorc\fR, si cette fonctionnalité est
+définis dans le fichier \fI.nanorc\fR, si cette fonctionnalité est
 disponible.
 .TP
 .B \-c (\-\-const)
@@ -153,111 +186,111 @@ Affiche en permanence la position du curseur. Notez que cette option
 prend le pas sur l'option \fB-U\fP.
 .TP
 .B \-d (\-\-rebinddelete)
-Interprète différemment la touche «\ Supprimer\ », afin que les touches 
-«\ Effacement arrière\ » et «\ Supprimer\ » fonctionnent correctement. 
-Vous ne devriez avoir besoin de cette option que si, sur votre système, 
-la touche «\ Effacement arrière\ » produit l'effet de la touche
-«\ Supprimer\ ».
+Interprète différemment la touche «\ Supprimer\ », afin que les touches 
+«\ Effacement arrière\ » et «\ Supprimer\ » fonctionnent correctement. 
+Vous ne devriez avoir besoin de cette option que si, sur votre système, 
+la touche «\ Effacement arrière\ » produit l'effet de la touche
+«\ Supprimer\ ».
 .TP
 .B \-h (\-\-help)
-Affiche un résumé des options de lancement de nano, puis s'arrête.
+Affiche un résumé des options de lancement de nano, puis s'arrête.
 .TP
 .B \-i (\-\-autoindent)
-Indentation automatique. Commence chaque nouvelle ligne au même niveau que
-la ligne précédente. Utile pour l'édition de code source.
+Indentation automatique. Commence chaque nouvelle ligne au même niveau que
+la ligne précédente. Utile pour l'édition de code source.
 .TP
 .B \-k (\-\-cut)
-Coupe le texte du curseur à la fin de la ligne, au lieu de couper la 
-ligne entière.
+Coupe le texte du curseur à la fin de la ligne, au lieu de couper la 
+ligne entière.
 .TP
 .B \-l (\-\-nofollow)
-Si le fichier édité est un lien symbolique, au lieu de le suivre, 
-remplace le lien par le nouveau fichier. Sans doute utile pour éditer 
+Si le fichier édité est un lien symbolique, au lieu de le suivre, 
+remplace le lien par le nouveau fichier. Sans doute utile pour éditer 
 les fichiers de \fI/tmp\fR, non\ ?
 .TP
 .B \-m (\-\-mouse)
 Active l'utilisation de la souris, si elle est disponible pour votre
-système. Lorsque celle-ci est activée, il est possible d'utiliser la 
+système. Lorsque celle-ci est activée, il est possible d'utiliser la 
 souris pour positionner le curseur, pour marquer le texte (avec un 
 double-clic) et pour lancer les fonctions correspondant aux raccourcis. 
 Il est possible d'utiliser la souris sous X\ Window ou en mode console 
 avec gpm.
 .TP
-.B \-o \fIrépertoire\fP (\-\-operatingdir=\fIrépertoire\fP)
-Définit le répertoire de travail. Demande à \fBnano\fP de mettre en place
-quelque chose de similaire à un environnement d'exécution restreint
+.B \-o \fIrépertoire\fP (\-\-operatingdir=\fIrépertoire\fP)
+Définit le répertoire de travail. Demande à \fBnano\fP de mettre en place
+quelque chose de similaire à un environnement d'exécution restreint
 (\fIchroot\fR).
 .TP
 .B \-p (\-\-preserve)
-Préserve les séquences XON et XOFF (^Q et ^S), afin qu'elle soient reçues
+Préserve les séquences XON et XOFF (^Q et ^S), afin qu'elle soient reçues
 par le terminal.
 .TP
 .B \-r \fIcolonne\fP (\-\-fill=\fIcolonne\fP)
-Passe automatiquement à la ligne une fois arrivé à la colonne 
-\fIcolonne\fR. Si la valeur indiquée est de 0 ou moins, le point de 
-passage à la ligne aura lieu à la taille de l'écran moins \fIcolonne\fR. 
-Cela permet de faire varier le point de passage à la ligne lorsque l'on 
-change la taille de l'écran. La valeur par défaut est de -8.
+Passe automatiquement à la ligne une fois arrivé à la colonne 
+\fIcolonne\fR. Si la valeur indiquée est de 0 ou moins, le point de 
+passage à la ligne aura lieu à la taille de l'écran moins \fIcolonne\fR. 
+Cela permet de faire varier le point de passage à la ligne lorsque l'on 
+change la taille de l'écran. La valeur par défaut est de \-8.
 .TP
 .B \-s \fIprogramme\fP (\-\-speller=\fIprogramme\fP)
 Choix d'un correcteur orthographique de remplacement.
 .TP
 .B \-t (\-\-tempfile)
-S'il a été modifié, le fichier sera sauvegardé automatiquement sans
-demande de confirmation. Identique à l'option \fB-t\fP de Pico.
+S'il a été modifié, le fichier sera sauvegardé automatiquement sans
+demande de confirmation. Identique à l'option \fB-t\fP de Pico.
 .TP
 .B \-v (\-\-view)
 Mode visualisation (lecture seule).
 .TP
 .B \-w (\-\-nowrap)
-Désactive le passage automatique à la ligne.
+Désactive le passage automatique à la ligne.
 .TP
 .B \-x (\-\-nohelp)
-Désactive la barre d'aide affichée en bas de l'écran.
+Désactive la barre d'aide affichée en bas de l'écran.
 .TP
 .B \-z (\-\-suspend)
-Autorise à suspendre l'éditeur.
+Autorise à suspendre l'éditeur.
 .TP
 .B \-a, \-b, \-e, \-f, \-g, \-j
-Ignoré, pour être compatible avec Pico.
+Ignoré, pour être compatible avec Pico.
 
 .SH "FICHIERS D'INITIALISATION"
 \fBnano\fR lit les fichiers d'initialisation dans l'ordre suivant\ : 
-\fISYSCONFDIR/nanorc\fR, puis \fI~/.nanorc\fR. Référez-vous à la page de 
+\fISYSCONFDIR/nanorc\fR, puis \fI~/.nanorc\fR. Référez-vous à la page de 
 manuel de \fBnanorc(5)\fR et au fichier d'exemple \fInanorc.sample\fR, 
-qui devraient tous les deux être livrés avec \fBnano\fR.
+qui devraient tous les deux être livrés avec \fBnano\fR.
 
 .SH NOTES
-Si aucun correcteur orthographique de remplacement n'est indiqué dans la 
+Si aucun correcteur orthographique de remplacement n'est indiqué dans la 
 ligne de commande ou dans l'un des fichiers nanorc, \fBnano\fR prendra 
-la commande indiquée par la variable d'environnement \fBSPELL\fR si 
-elle est définie.
+la commande indiquée par la variable d'environnement \fBSPELL\fR si 
+elle est définie.
 
 Dans certains cas, \fBnano\fR essaiera de sauvegarder le fichier en cours
-d'édition dans un fichier de secours. Cela arrivera principalement si
-\fBnano\fR reçoit un signal SIGHUP ou SIGTERM, ou bien se trouve à court de
-mémoire. Le nom de ce fichier de secours sera \fInano.save\fR si le fichier en
-cours n'avait pas encore de nom, ou sera composé du nom du fichier en cours
-suivi du suffixe «\ .save\ ». Si un fichier de ce nom existe déjà dans
-le répertoire, un «\ .save\ » et un nombre seront ajoutés à la fin du
+d'édition dans un fichier de secours. Cela arrivera principalement si
+\fBnano\fR reçoit un signal SIGHUP ou SIGTERM, ou bien se trouve à court de
+mémoire. Le nom de ce fichier de secours sera \fInano.save\fR si le fichier en
+cours n'avait pas encore de nom, ou sera composé du nom du fichier en cours
+suivi du suffixe «\ .save\ ». Si un fichier de ce nom existe déjà dans
+le répertoire, un «\ .save\ » et un nombre seront ajoutés à la fin du
 nom du fichier en cours afin de le rendre unique (par exemple,
-«\ .save.1\ »). En mode multi-espace, \fBnano\fR réalisera une
+«\ .save.1\ »). En mode multi-espace, \fBnano\fR réalisera une
 sauvegarde de tous les fichiers en cours dans leurs fichiers de secours
 respectifs.
 
 .SH BOGUES
 Merci de nous faire parvenir vos commentaires et de nous signaler les
-bogues, en écrivant, en anglais, à \fBnano@nano-editor.org\fR.
+bogues, en écrivant, en anglais, à \fBnano@nano-editor.org\fR.
 
-La liste de discussion anglophone \fBnano\fR est disponible à l'adresse
+La liste de discussion anglophone \fBnano\fR est disponible à l'adresse
 \fBnano-devel@gnu.org\fR.
 
-Pour vous abonner, envoyez un courrier électronique à
-\fBnano-devel-request@gnu.org\fR, ayant pour objet «\ subscribe\ ».
+Pour vous abonner, envoyez un courrier électronique à
+\fBnano-devel-request@gnu.org\fR, ayant pour objet «\ subscribe\ ».
 
-N'hésitez pas également à envoyez vos commentaires, suggestions et 
-corrections relatives à l'adaptation française de cette page de manuel 
-ou du logiciel à \fBjean-philippe.guerard@tigreraye.org\fR.
+N'hésitez pas également à envoyez vos commentaires, suggestions et 
+corrections relatives à l'adaptation française de cette page de manuel 
+ou du logiciel à \fBjean-philippe.guerard@tigreraye.org\fR.
 
 .SH "SITE INTERNET"
 http://www.nano-editor.org/
@@ -267,27 +300,27 @@ http://www.nano-editor.org/
 .TP
 \fBnanorc\fR(5)
 .PP
-\fI/usr/share/doc/nano/\fR (ou son équivalent sur votre système)
+\fI/usr/share/doc/nano/\fR (ou son équivalent sur votre système)
 
 .SH AUTEUR
 Chris Allegretta <chrisa@asty.org> et d'autres (voir les fichiers 
 \fIAUTHORS\fR et \fITHANKS\fR pour plus d'information). Cette page de 
-manuel a été initialement rédigée par Jordi Mallach <jordi@gnu.org> pour 
-le système Debian (mais elle peut être utilisée par d'autres).
+manuel a été initialement rédigée par Jordi Mallach <jordi@gnu.org> pour 
+le système Debian (mais elle peut être utilisée par d'autres).
 
 .SH TRADUCTION
-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.
+Cette adaptation française a été réalisée par Jean-Philippe\ Guérard 
+<jean-philippe.guerard@tigreraye.org> le 29\ novembre\ 2007 à partir 
+de la version 1.54 du 11\ octobre\ 2007 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
-vous en rencontrez, que ce soit dans la version française ou dans la
-version originale, n'hésitez pas à les signaler à l'auteur ou au
+Un maximum de soin a été apporté lors de l'élaboration de cette
+traduction\ ; néanmoins, quelques imperfections peuvent subsister. Si
+vous en rencontrez, que ce soit dans la version française ou dans la
+version originale, n'hésitez pas à les signaler à l'auteur ou au
 traducteur.
 
-La version originale la plus à jour de ce document est toujours 
+La version originale la plus à jour de ce document est toujours 
 consultable via la commande\ :
 
 LANGUAGE=en man nano

doc/man/fr/nanorc.5

@@ -1,66 +1,99 @@
 .\" Hey, EMACS: -*- nroff -*-
-.\" nanorc.5 is Copyright (C) 2003, 2004, 2005, 2006 by the Free 
-.\" Software Foundation, Inc.
+.\" Copyright (C) 2003, 2004, 2005, 2006, 2007
+.\" Free Software Foundation, Inc.
 .\"
-.\" (c) 2003-2006 Jean-Philippe Guérard <jean-philippe.guerard@tigreraye.org>
-.\" pour l'adaptation française.
+.\" Le travail d'adaptation française de cette page de manuel a été
+.\" réalisé par Jean-Philippe Guérard, en 2003, 2004, 2005, 2006 et 2007.
+.\" Ce travail d'adaptation est dans le domaine public. Attention, la
+.\" page traduite reste soumise au droit d'auteur de ses auteurs
+.\" originaux.
 .\"
-.\" This is free documentation, see the latest version of the GNU
-.\" General Public License for copying conditions.  There is NO
-.\" warranty.
+.\" The French translation of this document is a public domain work of
+.\" Jean-Philippe Guérard. This translation work was made in 2003, 2004,
+.\" 2005, 2006 and 2007. The translated man page in itself is still
+.\" subject to the copyright of its original authors.
 .\"
-.\" Ce document est libre. Reportez-vous à la dernière version de la
-.\" licence publique générale GNU (GNU GPL) pour connaître ses
-.\" conditions d'utilisation. Ce document est distribué sans
-.\" AUCUNE garantie.
+.\" This document is dual-licensed.  You may distribute and/or modify it
+.\" under the terms of either of the following licenses:
 .\"
-\" $Id$
-.TH NANORC 5 "version 2.0.0" "28\ octobre\ 2006"
+.\" * The GNU General Public License, as published by the Free Software
+.\"   Foundation, version 3 or (at your option) any later version.  You
+.\"   should have received a copy of the GNU General Public License
+.\"   along with this program.  If not, see
+.\"   <http://www.gnu.org/licenses/>.
+.\"
+.\" * The GNU Free Documentation License, as published by the Free
+.\"   Software Foundation, version 1.2 or (at your option) any later
+.\"   version, with no Invariant Sections, no Front-Cover Texts, and no
+.\"   Back-Cover Texts.  You should have received a copy of the GNU Free
+.\"   Documentation License along with this program.  If not, see
+.\"   <http://www.gnu.org/licenses/>.
+.\"
+.\" Ce document est publié sous une double licence. Vous pouvez
+.\" le distribuer et le modifier selon les termes de l'une des deux
+.\" licences ci-dessous :
+.\"
+.\" * La Licence publique générale GNU (GNU GPL) version 3 ou, à
+.\"   votre choix, supérieure, telle que publiée par la Free
+.\"   Software Foundation. Vous devriez avoir reçu une copie de la
+.\"   Licence publique générale GNU avec ce programme. Si ce n'est 
+.\"   pas le cas, consultez <http://www.gnu.org/licenses/>.
+.\"
+.\" * La Licence de documentation libre GNU (GNU FDL), version 1.2 
+.\"   ou, à votre choix, supérieure, telle que publiée par la Free
+.\"   Software Foundation, sans section invariante, ni texte de
+.\"   première ou de quatrième de couverture. Vous devriez avoir reçu
+.\"   une copie de la Licence de documentation libre GNU avec ce
+.\"   programme. Si ce n'est pas le cas, consultez
+.\"   <http://www.gnu.org/licenses/>.
+.\"
+.\" $Id$
+.TH NANORC 5 "version 2.0.0" "29\ novembre\ 2007"
 .\" Please adjust this date whenever revising the manpage.
-.\" Merci de modifier ces dates à chaque mise à jour de cette page.
+.\" Merci de modifier ces dates à chaque mise à jour de cette page.
 
 .SH NOM
-nanorc \- fichier de configuration de l'éditeur nano du projet GNU 
+nanorc \- fichier de configuration de l'éditeur nano du projet GNU 
 
 .SH DESCRIPTION
-Cette page de manuel décrit brièvement le fichier de configuration de 
-l'éditeur \fBnano\fP GNU.
+Cette page de manuel décrit brièvement le fichier de configuration de 
+l'éditeur \fBnano\fP GNU.
 .PP
-\fBnano\fP est un petit éditeur sympathique et libre, qui vise à 
-remplacer Pico, l'éditeur par défaut du logiciel non libre Pine. 
+\fBnano\fP est un petit éditeur sympathique et libre, qui vise à 
+remplacer Pico, l'éditeur par défaut du logiciel non libre Pine. 
 \fBnano\fP ne se contentant pas de copier l'interface et l'ergonomie de 
-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 à une ligne et à une colonne précise.
+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 à 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 
-démarrage, nano commencera par lire le fichier de configuration général 
+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 
+démarrage, nano commencera par lire le fichier de configuration général 
 \fISYSCONFDIR/nanorc\fP, puis lira le fichier de configuration personnel 
 de l'utilisateur \fI~/.nanorc\fP.
 
 .SH OPTIONS
-Le fichier de configuration accepte une série de commandes \fBset\fP 
-(activer) et \fBunset\fP (désactiver), qui permettent de définir le 
-paramétrage de nano au démarrage sans avoir à utiliser d'options de
+Le fichier de configuration accepte une série de commandes \fBset\fP 
+(activer) et \fBunset\fP (désactiver), qui permettent de définir le 
+paramétrage de nano au démarrage sans avoir à utiliser d'options de
 ligne de commande. De plus, les mots clefs \fBsyntax\fP (syntaxe),
-\fBcolor\fP (couleur) et \fBicolor\fP (couleur insensible à la casse) 
-sont utilisés pour définir les règles de colorisation pour différents 
+\fBcolor\fP (couleur) et \fBicolor\fP (couleur insensible à la casse) 
+sont utilisés pour définir les règles de colorisation pour différents 
 motifs de texte. \fBnano\fP lit une commande par ligne.
 
-Les options du fichier de configuration ont priorité sur les valeurs par 
-défaut utilisées par nano. Les options de la ligne de commande sont 
+Les options du fichier de configuration ont priorité sur les valeurs par 
+défaut utilisées par nano. Les options de la ligne de commande sont 
 prioritaires par rapport aux options du fichier de configuration. Les 
-options sont désactivées (unset) par défaut, sauf les options prenant un 
+options sont désactivées (unset) par défaut, sauf les options prenant un 
 argument.
 
-Les apostrophes («\ \fI'\fP\ ») et les guillemets droits («\ \fI"\fP\ »)
-présents dans des chaînes de caractères utilisées comme paramètres n'ont 
-pas besoin d'être précédées d'une barre oblique inversée
-(«\ \fI\\\fP\ »). La chaîne sera terminée par le dernier guillemet 
+Les apostrophes («\ \fI'\fP\ ») et les guillemets droits («\ \fI"\fP\ »)
+présents dans des chaînes de caractères utilisées comme paramètres n'ont 
+pas besoin d'être précédées d'une barre oblique inversée
+(«\ \fI\\\fP\ »). La chaîne sera terminée par le dernier guillemet 
 droit. Par exemple, pour l'option \fBbrackets\fP, "\fI"')>]}\fP" 
-correspondra à \fI"\fP, \fI'\fP, \fI)\fP, \fI>\fP, \fI]\fP et \fI}\fP.
+correspondra à \fI"\fP, \fI'\fP, \fI)\fP, \fI>\fP, \fI]\fP et \fI}\fP.
 
 Les commandes et arguments reconnus sont\ :
 
@@ -69,69 +102,69 @@ Les commandes et arguments reconnus sont\ :
 Active l'indentation automatique.
 .TP
 .B set/unset backup
-Crée des copies de sécurité nommées
+Crée des copies de sécurité nommées
 .IR nom_du_fichier~ .
 .TP
-.B set backupdir "\fIrépertoire\fP"
-Définit le répertoire utilisé par \fBnano\fP pour enregistrer les copies 
-de sécurité uniques, si l'enregistrement de copies de sécurité est 
-activé.
+.B set backupdir "\fIrépertoire\fP"
+Définit le répertoire utilisé par \fBnano\fP pour enregistrer les copies 
+de sécurité uniques, si l'enregistrement de copies de sécurité est 
+activé.
 .TP
 .B set/unset backwards
-Par défaut, les recherches se font vers l'arrière.
+Par défaut, les recherches se font vers l'arrière.
 .TP
 .B set/unset boldtext
-Utilise des caractères gras à la place de la vidéo inverse.
+Utilise des caractères gras à la place de la vidéo inverse.
 .TP
-.B set brackets "\fIchaîne\fP"
-Définit les caractères considérés comme des crochets fermants lors de la 
-justification des paragraphes. Ces caractères ne doivent pas contenir 
-d'espaces. Seules les ponctuations terminales, éventuellement suivies 
+.B set brackets "\fIchaîne\fP"
+Définit les caractères considérés comme des crochets fermants lors de la 
+justification des paragraphes. Ces caractères ne doivent pas contenir 
+d'espaces. Seules les ponctuations terminales, éventuellement suivies 
 de crochets fermants, peuvent terminer une phrase.
 
-(N.D.T.\ : reportez-vous au paragraphe sur l'option \fBpunct\fR pour 
-plus d'informations.)
+La valeur par défaut de cette option est\ : "\fI"')>]}\fP".
 
-La valeur par défaut de cette option est\ : "\fI"')>]}\fP".
+N.D.T.\ : reportez-vous au paragraphe sur l'option \fBpunct\fR pour 
+plus d'informations.
 
 .TP
 .B set/unset casesensitive
-Par défaut, les recherches ne tiennent pas compte de la casse.
+Par défaut, les recherches ne tiennent pas compte de la casse.
 .TP
 .B set/unset const
-Affiche en permanence la position du curseur dans la ligne d'état.
+Affiche en permanence la position du curseur dans la ligne d'état.
 .TP
 .B set/unset cut
-Par défaut, coupe le texte du curseur à la fin de la ligne, au lieu de 
-couper la ligne entière.
+Par défaut, coupe le texte du curseur à la fin de la ligne, au lieu de 
+couper la ligne entière.
 .TP
 .B set fill \fIn\fP
-Passe automatiquement à la ligne une fois arrivé à la colonne 
-\fIn\fR. Si la valeur indiquée est de 0 ou moins, le point de passage à 
-la ligne aura lieu à la taille de l'écran moins \fIn\fR. Cela permet de 
-faire varier le point de passage à la ligne lorsque l'on change la 
-taille de l'écran. La valeur par défaut est de -8.
+Passe automatiquement à la ligne une fois arrivé à la colonne 
+\fIn\fR. Si la valeur indiquée est de 0 ou moins, le point de passage à 
+la ligne aura lieu à la taille de l'écran moins \fIn\fR. Cela permet de 
+faire varier le point de passage à la ligne lorsque l'on change la 
+taille de l'écran. La valeur par défaut est de \-8.
 .TP
 .B set/unset historylog
 Active l'utilisation de
 .I ~/.nano_history
-pour enregistrer et relire les chaînes ayant fait l'objet d'une 
+pour enregistrer et relire les chaînes ayant fait l'objet d'une 
 recherche ou d'un remplacement.
 .TP
-.B set matchbrackets "\fIchaîne\fP"
-Définit les crochets ouvrants et fermant pour la recherche de crochets 
+.B set matchbrackets "\fIchaîne\fP"
+Définit les crochets ouvrants et fermant pour la recherche de crochets 
 correspondants. Cette liste ne doit pas contenir de blancs. L'ensemble 
-des crochets ouvrants doit être indiqué en premier, suivi de l'ensemble 
-des crochets fermant, qui doit être dans le même ordre. La valeur par 
-défaut de cette option est "\fI(<[{)>]}\fP".
+des crochets ouvrants doit être indiqué en premier, suivi de l'ensemble 
+des crochets fermant, qui doit être dans le même ordre. La valeur par 
+défaut de cette option est "\fI(<[{)>]}\fP".
 .TP
 .B set/unset morespace
-Utiliser la ligne blanche située sous la ligne de titre comme espace 
-supplémentaire d'édition.
+Utiliser la ligne blanche située sous la ligne de titre comme espace 
+supplémentaire d'édition.
 .TP
 .B set/unset mouse
 Active l'utilisation de la souris, si elle est disponible pour votre
-système. Lorsque celle-ci est activée, il est possible d'utiliser la
+système. Lorsque celle-ci est activée, il est possible d'utiliser la
 souris pour positionner le curseur, pour marquer le texte (avec un
 double-clic) et pour lancer les fonctions correspondant aux raccourcis.
 Il est possible d'utiliser la souris sous X\ Window ou en mode console
@@ -145,167 +178,167 @@ espace.
 Pas de conversion depuis les formats DOS et Mac.
 .TP
 .B set/unset nofollow
-Ne suit pas les liens symboliques lors de l'écriture des fichiers.
+Ne suit pas les liens symboliques lors de l'écriture des fichiers.
 .TP
 .B set/unset nohelp
-Désactive les lignes d'aide affichée en bas de l'écran.
+Désactive les lignes d'aide affichée en bas de l'écran.
 .TP
 .B set/unset nonewlines
-Ne pas ajouter de passage à la ligne à la fin des fichiers.
+Ne pas ajouter de passage à la ligne à la fin des fichiers.
 .TP
 .B set/unset nowrap
-Désactive le passage automatique à la ligne.
+Désactive le passage automatique à la ligne.
 .TP
-.B set operatingdir "\fIrépertoire\fP"
-\fBnano\fP ne lira et n'écrira des fichiers qu'à l'intérieur du 
-\fIrépertoire\fP et de ses sous-répertoires. De plus, celui-ci devient 
-le répertoire courant, afin que les fichiers soient lus depuis ce 
-répertoire. Par défaut, cette fonction est désactivée.
+.B set operatingdir "\fIrépertoire\fP"
+\fBnano\fP ne lira et n'écrira des fichiers qu'à l'intérieur du 
+\fIrépertoire\fP et de ses sous-répertoires. De plus, celui-ci devient 
+le répertoire courant, afin que les fichiers soient lus depuis ce 
+répertoire. Par défaut, cette fonction est désactivée.
 .TP
 .B set/unset preserve
-Préserve les séquences XON et XOFF (^Q et ^S).
+Préserve les séquences XON et XOFF (^Q et ^S).
 .TP
-.B set punct "\fIchaîne\fP"
-Définit les caractères interprétés comme des ponctuations terminales 
-lors de la justification des paragraphes. Ces caractères ne peuvent 
-inclure de blancs. Seules les ponctuations terminales, éventuellement 
+.B set punct "\fIchaîne\fP"
+Définit les caractères interprétés comme des ponctuations terminales 
+lors de la justification des paragraphes. Ces caractères ne peuvent 
+inclure de blancs. Seules les ponctuations terminales, éventuellement 
 suivies de crochets fermants, peuvent terminer une phrase. La valeur par 
-défaut de cette option est "\fI!.?\fP".
+défaut de cette option est "\fI!.?\fP".
 
-(N.D.T.\ : ce réglage permet, lors de la justification, de conserver
-2\ espaces au lieu d'une derrière les ponctuations terminales, ce qui 
+N.D.T.\ : ce réglage permet, lors de la justification, de conserver
+2\ espaces au lieu d'une derrière les ponctuations terminales, ce qui 
 correspond aux normes typographiques anglo-saxonnes, mais n'a pas lieu 
-d'être en français. Pour le français, le plus simple est d'indiquer, 
-dans le fichier nanorc, une chaîne vide pour ce paramètre.)
+d'être en français. Pour le français, le plus simple est d'indiquer, 
+dans le fichier nanorc, une chaîne vide pour ce paramètre.
 .TP
 .B set/unset quickblank
-Effacement rapide de la ligne d'état. Les messages affichés par la ligne
-d'état disparaîtront après une frappe clavier au lieu de 25.
+Effacement rapide de la ligne d'état. Les messages affichés par la ligne
+d'état disparaîtront après une frappe clavier au lieu de 25.
 .TP
-.B set quotestr "\fIchaîne\fP"
-Définit le préfixe par défaut utilisé pour les citations dans les 
-courriers électroniques. Ce préfixe est utilisé pour réaliser une 
-justification correcte de ces citations. Il s'agira, si votre système le 
-permet, d'une expression rationnelle étendue. Dans le cas 
-contraire, il s'agira d'une chaîne de texte brut. Si vous disposez des 
-expressions rationnelles, la valeur par défaut de cette option sera 
+.B set quotestr "\fIchaîne\fP"
+Définit le préfixe par défaut utilisé pour les citations dans les 
+courriers électroniques. Ce préfixe est utilisé pour réaliser une 
+justification correcte de ces citations. Il s'agira, si votre système le 
+permet, d'une expression rationnelle étendue. Dans le cas 
+contraire, il s'agira d'une chaîne de texte brut. Si vous disposez des 
+expressions rationnelles, la valeur par défaut de cette option sera 
 "\fI^([\ \\t]*[#:>\\|}])+\fP", sinon, ce sera ">\ ". Notez que le
-«\ \\t\ » ci-dessus correspond à un caractère de tabulation.
+«\ \\t\ » ci-dessus correspond à un caractère de tabulation.
 .TP
 .B set/unset rebinddelete
-Interprète différemment la touche «\ Supprimer\ », afin que les touches 
-«\ Effacement arrière\ » et «\ Supprimer\ » fonctionnent correctement. 
-Vous ne devriez avoir besoin de cette option que si, sur votre système, 
-la touche «\ Effacement arrière\ » produit l'effet de la touche «\ 
-Supprimer\ ».
+Interprète différemment la touche «\ Supprimer\ », afin que les touches 
+«\ Effacement arrière\ » et «\ Supprimer\ » fonctionnent correctement. 
+Vous ne devriez avoir besoin de cette option que si, sur votre système, 
+la touche «\ Effacement arrière\ » produit l'effet de la touche «\ 
+Supprimer\ ».
 .TP
 .B set/unset rebindkeypad
-Interprète les touches du pavé numérique afin qu'elles fonctionnent 
+Interprète les touches du pavé numérique afin qu'elles fonctionnent 
 toutes correctement. Vous ne devriez utiliser cette option que si ce 
 n'est pas le cas, car nano ne sera plus capable d'utiliser la souris 
-correctement lorsque cette option sera activée.
+correctement lorsque cette option sera activée.
 .TP
 .B set/unset regexp
-Utilise par défaut des expressions rationnelles étendues pour les 
+Utilise par défaut des expressions rationnelles étendues pour les 
 recherches.
 .TP
 .B set/unset smarthome
-Rend plus malin le fonctionnement de la touche «\ Début\ ». Lorsque
-cette touche est pressée à n'importe quel endroit excepté au tout début
-du texte d'une ligne (i.\ e. au premier caractère non blanc), le curseur
-se positionnera au début du texte de la ligne (qu'il soit en avant ou en 
-arrière). Si le curseur est déjà là, il se placera au vrai début de la 
+Rend plus malin le fonctionnement de la touche «\ Début\ ». Lorsque
+cette touche est pressée à n'importe quel endroit excepté au tout début
+du texte d'une ligne (i.\ e. au premier caractère non blanc), le curseur
+se positionnera au début du texte de la ligne (qu'il soit en avant ou en 
+arrière). Si le curseur est déjà là, il se placera au vrai début de la 
 ligne.
 .TP
 .B set/unset smooth
-Active le défilement ligne-par-ligne du texte.
+Active le défilement ligne-par-ligne du texte.
 .TP
 .B set speller "\fIprogramme\fP"
 Utilise le correcteur orthographique \fIprogramme\fP au lieu du 
-correcteur intégré, qui s'appuie sur \fIspell\fP.
+correcteur intégré, qui s'appuie sur \fIspell\fP.
 .TP
 .B set/unset suspend
-Autorise à suspendre \fBnano\fP.
+Autorise à suspendre \fBnano\fP.
 .TP
 .B set tabsize \fIn\fP
 Utilise une taille de tabulation de \fIn\fP colonnes. Cette valeur doit 
-être strictement supérieure à 0. La valeur par défaut est de\ 8.
+être strictement supérieure à 0. La valeur par défaut est de\ 8.
 .TP
 .B set/unset tabstospaces
 Convertit les tabulations clavier en espaces.
 .TP
 .B set/unset tempfile
-S'il a été modifié, le fichier sera sauvegardé automatiquement en 
+S'il a été modifié, le fichier sera sauvegardé automatiquement en 
 quittant, sans demande de confirmation.
 .TP
 .B set/unset view
 Interdit de modifier les fichiers.
 .TP
-.B set whitespace "\fIchaîne\fP"
-Définit les deux caractères utilisés pour afficher les premiers 
-caractères des tabulations et des espaces. Ces deux caractères doivent 
-être mono-colonne.
+.B set whitespace "\fIchaîne\fP"
+Définit les deux caractères utilisés pour afficher les premiers 
+caractères des tabulations et des espaces. Ces deux caractères doivent 
+être mono-colonne.
 .TP
 .B set/unset wordbounds
-Détection plus précise des limites de mots, obtenue en considérant les
-caractères de ponctuation comme faisant partie des mots.
+Détection plus précise des limites de mots, obtenue en considérant les
+caractères de ponctuation comme faisant partie des mots.
 .TP
-.B syntax "\fIchaîne\fP" ["\fImotif_de_fichier\fP" ... ]
-Définit une syntaxe nommée \fIchaîne\fP qui pourra être activé via 
+.B syntax "\fIchaîne\fP" ["\fImotif_de_fichier\fP" ... ]
+Définit une syntaxe nommée \fIchaîne\fP qui pourra être activé via 
 l'option \fB-Y\fP (ou \fB--syntax\fP) ou qui sera automatiquement 
-activée si le nom du fichier en cours correspond à l'expression 
-rationnelle étendue \fImotif_de_fichier\fP. Toutes les instructions 
-suivantes de colorisation \fBcolor\fP ou \fBicolor\fP s'appliqueront à 
-cette syntaxe, jusqu'à la définition d'une nouvelle syntaxe.
+activée si le nom du fichier en cours correspond à l'expression 
+rationnelle étendue \fImotif_de_fichier\fP. Toutes les instructions 
+suivantes de colorisation \fBcolor\fP ou \fBicolor\fP s'appliqueront à 
+cette syntaxe, jusqu'à la définition d'une nouvelle syntaxe.
 
-La syntaxe nommée \fInone\fP (aucune) est réservée\ ; si elle est 
-indiquée dans la ligne de commande, cela revient à ne définir aucune 
-syntaxe. La syntaxe nommée \fIdefault\fP (par défaut) est spéciale, elle 
-ne nécessite aucun motif de \fImotif_de_fichier\fP, et s'applique aux 
-fichiers ne correspondant à aucun des \fImotif_de_fichier\fP des autres 
+La syntaxe nommée \fInone\fP (aucune) est réservée\ ; si elle est 
+indiquée dans la ligne de commande, cela revient à ne définir aucune 
+syntaxe. La syntaxe nommée \fIdefault\fP (par défaut) est spéciale, elle 
+ne nécessite aucun motif de \fImotif_de_fichier\fP, et s'applique aux 
+fichiers ne correspondant à aucun des \fImotif_de_fichier\fP des autres 
 syntaxes.
 .TP
 .B color \fIcouleur_texte\fP[,\fIcouleur_fond\fP] "\fImotif\fP" ...
-Pour la syntaxe en cours, affiche toutes les expressions correspondant à 
-l'expression rationnelle étendue \fImotif\fP en utilisant la couleur de 
+Pour la syntaxe en cours, affiche toutes les expressions correspondant à 
+l'expression rationnelle étendue \fImotif\fP en utilisant la couleur de 
 texte \fIcouleur_texte\fP et la couleur de fond \fIcouleur_fond\fP, 
-l'une de ces deux couleurs au moins devant être définie. Les couleurs 
-acceptées par \fBnano\fP pour le texte et le fond sont\ : \fIwhite\fP 
+l'une de ces deux couleurs au moins devant être définie. Les couleurs 
+acceptées par \fBnano\fP pour le texte et le fond sont\ : \fIwhite\fP 
 (blanc), \fIblack\fP (noir), \fIred\fP (rouge), \fIblue\fP (bleu), 
 \fIgreen\fP (vert), \fIyellow\fP (jaune), \fImagenta\fP, et \fIcyan\fP. 
-Pour la couleur du texte, vous pouvez ajouter à ces couleurs le préfixe 
+Pour la couleur du texte, vous pouvez ajouter à ces couleurs le préfixe 
 \fIbright\fP (lumineux) pour obtenir une couleur plus lumineuse. Si 
-votre terminal est capable de gérer la transparence, ne pas spécifier de 
-\fIcouleur_fond\fP indique à \fBnano\fP d'essayer d'utiliser un fond 
+votre terminal est capable de gérer la transparence, ne pas spécifier de 
+\fIcouleur_fond\fP indique à \fBnano\fP d'essayer d'utiliser un fond 
 transparent.
 .TP
 .B icolor \fIcouleur_texte\fP[,\fIcouleur_fond\fP] "\fImotif\fP" ...
-Comme ci-dessus, mais la recherche des motifs est effectuée sans tenir 
+Comme ci-dessus, mais la recherche des motifs est effectuée sans tenir 
 compte de la casse.
 .TP
-.B color \fIcouleur_texte\fP[,\fIcouleur_fond\fP] start="\fImotif_début\fP" end="\fImotif_fin\fP"
-Affiche les expressions commençant par l'expression rationnelle étendue 
-\fImotif_début\fP et se terminant par l'expression rationnelle étendue 
+.B color \fIcouleur_texte\fP[,\fIcouleur_fond\fP] start="\fImotif_début\fP" end="\fImotif_fin\fP"
+Affiche les expressions commençant par l'expression rationnelle étendue 
+\fImotif_début\fP et se terminant par l'expression rationnelle étendue 
 \fImotif_fin\fP en utilisant la couleur de texte \fIcouleur_texte\fP 
 et la couleur de fond \fIcouleur_fond\fP, l'une de ces deux couleurs au 
-moins devant être définie. Cela permet à la colorisation syntaxique de 
-s'étendre sur plusieurs lignes. Notez que toutes les occurrences 
-successives de \fImotif_début\fP après le \fImotif_début\fP initial 
-seront surlignées jusqu'à la prochaine instance de \fImotif_fin\fP.
+moins devant être définie. Cela permet à la colorisation syntaxique de 
+s'étendre sur plusieurs lignes. Notez que toutes les occurrences 
+successives de \fImotif_début\fP après le \fImotif_début\fP initial 
+seront surlignées jusqu'à la prochaine instance de \fImotif_fin\fP.
 .TP
-.B icolor \fIcouleur_texte\fP[,\fIcouleur_fond\fP] start="\fImotif_début\fP" end="\fImotif_fin\fP"
-Comme ci-dessus, mais la recherche des motifs est effectuée sans tenir 
+.B icolor \fIcouleur_texte\fP[,\fIcouleur_fond\fP] start="\fImotif_début\fP" end="\fImotif_fin\fP"
+Comme ci-dessus, mais la recherche des motifs est effectuée sans tenir 
 compte de la casse.
 .TP
 .B include "\fIfichier_de_syntaxes\fP"
 Lit le fichier \fIfichier_de_syntaxes\fP contenant une liste 
-autosuffisante de définitions de syntaxes. Ce fichier ne doit contenir 
+autosuffisante de définitions de syntaxes. Ce fichier ne doit contenir 
 que des commandes \fBsyntax\fP, \fBcolor\fP et \fBicolor\fP.
 
 .SH FICHIERS
 .TP
 .I $SYSCONFDIR/nanorc
-Fichier de configuration général
+Fichier de configuration général
 .TP
 .I ~/.nanorc
 Fichier de configuration personnel
@@ -315,29 +348,29 @@ Fichier de configuration personnel
 .TP
 \fBnano\fP(1)
 .PP
-\fI/usr/share/doc/nano/examples/nanorc.sample\fP (ou son équivalent sur 
-votre système)
+\fI/usr/share/doc/nano/examples/nanorc.sample\fP (ou son équivalent sur 
+votre système)
 
 .SH AUTEUR
 Chris Allegretta <chrisa@asty.org> et d'autres (voir les fichiers
 \fIAUTHORS\fP et \fITHANKS\fP pour plus d'information). Cette page de
-manuel a été initialement rédigée par Jordi Mallach <jordi@gnu.org> pour
-le système Debian (mais elle peut être utilisée par d'autres).
+manuel a été initialement rédigée par Jordi Mallach <jordi@gnu.org> pour
+le système Debian (mais elle peut être utilisée par d'autres).
 
 .SH TRADUCTION
-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 
+Cette adaptation française a été réalisée par Jean-Philippe\ Guérard
+<jean-philippe.guerard@tigreraye.org> le 29\ novembre\ 2007 à partir de
+la version 1.56 du 11\ octobre\ 2007 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
-traduction\ ; néanmoins, quelques imperfections peuvent subsister. Si
-vous en rencontrez, que ce soit dans la version française ou dans la
-version originale, n'hésitez pas à les signaler à l'auteur ou au
+Un maximum de soin a été apporté lors de l'élaboration de cette
+traduction\ ; néanmoins, quelques imperfections peuvent subsister. Si
+vous en rencontrez, que ce soit dans la version française ou dans la
+version originale, n'hésitez pas à les signaler à l'auteur ou au
 traducteur.
 
-La version originale la plus à jour de ce document est toujours 
+La version originale la plus à jour de ce document est toujours 
 consultable via la commande\ :
 
 LANGUAGE=en man nano

doc/man/fr/rnano.1

@@ -1,122 +1,154 @@
 .\" Hey, EMACS: -*- nroff -*-
-.\" 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>.
+.\" Copyright (C) 2005, 2006, 2007 Free Software Foundation, Inc.
+.\" Skeleton based on nano-tiny.1:
+.\" Copyright (C) 2002 Free Software Foundation, Inc.
 .\"
-.\" Adaptation française (c) 2006 par
-.\" Jean-Philippe Guérard <jean-philippe.guerard@tigreraye.org>.
+.\" Le travail d'adaptation française de cette page de manuel a été
+.\" réalisé par Jean-Philippe Guérard, en 2006 et 2007. Ce travail
+.\" d'adaptation est dans le domaine public. Attention, la page traduite
+.\" reste soumise au droit d'auteur de ses auteurs originaux.
 .\"
-.\" This is free documentation, see the latest version of the GNU
-.\" General Public License for copying conditions.  There is NO
-.\" warranty.
+.\" The French translation of this document is a public domain work of
+.\" Jean-Philippe Guérard. This translation work was made in 2006 and
+.\" 2007. The translated man page in itself is still subject to the
+.\" copyright of its original authors.
 .\"
-.\" Ce document est libre. Reportez-vous à la dernière version de la
-.\" licence publique générale GNU (GNU GPL) pour connaître ses
-.\" conditions d'utilisation. Ce document est distribué sans
-.\" AUCUNE garantie.
+.\" This document is dual-licensed.  You may distribute and/or modify it
+.\" under the terms of either of the following licenses:
+.\"
+.\" * The GNU General Public License, as published by the Free Software
+.\"   Foundation, version 3 or (at your option) any later version.  You
+.\"   should have received a copy of the GNU General Public License
+.\"   along with this program.  If not, see
+.\"   <http://www.gnu.org/licenses/>.
+.\"
+.\" * The GNU Free Documentation License, as published by the Free
+.\"   Software Foundation, version 1.2 or (at your option) any later
+.\"   version, with no Invariant Sections, no Front-Cover Texts, and no
+.\"   Back-Cover Texts.  You should have received a copy of the GNU Free
+.\"   Documentation License along with this program.  If not, see
+.\"   <http://www.gnu.org/licenses/>.
+.\"
+.\" Ce document est publié sous une double licence. Vous pouvez
+.\" le distribuer et le modifier selon les termes de l'une des deux
+.\" licences ci-dessous :
+.\"
+.\" * La Licence publique générale GNU (GNU GPL) version 3 ou, à
+.\"   votre choix, supérieure, telle que publiée par la Free
+.\"   Software Foundation. Vous devriez avoir reçu une copie de la
+.\"   Licence publique générale GNU avec ce programme. Si ce n'est pas
+.\"   le cas, consultez <http://www.gnu.org/licenses/>.
+.\"
+.\" * La Licence de documentation libre GNU (GNU FDL), version 1.2 ou,
+.\"   à votre choix, supérieure, telle que publiée par la Free
+.\"   Software Foundation, sans section invariante, ni texte de
+.\"   première ou de quatrième de couverture. Vous devriez avoir reçu
+.\"   une copie de la Licence de documentation libre GNU avec ce
+.\"   programme. Si ce n'est pas le cas, consultez
+.\"   <http://www.gnu.org/licenses/>.
 .\"
 .\" $Id$
-.TH RNANO 1 "version 2.0.0" "28\ octobre\ 20O6"
+.TH RNANO 1 "version 2.0.0" "29\ novembre\ 20O7"
 .\" Please adjust this date whenever revising the manpage.
-.\" Merci de modifier ces dates à chaque mise à jour de cette page.
+.\" Merci de modifier ces dates à chaque mise à jour de cette page.
 .\"
 .SH NOM
-rnano \- Le mode restreint de NAno un NOuvel éditeur, un clone libre et 
-amélioré de Pico
+rnano \- Le mode restreint de NAno un NOuvel éditeur, un clone libre et 
+amélioré de Pico
 
 .SH SYNOPSIS
 .B rnano
-.I [OPTIONS]\ [[\+LIGNE,COLONNE]\ FICHIER]...
+.I [OPTIONS]\ [[+LIGNE,COLONNE]\ FICHIER]...
 .br
 
 .SH DESCRIPTION
-Cette page de manuel décrit brièvement la commande \fBrnano\fR.
+Cette page de manuel décrit brièvement la commande \fBrnano\fR.
 .PP
 .\" TeX users may be more comfortable with the \fB<whatever>\fP and
 .\" \fI<whatever>\fP escape sequences to invoke bold face and italics, 
 .\" respectively.
-\fBnano\fR est un éditeur petit, sympathique et libre, qui vise à 
-remplacer Pico, l'éditeur par défaut du logiciel non libre Pine. 
+\fBnano\fR est un éditeur petit, sympathique et libre, qui vise à 
+remplacer Pico, l'éditeur par défaut du logiciel non libre Pine. 
 \fBnano\fR ne se 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 à une ligne et à une colonne précise..
+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 à 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 
-n'autorise pas l'utilisateur à accéder au système de fichier ou à un 
-interpréteur de commandes.
+restreint, qui ne permet d'éditer que les fichiers indiqués et qui 
+n'autorise pas l'utilisateur à accéder au système de fichier ou à un 
+interpréteur de commandes.
 .PP
 En mode restreint, \fBnano\fP refusera\ :
 .IP \[bu] 2
-de lire ou d'écrire dans un fichier n'ayant pas été indiqué dans la 
+de lire ou d'écrire dans un fichier n'ayant pas été indiqué dans la 
 ligne de commande\ ;
 .IP \[bu]
 de lire un fichier nanorc\ ;
 .IP \[bu]
-de permettre de suspendre l'édition\ ;
+de permettre de suspendre l'édition\ ;
 .IP \[bu]
-de permettre d'ajouter en début ou en fin d'un fichier, ou de 
-l'enregistrer sous un nom différent\ ;
+de permettre d'ajouter en début ou en fin d'un fichier, ou de 
+l'enregistrer sous un nom différent\ ;
 .IP \[bu]
-l'utilisation de copies de sécurité ou de la correction orthographique.
+l'utilisation de copies de sécurité ou de la correction orthographique.
 
 .SH OPTIONS
 .TP
-.B \+\fILIGNE\fP,\fICOLONNE\fP
-Démarre avec le curseur positionné à la colonne \fICOLONNE\fP de
-la ligne \fILIGNE\fR (l'un des deux, au moins, devant être spécifié) au
-lieu de démarrer à la colonne\ 1, ligne\ 1.
+.B +\fILIGNE\fP,\fICOLONNE\fP
+Démarre avec le curseur positionné à la colonne \fICOLONNE\fP de
+la ligne \fILIGNE\fR (l'un des deux, au moins, devant être spécifié) au
+lieu de démarrer à la colonne\ 1, ligne\ 1.
 .TP
 .B \-?
-Identique à \fB-h (\-\-help)\fP.
+Identique à \fB\-h (\-\-help)\fP.
 .TP
 .B \-h (\-\-help)
-Affiche un résumé des options de lancement de nano, puis s'arrête.
+Affiche un résumé des options de lancement de nano, puis s'arrête.
 .TP
 .B \-V (\-\-version)
-Affiche la version, puis s'arrête.
+Affiche la version, puis s'arrête.
 .PP
-Reportez-vous à la page de manuel \fBnano\fP(1) si vous souhaitez 
-consulter la documentation complète de \fBnano\fP.
+Reportez-vous à la page de manuel \fBnano\fP(1) si vous souhaitez 
+consulter la documentation complète de \fBnano\fP.
 
 .SH BOGUES
 Merci de nous faire parvenir vos commentaires et de nous signaler les
-bogues, en écrivant, en anglais, à \fBnano@nano-editor.org\fR.
+bogues, en écrivant, en anglais, à \fBnano@nano-editor.org\fR.
 
-La liste de discussion anglophone \fBnano\fR est disponible à l'adresse
+La liste de discussion anglophone \fBnano\fR est disponible à l'adresse
 \fBnano-devel@gnu.org\fR.
 
-Pour vous abonner, envoyez un courrier électronique à
-\fBnano-devel-request@gnu.org\fR, ayant pour objet «\ subscribe\ ».
+Pour vous abonner, envoyez un courrier électronique à
+\fBnano-devel-request@gnu.org\fR, ayant pour objet «\ subscribe\ ».
 
-N'hésitez pas également à envoyez vos commentaires, suggestions et
-corrections relatives à l'adaptation française de cette page de manuel
-ou du logiciel à \fBjean-philippe.guerard@tigreraye.org\fR.
+N'hésitez pas également à envoyez vos commentaires, suggestions et
+corrections relatives à l'adaptation française de cette page de manuel
+ou du logiciel à \fBjean-philippe.guerard@tigreraye.org\fR.
 
 .SH "SITE INTERNET"
 http://www.nano-editor.org/
 
 .SH AUTEUR
 Chris Allegretta <chrisa@asty.org> et d'autres (voir le fichier
-\fIAUTHORS\fR). Cette page de manuel a été initialement rédigée par 
-Thijs Kinkhorst <thijs@kinkhorst.com>, pour le système GNU Debian (mais 
-elle peut être utilisée par d'autres).
+\fIAUTHORS\fR). Cette page de manuel a été initialement rédigée par 
+Thijs Kinkhorst <thijs@kinkhorst.com>, pour le système GNU Debian (mais 
+elle peut être utilisée par d'autres).
 
 .SH TRADUCTION
-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 
+Cette adaptation française a été réalisée par Jean-Philippe\ Guérard
+<jean-philippe.guerard@tigreraye.org> le 29\ novembre\ 2007 à partir
+de la version 1.19 du 6\ novembre\ 2007 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
-vous en rencontrez, que ce soit dans la version française ou dans la
-version originale, n'hésitez pas à les signaler à l'auteur ou au
+Un maximum de soin a été apporté lors de l'élaboration de cette
+traduction\ ; néanmoins, quelques imperfections peuvent subsister. Si
+vous en rencontrez, que ce soit dans la version française ou dans la
+version originale, n'hésitez pas à les signaler à l'auteur ou au
 traducteur.
 
-La version originale la plus à jour de ce document est toujours
+La version originale la plus à jour de ce document est toujours
 consultable via la commande\ :
 
 LANGUAGE=en man nano

doc/man/nano.1

@@ -1,13 +1,26 @@
 .\" Hey, EMACS: -*- nroff -*-
-.\" nano.1 is Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005,
-.\" 2006 by Chris Allegretta <chrisa@asty.org>
-.\"
-.\" This is free documentation, see the latest version of the GNU
-.\" General Public License for copying conditions.  There is NO
-.\" warranty.
-.\"
 .\" $Id$
-.TH NANO 1 "version 2.0.0" "October 28, 2006"
+.\"
+.\" Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007,
+.\" 2009, 2010, 2013, 2014 Free Software Foundation, Inc.
+.\"
+.\" This document is dual-licensed.  You may distribute and/or modify it
+.\" under the terms of either of the following licenses:
+.\"
+.\" * The GNU General Public License, as published by the Free Software
+.\"   Foundation, version 3 or (at your option) any later version.  You
+.\"   should have received a copy of the GNU General Public License
+.\"   along with this program.  If not, see
+.\"   <http://www.gnu.org/licenses/>.
+.\"
+.\" * The GNU Free Documentation License, as published by the Free
+.\"   Software Foundation, version 1.2 or (at your option) any later
+.\"   version, with no Invariant Sections, no Front-Cover Texts, and no
+.\"   Back-Cover Texts.  You should have received a copy of the GNU Free
+.\"   Documentation License along with this program.  If not, see
+.\"   <http://www.gnu.org/licenses/>.
+.\"
+.TH NANO 1 "version 2.5.3" "February 2016"
 .\" Please adjust this date whenever revising the manpage.
 .\"
 
@@ -16,187 +29,235 @@ nano \- Nano's ANOther editor, an enhanced free Pico clone
 
 .SH SYNOPSIS
 .B nano
-.I [OPTIONS]\ [[\+LINE,COLUMN]\ FILE]...
-.br
+.RI [ options "] [[+" line , column "]\ " file "]..."
 
 .SH DESCRIPTION
-This manual page briefly documents the \fBnano\fP command.
-.PP
-.\" TeX users may be more comfortable with the \fB<whatever>\fP and
-.\" \fI<whatever>\fP escape sequences to invoke bold face and italics,
-.\" respectively.
 \fBnano\fP is a small, free and friendly editor which aims to replace
-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
+Pico, the default editor included in the non-free Pine package.  On
+top of 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 and column number".
 
+.SH EDITING
+Entering text and moving around in a file is straightforward: typing the
+letters and using the normal cursor movement keys.  Commands are entered
+by using the Control (^) and the Alt or Meta (M-) keys.
+Typing \fB^K\fR deletes the current line and puts it in the cutbuffer.
+Consecutive \fB^K\fRs will put all deleted lines together in the cutbuffer.
+Any cursor movement or executing any other command will cause the next
+\fB^K\fR to overwrite the cutbuffer.  A \fB^U\fR will paste the current
+contents of the cutbuffer at the current cursor position.
+.PP
+When a more precise piece of text needs to be cut or copied, one can mark
+its start with \fB^6\fR, move the cursor to its end (the marked text will be
+highlighted), and then use \fB^K\fR to cut it, or \fBM-6\fR to copy it to the
+cutbuffer. One can also save the marked text to a file with \fB^O\fR, or
+spell check it with \fB^T\fR.
+.PP
+The two lines at the bottom of the screen show the most important commands;
+the built-in help (\fB^G\fR) lists all the available ones.
+The default key bindings can be changed via the .nanorc file -- see
+.BR nanorc (5).
+
 .SH OPTIONS
 .TP
-.B \+\fILINE\fP,\fICOLUMN\fP
-Places cursor at line number \fILINE\fP and column number \fICOLUMN\fP
+.B +\fIline\fP,\fIcolumn\fP
+Places the cursor on line number \fIline\fP and at column number \fIcolumn\fP
 (at least one of which must be specified) on startup, instead of the
-default of line 1, column 1.
+default line 1, column 1.
 .TP
-.B \-?
-Same as \fB-h (\-\-help)\fP.
-.TP
-.B \-A (\-\-smarthome)
+.BR \-A ", " \-\-smarthome
 Make the Home key smarter.  When Home is pressed anywhere but at the
 very beginning of non-whitespace characters on a line, the cursor will
 jump to that beginning (either forwards or backwards).  If the cursor is
 already at that position, it will jump to the true beginning of the
 line.
 .TP
-.B \-B (\-\-backup)
-When saving a file, back up the previous version of it to the current
-filename suffixed with a ~.
+.BR \-B ", " \-\-backup
+When saving a file, back up the previous version of it, using the current
+filename suffixed with a tilde (\fB~\fP).
 .TP
-.B \-C \fIdir\fP (\-\-backupdir=\fIdir\fP)
-Set the directory where \fBnano\fP puts unique backup files if file
-backups are enabled.
+.BR \-C\ \fIdirectory\fR ", " \-\-backupdir= \fIdirectory
+Make and keep not just one backup file, but make and keep a uniquely
+numbered one every time a file is saved -- when backups are enabled.
+The uniquely numbered files are stored in the specified \fIdirectory\fR.
 .TP
-.B \-D (\-\-boldtext)
+.BR \-D ", " \-\-boldtext
 Use bold text instead of reverse video text.
 .TP
-.B \-E (\-\-tabstospaces)
+.BR \-E ", " \-\-tabstospaces
 Convert typed tabs to spaces.
 .TP
-.B \-F (\-\-multibuffer)
-Enable multiple file buffers, if available.
+.BR \-F ", " \-\-multibuffer
+Enable multiple file buffers (if support for them has been compiled in).
 .TP
-.B \-H (\-\-historylog)
-Log search and replace strings to \fI~/.nano_history\fP, so they can be
-retrieved in later sessions, if nanorc support is available.
+.BR \-G ", " \-\-locking
+Enable vim-style file locking when editing files.
 .TP
-.B \-I (\-\-ignorercfiles)
-Don't look at \fISYSCONFDIR/nanorc\fP or \fI~/.nanorc\fP, if nanorc
-support is available.
+.BR \-H ", " \-\-historylog
+Log search and replace strings to \fI~/.nano/search_history\fP, so they can be
+retrieved in later sessions.
 .TP
-.B \-K (\-\-rebindkeypad)
+.BR \-I ", " \-\-ignorercfiles
+Don't look at the system's \fBnanorc\fP nor at \fB~/.nanorc\fP.
+.TP
+.BR \-K ", " \-\-rebindkeypad
 Interpret the numeric keypad keys so that they all work properly.  You
 should only need to use this option if they don't, as mouse support
 won't work properly with this option enabled.
 .TP
-.B \-L (\-\-nonewlines)
+.BR \-L ", " \-\-nonewlines
 Don't add newlines to the ends of files.
 .TP
-.B \-N (\-\-noconvert)
+.BR \-N ", " \-\-noconvert
 Disable automatic conversion of files from DOS/Mac format.
 .TP
-.B \-O (\-\-morespace)
+.BR \-O ", " \-\-morespace
 Use the blank line below the titlebar as extra editing space.
 .TP
-.B \-Q \fIstr\fP (\-\-quotestr=\fIstr\fP)
+.BR \-P ", " \-\-positionlog
+For the 200 most recent files, log the last position of the cursor,
+and place it at that position again upon reopening such a file.
+(The old form of this option, \fB\-\-poslog\fR, is deprecated.)
+.TP
+.BR "\-Q ""\fIcharacters\fB""" ", " "\-\-quotestr=""" \fIcharacters\fR """
 Set the quoting string for justifying.  The default is
-"\fI^([\ \\t]*[#:>\\|}])+\fP" if extended regular expression support is
-available, or "\fI>\ \fP" otherwise.  Note that \fI\\t\fP stands for a
+\fB"^([\ \\t]*[#:>\\|}])+"\fP if extended regular expression support is
+available, or \fB">\ "\fP otherwise.  Note that \fB\\t\fP stands for a
 Tab.
 .TP
-.B \-R (\-\-restricted)
+.BR \-R ", " \-\-restricted
 Restricted mode: don't read or write to any file not specified on the
-command line; read any nanorc files; allow suspending; allow a file
-to be appended to, prepended to, or saved under a different name if it
-already has one; or use backup files or spell checking.  Also accessible
-by invoking \fBnano\fP with any name beginning with 'r' (e.g. "rnano").
+command line; don't read any \fInanorc\fP files nor history files;
+don't allow suspending nor spell checking;
+don't allow a file to be appended to, prepended to, or saved under a
+different name if it already has one; and don't use backup files.
+This restricted mode is also accessible by invoking \fBnano\fP
+with any name beginning with 'r' (e.g. "rnano").
 .TP
-.B \-S (\-\-smooth)
+.BR \-S ", " \-\-smooth
 Enable smooth scrolling.  Text will scroll line-by-line, instead of the
 usual chunk-by-chunk behavior.
 .TP
-.B \-T \fIcols\fP (\-\-tabsize=\fIcols\fP)
-Set the size (width) of a tab to \fIcols\fP columns.  The value of
-\fIcols\fP must be greater than 0.  The default value is 8.
+.BR \-T\ \fInumber\fR ", " \-\-tabsize= \fInumber
+Set the size (width) of a tab to \fInumber\fP columns.  The value of
+\fInumber\fP must be greater than 0.  The default value is 8.
 .TP
-.B \-U (\-\-quickblank)
+.BR \-U ", " \-\-quickblank
 Do quick statusbar blanking.  Statusbar messages will disappear after 1
-keystroke instead of 25.  Note that \fB-c\fP overrides this.
+keystroke instead of 25.  Note that \fB\-c\fP overrides this.
 .TP
-.B \-V (\-\-version)
+.BR \-V ", " \-\-version
 Show the current version number and exit.
 .TP
-.B \-W (\-\-wordbounds)
+.BR \-W ", " \-\-wordbounds
 Detect word boundaries more accurately by treating punctuation
 characters as part of a word.
 .TP
-.B \-Y \fIstr\fP (\-\-syntax=\fIstr\fP)
-Specify a specific syntax highlighting from the \fInanorc\fP to use, if
-available.
+.BR \-Y\ \fIname\fR ", " \-\-syntax= \fIname
+Specify the name of the syntax highlighting to use from among the ones
+defined in the \fInanorc\fP files.
 .TP
-.B \-c (\-\-const)
-Constantly show the cursor position.  Note that this overrides \fB-U\fP.
+.BR \-c ", " \-\-constantshow
+Constantly show the cursor position.  Note that this overrides \fB\-U\fP.
 .TP
-.B \-d (\-\-rebinddelete)
+.BR \-d ", " \-\-rebinddelete
 Interpret the Delete key differently so that both Backspace and Delete
 work properly.  You should only need to use this option if Backspace
 acts like Delete on your system.
 .TP
-.B \-h (\-\-help)
-Show a summary of command line options and exit.
+.BR \-h ", " \-\-help
+Show a summary of the available command-line options and exit.
 .TP
-.B \-i (\-\-autoindent)
+.BR \-i ", " \-\-autoindent
 Indent new lines to the previous line's indentation.  Useful when
 editing source code.
 .TP
-.B \-k (\-\-cut)
-Enable cut from cursor to end of line.
+.BR \-k ", " \-\-cut
+Make the 'Cut Text' command (normally ^K) cut from the current cursor
+position to the end of the line, instead of cutting the entire line.
 .TP
-.B \-l (\-\-nofollow)
-If the file being edited is a symbolic link, replace the link with
-a new file instead of following it.  Good for editing files in
-\fI/tmp\fP, perhaps?
-.TP
-.B \-m (\-\-mouse)
+.BR \-m ", " \-\-mouse
 Enable mouse support, if available for your system.  When enabled, mouse
 clicks can be used to place the cursor, set the mark (with a double
 click), and execute shortcuts.  The mouse will work in the X Window
-System, and on the console when gpm is running.
+System, and on the console when gpm is running.  Text can still be
+selected through dragging by holding down the Shift key.
 .TP
-.B \-o \fIdir\fP (\-\-operatingdir=\fIdir\fP)
-Set operating directory.  Makes \fBnano\fP set up something similar to a
-chroot.
+.BR \-n ", " \-\-noread
+Treat any name given on the command line as a new file.  This allows
+\fBnano\fR to write to named pipes: it will start with a blank buffer,
+and will write to the pipe when the user saves the "file".  This way
+\fBnano\fR can be used as an editor in combination with for instance
+\fBgpg\fR without having to write sensitive data to disk first.
 .TP
-.B \-p (\-\-preserve)
+.BR \-o\ \fIdirectory\fR ", " \-\-operatingdir= \fIdirectory
+Set the operating directory.  This makes \fBnano\fP set up something
+similar to a chroot.
+.TP
+.BR \-p ", " \-\-preserve
 Preserve the XON and XOFF sequences (^Q and ^S) so they will be caught
 by the terminal.
 .TP
-.B \-r \fIcols\fP (\-\-fill=\fIcols\fP)
-Wrap lines at column \fIcols\fP.  If this value is 0 or less, wrapping
-will occur at the width of the screen less \fIcols\fP columns, allowing
+.BR \-q ", " \-\-quiet
+Do not report errors in the \fInanorc\fP files nor ask them to be
+acknowledged by pressing Enter at startup.
+.TP
+.BR \-r\ \fInumber\fR ", " \-\-fill= \fInumber
+Hard-wrap lines at column \fInumber\fP.  If this value is 0 or less, wrapping
+will occur at the width of the screen less \fInumber\fP columns, allowing
 the wrap point to vary along with the width of the screen if the screen
-is resized.  The default value is -8.
+is resized.  The default value is \-8.  This option conflicts with
+.B \-w
+-- the last one given takes effect.
 .TP
-.B \-s \fIprog\fP (\-\-speller=\fIprog\fP)
-Enable alternative spell checker command.
+.BR \-s\ \fIprogram\fR ", " \-\-speller= \fIprogram
+Use this alternative spell checker command.
 .TP
-.B \-t (\-\-tempfile)
-Always save changed buffer without prompting.  Same as Pico's \fB-t\fP
+.BR \-t ", " \-\-tempfile
+Always save a changed buffer without prompting.  Same as Pico's \fB\-t\fP
 option.
 .TP
-.B \-v (\-\-view)
-View file (read only) mode.
+.BR \-u ", " \-\-unix
+Save a file by default in Unix format.  This overrides nano's
+default behavior of saving a file in the format that it had.
+(This option has no effect when you also use \fB\-\-noconvert\fR.)
 .TP
-.B \-w (\-\-nowrap)
-Disable wrapping of long lines.
+.BR \-v ", " \-\-view
+View-file (read-only) mode.
 .TP
-.B \-x (\-\-nohelp)
-Disable help screen at bottom of editor.
+.BR \-w ", " \-\-nowrap
+Disable the hard-wrapping of long lines.  This option conflicts with
+.B \-r
+-- the last one given takes effect.
 .TP
-.B \-z (\-\-suspend)
-Enable suspend ability.
+.BR \-x ", " \-\-nohelp
+Don't show the two help lines at the bottom of the screen.
 .TP
-.B \-a, \-b, \-e, \-f, \-g, \-j
+.BR \-z ", " \-\-suspend
+Enable the suspend ability.
+.TP
+.BR \-$ ", " \-\-softwrap
+Enable 'soft wrapping'.  This will make \fBnano\fP attempt to display the
+entire contents of any line, even if it is longer than the screen width, by
+continuing it over multiple screen lines.  Since
+\&'$' normally refers to a variable in the Unix shell, you should specify
+this option last when using other options (e.g.\& 'nano \-wS$') or pass it
+separately (e.g.\& 'nano \-wS \-$').
+.TP
+.BR \-a ", " \-b ", " \-e ", " \-f ", " \-g ", " \-j
 Ignored, for compatibility with Pico.
 
 .SH INITIALIZATION FILE
 \fBnano\fP will read initialization files in the following order:
-\fISYSCONFDIR/nanorc\fP, then \fI~/.nanorc\fP.  Please see
-\fBnanorc(5)\fP and the example file \fBnanorc.sample\fP, both of which
-should be provided with \fBnano\fP.
+the system's \fBnanorc\fP (if it exists), and then the user's
+\fB~/.nanorc\fP (if it exists).  Please see
+.BR nanorc (5)
+for more information on the possible contents of those files.
 
 .SH NOTES
 If no alternative spell checker command is specified on the command
-line or in one of the nanorc files, \fBnano\fP will check the
+line nor in one of the \fInanorc\fP files, \fBnano\fP will check the
 \fBSPELL\fP environment variable for one.
 
 In some cases \fBnano\fP will try to dump the buffer into an emergency
@@ -205,17 +266,19 @@ SIGTERM or runs out of memory.  It will write the buffer into a file
 named \fInano.save\fP if the buffer didn't have a name already, or will
 add a ".save" suffix to the current filename.  If an emergency file with
 that name already exists in the current directory, it will add ".save"
-plus a number (e.g. ".save.1") to the current filename in order to make
+plus a number (e.g.\& ".save.1") to the current filename in order to make
 it unique.  In multibuffer mode, \fBnano\fP will write all the open
 buffers to their respective emergency files.
 
 .SH BUGS
-Please send any comments or bug reports to \fBnano@nano-editor.org\fP.
-
-The \fBnano\fP mailing list is available from \fBnano-devel@gnu.org\fP.
-
-To subscribe, email to \fBnano-devel-request@gnu.org\fP with a subject
-of "subscribe".
+Justifications (\fB^J\fR) and reindentations (\fBM-{\fR and \fBM-}\fR)
+are not yet covered by the general undo system.  So after a justification
+that is not immediately undone, or after any reindentation, earlier edits
+cannot be undone any more.  The workaround is, of course, to exit without
+saving.
+.sp
+Please report any other bugs that you encounter via
+https://savannah.gnu.org/bugs/?group=nano.
 
 .SH HOMEPAGE
 http://www.nano-editor.org/
@@ -228,7 +291,7 @@ http://www.nano-editor.org/
 \fI/usr/share/doc/nano/\fP (or equivalent on your system)
 
 .SH AUTHOR
-Chris Allegretta <chrisa@asty.org>, et al (see \fIAUTHORS\fP and
+Chris Allegretta <chrisa@asty.org>, et al (see the files \fIAUTHORS\fP and
 \fITHANKS\fP for details).  This manual page was originally written by
 Jordi Mallach <jordi@gnu.org>, for the Debian system (but may be used by
 others).

doc/man/nanorc.5

@@ -1,252 +1,727 @@
 .\" Hey, EMACS: -*- nroff -*-
-.\" nanorc.5 is Copyright (C) 2003, 2004, 2005, 2006 by the Free
-.\" Software Foundation, Inc.
-.\"
-.\" This is free documentation, see the latest version of the GNU
-.\" General Public License for copying conditions.  There is NO
-.\" warranty.
-.\"
 .\" $Id$
-.TH NANORC 5 "version 2.0.0" "October 28, 2006"
+.\"
+.\" Copyright (C) 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011,
+.\" 2013, 2014, 2015 Free Software Foundation, Inc.
+.\"
+.\" This document is dual-licensed.  You may distribute and/or modify it
+.\" under the terms of either of the following licenses:
+.\"
+.\" * The GNU General Public License, as published by the Free Software
+.\"   Foundation, version 3 or (at your option) any later version.  You
+.\"   should have received a copy of the GNU General Public License
+.\"   along with this program.  If not, see
+.\"   <http://www.gnu.org/licenses/>.
+.\"
+.\" * The GNU Free Documentation License, as published by the Free
+.\"   Software Foundation, version 1.2 or (at your option) any later
+.\"   version, with no Invariant Sections, no Front-Cover Texts, and no
+.\"   Back-Cover Texts.  You should have received a copy of the GNU Free
+.\"   Documentation License along with this program.  If not, see
+.\"   <http://www.gnu.org/licenses/>.
+.\"
+.TH NANORC 5 "version 2.5.3" "February 2016"
 .\" Please adjust this date whenever revising the manpage.
 .\"
 .SH NAME
 nanorc \- GNU nano's rcfile
 .SH DESCRIPTION
-This manual page briefly documents GNU \fBnano\fP's rcfile.
-.PP
-\fBnano\fP is a small, free and friendly editor which aims to replace
-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 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
-first read its system-wide settings from \fISYSCONFDIR/nanorc\fP, and
-then user-specific settings from \fI~/.nanorc\fP.
+The \fInanorc\fP file contains the default settings for \fBnano\fP, a
+small and friendly editor.  The file should be in Unix format, not in
+DOS or Mac format.  During startup, \fBnano\fP will first read the
+system-wide settings, from \fB/etc/nanorc\fP (the exact path might be
+different), and then the user-specific settings, from \fB~/.nanorc\fP.
 
 .SH OPTIONS
 The configuration file accepts a series of \fBset\fP and \fBunset\fP
 commands, which can be used to configure nano on startup without using
-the command line options.  Additionally, the \fBsyntax\fP, \fBcolor\fP,
-and \fBicolor\fP keywords are used to define syntax highlighting rules
-for different text patterns.  \fBnano\fP will read one command per line.
-
-Options in nanorc files take precedence over nano's defaults, and
-command line options override nanorc settings.  Also, options are unset
-by default, except for those that take arguments.
-
-Quotes inside string parameters don't have to be escaped with
+command-line options.  Additionally, there are some commands to define
+syntax highlighting and to rebind keys -- see the two separate sections
+on those.  \fBnano\fP reads one command per line.
+.PP
+Options in \fInanorc\fP files take precedence over nano's defaults, and
+command-line options override \fInanorc\fP settings.  Also, options that
+do not take an argument are unset by default.  So using the \fBunset\fR
+command is only needed when wanting to override a setting of the system's
+\fInanorc\fR file in your own \fB~/.nanorc\fR.  Options that take an
+argument cannot be unset.
+.PP
+Below, the \fIstring\fR parameters need to be enclosed in double quotes.
+Quotes inside these string parameters don't have to be escaped with
 backslashes.  The last double quote in the string will be treated as its
-end.  For example, for the \fBbrackets\fP option, "\fI"')>]}\fP" will
-match \fI"\fP, \fI'\fP, \fI)\fP, \fI>\fP, \fI]\fP, and \fI}\fP.
-
+end.  For example, for the \fBbrackets\fP option, "\fB"')>]}\fP" will
+match \fB"\fP, \fB'\fP, \fB)\fP, \fB>\fP, \fB]\fP, and \fB}\fP.
+.PP
 The supported commands and arguments are:
 
 .TP 3
-.B set/unset autoindent
+.B set allow_insecure_backup
+When backing up files, allow the backup to succeed even if its permissions
+can't be (re)set due to special OS considerations.  You should
+NOT enable this option unless you are sure you need it.
+.TP
+.B set autoindent
 Use auto-indentation.
 .TP
-.B set/unset backup
-Create backup files in \fIfilename~\fP.
+.B set backup
+When saving a file, create a backup file by adding a tilde (\fB~\fP) to
+the file's name.
 .TP
 .B set backupdir "\fIdirectory\fP"
-Set the directory where \fBnano\fP puts unique backup files if file
-backups are enabled.
+Make and keep not just one backup file, but make and keep a uniquely
+numbered one every time a file is saved --- when backups are enabled
+with \fBset backup\fR or \fB\-\-backup\fR or \fB\-B\fR.
+The uniquely numbered files are stored in the specified \fIdirectory\fR.
 .TP
-.B set/unset backwards
+.B set backwards
 Do backwards searches by default.
 .TP
-.B set/unset boldtext
-Use bold text instead of reverse video text.
+.B set boldtext
+Use bold instead of reverse video for the titlebar, statusbar, key combos,
+and selected text.  This can be overridden for the first three by setting
+the options \fBtitlecolor\fP, \fBstatuscolor\fP, and \fBkeycolor\fP.
 .TP
 .B set brackets "\fIstring\fP"
 Set the characters treated as closing brackets when justifying
-paragraphs.  They cannot contain blank characters.  Only closing
-punctuation, optionally followed by closing brackets, can end sentences.
-The default value is "\fI"')>]}\fP".
+paragraphs.  This may not include blank characters.  Only closing
+punctuation (see \fBpunct\fP), optionally followed by the specified
+closing brackets, can end sentences.  The default value is "\fB"')>]}\fP".
 .TP
-.B set/unset casesensitive
-Do case sensitive searches by default.
+.B set casesensitive
+Do case-sensitive searches by default.
 .TP
-.B set/unset const
+.B set constantshow
 Constantly display the cursor position in the status bar.
+(The old form of this option, '\fBset const\fR', is deprecated.)
 .TP
-.B set/unset cut
-Use cut to end of line by default.
+.B set cut
+Use cut-to-end-of-line by default, instead of cutting the whole line.
 .TP
-.B set fill \fIn\fP
-Wrap lines at column number \fIn\fP.  If \fIn\fP is 0 or less, the
-maximum line length will be the screen width less \fIn\fP columns.  The
-default value is -8.
+.B set fill \fInumber\fR
+Hard-wrap lines at column number \fInumber\fR.  If \fInumber\fR is 0 or less,
+the maximum line length will be the screen width less \fInumber\fP columns.
+The default value is \fB\-8\fR.
 .TP
-.B set/unset historylog
-Enable \fI~/.nano_history\fP for saving and reading search/replace
-strings.
+.B set functioncolor \fIfgcolor\fR,\fIbgcolor\fR
+Specify the color combination to use for the function descriptions
+in the two help lines at the bottom of the screen.
+See \fBset titlecolor\fR for more details.
+.TP
+.B set historylog
+Enable the use of \fB~/.nano/search_history\fP for saving and reading
+search/replace strings.
+.TP
+.B set justifytrim
+When justifying text, trailing newlines will automatically be removed.
+.TP
+.B set keycolor \fIfgcolor\fR,\fIbgcolor\fR
+Specify the color combination to use for the shortcut key combos
+in the two help lines at the bottom of the screen.
+See \fBset titlecolor\fR for more details.
+.TP
+.B set locking
+Enable vim-style lock-files for when editing files.
 .TP
 .B set matchbrackets "\fIstring\fP"
 Set the opening and closing brackets that can be found by bracket
-searches.  They cannot contain blank characters.  The former set must
-come before the latter set, and both must be in the same order.  The
-default value is "\fI(<[{)>]}\fP".
+searches.  This may not include blank characters.  The opening set must
+come before the closing set, and the two sets must be in the same order.
+The default value is "\fB(<[{)>]}\fP".
 .TP
-.B set/unset morespace
+.B set morespace
 Use the blank line below the titlebar as extra editing space.
 .TP
-.B set/unset mouse
+.B set mouse
 Enable mouse support, if available for your system.  When enabled, mouse
 clicks can be used to place the cursor, set the mark (with a double
 click), and execute shortcuts.  The mouse will work in the X Window
-System, and on the console when gpm is running.
+System, and on the console when gpm is running.  Text can still be
+selected through dragging by holding down the Shift key.
 .TP
-.B set/unset multibuffer
-Allow inserting files into their own buffers.
+.B set multibuffer
+When reading in a file with ^R, insert it into a new buffer by default.
 .TP
-.B set/unset noconvert
+.B set noconvert
 Don't convert files from DOS/Mac format.
 .TP
-.B set/unset nofollow
-Don't follow symlinks when writing files.
+.B set nohelp
+Don't display the two help lines at the bottom of the screen.
 .TP
-.B set/unset nohelp
-Don't display the help lists at the bottom of the screen.
+.B set nonewlines
+Don't automatically add a newline to the ends of files.
 .TP
-.B set/unset nonewlines
-Don't add newlines to the ends of files.
-.TP
-.B set/unset nowrap
-Don't wrap text at all.
+.B set nowrap
+Don't hard-wrap text at all.
 .TP
 .B set operatingdir "\fIdirectory\fP"
 \fBnano\fP will only read and write files inside \fIdirectory\fP and its
 subdirectories.  Also, the current directory is changed to here, so
-files are inserted from this diractory.  By default, the operating
+files are inserted from this directory.  By default, the operating
 directory feature is turned off.
 .TP
-.B set/unset preserve
+.B set positionlog
+Save the cursor position of files between editing sessions.
+The cursor position is remembered for the 200 most-recently edited files.
+(The old form of this option, '\fBset poslog\fR', is deprecated.)
+.TP
+.B set preserve
 Preserve the XON and XOFF keys (^Q and ^S).
 .TP
 .B set punct "\fIstring\fP"
 Set the characters treated as closing punctuation when justifying
-paragraphs.  They cannot contain blank characters.  Only closing
-punctuation, optionally followed by closing brackets, can end sentences.
-The default value is "\fI!.?\fP".
+paragraphs.  This may not include blank characters.  Only the
+specfified closing punctuation, optionally followed by closing brackets
+(see \fBbrackets\fP), can end sentences.  The default value is "\fB!.?\fP".
 .TP
-.B set/unset quickblank
+.B set quickblank
 Do quick statusbar blanking.  Statusbar messages will disappear after 1
 keystroke instead of 25.
 .TP
+.B set quiet
+\fBnano\fP will not report errors in the \fInanorc\fP file nor ask them
+to be acknowledged by pressing Enter at startup.  If this is used, it
+should be placed at the top of the file to be fully effective.
+.TP
 .B set quotestr "\fIstring\fP"
 The email-quote string, used to justify email-quoted paragraphs.  This
 is an extended regular expression if your system supports them,
 otherwise a literal string.  The default value is
-"\fI^([\ \\t]*[#:>\\|}])+\fP" if you have extended regular expression
-support, or "\fI>\ \fP" otherwise.  Note that '\\t' stands for a literal
+"\fB^([\ \\t]*[#:>\\|}])+\fP" if you have extended regular expression
+support, and "\fB>\ \fP" otherwise.  Note that '\\t' stands for a literal
 Tab character.
 .TP
-.B set/unset rebinddelete
+.B set rebinddelete
 Interpret the Delete key differently so that both Backspace and Delete
 work properly.  You should only need to use this option if Backspace
 acts like Delete on your system.
 .TP
-.B set/unset rebindkeypad
+.B set rebindkeypad
 Interpret the numeric keypad keys so that they all work properly.  You
 should only need to use this option if they don't, as mouse support
 won't work properly with this option enabled.
 .TP
-.B set/unset regexp
+.B set regexp
 Do extended regular expression searches by default.
 .TP
-.B set/unset smarthome
+.B set smarthome
 Make the Home key smarter.  When Home is pressed anywhere but at the
 very beginning of non-whitespace characters on a line, the cursor will
 jump to that beginning (either forwards or backwards).  If the cursor is
 already at that position, it will jump to the true beginning of the
 line.
 .TP
-.B set/unset smooth
+.B set smooth
 Use smooth scrolling by default.
 .TP
+.B set softwrap
+Enable soft line wrapping for easier viewing of very long lines.
+.TP
 .B set speller "\fIspellprog\fP"
 Use spelling checker \fIspellprog\fP instead of the built-in one, which
 calls \fIspell\fP.
 .TP
-.B set/unset suspend
+.B set statuscolor \fIfgcolor\fR,\fIbgcolor\fR
+Specify the color combination to use for the statusbar.
+See \fBset titlecolor\fR for more details.
+.TP
+.B set suspend
 Allow \fBnano\fP to be suspended.
 .TP
-.B set tabsize \fIn\fP
-Use a tab size of \fIn\fP columns.  The value of \fIn\fP must be greater
-than 0.  The default value is 8.  
+.B set tabsize \fInumber\fR
+Use a tab size of \fInumber\fR columns.  The value of \fInumber\fP must be
+greater than 0.  The default value is \fB8\fR.
 .TP
-.B set/unset tabstospaces
+.B set tabstospaces
 Convert typed tabs to spaces.
 .TP
-.B set/unset tempfile
+.B set tempfile
 Save automatically on exit, don't prompt.
 .TP
-.B set/unset view
+.B set titlecolor \fIfgcolor\fR,\fIbgcolor\fR
+Specify the color combination to use for the titlebar.
+Valid color names for foreground and background are:
+.BR white , \ black , \ red , \ blue , \ green , \ yellow , \ magenta ", and " cyan .
+And either "\fIfgcolor\fR" or ",\fIbgcolor\fR" may be left out.
+.TP
+.B set unix
+Save a file by default in Unix format.  This overrides nano's
+default behavior of saving a file in the format that it had.
+(This option has no effect when you also use \fBset noconvert\fR.)
+.TP
+.B set view
 Disallow file modification.
 .TP
 .B set whitespace "\fIstring\fP"
-Set the two characters used to display the first characters of tabs and
+Set the two characters used to indicate the presence of tabs and
 spaces.  They must be single-column characters.
 .TP
-.B set/unset wordbounds
+.B set wordbounds
 Detect word boundaries more accurately by treating punctuation
 characters as parts of words.
-.TP
-.B syntax "\fIstr\fP" ["\fIfileregex\fP" ... ]
-Defines a syntax named \fIstr\fP which can be activated via the
--Y/--syntax command line option, or will be automatically activated if
-the current filename matches the extended regular expression
-\fIfileregex\fP.  All following \fBcolor\fP and \fBicolor\fP statements
-will apply to \fIsyntax\fP until a new syntax is defined.
 
-The \fInone\fP syntax is reserved; specifying it on the command line is
-the same as not having a syntax at all.  The \fIdefault\fP syntax is
-special: it takes no \fIfileregex\fP, and applies to files that don't
-match any other syntax's \fIfileregex\fP.
+.SH SYNTAX HIGHLIGHTING
+Coloring the different syntactic elements of a file
+is done via regular expressions (see the \fBcolor\fR command below).
+This is inherently imperfect, because regular expressions are not
+powerful enough to fully parse a file.  Nevertheless, regular
+expressions can do a lot and are easy to make, so they are a
+good fit for a small editor like \fBnano\fR.
+.sp
+A separate syntax can be defined for each kind of file
+via the following commands:
 .TP
-.B color \fIfgcolor\fP,\fIbgcolor\fP "\fIregex\fP" ...
-For the currently defined syntax, display all expressions matching
+.BR syntax " ""\fIstr\fR"" [""\fIfileregex\fR"" ...]"
+Defines a syntax named \fIstr\fP which can be activated via the
+.BR \-Y / \-\-syntax
+command-line option, or will be automatically activated if
+the current filename matches the extended regular expression
+\fIfileregex\fP.  All subsequent \fBcolor\fR, \fBicolor\fR,
+\fBheader\fR and other such statements will apply to this
+\fIstr\fP syntax until a new \fBsyntax\fR command is encountered.
+
+The \fBnone\fP syntax is reserved; specifying it on the command line is
+the same as not having a syntax at all.  The \fBdefault\fP syntax is
+special: it takes no \fIfileregex\fP, and applies to files that don't
+match any syntax's \fIfileregex\fP.
+.TP
+.BI linter " program " \fR[ "arg " \fR...]
+Use the given \fIprogram\fR to run a syntax check on the current file
+(this overrides the speller function when defined).
+.TP
+.BI formatter " program " \fR[ "arg " \fR...]
+Use the given \fIprogram\fR to automatically reformat text.
+Useful in certain programming languages (e.g. Go).
+.TP
+.BR header " \fIregex\fR " ...
+Add one or more regexes which will
+be compared against the very first line of the file to be edited,
+to determine whether this syntax should be used for that file.
+.TP
+.BR magic " \fIregex\fR " ...
+Add one or more regexes which
+will be compared against the result of querying the \fBmagic\fP
+database about the file to be edited, to determine whether this
+syntax should be used for that file.  This
+functionality only works when \fBlibmagic\fP is installed on the
+system and will be silently ignored otherwise.
+.TP
+.B color \fIfgcolor\fR,\fIbgcolor\fR """\fIregex\fR""" ...
+Display all pieces of text that match
 the extended regular expression \fIregex\fP with foreground color
 \fIfgcolor\fP and background color \fIbgcolor\fP, at least one of which
-must be specified.  Legal colors for foreground and background color
+must be specified.  Valid colors for foreground and background
 are: white, black, red, blue, green, yellow, magenta, and cyan.  You may
-use the prefix "bright" to force a stronger color highlight for the
+use the prefix "bright" to get a stronger color highlight for the
 foreground.  If your terminal supports transparency, not specifying a
 \fIbgcolor\fP tells \fBnano\fP to attempt to use a transparent
 background.
 .TP
-.B icolor \fIfgcolor\fP,\fIbgcolor\fP "\fIregex\fP" ...
-Same as above, except that the expression matching is case insensitive.
+.B icolor \fIfgcolor\fR,\fIbgcolor\fR """\fIregex\fR""" ...
+Same as above, except that the text matching is case insensitive.
 .TP
-.B color \fIfgcolor\fP,\fIbgcolor\fP start="\fIsr\fP" end="\fIer\fP"
-Display expressions which start with the extended regular expression
-\fIsr\fP and end with the extended regular expression \fIer\fP with
+.BR color " \fIfgcolor\fR,\fIbgcolor\fR " start= """\fIsr\fR"" " end= """\fIer\fR""
+Display all pieces of text whose start matches extended regular expression
+\fIsr\fP and whose end matches extended regular expression \fIer\fP with
 foreground color \fIfgcolor\fP and background color \fIbgcolor\fP,
-at least one of which must be specified.  This allows syntax
-highlighting to span multiple lines.  Note that all subsequent instances
-of \fIsr\fP after an initial \fIsr\fP is found will be highlighted until
-the first instance of \fIer\fP.
+at least one of which must be specified.  This means that, after an
+initial instance of \fIsr\fP, all text will be highlighted until the
+first instance of \fIer\fP.  This allows syntax highlighting to span
+multiple lines.
 .TP
-.B icolor \fIfgcolor\fP,\fIbgcolor\fP start="\fIsr\fP" end="\fIer\fP"
-Same as above, except that the expression matching is case insensitive.
+.BR icolor " \fIfgcolor\fR,\fIbgcolor\fR " start= """\fIsr\fR"" " end= """\fIer\fR""
+Same as above, except that the text matching is case insensitive.
 .TP
-.B include "\fIsyntaxfile\fP"
+.BR include " ""\fIsyntaxfile\fR"""
 Read in self-contained color syntaxes from \fIsyntaxfile\fP.  Note that
-\fIsyntaxfile\fP can only contain \fBsyntax\fP, \fBcolor\fP, and
-\fBicolor\fP commands.
+\fIsyntaxfile\fP may contain only the above commands, from \fBsyntax\fP
+to \fBicolor\fP.
+.TP
+.BI extendsyntax " str directive " \fR[ "arg " \fR...]
+Extend the syntax previously defined as \fIstr\fP to include
+new information.  This allows you to add a new \fBcolor\fP, \fBicolor\fP,
+\fBheader\fP, \fBmagic\fP, \fBlinter\fP, or \fBformatter\fP directive
+to an already defined syntax -- useful when you want to
+slightly improve a syntax defined in one of the system-installed
+files (which are normally not writable)
+.SH REBINDING KEYS
+Key bindings can be changed via the following two commands:
+.TP
+.BI bind " key function menu"
+Rebinds the key \fIkey\fP to a new function named \fIfunction\fP in the
+context of menu \fImenu\fP (or in all menus where the function exists
+by using \fBall\fP).
+.TP
+.BI unbind " key menu"
+Unbinds the key \fIkey\fP from the menu named \fImenu\fP (or from all
+menus where it exists by using \fBall\fP).
+
+.TP
+The format of \fIkey\fP should be one of:
+.RS 3
+.TP 3
+.B ^
+followed by an alpha character or the word "Space".
+Example: ^C
+.TP
+.B M-
+followed by a printable character or the word "Space".
+Example: M-C
+.TP
+.B F
+followed by a numeric value from 1 to 16.
+Example: F10
+.RE
+
+.TP
+Valid \fIfunction\fP names to be bound are:
+.RS 3
+.TP 2
+.B help
+Invokes the help viewer.
+.TP
+.B cancel
+Cancels the current command.
+.TP
+.B exit
+Exits from the program (or from the help viewer or the file browser).
+.TP
+.B writeout
+Writes the current buffer to disk, asking for a name.
+.TP
+.B savefile
+Writes the current file to disk without prompting or warning.
+.TP
+.B insert
+Inserts a file into the current buffer (at the current cursor position),
+or into a new buffer when option \fBmultibuffer\fR is set.
+.TP
+.B whereis
+Searches for text in the current buffer -- or for filenames matching
+a string in the current list in the file browser.
+.TP
+.B searchagain
+Repeats the last search command without prompting.
+.TP
+.B findprevious
+As \fBsearchagain\fR, but always in the backward direction.
+.TP
+.B findnext
+As \fBsearchagain\fR, but always in the forward direction.
+.TP
+.B replace
+Interactively replaces text within the current buffer.
+.TP
+.B cut
+Cuts and stores the current line (or the marked region).
+.TP
+.B copytext
+Copies the current line (or the marked region) without deleting it.
+.TP
+.B uncut
+Copies the currently stored text into the current buffer at the
+current cursor position.
+.TP
+.B mark
+Sets the mark at the current position, to start selecting text.
+.TP
+.B cutwordleft
+Cuts from the cursor position to the beginning of the preceding word.
+.TP
+.B cutwordright
+Cuts from the cursor position to the beginning of the next word.
+.TP
+.B cutrestoffile
+Cuts all text from the cursor position till the end of the buffer.
+.TP
+.B curpos
+Shows the current cursor position: the line, column, and character positions.
+.TP
+.B wordcount
+Counts the number of words, lines and characters in the current buffer.
+.TP
+.B speller
+Invokes a spell-checking program (or a linting program, if the current
+syntax highlighting defines one).
+.TP
+.B linter
+A synonym of \fBspeller\fR (for when the speller has not been configured).
+.TP
+.B justify
+Justifies the current paragraph.
+.TP
+.B fulljustify
+Justifies the entire current buffer.
+.TP
+.B indent
+Indents (shifts to the right) the currently marked text.
+.TP
+.B unindent
+Unindents (shifts to the left) the currently marked text.
+.TP
+.B left
+Goes left one position (in the editor or browser).
+.TP
+.B right
+Goes right one position (in the editor or browser).
+.TP
+.B up
+Goes one line up (in the editor or browser).
+.TP
+.B down
+Goes one line down (in the editor or browser).
+.TP
+.B scrollup
+Scrolls up one line of text from the current position.
+.TP
+.B scrolldown
+Scrolls down one line of text from the current position.
+.TP
+.B prevword
+Moves the cursor to the beginning of the previous word.
+.TP
+.B nextword
+Moves the cursor to the beginning of the next word.
+.TP
+.B home
+Moves the cursor to the beginning of the current line.
+.TP
+.B end
+Moves the cursor to the end of the current line.
+.TP
+.B beginpara
+Moves the cursor to the beginning of the current paragraph.
+.TP
+.B endpara
+Moves the cursor to the end of the current paragraph.
+.TP
+.B prevpage
+Goes up one screenful.
+.TP
+.B nextpage
+Goes down one screenful.
+.TP
+.B firstline
+Goes to the first line of the file.
+.TP
+.B lastline
+Goes to the last line of the file.
+.TP
+.B gotoline
+Goes to a specific line (and column if specified).
+.TP
+.B gototext
+Switches from targeting a line number to searching for text.
+.TP
+.B findbracket
+Moves the cursor to the bracket (brace, parenthesis, etc.) that matches
+(pairs) with the one under the cursor.
+.TP
+.B prevbuf
+Switches to editing/viewing the previous buffer when multiple buffers are open.
+.TP
+.B nextbuf
+Switches to editing/viewing the next buffer when multiple buffers are open.
+.TP
+.B verbatim
+Inserts the next character verbatim into the file.
+.TP
+.B tab
+Inserts a tab at the current cursor location.
+.TP
+.B enter
+Inserts a new line below the current one.
+.TP
+.B delete
+Deletes the character under the cursor.
+.TP
+.B backspace
+Deletes the character before the cursor.
+.TP
+.B undo
+Undoes the last performed text action (add text, delete text, etc).
+.TP
+.B redo
+Redoes the last undone action (i.e., it undoes an undo).
+.TP
+.B refresh
+Refreshes the screen.
+.TP
+.B suspend
+Suspends the editor (if the suspending function is enabled, see the
+"suspendenable" entry below).
+.TP
+.B casesens
+Toggles case sensitivity in searching (search/replace menus only).
+.TP
+.B regexp
+Toggles whether searching/replacing is based on literal strings or regular expressions.
+.TP
+.B backwards
+Toggles whether searching/replacing goes forward or backward.
+.TP
+.B prevhistory
+Shows the previous history entry in the prompt menus (e.g. search).
+.TP
+.B nexthistory
+Shows the next history entry in the prompt menus (e.g. search).
+.TP
+.B flipreplace
+Toggles between searching for something and replacing something.
+.TP
+.B flipexecute
+Toggles between inserting a file and executing a command.
+.TP
+.B flipnewbuffer
+Toggles between inserting into the current buffer and into a new
+empty buffer.
+.TP
+.B dosformat
+When writing a file, switches to writing a DOS format (CR/LF).
+.TP
+.B macformat
+When writing a file, switches to writing a Mac format.
+.TP
+.B append
+When writing a file, appends to the end instead of overwriting.
+.TP
+.B prepend
+When writing a file, 'prepends' (writes at the beginning) instead of overwriting.
+.TP
+.B backup
+When writing a file, creates a backup of the current file.
+.TP
+.B discardbuffer
+When about to write a file, discard the current buffer without saving.
+(This function is bound by default only when option \fB\-\-tempfile\fR
+is in effect.)
+.TP
+.B tofiles
+Starts the file browser, allowing to select a file from a list.
+.TP
+.B gotodir
+Goes to a directory to be specified, allowing to browse anywhere
+in the filesystem.
+.TP
+.B firstfile
+Goes to the first file when using the file browser (reading or writing files).
+.TP
+.B lastfile
+Goes to the last file when using the file browser (reading or writing files).
+.TP
+.B nohelp
+Toggles the presence of the two-line list of key bindings at the bottom of the screen.
+.TP
+.B constupdate
+Toggles the constant display of the current line, column, and character positions.
+.TP
+.B morespace
+Toggles the presence of the blank line which 'separates' the titlebar from the file text.
+.TP
+.B smoothscroll
+Toggles smooth scrolling (when moving around with the arrow keys).
+.TP
+.B softwrap
+Toggles the displaying of overlong lines on multiple screen lines.
+.TP
+.B whitespacedisplay
+Toggles the showing of whitespace.
+.TP
+.B nosyntax
+Toggles syntax highlighting.
+.TP
+.B smarthome
+Toggles the smartness of the Home key.
+.TP
+.B autoindent
+Toggles whether new lines will contain the same amount of whitespace as the preceding line.
+.TP
+.B cuttoend
+Toggles whether cutting text will cut the whole line or just from the current cursor
+position to the end of the line.
+.TP
+.B nowrap
+Toggles whether long lines will be hard-wrapped to the next line.
+.TP
+.B tabstospaces
+Toggles whether typed tabs will be converted to spaces.
+.TP
+.B backupfile
+Toggles whether a backup will be made of the file being edited.
+.TP
+.B multibuffer
+Toggles whether a file is inserted into the current buffer
+or read into a new buffer.
+.TP
+.B mouse
+Toggles mouse support.
+.TP
+.B noconvert
+Toggles automatic conversion of files from DOS/Mac format.
+.TP
+.B suspendenable
+Toggles whether the suspend sequence (normally ^Z) will suspend the editor window.
+.RE
+
+.TP
+Valid \fImenu\fP sections are:
+.RS 3
+.TP 2
+.B main
+The main editor window where text is entered and edited.
+.TP
+.B search
+The search menu (AKA whereis).
+.TP
+.B replace
+The 'search to replace' menu.
+.TP
+.B replacewith
+The 'replace with' menu, which comes up after 'search to replace'.
+.TP
+.B gotoline
+The 'goto line (and column)' menu.
+.TP
+.B writeout
+The 'write file' menu.
+.TP
+.B insert
+The 'insert file' menu.
+.TP
+.B extcmd
+The menu for inserting output from an external command, reached from the insert menu.
+.TP
+.B help
+The help-viewer menu.
+.TP
+.B spell
+The interactive spell checker Yes/no menu.
+.TP
+.B linter
+The linter menu.
+.TP
+.B browser
+The file browser for inserting or writing a file.
+.TP
+.B whereisfile
+The 'search for a file' menu in the file browser.
+.TP
+.B gotodir
+The 'go to directory' menu in the file browser.
+.TP
+.B all
+A special name that encompasses all menus.
+For \fBbind\fR it means all menus where the specified \fIfunction\fR exists;
+for \fBunbind\fR it means all menus where the specified \fIkey\fR exists.
+.RE
+
 .SH FILES
 .TP
-.I SYSCONFDIR/nanorc
-System-wide configuration file
+.B /etc/nanorc
+System-wide configuration file.
 .TP
-.I ~/.nanorc
-Per-user configuration file
+.B ~/.nanorc
+Per-user configuration file.
 .SH SEE ALSO
-.PD 0
 .TP
 \fBnano\fP(1)
 .PP

doc/man/rnano.1

@@ -1,14 +1,25 @@
 .\" Hey, EMACS: -*- nroff -*-
-.\" 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>.
-.\"
-.\" This is free documentation, see the latest version of the GNU
-.\" General Public License for copying conditions.  There is NO
-.\" warranty.
-.\"
 .\" $Id$
-.TH RNANO 1 "version 2.0.0" "October 28, 2006"
+.\"
+.\" Copyright (C) 2002, 2005, 2006, 2007, 2014 Free Software Foundation, Inc.
+.\"
+.\" This document is dual-licensed.  You may distribute and/or modify it
+.\" under the terms of either of the following licenses:
+.\"
+.\" * The GNU General Public License, as published by the Free Software
+.\"   Foundation, version 3 or (at your option) any later version.  You
+.\"   should have received a copy of the GNU General Public License
+.\"   along with this program.  If not, see
+.\"   <http://www.gnu.org/licenses/>.
+.\"
+.\" * The GNU Free Documentation License, as published by the Free
+.\"   Software Foundation, version 1.2 or (at your option) any later
+.\"   version, with no Invariant Sections, no Front-Cover Texts, and no
+.\"   Back-Cover Texts.  You should have received a copy of the GNU Free
+.\"   Documentation License along with this program.  If not, see
+.\"   <http://www.gnu.org/licenses/>.
+.\"
+.TH RNANO 1 "version 2.5.3" "February 2016"
 .\" Please adjust this date whenever revising the manpage.
 .\"
 .SH NAME
@@ -17,18 +28,12 @@ Pico clone
 
 .SH SYNOPSIS
 .B rnano
-.I [OPTIONS]\ [[\+LINE,COLUMN]\ FILE]...
-.br
+.RI [ options "] [[+" line , column "]\ " file "]..."
 
 .SH DESCRIPTION
-This manual page briefly documents the \fBrnano\fP command.
-.PP
-.\" TeX users may be more comfortable with the \fB<whatever>\fP and
-.\" \fI<whatever>\fP escape sequences to invoke bold face and italics, 
-.\" respectively.
 \fBnano\fP is a small, free and friendly editor which aims to replace
-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
+Pico, the default editor included in the non-free Pine package.  On
+top of 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 and column number".
 .PP
@@ -36,7 +41,7 @@ replace" and "go to line and column number".
 specific files and doesn't allow the user access to the filesystem or a
 command shell.
 .PP
-In restricted mode, \fBnano\fP will \fInot\fP:
+In restricted mode, \fBnano\fP will \fInot\/\fP:
 .IP \[bu] 2
 read or write to any file not specified on the command line;
 .IP \[bu]
@@ -51,22 +56,13 @@ use backup files or spell checking.
 
 .SH OPTIONS
 .TP
-.B \+\fILINE\fP,\fICOLUMN\fP
-Places cursor at line number \fILINE\fP and column number \fICOLUMN\fP
-(at least one of which must be specified) on startup, instead of the
-default of line 1, column 1.
+.BR \-h ", " \-\-help
+Show a summary of command-line options and exit.
 .TP
-.B \-?
-Same as \fB-h (\-\-help)\fP.
-.TP
-.B \-h (\-\-help)
-Show a summary of command line options and exit.
-.TP
-.B \-V (\-\-version)
+.BR \-V ", " \-\-version
 Show the current version number and exit.
 .PP
-See the \fBnano\fP(1) manpage for the complete documentation of
-\fBnano\fP.
+See the \fBnano\fP(1) manpage for all of the possible options.
 
 .SH BUGS
 Please send any comments or bug reports to \fBnano@nano-editor.org\fP.
@@ -80,7 +76,7 @@ of "subscribe".
 http://www.nano-editor.org/
 
 .SH AUTHOR
-Chris Allegretta <chrisa@asty.org>, et al (see AUTHORS for details).
+Chris Allegretta <chrisa@asty.org>, et al (see the file AUTHORS for details).
 This manual page was originally written by Thijs Kinkhorst
 <thijs@kinkhorst.com>, for the Debian system (but may be used by
 others).

doc/nanorc.sample.in

@@ -5,7 +5,7 @@
 ## DOS or Mac format, and that characters specially interpreted by the
 ## shell should not be escaped here.
 ##
-## To make sure a value is disabled, use "unset <option>".
+## To make sure an option is disabled, use "unset <option>".
 ##
 ## For the options that take parameters, the default value is given.
 ## Other options are unset by default.
@@ -15,10 +15,15 @@
 ## its end.  For example, for the "brackets" option, ""')>]}" will match
 ## ", ', ), >, ], and }.
 
+## Silently ignore problems with unknown directives in the nanorc file.
+## Useful when your nanorc file might be read on systems with multiple
+## versions of nano installed (e.g. your home directory is on NFS).
+# set quiet
+
 ## Use auto-indentation.
 # set autoindent
 
-## Backup files to filename~.
+## Back up files to the current filename plus a tilde.
 # set backup
 
 ## The directory to put unique backup files in.
@@ -34,32 +39,38 @@
 ## paragraphs.  They cannot contain blank characters.  Only closing
 ## punctuation, optionally followed by closing brackets, can end
 ## sentences.
-##
 # set brackets ""')>]}"
 
-## Do case sensitive searches by default.
+## Do case-sensitive searches by default.
 # set casesensitive
 
 ## Constantly display the cursor position in the statusbar.  Note that
 ## this overrides "quickblank".
-# set const
+# set constantshow
+## (The old form, 'const', is deprecated.)
 
-## Use cut to end of line by default.
+## Use cut-to-end-of-line by default.
 # set cut
 
 ## Set the line length for wrapping text and justifying paragraphs.
-## If fill is 0 or less, the line length will be the screen width less
-## this number.
-##
+## If the value is 0 or less, the wrapping point will be the screen
+## width less this number.
 # set fill -8
 
-## Enable ~/.nano_history for saving and reading search/replace strings.
+## Remember the used search/replace strings for the next session.
 # set historylog
 
+## Have the justify command kill whitespace at the end of lines
+# set justifytrim
+
+## Enable vim-style lock-files.  This is just to let a vim user know you
+## are editing a file [s]he is trying to edit and vice versa. There are
+## no plans to implement vim-style undo state in these files.
+# set locking
+
 ## The opening and closing brackets that can be found by bracket
 ## searches.  They cannot contain blank characters.  The former set must
 ## come before the latter set, and both must be in the same order.
-##
 # set matchbrackets "(<[{)>]}"
 
 ## Use the blank line below the titlebar as extra editing space.
@@ -69,21 +80,15 @@
 ## mouse clicks can be used to place the cursor, set the mark (with a
 ## double click), and execute shortcuts.  The mouse will work in the X
 ## Window System, and on the console when gpm is running.
-##
 # set mouse
 
-## Allow multiple file buffers (inserting a file will put it into a
-## separate buffer).  You must have configured with --enable-multibuffer
-## for this to work.
-##
+## Switch on multiple file buffers (inserting a file will put it into
+## a separate buffer).
 # set multibuffer
 
 ## Don't convert files from DOS/Mac format.
 # set noconvert
 
-## Don't follow symlinks when writing files.
-# set nofollow
-
 ## Don't display the helpful shortcut lists at the bottom of the screen.
 # set nohelp
 
@@ -96,10 +101,13 @@
 ## Set operating directory.  nano will not read or write files outside
 ## this directory and its subdirectories.  Also, the current directory
 ## is changed to here, so any files are inserted from this dir.  A blank
-## string means the operating directory feature is turned off.
-##
+## string means the operating-directory feature is turned off.
 # set operatingdir ""
 
+## Remember the cursor position in each file for the next editing session.
+# set positionlog
+## (The old form, 'poslog', is deprecated.)
+
 ## Preserve the XON and XOFF keys (^Q and ^S).
 # set preserve
 
@@ -107,19 +115,18 @@
 ## paragraphs.  They cannot contain blank characters.  Only closing
 ## punctuation, optionally followed by closing brackets, can end
 ## sentences.
-##
 # set punct "!.?"
 
 ## Do quick statusbar blanking.  Statusbar messages will disappear after
 ## 1 keystroke instead of 26.  Note that "const" overrides this.
-##
 # set quickblank
 
 ## The email-quote string, used to justify email-quoted paragraphs.
 ## This is an extended regular expression if your system supports them,
-## otherwise a literal string.  Default:
+## otherwise a literal string.
+## If you have extended regular expression support, the default is:
 # set quotestr "^([ 	]*[#:>\|}])+"
-## if you have extended regular expression support, otherwise:
+## Otherwise:
 # set quotestr "> "
 
 ## Fix Backspace/Delete confusion problem.
@@ -141,9 +148,11 @@
 ## Use smooth scrolling as the default.
 # set smooth
 
+## Enable soft line wrapping (AKA full-line display).
+# set softwrap
+
 ## Use this spelling checker instead of the internal one.  This option
 ## does not properly have a default value.
-##
 # set speller "aspell -x -c"
 
 ## Allow nano to be suspended.
@@ -155,7 +164,7 @@
 ## Convert typed tabs to spaces.
 # set tabstospaces
 
-## Save automatically on exit, don't prompt.
+## Save automatically on exit; don't prompt.
 # set tempfile
 
 ## Disallow file modification.  Why would you want this in an rcfile? ;)
@@ -164,14 +173,25 @@
 ## The two single-column characters used to display the first characters
 ## of tabs and spaces.  187 in ISO 8859-1 (0000BB in Unicode) and 183 in
 ## ISO-8859-1 (0000B7 in Unicode) seem to be good values for these.
-# set whitespace "  "
+## The default when in a UTF-8 locale:
+# set whitespace "»·"
+## The default otherwise:
+# set whitespace ">."
 
 ## Detect word boundaries more accurately by treating punctuation
 ## characters as parts of words.
 # set wordbounds
 
 
-## Color setup
+## Paint the interface elements of nano.
+## This is an example; by default there are no colors.
+# set titlecolor brightwhite,blue
+# set statuscolor brightwhite,green
+# set keycolor green
+# set functioncolor yellow
+
+
+## Setup of syntax coloring.
 ##
 ## Format:
 ##
@@ -186,8 +206,8 @@
 ## or
 ## icolor foreground,background "regex" ["regex"...]
 ##
-## "color" will do case sensitive matches, while "icolor" will do case
-## insensitive matches.
+## "color" will do case-sensitive matches, while "icolor" will do
+## case-insensitive matches.
 ##
 ## Valid colors: white, black, red, blue, green, yellow, magenta, cyan.
 ## For foreground colors, you may use the prefix "bright" to get a
@@ -200,9 +220,10 @@
 ## color will use a transparent color.  If you don't want this, be sure
 ## to set the background color to black or white.
 ##
-## If you wish, you may put your syntaxes in separate files.  You can
-## make use of such files (which can only include "syntax", "color", and
-## "icolor" commands) as follows:
+## All regexes should be extended regular expressions.
+##
+## If you wish, you may put your syntax definitions in separate files.
+## You can make use of such files as follows:
 ##
 ## include "/path/to/syntax_file.nanorc"
 ##
@@ -211,50 +232,20 @@
 ## name inside that file.  These names are kept fairly short to make
 ## them easier to remember and faster to type using nano's -Y option.
 ##
-## All regexes should be extended regular expressions.
+## To include all existing syntax definitions, you can do:
+# include "@PKGDATADIR@/*.nanorc"
 
 
-## Nanorc files
-# include "@PKGDATADIR@/nanorc.nanorc"
+## Key bindings.
+## See nanorc(5) (section REBINDING KEYS) for more details on this.
+##
+## The following five functions are not bound to any key by default.
+## You may wish to choose different keys than the ones suggested here.
+# bind ^S savefile main
+# bind M-Q findprevious main
+# bind M-W findnext main
+# bind M-B cutwordleft main
+# bind M-N cutwordright main
 
-## C/C++
-# include "@PKGDATADIR@/c.nanorc"
-
-## HTML
-# include "@PKGDATADIR@/html.nanorc"
-
-## TeX
-# include "@PKGDATADIR@/tex.nanorc"
-
-## Quoted emails (under e.g. mutt)
-# include "@PKGDATADIR@/mutt.nanorc"
-
-## Patch files
-# include "@PKGDATADIR@/patch.nanorc"
-
-## Manpages
-# include "@PKGDATADIR@/man.nanorc"
-
-## Groff
-# include "@PKGDATADIR@/groff.nanorc"
-
-## Perl
-# include "@PKGDATADIR@/perl.nanorc"
-
-## Python
-# include "@PKGDATADIR@/python.nanorc"
-
-## Ruby
-# include "@PKGDATADIR@/ruby.nanorc"
-
-## Java
-# include "@PKGDATADIR@/java.nanorc"
-
-## Assembler
-# include "@PKGDATADIR@/asm.nanorc"
-
-## Bourne shell scripts
-# include "@PKGDATADIR@/sh.nanorc"
-
-## POV-Ray
-# include "@PKGDATADIR@/pov.nanorc"
+## Set this if your Backspace key sends Del most of the time.
+# bind Del backspace all

doc/syntax/.cvsignore

@@ -1,2 +0,0 @@
-Makefile
-Makefile.in

doc/syntax/Makefile.am

@@ -1,17 +1,44 @@
 pkgdata_DATA =	asm.nanorc \
+		autoconf.nanorc \
+		awk.nanorc \
+		changelog.nanorc \
+		cmake.nanorc \
 		c.nanorc \
+		css.nanorc \
+		debian.nanorc \
+		default.nanorc \
+		elisp.nanorc \
+		fortran.nanorc \
+		gentoo.nanorc \
+		go.nanorc \
 		groff.nanorc \
+		guile.nanorc \
 		html.nanorc \
 		java.nanorc \
+		javascript.nanorc \
+		json.nanorc \
+		lua.nanorc \
+		makefile.nanorc \
 		man.nanorc \
+		mgp.nanorc \
 		mutt.nanorc \
+		nftables.nanorc \
 		nanorc.nanorc \
+		objc.nanorc \
+		ocaml.nanorc \
 		patch.nanorc \
 		perl.nanorc \
+		php.nanorc \
+		po.nanorc \
+		postgresql.nanorc \
 		pov.nanorc \
 		python.nanorc \
 		ruby.nanorc \
 		sh.nanorc \
-		tex.nanorc
+		spec.nanorc \
+		tcl.nanorc \
+		tex.nanorc \
+		texinfo.nanorc \
+		xml.nanorc
 
 EXTRA_DIST = $(pkgdata_DATA)

doc/syntax/asm.nanorc

@@ -1,15 +1,24 @@
 ## Here is an example for assembler.
-##
+
 syntax "asm" "\.(S|s|asm)$"
+magic "[Aa]ssembl(y|er)"
+
 color red "\<[A-Z_]{2,}\>"
 color brightgreen "\.(data|subsection|text)"
 color green "\.(align|file|globl|global|hidden|section|size|type|weak)"
 color brightyellow "\.(ascii|asciz|byte|double|float|hword|int|long|short|single|struct|word)"
 icolor brightred "^[[:space:]]*[.0-9A-Z_]*:"
 color brightcyan "^[[:space:]]*#[[:space:]]*(define|undef|include|ifn?def|endif|elif|else|if|warning|error)"
-## Highlight strings (note: VERY resource intensive)
+
+# Strings.
 color brightyellow "<[^= 	]*>" ""(\\.|[^"])*""
-color brightyellow start=""(\\.|[^"])*\\[[:space:]]*$" end="^(\\.|[^"])*""
-## Highlight comments
+# Multiline strings.  This regex is VERY resource intensive,
+# and sometimes colours things that shouldn't be coloured.
+###color brightyellow start=""(\\.|[^"])*\\[[:space:]]*$" end="^(\\.|[^"])*""
+
+# Comments.
 color brightblue "//.*"
 color brightblue start="/\*" end="\*/"
+
+# Trailing whitespace.
+color ,green "[[:space:]]+$"

doc/syntax/autoconf.nanorc

@@ -0,0 +1,31 @@
+## Here is an example for Autoconf.
+
+syntax "autoconf" "\.(ac|m4)$"
+
+# Keywords:
+color yellow "\<(if|test|then|elif|else|fi|for|in|do|done)\>"
+color yellow "(=|!=|&&|\|\|)"
+
+# Macros:
+color cyan "\<[[:upper:]_[:digit:]]+\>"
+
+# Version numbers:
+color red "\<[-_.0-9]+\>"
+
+# Strings:
+color red "\"[^"]*\""  "\'[^']*\'"
+
+# Backticks:
+color green "`[^`]*`"
+
+# Error lines:
+color black "^\*\*\*.*"
+
+# Brackets:
+color magenta "\[|\]|\(|\)"
+
+# Comments:
+color blue "^[[:blank:]]*#.*"  "\<dnl.*"
+
+# Trailing whitespace:
+color ,green "[[:space:]]+$"

doc/syntax/awk.nanorc

@@ -0,0 +1,36 @@
+## Here is an example for awk.
+
+syntax "awk" "\.awk$"
+magic "awk.*script text"
+
+# Records.
+icolor brightred "\$[0-9A-Z_!@#$*?-]+"
+# Awk-set variables.
+color red "\<(ARGC|ARGIND|ARGV|BINMODE|CONVFMT|ENVIRON|ERRNO|FIELDWIDTHS)\>"
+color red "\<(FILENAME|FNR|FS|IGNORECASE|LINT|NF|NR|OFMT|OFS|ORS)\>"
+color red "\<(PROCINFO|RS|RT|RSTART|RLENGTH|SUBSEP|TEXTDOMAIN)\>"
+# Function declarations and special patterns.
+color brightgreen "\<(function|extension|BEGIN|END)\>"
+# Operators.
+color green "(\{|\}|\(|\)|\;|\]|\[|\\|<|>|!|=|&|\+|-|\*|%|/|\?:|\^|\|)"
+# Flow control.
+color brightyellow "\<(for|if|while|do|else|in|delete|exit)\>"
+color brightyellow "\<(break|continue|return)\>"
+# I/O statements.
+color brightgreen "\<(close|getline|next|nextfile|print|printf)\>"
+color brightgreen "\<(system|fflush)\>"
+# Standard functions.
+color magenta "\<(atan2|cos|exp|int|log|rand|sin|sqrt|srand)\>"
+color magenta "\<(asort|asorti|gensub|gsub|index|length|match)\>"
+color magenta "\<(split|sprintf|strtonum|sub|substr|tolower|toupper)\>"
+color magenta "\<(mktime|strftime|systime)\>"
+color magenta "\<(and|compl|lshift|or|rshift|xor)\>"
+color magenta "\<(bindtextdomain|dcgettext|dcngettext)\>"
+
+# Strings.
+color brightyellow "<[^= 	]*>" ""(\\.|[^"])*""
+# Comments.
+color brightblue "(^|[[:space:]])#.*$"
+
+# Trailing whitespace.
+color ,green "[[:space:]]+$"

doc/syntax/c.nanorc

@@ -1,27 +1,34 @@
 ## Here is an example for C/C++.
-##
-syntax "c" "\.(c(c|pp|xx)?|C)$" "\.(h(h|pp|xx)?|H)$" "\.ii?$"
-color brightred "\<[A-Z_][0-9A-Z_]+\>" 
-color green "\<(float|double|bool|char|int|short|long|sizeof|enum|void|static|const|struct|union|typedef|extern|(un)?signed|inline)\>"
+
+syntax "c" "\.(c(c|pp|xx|\+\+)?|C)$" "\.(h(h|pp|xx)?|H)$" "\.ii?$"
+magic "(ASCII|UTF-8 Unicode) C(\+\+)? program text"
+
+color brightred "\<[A-Z_][0-9A-Z_]+\>"
+color green "\<(float|double|bool|char|int|short|long|sizeof|enum|void|auto|static|const|struct|union|typedef|extern|(un)?signed|inline)\>"
 color green "\<((s?size)|((u_?)?int(8|16|32|64|ptr)))_t\>"
 color green "\<(class|namespace|template|public|protected|private|typename|this|friend|virtual|using|mutable|volatile|register|explicit)\>"
 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|include|(un|ifn?)def|endif|el(if|se)|if|warning|error)"
+color brightcyan "^[[:space:]]*#[[:space:]]*(define|include(_next)?|(un|ifn?)def|endif|el(if|se)|if|warning|error|pragma)"
 color brightmagenta "'([^'\]|(\\["'abfnrtv\\]))'" "'\\(([0-3]?[0-7]{1,2}))'" "'\\x[0-9A-Fa-f]{1,2}'"
-##
-## GCC builtins
-color cyan "__attribute__[[:space:]]*\(\([^)]*\)\)" "__(aligned|asm|builtin|hidden|inline|packed|restrict|section|typeof|weak)__"
-##
-## 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 brightyellow "<[^= 	]*>" ""(\\.|[^"])*""
-##
-## This string is VERY resource intensive!
-color brightyellow start=""(\\.|[^"])*\\[[:space:]]*$" end="^(\\.|[^"])*""
 
-## Comment highlighting
+# GCC builtins.
+color cyan "__attribute__[[:space:]]*\(\([^)]*\)\)" "__(aligned|asm|builtin|hidden|inline|packed|restrict|section|typeof|weak)__"
+
+# Strings.  In general you will want your strings and comments to come last,
+# because highlighting rules are applied in the order they are read in.
+color brightyellow ""([^"]|\\")*"" "<[^[:blank:]=]*>"
+# Multiline strings.  This regex is VERY resource intensive,
+# and sometimes colours things that shouldn't be coloured.
+###color brightyellow start=""(\\.|[^"])*\\[[:space:]]*$" end="^(\\.|[^"])*""
+
+# Comments.
 color brightblue "//.*"
 color brightblue start="/\*" end="\*/"
+
+# Reminders.
+color ,yellow "\<(FIXME|TODO|XXX)\>"
+
+# Trailing whitespace.
+color ,green "[[:space:]]+$"

doc/syntax/changelog.nanorc

@@ -0,0 +1,28 @@
+## Colouring for Changelogs.
+
+syntax "changelog" "Change[Ll]og.*"
+
+# Author lines.
+color green "^(19|20).*$"
+# Dates.
+color red "^(19|20)[0-9-]{8}"
+# Email addresses.
+color yellow "<[^>]*@[^>]*>"
+
+# Command-line options.
+color cyan "[[:space:]]-[a-zA-Z\$]" "--[8a-z-]+"
+# Bug and patch numbers.
+color cyan "bug #[0-9]{5,9}" "patch #[0-9]{4,9}"
+# Probable constants, for variety.
+color brightred "\<[A-Z_][0-9A-Z_]+\>"
+# Key sequences.
+color brightblue "\^[A-Z^\]" "\<M-." "\<F1?[0-9]" "(\^|M-)Space"
+
+# Changed files.
+color magenta start="^(	| {8})\* " end="(:( |$)|^$)"
+
+# Release markers.
+color brightblue "^(GNU )?nano[- ][0-9]\.[0-9]\.[^ ]+"
+
+# Trailing whitespace.
+color ,green "[[:space:]]+$"

doc/syntax/cmake.nanorc

@@ -0,0 +1,19 @@
+## Syntax highlighting for CMake files.
+
+syntax "cmake" "(CMakeLists\.txt|\.cmake)$"
+
+icolor green "^[[:space:]]*[A-Z0-9_]+"
+icolor brightyellow "^[[:space:]]*(include|include_directories|include_external_msproject)\>"
+
+icolor brightgreen "^[[:space:]]*\<((else|end)?if|else|(end)?while|(end)?foreach|break)\>"
+color brightgreen "\<(NOT|COMMAND|POLICY|TARGET|EXISTS|IS_(DIRECTORY|ABSOLUTE)|DEFINED)\>[[:space:]]"
+color brightgreen "[[:space:]]\<(OR|AND|IS_NEWER_THAN|MATCHES|(STR|VERSION_)?(LESS|GREATER|EQUAL))\>[[:space:]]"
+
+icolor brightred "^[[:space:]]*\<((end)?(function|macro)|return)"
+
+icolor cyan start="\$(\{|ENV\{)" end="\}"
+color magenta "\<(APPLE|UNIX|WIN32|CYGWIN|BORLAND|MINGW|MSVC(_IDE|60|71|80|90)?)\>"
+
+icolor brightblue "^([[:space:]]*)?#.*"
+icolor brightblue "[[:space:]]#.*"
+color ,green "[[:space:]]+$"

doc/syntax/css.nanorc

@@ -0,0 +1,10 @@
+## Here is an example for CSS files.
+
+syntax "css" "\.css$"
+
+color brightred     "."
+color brightyellow  start="\{" end="\}"
+color brightwhite   start=":" end="([;^\{]|$)"
+color brightblue    ":active|:focus|:hover|:link|:visited|:link|:after|:before|$"
+color brightblue    start="\/\*" end="\\*/"
+color green         ";|:|\{|\}"

doc/syntax/debian.nanorc

@@ -0,0 +1,20 @@
+## Here is an example for apt's sources.list.
+
+syntax "sources.list" "sources\.list(~|\.old|\.save)?$" "sources\.list\.d/.*\.list(~|\.old|\.save)?$"
+
+# Coloring the deb lines, working from tail to head.  First the
+# components -- well, everything, and thus also the components.
+color brightmagenta "^deb.*"
+# Distribution -- well, everything, except the components.
+color brightred "^deb(-src)?\s+.*((ftp|https?|rsh|ssh|copy|file|spacewalk|tor):/\S+|cdrom:\[.+\]/)\s+\S+"
+# URIs.
+color brightgreen "^deb(-src)?\s+.*(ftp|https?|rsh|ssh|copy|file|spacewalk|tor):/\S+"
+# CDroms.
+color brightgreen "^deb(-src)?\s+.*cdrom:\[.+\]/"
+# Options.
+color brightcyan "^deb(-src)?\s+\[.+\]\s+"
+# And finally the initial deb tag.
+color yellow "^deb(-src)?"
+
+# Comments.
+color brightblue "#.*"

doc/syntax/default.nanorc

@@ -0,0 +1,10 @@
+## A default syntax, which is used
+## for files that do not match any other syntax.
+
+syntax "default"
+
+# Spaces in front of tabs.
+color ,red " +	+"
+
+# Nano's name, including version.
+color brightred "(GNU )?nano [1-9]\.[0-9]\.[^[:space:][:punct:]]+"

doc/syntax/elisp.nanorc

@@ -0,0 +1,31 @@
+## Here is an example for Emacs Lisp.
+
+syntax "elisp" "\.el$"
+
+# Basic functions/macros
+color brightcyan "\<(if|when|unless|cond|and|or|lambda|let|progn|while|dolist|dotimes)\>"
+color brightcyan "\<save-((window-)?excursion|restriction)\>"
+color brightcyan "\<eval-(and|when)-compile\>"
+# Defining functions
+color brightcyan "\<def(un|macro|subst|generic|alias)\>"
+color brightcyan "\<cl-def(un|macro|subst|generic|struct|type)\>"
+color brightcyan "\<define-(derived|minor|generic)-mode\>"
+# Defining variables
+color brightcyan "\<def(class|const|var(-local|alias)?)\>"
+# Customization functions
+color brightcyan "\<def(custom|face|group|theme)\>"
+# Setting values
+color brightcyan "\<(setq(-default|-local)?|setf|push|pop|declare(-function)?)\>"
+# Feature functions
+color brightcyan "\<(require|provide)\>"
+# Quoted symbols
+color brightyellow "#?'\<(\w|-)+\>"
+# Booleans
+color brightred "\<(t|nil)\>"
+# Keywords
+color blue ":(\w|[?-])+"
+# Strings
+color yellow start="^[[:blank:]]+\"" end="[^\]\""
+color yellow ""(\\.|[^"])*""
+# Comments
+color cyan "(^|[[:space:]]);.*$"

doc/syntax/fortran.nanorc

@@ -0,0 +1,39 @@
+## Here is an example for Fortran 90/95.
+
+syntax "fortran" "\.(f|f90|f95)$"
+
+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)\>"
+
+# Strings.
+icolor yellow "<[^= 	]*>" ""(\\.|[^"])*""
+
+# Comments.
+icolor blue "!.*"

doc/syntax/gentoo.nanorc

@@ -0,0 +1,67 @@
+## Here is an example for Gentoo ebuilds/eclasses.
+
+syntax "ebuild" "\.e(build|class)$"
+
+## All the standard portage functions
+color brightgreen "(^|\<default_)src_(unpack|prepare|configure|compile|install|test)\>"
+color brightgreen "^pkg_(config|nofetch|info|pretend|setup|(pre|post)(inst|rm))\>"
+color brightgreen "\<default(_pkg_nofetch|_src_(unpack|prepare|configure|compile|test))?\>"
+## Highlight bash related syntax
+color green "\<(break|case|continue|do|done|elif|else|esac|exit|fi|for|function|if|in|read|return|select|shift|then|time|until|while)\>"
+color green "\<(declare|eval|exec|export|let|local)\>"
+color green "[{}():;|`$<>!=&\\]" "(\]|\[)"
+color green "-[defhnrsuwxzL]\>"
+color green "-(eq|ne|gt|lt|ge|le)\>"
+## Highlight variables ... official portage ones in red, all others in bright red
+color brightred "\$[-0-9@*#?$!]" "\$[[:alpha:]_][[:alnum:]_]*"
+color brightred "\$\{[#!]?([-@*#?$!]|[0-9]+|[[:alpha:]_][[:alnum:]_]*)(\[([[:digit:]]|@)+\])?(([#%/]|:?[-=?+])[^}]*\}|\[|\})"
+color red "\<(EAPI|ARCH|HOMEPAGE|DESCRIPTION|IUSE|SRC_URI|LICENSE|SLOT|KEYWORDS|[HPR]?DEPEND|PROVIDE|PROPERTIES|REQUIRED_USE|RESTRICT|USERLAND)\>"
+color red "\<(S|E?D|T|PV|PF|P|PN|PR|PVR|A|CATEGORY|DISTDIR|FILESDIR|EPREFIX|E?ROOT|WORKDIR)\>"
+color red "\<(AS|C(PP|XX)?|LD)FLAGS\>" "\<C(HOST|TARGET|BUILD)\>" "\<(MERGE_TYPE|REPLACING_VERSIONS|REPLACED_BY_VERSION)\>"
+color red "\<EBUILD_PHASE(_FUNC)?\>"
+color red "\<QA_((TEXTRELS|EXECSTACK|WX_LOAD)(_[a-zA-Z_0-9]+)?|DT_HASH|PRESTRIPPED)\>"
+color red "\<(PATCHES|(HTML_)?DOCS)\>" "\<WANT_(AUTO(CONF|MAKE)|LIBTOOL)\>" "\<AT_M4DIR\>"
+## Highlight portage commands
+color magenta "\<(use(_(with|enable|if_iuse)|x)?|in_iuse)\> [!a-zA-Z0-9_+ -]*" "inherit.*"
+color brightblue "\<e(begin|end|conf|install|make|qmake4|ant|(qa)?warn|infon?|error|log|patch(_user)?|new(group|user))\>"
+color brightblue "\<e(pause|beep|mktemp|(cvs|svn)_clean|punt_cxx)\>" "\<e(aclocal|auto(reconf|header|conf|make)|libtoolize)\>"
+color brightblue "\<e(stack|shopts|umask)_(push|pop)\>" "\<version_is_at_least\>"
+color brightblue "\<make_desktop_entry\>" "\<unpack(_(makeself|pdv))?\>"
+color brightblue "\<(die|hasv?|inherit|nonfatal)\>" "\<(use(_(with|enable|if_iuse)|x)?|in_iuse)\>" "\<(has|best)_version\>"
+color brightblue "\<(do|new)(ins|(games)?s?bin|doc|lib(\.so|\.a)?|man|info|exe|initd|confd|envd|pam|menu|icon)\>"
+color brightblue "\<do(compress|header|python|sed|dir|hard|sym|html|jar|mo)\>" "\<keepdir\>"
+color brightblue "\<prepall(docs|info|man|strip)?\>" "\<prep(info|lib|lib\.(so|a)|man|strip|gamesdirs)\>"
+color brightblue "\<(doc|ins|exe)?into\>" "\<(f|games)(owners|perms)\>" "\<(exe|ins|dir)opts\>"
+color brightblue "\<tc-get(BUILD_)?(AR|AS|CC|CPP|CXX|LD|NM|OBJCOPY|PKG_CONFIG|RANLIB)\>"
+color brightblue "\<tc-(arch(-kernel)?|export|has-(tls|openmp))\>"
+## Highlight common commands used in ebuilds
+color blue "\<(awk|cat|cd|chmod|chown|cp|echo|env|find|e?grep|ln|make|mkdir|mv|popd|printf|pushd|rm|rmdir|sed|set|tar|touch|unset|xargs)\>"
+## Highlight comments (doesnt work that well)
+color yellow "(^|[[:space:]])#.*$"
+## Highlight strings (doesnt work that well)
+color brightyellow ""(\\.|[^\"])*"" "'(\\.|[^'])*'"
+## Trailing space is bad!
+color ,green "[[:space:]]+$"
+
+## Here is an example for Portage control files.
+##
+syntax "/etc/portage" "\.(accept_keywords|env|keywords|mask|unmask|use)(/.+)?$"
+## Base text:
+color green "^.+$"
+## Use flags:
+color brightred "[[:space:]]+\+?[a-zA-Z0-9_-]+"
+color brightblue "[[:space:]]+-[a-zA-Z0-9_-]+"
+## Likely version and slot numbers:
+color magenta "-[[:digit:]].*([[:space:]]|$)"
+color magenta ":[^[:space:]]+([[:space:]]|$)"
+## Accepted arches:
+color white "[~-]?\<(alpha|amd64|arm|hppa|ia64|mips|ppc|ppc64|s390|sh|sparc(-fbsd)?|x86(-fbsd)?)\>"
+color white "[[:space:]][*~-]?\*"
+## Categories:
+color cyan "^[[:space:]]*.*/"
+## Masking regulators:
+color brightmagenta "^[[:space:]]*(=|~|<|<=|=<|>|>=|=>)"
+## Comments:
+color yellow "#.*$"
+## Trailing space is bad!
+color ,green "[[:space:]]+$"

doc/syntax/go.nanorc

@@ -0,0 +1,45 @@
+## Here is an example for Go.
+
+syntax "go" "\.go$"
+
+# Set up a formatter since spelling is probably useless...
+formatter gofmt -w
+
+# Types.
+color green "\<(bool|u?int(8|16|32|64)?|float(32|64)|complex(64|128)|byte|rune|uintptr|string|error)\>"
+color green "\<((<-[[:space:]]*)chan|chan[[:space:]]*<-|const|func|interface|map|struct|type|var)\>"
+
+# Predefined functions.
+color blue "\<(append|cap|close|complex|copy|delete|imag|len|make|new|panic|print|println|real|recover)\>"
+
+# Control structures.
+color brightyellow "\<(case|default|defer|else|for|go|if|range|select|switch)\>"
+
+# Control flow.
+color magenta "\<(break|continue|fallthrough|goto|return)\>"
+
+# Declarations.
+color brightcyan "\<(package|import)\>"
+color brightcyan "//[[:space:]]*\+build[[:space:]]+(([a-zA-Z_0-9]+[[:space:]]*)+,[[:space:]]*)*[a-zA-Z_0-9]+"
+
+# Literals.
+color red "\<[0-9]+\.[0-9]*([Ee][+-][0-9]+)?i?\>"
+color red "\<[0-9]+[Ee][+-][0-9]+i?\>"
+color red "\<\.[0-9]+([Ee][+-][0-9]+)?i?\>"
+color red "\<[0-9]+i\>"
+color red "\<[1-9][0-9]*\>"
+color red "\<0[0-7]*\>"
+icolor red "\<0x[0-9a-f]+\>"
+
+# Strings and characters; slightly fuzzy.
+color red "\<(true|false|nil|iota|_)\>"
+color red "'(\\.|[^'])+'"
+color red ""(\\.|[^"])*""
+color red start=""(\\.|[^"])*\\[[:space:]]*$" end="^(\\.|[^"])*""
+
+# Comments.
+color brightblue "//.*"
+color brightblue start="/\*" end="\*/"
+
+# Trailing whitespace.
+color ,green "[[:space:]]+$"

doc/syntax/groff.nanorc

@@ -1,24 +1,25 @@
 ## Here is an example for groff.
-##
+
 syntax "groff" "\.m[ems]$" "\.rof" "\.tmac$" "^tmac."
-## The argument of .ds or .nr
-color cyan "^\.(ds|nr) [^[[:space:]]]*"
-## Single character escapes
+
+# The argument of .ds or .nr
+color cyan "^\.(ds|nr) [^[:space:]]*"
+# Single-character escapes
 color brightmagenta "\\."
-## Highlight the argument of \f or \s in the same color
+# The argument of \f or \s in the same color
 color brightmagenta "\\f." "\\f\(.." "\\s(\+|\-)?[0-9]"
-## Newlines
+# Newlines
 color cyan "(\\|\\\\)n(.|\(..)"
 color cyan start="(\\|\\\\)n\[" end="]"
-## Requests
-color brightgreen "^\.[[:space:]]*[^[[:space:]]]*"
-## Comments
+# Requests
+color brightgreen "^\.[[:space:]]*[^[:space:]]*"
+# Comments
 color yellow "^\.\\".*$"
-## Strings
+# Strings
 color green "(\\|\\\\)\*(.|\(..)"
 color green start="(\\|\\\\)\*\[" end="]"
-## Characters
+# Characters
 color brightred "\\\(.."
 color brightred start="\\\[" end="]"
-## Macro arguments
+# Macro arguments
 color brightcyan "\\\\\$[1-9]"

doc/syntax/guile.nanorc

@@ -0,0 +1,24 @@
+## Here is an example for Guile Scheme.
+
+syntax "guile" "\.scm$"
+header "^#!.*guile"
+magic "guile"
+
+# Basic scheme functions
+color green "\<(do|if|lambda|let(rec)?|map|unless|when)\>"
+# Defining things
+color brightcyan "\<define(-macro|-module|-public|-syntax)?\>"
+# Quoted symbols
+color brightyellow "'\<(\w|-)+\>"
+# Chars
+color brightmagenta "#\\."
+color brightmagenta "#\\\w+\>"
+# Booleans
+color brightred "(#t|#f)\>"
+# Keywords
+color blue "#?:(\w|[?-])+"
+# Strings
+color yellow start="^[[:blank:]]+\"" end="[^\]\""
+color yellow ""(\\.|[^"])*""
+# Comments
+color cyan "(^|[[:space:]]);.*$"

doc/syntax/html.nanorc

@@ -1,5 +1,8 @@
 ## Here is a short example for HTML.
-##
-syntax "html" "\.html$"
-color blue start="<" end=">"
-color red "&[^;[[:space:]]]*;"
+
+syntax "html" "\.html?$"
+magic "HTML document text"
+
+color cyan start="<" end=">"
+color red "&[^;[:space:]]*;"
+color green ""(\\.|[^"])*""

doc/syntax/java.nanorc

@@ -1,9 +1,12 @@
 ## Here is an example for Java.
-##
+
 syntax "java" "\.java$"
+magic "Java "
+
 color green "\<(boolean|byte|char|double|float|int|long|new|short|this|transient|void)\>"
 color red "\<(break|case|catch|continue|default|do|else|finally|for|if|return|switch|throw|try|while)\>"
-color cyan "\<(abstract|class|extends|final|implements|import|instanceof|interface|native|package|private|protected|public|static|strictfp|super|synchronized|throws|volatile)\>"
+color cyan "\<(abstract|class|extends|final|implements|import|instanceof|interface|native)\>"
+color cyan "\<(package|private|protected|public|static|strictfp|super|synchronized|throws|volatile)\>"
 color red ""[^"]*""
 color yellow "\<(true|false|null)\>"
 color blue "//.*"

doc/syntax/javascript.nanorc

@@ -0,0 +1,19 @@
+## Here is an example for Javascript.
+
+syntax "javascript" "\.js$"
+
+color brightred "\<[A-Z_][0-9A-Z_]+\>"
+color green "\<(const|function|let|this|typeof|var|void)\>"
+color brightyellow "\<(for|if|while|with|do|else|case|default|switch)\>"
+color brightyellow "\<(export|try|throw|catch|new|delete)\>"
+color magenta "\<(continue|break|return|yield)\>"
+color brightmagenta "'([^'\]|(\\["'abfnrtv\\]))'" "'\\(([0-3]?[0-7]{1,2}))'" "'\\x[0-9A-Fa-f]{1,2}'"
+
+# Strings.
+color brightyellow "<[^= 	]*>" ""(\\.|[^"])*"" "'(\\.|[^'])*'"
+# Comments.
+color brightblue "//.*"
+color brightblue start="/\*" end="\*/"
+
+# Trailing whitespace.
+color ,green "[[:space:]]+$"

doc/syntax/json.nanorc

@@ -0,0 +1,32 @@
+## Syntax highlighting for JSON files.
+
+# See:  http://www.json.org/
+# Original author:  Aapo Rantalainen
+# License:  GPLv3 or newer
+
+syntax "json" "\.json$"
+
+# Numbers (used as value).
+color green ":[[:space:]]*\-?(0|[1-9][0-9]*)(\.[0-9]+)?([Ee]?[-+]?[0-9]+)?"
+# Values (well, any string).
+color brightmagenta "\".+\""
+# Hex numbers (used as value).
+color green ":[[:space:]]*\"#[0-9abcdefABCDEF]+\""
+# Escapes.
+color green "\\\\" "\\\"" "\\[bfnrt]" "\\u[0-9abcdefABCDEF]{4})"
+# Special words.
+color green "(true|false|null)"
+
+# Names (very unlikely to contain a quote).
+color brightblue "\"[^"]+\"[[:space:]]*:"
+
+# Brackets, braces, and separators.
+color brightblue "\[" "\]"
+color brightred "\{" "\}"
+color brightred "," ":"
+
+# Comments.
+color cyan "(^|[[:space:]]+)(//|#).*$"
+
+# Trailing whitespace.
+color ,green "[[:space:]]+$"

doc/syntax/lua.nanorc

@@ -0,0 +1,62 @@
+## Syntax highlighting for Lua.
+#
+## Author:  Matthew Wild <mwild1 (at) gmail.com>
+## License: GPL 3 or later
+## Version: 2011-05-05
+
+syntax "lua" "\.lua$"
+
+color brightwhite "\[\[.*\]\]"
+
+# Operators
+color brightyellow ":|\*|/|%|\+|-|\^|>|>=|<|<=|~=|=|\.\.|\<(not|and|or)\>"
+
+# Statements
+color brightblue "\<(do|end|while|repeat|until|if|elseif|then|else|for|in|function|local|return|break)\>"
+
+# Keywords
+color brightyellow "\<(io|math|os|string|table|coroutine|debug)\>\."
+color brightyellow "\<(_G|_VERSION|assert|collectgarbage|dofile|error|getfenv|getmetatable|ipairs|load|loadfile|module|next|pairs|pcall|print|rawequal|rawget|rawset|require|select|setfenv|setmetatable|tonumber|tostring|type|unpack|xpcall)\s*\("
+
+# Standard library
+color brightyellow "io\.\<(close|flush|input|lines|open|output|popen|read|tmpfile|type|write|stdin|stdout|stderr)\>"
+color brightyellow "math\.\<(abs|acos|asin|atan2|atan|ceil|cosh|cos|deg|exp|floor|fmod|frexp|huge|ldexp|log10|log)\>"
+color brightyellow "math\.\<(max|min|mod|modf|pi|pow|rad|random|randomseed|sinh|tan)\>"
+color brightyellow "os\.\<(clock|date|difftime|execute|exit|getenv|remove|rename|setlocale|time|tmpname)\>"
+color brightyellow "package\.\<(cpath|loaded|loadlib|path|preload|seeall)\>"
+color brightyellow "string\.\<(byte|char|dump|find|format|gmatch|gsub|len|lower|match|rep|reverse|sub|upper)\>"
+color brightyellow "table\.\<(concat|insert|maxn|remove|sort)\>"
+color brightyellow "coroutine\.\<(create|resume|running|status|wrap|yield)\>"
+color brightyellow "debug\.\<(debug|getfenv|gethook|getinfo|getlocal|getmetatable|getregistry|getupvalue)\>"
+color brightyellow "debug\.\<(setfenv|sethook|setlocal|setmetatable|setupvalue|traceback)\>"
+
+# File handle methods
+color brightyellow "\:\<(close|flush|lines|read|seek|setvbuf|write)\>"
+
+# false, nil, true
+color brightmagenta "\<(false|nil|true)\>"
+
+# External files
+color brightgreen "\<(dofile|require)\>"
+
+# Numbers
+color red "\<([0-9]+)\>"
+
+# Symbols
+color brightmagenta "(\(|\)|\[|\]|\{|\})"
+
+# Shebang
+color brightcyan   "^#!.*"
+
+# Simple comments
+color green        "\-\-.*$"
+
+# Multiline comments
+color green         start="\-\-\[\[" end="\]\]"
+
+# Strings
+color red "\"(\\.|[^\\\"])*\"|'(\\.|[^\\'])*'"
+##color red         start="\[\[" end="\]\]"
+
+# Hex literals
+color red "0x[0-9a-fA-F]*"

doc/syntax/makefile.nanorc

@@ -0,0 +1,12 @@
+## Here is an example for Makefiles.
+
+syntax "makefile" "Makefile[^/]*$" "\.(make|mk)$"
+
+color red "[:=]"
+color magenta "\<(if|ifeq|else|endif)\>"
+color blue "\$+[{(][a-zA-Z0-9_-]+[})]"
+color brightblue "^[^ 	]+:"
+color green "#.*$"
+
+## Trailing whitespace.
+color ,green "[[:space:]]+$"

doc/syntax/man.nanorc

@@ -1,9 +1,17 @@
 ## Here is an example for manpages.
-##
+
 syntax "man" "\.[1-9]x?$"
-color green "\.(S|T)H.*$"
-color brightgreen "\.(S|T)H" "\.TP"
-color brightred "\.(BR?|I[PR]?).*$"
-color brightblue "\.(BR?|I[PR]?|PP)"
-color brightwhite "\\f[BIPR]"
-color yellow "\.(br|DS|RS|RE|PD)"
+magic "troff or preprocessor input text"
+
+color green "\.(SH|SS|TH) .*$"
+color brightgreen "\.(SH|SS|TH) " "\.([HIT]P)"
+color brightred "\.(B[IR]?|I[BR]?|R[BI]|S[BM]) .*$"
+color brightblue "\.(B[IR]?|I[BR]?|R[BI]|S[BM]) " "\.([LP]?P)$"
+color magenta "\\f[BIPR]"
+color yellow "\.(br|DT|RS|RE|PD)"
+
+# Comments.
+color cyan "\.?\\\".*$"
+
+# Trailing whitespace.
+color ,green "[[:space:]]+$"

doc/syntax/mgp.nanorc

@@ -0,0 +1,9 @@
+## Here is an example for Magicpoint presentations.
+
+syntax "mgp" "\.mgp$"
+header "^%include.*"
+
+icolor green "^%[a-z].*$"
+color cyan "(^|[[:space:]])#.*$"
+color cyan "(^|[[:space:]])%%.*$"
+color ,green "[[:space:]]+$"

doc/syntax/mutt.nanorc

@@ -1,4 +1,9 @@
 ## Here is an example for quoted emails (under e.g. mutt).
-##
+
 syntax "mutt"
+
+# Quoted lines.
 color green "^>.*"
+
+# Signatures, even quoted ones.
+color yellow start="^>* ?-- $" end="^>* ?$"

doc/syntax/nanorc.nanorc

@@ -1,16 +1,28 @@
 ## Here is an example for nanorc files.
-##
+
 syntax "nanorc" "\.?nanorc$"
-## Possible errors and parameters
-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)\>"
-## Colors
+
+# Possible errors and parameters
+icolor brightred "^[[:space:]]*((un)?(bind|set)|include|syntax|header|magic|linter|i?color|extendsyntax).*$"
+
+# Keywords
+icolor brightgreen "^[[:space:]]*(set|unset)[[:space:]]+(allow_insecure_backup|autoindent|backup|backwards|boldtext|casesensitive|const(antshow)?|cut|fill|historylog|locking|morespace|mouse|multibuffer|noconvert|nohelp|nonewlines|nowrap|pos(ition)?log|preserve|quickblank|quiet|rebinddelete|rebindkeypad|regexp|smarthome|smooth|softwrap|suspend|tabsize|tabstospaces|tempfile|unix|view|wordbounds|justifytrim)\>"
+icolor yellow "^[[:space:]]*set[[:space:]]+(functioncolor|keycolor|statuscolor|titlecolor)[[:space:]]+(bright)?(white|black|red|blue|green|yellow|magenta|cyan)?(,(white|black|red|blue|green|yellow|magenta|cyan))?\>"
+icolor brightgreen "^[[:space:]]*set[[:space:]]+(backupdir|brackets|functioncolor|keycolor|matchbrackets|operatingdir|punct|quotestr|speller|statuscolor|titlecolor|whitespace)[[:space:]]+"
+icolor brightgreen "^[[:space:]]*bind[[:space:]]+((\^|M-)([[:alpha:]]|space|[]]|[0-9^_=+{}|;:'\",./<>\?-])|F([1-9]|1[0-6])|Ins|Del)[[:space:]]+[[:alpha:]]+[[:space:]]+(all|main|search|replace(2|with)?|gotoline|writeout|insert|ext(ernal)?cmd|help|spell|linter|browser|whereisfile|gotodir)([[:space:]]+#|[[:space:]]*$)"
+icolor brightgreen "^[[:space:]]*unbind[[:space:]]+((\^|M-)([[:alpha:]]|space|[]]|[0-9^_=+{}|;:'\",./<>\?-])|F([1-9]|1[0-6])|Ins|Del)[[:space:]]+(all|main|search|replace(2|with)?|gotoline|writeout|insert|ext(ernal)?cmd|help|spell|linter|browser|whereisfile|gotodir)([[:space:]]+#|[[:space:]]*$)"
+icolor brightgreen "^[[:space:]]*extendsyntax[[:space:]]+[[:alpha:]]+[[:space:]]+(i?color|header|magic|linter|formatter)[[:space:]]+.*$"
+icolor green "^[[:space:]]*((un)?(bind|set)|include|syntax|header|magic|linter|formatter|extendsyntax)\>"
+
+# 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)="
-## Strings
-icolor white ""(\\.|[^"])*""
-## Comments
-icolor brightblue "^[[:space:]]*#.*$"
+
+# Strings
+icolor brightmagenta ""(\\.|[^"])*""
+# Comments
+icolor brightblue "(^|[[:space:]]+)#.*$"
 icolor cyan "^[[:space:]]*##.*$"
+
+# Trailing whitespace
+color ,green "[[:space:]]+$"

doc/syntax/nftables.nanorc

@@ -0,0 +1,29 @@
+## Here is an example for nftables.
+
+syntax "nftables" "\.(nft|nftables)$"
+header "^#!.*(nft|nftables)"
+
+# Objects and operations
+color green "\<(chain|hook|policy|priority|ruleset|set|table|type|v?map)\>"
+color green "\<(define|include)\>"
+color red "\<(add|delete|flush|insert|remove|replace)\>"
+
+# Families
+color yellow "\<(arp|bridge|inet|ip6?)\>"
+
+# Terminal statements
+color red "\<(drop|reject)\>"
+color brightblue "\<(accept|continue|(d|s)nat|goto|jump|masquerade|return)\>"
+
+# Comments
+color cyan "(^|[[:space:]])#.*$"
+
+# Trailing whitespace
+color ,green "[[:space:]]+$"
+
+# Strings and others
+color yellow ""(\\.|[^"])*"" "'(\\.|[^'])*'"
+color green "[{}():;|`$<>!=&\\]" "(\]|\[)"
+
+# Basic variable names
+color brightred "\$[[:alpha:]_][[:alnum:]_.]*"

doc/syntax/objc.nanorc

@@ -0,0 +1,40 @@
+## 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:]]*\]"
+
+# Strings.
+color brightblack "'([^'\]|(\\["'abfnrtv\\]))'" "'\\(([0-3]?[0-7]{1,2}))'" "'\\x[0-9A-Fa-f]{1,2}'"
+color brightblack "<[^= 	]*>" ""(\\.|[^"])*""
+color brightblue "@"(\\.|[^"])*""
+# Multiline strings.  This regex is VERY resource intensive,
+# and sometimes colours things that shouldn't be coloured.
+###color brightyellow start=""(\\.|[^"])*\\[[:space:]]*$" end="^(\\.|[^"])*""
+
+# Preprocessor commands.
+color brightblue "^[[:space:]]*#[[:space:]]*(define|include|import|(un|ifn?)def|endif|el(if|se)|if|warning|error)"
+
+# Comments.
+color yellow "//.*"
+color yellow start="/\*" end="\*/"
+
+# Trailing whitespace.                                                                                                       
+color ,green "[[:space:]]+$"

doc/syntax/ocaml.nanorc

@@ -0,0 +1,28 @@
+## Syntax highlighting for OCaml.
+
+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)\>"
+# Pattern modifiers:
+color yellow "\<(as|when|of)\>"
+# Conditions:
+color cyan "\<(if|then|else)\>"
+# Blocks:
+color magenta "\<(begin|end|object|struct|sig|for|while|do|done|to|downto)\>"
+# Constants:
+color green "\<(true|false)\>"
+# Modules/classes:
+color green "\<(include|inherit|initializer)\>"
+# Expression modifiers:
+color yellow "\<(new|ref|mutable|lazy|assert|raise)\>"
+# Comments:
+color white start="\(\*" end="\*\)"
+# Strings: (no multiline handling yet)
+color brightblack ""[^\"]*""

doc/syntax/patch.nanorc

@@ -1,10 +1,21 @@
 ## Here is an example for patch files.
-##
-syntax "patch" "\.(patch|diff)$"
+
+syntax "patch" "\.(patch|diff|debdiff)$"
+magic "diff output text"
+
+# Added lines.
 color brightgreen "^\+.*"
-color green "^\+\+\+.*"
+# Show trailing whitespace only on added lines.
+color ,green "[[:space:]]+$"
+# Context lines.
 color brightblue "^ .*"
+# Deleted lines.
 color brightred "^-.*"
+
+# File names and dates.
 color red "^---.*"
+color green "^\+\+\+.*"
+# Line numbers.
 color brightyellow "^@@.*"
+# Header lines.
 color magenta "^diff.*"

doc/syntax/perl.nanorc

@@ -1,6 +1,9 @@
 ## Here is an example for Perl.
-##
+
 syntax "perl" "\.p[lm]$"
+header "^#!.*perl[-0-9._]*"
+magic "Perl script text"
+
 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/php.nanorc

@@ -0,0 +1,31 @@
+## Here is an example for PHP.
+
+syntax "php" "\.php[2345s~]?$"
+magic "PHP script text"
+
+# PHP markings.
+color brightgreen "(<\?(php)?|\?>)"
+
+# Functions.
+color white "\<[a-z_]*\("
+
+# Types.
+color green "\<(var|float|global|double|bool|char|int|enum|const)\>"
+
+# Structure.
+color brightyellow "\<(class|new|private|public|function|for|foreach|if|while|do|else|elseif|case|default|switch)\>"
+
+# Control flow.
+color magenta "\<(goto|continue|break|return)\>"
+
+# Strings.
+color brightyellow "<[^=       ]*>" ""(\.|[^"])*""
+
+# Comments.
+color brightblue "//.*"
+color brightblue start="/\*" end="\*/"
+##color blue start="<" end=">"
+##color red "&[^;[:space:]]*;"
+
+# Trailing whitespace.
+color ,green "[[:space:]]+$"

doc/syntax/po.nanorc

@@ -0,0 +1,27 @@
+## Colouring for PO files.
+
+syntax "po" "\.pot?$"
+
+# Comments.
+color green "^#.*$"
+color yellow "Copyright|\(C\)"
+# Header fields.
+color brightmagenta "\<(Project\-Id\-Version|Report\-Msgid\-Bugs\-To|Last\-Translator|Language(\-Team)?|X\-Generator|Plural\-Forms)\>"
+color cyan "\<(POT\-Creation\-Date|PO\-Revision\-Date|MIME\-Version|Content\-Type|Content\-Transfer\-Encoding)\>"
+# Encodings and numbers.
+color yellow "\<(UTF|ISO|Windows|Mac|IBM)\>\-[0-9]"
+color yellow "[0-9]|pre[0-9]|[0-9]bit"
+# Msgids.
+color brightblue "^(msgid|msgid_plural|msgstr)\>"
+# Tags.
+color red " fuzzy(,|$)"
+color yellow " (no-)?[-[:alpha:]]+-format(,|$)"
+# Format specifiers.
+color brightmagenta "%([1-9]\$)?[a-z]*"
+# Quotes and newlines.
+color yellow "\""
+color cyan "\\n"
+# Reminders.
+color ,yellow "(FIXME|TODO|XXX)"
+# Obsolete strings.
+color red "#~.*$"

doc/syntax/postgresql.nanorc

@@ -0,0 +1,75 @@
+## Here is an example for PostgreSQL.
+
+syntax "sql" "\.sql[2345s~]?$"
+magic "PostgreSQL script text"
+
+# Functions.
+color white "\<[a-z_]*\("
+
+# Types.
+color green "\<(int2|smallint|int4|int|integer|int8|bigint|decimal|numeric|real|double precision|(small|big)?serial)\>"
+color green "\<(bit( varying)?|boolean|bytea|enum|money|tsvector|uuid)\>"
+color green "\<(char|varchar|character( varying)?|text)\>"
+color green "\<(date|interval|time(stamp)?( with time zone| without time zone)?)\>"
+color green "\<(point|line|lseg|path|box|polygon|circle)\>"
+color green "\<(cidr|inet|macaddr)\>"
+color green "\<(daterange|int4range|int8range|numrange|tsrange|tstzrange)\>"
+
+# Structure.
+color brightyellow "\<(CASE|CLASS|DEFAULT|DO|ELSE|ELSEIF|FOR|FOREACH|FUNCTION|IF|IS NULL)\>"
+color brightyellow "\<(NEW|PRIVATE|PUBLIC|RETURN|RETURNS|SETOF|SWITCH|THEN|WHEN|WHILE)>"
+
+# Control flow.
+color magenta "\<(EXCEPTION|NOTICE|RAISE|RETURN)\>"
+
+# SQL keywords.
+color blue "\<(ABORT|AGGREGATE|ALTER|ANALYZE|AND|AS|AUTHORIZATION|BEGIN|CAST|CHECKPOINT|CLASS|CLOSE)\>"
+color blue "\<(CLUSTER|COLLATION|COMMENT|COMMIT|CONFIGURATION|CONSTRAINTS|CONVERSION|COPY|CREATE)\>"
+color blue "\<(DATA|DATABASE|DEALLOCATE|DECLARE|DEFAULT|DELETE|DICTIONARY|DISCARD|DO|DOMAIN|DROP)\>"
+color blue "\<(END|EVENT|EXECUTE|EXPLAIN|EXTENSION|FAMILY|FETCH|FOREIGN|FROM|FUNCTION)\>"
+color blue "\<(GRANT|GROUP|IF NOT EXISTS|IMMUTABLE|INDEX|INSERT|INTO|LABEL|LANGUAGE|LARGE|LOAD|LOCK)\>"
+color blue "\<(MAPPING FOR|MATERIALIZED|MOVE|NOTIFY|OBJECT|OPERATOR|OPTIONS|OWNED|OWNER)\>"
+color blue "\<(PARSER|PREPARED?|PRIVILEGES|REASSIGN|REFRESH|RELEASE|RESET|REVOKE|ROLE|ROLLBACK|RULE)\>"
+color blue "\<(SAVEPOINT|SCHEMA|SEARCH|SECURITY|SELECT|SEQUENCE|SERVER|SESSION|SET|SHOW|SPACE|START|SYSTEM)\>"
+color blue "\<(TABLE|TEXT|TO|TRANSACTION|TYPE|UPDATE|USER|VACUUM|VALUES|VIEW|WHERE|WITH|WRAPPER)\>"
+
+# Strings.
+color brightyellow "<[^=       ]*>" ""(\.|[^"])*""
+
+# Trailing whitespace.
+color ,green "[[:space:]]+$"
+
+# Regular expressions.
+color brightmagenta "/([^/]|(\\/))*/[iomx]*" "%r\{([^}]|(\\}))*\}[iomx]*"
+
+# Shell command expansion is in `backticks` or like %x{this}.  These are
+# "double-quotish" (to use a perlism).
+color brightblue "`[^`]*`" "%x\{[^}]*\}"
+
+# Strings, double-quoted.
+color green ""([^"]|(\\"))*"" "%[QW]?\{[^}]*\}" "%[QW]?\([^)]*\)" "%[QW]?<[^>]*>"
+color green "%[QW]?\[[^]]*\]" "%[QW]?\$[^$]*\$" "%[QW]?\^[^^]*\^" "%[QW]?![^!]*!"
+
+# Expression substitution.  These go inside double-quoted strings,
+# "like #{this}".
+color brightgreen "#\{[^}]*\}"
+
+# Strings, single-quoted.
+color green "'([^']|(\\'))*'" "%[qw]\{[^}]*\}" "%[qw]\([^)]*\)" "%[qw]<[^>]*>"
+color green "%[qw]\[[^]]*\]" "%[qw]\$[^$]*\$" "%[qw]\^[^^]*\^" "%[qw]![^!]*!"
+
+# Comments.
+color red "#[^{].*$" "#$"
+color red "--[^{].*$" "#$"
+color red "##[^{].*$" "##$"
+color brightblue "//.*"
+color brightblue start="/\*" end="\*/"
+
+# PostgreSQL markings.
+color red "(--)"
+
+# PostgreSQL default schemas.
+color brightred "(pg_catalog|public)"
+
+# PostgreSQL PLs.
+color brightblue "(pljava|plperlu?|plpgsql|plpy|plpythonu?|plr|plruby|plsh|pltcl|plscheme)"

doc/syntax/pov.nanorc

@@ -1,6 +1,7 @@
 ## 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)\>"
@@ -10,6 +11,7 @@ color brightred "\<(light_source|background)\>"
 color brightred "\<(fog|object|camera)\>"
 color green "(\{|\}|\(|\)|\;|\]|\[|`|\\|\$|<|>|!|=|&|\|)"
 color brightmagenta "\<(union|group|subgroup)\>"
-## Comment highlighting
+
+# Comments.
 color brightblue "//.*"
 color brightblue start="/\*" end="\*/"

doc/syntax/python.nanorc

@@ -1,8 +1,26 @@
 ## Here is an example for Python.
-##
+
 syntax "python" "\.py$"
+header "^#!.*python[-0-9._]*"
+linter pyflakes
+
+# Function definitions.
 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 brightgreen "["'].*[^\\]["']" "["']{3}.*[^\\]["']{3}"
-color brightgreen start=""""[^"]" end=""""" start="'''[^']" end="'''"
-color brightred "#.*$"
+# Keywords.
+color brightcyan "\<(and|as|assert|break|class|continue|def|del|elif|else|except|exec|finally|for|from)\>"
+color brightcyan "\<(global|if|import|in|is|lambda|not|or|pass|print|raise|return|try|while|with|yield)\>"
+
+# Single-quoted strings.
+color brightgreen "'([^'\]|\\.)+'"
+color brightgreen ""([^"\]|\\.)+""
+# Comments.
+color brightred "(^|[[:blank:]])#.*$"
+# Triple-quoted strings.
+color brightgreen    start="'''[^'),]" end="(^|[^(\])'''"
+color brightgreen start="\"\"\"[^"),]" end="(^|[^(\])\"\"\""
+
+# Reminders.
+color ,yellow "(FIXME|TODO|XXX)"
+
+# Trailing whitespace.
+color ,green "[[:space:]]+$"

doc/syntax/ruby.nanorc

@@ -1,30 +1,34 @@
 ## Here is an example for Ruby.
-##
+
 syntax "ruby" "\.rb$"
-## 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
+header "^#!.*ruby[-0-9._]*"
+linter ruby -w -c
+
+# Reserved words.
+color yellow "\<(BEGIN|END|alias|and|begin|break|case|class|def|defined\?|do|else|elsif|end|ensure|false|for|if|in|module)\>"
+color yellow "\<(next|nil|not|or|redo|rescue|retry|return|self|super|then|true|undef|unless|until|when|while|yield)\>"
+# Constants.
 color brightblue "(\$|@|@@)?\<[A-Z]+[0-9A-Z_a-z]*"
-## Ruby "symbols"
+# Ruby "symbols".
 icolor magenta "([ 	]|^):[0-9A-Z_]+\>"
-## Some unique things we want to stand out
+# Some unique things we want to stand out.
 color brightyellow "\<(__FILE__|__LINE__)\>"
-## Regular expressions
+# Regular expressions.
 color brightmagenta "/([^/]|(\\/))*/[iomx]*" "%r\{([^}]|(\\}))*\}[iomx]*"
-## Shell command expansion is in `backticks` or like %x{this}.  These are
-## "double-quotish" (to use a perlism).
+# Shell command expansion is in `backticks` or like %x{this}.  These are
+# "double-quotish" (to use a perlism).
 color brightblue "`[^`]*`" "%x\{[^}]*\}"
-## Strings, double-quoted
+# Strings, double-quoted.
 color green ""([^"]|(\\"))*"" "%[QW]?\{[^}]*\}" "%[QW]?\([^)]*\)" "%[QW]?<[^>]*>" "%[QW]?\[[^]]*\]" "%[QW]?\$[^$]*\$" "%[QW]?\^[^^]*\^" "%[QW]?![^!]*!"
-## Expression substitution.  These go inside double-quoted strings,
-## "like #{this}".
+# Expression substitution.  These go inside double-quoted strings,
+# "like #{this}".
 color brightgreen "#\{[^}]*\}"
-## Strings, single-quoted
+# Strings, single-quoted.
 color green "'([^']|(\\'))*'" "%[qw]\{[^}]*\}" "%[qw]\([^)]*\)" "%[qw]<[^>]*>" "%[qw]\[[^]]*\]" "%[qw]\$[^$]*\$" "%[qw]\^[^^]*\^" "%[qw]![^!]*!"
-## Comments
+# Comments.
 color cyan "#[^{].*$" "#$"
 color brightcyan "##[^{].*$" "##$"
-## "Here" docs
+# "Here" docs.
 color green start="<<-?'?EOT'?" end="^EOT"
-## Some common markers
+# Some common markers.
 color brightcyan "(XXX|TODO|FIXME|\?\?\?)"

doc/syntax/sh.nanorc

@@ -1,12 +1,28 @@
 ## Here is an example for Bourne shell scripts.
-##
+
 syntax "sh" "\.sh$"
+header "^#!.*((ba|da|k|pdk)?sh[-0-9_]*|openrc-run|runscript)"
+magic "(POSIX|Bourne.*) shell script text"
+linter dash -n
+
 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 "(\{|\}|\(|\)|\;|\]|\[|`|\\|\$|<|>|!|=|&|\|)"
+color green "\<(break|case|continue|do|done|elif|else|esac|exit|fi|for|function|if|in|read|return|select|shift|then|time|until|while)\>"
+color green "\<(declare|eval|exec|export|let|local)\>"
+color green "[{}():;|`$<>!=&\\]" "(\]|\[)"
 color green "-[Ldefgruwx]\>"
 color green "-(eq|ne|gt|lt|ge|le|s|n|z)\>"
-color brightblue "\<(cat|cd|chmod|chown|cp|echo|env|export|grep|install|let|ln|make|mkdir|mv|rm|sed|set|tar|touch|umask|unset)\>"
-icolor brightred "\$\{?[0-9A-Z_!@#$*?-]+\}?"
+color brightblue "\<(awk|cat|cd|ch(grp|mod|own)|cp|echo|env|grep|install|ln|make|mkdir|mv|popd|printf|pushd|rm|rmdir|sed|set|tar|touch|umask|unset)\>"
+
+# Basic variable names (no braces).
+color brightred "\$[-0-9@*#?$!]" "\$[[:alpha:]_][[:alnum:]_]*"
+# More complicated variable names; handles braces and replacements and arrays.
+color brightred "\$\{[#!]?([-@*#?$!]|[0-9]+|[[:alpha:]_][[:alnum:]_]*)(\[([[:space:]]*[[:alnum:]_]+[[:space:]]*|@)\])?(([#%/]|:?[-=?+])[^}]*\}|\[|\})"
+
+# Comments.
 color cyan "(^|[[:space:]])#.*$"
+
+# Strings.
 color brightyellow ""(\\.|[^"])*"" "'(\\.|[^'])*'"
+
+# Trailing whitespace.
+color ,green "[[:space:]]+$"

doc/syntax/spec.nanorc

@@ -0,0 +1,39 @@
+## Syntax highlighting for RPM spec files.
+
+syntax "spec" "\.(spec$|spec\.*)"
+
+# Main tags.
+color brightblue "((Icon|ExclusiveOs|ExcludeOs)[[:space:]]*:)"
+color brightblue "((BuildArch|BuildArchitectures|ExclusiveArch|ExcludeArch)[[:space:]]*:)"
+color brightblue "((Conflicts|Obsoletes|Provides|Requires|Requires\(.*\)|Enhances|Suggests|BuildConflicts|BuildRequires|Recommends|PreReq|Supplements)[[:space:]]*:)"
+color brightblue "((Epoch|Serial|Nosource|Nopatch)[[:space:]]*:)"
+color brightblue "((AutoReq|AutoProv|AutoReqProv)[[:space:]]*:)"
+color brightblue "((Copyright|License|Summary|Summary\(.*\)|Distribution|Vendor|Packager|Group|Source\d*|Patch\d*|BuildRoot|Prefix)[[:space:]]*:)"
+color brightblue "((Name|Version|Release|Url|URL)[[:space:]]*:)"
+color brightblue start="^Source" end=":" start="^Patch" end=":"
+# Architectures.
+color brightred "(i386|i486|i586|i686|athlon|ia64|alpha|alphaev5|alphaev56|alphapca56|alphaev6|alphaev67|sparc|sparcv9|sparc64armv3l|armv4b|armv4lm|ips|mipsel|ppc|ppc|iseries|ppcpseries|ppc64|m68k|m68kmint|Sgi|rs6000|i370|s390x|s390|noarch)"
+# Architecture conditionals.
+color brightred "(ifarch|ifnarch)"
+# OS conditionals.
+color brightred "(ifos|ifnos)"
+# %* strings.
+color green "%([A-Z_a-z_0-9_]*)"
+color magenta "%_([A-Z_a-z_0-9_]*)"
+color yellow start="%__" end="\ "
+color magenta start="%\{" end="\}"
+color yellow start="%\{__" end="\}"
+# Sections.
+color red "^%(build$|changelog|check$|clean$|description|files|install$|package|pre|prep$|pretrans|preun)"
+color red "^%(post|posttrans|postun|trigger|triggerin|triggerpostun|triggerun|verifyscript)"
+# Conditionals and defines.
+color brightred "%(if|else|endif|define|global|undefine)"
+
+# Comments.
+color cyan "#.*$"
+# Special case: "# norootforbuild" is handled as main tag.
+color brightblue "^# norootforbuild"
+# %changelog date entries.
+color brightyellow "^\* .*\)$"
+# Trailing whitespace.
+color ,green "[[:space:]]+$"

doc/syntax/tcl.nanorc

@@ -0,0 +1,18 @@
+## Syntax highlighting for Tcl files.
+
+syntax "tcl" "\.tcl$"
+
+# Standard Tcl [info commands]:
+color green "\<(after|append|array|auto_execok|auto_import|auto_load|auto_load_index|auto_qualify|binary|break|case|catch|cd|clock|close|concat|continue|encoding|eof|error|eval|exec|exit|expr|fblocked|fconfigure|fcopy|file|fileevent|flush|for|foreach|format|gets|glob|global|history|if|incr|info|interp|join|lappend|lindex|linsert|list|llength|load|lrange|lreplace|lsearch|lset|lsort|namespace|open|package|pid|puts|pwd|read|regexp|regsub|rename|return|scan|seek|set|socket|source|split|string|subst|switch|tclLog|tell|time|trace|unknown|unset|update|uplevel|upvar|variable|vwait|while)\>"
+# Basic Tcl subcommands:
+color green "\<(array anymore|array donesearch|array exists|array get|array names|array nextelement|array set|array size|array startsearch|array statistics|array unset)\>"
+color green "\<(string bytelength|string compare|string equal|string first|string index|string is|string last|string length|string map|string match|string range|string repeat|string replace|string to|string tolower|string totitle|string toupper|string trim|string trimleft|string trimright|string will|string wordend|string wordstart)\>"
+# Extended TclX [info commands]:
+color green "\<(alarm|auto_load_pkg|bsearch|catclose|catgets|catopen|ccollate|cconcat|cequal|chgrp|chmod|chown|chroot|cindex|clength|cmdtrace|commandloop|crange|csubstr|ctoken|ctype|dup|echo|execl|fcntl|flock|fork|fstat|ftruncate|funlock|host_info|id|infox|keyldel|keylget|keylkeys|keylset|kill|lassign|lcontain|lempty|lgets|link|lmatch|loadlibindex|loop|lvarcat|lvarpop|lvarpush|max|min|nice|pipe|profile|random|readdir|replicate|scancontext|scanfile|scanmatch|select|server_accept|server_create|signal|sleep|sync|system|tclx_findinit|tclx_fork|tclx_load_tndxs|tclx_sleep|tclx_system|tclx_wait|times|translit|try_eval|umask|wait)\>"
+# Syntax:
+color brightblue "proc[[:space:]]" "(\{|\})"
+color green "(\(|\)|\;|`|\\|\$|<|>|!|=|&|\|)"
+color brightyellow ""(\\.|[^"])*"" "'(\\.|[^'])*'"
+icolor brightred "\$\{?[0-9A-Z_!@#$*?-]+\}?"
+color ,green "[[:space:]]+$"
+color ,magenta "^[[:space:]]*#.*"

doc/syntax/tex.nanorc

@@ -1,6 +1,8 @@
 ## Here is a short example for TeX files.
-##
+
 syntax "tex" "\.tex$"
+linter chktex -v0 -q -I
+
 icolor green "\\.|\\[A-Z]*"
 color magenta "[{}]"
-color blue "%.*"
+color blue "(^|[^\])%.*"

doc/syntax/texinfo.nanorc

@@ -0,0 +1,20 @@
+## Here is an example for Texinfo files.
+
+syntax "texinfo" "\.texi$"
+header "^\\input texinfo"
+magic "Texinfo source text"
+
+# Command arguments, trailing and enclosed.
+color cyan "^@[a-z]+[[:space:]]+.*$"
+color brightmagenta "@[a-z]+\{[^}]*\}"
+# Commands themselves.
+color yellow "@[a-z]+\{?" "\}"
+
+# Menu items.
+color brightred "^\*[[:space:]]+.*::.*$"
+
+# Comments.
+color green "@c[[:space:]]+.*$"
+
+# Trailing whitespace.
+color ,green "[[:space:]]+$"

doc/syntax/xml.nanorc

@@ -0,0 +1,20 @@
+## Here is an example for XML files.
+
+syntax "xml" "\.([jrsx]html?|jnlp|mml|pom|rng|sgml?|svg|w[as]dl|wsdd|xjb|xml|xs(d|lt?)|xul)$"
+magic "(XML|SGML) (sub)?document text"
+
+# The entire content of the tag:
+color green  start="<" end=">"
+
+# The start and the end of the tag:
+color cyan   "<[^> ]+" ">"
+
+# The strings inside the tag:
+color magenta "\"[^"]*\""
+
+# Comments:
+color yellow start="<!DOCTYPE" end="[/]?>"
+color yellow start="<!--" end="-->"
+
+# Escapes:
+color red    "&[^;]*;"

doc/texinfo/.gitignore

@@ -1,5 +1,3 @@
-Makefile
-Makefile.in
-nano.info
-nano.html
 texinfo.tex
+nano.html
+nano.info

doc/texinfo/Makefile.am

@@ -5,6 +5,6 @@ MAKEINFO = makeinfo --no-split
 BUILT_SOURCES = nano.html
 
 nano.html: nano.texi
-	cat $< | makeinfo --no-split --html > $@
+	makeinfo --no-split --html < $< > $@
 
 EXTRA_DIST = $(info_TEXINFOS) $(BUILT_SOURCES)

m4/.cvsignore

@@ -1,2 +0,0 @@
-Makefile.in
-Makefile

m4/ax_check_compile_flag.m4

@@ -0,0 +1,74 @@
+# ===========================================================================
+#   http://www.gnu.org/software/autoconf-archive/ax_check_compile_flag.html
+# ===========================================================================
+#
+# SYNOPSIS
+#
+#   AX_CHECK_COMPILE_FLAG(FLAG, [ACTION-SUCCESS], [ACTION-FAILURE], [EXTRA-FLAGS], [INPUT])
+#
+# DESCRIPTION
+#
+#   Check whether the given FLAG works with the current language's compiler
+#   or gives an error.  (Warnings, however, are ignored)
+#
+#   ACTION-SUCCESS/ACTION-FAILURE are shell commands to execute on
+#   success/failure.
+#
+#   If EXTRA-FLAGS is defined, it is added to the current language's default
+#   flags (e.g. CFLAGS) when the check is done.  The check is thus made with
+#   the flags: "CFLAGS EXTRA-FLAGS FLAG".  This can for example be used to
+#   force the compiler to issue an error when a bad flag is given.
+#
+#   INPUT gives an alternative input source to AC_COMPILE_IFELSE.
+#
+#   NOTE: Implementation based on AX_CFLAGS_GCC_OPTION. Please keep this
+#   macro in sync with AX_CHECK_{PREPROC,LINK}_FLAG.
+#
+# LICENSE
+#
+#   Copyright (c) 2008 Guido U. Draheim <guidod@gmx.de>
+#   Copyright (c) 2011 Maarten Bosmans <mkbosmans@gmail.com>
+#
+#   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 3 of the License, or (at your
+#   option) any later version.
+#
+#   This program is distributed in the hope that it will be useful, but
+#   WITHOUT ANY WARRANTY; without even the implied warranty of
+#   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General
+#   Public License for more details.
+#
+#   You should have received a copy of the GNU General Public License along
+#   with this program. If not, see <http://www.gnu.org/licenses/>.
+#
+#   As a special exception, the respective Autoconf Macro's copyright owner
+#   gives unlimited permission to copy, distribute and modify the configure
+#   scripts that are the output of Autoconf when processing the Macro. You
+#   need not follow the terms of the GNU General Public License when using
+#   or distributing such scripts, even though portions of the text of the
+#   Macro appear in them. The GNU General Public License (GPL) does govern
+#   all other use of the material that constitutes the Autoconf Macro.
+#
+#   This special exception to the GPL applies to versions of the Autoconf
+#   Macro released by the Autoconf Archive. When you make and distribute a
+#   modified version of the Autoconf Macro, you may extend this special
+#   exception to the GPL to apply to your modified version as well.
+
+#serial 3
+
+AC_DEFUN([AX_CHECK_COMPILE_FLAG],
+[AC_PREREQ(2.59)dnl for _AC_LANG_PREFIX
+AS_VAR_PUSHDEF([CACHEVAR],[ax_cv_check_[]_AC_LANG_ABBREV[]flags_$4_$1])dnl
+AC_CACHE_CHECK([whether _AC_LANG compiler accepts $1], CACHEVAR, [
+  ax_check_save_flags=$[]_AC_LANG_PREFIX[]FLAGS
+  _AC_LANG_PREFIX[]FLAGS="$[]_AC_LANG_PREFIX[]FLAGS $4 $1"
+  AC_COMPILE_IFELSE([m4_default([$5],[AC_LANG_PROGRAM()])],
+    [AS_VAR_SET(CACHEVAR,[yes])],
+    [AS_VAR_SET(CACHEVAR,[no])])
+  _AC_LANG_PREFIX[]FLAGS=$ax_check_save_flags])
+AS_IF([test x"AS_VAR_GET(CACHEVAR)" = xyes],
+  [m4_default([$2], :)],
+  [m4_default([$3], :)])
+AS_VAR_POPDEF([CACHEVAR])dnl
+])dnl AX_CHECK_COMPILE_FLAGS

m4/glib-2.0.m4

@@ -19,6 +19,9 @@ AC_ARG_ENABLE(glibtest, [  --disable-glibtest      do not try to compile and run
          gmodule) 
              pkg_config_args="$pkg_config_args gmodule-2.0"
          ;;
+         gmodule-no-export) 
+             pkg_config_args="$pkg_config_args gmodule-no-export-2.0"
+         ;;
          gobject) 
              pkg_config_args="$pkg_config_args gobject-2.0"
          ;;

nano-regress

@@ -0,0 +1,29 @@
+#!/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-wrapping", "--disable-justify", "--disable-extra", "--enable-tiny", "--disable-utf8", "--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;
+    my $cmd = "./configure @args && make clean all";
+    system("($cmd) >/dev/null 2>&1");
+    if ($? != 0)  {
+	print "Build failed for args: @args\n";
+	print "To reproduce, run:\n $cmd\n";
+	exit(1);
+    }
+    $i++;
+}
+
+print "All options completed successfully!\n";

nano.spec.in

@@ -2,36 +2,50 @@
 %define version	@VERSION@
 %define release	1
 
-Summary	: Pico editor clone with enhancements
 Name		: %{name}
 Version		: %{version}
 Release		: %{release}
-License		: GPL
+Summary		: a user-friendly editor, a Pico clone with enhancements
+
+License		: GPLv3+
 Group		: Applications/Editors
 URL		: http://www.nano-editor.org/
-Source		: http://www.nano-editor.org/dist/v2.0/%{name}-%{version}.tar.gz
+Source		: http://www.nano-editor.org/dist/v2.4/%{name}-%{version}.tar.gz
+
 BuildRoot	: %{_tmppath}/%{name}-%{version}-root
-BuildRequires	: autoconf, automake, gettext-devel, ncurses-devel
+BuildRequires	: autoconf, automake, gettext-devel, ncurses-devel, texinfo
+Requires(post)	: info
+Requires(preun)	: info
 
 %description
 GNU nano is a small and friendly text editor.  It aims to emulate the
-Pico text editor while also offering a few enhancements.
+Pico text editor while also offering several enhancements.
 
 %prep
 %setup -q
 
 %build
-%configure --enable-all
+%configure
 make
 
 %install
-rm -rf %{buildroot}
 make DESTDIR="%{buildroot}" install
+#ln -s nano %{buildroot}/%{_bindir}/pico
+rm -f %{buildroot}/%{_infodir}/dir
+
+%post
+/sbin/install-info %{_infodir}/%{name}.info %{_infodir}/dir || :
+
+%preun
+if [ $1 = 0 ] ; then
+/sbin/install-info --delete %{_infodir}/%{name}.info %{_infodir}/dir || :
+fi
 
 %files
 %defattr(-,root,root)
-%doc AUTHORS BUGS COPYING ChangeLog INSTALL NEWS README THANKS TODO doc/faq.html doc/nanorc.sample
+%doc AUTHORS COPYING ChangeLog INSTALL NEWS README THANKS TODO doc/faq.html doc/nanorc.sample
 %{_bindir}/*
+%{_docdir}/nano/*
 %{_mandir}/man*/*
 %{_mandir}/fr/man*/*
 %{_infodir}/nano.info*

po/.cvsignore

@@ -1,18 +0,0 @@
-Makefile
-Makefile.in
-Makefile.in.in
-POTFILES
-Rules-quot
-boldquot.sed
-cat-id*
-en@boldquot.header
-en@quot.header
-insert-header.sin
-messages
-messages.mo
-nano.pot
-remove-potcdate.sed
-remove-potcdate.sin
-stamp-cat*
-quot.sed
-*.gmo

po/.gitignore

@@ -0,0 +1,11 @@
+/*.gmo
+
+/Makefile.in.in
+/Rules-quot
+/boldquot.sed
+/en@boldquot.header
+/en@quot.header
+/insert-header.sin
+/POTFILES
+/quot.sed
+/remove-potcdate.sin

po/ChangeLog

@@ -1,7 +1,77 @@
+2014-05-28  Benno Schulenberg  <bensberg@justemail.net>
+	* de.po, eo.po, nl.po: Updates for German, Dutch, and Esperanto.
+
+2014-05-27  Benno Schulenberg  <bensberg@justemail.net>
+	* de.po, nl.po, ru.po: Updates for Russian, Dutch, and German.
+
+2014-05-25  Benno Schulenberg  <bensberg@justemail.net>
+	* it.po, uk.po: Updates from the TP for Ukrainian and Italian.
+
+2014-05-22  Benno Schulenberg  <bensberg@justemail.net>
+	* de.po, uk.po: Updates from the TP for German and Ukrainian.
+
+2014-05-16  Benno Schulenberg  <bensberg@justemail.net>
+	* eo.po, fi.po, fr.po, nl.po, vi.po: Updates from the TP for
+	Vietnamese, Finnish, Dutch, French, and Esperanto.
+
+2014-05-13  Benno Schulenberg  <bensberg@justemail.net>
+	* nano.pot, *.po: Regenerated the POT file and refreshed the PO's.
+
+2014-03-22  Benno Schulenberg  <bensberg@justemail.net>
+	* nano.pot: Regenerated the POT file.
+	* cs.po, es.po, it.po, nb.po, sr.po, zh_TW: Updates from the TP
+	for Czech, Spanish, Italian, Norwegian, Serbian, and Chinese.
+	* LINGUAS: Removed rw (Kinyarwanda) -- it was just fragments.
+
+2007-12-09  Jordi Mallach  <jordi@gnu.org>
+
+	* LINGUAS: Add zh_CN.
+	* es.po, fr.po, it.po, nb.po, nl.po, pt_BR.po: New pull from the TP,
+	to fetch the now corrected latest pt_BR file.
+
+2007-12-08  Jordi Mallach  <jordi@gnu.org>
+
+	* zh_CN.po: New Simplified Chinese translation by
+	LI Daobing <lidaobing@gmail.com>.
+	* fr.po, ga.po, ms.po, nl.po, nn.po, vi.po: Translation updates taken
+	from the Translation Project.
+	* Refreshed the rest of the files from the latest TP archive.
+
+2007-09-18  Jordi Mallach  <jordi@gnu.org>
+
+	* po/ru.po: Updated Russian translation by Sergey A. Ribalchenko.
+
+2007-08-11  David Lawrence Ramsey  <pooka109@gmail.com>
+
+	* po/update.pl: Relicense to the GNU GPL version 3 or later.
+
+2007-07-31  David Lawrence Ramsey  <pooka109@gmail.com>
+
+	* po/update.pl: Update copyright notice to account for
+	modifications.
+
+2007-01-29  David Lawrence Ramsey  <pooka109@cox.net>
+
+	* ru.po: Updated Russian translation by Dimitriy Ryazantcev.
+	* ru.po: Fix incorrect "Project-Id-Version" entry and misplaced
+	space.
+
+2007-01-13  David Lawrence Ramsey  <pooka109@cox.net>
+
+	* es.po: Fix misplaced space.
+	* eu.po: Fix typos and misplaced space.
+	* fr.po: Fix misplaced space.
+	* gl.po: Fix typos and misplaced space.
+	* nb.po: Fix typos and more misplaced space.
+
+2007-01-06  David Lawrence Ramsey  <pooka109@cox.net>
+
+	* nb.po: Fix misplaced space.
+
 2006-12-06  David Lawrence Ramsey  <pooka109@cox.net>
 
 	* hu.po: Removed unneeded duplicate plural forms again.
-	* ms.po: Fixed incorrect "Project-Id-Version" entry.
+	* ms.po: Fix incorrect "Project-Id-Version" entry.
 
 2006-12-06  Jordi Mallach <jordi@gnu.org>
 
@@ -12,7 +82,7 @@
 2006-11-20  David Lawrence Ramsey  <pooka109@cox.net>
 
 	* tr.po: Removed unneeded blank plural forms, as gettext 0.15
-	  generates errors upon encountering them.
+	generates errors upon encountering them.
 
 2006-10-25  Jordi Mallach  <jordi@gnu.org>
 
@@ -93,9 +163,9 @@
 2006-08-15  David Lawrence Ramsey  <pooka109@cox.net>
 
 	* hu.po: Removed unneeded duplicate plural forms, as gettext
-	  0.15 generates errors upon encountering them.
+	0.15 generates errors upon encountering them.
 	* id.po: Removed unneeded duplicate plural forms, as gettext
-	  0.15 generates errors upon encountering them.
+	0.15 generates errors upon encountering them.
 
 2006-06-20  Jordi Mallach  <jordi@gnu.org>
 
@@ -106,9 +176,9 @@
 
 2006-06-20  David Lawrence Ramsey  <pooka109@cox.net>
 
-	* fr.po: Fixed incorrect "Project-Id-Version" entry.
-	* hu.po: Fixed incorrect "Project-Id-Version" entry.
-	* it.po: Fixed incorrect "Project-Id-Version" entry.
+	* fr.po: Fix incorrect "Project-Id-Version" entry.
+	* hu.po: Fix incorrect "Project-Id-Version" entry.
+	* it.po: Fix incorrect "Project-Id-Version" entry.
 
 2006-06-19  Jordi Mallach  <jordi@gnu.org>
 

po/LINGUAS

@@ -1,2 +1,2 @@
 # List of available languages.
-bg ca cs da de es eu fi fr ga gl hu id it ms nb nl nn pl pt_BR ro ru rw sr sv tr uk vi zh_TW
+bg ca cs da de eo es eu fi fr ga gl hr hu id it ja ms nb nl nn pl pt_BR ro ru sl sr sv tr uk vi zh_CN zh_TW