po: update translations and regenerate POT file and PO files

When there is no end match after a start, it is pointless to look
for any more starts because also they will not have any end match,
so nothing will get painted -- just cut the loop short.

.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,39 @@
+*~
+*.bak
+*.o
+*.orig
+*.patch
+*.swp
+.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
+/intl
+/missing
+/mkinstalldirs
+/stamp-h1
+
+/nano.spec
+/src/nano
+/src/revision.h

AUTHORS

@@ -1,18 +1,17 @@
-$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, stable series maintainer.
+	* Original program author and long-time maintainer.
 
-David Lawrence Ramsey <pooka_regent@sluggy.net>
-	* Development 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@sindominio.net>
+Jordi Mallach <jordi@gnu.org>
 	* Debian package maintainer, fellow bug squasher.
 	* Internationalization support head, ca.po maintainer.
 
@@ -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
@@ -35,3 +34,29 @@ David Benbennick <dbenbenn@math.cornell.edu>
 	* Wrap and justify bugfixes/enhancements, new color syntax
 	  code, memleak fixes, parts of the UTF-8 support, and other
 	  miscellaneous fixes.
+
+Mike Frysinger <vapier@gentoo.org>
+	* Gentoo package maintainer.  Whitespace display mode,
+	  --enable-utf8/--disable-utf8 configure options for ncurses,
+	  many new color regexes and improvements to existing color
+	  regexes in syntax/*.nanorc, and miscellaneous bug fixes.
+
+Mark Majeres <mark@engine12.com>
+	* A functional undo/redo system, and coloring nano's interface.
+
+Mahyar Abbaspour <mahyar.abaspour@gmail.com>
+	* Improved handling of SIGWINCH.
+
+Mike Scalora <mike@scalora.org>
+	* The comment/uncomment feature.
+
+Faissal Bensefia <faissaloo@gmail.com>
+	* Line numbers.
+
+Sumedh Pendurkar <sumedh.pendurkar@gmail.com>
+	* The word-completion feature.
+
+Benno Schulenberg <bensberg@justemail.net>
+	* An array of small bug fixes, the cut-word and block-jump
+	  routines, text selection by holding Shift, and some extra
+	  key bindings.  Current maintainer.

BUGS

@@ -1,139 +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]
-- Alt-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 down's, the screen doesn't update
-  properly (discovered by David Lawrence Ramsey) (59) [FIXED].
-- On BSD systems, marked cutting sna 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.

IMPROVEMENTS

@@ -0,0 +1,156 @@
+Improvements in GNU nano
+========================
+
+Since 2.7.0:
+  - The keystroke ^] to complete a fragment to an existing full word.
+  - The ability to display line numbers in front of the text (M-#).
+
+Since 2.6.0:
+  - Shift plus the cursor keys can be used for selecting text.
+  - Ctrl+Arrow should now work also on a Linux virtual console.
+  - Ctrl+Up and Ctrl+Down jump to previous or next block of text.
+  - Feedback during Unicode Input (M-V followed by six digits).
+  - The option 'wordchars' for specifying extra word characters.
+  - Hi-bit control characters are shown in a more readable manner.
+  - The ability to use negative numbers at the Go To Line prompt.
+
+Noteworthy changes since 2.2
+----------------------------
+  - The ability to comment/uncomment lines with a single keystroke (M-3).
+  - The ability to refresh the file list in the browser (^L).
+  - The ability to abort re-searches (^C after an M-W).
+  - Better feedback at startup when opening large or multiple files.
+  - The option 'justifytrim' for snipping whitespace from justified lines.
+  - The ability to discard a buffer (^O ^Q) when --tempfile is used.
+  - Replacing things in a marked region now takes place in situ, in context,
+    instead of changing the view to only the marked text.
+  - On some terminals Ctrl+Left / Ctrl+Right now work for PrevWord/NextWord.
+  - When in the middle of a word, PrevWord now jumps to the start of this
+    word (like Pico does) instead of to the start of the preceding word.
+  - Invalid byte sequences are properly displayed and not mistakenly found.
+  - Resizing the window does not exit from help viewer nor file browser.
+  - Improved arrangement of the shortcuts in the two help lines.
+  - Several small bug fixes in the syntax highlighting.
+  - System syntaxes can be improved upon with the 'extendsyntax' command.
+  - The ability to delete whole words with 'cutwordleft' and 'cutwordright'.
+  - The ability to save a file without prompting for its name ('savefile').
+  - The ability to search backward without having to toggle the direction.
+  - Whitespace display (M-P) does not require configuration to be useful.
+  - Undo/redo is enabled by default (M-U/M-E) and works nearly everywhere
+    -- just not yet for justifying and indenting/unindenting.
+  - The ability to color the title bar, the status bar and the help lines.
+  - The ability to run a linter or formatter (^T) on the current buffer.
+  - The ability to only write to named pipes with --noread.
+  - Determination of the applicable syntax through libmagic -- when the
+    file extension nor the first line give an answer.
+  - The option 'positionlog' for saving/restoring the cursor position.
+  - The ability to read and write vim-style lock files.
+
+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
+  - Support for UTF-8.
+  - Moving to a specified line and column of a file, instead of just a
+    line (+LINE,COLUMN).
+  - Smart home key (-A).
+  - Creation of unique backup files in a specified directory (-C <dir>).
+  - Insertion of spaces instead of a tab when Tab is pressed (-E).
+  - The long option for -K is now --rebindkeypad.
+  - Regular expression searching can now be toggled when nano is built
+    with --enable-tiny, so -R now means something else (see below).
+  - Restricted mode that provides more security than -o (-R).
+  - Blanking of the statusbar after 1 keystroke instead of 25 (-U).
+  - Word searches can optionally skip over punctuation (-W).
+  - Workaround for Delete's acting like Backspace (-d).
+  - Many more options are supported in the nanorc.
+  - Improvements to color syntax highlighting support: case insensitive
+    matching, the ability to include color syntaxes in separate files,
+    the ability to specify background colors without foreground colors,
+    etc.
+  - Insertion of single-byte characters via Esc Esc <000-255>.
+  - Insertion of all characters via "Verbatim Input" mode.
+  - Workaround for the "NumLock glitch".
+  - Meta-W now repeats the last search.  Wrapping is now toggled via
+    Meta-L.
+  - Replacing and spell checking only selected text.
+  - Indenting lines with one keystroke.
+  - Copying text into the cutbuffer without cutting it.
+  - Scrolling the text up and down single lines without moving the
+    cursor.
+  - PageUp and PageDown work more smoothly when using -S.
+  - Scrolling the help text up and down single lines.
+  - Cutting all text from the current position to the end of the file
+    with one keystroke.
+  - Justifying the entire file with one keystroke.
+  - Justifying without removing spaces from the ends of lines.
+  - Unjustifying after justifying and immediately resizing.
+  - Going to the first or last line of the current paragraph.
+  - Going to the first or last line of the file without having to go to
+    the "Search" prompt.
+  - Searching for filenames in the file browser.
+  - Displaying spaces and tabs differently to make it easier to tell
+    them apart.
+  - Many more functions available at the statusbar prompt: moving to the
+    next or previous word, searching for matching brackets, "Verbatim
+    Input" mode, etc.
+  - The glibc 2.2.3 crashes involving extended regular expressions are
+    no longer worked around, as they can break anything using extended
+    regular expressions, and glibc 2.2.3 is old.  You should upgrade to
+    at least glibc 2.2.4.
+
+* File Handling
+  - Automatic adding of newlines to the ends of files without them can
+    now be disabled (-L).
+  - Converting from and to DOS/Mac file format is now toggled only at
+    the "Write File" prompt, via Meta-D and Meta-M, and the default file
+    format to save in is now set depending on what format the file was
+    originally in.  -D now makes nano use bold text instead of reverse
+    video text, and Meta-D at the edit window now does a
+    word/line/character count.  -O now makes the unused second line of
+    the screen part of the edit window, and Meta-O at the edit window
+    now toggles this behavior.
+  - Converting files that contain a mix of DOS and Mac format lines.
+  - Automatic switching on of -N with binary files has been removed, as
+    it causes problems with UTF-8 support.
+
+Visible changes since 1.0
+-------------------------
+* Editor Features
+  - Complete Pico compatibility (--pico has been removed, and -p means
+    something else, see below).
+  - nanorc support (see nanorc.sample included in sources).
+  - Smooth scrolling (-S).
+  - Support for searching for matching braces, brackets, etc.
+  - Help for all editor features.
+  - Color syntax highlighting support.
+  - Quote string support, useful for mail agents, etc. (-Q).
+  - Insertion of output of external commands.
+  - Optional enabling of XON and XOFF control characters (-p).
+  - Tons of bugfixes/enhancements for already existing features.
+
+* File Handling
+  - Overwriting and appending or prepending to files.
+  - Writing marked text to separate files.
+  - Multiple file buffers (-F).
+  - Converting from and to DOS/Mac file format (-D/-M, -N to disable).
+  - Better control character handling.
+  - Creation of backup files (-B).
+  - Search/replace history (-H).
+
+See the nano manual for detailed information on each feature.

Makefile.am

@@ -1,10 +1,12 @@
-## $Id$
 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
+if USE_COLOR
+SUBDIRS += syntax
+endif
+
+EXTRA_DIST = ChangeLog.1999-2006 ChangeLog.2007-2015 \
+		IMPROVEMENTS README.GIT nano.spec
 
 ACLOCAL_AMFLAGS = -I m4

README

@@ -1,69 +1,69 @@
 
-	GNU nano - an enhanced clone of the Pico text editor.
+		GNU nano -- an enhanced clone of the Pico text editor
 
 Overview
 
-     The nano project was started because of a few "problems" with the
-     wonderfully easy-to-use and friendly Pico text editor.
+	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
-     redistribution.  Because of this, Pine and Pico are not included
-     with many GNU/Linux distributions.  Also, other features (like goto
-     line number or search and replace) were unavailable until recently
-     or require a command line flag.  Yuck.
+	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.
 
-     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.
+	nano aims to solve these problems by emulating the functionality of
+	Pico as closely as possible while addressing the problems above and
+	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
-     make
-     make install
+	Download the nano source code, then:
 
-     It's that simple.  Use --prefix with configure to override the
-     default installation directory of /usr/local.
+	tar xvzf nano-x.y.z.tar.gz
+	cd nano-x.y.z
+	./configure
+	make
+	make install
+
+	It's that simple.  Use --prefix with configure to override the
+	default installation directory of /usr/local.
+
+	If you haven't configured with the --disable-nanorc option, after
+	installation you may want to copy the doc/sample.nanorc file to
+	your home directory, rename it to ".nanorc", and then edit it
+	according to your taste.
 
 Web Page
 
-	http://www.nano-editor.org/
+	https://nano-editor.org/
 
-Mailing List and Bug Reports
+Mailing Lists
 
-	Savannah hosts all the nano-related mailing-lists.
+	There are three 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 info 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
-	subject of "subscribe", where <name> is the list you want to
-	subscribe to.
+	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.
+Bug Reports
+
+	To report a bug, please file a description of the problem on nano's
+	bug tracker (https://savannah.gnu.org/bugs/?group=nano -- hover on
+	"Bugs", then click "Submit new").  The issue may have already been
+	reported, so please look first.
 
 Current Status
 
-	GNU nano has reached its second stable milestone, 1.2.x.
-	Development of new features continues in the 1.3.x branch, while
-	1.2.x versions are dedicated to bug-fixing and polishing.
-
-   Chris Allegretta (chrisa@asty.org)
-
-$Id$
+	GNU nano has reached its seventh milestone, 2.6.x.  Since 2.5.0, it
+	is a "rolling" release: bug fixing and development go hand in hand.

README.CVS

@@ -1,46 +0,0 @@
-INSTRUCTIONS TO COMPILE AND INSTALL NANO CVS VERSIONS
------------------------------------------------------
-
-GNU nano is available from CVS, but building this needs a bit more care
-than the official stable and unstable tarballs.
-
-To successfully compile GNU nano from CVS, you'll need the following
-packages:
-
-- autoconf (version >= 2.54)
-- automake (version >= 1.7)
-- gettext (version >= 0.11.5)
-- groff
-- texinfo
-- cvs
-- ssh (with support for the SSH version 2 protocol)
-- glib 2.x (if your system doesn't have snprintf() and/or vsnprintf())
-- make, gcc and the normal development libraries (curses or slang, etc.)
-
-These should be available on your GNU mirror.  Note that you'll need a
-version of curses or slang with wide character support if you want nano
-to use UTF-8.
-
-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
-$ export CVS_RSH=ssh
-If you're using a C shell (e.g. tcsh or csh), do
-$ setenv CVS_RSH ssh
-
-After it's set up, use the following command to download the CVS tree:
-$ cvs -z3 -d:ext:anoncvs@savannah.gnu.org:/cvsroot/nano checkout nano
-
-If you want to download the stable CVS branch, add "-r nano_1_0_branch":
-$ cvs -z3 -d:ext:anoncvs@savannah.gnu.org:/cvsroot/nano checkout -r nano_1_0_branch nano
-
-Once you have the sources in the "nano" directory, cd into it, and
-execute the "autogen.sh" script in the top directory.  This will set up
-a configure script and Makefile.in, and you will be ready to compile
-with
-$ ./configure [--add-options-here] && make
-
-Once it's done compiling,
-$ make install
-(as root) should put the required files in their respective directories.
-
-Please submit any bugs in the CVS branch to nano-devel@gnu.org.

README.GIT

@@ -0,0 +1,108 @@
+INSTRUCTIONS FOR COMPILING AND INSTALLING NANO FROM GIT
+=======================================================
+
+The latest changes and fixes for GNU nano are available via git, but
+building this needs a bit more care than the official tarballs.
+
+
+Prerequisites
+-------------
+
+To successfully compile GNU nano from git, you'll need the following
+packages:
+
+- autoconf    (version >= 2.61)
+- automake    (version >= 1.7)
+- autopoint   (version >= 0.11.5)
+- gettext     (version >= 0.11.5)
+- git         (version >= 2.7.4)
+- groff       (version >= 1.12)
+- pkg-config  (version >= 0.22)
+- texinfo     (version >= 4.0)
+- gcc         (any version)
+- make        (any version)
+
+If you want UTF-8 support, you will also need libncursesw5-dev installed
+(version >= 5.7), or libslang2-dev (version >= 2.0) if you use --with-slang.
+If your system doesn't have 'snprintf' or 'vsnprintf' (which the configure
+script will check for), you will also need glib-2.x installed.
+
+These should all be available in your distro's package manager or software
+center, or otherwise on any GNU mirror.
+
+
+Download the source
+-------------------
+
+To obtain the current nano development branch (called 'master'), use the
+following command.  It will create in your current working directory a
+subdirectory called 'nano' containing a copy of all of the files:
+
+    $ git clone git://git.savannah.gnu.org/nano.git nano
+
+
+Generate the configure script
+-----------------------------
+
+Once you have the sources in the "nano" directory,
+
+    $ cd nano
+    $ ./autogen.sh
+
+This will set up a configure script and a Makefile.in file.
+
+
+Configure your build
+--------------------
+
+To configure your build, run the configure script from the nano source
+directory:
+
+    $ ./configure [--add-options-here]
+
+
+Build and install
+-----------------
+
+From the nano source directory, build the code with:
+
+    $ make
+
+Then, once it's done compiling, run:
+
+    $ make install
+
+which should copy various files (i.e. the nano executable, the info and
+man pages, and syntax highlighting pattern files) to their appropriate
+directories.
+
+If you're installing into the default install directory (/usr/local),
+you'll need to run that "make install" command with root privileges.
+
+
+Problems?
+---------
+
+Please submit any bugs you find in the code in git via the bug tracker
+on Savannah (https://savannah.gnu.org/bugs/?group=nano).
+
+
+Contributing something
+----------------------
+
+If you have a fix for a bug, or the code for a new or improved feature,
+first create a branch off of master:
+
+    $ git checkout -b somename
+
+Then change the code so it does what you want, and commit it, with in the
+commit message (after the one-line summary) a rationale for the change:
+
+    $ git commit -as
+
+Then create a patch (or patches):
+
+    $ git format-patch master
+
+Send that patch (or patches) to <nano-devel@gnu.org>, as an attachment
+or with git send-email.

THANKS

@@ -1,48 +1,87 @@
 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
-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
-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
-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
-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
 Roy Lanek <lanek@ranahminang.net>		Advice and advocacy
@@ -52,6 +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,14 +1,60 @@
-TODO file (? means the feature may be implemented, but not definitely)
------------------------------------------------------------------------------
+A list of desired features
+--------------------------
 
-For version 1.4:
-- UTF-8 support. [DONE except for the NO_CONVERT flag, which should
-  allow editing UTF-8 as raw bytes.]
+Vague musings:
+- FriBidi support?
+- Make matching bracket searches sophisticated enough to skip over
+  brackets inside comments?
+- 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 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()?
+- 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 searching for and replacing newlines?
+  See also https://savannah.gnu.org/bugs/?47053.
+- New regression framework built on expect?
+- 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?
+
+Somewhat urgent:
+- Allow text searches in the help viewer.
+  See https://savannah.gnu.org/bugs/?28994.
+- Detect when text is being pasted, so that we can handle it faster.
+  See https://savannah.gnu.org/bugs/?40060.
+- 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 piping marked text to an external command and replacing it with
+  the command's output -- that is: generalize the spell-check flow.
+  See also https://savannah.gnu.org/bugs/?28993.
+
+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 (reading 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]
 - Support for paragraph searches. [DONE]
 - Support for justifying the entire file at once. [DONE]
-- Support for filename searches in the file browser.
-- Undo/Redo key?
-- Rebindable keys?
+- Support for filename searches in the file browser. [DONE]
 - Keystroke to implement "Add next sequence as raw" like vi's ^V. [DONE]
 - Spell check selected text only. [DONE]
 - Make "To Line" (^W^T) and "Read from Command" (^R^X) reenter their
@@ -16,41 +62,31 @@ For version 1.4:
   (^R^X^X) (requires figuring out when to keep cursor position and when
   not to). [DONE]
 - Fix resetstatuspos global which we shouldn't have. [DONE]
-- Rewrite the nano FAQ in SGML.
-
-Old requests:
 
 For version 1.2:
-- Single line scroll up/down? [DONE]
-- Color syntax highlighting? (certainly seems like there's a demand for
+- Single-line scroll up/down? [DONE]
+- Color syntax highlighting? (Certainly seems like there's a demand for
   it.) [DONE]
 - .nanorc [DONE]
 - Backup making (filename~)? [DONE]
-- Search (etc.) string history [DONE]
-- Implement Pico's -j and -g flags, as they are pretty easy to do.
-  [DONE]
-- Make mouse support work with clicking on the shortcuts (-m).  Must
-  make global variable pointing to current shortcut list to determine
-  what keystroke to ungetch(). [DONE].
-- Implement -o (chroot of sorts) [DONE]
+- Search/replace string history. [DONE]
+- Implement Pico's -j and -g flags, as they are pretty easy to do. [DONE]
+- Make mouse support work with clicking on the shortcuts (-m). [DONE]
+- Implement -o (chroot of sorts). [DONE]
 - Allow -r to take a negative argument, meaning right margin instead of
   left (allows resizing that way), formerly -W arg. [DONE]
 
 For version 1.0:
-- Implement Spelling [DONE]
-- Implement Help [DONE]
+- Implement Spelling. [DONE]
+- Implement Help. [DONE]
 - Internationalization [In progress, translators welcome!]
 - Allow nano to be resized in X. [DONE]
-- On page up/down, put the cursor on the first line (like Pico), not the
-  center line [DONE]
-- Rewrite edit_refresh, if at all possible [DONE]
-- Implement justify function [DONE]
-- Cut to end of line [DONE]
-- Built-in speller command [needed for version 1.0] [DONE]
-- Better statusbar interaction (scrolling, tab completion for filename)
-  [needed for version 1.0] [DONE]
-- Now do username completion [DONE].
-- Unjustify command (^U after ^J) [DONE =-].
-- Username completion (~user) [DONE =-].
-
-$Id$
+- On PageUp/Down, put the cursor on the first line (like Pico), not the
+  center line. [DONE]
+- Rewrite edit_refresh, if at all possible. [DONE]
+- Implement justify function. [DONE]
+- Cut to end of line. [DONE]
+- Built-in speller command. [DONE]
+- Better statusbar interaction (scrolling, tab completion). [DONE]
+- Unjustify command (^U after ^J). [DONE]
+- Username completion (~user). [DONE]

UPGRADE

@@ -1,28 +0,0 @@
-GNU nano upgrading information
-==============================
-
-Visible changes since 1.0
--------------------------
-* Editor Features
-  - Complete Pico compatibility (--pico has been removed, and -p means
-    something else, see below).
-  - nanorc support (see nanorc.sample included in sources).
-  - Smooth scrolling (-S).
-  - Searching of matching brace/bracket/etc.
-  - Help for all editor features.
-  - Color syntax highlighting support.
-  - Quote string support, useful for mail agents, etc (-Q).
-  - Insertion of output of external commands.
-  - Optional enabling of XON and XOFF control characters (-p).
-  - Tons of bugfixes/enhancements for already existing features.
-
-* File Handling
-  - Overwriting and appending or prepending to files.
-  - Writing marked text to separate files.
-  - Multiple file buffers (-F).
-  - Converting from and to DOS/Mac file format (-D/-M, -N to disable).
-  - Better control character handling.
-  - Creation of backup files (-B).
-  - Search/replace history (-H).
-
-See the GNU nano manual for detailed information on each feature.

autogen.sh

@@ -1,4 +1,4 @@
 #!/bin/sh
-# Generate configure & friends for CVS users.
+# Generate configure & friends for GIT users.
 
 autoreconf -f -i -s

doc/.cvsignore

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

doc/.gitignore

@@ -0,0 +1,7 @@
+nano.1.html
+rnano.1.html
+nanorc.5.html
+texinfo.tex
+nano.info
+nano.html
+sample.nanorc

doc/Makefile.am

@@ -1,3 +1,33 @@
-SUBDIRS = man texinfo
+SUBDIRS =
+BUILT_SOURCES =
 
-EXTRA_DIST = faq.html nanorc.sample
+dist_html_DATA = faq.html
+
+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
+	groff -t -mandoc -Thtml < $? > $@
+nanorc.5.html: nanorc.5
+	groff -t -mandoc -Thtml < $? > $@
+rnano.1.html: rnano.1
+	groff -t -mandoc -Thtml < $? > $@
+
+if GROFF_HTML
+BUILT_SOURCES += $(html_pages)
+dist_html_DATA += $(html_pages)
+endif
+
+info_TEXINFOS = nano.texi
+
+BUILT_SOURCES += nano.html
+dist_html_DATA += nano.html
+
+AM_MAKEINFOHTMLFLAGS = --no-split
+
+EXTRA_DIST = $(BUILT_SOURCES) $(info_TEXINFOS)

doc/faq.html

@@ -2,9 +2,10 @@
 <html>
 <head>
   <title>The GNU nano editor FAQ</title>
-  <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
+  <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
 </head>
 <body text="#330000" bgcolor="#ffffff" link="#0000ef" vlink="#51188e" alink="#ff0000">
+
 <h1>The GNU nano editor FAQ</h1>
 <h2>Table of Contents</h2>
 <h2><a href="#1">1. General</a></h2>
@@ -19,113 +20,108 @@
 <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 GIT (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.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/double bucky/meta key doesn't seem to work! What can I do?</a><br>
-  <a href="#4.3">4.3. How do I type the F13-F16 keys shown in the help browser? My keyboard only has F1-F12!</a><br>
-  <a href="#4.4">4.4. Nano crashes when I type &lt;insert keystroke here&gt;!</a><br>
-  <a href="#4.5">4.5. Nano crashes when I resize my window. How can I fix that?</a><br>
-  <a href="#4.6">4.6. [version 1.1.12 and earlier] Why does nano show ^\ in the shortcut list instead of ^J?</a><br>
-  <a href="#4.7a">4.7a. [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?!</a><br>
-  <a href="#4.7b">4.7b. [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.8">4.8. How do I make nano my default editor (in Pine, mutt, etc.)?</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>
+  <a href="#4.3">4.3. Ack! My numeric keypad's keys don't work properly when NumLock is off! What can I do?</a><br>
+  <a href="#4.4">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?</a><br>
+  <a href="#4.5">4.5. How do I type the F13-F16 keys shown in the help browser? My keyboard only has F1-F12!</a><br>
+  <a href="#4.6">4.6. nano crashes when I type &lt;insert keystroke here&gt;!</a><br>
+  <a href="#4.7">4.7. nano crashes when I resize my window. How can I fix that?</a><br>
+  <a href="#4.8">4.8. 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.9">4.9. I've compiled nano with color support, but I don't see any color when I run it!</a><br>
-  <a href="#4.10">4.10. How do I select text for the clipboard in an X terminal when I'm running nano in one and nano's mouse support is turned on?</a></p></blockquote>
+  <a href="#4.10">4.10. How do I make nano my default editor (in Pine, mutt, etc.)?</a><br>
+  <a href="#4.11">4.11. 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.12">4.12. 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></p></blockquote>
+  <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>
+  <a href="#5.3">5.3. What is the status of Unicode support?</a></p></blockquote>
 <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>
+<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 GIT 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 written and is 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. 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>
-<blockquote><p>GNU nano is designed to be a free replacement for the Pico text editor, part of the Pine email suite from <a href="http://www.washington.edu/pine/">The University of Washington</a>. It aims to &quot;emulate Pico as closely as possible and perhaps include extra functionality&quot;.</p></blockquote>
+<blockquote><p>GNU nano is designed to be a free replacement for the Pico text editor, part of the Pine email suite from <a href="http://www.washington.edu/pine/">The University of Washington</a>. It aims to &quot;emulate Pico as closely as possible and then include extra functionality&quot;.</p></blockquote>
 <h2><a name="1.4"></a>1.4. What is the history behind nano?</h2>
 <blockquote><p>Funny you should ask!</p>
   <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 menu, 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>
-  <p>In February 2001, nano was declared an official GNU program by Richard Stallman. Nano also reached its first production release on March 22, 2001.</p></blockquote>
+  <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 in today.</p>
+  <p>In February 2001, nano was declared an official GNU program by Richard Stallman. nano also reached its first production release on March 22, 2001.</p></blockquote>
 <h2><a name="1.5"></a>1.5. Why the name change from TIP?</h2>
 <blockquote><p>On January 10, 2000, TIP was officially renamed to nano because of a namespace conflict with another program called 'tip'. The original 'tip' program &quot;establishes a full duplex terminal connection to a remote host&quot;, and was included with many older Unix systems (and newer ones like Solaris). The conflict was not noticed at first because there is no 'tip' utility included with most GNU/Linux distributions (where nano was developed).</p></blockquote>
 <h2><a name="1.6"></a>1.6. What is the current version of nano?</h2>
-<blockquote><p>The current version of nano *should* be 1.3.6. Of course you should always check the nano homepage to see what the latest and greatest version is.</p></blockquote>
+<blockquote><p>The current version of nano <i>should</i> be <b>2.7.4</b>.  Of course, you should always check the <a href="https://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/v1.3/nano.1.html">here</a>.</p></blockquote>
+<blockquote><p>Jeez, demanding, aren't we? Okay, look <a href="https://nano-editor.org/dist/latest/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>
+<h2><a name="2.1"></a>2.1. Web sites that carry nano.</h2>
+<blockquote><p>The nano source tarballs can be downloaded from the following web 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>
+    <li><a href="https://nano-editor.org/dist/">https://nano-editor.org/dist/</a></li>
+    <li><a href="https://ftp.gnu.org/gnu/nano/">https://ftp.gnu.org/gnu/nano/</a></li>
   </ul>
 </blockquote>
-<h2><a name="2.2"></a>2.2. RedHat and derivatives (.rpm) packages.</h2>
+<h2><a name="2.2"></a>2.2. RPM packages (RedHat, OpenSuse, and derivatives).</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>
-  </ul>
-  <p>Additionally, check out the RedHat contribs section at:</p>
-  <ul>
-    <li><a href="http://distro.ibiblio.org/pub/Linux/distributions/redhat/contrib/libc6/i386/">http://distro.ibiblio.org/pub/Linux/distributions/redhat/contrib/libc6/i386/</a></li>
-    <li><a href="ftp://distro.ibiblio.org/pub/Linux/distributions/redhat/contrib/libc6/i386/">ftp://distro.ibiblio.org/pub/Linux/distributions/redhat/contrib/libc6/i386/</a></li>
+    <li><a href="https://kojipkgs.fedoraproject.org//packages/nano/">https://kojipkgs.fedoraproject.org//packages/nano/</a></li>
+    <li><a href="https://software.opensuse.org/package/nano">https://software.opensuse.org/package/nano</a></li>
   </ul>
 </blockquote>
-<h2><a name="2.3"></a>2.3. Debian (.deb) packages.</h2>
+<h2><a name="2.3"></a>2.3. Deb packages (Debian and derivatives):</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_id=1025">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 GIT (for the brave).</h2>
+<blockquote><p>For the 'bleeding edge' current version of nano, you can use GIT 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://git.savannah.gnu.org/cgit/nano.git/tree/README.GIT">the nano GIT document</a> for info on anonymous GIT 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>
@@ -135,154 +131,201 @@
 <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>
+<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 code for a smaller
-                          binary
-  <b>--disable-justify</b>       Disable justify/unjustify function
-  <b>--disable-speller</b>       Disable spell checker function
-  <b>--disable-help</b>          Disable help function
-  <b>--disable-browser</b>       Disable mini 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 functions, including easter eggs
-  <b>--enable-nanorc</b>         Enable use of .nanorc file
-  <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>
-                          Turn off wrapping of text by default when the
-                          user is root</pre></blockquote>
+  <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-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-wordcomp</b>      Disable the word completion function
+  <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 whether 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> or <b>--enable-extra</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>
-  <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>
+<blockquote><p>To use multiple file buffers, you must not have configured nano 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 without holding Shift: <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, you can press <b>Meta-V</b> and then type a four-digit hexadecimal code from 0000 to ffff (case-insensitive), and the character with the corresponding value will be inserted instead.</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>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; on the statusbar), 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. The statubar 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 will be read when I start nano?</h2>
+<blockquote><p>It's not hard at all! But, your nano must <b>not</b> have been compiled with <b>--disable-nanorc</b>. Then simply copy the <b>sample.nanorc</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 of the file 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>
-<h2><a name="4.2"></a>4.2. Ack! My backspace/delete/enter/double bucky/meta 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>
+  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. 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, or Eterm, Shift-F3 to Shift-F6 will generate F13 to F16.</p></blockquote>
-<h2><a name="4.4"></a>4.4. 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>
-<h2><a name="4.5"></a>4.5. 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>
-<h2><a name="4.6"></a>4.6. [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>
-<h2><a name="4.7a"></a>4.7a. [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>
-<h2><a name="4.7b"></a>4.7b. [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.8"></a>4.8. How do I make nano my default editor (in Pine, mutt, etc.)?</h2>
+<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> 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 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 version 2.7.0 or newer.</p></blockquote>
+<h2><a name="4.8"></a>4.8. 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.9"></a>4.9. 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. 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.10"></a>4.10. How do I make nano my default editor (in Pine, mutt, etc.)?</h2>
 <blockquote><p>You need to make nano your $EDITOR. If you want this to be saved, you should put a line like this in your <b>.bashrc</b> if you use bash (or <b>.zshrc</b> if you believe in zsh):</p>
   <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>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>Then on top that if you use Pine you must go into setup (type <b>S</b> at the main menu), then configure (type <b>C</b>). Hit enter on the lines that say:</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>
   <p>Then exit (<b>E</b>) and select Yes (<b>Y</b>).</p>
-  <p>Mutt users should see an effect immediately the next time you log in, no further configuration is needed. However, if you want to let people know you use nano to compose your email messages, you can put a line like this in your <b>.muttrc</b>:</p>
+  <p>If you're a mutt user, you should see an effect immediately the next time you log in. No further configuration is needed. However, if you want to let people know you use nano to compose your email messages, you can put a line like this in your <b>.muttrc</b>:</p>
   <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.9"></a>4.9. 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>
-<h2><a name="4.10"></a>4.10. How do I select text for the clipboard in an X terminal when I'm running nano in one and nano's mouse support is turned on?</h2>
-<blockquote><p>Try holding down the Shift key and selecting the text as you normally would.</p></blockquote>
+<h2><a name="4.11"></a>4.11. 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.12"></a>4.12. 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 in a .nano subdirectory in your home directory.  A newer nano will move an existing search-history file to this new location so it can continue to be used.  This means that if you then try and use an earlier version of nano, it will be unable to see your current search history.  To fix this, run the following command:<br>
+  <p><b>ln -sf ~/.nano/search_history ~/.nano_history</b></p>
+</p><p>The "migration service" (moving the search-history file to its new location) will be deleted from nano in early 2018.</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/contrib/po/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/contrib/po/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/contrib/po/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>In June 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>Since versions 1.3.12, 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="https://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="https://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>
+<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>
   <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/v1.3/BUGS">bug</a> in the program or implement a <a href="http://www.nano-editor.org/dist/v1.3/TODO">cool feature</a> and send us that instead (though cash is fine too).</p></blockquote>
-<h2><a name="7.3"></a>7.3. How do I submit a patch?</h2>
-<blockquote><p>See Section <a href="#7.2">7.2</a>.</p></blockquote>
-<h2><a name="7.4"></a>7.4. How do I join the development team?</h2>
-<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>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>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="https://nano-editor.org/dist/latest/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>
-2005/03/09 - Added question about opening files with names beginning with '+'s, and added a few more miscellaneous cosmetic fixes. (DLR)<br>
-2005/01/03 - Removed now-inaccurate note about verbatim input's not working at prompts, and update its description to mention that it handles hexadecimal values now. (DLR)<br>
-2004/11/21 - Listed sh as an example of a Bourne shell. (DLR)<br>
-2004/11/05 - Fixed inaccuracy: Pico compatibility mode was made the default in nano 1.1.99pre1, not 1.2.2. Also added question about how to type F13-F16 on terminals lacking keys past F12 (suggested by Chris), question about how to select text for the clipboard in X terminals with nano's mouse support turned on (answer found by Joseph Birthisel), and misc. fixes and link updates. (DLR)<br>
-2004/04/07 - Removed NumLock glitch question, as it's no longer needed. (DLR)<br>
-2004/01/30 - Fixed inaccuracy: multibuffer mode was first in nano 1.1.0, not 1.1.12. (DLR)<br>
-2003/12/31 - Added question about the new verbatim input function, and a few minor fixes.  Removed reference to &quot;set pico&quot; (DLR).<br>
-2003/07/02 - Added question about nano's not showing color when it's compiled with color support (DLR; suggested by Jordi).<br>
-2003/02/23 - Updated RPM links for nano 1.2.x (DLR).<br>
-2003/01/16 - Split section 4.5 into 4.5a and 4.5b for search string behavior. Added --enable-all docs.<br>
-2002/12/28 - More misc. fixes (David Benbennick, DLR).<br>
-2002/10/25 - Misc. fixes and link updates (DLR).<br>
-2002/09/10 - Another typo fix (DLR).<br>
-2002/05/15 - Typo fix (DLR).<br>
-2001/12/26 - Misc. fixes (Aaron S. Hawley, DLR).<br>
-2001/10/02 - Update for Free Translation Project.<br>
-2001/10/02 - Assorted fixes, Debian additions.<br>
-2001/06/30 - Silly typo fix.<br>
-2001/05/05 - Spelling fixes by David Lawrence Ramsey.<br>
-2001/05/02 - Misc fixes.<br>
-2001/03/26 - Typo fix in an URL.<br>
-2001/02/17 - Advocacy updates.<br>
-2001/02/15 - Added GNU notes for 0.9.99pre3.<br>
-2001/02/06 - Typo fixes.<br>
-2001/01/14 - Added note about NumLock glitch.<br>
-2001/01/10 - Linux -&gt; GNU/Linux.<br>
-2001/01/09 - Added &quot;making exe smaller&quot; section.<br>
-2000/12/19 - Typo and assorted error fixes.<br>
-2000/11/28 - Added blurb about make install-strip.<br>
-2000/11/19 - Changed Debian frozen to stable.<br>
-2000/11/18 - Previous string display (4.5).<br>
-2000/09/27 - Moved addresses to nano-editor.org.<br>
-2000/06/31 - Initial framework.</p></blockquote>
-<p>$Id$</p>
+<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 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 git tree?</h2>
+<blockquote><p>Re-read section <a href="#7.4">7.4</a> and you should know the answer.</p></blockquote>
+<hr width="100%">
+
+<h1><a name="8"></a>8. ChangeLog</h1>
+<blockquote><p>
+2017.01.09 - Delete some obsolete items and update a few others. (Benno)<br>
+2016.04.17 - Update docs to refer to GIT instead of subversion. (Mike)<br>
+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. (Chris)<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>
+2006.06.12 - Update section 5.3, due to the display fix for two-column Unicode characters. (DLR)<br>
+2006.06.05 - Add a new section 4.8, and move all section 4 entries after it down one number, to explain how to deal with glibc 2.2.3's crashes involving extended regular expressions. (DLR)<br>
+2006.06.04 - Add minor punctuation, wording, and typo fixes. (DLR)<br>
+2006.05.27 - Update section 3.8 to mention the new "Unicode Input" prompt, and how Unicode input only works when Unicode support is enabled. (DLR)<br>
+2006.05.12 - Remove section 4.4, and move all section 4 entries after it up one number, since it no longer applies. Meta-] and Meta-[ are no longer used to indent and unindent marked text, since they require that the bracket matching key change to Ctrl-], which is used as the telnet escape key (found by Chris). Also, make the link to the nano CVS page a bit more readable. (DLR)<br>
+2006.05.08 - Add a new section 4.5, and move all section 4 entries after it down one number, to explain a problem that can occur when holding down keys to generate Meta sequences. Also add a few more capitalization and wording fixes. (Benno Schulenberg, minor tweaks by DLR)<br>
+2006.05.01 - Add a new section 4.4, and move all section 4 entries after it down one number, to explain how to deal with problems typing Meta-[. Also add a few capitalization and wording fixes. (DLR)<br>
+2006.04.14 - Clarify section 1.4: help menu -> help text display. (DLR, suggested by Benno Schulenberg)<br>
+2006.03.16 - Update the Free Translation Project's address, change the character set to UTF-8, and remove broken links to contributed RedHat nano packages. (DLR)<br>
+2005.11.21 - Clarify section 5.3 to better explain how to enable Unicode support, and remove the mention of quirks, since they turned out to not be a nano problem. (Mike Frysinger and DLR)<br>
+2005.11.19 - Add a new section 5.3 to explain the status of nano's Unicode support. (Mike Frysinger, minor tweaks by DLR)<br>
+2005.08.27 - Update email address. (DLR)<br>
+2005.08.10 - Add a new section 4.3, and move all section 4 entries after it down one number, to explain how to deal with numeric keypad problems. (DLR)<br>
+2005.08.08 - Update section 3.8 to mention that verbatim input mode now takes a six-digit hexadecimal number. (DLR)<br>
+2005.07.04 - Update section 4.10 to mention that pasting from the X clipboard via the middle mouse button also works when the Shift key is used. (DLR)<br>
+2005.06.15 - Update description of --enable-extra, and add missing line breaks. (DLR)<br>
+2005.06.13 - Minor capitalization and wording fixes. (DLR)<br>
+2005.06.08 - Updated section 1.1 to mention the current maintainer. (DLR)<br>
+2005.03.09 - Added question about opening files with names beginning with '+'s, and added a few more miscellaneous cosmetic fixes. (DLR)<br>
+2005.01.03 - Removed now-inaccurate note about verbatim input's not working at prompts, and update its description to mention that it handles hexadecimal values now. (DLR)<br>
+2004.11.21 - Listed sh as an example of a Bourne shell. (DLR)<br>
+2004.11.05 - Fixed inaccuracy: Pico compatibility mode was made the default in nano 1.1.99pre1, not 1.2.2. Also added question about how to type F13-F16 on terminals lacking keys past F12 (suggested by Chris), question about how to select text for the clipboard in X terminals with nano's mouse support turned on (answer found by Joseph Birthisel), and misc. fixes and link updates. (DLR)<br>
+2004.04.07 - Removed NumLock glitch question, as it's no longer needed. (DLR)<br>
+2004.01.30 - Fixed inaccuracy: multibuffer mode was first in nano 1.1.0, not 1.1.12. (DLR)<br>
+2003.12.31 - Added question about the new verbatim input function, and a few minor fixes. Removed reference to &quot;set pico&quot; (DLR).<br>
+2003.07.02 - Added question about nano's not showing color when it's compiled with color support (DLR; suggested by Jordi).<br>
+2003.02.23 - Updated RPM links for nano 1.2.x (DLR).<br>
+2003.01.16 - Split section 4.5 into 4.5a and 4.5b for search string behavior. Added --enable-all docs.<br>
+2002.12.28 - More misc. fixes (David Benbennick, DLR).<br>
+2002.10.25 - Misc. fixes and link updates (DLR).<br>
+2002.09.10 - Another typo fix (DLR).<br>
+2002.05.15 - Typo fix (DLR).<br>
+2001.12.26 - Misc. fixes (Aaron S. Hawley, DLR).<br>
+2001.10.02 - Update for Free Translation Project.<br>
+2001.10.02 - Assorted fixes, Debian additions.<br>
+2001.06.30 - Silly typo fix.<br>
+2001.05.05 - Spelling fixes by David Lawrence Ramsey.<br>
+2001.05.02 - Misc fixes.<br>
+2001.03.26 - Typo fix in an URL.<br>
+2001.02.17 - Advocacy updates.<br>
+2001.02.15 - Added GNU notes for 0.9.99pre3.<br>
+2001.02.06 - Typo fixes.<br>
+2001.01.14 - Added note about NumLock glitch.<br>
+2001.01.10 - Linux -&gt; GNU/Linux.<br>
+2001.01.09 - Added &quot;making exe smaller&quot; section.<br>
+2000.12.19 - Typo and assorted error fixes.<br>
+2000.11.28 - Added blurb about make install-strip.<br>
+2000.11.19 - Changed Debian frozen to stable.<br>
+2000.11.18 - Previous string display (4.5).<br>
+2000.09.27 - Moved addresses to nano-editor.org.<br>
+2000.06.31 - Initial framework.</p></blockquote>
 </body>
 </html>

doc/man/.cvsignore

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

doc/man/Makefile.am

@@ -1,12 +0,0 @@
-SUBDIRS = fr
-
-man_MANS = nano.1 nanorc.5
-
-BUILT_SOURCES = nano.1.html nanorc.5.html
-
-nano.1.html: nano.1
-	cat $< | groff -t -mandoc -Thtml > $@
-nanorc.5.html: nanorc.5
-	cat $< | groff -t -mandoc -Thtml > $@
-
-EXTRA_DIST = $(man_MANS) $(BUILT_SOURCES)

doc/man/fr/.cvsignore

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

doc/man/fr/Makefile.am

@@ -1,10 +0,0 @@
-man_MANS = nano.1 nanorc.5
-
-BUILT_SOURCES = nano.1.html nanorc.5.html
-
-nano.1.html: nano.1
-	cat $< | groff -t -mandoc -Thtml > $@
-nanorc.5.html: nanorc.5
-	cat $< | groff -t -mandoc -Thtml > $@
-
-EXTRA_DIST = $(man_MANS) $(BUILT_SOURCES)

doc/man/fr/nano.1

@@ -1,246 +0,0 @@
-.\" Hey, EMACS: -*- nroff -*-
-.\" nano.1 is copyright (C) 1999, 2000, 2001, 2002, 2003 by
-.\" Chris Allegretta <chrisa@asty.org>
-.\"
-.\" (c) 2003-2004 Jean-Philippe Guérard <jean-philippe.guerard@corbeaunoir.org>
-.\" pour l'adaptation française
-.\"
-.\" This is free documentation, see the latest version of the GNU General
-.\" Public License for copying conditions.  There is NO warranty.
-.\"
-.\" 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. AUCUNE garantie n'est offerte.
-.\"
-.\" $Id$
-.TH NANO 1 "version 1.3.4" "17 août 2004"  
-.\" Please adjust this date whenever revising the manpage.
-.\" 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
-
-.SH SYNOPSIS
-.B nano
-.I [\+LIGNE]\ [options]\ [fichier]
-.br
-
-.SH DESCRIPTION
-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 paquet 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 à un
-numéro de ligne.
-
-.SH OPTIONS
-.TP
-.B \+\fILIGNE\fR
-Démarre avec le curseur positionné à la ligne numéro \fILIGNE\fR.
-.TP
-.B \-A (\-\-smarthome)
-Active le fonctionnement évolué 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 à ce début de ligne (qu'il soit en avant ou en arrière). Si
-le curseur est déjà au tout début de la ligne, 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.
-.TP
-.B \-D (\-\-dos)
-Écrit le fichier au format DOS.
-.TP
-.B \-E \fIrépertoire\fP (\-\-backupdir=\fIrépertoire\fP)
-Définit le répertoire utilisé par \fBnano\fP pour enregistrer les copies 
-de sécurité si celles-ci sont activées.
-.TP
-.B \-F (\-\-multibuffer)
-Active le mode multifichier, 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
-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
-utiliser les fichiers nanorc.
-.TP
-.B \-I (\-\-ignorercfiles)
-N'utilise pas les fichiers \fISYSCONFDIR/nanorc\fR et \fI~/.nanorc\fR, même si
-\fBnano\fR est capable de les utiliser.
-.TP
-.B \-M (\-\-mac)
-Écrit le fichier au format Mac.
-.TP
-.B \-N (\-\-noconvert)
-Désactive la conversion automatique des fichiers depuis les formats Mac et
-DOS.
-.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
-sera "^([\ \\t]*[|>:}#])+", sinon, ce sera ">\ ".
-.TP
-.B \-R (\-\-regexp)
-Active l'utilisation d'expressions rationnelles lors des recherches, ainsi
-que la possibilité d'utiliser \\n dans les chaînes de remplacement pour
-faire référence à la n-ième sous-expression du motif de recherche, si
-cette fonction est disponible.
-.TP
-.B \-S (\-\-smooth)
-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.
-.TP
-.B \-V (\-\-version)
-Affiche le numéro de version et l'auteur.
-.TP
-.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
-disponible.
-.TP
-.B \-Z (\-\-restricted)
-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 et interdiction de sauvegarder (ou d'ajouter 
-en tête ou en fin) un fichier ayant déjà un nom sous un nom différent. 
-Cette option peut aussi être activée en appelant \fBnano\fP sous un nom 
-commençant par «\ r\ » (par exemple «\ rnano\ »).
-.TP
-.B \-c (\-\-const)
-Affiche en permanence la position du curseur.
-.TP
-.B \-d (\-\-rebinddelete)
-Interprète différemment la touche «\ Supprimer\ », afin que les touches
-«\ Effacement arrière\ » et «\ Supprimer\ » fonctionnent correctement. 
-Vous devriez n'avoir besoin de cette option que si la touche 
-«\ Effacement arrière\ » produit l'effet de la touche «\ Supprimer\ » 
-sur votre système.
-.TP
-.B \-h (\-\-help)
-Affiche un résumé des options disponibles en ligne de commande.
-.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.
-.TP
-.B \-k (\-\-cut)
-^K 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, remplace le lien par le
-nouveau fichier, sans le suivre. Ce mode ne serait-il pas utile pour éditer
-les fichiers de \fI/tmp\fR ?
-.TP
-.B \-m (\-\-mouse)
-Active l'utilisation de la souris (si elle est disponible sur votre
-système).
-.TP
-.B \-o \fIrépertoire\fP (\-\-operatingdir=\fIrépertoire\fP)
-Définit le répertoire de travail. Demande à nano 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
-par le terminal.
-.TP
-.B \-r \fIcolonne\fP (\-\-fill=\fIcolonne\fP)
-Passe automatiquement à la ligne à la colonne \fIcolonne\fR. Par défaut, le
-passage à la ligne se fait à la taille de l'écran moins huit. Si la
-valeur indiquée est négative, le point de passage à la ligne sera
-calculé relativement au bord droit de l'écran. Cela permet de faire varier
-le point de passage à la ligne lorsque l'on change la taille de l'écran.
-.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 -t de Pico.
-.TP
-.B \-v (\-\-view)
-Mode visualisation (lecture seule).
-.TP
-.B \-w (\-\-nowrap)
-Désactive le passage automatique à la ligne.
-.TP
-.B \-x (\-\-nohelp)
-Désactive la barre d'aide affichée en bas de l'écran.
-.TP
-.B \-z (\-\-suspend)
-Autorise à suspendre l'éditeur.
-.TP
-.B \-a, \-b, \-e, \-f, \-g, \-j
-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 manuel
-de \fBnanorc\fR(5) et au fichier-exemple \fInanorc.sample\fR qui devrait être
-livré avec \fBnano\fR.
-
-.SH NOTES
-Si aucun correcteur orthographique de remplacement n'est indiqué dans la 
-ligne de commande ou dans le fichier nanorc, \fBnano\fR prendra 
-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
-nom du fichier en cours afin de le rendre unique (par exemple,
-«\ .save.1\ »). En mode multifichier, \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.
-
-La liste de discussion anglophone \fBnano\fR est disponible via
-\fBnano-devel@gnu.org\fR.
-
-Pour vous abonner, envoyez un courrier électronique à
-\fBnano-devel-request@gnu.org\fR, ayant pour objet «\ subscribe\ ».
-
-.SH "SITE INTERNET"
-http://www.nano-editor.org/
-
-.SH "VOIR AUSSI"
-.PD 0
-.TP
-\fBnanorc\fR(5)
-.PP
-\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@sindominio.net> pour le système GNU Debian (mais elle peut
-être utilisée par d'autres).
-
-.SH TRADUCTION
-
-Adaptation française du 4\ septembre\ 2004 par
-Jean-Philippe\ Guérard\ <jean-philippe.guerard@corbeaunoir.org>.

doc/man/fr/nanorc.5

@@ -1,230 +0,0 @@
-.\" Hey, EMACS: -*- nroff -*-
-.\" nanorc.5 is Copyright (C) 2003 Free Software Foundation, Inc.
-.\"
-.\" (c) 2003-2004 Jean-Philippe Guérard <jean-philippe.guerard@corbeaunoir.org>
-.\" pour l'adaptation française
-.\"
-.\" This is free documentation, see the latest version of the GNU General
-.\" Public License for copying conditions. There is NO warranty.
-.\"
-.\" 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. AUCUNE garantie n'est offerte.
-.\"
-.\" $Id$
-.TH NANORC 5 "version 1.3.4" "17 août 2004"
-.\" Please adjust this date whenever revising the manpage.
-.\" Merci de modifier ces dates à chaque mise à jour de cette page.
-
-.SH NOM
-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 du projet GNU.
-.PP
-\fBnano\fP est un petit éditeur sympathique et libre, qui vise à 
-remplacer Pico, l'éditeur par défaut du paquet 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 à un numéro de ligne.
-.PP
-Le fichier \fInanorc\fP contient les paramètres par défaut de 
-\fBnano\fP. Lors de son démarrage, nano commence par lire le fichier de 
-configuration général \fISYSCONFDIR/nanorc\fP, puis lit le fichier de 
-configuration personnel de l'utilisateur \fI~/.nanorc\fP.
-
-.SH OPTIONS
-Le fichier de configuration accepte une série de commandes «\ set\ » 
-(activer) et «\ unset\ » (désactiver), qui permettent de définir la 
-configuration de nano au démarrage sans avoir à utiliser d'options sur 
-la ligne de commande.
-De plus, les mots clefs «\ syntax\ » (syntaxe) et «\ color\ » (couleur) 
-sont utilisés pour définir les règles de colorisation pour différents 
-motifs de texte. Nano lira 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
-prioritaires par rapport aux options du fichier de configuration.
-
-Les options sont désactivées (unset) par défaut, sauf les options 
-prenant un argument.
-
-Les commandes et arguments reconnus sont\ :
-
-.TP 3
-\fBset/unset autoindent\fP
-Active l'indentation automatique.
-.TP
-\fBset/unset backup\fP
-Crée des copie de sécurité nommées
-.IR nom_du_fichier~ .
-.TP
-\fBset/unset const\fP
-Affiche en permanence la position du curseur dans la ligne d'état.
-.TP
-\fBset/unset cut\fP
-Par défaut, ^K  coupe le texte du curseur jusqu'à la fin de la ligne, au 
-lieu de couper la ligne entière.
-.TP
-\fBset fill \fIn\fP\fP
-Passe automatiquement à la ligne à la colonne \fIn\fP. Si la valeur 
-indiquée est 0 ou moins, la longueur de la ligne sera égale à la largeur 
-de l'écran moins \fIn\fP. La valeur par défaut est -8.
-.TP
-\fBset/unset historylog\fP
-Active l'utilisation de
-.I ~/.nano_history
-pour enregistrer et relire les chaînes ayant fait l'objet d'une 
-recherche ou d'un remplacement.
-.TP
-\fBset/unset multibuffer\fP
-Mode multifichier\ : permet de charger les fichiers dans leur propre 
-espace.
-.TP
-\fBset/unset noconvert\fP
-Pas de conversion depuis les formats DOS et Mac.
-.TP
-\fBset/unset nofollow\fP
-Ne suit pas les liens symboliques lors de l'écriture des fichiers.
-.TP
-\fBset/unset nohelp\fP
-Désactive les lignes d'aide affichée en bas de l'écran.
-.TP
-\fBset/unset nowrap\fP
-Désactive le passage automatique à la ligne.
-.TP
-\fBset operatingdir "\fIrépertoire\fP"\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
-\fBset/unset preserve\fP
-Préserve les séquences XON et XOFF (^Q et ^S).
-.TP
-\fBset punct "\fIchaîne\fP"\fP
-Définit les caractères interprétés comme des ponctuations terminales. 
-Ces caractères ne peuvent inclure d'espaces ou de tabulations. Seules les 
-ponctuations terminales, éventuellement suivies de crochets fermants, 
-peuvent terminer une phrase.
-
-(N.D.T.\ : ce réglage permet de conserver 2\ espaces au lieu d'une 
-derrière les ponctuations terminales lors de la justification, 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.)
-.TP
-\fBset quotestr "\fIchaîne\fP"\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 sera\ :
-
-	set quotestr "^([\ \\t]*[|>:}#])+"
-
-Sinon, ce sera ">\ ". Notez que le «\ \\t\ » ci-dessus correspond à un 
-caractère de tabulation.
-.TP
-\fBset/unset rebinddelete\fP
-Interprète différemment la touche «\ Supprimer\ », afin que les touches
-«\ Effacement arrière\ » et «\ Supprimer\ » fonctionnent correctement.
-Vous devriez uniquement avoir besoin de cette option si la touche
-«\ Effacement arrière\ » produit l'effet de la touche «\ Supprimer\ »
-sur votre système.
-.TP
-\fBset/unset regexp\fP
-Utilise par défaut des expressions rationnelles pour les recherches.
-.TP
-\fBset/unset smarthome\fP
-Active le fonctionnement évolué 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 à ce début de ligne (qu'il soit en avant ou en arrière). Si
-le curseur est déjà au tout début de la ligne, il se placera au vrai
-début de la ligne.
-.TP
-\fBset/unset smooth\fP
-Active le défilement ligne-par-ligne du texte.
-.TP
-\fBset speller \fIprogramme\fP\fP
-Utilise le correcteur orthographique \fIprogramme\fP au lieu du 
-correcteur intégré, qui s'appuie sur \fIspell\fP.
-.TP
-\fBset/unset suspend\fP
-Autorise à suspendre nano avec ^Z.
-.TP
-\fBset tabsize \fIn\fP\fP
-Utilise une largeur de tabulation de \fIn\fP au lieu de la valeur par 
-défaut (8). Cette valeur doit être supérieur à 0.
-.TP
-\fBset/unset tempfile\fP
-S'il a été modifié, le fichier sera sauvegardé automatiquement en 
-quittant, sans demande de confirmation.
-.TP
-\fBset/unset view\fP
-Interdit la modification du fichier.
-.TP
-\fBset whitespace "\fIchaîne\fP"\fP
-Définit les deux caractères utilisés pour afficher les premiers 
-caractères de tabulations et d'espaces. Cela ne doit pas être 
-des caractère de contrôle.
-.TP
-.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 qui sera automatiquement activé si le nom du 
-fichier en cours correspond au \fImotif_de_fichier\fP. Toutes les 
-instructions suivantes de colorisation \fBcolor\fP s'appliqueront à 
-cette syntaxe, jusqu'à la définition d'une nouvelle syntaxe.
-.TP
-.B color \fIcouleur_texte\fP[,\fIcouleur_fond\fP] "\fImotif\fP" ...
-Pour la syntaxe en cours, affiche toutes les expressions correspondant à 
-l'expression rationnelle \fImotif\fP en utilisant la couleur de texte 
-\fIcouleur_texte\fP et éventuellement la couleur de fond 
-\fIcouleur_fond\fP. 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. Vous pouvez ajouter à 
-ces couleurs le préfixe \fIbright\fP 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 transparent.
-.TP
-.B color \fIcouleur_texte\fP[,\fIcouleur_fond\fP] start="\fImotif_début\fP" end="\fImotif_fin\fP"
-Affiche les expressions commençant par \fImotif_début\fP et se terminant 
-par \fImotif_fin\fP en utilisant la couleur de texte \fIcouleur_texte\fP 
-et éventuellement la couleur de fond \fIcouleur_fond\fP. 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.
-
-.SH FICHIERS
-.TP
-.I $SYSCONFDIR/nanorc
-Fichier de configuration général
-.TP
-.I ~/.nanorc
-Fichier de configuration personnel
-
-.SH VOIR AUSSI
-.PD 0
-.TP
-\fBnano\fP(1)
-.PP
-\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é rédigée par Jordi Mallach <jordi@gnu.org>.
-
-.SH TRADUCTION
-
-Adaptation française du 4\ septembre\ 2004 par
-Jean-Philippe\ Guérard\ <jean-philippe.guerard@corbeaunoir.org>.

doc/man/nano.1

@@ -1,223 +0,0 @@
-.\" Hey, EMACS: -*- nroff -*-
-.\" nano.1 is copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005 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 1.3.6" "March 11, 2005"
-.\" Please adjust this date whenever revising the manpage.
-.\"
-
-.SH NAME
-nano \- Nano's ANOther editor, an enhanced free Pico clone
-
-.SH SYNOPSIS
-.B nano
-.I [\+LINE]\ [options]\ [file]
-.br
-
-.SH DESCRIPTION
-This manual page documents briefly 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
-missing (or disabled by default) features in Pico, such as "search and
-replace" and "go to line number".
-
-.SH OPTIONS
-.TP
-.B \+\fILINE\fP
-Places cursor at \fILINE\fP on startup.
-.TP
-.B \-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 ~.
-.TP
-.B \-E \fIdir\fP (\-\-backupdir=\fIdir\fP)
-Set the directory where \fBnano\fP puts the backup files if file backups
-are enabled.
-.TP
-.B \-F (\-\-multibuffer)
-Enable multiple file buffers, if available.
-.TP
-.B \-H (\-\-historylog)
-Log search and replace strings to
-.I ~/.nano_history
-so they may be stored for later editing, if nanorc support is
-configured.
-.TP
-.B \-I (\-\-ignorercfiles)
-Don't look at
-.I SYSCONFDIR/nanorc
-or
-.IR ~/.nanorc ,
-if nanorc support is available.
-.TP
-.B \-N (\-\-noconvert)
-Disable automatic conversion of files from DOS/Mac format.
-.TP
-.B \-O (\-\-morespace)
-Use the blank line below the titlebar as extra editing space.
-.TP
-.B \-Q \fIstr\fP (\-\-quotestr=\fIstr\fP)
-Set the quoting string for justifying.  The default is
-"^([\ \\t]*[|>:}#])+" if regular expression support is available, or
-">\ " otherwise.
-.TP
-.B \-R (\-\-regexp)
-Enable regular expression matching for search strings, as well as
-\\n subexpression replacement for replace strings, if available.
-.TP
-.B \-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.
-.TP
-.B \-V (\-\-version)
-Show the current version number and author.
-.TP
-.B \-Y \fIstr\fP (\-\-syntax=\fIstr\fP)
-Specify a specific syntax highlighting from the
-.I nanorc
-to use, if available.
-.TP
-.B \-Z (\-\-restricted)
-Restricted mode: Don't read or write to any file not specified on the
-command line, read any nanorc files, allow suspending, or allow a file
-to be appended to, prepended to, or saved under a different name if it
-already has one.  Also accessible by invoking \fBnano\fP with any name
-beginning with 'r' (e.g. "rnano").
-.TP
-.B \-c (\-\-const)
-Constantly show the cursor position.
-.TP
-.B \-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)
-Display a summary of command line options.
-.TP
-.B \-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.
-.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
-.IR /tmp ,
-perhaps?
-.TP
-.B \-m (\-\-mouse)
-Enable mouse support (if available for your system).
-.TP
-.B \-o \fIdir\fP (\-\-operatingdir=\fIdir\fP)
-Set operating directory.  Makes nano set up something similar to a
-chroot.
-.TP
-.B \-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.  By default, this is the width of the
-screen, less eight.  If this value is negative, wrapping will occur at
-\fIcols\fP columns from the right of the screen, allowing the wrap point
-to vary along with the screen width if resized.
-.TP
-.B \-s \fIprog\fP (\-\-speller=\fIprog\fP)
-Enable alternative spell checker command.
-.TP
-.B \-t (\-\-tempfile)
-Always save changed buffer without prompting.  Same as Pico's -t option.
-.TP
-.B \-v (\-\-view)
-View file (read only) mode.
-.TP
-.B \-w (\-\-nowrap)
-Disable wrapping of long lines.
-.TP
-.B \-x (\-\-nohelp)
-Disable help screen at bottom of editor.
-.TP
-.B \-z (\-\-suspend)
-Enable suspend ability.
-.TP
-.B \-a, \-b, \-e, \-f, \-g, \-j
-Ignored, for compatibility with Pico.
-
-.SH INITIALIZATION FILE
-\fBnano\fP will read initialization files in the following order:
-.IR SYSCONFDIR/nanorc ,
-then
-.IR ~/.nanorc .
-Please see
-.BR nanorc (5)
-and the example file \fBnanorc.sample\fP which should be provided with
-\fBnano\fP.
-
-.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
-\fBSPELL\fP environment variable for one.
-
-\fBnano\fP will try to dump the buffer into an emergency file in some
-cases.  Mainly, this will happen if \fBnano\fP receives a SIGHUP or
-SIGTERM or runs out of memory, when it will write the buffer into a file
-named
-.I nano.save
-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, ".save" and a number (e.g. ".save.1")
-will be suffixed to the current filename in order to make it unique.  In
-multibuffer mode, \fBnano\fP will write all the open buffers to the
-respective emergency files.
-
-.SH BUGS
-Please send any comments or bug reports to
-.BR nano@nano-editor.org .
-
-The \fBnano\fP mailing list is available from
-.BR nano-devel@gnu.org .
-
-To subscribe, email to
-.B nano-devel-request@gnu.org
-with a subject of "subscribe".
-
-.SH HOMEPAGE
-http://www.nano-editor.org/
-
-.SH SEE ALSO
-.PD 0
-.TP
-\fBnanorc\fP(5)
-.PP
-\fI/usr/share/doc/nano/\fP (or equivalent on your system)
-
-.SH AUTHOR
-Chris Allegretta <chrisa@asty.org>, et al (see
-.I AUTHORS
-and
-.I THANKS
-for details). This manual page was originally written by Jordi Mallach
-<jordi@sindominio.net>, for the Debian GNU system (but may be used by
-others).

doc/man/nanorc.5

@@ -1,202 +0,0 @@
-.\" Hey, EMACS: -*- nroff -*-
-.\" nanorc.5 is Copyright (C) 2003, 2004, 2005 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 1.3.6" "March 11, 2005"
-.\" Please adjust this date whenever revising the manpage.
-.\"
-.SH NAME
-nanorc \- GNU nano's rcfile
-.SH DESCRIPTION
-This manual page 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 number".
-.PP
-The \fInanorc\fP file contains the default settings for \fBnano\fP.
-During startup, \fBnano\fP will first read its system-wide settings from
-.IR SYSCONFDIR/nanorc ,
-and then user-specific settings from
-.IR ~/.nanorc .
-
-.SH OPTIONS
-The configuration file accepts a series of "set" and "unset" commands,
-which can be used to configure nano on startup without using the
-command-line options.  Additionally, the "syntax" and "color" keywords
-are used to define syntax highlighting rules for different text
-patterns.  GNU nano will read one command per line.
-
-Options in rcfiles take precedence over nano's defaults, and command
-line options override rcfile settings.
-
-Options are unset by default, except for options that take an argument.
-
-The supported commands and arguments are:
-
-.TP 3
-\fBset/unset autoindent\fP
-Use auto-indentation.
-.TP
-\fBset/unset backup\fP
-Create backup files in
-.IR filename~ .
-.TP
-\fBset backupdir "\fIdirectory\fP"\fP
-Set the directory where \fBnano\fP puts the backup files if file backups
-are enabled.
-\fBset brackets "\fIstring\fP"\fP
-Set the characters treated as closing brackets.  They cannot contain
-tabs or spaces.  Only closing punctuation, optionally followed by
-closing brackets, can end sentences.
-.TP
-\fBset/unset const\fP
-Constantly display the cursor position in the status bar.
-.TP
-\fBset/unset cut\fP
-Use cut to end of line by default.
-.TP
-\fBset fill \fIn\fP\fP
-Wrap lines at column number \fIn\fP.  If \fIn\fP is 0 or less, the line
-length will be the screen width less \fIn\fP.  The default value is -8.
-.TP
-\fBset/unset historylog\fP
-Enable
-.I ~/.nano_history
-for saving and reading search/replace strings.
-.TP
-\fBset/unset morespace\fP
-Allow use of the blank line below the titlebar as extra editing space.
-.TP
-\fBset/unset mouse\fP
-Enable mouse support, so that mouse clicks can be used to set the mark
-and run shortcuts.
-.TP
-\fBset/unset multibuffer\fP
-Allow inserting files into their own buffers.
-.TP
-\fBset/unset noconvert\fP
-Don't convert files from DOS/Mac format.
-.TP
-\fBset/unset nofollow\fP
-Don't follow symlinks when writing files.
-.TP
-\fBset/unset nohelp\fP
-Don't display the help lists at the bottom of the screen.
-.TP
-\fBset/unset nowrap\fP
-Don't wrap text at all.
-.TP
-\fBset operatingdir "\fIdirectory\fP"\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 dir.  By default the operating directory
-feature is turned off.
-.TP
-\fBset/unset preserve\fP
-Preserve the XON and XOFF keys (^Q and ^S).
-.TP
-\fBset punct "\fIstring\fP"\fP
-Set the characters treated as closing punctuation.  They cannot contain
-tabs or spaces.  Only closing punctuation, optionally followed by
-closing brackets, can end sentences.
-.TP
-\fBset quotestr "\fIstring\fP"\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
-
-	set quotestr "^([\ \\t]*[|>:}#])+"
-
-if you have regexps, otherwise set quotestr ">\ ".  Note that '\\t'
-above stands for a literal Tab character.
-.TP
-\fBset/unset rebinddelete\fP
-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
-\fBset/unset regexp\fP
-Do regular expression searches by default.
-.TP
-\fBset/unset smarthome\fP
-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
-\fBset/unset smooth\fP
-Use smooth scrolling by default.
-.TP
-\fBset speller \fIspellprog\fP\fP
-Use spelling checker \fIspellprog\fP instead of the built-in one, which
-calls \fIspell\fP.
-.TP
-\fBset/unset suspend\fP
-Allow nano to be suspended.
-.TP
-\fBset tabsize \fIn\fP\fP
-Use a tab size of \fIn\fP columns instead of the default (8); must be
-greater than 0.
-.TP
-\fBset/unset tempfile\fP
-Save automatically on exit, don't prompt.
-.TP
-\fBset/unset view\fP
-Disallow file modification.
-.TP
-\fBset whitespace "\fIstring\fP"\fP
-Set the two characters used to display the first characters of tabs and
-spaces.  They cannot be control characters.
-.TP
-.B syntax "\fIstr\fP" ["\fIfileregex\fP" ... ]
-Defines a syntax named \fIstr\fP which can be activated via the \fB-Y\fP
-flag, or will be automatically activated if the current filename matches
-\fIfileregex\fP.  All following \fBcolor\fP statements will apply to
-\fIsyntax\fP until a new syntax is defined.
-.TP
-.B color \fIfgcolor\fP[,\fIbgcolor\fP] "\fIregex\fP" ...
-For the currently defined syntax, display all expressions matching
-\fIregex\fP with foreground color \fIfgcolor\fP and optional background
-color \fIbgcolor\fP.  Legal colors for foreground and background color
-are: white, black, red, blue, green, yellow, magenta, and cyan.  You may
-use the prefix "bright" to force a stronger color highlight.  If your
-terminal supports transparency, not specifying a \fIbgcolor\fP tells
-\fBnano\fP to attempt to use a transparent background.
-.TP
-.B color \fIfgcolor\fP[,\fIbgcolor\fP] start="\fIsr\fP" end="\fIer\fP"
-Display expressions which start with \fIsr\fP and end with \fIer\fP
-with foreground color \fIfgcolor\fP and optional background color
-\fIbgcolor\fP.  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.
-\fI
-
-.SH FILES
-.TP
-.I SYSCONFDIR/nanorc
-System-wide configuration file
-.TP
-.I ~/.nanorc
-Per-user configuration file
-.SH SEE ALSO
-.PD 0
-.TP
-\fBnano\fP(1)
-.PP
-\fI/usr/share/doc/nano/examples/nanorc.sample\fP (or equivalent on your
-system)
-.SH AUTHOR
-Chris Allegretta <chrisa@asty.org>, et al (see
-.I AUTHORS
-and
-.I THANKS
-for details).
-This manual page was written by Jordi Mallach <jordi@gnu.org>.

doc/nano.1

@@ -0,0 +1,312 @@
+.\" 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.7.4" "January 2017"
+.\" Please adjust this date whenever revising the manpage.
+
+.SH NAME
+nano \- Nano's ANOther editor, an enhanced free Pico clone
+
+.SH SYNOPSIS
+.B nano
+.RI [ options "] [[+" line [, column "]]\ " file "]..."
+
+.SH DESCRIPTION
+\fBnano\fP is a small, free and friendly editor which aims to replace
+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
+Since nano-2.7.0, text can also be selected by holding Shift and moving the
+cursor with the arrow keys.  Holding down the Alt key too will increase the
+stride.
+.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 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 line 1, column 1.
+.TP
+.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
+.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
+.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
+.BR \-D ", " \-\-boldtext
+Use bold text instead of reverse video text.
+.TP
+.BR \-E ", " \-\-tabstospaces
+Convert typed tabs to spaces.
+.TP
+.BR \-F ", " \-\-multibuffer
+Enable multiple file buffers (if support for them has been compiled in).
+.TP
+.BR \-G ", " \-\-locking
+Enable vim-style file locking when editing files.
+.TP
+.BR \-H ", " \-\-historylog
+Log search and replace strings to \fI~/.nano/search_history\fP, so they can be
+retrieved in later sessions.
+.TP
+.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
+.BR \-L ", " \-\-nonewlines
+Don't add newlines to the ends of files.
+.TP
+.BR \-N ", " \-\-noconvert
+Disable automatic conversion of files from DOS/Mac format.
+.TP
+.BR \-O ", " \-\-morespace
+Use the blank line below the titlebar as extra editing space.
+.TP
+.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
+\fB"^([\ \\t]*[#:>\\|}])+"\fP if extended regular expression support is
+available, or \fB">\ "\fP otherwise.  Note that \fB\\t\fP stands for a
+Tab.
+.TP
+.BR \-R ", " \-\-restricted
+Restricted mode: don't read or write to any file not specified on the
+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
+.BR \-S ", " \-\-smooth
+Enable smooth scrolling.  Text will scroll line-by-line, instead of the
+usual chunk-by-chunk behavior.
+.TP
+.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
+.BR \-U ", " \-\-quickblank
+Do quick statusbar blanking.  Statusbar messages will disappear after 1
+keystroke instead of 25.  Note that \fB\-c\fP overrides this.
+.TP
+.BR \-V ", " \-\-version
+Show the current version number and exit.
+.TP
+.BR \-W ", " \-\-wordbounds
+Detect word boundaries differently by treating punctuation
+characters as part of a word.
+.TP
+.BR "\-X ""\fIcharacters\fB""" ", " "\-\-wordchars=""" \fIcharacters """
+Specify which other characters (besides the normal alphanumeric ones)
+should be considered as part of a word.  This overrides option
+\fB\-W\fR (\fB\-\-wordbounds\fR).
+.TP
+.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
+.BR \-c ", " \-\-constantshow
+Constantly show the cursor position.  Note that this overrides \fB\-U\fP.
+.TP
+.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
+.BR \-g ", " \-\-showcursor
+Make the cursor visible in the file browser, putting it on the
+highlighted item.  Useful for braille users.
+.TP
+.BR \-h ", " \-\-help
+Show a summary of the available command-line options and exit.
+.TP
+.BR \-i ", " \-\-autoindent
+Indent new lines to the previous line's indentation.  Useful when
+editing source code.
+.TP
+.BR \-k ", " \-\-cut
+Make the 'Cut Text' command (normally \fB^K\fR) cut from the current cursor
+position to the end of the line, instead of cutting the entire line.
+.TP
+.BR \-l ", " \-\-linenumbers
+Display line numbers to the left of the text area.
+.TP
+.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.  Text can still be
+selected through dragging by holding down the Shift key.
+.TP
+.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
+.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
+.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.  This option conflicts with
+\fB\-w\fR -- the last one given takes effect.
+.TP
+.BR \-s\ \fIprogram\fR ", " \-\-speller= \fIprogram
+Use this alternative spell checker command.
+.TP
+.BR \-t ", " \-\-tempfile
+Save a changed buffer without prompting (when exiting with \fB^X\fR).
+.TP
+.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
+.BR \-v ", " \-\-view
+Just view the file and disallow editing: read-only mode.
+.TP
+.BR \-w ", " \-\-nowrap
+Disable the hard-wrapping of long lines.  This option conflicts with
+\fB\-r\fR -- the last one given takes effect.
+.TP
+.BR \-x ", " \-\-nohelp
+Don't show the two help lines at the bottom of the screen.
+.TP
+.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 ", " \-j
+Ignored, for compatibility with Pico.
+
+.SH TOGGLES
+Several of the above options can be switched on and off also while
+\fBnano\fR is running.  For example, \fBM\-L\fR toggles the
+hard-wrapping of long lines, \fBM\-$\fR toggles soft-wrapping,
+\fBM\-#\fR toggles line numbers, \fBM\-M\fR toggles the mouse,
+\fBM\-I\fR auto-indentation, and \fBM\-X\fR the help lines.
+See at the end of the \fB^G\fR help text for a complete list.
+
+.SH INITIALIZATION FILE
+\fBnano\fP will read initialization files in the following order:
+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 nor in one of the \fInanorc\fP files, \fBnano\fP will check the
+\fBSPELL\fP environment variable for one.
+.sp
+In some cases \fBnano\fP will try to dump the buffer into an emergency
+file.  This will happen mainly if \fBnano\fP receives a SIGHUP or
+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
+it unique.  In multibuffer mode, \fBnano\fP will write all the open
+buffers to their respective emergency files.
+
+.SH BUGS
+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:
+.br
+\fIhttps://savannah.gnu.org/bugs/?group=nano\fR.
+
+.SH HOMEPAGE
+https://nano-editor.org/
+
+.SH SEE ALSO
+.BR nanorc (5)
+.PP
+\fI/usr/share/doc/nano/\fP (or equivalent on your system)
+
+.SH AUTHOR
+Chris Allegretta and others (see the files \fIAUTHORS\fR and
+\fITHANKS\fP for details).  This manual page was originally written by
+Jordi Mallach for the Debian system (but may be used by others).

doc/nanorc.5

@@ -0,0 +1,778 @@
+.\" 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.7.4" "January 2017"
+.\" Please adjust this date whenever revising the manpage.
+
+.SH NAME
+nanorc \- GNU nano's configuration file
+
+.SH DESCRIPTION
+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
+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, "\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 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 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"
+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 backwards
+Do backwards searches by default.
+.TP
+.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.  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 casesensitive
+Do case-sensitive searches by default.
+.TP
+.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 cut
+Use cut-to-end-of-line by default, instead of cutting the whole line.
+.TP
+.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 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 whitespace 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 linenumbers
+Display line numbers to the left of the text area.
+.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.  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 morespace
+Use the blank line below the titlebar as extra editing space.
+.TP
+.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.  Text can still be
+selected through dragging by holding down the Shift key.
+.TP
+.B set multibuffer
+When reading in a file with ^R, insert it into a new buffer by default.
+.TP
+.B set noconvert
+Don't convert files from DOS/Mac format.
+.TP
+.B set nohelp
+Don't display the two help lines at the bottom of the screen.
+.TP
+.B set nonewlines
+Don't automatically add a newline to the ends of files.
+.TP
+.B set nowrap
+Don't hard-wrap text at all.
+.TP
+.B set numbercolor \fIfgcolor\fR,\fIbgcolor\fR
+Specify the color combination to use for line numbers.
+See \fBset titlecolor\fR for more details.
+.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 directory.  By default, the operating
+directory feature is turned off.
+.TP
+.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.  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 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
+"\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 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 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 regexp
+Do extended regular expression searches by default.
+.TP
+.B set showcursor
+Put the cursor on the highlighted item in the file browser, to aid
+braille users.
+.TP
+.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 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 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 \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 tabstospaces
+Convert typed tabs to spaces.
+.TP
+.B set tempfile
+Save automatically on exit, don't prompt.
+.TP
+.B set titlecolor \fIfgcolor\fR,\fIbgcolor\fR
+Specify the color combination to use for the titlebar.
+Valid names for the foreground and background colors are:
+.BR white ", " black ", " blue ", " green ", " red ", " cyan ", " yellow ",  and " magenta .
+The name of the foreground color may be prefixed with \fBbright\fR.
+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 indicate the presence of tabs and
+spaces.  They must be single-column characters.
+.TP
+.B set wordbounds
+Detect word boundaries differently by treating punctuation
+characters as parts of words.
+.TP
+.B set wordchars \fIstring\fP
+Specify which other characters (besides the normal alphanumeric ones)
+should be considered as parts of words.  This overrides the option
+\fBwordbounds\fR.
+
+.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
+.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
+.BI comment " string"
+Use the given string for commenting and uncommenting lines.  A vertical bar or
+pipe character (|) designates bracket-style comments; for example, "/*|*/" for
+CSS files.  The characters before the pipe are prepended to the line and the
+characters after the pipe are appended at the end of the line.  If no pipe
+character is present, the entire string is prepended; for example, "#" for
+Python files.  If empty double quotes are specified, the comment/uncomment
+function is disabled; for example, "" for JSON.  Double quotes or backslashes
+may be escaped with a backslash; for example, ".\\"" for man page source.
+.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.  Valid colors for foreground and background
+are: white, black, red, blue, green, yellow, magenta, and cyan.  You may
+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\fR,\fIbgcolor\fR """\fIregex\fR""" ...
+Same as above, except that the text matching is case insensitive.
+.TP
+.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 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
+.BR icolor " \fIfgcolor\fR,\fIbgcolor\fR " start= """\fIsr\fR"" " end= """\fIer\fR""
+Same as above, except that the text matching is case insensitive.
+.TP
+.BR include " ""\fIsyntaxfile\fR"""
+Read in self-contained color syntaxes from \fIsyntaxfile\fP.  Note that
+\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, \fBcomment\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.
+(The form 'research' is deprecated.)
+.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.
+(The form 'cursorpos' is deprecated.)
+.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 comment
+Comments or uncomments the current line or marked lines, using the comment
+style specified in the active syntax.
+.TP
+.B complete
+Completes the fragment before the cursor to a full word found elsewhere
+in the current buffer.
+.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 prevblock
+Moves the cursor to the beginning of the current or preceding block of text.
+(Blocks are separated by one or more blank lines.)
+.TP
+.B nextblock
+Moves the cursor to the beginning of the next block of text.
+.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).  Negative numbers count
+from the end of the file (and end of the line).
+.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 keystroke 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.
+(The form 'regex' is deprecated.)
+.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.
+(The form 'dontreplace' is deprecated.)
+.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.
+(The form 'newbuffer' is deprecated.)
+.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'.
+(The form 'replace2' is deprecated.)
+.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
+.B /etc/nanorc
+System-wide configuration file.
+.TP
+.B ~/.nanorc
+Per-user configuration file.
+
+.SH SEE ALSO
+.BR nano (1)
+
+.SH AUTHOR
+Chris Allegretta and others (see the files \fIAUTHORS\fP and
+\fITHANKS\fP for details).  This manual page was originally written by
+Jordi Mallach for the Debian system (but may be used by others).

doc/nanorc.sample

@@ -1,268 +0,0 @@
-## Sample initialization file for GNU nano
-## Please note that you must have configured nano with --enable-nanorc
-## for this file to be read!  Also note that characters specially
-## interpreted by the shell should not be escaped here.
-##
-## To make sure a value is not enabled, use "unset <option>"
-##
-## For the options that take parameters, the default value is given.
-## Other options are unset by default.
-
-## Use auto-indentation.
-# set autoindent
-
-## Backup files to filename~.
-# set backup
-
-## The directory to put the backup files in.
-# set backupdir ""
-
-## The characters treated as closing brackets.  They cannot contain tabs
-## or spaces.  Only closing punctuation, optionally followed by closing
-## brackets, can end sentences.
-##
-# set brackets "'")}]>"
-
-## Constantly display the cursor position in the status bar.
-# set const
-
-## Use cut to end of line by default.
-# set cut
-
-## Set the line length for wrapping text and justifying paragraphs.
-## If fill is negative, the line length will be the screen width less
-## this number.
-##
-# set fill -8
-
-## Enable ~/.nano_history for saving and reading search/replace strings.
-# set historylog
-
-## Use the blank line below the titlebar as extra editing space.
-# set morespace
-
-## Enable mouse support, so that mouse clicks can be used to set the
-## mark and run shortcuts.
-# set mouse
-
-## Allow multiple file buffers (inserting a file will put it into a
-## separate buffer).  You must have configured with --enable-multibuffer
-## or --enable-extra for this to work.
-##
-# 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
-
-## Don't wrap text at all.
-# set nowrap
-
-## 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 files are inserted from this dir.  A blank
-## string means the operating directory feature is turned off.
-##
-# set operatingdir ""
-
-## Preserve the XON and XOFF keys (^Q and ^S).
-# set preserve
-
-## The characters treated as closing punctuation.  They cannot contain
-## tabs or spaces.  Only closing punctuation, optionally followed by
-## closing brackets, can end sentences.
-##
-# set punct ".?!"
-
-## 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:
-# set quotestr "^([ 	]*[\|>:}#])+"
-## if you have regexps, otherwise:
-# set quotestr "> "
-## You can get old nano quoted-justify behavior via:
-# set quotestr "(> )+"
-
-## Fix Backspace/Delete confusion problem.
-# set rebinddelete
-
-## Do extended regular expression searches by default.
-# set regexp
-
-## 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.
-# set smarthome
-
-## Use smooth scrolling as the default.
-# set smooth
-
-## 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.
-# set suspend
-
-## Use this tab size instead of the default; it must be greater than 0.
-# set tabsize 8
-
-## Save automatically on exit, don't prompt.
-# set tempfile
-
-## Disallow file modification; why would you want this in an rcfile? ;)
-# set view
-
-## The two characters used to display the first characters of tabs and
-## spaces.  187 decimal (00BB hexadecimal) and 183 decimal (00B7
-## hexadecimal) seem to be good values for these.
-# set whitespace "  "
-
-## Color setup
-## Format:
-## syntax "short description" ["filename regex" ...]
-## color foreground,background "regex" ["regex"...]
-##
-## Legal colors: white, black, red, blue, green, yellow, magenta, cyan.
-## You may use the prefix "bright" to mean a stronger color highlight.
-##
-## To use multi-line regexes use the start="regex" end="regex" format.
-##
-## If your system supports transparency, not specifying a background
-## color will use a transparent color.  If you don't want this, be sure
-## to set the background color to black or white.
-##
-# syntax "c-file" "\.(c|h)$"
-# color red "\<[A-Z_]{2,}\>" 
-# color green "\<(float|double|char|int|short|long|enum|void|static|const|struct|union|typedef|extern|signed|unsigned|inline)\>"
-# color brightyellow "\<(for|if|while|do|else|case|switch|goto|continue|break|return)\>"
-# color brightcyan "^ *# *(define|undef|include|ifn?def|endif|elif|else|if)"
-# color brightmagenta "'([^\]|(\\['abfnrtv\\]))'" "'\\(([0-7][0-7]?)|([0-3][0-7][0-7]))'" "'\\x[0-9A-Fa-f][0-9A-Fa-f]?'"
-##
-## 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=""(\\.|[^\"])*\\ *$" end="^(\\.|[^\"])*""
-##
-## And we want to have some nice comment highlighting too
-# color brightblue "//.*"
-# color brightblue start="/\*" end="\*/"
-
-## Here is a short example for HTML
-# syntax "HTML" "\.html$"
-# color blue start="<" end=">"
-# color red "&[^; ]*;"
-
-## Here is a short example for TeX files
-# syntax "TeX" "\.tex$"
-# color green "\\.|\\[A-Za-z]*"
-# color magenta "[{}]"
-# color blue "%.*"
-
-## Here is an example for quoted emails (under e.g. mutt)
-# syntax "mutt"
-# color green "^>.*"
-
-## Here is an example for groff
-##
-# syntax "groff" "\.ms$" "\.mm$" "\.me$" "\.tmac$" "^tmac." ".rof"
-## The argument of .nr or .ds
-# color cyan "^\.ds [^ ]*"
-# color cyan "^\.nr [^ ]*"
-## Single character escapes
-# color brightmagenta "\\."
-## Highlight the argument of \f or \s in the same color
-# color brightmagenta "\\f."
-# color brightmagenta "\\f\(.."
-# color brightmagenta "\\s(\+|\-)?[0-9]"
-## \n
-# color cyan "(\\|\\\\)n."
-# color cyan "(\\|\\\\)n\(.."
-# color cyan start="(\\|\\\\)n\[" end="]"
-## Requests
-# color brightgreen "^\. *[^ ]*"
-## Comments
-# color yellow "^\.\\\".*$"
-## Strings
-# color green "(\\|\\\\)\*."
-# color green "(\\|\\\\)\*\(.."
-# color green start="(\\|\\\\)\*\[" end="]"
-## Characters
-# color brightred "\\\(.."
-# color brightred start="\\\[" end="]"
-## Macro arguments
-# color brightcyan "\\\\\$[1-9]"
-
-## Here is an example for perl
-##
-# syntax "perl" "\.p[lm]$"
-# 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|seekdir|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)\>"
-# color cyan start="[$@%]" end="( |\\W|-)"
-# color yellow "".*"|qq\|.*\|"
-# color white "[sm]/.*/"
-# color white start="(^use| = new)" end=";"
-# color green "#.*"
-# color yellow start="<< 'STOP'" end="STOP"
-
-## Here is an example for Java source
-##
-# syntax "Java source" "\.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 red ""[^\"]*""
-# color yellow "\<(true|false|null)\>"
-# color blue "//.*"
-# color blue start="/\*" end="\*/"
-# color brightblue start="/\*\*" end="\*/"
-# color brightgreen,green " +$"
-
-## Here is an example for patch files
-##
-# syntax "patch" "\.(patch|diff)$"
-# color brightgreen "^\+.*"
-# color green "^\+\+\+.*"
-# color brightblue "^ .*"
-# color brightred "^-.*"
-# color red "^---.*"
-# color brightyellow "^@@.*"
-# color magenta "^diff.*"
-
-## Here is an example for manpages
-##
-# syntax "manpage" "\.[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)"
-
-## Here is an example for your .nanorc
-##
-# syntax "nanorc" "(\.|/|)nanorc$"
-## highlight possible errors and parameters
-# color brightwhite "^ *(set|unset|syntax|color).*$"
-## set, unset and syntax
-# color cyan "^ *(set|unset) +(autoindent|backup|backupdir|brackets|const|cut|fill|historylog|morespace|mouse|multibuffer|noconvert|nofollow|nohelp|nowrap|operatingdir|preserve|punct|quotestr|rebinddelete|regexp|smarthome|smooth|speller|suspend|tabsize|tempfile|view|whitespace)"
-# color green "^ *(set|unset|syntax)\>"
-## colors
-# color yellow "^ *color +(bright)?(white|black|red|blue|green|yellow|magenta|cyan)(,(white|black|red|blue|green|yellow|magenta|cyan))?\>"
-# color magenta "^ *color\>" "\<(start|end)="
-## strings
-# color white "\"(\\.|[^\"])*\""
-## comments
-# color blue "^ *#.*$"

doc/rnano.1

@@ -0,0 +1,67 @@
+.\" 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.7.4" "January 2017"
+.\" Please adjust this date whenever revising the manpage.
+
+.SH NAME
+rnano \- a restricted nano
+
+.SH SYNOPSIS
+.B rnano
+.RI [ options "] [[+" line [, column "]]\ " file "]..."
+
+.SH DESCRIPTION
+\fBrnano\fR runs the \fBnano\fR editor in restricted mode.  This allows
+editing only the specified file or files, and doesn't allow the user
+access to the filesystem nor to a command shell.
+.PP
+In restricted mode, \fBnano\fR will:
+.IP \[bu] 2
+not read any nanorc files;
+.IP \[bu]
+not allow suspending;
+.IP \[bu]
+not read nor write any file not specified on the command line;
+.IP \[bu]
+not allow saving a file under a different name;
+.IP \[bu]
+not allow appending or prepending to any file;
+.IP \[bu]
+not make backup files nor do spell checking.
+
+.SH OPTIONS
+.TP
+.BR \-h ", " \-\-help
+Show a summary of command-line options and exit.
+.PP
+See the \fBnano\fP(1) manpage for all available options.
+
+.SH BUGS
+Please report bugs via \fIhttps://savannah.gnu.org/bugs/?group=nano\fR.
+
+.SH HOMEPAGE
+https://nano-editor.org/
+
+.SH SEE ALSO
+.BR nano (1)
+
+.SH AUTHOR
+Chris Allegretta and others (see the files \fIAUTHORS\fR and \fITHANKS\fR
+for details).  This manual page was originally written by Thijs Kinkhorst
+for the Debian system (but may be used by others).

doc/sample.nanorc.in

@@ -0,0 +1,264 @@
+## Sample initialization file for GNU nano.
+##
+## Please note that you must have configured nano with --enable-nanorc
+## for this file to be read!  Also note that this file should not be in
+## DOS or Mac format, and that characters specially interpreted by the
+## shell should not be escaped here.
+##
+## 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.
+##
+## Quotes inside 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 "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
+
+## Back up files to the current filename plus a tilde.
+# set backup
+
+## The directory to put unique backup files in.
+# set backupdir ""
+
+## Do backwards searches by default.
+# set backwards
+
+## Use bold text instead of reverse video text.
+# set boldtext
+
+## 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.
+# set brackets ""')>]}"
+
+## Do case-sensitive searches by default.
+# set casesensitive
+
+## Constantly display the cursor position in the statusbar.  Note that
+## this overrides "quickblank".
+# set constantshow
+## (The old form, 'const', is deprecated.)
+
+## Use cut-to-end-of-line by default.
+# set cut
+
+## Set the line length for wrapping text and justifying paragraphs.
+## If the value is 0 or less, the wrapping point will be the screen
+## width less this number.
+# set fill -8
+
+## Remember the used search/replace strings for the next session.
+# set historylog
+
+## Make the justify command kill whitespace at the end of lines.
+# set justifytrim
+
+## Display line numbers to the left of the text.
+# set linenumbers
+
+## 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.
+# set morespace
+
+## 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.
+# set mouse
+
+## 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 display the helpful shortcut lists at the bottom of the screen.
+# set nohelp
+
+## Don't add newlines to the ends of files.
+# set nonewlines
+
+## Don't wrap text at all.
+# set nowrap
+
+## 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.
+# 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
+
+## 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.
+# 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.
+## If you have extended regular expression support, the default is:
+# set quotestr "^([ 	]*[#:>\|}])+"
+## Otherwise:
+# set quotestr "> "
+
+## Fix Backspace/Delete confusion problem.
+# set rebinddelete
+
+## Fix numeric keypad key confusion problem.
+# set rebindkeypad
+
+## Do extended regular expression searches by default.
+# set regexp
+
+## Put the cursor on the highlighted item in the file browser;
+## useful for people who use a braille display.
+# set showcursor
+
+## 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.
+# set smarthome
+
+## 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.
+# set suspend
+
+## Use this tab size instead of the default; it must be greater than 0.
+# set tabsize 8
+
+## Convert typed tabs to spaces.
+# set tabstospaces
+
+## Save automatically on exit; don't prompt.
+# set tempfile
+
+## Disallow file modification.  Why would you want this in an rcfile? ;)
+# set view
+
+## 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.
+## The default when in a UTF-8 locale:
+# set whitespace "»·"
+## The default otherwise:
+# set whitespace ">."
+
+## Detect word boundaries differently by treating punctuation
+## characters as parts of words.
+# set wordbounds
+
+## The characters (besides alphanumeric ones) that should be considered
+## as parts of words.  This option does not have a default value.  When
+## set, it overrides option 'set wordbounds'.
+# set wordchars "<_>."
+
+
+## Paint the interface elements of nano.
+## These are examples; by default there are no colors.
+# set titlecolor brightwhite,blue
+# set numbercolor cyan
+# set statuscolor brightwhite,green
+# set keycolor green
+# set functioncolor yellow
+
+
+## Setup of syntax coloring.
+##
+## Format:
+##
+## syntax "short description" ["filename regex" ...]
+##
+## The "none" syntax is reserved; specifying it on the command line is
+## the same as not having a syntax at all.  The "default" syntax is
+## special: it takes no filename regexes, and applies to files that
+## don't match any other syntax's filename regexes.
+##
+## color foreground,background "regex" ["regex"...]
+## or
+## icolor foreground,background "regex" ["regex"...]
+##
+## "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
+## stronger highlight.
+##
+## To use multi-line regexes, use the start="regex" end="regex"
+## [start="regex" end="regex"...] format.
+##
+## If your system supports transparency, not specifying a background
+## color will use a transparent color.  If you don't want this, be sure
+## to set the background color to black or white.
+##
+## 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"
+##
+## Unless otherwise noted, the name of the syntax file (without the
+## ".nanorc" extension) should be the same as the "short description"
+## 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.
+##
+## To include all existing syntax definitions, you can do:
+# include "@PKGDATADIR@/*.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
+
+## Set this if your Backspace key sends Del most of the time.
+# bind Del backspace all

doc/texinfo/.cvsignore

@@ -1,4 +0,0 @@
-Makefile
-Makefile.in
-nano.info
-texinfo.tex

doc/texinfo/Makefile.am

@@ -1,5 +0,0 @@
-info_TEXINFOS = nano.texi
-
-MAKEINFO = makeinfo --no-split
-
-EXTRA_DIST = nano.info

doc/texinfo/nano.texi

@@ -1,509 +0,0 @@
-\input texinfo  @c -*-texinfo-*-
-@c %**start of header
-@setfilename nano.info
-@settitle nano Command Manual
-@c %**end of header
-
-@c This file has the new style title page commands.
-@c Run `makeinfo' rather than `texinfo-format-buffer'.
-@smallbook
-@set EDITION 0.1
-@set VERSION 1.3.6
-@set UPDATED 11 Mar 2005
-
-@dircategory Editors
-@direntry
-* nano: (nano).                 Small and friendly text editor.
-@end direntry
-
-@c tex
-@c \overfullrule=0pt
-@c end tex
-
-@titlepage
-@title GNU @code{nano}
-@subtitle a small and friendly text editor.
-@subtitle version 1.3.6
-
-@author Chris Allegretta
-@page
-
-This manual documents GNU @code{nano}, a small and friendly text
-editor.
-
-This manual is part of the GNU @code{nano} distribution.@*
-@sp4
-Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005 Chris Allegretta.
-
-Permission is granted to make and distribute verbatim copies of this
-manual provided the copyright notice and this permission notice are
-preserved on all copies.
-
-@iftex
-Permission is granted to process this file through @TeX{} and print the
-results, provided the printed document carries copying permission notice
-identical to this one except for the removal of this paragraph (this
-paragraph not being relevant to the printed manual).
-@end iftex
-
-Permission is granted to copy and distribute modified versions of this
-manual under the conditions for verbatim copying, provided that the
-entire resulting derived work is distributed under the terms of a
-permission notice identical to this one.
-
-Permission is granted to copy and distribute translations of this manual
-into another language, under the above conditions for modified versions,
-except that this permission notice may be stated in a translation
-approved by the Foundation.
-
-You may contact the author by
-e-mail: @email{chrisa@@asty.org}@*
-@end titlepage
-
-@node Top, Introduction, (dir), (dir)
-
-This manual documents GNU @code{nano}, a small and friendly text
-editor.
-
-@menu
-* Introduction::
-* Editor Basics::
-* Online Help::
-* Feature Toggles::
-* The File Browser::
-* Pico Compatibility::
-* Building and Configure Options::
-@end menu
-
-@node Introduction, Editor Basics, Top, Top
-@chapter Introduction
-
-GNU @code{nano} is a small and friendly text editor.  Besides basic text
-editing, @code{nano} offers many extra features like an interactive
-search and replace, goto line number, auto-indentation, feature toggles,
-internationalization support, and filename tab completion.
-
-@menu
-* Overview::
-* Command Line Options::
-@end menu
-
-@node Overview, Command Line Options, Introduction, Introduction
-@section Overview
-
-@code{nano} +LINE [GNU long option] [option] [ @var{file ...} ]
-
-The original goal for @code{nano} was a complete bug-for-bug compatible
-emulation of Pico, but nano's main goal is to be as compatible as
-possible while offering a superset of Pico's functionality.  Also see
-@xref{Pico Compatibility}, for other differences.
-
-Email bug reports to @email{nano@@nano-editor.org}.
-
-@node Command Line Options, , Overview, Introduction
-@section Command Line Options
-
-@code{nano} takes the following options from the command line:
-
-@table @code
-
-@item -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.
-
-@item -B, --backup
-When saving a file, back up the previous version of it to the current
-filename suffixed with a ~.
-
-@item -E, --backupdir=[dir]
-Set the directory where @code{nano} puts the backup files if file
-backups are enabled.
-
-@item -F, --multibuffer
-Enable multiple file buffers, if available.
-
-@item -I, --ignorercfiles
-Don't look at SYSCONFDIR/nanorc or ~/.nanorc, if nanorc support is
-available.
-
-@item -N, --noconvert
-Do not convert files from DOS/Mac format.
-
-@item -Q [str], --quotestr [str]
-Set the quoting string for justifying.  The default is
-
-@quotation
-@code{^([ \t]*[|>:@}#])+}
-@end quotation
-
-if regular expression support is available, or ``> '' otherwise.  Note
-that @code{\t} above stands for a literal Tab character.
-
-@item -R, --regexp
-Turn on regular expression search and search/replace.
-
-@item -S, --smooth
-Enable smooth scrolling.
-
-@item -T [num], --tabsize=[#cols]
-Set the displayed tab length to [#cols] columns.
-
-@item -V, --version
-Print the version number and copyright and quit.
-
-@item -Y, --syntax=[str]
-Specify a specific syntax highlighting from the .nanorc to use, if
-available.
-
-@item -Z, --restricted
-Restricted mode: Don't read or write to any file not specified on the
-command line, read any nanorc files, allow suspending, or allow a file
-to be appended to, prepended to, or saved under a different name if it
-already has one.  Also accessible by invoking @code{nano} with any name
-beginning with 'r' (e.g. "rnano").
-
-@item -c, --const
-Constantly display the cursor position and line number on the statusbar.
-
-@item -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.
-
-@item -h, --help
-Print the usage and exit.
-
-@item -i, --autoindent
-Automatically indent new lines to the same number of spaces and tabs as
-the previous line.
-
-@item -k, --cut
-Cut from the current cursor position to the end of the current line.
-
-@item -l, --nofollow
-When writing files, if the given file is a symbolic link, it is removed
-and a new file is created.
-
-@item -m, --mouse
-Enables the use of the mouse to select text (currently only useful for
-running under the X Window System).
-
-@item -o [dir], --operatingdir=[dir]
-Set operating directory.  Makes @code{nano} set up something similar to
-a chroot.
-
-@item -p, --preserve
-Preserve the ^Q (XON) and ^S (XOFF) sequences so data being sent to the
-editor can be can be stopped and started.
-
-@item -r [#cols], --fill=[#cols].
-Wrap lines at column #cols.  By default this is the width of the screen,
-less eight.  If this value is negative, wrapping will occur at #cols
-from the right of the screen, allowing it to vary along with the screen
-width if the screen is resized.
-
-@item -s [prog], --speller=[prog]
-Invoke [prog] as the spell checker.  By default, @code{nano} uses the
-command specified in the SPELL environment variable, or, if SPELL is not
-set, its own interactive spell checker that requires the @code{spell}
-program to be installed on your system.
-
-@item -t, --tempfile
-Do not ask whether or not to save the current contents of the file when
-exiting, assume yes.  This is most useful when using @code{nano} as the
-composer of a mailer program.
-
-@anchor{Expert Mode}
-@item -x, --nohelp
-In Expert Mode, the Shortcut Lists will not appear at the bottom of the
-screen.  This affects the location of the statusbar as well, as in
-Expert Mode it is located at the very bottom of the editor.
-
-Note: When accessing the help system, Expert Mode is temporarily
-disabled to display the help system navigation keys.
-
-@item -v, --view
-Do not allow the contents of the file to be altered.  Note that this
-flag should NOT be used in place of correct file permissions to
-implement a read-only file.
-
-@item -w, --nowrap
-Do not wrap long lines at any length.  This option overrides any value
-for -r.
-
-@item -z, --suspend
-Enable suspend ability of @code{nano} using the system's suspend
-keystroke (usually ^Z).
-
-@item -a, -b, -e, -f, -g, -j
-Ignored, for compatibility with Pico.
-
-@item +LINE
-Start at line number LINE instead of the default of line 1.
-@end table
-
-@node Editor Basics, Online Help, Introduction, Top
-@chapter Editor Basics
-@menu
-* Entering Text::
-* Special Functions::
-* The Titlebar::
-* The Statusbar::
-* Shortcut Lists::
-@end menu
-
-@node Entering Text, Special Functions, Editor Basics, Editor Basics
-@section Entering Text
-
-All key sequences in @code{nano} are entered using the keyboard.
-@code{nano} is a ``modeless'' editor.  All keys with the exception of
-Control and Meta key sequences will enter text into the file being
-edited.
-
-@node Special Functions, The Titlebar, Entering Text, Editor Basics
-@section Special Functions
-
-Special functions use the Control key (displayed in the help and
-shortcut lists as ^), the Meta key (displayed as M), or the Esc key.
-
-@itemize @bullet
-@item
-Control key sequences are entered by holding down the Control key and
-pressing the desired key, or by pressing the Esc key twice and pressing
-the desired key.
-@item
-Pressing Esc twice and then typing a three-digit number from 000 to 255
-will enter the character with the corresponding ASCII code.
-@item
-Meta key sequences can be entered in a number of possible ways: Pressing
-the Escape key, then releasing it and pressing the desired key, or
-holding down the Alt key while pressing the desired key.  This varies
-from keyboard to keyboard, and certain commercial operating systems
-``swallow'' the Alt key so that it never reaches the application.  If
-your operating system does this, you should use the Escape key to
-generate Meta key sequences.
-@end itemize
-
-@node The Titlebar, The Statusbar, Special Functions, Editor Basics
-@section The Titlebar
-
-The titlebar is the line displayed at the top of the editor.  There are
-three sections: left, center and right.  The section on the left
-displays the version of @code{nano} being used.  The center section
-displays the current file name, or ``New Buffer'' if the file has not
-yet been named.  The section on the right will display ``Modified'' if
-the file has been modified since it was last saved or opened.
-
-Special modes: When @code{nano} is in ``File browser'' mode, the center
-section will display the current directory instead of the filename.
-@xref{The File Browser}.
-
-@node The Statusbar, Shortcut Lists, The Titlebar, Editor Basics
-@section The Statusbar
-
-The statusbar is located three lines from the bottom of the screen (or
-the bottom line in Expert Mode.  @xref{Expert Mode}, for more info).
-
-The Statusbar shows important and informational messages.  Any error
-messages that occur from using the editor will appear on the statusbar.
-Any questions that are asked of the user will be asked on the statusbar,
-and any user input (search strings, file names, etc) will be input on
-the statusbar.
-
-@node Shortcut Lists, , The Statusbar, Editor Basics
-@section Shortcut Lists
-
-The Shortcut Lists are the two lines at the bottom of the screen which
-show some of the more commonly used functions in the editor.
-
-@node Online Help, Feature Toggles, Editor Basics, Top
-@chapter Online Help
-
-The online help system in @code{nano} is available by pressing ^G.
-It is fairly self explanatory, documenting the various parts of the
-editor and available keystrokes.  Navigation is via the ^Y (Page Up)
-and ^V (Page Down) keys.  ^X exits the help system.
-
-
-@node Feature Toggles, The File Browser, Online Help, Top
-@chapter Feature Toggles
-
-Toggles allow you to change certain aspects of the editor that
-would normally be done via command line flags.  They are invoked via
-certain Meta key sequences.  @xref{Special Functions}, for more info.
-The following global toggles are available:
-
-@table @code
-
-@item Backup File Toggle (Meta-B)
-toggles the -B (@code{--backup}) command line flag.
-
-@item Multiple File Buffers Toggle (Meta-F)
-toggles the -F (@code{--multibuffer}) command line flag.
-
-@item Backup File Toggle (Meta-H)
-toggles the -A (@code{--smarthome}) command line flag.
-
-@item Auto Indent Toggle (Meta-I)
-toggles the -i (@code{--autoindent}) command line flag.
-
-@item Cut To End Toggle (Meta-K)
-toggles the -k (@code{--cut}) command line flag.
-
-@item Auto Line Wrap Toggle (Meta-L)
-toggles the -w (@code{--nowrap}) command line flag.
-
-@item Mouse Toggle (Meta-M)
-toggles the -m (@code{--mouse}) command line flag.
-
-@item More Space Toggle (Meta-O)
-toggles the -O (@code{--morespace}) command line flag.
-
-@item Smooth Scrolling Toggle (Meta-S)
-toggles the -S (@code{--smooth}) command line flag.
-
-@item Expert/Nohelp Toggle (Meta-X)
-toggles the -x (@code{--nohelp}) command line flag.
-
-@item Suspend Toggle (Meta-Z)
-toggles the -z (@code{--suspend}) command line flag.
-
-@end table
-
-
-@node The File Browser, Pico Compatibility, Feature Toggles, Top
-@chapter The File Browser
-
-When reading or writing files, pressing ^T will invoke the file browser.
-Here, one can navigate directories in a graphical manner in order to
-find the desired file.
-
-Basic movement in the file browser is accomplished with the arrow keys
-and page up/down.  The behavior of the enter (or `s') key varies by what
-is currently selected.  If the currently selected object is a directory,
-the file browser will enter and display the contents of the directory.
-If the object is a file, this filename and path are copied to the
-statusbar and the file browser is exited.
-
-@node Pico Compatibility, Building and Configure Options, The File Browser, Top
-@chapter Pico Compatibility
-
-@code{nano} attempts to emulate Pico as closely as possible, but there
-are certain differences between the editors:
-
-@table @code
-@item Search and Replace History
-As of version 1.1.99pre1 of @code{nano}, text entered as search or
-replace strings will be stored and can be accessed with the up/down
-arrow keys.  Previously, @code{nano} offered a more consistent, but
-incompatible with Pico, method for entering search and replace strings.
-In the old method, previous entries would be displayed by default as
-editable text in front of the cursor, as opposed to being bracketed and
-uneditable as it is in Pico.  The old behavior could be made compatible
-with Pico via the @code{-p} flag, but recent versions of Pico use the
-@code{-p} flag to preserve the XON and XOFF sequences within the editor.
-Since with the new method search and replace strings can still be edited
-by simply hitting the up arrow key once, the old method was removed
-completely.
-
-
-@item Writing or Appending Selected Text to Files
-Text selected using the Control-Caret (^^) key can be written out or
-appended to a new or existing file using the Writeout key (^O).
-
-@item Toggles
-Many options which alter the functionality of the program can be
-"toggled" on or off using Meta key sequences, meaning the program does
-not have to be restarted to turn a particular feature of the editor on
-or off.  Please see the internal help function (^G) for a list of what
-functions can be toggled for a particular version of @code{nano}.  Also
-see @xref{Feature Toggles}, though this may be out of date.
-
-@item Cursor Position Display
-The output of the "Display Cursor Position" in @code{nano} displays
-the given column position, as well as the row and total character
-position of the cursor.
-
-@item Interactive Replace and Spell Checker
-It is worth noting that the @code{nano} replace function is interactive,
-i.e, it does not stop after one search string is found and automatically
-replace it.  The @code{nano} implementation will stop at each search
-string found and query whether to replace this instance or not.  The
-internal spell checker operates similarly.  Note that these is no way to
-force these functions to behave in the Pico fashion.  As of version
-1.1.99pre1, misspelled words are sorted and trimmed for uniqueness in
-the internal spell checker such that the words 'apple' and 'Apple' will
-be prompted for correction separately.
-@end table
-
-@node Building and Configure Options, , Pico Compatibility, Top
-@chapter Building and Configure Options
-
-Building @code{nano} from source is fairly straightforward if you are
-familiar with compiling programs with autoconf support:
-
-@itemize @bullet
-@item tar xvfz nano-x.y.z.tar.gz (where x.y.z is the version of nano)
-@item cd nano-x.y.z/
-@item ./configure
-@item make
-@item make install
-@end itemize
-
-if you are looking to optimize @code{nano} for size, you may want to
-consider the following command line options:
-
-
-@table @code
-
-@item --disable-tabcomp
-Disable the tab completion code when reading or writing files.
-
-@item --disable-justify
-Disable the justify (^J)/unjustify (^U) functions in the editor.
-
-@item --disable-speller
-Disable spell checker ability.
-
-@item --disable-help
-Disable the help function (^G).  Disabling this option makes the binary
-much smaller, but makes it difficult for new users to learn more than
-very basic things about using the editor.
-
-@item --disable-browser
-Disable the mini file browser (^T) when reading or writing files.
-
-@item --disable-mouse
-Disable all mouse functionality.  This also disables the -m command line
-flag, which enables the mouse functions.
-
-@item --disable-operatingdir
-Disable setting the operating directory.  This also disables the -o
-command line flag.
-
-@item --enable-tiny
-This option disables all the above.  It also disables some of the larger
-internals of the editor, like the marker code (^^) and the cut to line
-(-k) option, which depends on the marker code to work properly.  It also
-disables the function toggles.
-
-@item --disable-wrapping
-Disable all word wrapping in the editor.  This also eliminates the -w
-command line flag, as nonwrapping is then the default behavior.
-
-@item --disable-nls
-Disables Native Language support.  This will make the available GNU
-@code{nano} translations unusable.
-
-@item --with-slang
-Compiling GNU @code{nano} with Slang is supported, and will make the
-binary notably smaller than if compiled with ncurses or other curses
-libraries.
-
-@end table
-
-@contents
-@bye

m4/.cvsignore

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

m4/Makefile.am

@@ -1,4 +1,5 @@
-EXTRA_DIST = ulonglong.m4 intdiv0.m4 inttypes.m4 inttypes_h.m4 inttypes-pri.m4 \
-	     stdint_h.m4 uintmax_t.m4 isc-posix.m4 lib-ld.m4 lib-link.m4 \
-	     lib-prefix.m4 codeset.m4 glibc21.m4 progtest.m4 gettext.m4 \
-	     iconv.m4 lcmessage.m4 glib-2.0.m4
+EXTRA_DIST = ac_define_dir.m4 codeset.m4 gettext.m4 glib-2.0.m4 \
+		glibc21.m4 iconv.m4 intdiv0.m4 inttypes_h.m4 \
+		inttypes.m4 inttypes-pri.m4 isc-posix.m4 lcmessage.m4 \
+		lib-ld.m4 lib-link.m4 lib-prefix.m4 progtest.m4 \
+		stdint_h.m4 uintmax_t.m4 ulonglong.m4

m4/ac_define_dir.m4

@@ -0,0 +1,34 @@
+dnl @synopsis AC_DEFINE_DIR(VARNAME, DIR [, DESCRIPTION])
+dnl
+dnl This macro sets VARNAME to the expansion of the DIR variable,
+dnl taking care of fixing up ${prefix} and such.
+dnl
+dnl VARNAME is then offered as both an output variable and a C
+dnl preprocessor symbol.
+dnl
+dnl Example:
+dnl
+dnl    AC_DEFINE_DIR([DATADIR], [datadir], [Where data are placed to.])
+dnl
+dnl @category Misc
+dnl @author Stepan Kasal <kasal@ucw.cz>
+dnl @author Andreas Schwab <schwab@suse.de>
+dnl @author Guido U. Draheim <guidod@gmx.de>
+dnl @author Alexandre Oliva
+dnl @version 2006-10-13
+dnl @license AllPermissive
+
+AC_DEFUN([AC_DEFINE_DIR], [
+  prefix_NONE=
+  exec_prefix_NONE=
+  test "x$prefix" = xNONE && prefix_NONE=yes && prefix=$ac_default_prefix
+  test "x$exec_prefix" = xNONE && exec_prefix_NONE=yes && exec_prefix=$prefix
+dnl In Autoconf 2.60, ${datadir} refers to ${datarootdir}, which in turn
+dnl refers to ${prefix}.  Thus we have to use `eval' twice.
+  eval ac_define_dir="\"[$]$2\""
+  eval ac_define_dir="\"$ac_define_dir\""
+  AC_SUBST($1, "$ac_define_dir")
+  AC_DEFINE_UNQUOTED($1, "$ac_define_dir", [$3])
+  test "$prefix_NONE" && prefix=NONE
+  test "$exec_prefix_NONE" && exec_prefix=NONE
+])

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

@@ -1,44 +1,53 @@
 %define name	@PACKAGE@
-%define ver	@VERSION@
-%define rel	1
+%define version	@VERSION@
+%define release	1
 
-Summary	: Pico editor clone with enhancements
 Name		: %{name}
-Version		: %{ver}
-Release		: %{rel}
-Copyright	: GPL
-Group		: Console/Editors
-URL		: http://www.nano-editor.org
-Source		: http://www.nano-editor.org/dist/v1.3/%{name}-%{ver}.tar.gz
-BuildRoot	: /var/tmp/%{name}-buildroot
-Requires	: ncurses
+Version		: %{version}
+Release		: %{release}
+Summary		: a user-friendly editor, a Pico clone with enhancements
+
+License		: GPLv3+
+Group		: Applications/Editors
+URL		: https://nano-editor.org/
+Source		: https://nano-editor.org/dist/v2.6/%{name}-%{version}.tar.gz
+
+BuildRoot	: %{_tmppath}/%{name}-%{version}-root
+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.
+GNU nano is a small and friendly text editor.  It aims to emulate the
+Pico text editor while also offering several enhancements.
 
 %prep
 %setup -q
 
 %build
-%configure --enable-all
-make RPM_OPT_FLAGS="$RPM_OPT_FLAGS"
+%configure
+make
 
 %install
-rm -rf "$RPM_BUILD_ROOT"
-make DESTDIR="$RPM_BUILD_ROOT" install
+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/sample.nanorc
 %{_bindir}/*
-%{_mandir}/*/*
-%{_datadir}/locale/*/LC_MESSAGES/nano.mo
+%{_docdir}/nano/*
+%{_mandir}/man*/*
+%{_mandir}/fr/man*/*
 %{_infodir}/nano.info*
-
-%changelog
-* Sat Mar 30 2002 Chris Allegretta <chrisa@asty.org>
-- Accepted into main distribution
-- Added Packager and URL tage from original spec file.
-* Tue Mar 06 2002 Brett Pemberton <generica@email.com>
-- Initial spec-file
+%{_datadir}/locale/*/LC_MESSAGES/nano.mo
+%{_datadir}/nano/*

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,3 +1,382 @@
+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: Fix incorrect "Project-Id-Version" entry.
+
+2006-12-06  Jordi Mallach <jordi@gnu.org>
+
+	* hu.po: Updated Hungarian translation by Gabor Kelemen.
+	* ms.po: Updated Malay translation by
+	Sharuzzaman Ahmat Raslan.
+
+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.
+
+2006-10-25  Jordi Mallach  <jordi@gnu.org>
+
+	* fr.po: Updated French translation by Jean-Philippe Guérard.
+	* nb.po: Updated Norwegian bokmål translation by
+	Geir Helland.
+
+2006-10-16  Jordi Mallach  <jordi@gnu.org>
+
+	* gl.po: Updated Galician translation by
+	Francisco Javier Tsao Santín.
+
+2006-10-16  Jordi Mallach  <jordi@gnu.org>
+
+	* eu.po: Updated Basque translation by Mikel Olasagasti.
+
+2006-10-10  Jordi Mallach  <jordi@gnu.org>
+
+	* gl.po: Updated Galician translation by
+	Francisco Javier Tsao Santín.
+
+2006-10-02  Jordi Mallach  <jordi@gnu.org>
+
+	* pt_BR.po: Refetch the current nano 1.9.99pre0 pt_BR file from
+	the TP, as the latest file offered is apparently for 1.3.11pre1.
+
+2006-10-02  David Lawrence Ramsey  <pooka109@cox.net>
+
+	* pt_BR.po: Restore previous version of pt_BR, as it was for
+	nano 1.9.99pre0, and the current version is for 1.3.11pre1.
+
+2006-09-27  Jordi Mallach  <jordi@gnu.org>
+
+	* pt_BR.po: Updated Brazilian Portuguese translation by
+	Joao Victor Duarte Martins.
+
+2006-09-10  David Lawrence Ramsey  <pooka109@cox.net>
+
+	* hu.po: Removed unneeded duplicate plural forms again.
+
+2006-09-10  Jordi Mallach  <jordi@gnu.org>
+
+	* hu.po: Updated Hungarian translation by Gabor Kelemen.
+
+2006-09-02  Jordi Mallach  <jordi@gnu.org>
+
+	* pt_BR.po: Updated Brazilian Portuguese translation by
+	Joao Victor Duarte Martins.
+
+2006-09-01  Benno Schulenberg  <bensberg@justemail.net>
+
+	* ChangeLog: Fix incorrect years in two entries.
+
+2006-08-31  David Lawrence Ramsey  <pooka109@cox.net>
+
+	* bg.po: Fix misplaced space.
+
+2006-08-31  Jordi Mallach  <jordi@gnu.org>
+
+	* ca.po: Updated Catalan translation.
+	* de.po: Updated German translation by Michael Piefel.
+	* es.po: Updated Spanish translation by
+	Ricardo Javier Cardenes Medina.
+
+2006-08-28  Jordi Mallach  <jordi@gnu.org>
+
+	* fr.po: Updated French translation by Jean-Philippe Guérard.
+
+2006-08-25  Jordi Mallach  <jordi@gnu.org>
+
+	* bg.po: Updated Bulgarian translation by Anton Zinoviev.
+	* ca.po: Updated Catalan translation.
+	* ga.po: Updated Irish translation by Kevin Patrick Scannell.
+	* it.po: Updated Italian translation by Marco Colombo.
+	* nl.po: Updated Dutch translation by Benno Schulenberg.
+	* sv.po: Updated Swedish translation by Daniel Nylander.
+
+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.
+	* id.po: Removed unneeded duplicate plural forms, as gettext
+	0.15 generates errors upon encountering them.
+
+2006-06-20  Jordi Mallach  <jordi@gnu.org>
+
+	* ca.po: Updated Catalan translation.
+	* fr.po: Updated French translation by Jean-Philippe Guérard.
+	* hu.po: Updated Hungarian translation by Gabor Kelemen.
+	* nl.po: Updated Dutch translation by Benno Schulenberg.
+
+2006-06-20  David Lawrence Ramsey  <pooka109@cox.net>
+
+	* 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>
+
+	* bg.po: Updated Bulgarian translation by Anton Zinoviev.
+	* ga.po: Updated Irish translation by Kevin Patrick Scannell.
+
+2006-06-17  Jordi Mallach  <jordi@gnu.org>
+
+	* ca.po: Updated Catalan translation.
+	* de.po: Updated German translation by Michael Piefel.
+	* fr.po: Updated French translation by Jean-Philippe Guérard.
+	* hu.po: Updated Hungarian translation by Gabor Kelemen.
+	* it.po: Updated Italian translation by Marco Colombo.
+	* nl.po: Updated Dutch translation by Benno Schulenberg.
+
+2006-06-12  Jordi Mallach  <jordi@gnu.org>
+
+	* fr.po: Updated French translation by Jean-Philippe Guérard.
+	* hu.po: Updated Hungarian translation by Gabor Kelemen.
+
+2006-06-09  Jordi Mallach  <jordi@gnu.org>
+
+	* ca.po: Updated Catalan translation.
+	* ga.po: Updated Irish translation by Kevin Patrick Scannell.
+	* it.po: Updated Italian translation by Marco Colombo.
+	* nl.po: Updated Dutch translation by Benno Schulenberg.
+
+2006-05-17  Jordi Mallach  <jordi@gnu.org>
+
+	* LINGUAS: Added "ga".
+	* ga.po: New Irish translation by
+	Kevin Patrick Scannell <scannell@SLU.EDU>.
+
+2006-05-10  Jordi Mallach  <jordi@gnu.org>
+
+	* nl.po: Updated Dutch translation by Benno Schulenberg.
+
+2006-03-15  Jordi Mallach  <jordi@gnu.org>
+
+	* sv.po: Updated Swedish translation by Daniel Nylander.
+
+2006-03-06  Jordi Mallach  <jordi@gnu.org>
+
+	* ca.po: Updated Vietnamese translation by
+	Phan Vinh Thinh.
+
+2005-12-21  Jordi Mallach  <jordi@gnu.org>
+
+	* bg.po: Updated Bulgarian translation by Anton Zinoviev.
+	* ca.po: Updated Catalan translation.
+	* fr.po: Updated French translation by Jean-Philippe Guérard.
+	* ms.po: Updated Malay translation by Sharuzzaman Ahmat Raslan.
+	* zh_TW: Updated Traditional Chinese translation by
+	Wei-Lun Chao.
+
+2005-12-13  Jordi Mallach  <jordi@gnu.org>
+
+	* it.po: Updated Italian translation by Marco Colombo.
+	* de.po: Updated German translation by Michael Piefel.
+	* nl.po: Updated Dutch translation by Benno Schulenberg.
+
+2005-11-08  David Lawrence Ramsey  <pooka109@cox.net>
+
+	* POTFILES.in: Add prompt.c.
+
+2005-11-05  David Lawrence Ramsey  <pooka109@cox.net>
+
+	* POTFILES.in: Add browser.c.
+
+2005-11-01  David Lawrence Ramsey  <pooka109@cox.net>
+
+	* POTFILES.in: Add help.c.
+
+2005-10-23  Jordi Mallach  <jordi@gnu.org>
+
+	* ca.po: Updated Catalan translation.
+	* eu.po: Updated Basque translation by Mikel Olasagasti.
+	* fr.po: Updated French translation by Jean-Philippe Guérard.
+	* it.po: Updated Italian translation by Marco Colombo.
+	* ms.po: Updated Malay translation by Sharuzzaman Ahmat Raslan.
+	* nl.po: Updated Dutch translation by Benno Schulenberg.
+	* zh_TW: Updated Traditional Chinese translation by
+	Wei-Lun Chao.
+	
+2005-08-22  Jordi Mallach  <jordi@gnu.org>
+	* bg.po: New Bulgarian translation by
+	Yavor Doganov <yavor@doganov.org>.
+
+	* LINGUAS: Added "bg".
+
+2005-08-16  Jordi Mallach  <jordi@gnu.org>
+
+	* ca.po: Updated Catalan translation.
+
+2005-08-16  Jordi Mallach  <jordi@gnu.org>
+
+	* nl.po: Updated Dutch translation by
+	Benno Schulenberg and Reinout van Schouwen.
+
+2005-07-24  David Lawrence Ramsey  <pooka109@cox.net>
+
+	* POTFILES.in: Add text.c.
+
+2005-07-19  Jordi Mallach  <jordi@gnu.org>
+
+	* ms.po: Updated Malay translation by
+	Sharuzzaman Ahmat Raslan.
+
+2005-07-18  Jordi Mallach  <jordi@gnu.org>
+
+	* fr.po: Updated French translation by
+	Jean-Philippe Guérard.
+
+2005-07-07  Jordi Mallach  <jordi@gnu.org>
+
+	* it.po: Updated Italian translation by Marco Colombo.
+	* ca.po: Updated Catalan translation.
+
+2005-06-28  David Lawrence Ramsey  <pooka109@cox.net>
+
+	* POTFILES.in: Remove source files that contain no translatable
+	strings.
+
+2005-06-19  David Lawrence Ramsey  <pooka109@cox.net>
+
+	* pt_BR.po: Typo fix.
+
+2005-06-15  Jordi Mallach  <jordi@gnu.org>
+
+	* de.po: Typo fix by Jens Seidel.
+
+2005-05-23  Jordi Mallach  <jordi@gnu.org>
+
+	* fr.po: Updated French translation by
+	Jean-Philippe Guérard.
+
+2005-04-27  Jordi Mallach  <jordi@gnu.org>
+
+	* ms.po: Updated Malay translation by
+	Sharuzzaman Ahmat Raslan.
+
+2005-04-22  Jordi Mallach  <jordi@gnu.org>
+
+	* nb.po: Updated Norwegian bokmål translation by
+	Geir Helland.
+
+2005-04-20  Jordi Mallach  <jordi@gnu.org>
+
+	* ms.po: Updated Malay translation by
+	Sharuzzaman Ahmat Raslan.
+	* ro.po: Updated Romanian translation by Laurentiu Buzdugan.
+	* zh_TW.po: Updated Traditional Chinese translation by
+	CHAO Wei-Lun.
+
+2005-04-18  Jordi Mallach  <jordi@gnu.org>
+
+	* vi.po: Updated Vietnamese translation by Phan Vinh Thinh.
+
+2005-04-18  Jordi Mallach  <jordi@gnu.org>
+
+	* ca.po: Updated Catalan translation.
+	* it.po: Updated Italian translation by Marco Colombo.
+	* ro.po: Updated Romanian translation by Laurentiu Buzdugan.
+
+2005-04-14  Jordi Mallach  <jordi@gnu.org>
+
+	* es.po: Updated Spanish translation by
+	Ricardo Javier Cárdenes Medina.
+
+2005-04-13  Jordi Mallach  <jordi@gnu.org>
+
+	* vi.po: New Vietnamese translation by Phan Vinh Thinh.
+	* LINGUAS: Added "vi".
+
+2005-04-09  Jordi Mallach  <jordi@gnu.org>
+
+	* zh_TW.po: Added Plural-Forms header and fix format specification
+	typos.
+
+2005-04-08  Jordi Mallach  <jordi@gnu.org>
+
+	* ca.po: Updated Catalan translation.
+	* it.po: Updated Italian translation by Marco Colombo.
+	* zh_TW.po: Updated Traditional Chinese translation by
+	CHAO Wei-Lun.
+
+2005-04-06  Jordi Mallach  <jordi@gnu.org>
+
+	* rw.po: New Kinyarwanda translation by Steve Murphy.
+	* LINGUAS: Added "rw".
+
+2005-04-05  Jordi Mallach  <jordi@gnu.org>
+
+	* fr.po: Updated French translation by
+	Jean-Philippe Guérard.
+	* ro.po: Updated Romanian translation by
+	Laurentiu Buzdugan.
+
 2005-03-11  Jordi Mallach  <jordi@gnu.org>
 
 	* ms.po: Updated Malay translation by
@@ -617,6 +996,3 @@
 
 	* ca.po: Updated.
 	* es.po: Updated.
-
-
-$Id$

po/LINGUAS

@@ -1,2 +1,2 @@
 # List of available languages.
-ca cs da de es eu fi fr gl hu id it ms nb nl nn pl pt_BR ro ru sr sv tr uk 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

po/POTFILES.in

@@ -1,17 +1,14 @@
-# $Id$
 # List of source files containing translatable strings.
 
-# Package source files
-src/cut.c
+src/browser.c
+src/color.c
 src/files.c
 src/global.c
-src/move.c
+src/help.c
 src/nano.c
+src/prompt.c
 src/rcfile.c
 src/search.c
+src/text.c
 src/utils.c
 src/winio.c
-
-# Package header files
-src/nano.h
-src/proto.h

po/update.pl

@@ -1,367 +0,0 @@
-#!/usr/bin/perl -w
-
-#
-#  GNOME PO Update Utility
-#
-#  Copyright (C) 2000 Free Software Foundation.
-#
-#  This script 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 of the
-#  License, or (at your option) any later version.
-#
-#  This script 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 library; if not, write to the Free Software
-#  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-#
-#  Authors: Kenneth Christiansen <kenneth@gnu.org>
-#
-
-#  NOTICE: Please remember to change the variable $PACKAGE to reflect 
-#  the package this script is used within.
-
-$PACKAGE="nano";
-
-use File::Basename;
-
-# Declare global variables
-#-------------------------
-my $VERSION = "1.5beta5";
-my $LANG    = $ARGV[0];
-
-# Always print as the first thing
-#--------------------------------
-$| = 1;
-
-# Figure out what package that is in use
-#---------------------------------------
-#open FILE, "../configure.in";
-#    while (<FILE>) {
-#	next if /^dnl/; #ignore comments
-#        if ($_=~/AM_INIT_AUTOMAKE\((.*),(.*)\)/o){
-#            $PACKAGE=$1;
-#	    last; #stop when found
-#            }
-#	if ($_=~/PACKAGE\((.*)\)/o){
-#            $PACKAGE=$1;
-#            last; #stop when found
-#            }
-#        }   
-#close FILE;
-
-
-# Give error if script is run without an argument
-#------------------------------------------------
-if (! $LANG){
-    print "update.pl:  missing file arguments\n";
-    print "Try `update.pl --help' for more information.\n";
-    exit;
-}
-
-# Use the supplied arguments
-#---------------------------
-if ($LANG=~/^-(.)*/){
-
-    if ("$LANG" eq "--version"   || "$LANG" eq "-V"){
-        &Version;
-    }
-    elsif ($LANG eq "--help"     || "$LANG" eq "-H"){
-	&Help;
-    }
-    elsif ($LANG eq "--dist"     || "$LANG" eq "-D"){
-        &Merging;
-    }
-    elsif ($LANG eq "--pot"      || "$LANG" eq "-P"){
-
- 	# Check for .headerlock file, so the Makefile
-        # will not generate the header files twise 
-	#--------------------------------------------
-	if (-e ".headerlock"){
-   	&GeneratePot;
-	}else{
-        &GenHeaders;
-	&GeneratePot;}
-        exit;
-    }
-    elsif ($LANG eq "--headers"  || "$LANG" eq "-S"){
-        &GenHeaders;
-        exit;
-    }
-    elsif ($LANG eq "--maintain" || "$LANG" eq "-M"){
-        &Maintain;
-    }
-    else {
-        &InvalidOption;
-    }
-
-} else {
-   
-   # Run standard procedure
-   #-----------------------
-   if(-s "$LANG.po"){
-        &GenHeaders; 
-	&GeneratePot;
-	&Merging;
-	&Status;
-   }  
-
-   # Report error if the language file supplied
-   # to the command line is non-existent
-   #-------------------------------------------
-   else {
-	&NotExisting;       
-   }
-}
-
-sub Version{
-
-    # Print version information
-    #--------------------------
-    print "GNOME PO Updater $VERSION\n";
-    print "Written by Kenneth Christiansen <kenneth\@gnome.org>, 2000.\n\n";
-    print "Copyright (C) 2000 Free Software Foundation, Inc.\n";
-    print "This is free software; see the source for copying conditions.  There is NO\n";
-    print "warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.\n";
-    exit;
-}
-
-sub Help{
-
-    # Print usage information
-    #------------------------
-    print "Usage: ./update.pl [OPTIONS] ...LANGCODE\n";
-    print "Updates pot files and merge them with the translations.\n\n";
-    print "  -H, --help                   shows this help page\n";
-    print "  -P, --pot                    generate the pot file only\n";
-    print "  -S, --headers                generate the XML headerfiles in POTFILES.in\n";
-    print "  -M, --maintain               search for missing files in POTFILES.in\n";
-    print "  -V, --version                shows the version\n";
-    print "\nExamples of use:\n";
-    print "update.sh --pot    just creates a new pot file from the source\n";
-    print "update.sh da       created new pot file and updated the da.po file\n\n";
-    print "Report bugs to <kenneth\@gnome.org>.\n";
-    exit;
-}
-
-sub Maintain{
-   
-    # Search and fine, all translatable files
-    # ---------------------------------------
-    $i18nfiles="find ../ -print | egrep '.*\\.(c|y|cc|c++|h|gob)' ";
-
-    open(BUF2, "POTFILES.in") || die "update.pl:  there's no POTFILES.in!!!\n";
-    
-    print "Searching for missing _(\" \") entries...\n";
-    
-    open(BUF1, "$i18nfiles|");
-
-    @buf1_1 = <BUF1>;
-    @buf1_2 = <BUF2>;
-
-    # Check if we should ignore some found files, when 
-    # comparing with POTFILES.in
-    #-------------------------------------------------
-    if (-s ".potignore"){
-        open FILE, ".potignore";
-        while (<FILE>) {
-            if ($_=~/^[^#]/o){
-                push @bup, $_;
-            }
-        }
-        print "Found .potignore: Ignoring files...\n";
-        @buf1_2 = (@bup, @buf1_2);
-    }
-
-    foreach my $file (@buf1_1){
-        open FILE, "<$file";
-        while (<FILE>) {
-            if ($_=~/_\(\"/o){
-                $file = unpack("x3 A*",$file) . "\n";
-                push @buf2_1, $file;
-                last;
-            }
-        }
-    }
-
-    @buf3_1 = sort (@buf2_1);
-    @buf3_2 = sort (@buf1_2);
-
-    my %in2;
-    foreach (@buf3_2) {
-        $in2{$_} = 1;
-    }
-
-    foreach (@buf3_1){
-        if (!exists($in2{$_})){
-            push @result, $_ 
-        }
-    }
-
-    # Save file with information about the files missing
-    # if any, and give information about this proceedier
-    #---------------------------------------------------
-    if(@result){
-        open OUT, ">missing";
-        print OUT @result;
-        print "\nHere is the result:\n\n", @result, "\n";
-        print "The file \"missing\" has been placed in the current directory.\n";
-        print "Files supposed to be ignored should be placed in \".potignore\"\n";
-    }
-
-    # If there is nothing to complain about, notice the user
-    #-------------------------------------------------------
-    else{
-        print "\nWell, it's all perfect! Congratulation!\n";
-    }         
-}
-
-sub InvalidOption{
-
-    # Handle invalid arguments
-    #-------------------------
-    print "update.pl: invalid option -- $LANG\n";
-    print "Try `update.pl --help' for more information.\n";
-}
- 
-sub GenHeaders{
-
-    # Generate the .h header files, so we can allow glade and
-    # xml translation support
-    #--------------------------------------------------------
-    if(-s "ui-extract.pl"){
-
-        print "Found ui-extract.pl script\nRunning ui-extract...\n";
-
-        open FILE, "<POTFILES.in";
-        while (<FILE>) {
-
-           # Find .xml files in POTFILES.in and generate the
-           # files with help from the ui-extract.pl script
-           #--------------------------------------------------
-           if ($_=~ /(.*)(\.xml)/o){
-              $filename = "../$1.xml";
-              $xmlfiles="perl \.\/ui-extract.pl --local $filename";
-              system($xmlfiles);
-           }
-      
-           # Find .glade files in POTFILES.in and generate
-           # the files with help from the ui-extract.pl script
-           #--------------------------------------------------
-           elsif ($_=~ /(.*)(\.glade)/o){
-              $filename = "../$1.glade";
-              $xmlfiles="perl \.\/ui-extract.pl --local $filename";
-              system($xmlfiles);  
-           }
-       }
-       close FILE;
-
-       # Create .headerlock file, so the script will know 
-       # that we already passed this section. This is required 
-       # since the individual sections can be reaced at different
-       # times by the Makefile
-       #--------------------------------------------------------- 
-       system("touch .headerlock");
-   }
-}
-
-sub GeneratePot{
-
-    # Generate the potfiles from the POTFILES.in file
-    #------------------------------------------------
-
-    print "Building the $PACKAGE.pot...\n";
-
-    system ("mv POTFILES.in POTFILES.in.old");    
-
-    open INFILE, "<POTFILES.in.old";
-    open OUTFILE, ">POTFILES.in";
-    while (<INFILE>) {
-	if ($_ =~ /\.(glade|xml)$/) {
-        s/\.glade$/\.glade\.h/;
-        s/\.xml$/\.xml\.h/;
-        $_ = basename($_);
-	$_ = "po/tmp/$_\n";
-        }
-        print OUTFILE $_;        
-    }
-    close OUTFILE;
-    close INFILE;
-
-    $GETTEXT ="xgettext --default-domain\=$PACKAGE --directory\=\.\."
-             ." --add-comments --keyword\=\_ --keyword\=N\_ --keyword\=P_\:1,2"
-             ." --files-from\=\.\/POTFILES\.in ";  
-    $GTEST   ="test \! -f $PACKAGE\.po \|\| \( rm -f \.\/$PACKAGE\.pot "
-             ."&& mv $PACKAGE\.po \.\/$PACKAGE\.pot \)";
-
-    system($GETTEXT);
-    system($GTEST);
-    print "Wrote $PACKAGE.pot\n";
-    system("mv POTFILES.in.old POTFILES.in");
-
-    # If .headerlock file is found, it means that the potfiles
-    # already has been generated. If so delete the generated 
-    # .h header files. The reason for this approach with a 
-    # file as a marker is due to that the Makefile runs the
-    # scripts in turns
-    #---------------------------------------------------------
-
-    if(-e ".headerlock"){
-        unlink(".headerlock");
-
-        print "Removing generated header (.h) files...";
-	system("rm ./tmp/ -rf");
-    }
-    print "done\n";
-}
-
-sub Merging{
-
-    if ($ARGV[1]){
-        $LANG   = $ARGV[1]; 
-    } else {
-	$LANG   = $ARGV[0];
-    }
-
-    if ($ARGV[0] ne "--dist" && $ARGV[0] ne "-D") {
-        print "Merging $LANG.po with $PACKAGE.pot...";
-    }
-
-    $MERGE="cp $LANG.po $LANG.po.old && msgmerge $LANG.po.old $PACKAGE.pot -o $LANG.po";
-
-    system($MERGE);
-    
-    if ($ARGV[0] ne "--dist" && $ARGV[0] ne "-D") {
-        print "\n\n";
-    }
-
-    # Remove the "messages" trash file generated
-    # by gettext, aswell as the backup file
-    #-------------------------------------------
-    unlink "messages";
-    unlink "$LANG.po.old";
-}
-
-sub NotExisting{
-
-    # Report error if supplied language 
-    # file is non-existant
-    #----------------------------------
-    print "update.pl:  sorry, $LANG.po does not exist!\n";
-    print "Try `update.pl --help' for more information.\n";    
-    exit;
-}
-
-sub Status{
-
-    # Print status information about the po file
-    #-------------------------------------------
-    $STATUS="msgfmt --statistics $LANG.po";
-    
-    system($STATUS);
-    print "\n";   
-}

po/update_linguas.sh

@@ -0,0 +1,26 @@
+#!/bin/sh
+
+# Let this be executed in the po/ subdir.
+cd "$(dirname "$0")" || exit
+
+echo "Updating translations via TP"
+rsync -Lrtvz  translationproject.org::tp/latest/nano/ .
+
+# Are there now PO files that are not in git yet?
+NEWSTUFF=$(git status --porcelain *.po | grep "^??")
+
+if [ -n "${NEWSTUFF}" ]; then
+    echo "New languages found; updating LINGUAS"
+    echo "# List of available languages." >LINGUAS
+    echo $(printf '%s\n' *.po | LC_ALL=C sort | sed 's/\.po//g') >>LINGUAS
+fi
+
+echo "Regenerating POT file and remerging and recompiling PO files..."
+make update-po
+
+# Ensure that the PO files are newer than the POT.
+touch *.po
+
+# If needed, fix a problem in the Makefile template.
+grep -q '^datarootdir' Makefile.in.in || \
+	sed -i 's/^\(datadir.*\)/datarootdir = @datarootdir@\n\1/' Makefile.in.in

src/.cvsignore

@@ -1,4 +0,0 @@
-Makefile
-Makefile.in
-nano
-.deps

src/Makefile.am

@@ -1,20 +1,39 @@
-localedir = $(datadir)/locale
-INCLUDES = -Iintl -DLOCALEDIR=\"$(localedir)\" -DSYSCONFDIR=\"$(sysconfdir)\"
+AM_CPPFLAGS = -DLOCALEDIR=\"$(localedir)\" -DSYSCONFDIR=\"$(sysconfdir)\"
 
-ACLOCAL_AMFLAGS = -I m4
+CLEANFILES = revision.h
+
+if BUILDING_FROM_GIT
+SOMETHING = "REVISION \"$(shell git describe --tags 2>/dev/null)\""
+else
+SOMETHING = "NOTHING \"from tarball\""
+endif
+
+nano.o: revision.h
+winio.o: revision.h
+
+revision.h: update_revision
+	@[ -f $@ ] || touch $@
+	@echo "#define $(SOMETHING)" | cmp -s $@ - || \
+	echo "#define $(SOMETHING)" > $@
+
+.PHONY: update_revision
 
 bin_PROGRAMS = 	nano
-nano_SOURCES =	chars.c \
+nano_SOURCES =	browser.c \
+		chars.c \
 		color.c \
 		cut.c \
 		files.c \
 		global.c \
+		help.c \
 		move.c \
 		nano.c \
 		nano.h \
+		prompt.c \
 		proto.h \
 		rcfile.c \
 		search.c \
+		text.c \
 		utils.c \
 		winio.c 
 
@@ -22,3 +41,5 @@ nano_LDADD = @GLIB_LIBS@ @LIBINTL@
 
 install-exec-hook:
 	cd $(DESTDIR)$(bindir) && rm -f rnano && $(LN_S) nano rnano
+uninstall-hook:
+	cd $(DESTDIR)$(bindir) && rm -f rnano

src/browser.c

@@ -0,0 +1,801 @@
+/**************************************************************************
+ *   browser.c  --  This file is part of GNU nano.                        *
+ *                                                                        *
+ *   Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009,  *
+ *   2010, 2011, 2013, 2014, 2015 Free Software Foundation, Inc.          *
+ *   Copyright (C) 2015, 2016 Benno Schulenberg                           *
+ *                                                                        *
+ *   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 3 of the License,    *
+ *   or (at your option) any later version.                               *
+ *                                                                        *
+ *   GNU nano 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/.  *
+ *                                                                        *
+ **************************************************************************/
+
+#include "proto.h"
+
+#include <stdint.h>
+#include <stdio.h>
+#include <string.h>
+#include <unistd.h>
+#include <errno.h>
+
+#ifndef DISABLE_BROWSER
+
+static char **filelist = NULL;
+	/* The list of files to display in the file browser. */
+static size_t filelist_len = 0;
+	/* The number of files in the list. */
+static int width = 0;
+	/* The number of files that we can display per line. */
+static int longest = 0;
+	/* The number of columns in the longest filename in the list. */
+static size_t selected = 0;
+	/* The currently selected filename in the list; zero-based. */
+
+/* Our main file browser function.  path is the tilde-expanded path we
+ * start browsing from. */
+char *do_browser(char *path)
+{
+    char *retval = NULL;
+    int kbinput;
+    char *present_name = NULL;
+	/* The name of the currently selected file, or of the directory we
+	 * were in before backing up to "..". */
+    size_t old_selected;
+	/* The number of the selected file before the current selected file. */
+    functionptrtype func;
+	/* The function of the key the user typed in. */
+    DIR *dir;
+	/* The directory whose contents we are showing. */
+
+    /* Don't show a cursor in the file list. */
+    curs_set(0);
+
+  read_directory_contents:
+	/* We come here when we refresh or select a new directory. */
+
+    path = free_and_assign(path, get_full_path(path));
+
+    if (path != NULL)
+	dir = opendir(path);
+
+    if (path == NULL || dir == NULL) {
+	statusline(ALERT, _("Cannot open directory: %s"), strerror(errno));
+	/* If we don't have a file list yet, there is nothing to show. */
+	if (filelist == NULL) {
+	    napms(1200);
+	    lastmessage = HUSH;
+	    free(path);
+	    free(present_name);
+	    return NULL;
+	}
+	path = mallocstrcpy(path, present_path);
+	present_name = mallocstrcpy(present_name, filelist[selected]);
+    }
+
+    assert(path != NULL && path[strlen(path) - 1] == '/');
+
+    if (dir != NULL) {
+	/* Get the file list, and set longest and width in the process. */
+	read_the_list(path, dir);
+	closedir(dir);
+	dir = NULL;
+    }
+
+    /* If given, reselect the present_name and then discard it. */
+    if (present_name != NULL) {
+	browser_select_dirname(present_name);
+
+	free(present_name);
+	present_name = NULL;
+    /* Otherwise, select the first file or directory in the list. */
+    } else
+	selected = 0;
+
+    old_selected = (size_t)-1;
+
+    present_path = mallocstrcpy(present_path, path);
+
+    titlebar(path);
+
+    while (TRUE) {
+	/* Make sure that the cursor is off. */
+	curs_set(0);
+	lastmessage = HUSH;
+
+	bottombars(MBROWSER);
+
+	/* Display (or redisplay) the file list if the list itself or
+	 * the selected file has changed. */
+	if (old_selected != selected)
+	    browser_refresh();
+
+	old_selected = selected;
+
+	kbinput = get_kbinput(edit);
+
+#ifndef DISABLE_MOUSE
+	if (kbinput == KEY_MOUSE) {
+	    int mouse_x, mouse_y;
+
+	    /* We can click on the edit window to select a filename. */
+	    if (get_mouseinput(&mouse_x, &mouse_y, TRUE) == 0 &&
+			wmouse_trafo(edit, &mouse_y, &mouse_x, FALSE)) {
+		/* longest is the width of each column.  There
+		 * are two spaces between each column. */
+		selected = selected - selected % (editwinrows * width) +
+				(mouse_y * width) + (mouse_x / (longest + 2));
+
+		/* If they clicked beyond the end of a row,
+		 * select the last filename in that row. */
+		if (mouse_x > width * (longest + 2))
+		    selected--;
+
+		/* If we're beyond the list, select the last filename. */
+		if (selected > filelist_len - 1)
+		    selected = filelist_len - 1;
+
+		/* If we selected the same filename as last time, fake a
+		 * press of the Enter key so that the file is read in. */
+		if (old_selected == selected)
+		    unget_kbinput(KEY_ENTER, FALSE);
+	    }
+
+	    continue;
+	}
+#endif /* !DISABLE_MOUSE */
+
+	func = parse_browser_input(&kbinput);
+
+	if (func == total_refresh) {
+	    total_redraw();
+#ifndef NANO_TINY
+	    /* Simulate a window resize to force a directory reread. */
+	    kbinput = KEY_WINCH;
+#endif
+	} else if (func == do_help_void) {
+#ifndef DISABLE_HELP
+	    do_help_void();
+#ifndef NANO_TINY
+	    /* The window dimensions might have changed, so act as if. */
+	    kbinput = KEY_WINCH;
+#endif
+#else
+	    say_there_is_no_help();
+#endif
+	} else if (func == do_search) {
+	    /* Search for a filename. */
+	    do_filesearch();
+	} else if (func == do_research) {
+	    /* Search for another filename. */
+	    do_fileresearch();
+	} else if (func == do_left) {
+	    if (selected > 0)
+		selected--;
+	} else if (func == do_right) {
+	    if (selected < filelist_len - 1)
+		selected++;
+#ifndef NANO_TINY
+	} else if (func == do_prev_word_void) {
+	    selected -= (selected % width);
+	} else if (func == do_next_word_void) {
+	    selected += width - 1 - (selected % width);
+	    if (selected >= filelist_len)
+		selected = filelist_len - 1;
+#endif
+	} else if (func == do_up_void) {
+	    if (selected >= width)
+		selected -= width;
+	} else if (func == do_down_void) {
+	    if (selected + width <= filelist_len - 1)
+		selected += width;
+	} else if (func == do_page_up) {
+	    if (selected < width)
+		selected = 0;
+	    else if (selected < editwinrows * width)
+		selected = selected % width;
+	    else
+		selected -= editwinrows * width;
+	} else if (func == do_page_down) {
+	    if (selected + width >= filelist_len - 1)
+		selected = filelist_len - 1;
+	    else if (selected + editwinrows * width >= filelist_len)
+		selected = (selected + editwinrows * width - filelist_len) %
+				width +	filelist_len - width;
+	    else
+		selected += editwinrows * width;
+	} else if (func == do_first_file) {
+	    selected = 0;
+	} else if (func == do_last_file) {
+	    selected = filelist_len - 1;
+	} else if (func == goto_dir_void) {
+	    /* Ask for the directory to go to. */
+	    int i = do_prompt(TRUE, FALSE, MGOTODIR, NULL,
+#ifndef DISABLE_HISTORIES
+			NULL,
+#endif
+			/* TRANSLATORS: This is a prompt. */
+			browser_refresh, _("Go To Directory"));
+
+	    if (i < 0) {
+		statusbar(_("Cancelled"));
+		continue;
+	    }
+
+	    path = free_and_assign(path, real_dir_from_tilde(answer));
+
+	    /* If the given path is relative, join it with the current path. */
+	    if (*path != '/') {
+		path = charealloc(path, strlen(present_path) +
+						strlen(answer) + 1);
+		sprintf(path, "%s%s", present_path, answer);
+	    }
+
+#ifndef DISABLE_OPERATINGDIR
+	    if (check_operating_dir(path, FALSE)) {
+		/* TRANSLATORS: This refers to the confining effect of the
+		 * option --operatingdir, not of --restricted. */
+		statusline(ALERT, _("Can't go outside of %s"),
+				full_operating_dir);
+		path = mallocstrcpy(path, present_path);
+		continue;
+	    }
+#endif
+	    /* Snip any trailing slashes, so the name can be compared. */
+	    while (strlen(path) > 1 && path[strlen(path) - 1] == '/')
+		path[strlen(path) - 1] = '\0';
+
+	    /* In case the specified directory cannot be entered, select it
+	     * (if it is in the current list) so it will be highlighted. */
+	    for (i = 0; i < filelist_len; i++)
+		if (strcmp(filelist[i], path) == 0)
+		    selected = i;
+
+	    /* Try opening and reading the specified directory. */
+	    goto read_directory_contents;
+	} else if (func == do_enter) {
+	    struct stat st;
+
+	    /* It isn't possible to move up from the root directory. */
+	    if (strcmp(filelist[selected], "/..") == 0) {
+		statusline(ALERT, _("Can't move up a directory"));
+		continue;
+	    }
+
+#ifndef DISABLE_OPERATINGDIR
+	    /* Note: The selected file can be outside the operating
+	     * directory if it's ".." or if it's a symlink to a
+	     * directory outside the operating directory. */
+	    if (check_operating_dir(filelist[selected], FALSE)) {
+		statusline(ALERT, _("Can't go outside of %s"),
+				full_operating_dir);
+		continue;
+	    }
+#endif
+	    /* If for some reason the file is inaccessible, complain. */
+	    if (stat(filelist[selected], &st) == -1) {
+		statusline(ALERT, _("Error reading %s: %s"),
+				filelist[selected], strerror(errno));
+		continue;
+	    }
+
+	    /* If it isn't a directory, a file was selected -- we're done. */
+	    if (!S_ISDIR(st.st_mode)) {
+		retval = mallocstrcpy(NULL, filelist[selected]);
+		break;
+	    }
+
+	    /* If we are moving up one level, remember where we came from, so
+	     * this directory can be highlighted and easily reentered. */
+	    if (strcmp(tail(filelist[selected]), "..") == 0)
+		present_name = striponedir(filelist[selected]);
+
+	    /* Try opening and reading the selected directory. */
+	    path = mallocstrcpy(path, filelist[selected]);
+	    goto read_directory_contents;
+	} else if (func == do_exit) {
+	    /* Exit from the file browser. */
+	    break;
+#ifndef NANO_TINY
+	} else if (kbinput == KEY_WINCH) {
+	    ;
+#endif
+	} else
+	    unbound_key(kbinput);
+
+#ifndef NANO_TINY
+	/* If the window resized, refresh the file list. */
+	if (kbinput == KEY_WINCH) {
+	    /* Remember the selected file, to be able to reselect it. */
+	    present_name = mallocstrcpy(NULL, filelist[selected]);
+	    /* Reread the contents of the current directory. */
+	    goto read_directory_contents;
+	}
+#endif
+    }
+
+    titlebar(NULL);
+    edit_refresh();
+
+    free(path);
+
+    free_chararray(filelist, filelist_len);
+    filelist = NULL;
+    filelist_len = 0;
+
+    return retval;
+}
+
+/* The file browser front end.  We check to see if inpath has a
+ * directory in it.  If it does, we start do_browser() from there.
+ * Otherwise, we start do_browser() from the current directory. */
+char *do_browse_from(const char *inpath)
+{
+    struct stat st;
+    char *path;
+	/* This holds the tilde-expanded version of inpath. */
+
+    path = real_dir_from_tilde(inpath);
+
+    /* Perhaps path is a directory.  If so, we'll pass it to
+     * do_browser().  Or perhaps path is a directory / a file.  If so,
+     * we'll try stripping off the last path element and passing it to
+     * do_browser().  Or perhaps path doesn't have a directory portion
+     * at all.  If so, we'll just pass the current directory to
+     * do_browser(). */
+    if (stat(path, &st) == -1 || !S_ISDIR(st.st_mode)) {
+	path = free_and_assign(path, striponedir(path));
+
+	if (stat(path, &st) == -1 || !S_ISDIR(st.st_mode)) {
+	    char * currentdir = charalloc(PATH_MAX + 1);
+
+	    free(path);
+	    path = getcwd(currentdir, PATH_MAX + 1);
+
+	    if (path == NULL) {
+		free(currentdir);
+		statusline(MILD, _("The working directory has disappeared"));
+		beep();
+		napms(1200);
+		return NULL;
+	    }
+	}
+    }
+
+#ifndef DISABLE_OPERATINGDIR
+    /* If the resulting path isn't in the operating directory, use
+     * the operating directory instead. */
+    if (check_operating_dir(path, FALSE))
+	path = mallocstrcpy(path, operating_dir);
+#endif
+
+    return do_browser(path);
+}
+
+/* Set filelist to the list of files contained in the directory path,
+ * set filelist_len to the number of files in that list, set longest to
+ * the width in columns of the longest filename in that list (between 15
+ * and COLS), and set width to the number of files that we can display
+ * per line.  And sort the list too. */
+void read_the_list(const char *path, DIR *dir)
+{
+    const struct dirent *nextdir;
+    size_t i = 0, path_len = strlen(path);
+
+    assert(path != NULL && path[strlen(path) - 1] == '/' && dir != NULL);
+
+    longest = 0;
+
+    /* Find the length of the longest filename in the current folder. */
+    while ((nextdir = readdir(dir)) != NULL) {
+	size_t name_len = strlenpt(nextdir->d_name);
+
+	if (name_len > longest)
+	    longest = name_len;
+
+	i++;
+    }
+
+    /* Put 10 characters' worth of blank space between columns of filenames
+     * in the list whenever possible, as Pico does. */
+    longest += 10;
+
+    /* If needed, make room for ".. (parent dir)". */
+    if (longest < 15)
+	longest = 15;
+    /* Make sure we're not wider than the window. */
+    if (longest > COLS)
+	longest = COLS;
+
+    rewinddir(dir);
+
+    free_chararray(filelist, filelist_len);
+
+    filelist_len = i;
+
+    filelist = (char **)nmalloc(filelist_len * sizeof(char *));
+
+    i = 0;
+
+    while ((nextdir = readdir(dir)) != NULL && i < filelist_len) {
+	/* Don't show the "." entry. */
+	if (strcmp(nextdir->d_name, ".") == 0)
+	    continue;
+
+	filelist[i] = charalloc(path_len + strlen(nextdir->d_name) + 1);
+	sprintf(filelist[i], "%s%s", path, nextdir->d_name);
+
+	i++;
+    }
+
+    /* Maybe the number of files in the directory changed between the
+     * first time we scanned and the second.  i is the actual length of
+     * filelist, so record it. */
+    filelist_len = i;
+
+    assert(filelist != NULL);
+
+    /* Sort the list of names. */
+    qsort(filelist, filelist_len, sizeof(char *), diralphasort);
+
+    /* Calculate how many files fit on a line -- feigning room for two
+     * spaces beyond the right edge, and adding two spaces of padding
+     * between columns. */
+    width = (COLS + 2) / (longest + 2);
+}
+
+/* Return the function that is bound to the given key, accepting certain
+ * plain characters too, for compatibility with Pico. */
+functionptrtype parse_browser_input(int *kbinput)
+{
+    if (!meta_key) {
+	switch (*kbinput) {
+	    case ' ':
+		return do_page_down;
+	    case '-':
+		return do_page_up;
+	    case '?':
+		return do_help_void;
+	    case 'E':
+	    case 'e':
+		return do_exit;
+	    case 'G':
+	    case 'g':
+		return goto_dir_void;
+	    case 'S':
+	    case 's':
+		return do_enter;
+	    case 'W':
+	    case 'w':
+		return do_search;
+	}
+    }
+    return func_from_key(kbinput);
+}
+
+/* Set width to the number of files that we can display per line, if
+ * necessary, and display the list of files. */
+void browser_refresh(void)
+{
+    size_t i;
+    int line = 0, col = 0;
+	/* The current line and column while the list is getting displayed. */
+    int the_line = 0, the_column = 0;
+	/* The line and column of the selected item. */
+    char *info;
+	/* The additional information that we'll display about a file. */
+
+    titlebar(present_path);
+    blank_edit();
+
+    wmove(edit, 0, 0);
+
+    i = selected - selected % (editwinrows * width);
+
+    for (; i < filelist_len && line < editwinrows; i++) {
+	struct stat st;
+	const char *thename = tail(filelist[i]);
+		/* The filename we display, minus the path. */
+	size_t namelen = strlenpt(thename);
+		/* The length of the filename in columns. */
+	size_t infolen;
+		/* The length of the file information in columns. */
+	int infomaxlen = 7;
+		/* The maximum length of the file information in columns:
+		 * normally seven, but will be twelve for "(parent dir)". */
+	bool dots = (COLS >= 15 && namelen >= longest - infomaxlen);
+		/* Whether to put an ellipsis before the filename?  We don't
+		 * waste space on dots when there are fewer than 15 columns. */
+	char *disp = display_string(thename, dots ?
+		namelen + infomaxlen + 4 - longest : 0, longest, FALSE);
+		/* The filename (or a fragment of it) in displayable format.
+		 * When a fragment, account for dots plus one space padding. */
+
+	/* If this is the selected item, start its highlighting, and
+	 * remember its location to be able to place the cursor on it. */
+	if (i == selected) {
+	    wattron(edit, hilite_attribute);
+	    the_line = line;
+	    the_column = col;
+	}
+
+	blank_line(edit, line, col, longest);
+
+	/* If the name is too long, we display something like "...ename". */
+	if (dots)
+	    mvwaddstr(edit, line, col, "...");
+	mvwaddstr(edit, line, dots ? col + 3 : col, disp);
+
+	free(disp);
+
+	col += longest;
+
+	/* Show information about the file: "--" for symlinks (except when
+	 * they point to a directory) and for files that have disappeared,
+	 * "(dir)" for directories, and the file size for normal files. */
+	if (lstat(filelist[i], &st) == -1 || S_ISLNK(st.st_mode)) {
+	    if (stat(filelist[i], &st) == -1 || !S_ISDIR(st.st_mode))
+		info = mallocstrcpy(NULL, "--");
+	    else
+		/* TRANSLATORS: Try to keep this at most 7 characters. */
+		info = mallocstrcpy(NULL, _("(dir)"));
+	} else if (S_ISDIR(st.st_mode)) {
+	    if (strcmp(thename, "..") == 0) {
+		/* TRANSLATORS: Try to keep this at most 12 characters. */
+		info = mallocstrcpy(NULL, _("(parent dir)"));
+		infomaxlen = 12;
+	    } else
+		info = mallocstrcpy(NULL, _("(dir)"));
+	} else {
+	    off_t result = st.st_size;
+	    char modifier;
+
+	    info = charalloc(infomaxlen + 1);
+
+	    /* Massage the file size into a human-readable form. */
+	    if (st.st_size < (1 << 10))
+		modifier = ' ';  /* bytes */
+	    else if (st.st_size < (1 << 20)) {
+		result >>= 10;
+		modifier = 'K';  /* kilobytes */
+	    } else if (st.st_size < (1 << 30)) {
+		result >>= 20;
+		modifier = 'M';  /* megabytes */
+	    } else {
+		result >>= 30;
+		modifier = 'G';  /* gigabytes */
+	    }
+
+	    /* Show the size if less than a terabyte, else show "(huge)". */
+	    if (result < (1 << 10))
+		sprintf(info, "%4ju %cB", (intmax_t)result, modifier);
+	    else
+		/* TRANSLATORS: Try to keep this at most 7 characters.
+		 * If necessary, you can leave out the parentheses. */
+		info = mallocstrcpy(info, _("(huge)"));
+	}
+
+	/* Make sure info takes up no more than infomaxlen columns. */
+	infolen = strlenpt(info);
+	if (infolen > infomaxlen) {
+	    null_at(&info, actual_x(info, infomaxlen));
+	    infolen = infomaxlen;
+	}
+
+	mvwaddstr(edit, line, col - infolen, info);
+
+	/* If this is the selected item, finish its highlighting. */
+	if (i == selected)
+	    wattroff(edit, hilite_attribute);
+
+	free(info);
+
+	/* Add some space between the columns. */
+	col += 2;
+
+	/* If the next entry isn't going to fit on the current line,
+	 * move to the next line. */
+	if (col > COLS - longest) {
+	    line++;
+	    col = 0;
+	}
+    }
+
+    /* If requested, put the cursor on the selected item and switch it on. */
+    if (ISSET(SHOW_CURSOR)) {
+	wmove(edit, the_line, the_column);
+	curs_set(1);
+    }
+
+    wnoutrefresh(edit);
+}
+
+/* Look for needle.  If we find it, set selected to its location.
+ * Note that needle must be an exact match for a file in the list. */
+void browser_select_dirname(const char *needle)
+{
+    size_t looking_at = 0;
+
+    for (; looking_at < filelist_len; looking_at++) {
+	if (strcmp(filelist[looking_at], needle) == 0) {
+	    selected = looking_at;
+	    break;
+	}
+    }
+
+    /* If the sought name isn't found, move the highlight so that the
+     * changed selection will be noticed. */
+    if (looking_at == filelist_len) {
+	--selected;
+
+	/* Make sure we stay within the available range. */
+	if (selected >= filelist_len)
+	    selected = filelist_len - 1;
+    }
+}
+
+/* Set up the system variables for a filename search.  Return -1 or -2 if
+ * the search should be canceled (due to Cancel or a blank search string),
+ * return 0 when we have a string, and return a positive value when some
+ * function was run. */
+int filesearch_init(void)
+{
+    int input;
+    char *buf;
+
+    if (*last_search != '\0') {
+	char *disp = display_string(last_search, 0, COLS / 3, FALSE);
+
+	buf = charalloc(strlen(disp) + 7);
+	/* We use (COLS / 3) here because we need to see more on the line. */
+	sprintf(buf, " [%s%s]", disp,
+		(strlenpt(last_search) > COLS / 3) ? "..." : "");
+	free(disp);
+    } else
+	buf = mallocstrcpy(NULL, "");
+
+    /* This is now one simple call.  It just does a lot. */
+    input = do_prompt(FALSE, FALSE, MWHEREISFILE, NULL,
+#ifndef DISABLE_HISTORIES
+		&search_history,
+#endif
+		browser_refresh, "%s%s", _("Search"), buf);
+
+    /* Release buf now that we don't need it anymore. */
+    free(buf);
+
+    /* If only Enter was pressed but we have a previous string, it's okay. */
+    if (input == -2 && *last_search != '\0')
+	return 0;
+
+    /* Otherwise negative inputs are a bailout. */
+    if (input < 0)
+	statusbar(_("Cancelled"));
+
+    return input;
+}
+
+/* Look for the given needle in the list of files. */
+void findnextfile(const char *needle)
+{
+    size_t looking_at = selected;
+	/* The location in the file list of the filename we're looking at. */
+    const char *thename;
+	/* The plain filename, without the path. */
+    unsigned stash[sizeof(flags) / sizeof(flags[0])];
+	/* A storage place for the current flag settings. */
+
+    /* Save the settings of all flags. */
+    memcpy(stash, flags, sizeof(flags));
+
+    /* Search forward, case insensitive, and without regexes. */
+    UNSET(BACKWARDS_SEARCH);
+    UNSET(CASE_SENSITIVE);
+    UNSET(USE_REGEXP);
+
+    /* Step through each filename in the list until a match is found or
+     * we've come back to the point where we started. */
+    while (TRUE) {
+	/* Move to the next filename in the list, or back to the first. */
+	if (looking_at < filelist_len - 1)
+	    looking_at++;
+	else {
+	    looking_at = 0;
+	    statusbar(_("Search Wrapped"));
+	}
+
+	/* Get the bare filename, without the path. */
+	thename = tail(filelist[looking_at]);
+
+	/* If the needle matches, we're done.  And if we're back at the file
+	 * where we started, it is the only occurrence. */
+	if (strstrwrapper(thename, needle, thename)) {
+	    if (looking_at == selected)
+		statusbar(_("This is the only occurrence"));
+	    break;
+	}
+
+	/* If we're back at the beginning and didn't find any match... */
+	if (looking_at == selected) {
+	    not_found_msg(needle);
+	    break;
+	}
+    }
+
+    /* Restore the settings of all flags. */
+    memcpy(flags, stash, sizeof(flags));
+
+    /* Select the one we've found. */
+    selected = looking_at;
+}
+
+/* Search for a filename. */
+void do_filesearch(void)
+{
+    /* If the user cancelled or jumped to first or last file, don't search. */
+    if (filesearch_init() != 0)
+	return;
+
+    /* If answer is now "", copy last_search into answer. */
+    if (*answer == '\0')
+	answer = mallocstrcpy(answer, last_search);
+    else
+	last_search = mallocstrcpy(last_search, answer);
+
+#ifndef DISABLE_HISTORIES
+    /* If answer is not empty, add the string to the search history list. */
+    if (*answer != '\0')
+	update_history(&search_history, answer);
+#endif
+
+    findnextfile(answer);
+}
+
+/* Search again for the last given filename, without prompting. */
+void do_fileresearch(void)
+{
+    if (*last_search == '\0')
+	statusbar(_("No current search pattern"));
+    else
+	findnextfile(last_search);
+}
+
+/* Select the first file in the list. */
+void do_first_file(void)
+{
+    selected = 0;
+}
+
+/* Select the last file in the list. */
+void do_last_file(void)
+{
+    selected = filelist_len - 1;
+}
+
+/* Strip one directory from the end of path, and return the stripped
+ * path.  The returned string is dynamically allocated, and should be
+ * freed. */
+char *striponedir(const char *path)
+{
+    char *retval, *tmp;
+
+    retval = mallocstrcpy(NULL, path);
+
+    tmp = strrchr(retval, '/');
+
+    if (tmp != NULL)
+	null_at(&retval, tmp - retval);
+
+    return retval;
+}
+
+#endif /* !DISABLE_BROWSER */

src/color.c

@@ -1,132 +1,503 @@
-/* $Id$ */
 /**************************************************************************
- *   color.c                                                              *
+ *   color.c  --  This file is part of GNU nano.                          *
  *                                                                        *
- *   Copyright (C) 1999-2005 Chris Allegretta                             *
- *   This program is free software; you can redistribute it and/or modify *
- *   it under the terms of the GNU General Public License as published by *
- *   the Free Software Foundation; either version 2, or (at your option)  *
- *   any later version.                                                   *
+ *   Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009,  *
+ *   2010, 2011, 2013, 2014, 2015 Free Software Foundation, Inc.          *
+ *   Copyright (C) 2014, 2015, 2016 Benno Schulenberg                     *
  *                                                                        *
- *   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.                         *
+ *   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 3 of the License,    *
+ *   or (at your option) any later version.                               *
+ *                                                                        *
+ *   GNU nano 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, write to the Free Software          *
- *   Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.            *
+ *   along with this program.  If not, see http://www.gnu.org/licenses/.  *
  *                                                                        *
  **************************************************************************/
 
-#ifdef HAVE_CONFIG_H
-#include <config.h>
+#include "proto.h"
+
+#include <stdio.h>
+#include <string.h>
+#include <errno.h>
+#include <time.h>
+#include <unistd.h>
+
+#ifdef HAVE_MAGIC_H
+#include <magic.h>
 #endif
 
-#include <stdlib.h>
-#include <string.h>
-#include <stdio.h>
-#include <errno.h>
-#include <fcntl.h>
-#include "proto.h"
-#include "nano.h"
+#ifndef DISABLE_COLOR
 
-#ifdef ENABLE_COLOR
-
-/* For each syntax list entry, we go through the list of colors and
- * assign color pairs. */
+/* Initialize the colors for nano's interface, and assign pair numbers
+ * for the colors in each syntax. */
 void set_colorpairs(void)
 {
-    const syntaxtype *this_syntax = syntaxes;
+    const syntaxtype *sint;
+    bool using_defaults = FALSE;
+    short foreground, background;
+    size_t i;
 
-    for (; this_syntax != NULL; this_syntax = this_syntax->next) {
-	colortype *this_color = this_syntax->color;
-	int color_pair = 1;
+    /* Tell ncurses to enable colors. */
+    start_color();
 
-	for (; this_color != NULL; this_color = this_color->next) {
-	    const colortype *beforenow = this_syntax->color;
+#ifdef HAVE_USE_DEFAULT_COLORS
+    /* Allow using the default colors, if available. */
+    using_defaults = (use_default_colors() != ERR);
+#endif
 
-	    for (; beforenow != this_color &&
-		(beforenow->fg != this_color->fg ||
-		beforenow->bg != this_color->bg ||
-		beforenow->bright != this_color->bright);
-		beforenow = beforenow->next)
-		;
+    /* Initialize the color pairs for nano's interface elements. */
+    for (i = 0; i < NUMBER_OF_ELEMENTS; i++) {
+	bool bright = FALSE;
 
-	    if (beforenow != this_color)
-		this_color->pairnum = beforenow->pairnum;
+	if (parse_color_names(specified_color_combo[i],
+			&foreground, &background, &bright)) {
+	    if (foreground == -1 && !using_defaults)
+		foreground = COLOR_WHITE;
+	    if (background == -1 && !using_defaults)
+		background = COLOR_BLACK;
+	    init_pair(i + 1, foreground, background);
+	    interface_color_pair[i] =
+			COLOR_PAIR(i + 1) | (bright ? A_BOLD : A_NORMAL);
+	}
+	else {
+	    if (i != FUNCTION_TAG)
+		interface_color_pair[i] = hilite_attribute;
+	    else
+		interface_color_pair[i] = A_NORMAL;
+	}
+
+	free(specified_color_combo[i]);
+	specified_color_combo[i] = NULL;
+    }
+
+    /* For each syntax, go through its list of colors and assign each
+     * its pair number, giving identical color pairs the same number. */
+    for (sint = syntaxes; sint != NULL; sint = sint->next) {
+	colortype *ink;
+	int new_number = NUMBER_OF_ELEMENTS + 1;
+
+	for (ink = sint->color; ink != NULL; ink = ink->next) {
+	    const colortype *beforenow = sint->color;
+
+	    while (beforenow != ink && (beforenow->fg != ink->fg ||
+					beforenow->bg != ink->bg ||
+					beforenow->bright != ink->bright))
+		beforenow = beforenow->next;
+
+	    if (beforenow != ink)
+		ink->pairnum = beforenow->pairnum;
+	    else
+		ink->pairnum = new_number++;
+
+	    ink->attributes = COLOR_PAIR(ink->pairnum) |
+				(ink->bright ? A_BOLD : A_NORMAL);
+	}
+    }
+}
+
+/* Initialize the color information. */
+void color_init(void)
+{
+    const colortype *ink;
+    bool using_defaults = FALSE;
+    short foreground, background;
+
+    /* If the terminal is not capable of colors, forget it. */
+    if (!has_colors())
+	return;
+
+#ifdef HAVE_USE_DEFAULT_COLORS
+    /* Allow using the default colors, if available. */
+    using_defaults = (use_default_colors() != ERR);
+#endif
+
+    /* For each coloring expression, initialize the color pair. */
+    for (ink = openfile->colorstrings; ink != NULL; ink = ink->next) {
+	foreground = ink->fg;
+	background = ink->bg;
+
+	if (foreground == -1 && !using_defaults)
+	    foreground = COLOR_WHITE;
+
+	if (background == -1 && !using_defaults)
+	    background = COLOR_BLACK;
+
+	init_pair(ink->pairnum, foreground, background);
+#ifdef DEBUG
+	fprintf(stderr, "init_pair(): fg = %hd, bg = %hd\n", foreground, background);
+#endif
+    }
+}
+
+/* Try to match the given shibboleth string with one of the regexes in
+ * the list starting at head.  Return TRUE upon success. */
+bool found_in_list(regexlisttype *head, const char *shibboleth)
+{
+    regexlisttype *item;
+    regex_t rgx;
+
+    for (item = head; item != NULL; item = item->next) {
+	regcomp(&rgx, fixbounds(item->full_regex), NANO_REG_EXTENDED);
+
+	if (regexec(&rgx, shibboleth, 0, NULL, 0) == 0) {
+	    regfree(&rgx);
+	    return TRUE;
+	}
+
+	regfree(&rgx);
+    }
+
+    return FALSE;
+}
+
+/* Update the color information based on the current filename and content. */
+void color_update(void)
+{
+    syntaxtype *sint = NULL;
+    colortype *ink;
+
+    /* If the rcfiles were not read, or contained no syntaxes, get out. */
+    if (syntaxes == NULL)
+	return;
+
+    /* If we specified a syntax-override string, use it. */
+    if (syntaxstr != NULL) {
+	/* An override of "none" is like having no syntax at all. */
+	if (strcmp(syntaxstr, "none") == 0)
+	    return;
+
+	for (sint = syntaxes; sint != NULL; sint = sint->next) {
+	    if (strcmp(sint->name, syntaxstr) == 0)
+		break;
+	}
+
+	if (sint == NULL)
+	    statusline(ALERT, _("Unknown syntax name: %s"), syntaxstr);
+    }
+
+    /* If no syntax-override string was specified, or it didn't match,
+     * try finding a syntax based on the filename (extension). */
+    if (sint == NULL) {
+	char *reserved = charalloc(PATH_MAX + 1);
+	char *currentdir = getcwd(reserved, PATH_MAX + 1);
+	char *joinednames = charalloc(PATH_MAX + 1);
+	char *fullname = NULL;
+
+	if (currentdir == NULL)
+	    free(reserved);
+	else {
+	    /* Concatenate the current working directory with the
+	     * specified filename, and canonicalize the result. */
+	    sprintf(joinednames, "%s/%s", currentdir, openfile->filename);
+	    fullname = get_full_path(joinednames);
+	    free(currentdir);
+	}
+
+	if (fullname == NULL)
+	    fullname = mallocstrcpy(fullname, openfile->filename);
+
+	for (sint = syntaxes; sint != NULL; sint = sint->next) {
+	    if (found_in_list(sint->extensions, fullname))
+		break;
+	}
+
+	free(joinednames);
+	free(fullname);
+    }
+
+    /* If the filename didn't match anything, try the first line. */
+    if (sint == NULL) {
+#ifdef DEBUG
+	fprintf(stderr, "No result from file extension, trying headerline...\n");
+#endif
+	for (sint = syntaxes; sint != NULL; sint = sint->next) {
+	    if (found_in_list(sint->headers, openfile->fileage->data))
+		break;
+	}
+    }
+
+#ifdef HAVE_LIBMAGIC
+    /* If we still don't have an answer, try using magic. */
+    if (sint == NULL) {
+	struct stat fileinfo;
+	magic_t cookie = NULL;
+	const char *magicstring = NULL;
+#ifdef DEBUG
+	fprintf(stderr, "No result from headerline either, trying libmagic...\n");
+#endif
+	if (stat(openfile->filename, &fileinfo) == 0) {
+	    /* Open the magic database and get a diagnosis of the file. */
+	    cookie = magic_open(MAGIC_SYMLINK |
+#ifdef DEBUG
+				    MAGIC_DEBUG | MAGIC_CHECK |
+#endif
+				    MAGIC_ERROR);
+	    if (cookie == NULL || magic_load(cookie, NULL) < 0)
+		statusline(ALERT, _("magic_load() failed: %s"), strerror(errno));
 	    else {
-		this_color->pairnum = color_pair;
-		color_pair++;
+		magicstring = magic_file(cookie, openfile->filename);
+		if (magicstring == NULL)
+		    statusline(ALERT, _("magic_file(%s) failed: %s"),
+				openfile->filename, magic_error(cookie));
+#ifdef DEBUG
+		fprintf(stderr, "Returned magic string is: %s\n", magicstring);
+#endif
+	    }
+	}
+
+	/* Now try and find a syntax that matches the magic string. */
+	if (magicstring != NULL) {
+	    for (sint = syntaxes; sint != NULL; sint = sint->next) {
+		if (found_in_list(sint->magics, magicstring))
+		    break;
+	    }
+	}
+
+	if (stat(openfile->filename, &fileinfo) == 0)
+	    magic_close(cookie);
+    }
+#endif /* HAVE_LIBMAGIC */
+
+    /* If nothing at all matched, see if there is a default syntax. */
+    if (sint == NULL) {
+	for (sint = syntaxes; sint != NULL; sint = sint->next) {
+	    if (strcmp(sint->name, "default") == 0)
+		break;
+	}
+    }
+
+    openfile->syntax = sint;
+    openfile->colorstrings = (sint == NULL ? NULL : sint->color);
+
+    /* If a syntax was found, compile its specified regexes (which have
+     * already been checked for validity when they were read in). */
+    for (ink = openfile->colorstrings; ink != NULL; ink = ink->next) {
+	if (ink->start == NULL) {
+	    ink->start = (regex_t *)nmalloc(sizeof(regex_t));
+	    regcomp(ink->start, fixbounds(ink->start_regex), ink->rex_flags);
+	}
+
+	if (ink->end_regex != NULL && ink->end == NULL) {
+	    ink->end = (regex_t *)nmalloc(sizeof(regex_t));
+	    regcomp(ink->end, fixbounds(ink->end_regex), ink->rex_flags);
+	}
+    }
+}
+
+/* Reset the multiline coloring cache for one specific regex (given by
+ * index) for lines that need reevaluation. */
+void reset_multis_for_id(filestruct *fileptr, int index)
+{
+    filestruct *row;
+
+    /* Reset the cache of earlier lines, as far back as needed. */
+    for (row = fileptr->prev; row != NULL; row = row->prev) {
+	alloc_multidata_if_needed(row);
+	if (row->multidata[index] == CNONE)
+	    break;
+	row->multidata[index] = -1;
+    }
+    for (; row != NULL; row = row->prev) {
+	alloc_multidata_if_needed(row);
+	if (row->multidata[index] != CNONE)
+	    break;
+	row->multidata[index] = -1;
+    }
+
+    /* Reset the cache of the current line. */
+    fileptr->multidata[index] = -1;
+
+    /* Reset the cache of later lines, as far ahead as needed. */
+    for (row = fileptr->next; row != NULL; row = row->next) {
+	alloc_multidata_if_needed(row);
+	if (row->multidata[index] == CNONE)
+	    break;
+	row->multidata[index] = -1;
+    }
+    for (; row != NULL; row = row->next) {
+	alloc_multidata_if_needed(row);
+	if (row->multidata[index] != CNONE)
+	    break;
+	row->multidata[index] = -1;
+    }
+
+    refresh_needed = TRUE;
+}
+
+/* Reset multi-line strings around the filestruct fileptr, trying to be
+ * smart about stopping.  Bool force means: reset everything regardless,
+ * useful when we don't know how much screen state has changed. */
+void reset_multis(filestruct *fileptr, bool force)
+{
+    const colortype *ink;
+    int nobegin = 0, noend = 0;
+    regmatch_t startmatch, endmatch;
+
+    /* If there is no syntax or no multiline regex, there is nothing to do. */
+    if (openfile->syntax == NULL || openfile->syntax->nmultis == 0)
+	return;
+
+    for (ink = openfile->colorstrings; ink != NULL; ink = ink->next) {
+	/* If it's not a multi-line regex, amscray. */
+	if (ink->end == NULL)
+	    continue;
+
+	alloc_multidata_if_needed(fileptr);
+
+	if (force == FALSE) {
+	    /* Check whether the multidata still matches the current situation. */
+	    nobegin = regexec(ink->start, fileptr->data, 1, &startmatch, 0);
+	    noend = regexec(ink->end, fileptr->data, 1, &endmatch, 0);
+	    if ((fileptr->multidata[ink->id] == CWHOLELINE ||
+			fileptr->multidata[ink->id] == CNONE) &&
+			nobegin && noend)
+		continue;
+	    else if (fileptr->multidata[ink->id] == CSTARTENDHERE &&
+			!nobegin && !noend && startmatch.rm_so < endmatch.rm_so)
+		continue;
+	    else if (fileptr->multidata[ink->id] == CBEGINBEFORE &&
+			nobegin && !noend)
+		continue;
+	    else if (fileptr->multidata[ink->id] == CENDAFTER &&
+			!nobegin && noend)
+		continue;
+	}
+
+	/* If we got here, things have changed. */
+	reset_multis_for_id(fileptr, ink->id);
+
+	/* If start and end are the same, push the resets further. */
+	if (force == FALSE && !nobegin && !noend &&
+				startmatch.rm_so == endmatch.rm_so)
+	    reset_multis_for_id(fileptr, ink->id);
+    }
+}
+
+/* Allocate (for one line) the cache space for multiline color regexes. */
+void alloc_multidata_if_needed(filestruct *fileptr)
+{
+    int i;
+
+    if (fileptr->multidata == NULL) {
+	fileptr->multidata = (short *)nmalloc(openfile->syntax->nmultis * sizeof(short));
+
+	for (i = 0; i < openfile->syntax->nmultis; i++)
+	    fileptr->multidata[i] = -1;
+    }
+}
+
+/* Precalculate the multi-line start and end regex info so we can
+ * speed up rendering (with any hope at all...). */
+void precalc_multicolorinfo(void)
+{
+    const colortype *ink;
+    regmatch_t startmatch, endmatch;
+    filestruct *fileptr, *endptr;
+
+    if (openfile->colorstrings == NULL || ISSET(NO_COLOR_SYNTAX))
+	return;
+
+#ifdef DEBUG
+    fprintf(stderr, "Entering precalculation of multiline color info\n");
+#endif
+
+    for (ink = openfile->colorstrings; ink != NULL; ink = ink->next) {
+	/* If this is not a multi-line regex, skip it. */
+	if (ink->end == NULL)
+	    continue;
+#ifdef DEBUG
+	fprintf(stderr, "Starting work on color id %d\n", ink->id);
+#endif
+
+	for (fileptr = openfile->fileage; fileptr != NULL; fileptr = fileptr->next) {
+	    int startx = 0, nostart = 0;
+#ifdef DEBUG
+	    fprintf(stderr, "working on lineno %ld... ", (long)fileptr->lineno);
+#endif
+	    alloc_multidata_if_needed(fileptr);
+
+	    while ((nostart = regexec(ink->start, &fileptr->data[startx], 1,
+			&startmatch, (startx == 0) ? 0 : REG_NOTBOL)) == 0) {
+		/* Look for an end, and start marking how many lines are
+		 * encompassed, which should speed up rendering later. */
+		startx += startmatch.rm_eo;
+#ifdef DEBUG
+		fprintf(stderr, "start found at pos %lu... ", (unsigned long)startx);
+#endif
+		/* Look first on this line for an end. */
+		if (regexec(ink->end, &fileptr->data[startx], 1,
+			&endmatch, (startx == 0) ? 0 : REG_NOTBOL) == 0) {
+		    startx += endmatch.rm_eo;
+		    /* Step ahead when both start and end are mere anchors. */
+		    if (startmatch.rm_so == startmatch.rm_eo &&
+				endmatch.rm_so == endmatch.rm_eo)
+			startx += 1;
+		    fileptr->multidata[ink->id] = CSTARTENDHERE;
+#ifdef DEBUG
+		    fprintf(stderr, "end found on this line\n");
+#endif
+		    continue;
+		}
+
+		/* Nice, we didn't find the end regex on this line.  Let's start looking for it. */
+		for (endptr = fileptr->next; endptr != NULL; endptr = endptr->next) {
+#ifdef DEBUG
+		    fprintf(stderr, "\nadvancing to line %ld to find end... ", (long)endptr->lineno);
+#endif
+		    if (regexec(ink->end, endptr->data, 1, &endmatch, 0) == 0)
+			break;
+		}
+
+		if (endptr == NULL) {
+#ifdef DEBUG
+		    fprintf(stderr, "no end found, breaking out\n");
+#endif
+		    break;
+		}
+#ifdef DEBUG
+		fprintf(stderr, "end found\n");
+#endif
+		/* We found it, we found it, la la la la la.  Mark all
+		 * the lines in between and the end properly. */
+		fileptr->multidata[ink->id] = CENDAFTER;
+#ifdef DEBUG
+		fprintf(stderr, "marking line %ld as CENDAFTER\n", (long)fileptr->lineno);
+#endif
+		for (fileptr = fileptr->next; fileptr != endptr; fileptr = fileptr->next) {
+		    alloc_multidata_if_needed(fileptr);
+		    fileptr->multidata[ink->id] = CWHOLELINE;
+#ifdef DEBUG
+		    fprintf(stderr, "marking intermediary line %ld as CWHOLELINE\n", (long)fileptr->lineno);
+#endif
+		}
+
+		alloc_multidata_if_needed(endptr);
+		fileptr->multidata[ink->id] = CBEGINBEFORE;
+#ifdef DEBUG
+		fprintf(stderr, "marking line %ld as CBEGINBEFORE\n", (long)fileptr->lineno);
+#endif
+		/* Skip to the end point of the match. */
+		startx = endmatch.rm_eo;
+#ifdef DEBUG
+		fprintf(stderr, "jumping to line %ld pos %lu to continue\n", (long)fileptr->lineno, (unsigned long)startx);
+#endif
+	    }
+
+	    if (nostart && startx == 0) {
+#ifdef DEBUG
+		fprintf(stderr, "no match\n");
+#endif
+		fileptr->multidata[ink->id] = CNONE;
+		continue;
 	    }
 	}
     }
 }
 
-void do_colorinit(void)
-{
-    if (has_colors()) {
-	const colortype *tmpcolor = NULL;
-#ifdef HAVE_USE_DEFAULT_COLORS
-	bool defok;
-#endif
-
-	start_color();
-
-	/* Add in colors, if available. */
-#ifdef HAVE_USE_DEFAULT_COLORS
-	defok = (use_default_colors() != ERR);
-#endif
-
-	for (tmpcolor = colorstrings; tmpcolor != NULL;
-		tmpcolor = tmpcolor->next) {
-	    short background = tmpcolor->bg;
-
-	    if (background == -1)
-#ifdef HAVE_USE_DEFAULT_COLORS
-		if (!defok)
-#endif
-		    background = COLOR_BLACK;
-
-	    init_pair(tmpcolor->pairnum, tmpcolor->fg, background);
-
-#ifdef DEBUG
-	    fprintf(stderr, "init_pair(): fg = %d, bg = %d\n",
-		tmpcolor->fg, tmpcolor->bg);
-#endif
-	}
-    }
-}
-
-/* Update the color information based on the current filename. */
-void update_color(void)
-{
-    const syntaxtype *tmpsyntax;
-
-    colorstrings = NULL;
-    for (tmpsyntax = syntaxes; tmpsyntax != NULL;
-	tmpsyntax = tmpsyntax->next) {
-	const exttype *e;
-
-	for (e = tmpsyntax->extensions; e != NULL; e = e->next) {
-	    /* Set colorstrings if we matched the extension regex. */
-	    if (regexec(&e->val, filename, 0, NULL, 0) == 0)
-		colorstrings = tmpsyntax->color;
-
-	    if (colorstrings != NULL)
-		break;
-	}
-    }
-
-    /* If we haven't found a match, use the override string. */
-    if (colorstrings == NULL && syntaxstr != NULL) {
-	for (tmpsyntax = syntaxes; tmpsyntax != NULL;
-		tmpsyntax = tmpsyntax->next) {
-	    if (strcasecmp(tmpsyntax->desc, syntaxstr) == 0)
-		colorstrings = tmpsyntax->color;
-	}
-    }
-    do_colorinit();
-}
-
-#endif /* ENABLE_COLOR */
+#endif /* !DISABLE_COLOR */

src/cut.c

@@ -1,192 +1,300 @@
-/* $Id$ */
 /**************************************************************************
- *   cut.c                                                                *
+ *   cut.c  --  This file is part of GNU nano.                            *
  *                                                                        *
- *   Copyright (C) 1999-2005 Chris Allegretta                             *
- *   This program is free software; you can redistribute it and/or modify *
- *   it under the terms of the GNU General Public License as published by *
- *   the Free Software Foundation; either version 2, or (at your option)  *
- *   any later version.                                                   *
+ *   Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007,  *
+ *   2008, 2009, 2010, 2011, 2013, 2014 Free Software Foundation, Inc.    *
+ *   Copyright (C) 2014 Mark Majeres                                      *
+ *   Copyright (C) 2016 Benno Schulenberg                                 *
  *                                                                        *
- *   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.                         *
+ *   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 3 of the License,    *
+ *   or (at your option) any later version.                               *
+ *                                                                        *
+ *   GNU nano 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, write to the Free Software          *
- *   Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.            *
+ *   along with this program.  If not, see http://www.gnu.org/licenses/.  *
  *                                                                        *
  **************************************************************************/
 
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
+#include "proto.h"
 
-#include <stdlib.h>
 #include <string.h>
 #include <stdio.h>
-#include <assert.h>
-#include "proto.h"
-#include "nano.h"
 
 static bool keep_cutbuffer = FALSE;
 	/* Should we keep the contents of the cutbuffer? */
-static filestruct *cutbottom = NULL;
-	/* Pointer to end of cutbuffer. */
 
+/* Indicate that we should no longer keep the contents of the cutbuffer. */
 void cutbuffer_reset(void)
 {
     keep_cutbuffer = FALSE;
 }
 
-/* If we're not on the magicline, move all the text of the current line,
- * plus the newline at the end, to the cutbuffer. */
-void cut_line(void)
+/* Return the status of cutbuffer preservation. */
+inline bool keeping_cutbuffer(void)
 {
-    if (current->next != NULL)
-	move_to_filestruct(&cutbuffer, &cutbottom, current, 0,
-		current->next, 0);
+    return keep_cutbuffer;
 }
 
-#ifndef NANO_SMALL
-/* Move all currently marked text to the cutbuffer, and set the current
- * place we want to where the text used to start. */
-void cut_marked(void)
+/* If we aren't on the last line of the file, move all the text of the
+ * current line, plus the newline at the end, into the cutbuffer.  If we
+ * are, move all of the text of the current line into the cutbuffer.  In
+ * both cases, set the current place we want to the beginning of the
+ * current line. */
+void cut_line(void)
+{
+    if (openfile->current != openfile->filebot)
+	move_to_filestruct(&cutbuffer, &cutbottom, openfile->current, 0,
+		openfile->current->next, 0);
+    else
+	move_to_filestruct(&cutbuffer, &cutbottom, openfile->current, 0,
+		openfile->current, strlen(openfile->current->data));
+    openfile->placewewant = 0;
+}
+
+#ifndef NANO_TINY
+/* Move all currently marked text into the cutbuffer, and set the
+ * current place we want to where the text used to start. */
+void cut_marked(bool *right_side_up)
 {
     filestruct *top, *bot;
     size_t top_x, bot_x;
 
     mark_order((const filestruct **)&top, &top_x,
-	(const filestruct **)&bot, &bot_x, NULL);
+		(const filestruct **)&bot, &bot_x, right_side_up);
 
     move_to_filestruct(&cutbuffer, &cutbottom, top, top_x, bot, bot_x);
-    placewewant = xplustabs();
+    openfile->placewewant = xplustabs();
 }
-#endif
 
-/* If we're not at the end of the current line, move all the text from
- * the current cursor position to the end of the current line,
- * not counting the newline at the end, to the cutbuffer.  If we are,
- * and we're not on the magicline, move the newline at the end to the
- * cutbuffer, and set the current place we want to where the newline
- * used to be. */
+/* If we aren't at the end of the current line, move all the text from
+ * the current cursor position to the end of the current line, not
+ * counting the newline at the end, into the cutbuffer.  If we are, and
+ * we're not on the last line of the file, move the newline at the end
+ * into the cutbuffer, and set the current place we want to where the
+ * newline used to be. */
 void cut_to_eol(void)
 {
-    size_t data_len = strlen(current->data);
+    size_t data_len = strlen(openfile->current->data);
 
-    assert(current_x <= data_len);
-
-    if (current_x < data_len)
+    if (openfile->current_x < data_len)
 	/* If we're not at the end of the line, move all the text from
 	 * the current position up to it, not counting the newline at
-	 * the end, to the cutbuffer. */
-	move_to_filestruct(&cutbuffer, &cutbottom, current, current_x,
-		current, data_len);
-    else if (current->next != NULL) {
-	/* If we're at the end of the line, and the next line isn't the
-	 * magicline, move all the text from the current position up to
-	 * the beginning of the next line, i.e, the newline at the
-	 * end, to the cutbuffer. */
-	move_to_filestruct(&cutbuffer, &cutbottom, current, current_x,
-		current->next, 0);
-	placewewant = xplustabs();
+	 * the end, into the cutbuffer. */
+	move_to_filestruct(&cutbuffer, &cutbottom, openfile->current,
+		openfile->current_x, openfile->current, data_len);
+    else if (openfile->current != openfile->filebot) {
+	/* If we're at the end of the line, and it isn't the last line
+	 * of the file, move all the text from the current position up
+	 * to the beginning of the next line, i.e. the newline at the
+	 * end, into the cutbuffer. */
+	move_to_filestruct(&cutbuffer, &cutbottom, openfile->current,
+		openfile->current_x, openfile->current->next, 0);
+	openfile->placewewant = xplustabs();
     }
 }
 
-/* Move text from the current filestruct into the cutbuffer. */
-void do_cut_text(void)
+/* Move all the text from the current cursor position to the end of the
+ * file into the cutbuffer. */
+void cut_to_eof(void)
 {
-    assert(current != NULL && current->data != NULL);
+    move_to_filestruct(&cutbuffer, &cutbottom,
+		openfile->current, openfile->current_x,
+		openfile->filebot, strlen(openfile->filebot->data));
+}
+#endif /* !NANO_TINY */
 
-    check_statusblank();
+/* Move text from the current filestruct into the cutbuffer.  If
+ * copy_text is TRUE, copy the text back into the filestruct afterward.
+ * If cut_till_eof is TRUE, move all text from the current cursor
+ * position to the end of the file into the cutbuffer. */
+void do_cut_text(bool copy_text, bool cut_till_eof)
+{
+#ifndef NANO_TINY
+    filestruct *cb_save = NULL;
+	/* The current end of the cutbuffer, before we add text to it. */
+    size_t cb_save_len = 0;
+	/* The length of the string at the current end of the cutbuffer,
+	 * before we add text to it. */
+    bool old_no_newlines = ISSET(NO_NEWLINES);
+    bool right_side_up = TRUE;
+	/* There *is* no region, *or* it is marked forward. */
+#endif
+    size_t was_totsize = openfile->totsize;
 
-    /* If keep_cutbuffer is FALSE and the cutbuffer isn't empty, blow
-     * away the text in the cutbuffer. */
-    if (!keep_cutbuffer && cutbuffer != NULL) {
+    /* If a chain of cuts was broken, empty the cutbuffer. */
+    if (!keep_cutbuffer) {
 	free_filestruct(cutbuffer);
 	cutbuffer = NULL;
 #ifdef DEBUG
 	fprintf(stderr, "Blew away cutbuffer =)\n");
 #endif
+	/* Indicate that future cuts should add to the cutbuffer. */
+	keep_cutbuffer = TRUE;
     }
 
-    /* Set keep_cutbuffer to TRUE, so that the text we're going to move
-     * into the cutbuffer will be added to the text already in the
-     * cutbuffer instead of replacing it. */
-    keep_cutbuffer = TRUE;
+#ifndef NANO_TINY
+    if (copy_text) {
+	/* If the cutbuffer isn't empty, remember where it currently ends. */
+	if (cutbuffer != NULL) {
+	    cb_save = cutbottom;
+	    cb_save_len = strlen(cutbottom->data);
+	}
+	/* Don't add a magicline when moving text to the cutbuffer. */
+	SET(NO_NEWLINES);
+    }
 
-#ifndef NANO_SMALL
-    if (ISSET(MARK_ISSET)) {
-	/* If the mark is on, move the marked text to the cutbuffer and
-	 * turn the mark off. */
-	cut_marked();
-	UNSET(MARK_ISSET);
-    } else
-#endif
-    if (ISSET(CUT_TO_END))
-	/* Otherwise, if the CUT_TO_END flag is set, move all text up to
-	 * the end of the line into the cutbuffer. */
+    if (cut_till_eof) {
+	/* Move all text up to the end of the file into the cutbuffer. */
+	cut_to_eof();
+    } else if (openfile->mark_set) {
+	/* Move the marked text to the cutbuffer, and turn the mark off. */
+	cut_marked(&right_side_up);
+	openfile->mark_set = FALSE;
+    } else if (ISSET(CUT_TO_END))
+	/* Move all text up to the end of the line into the cutbuffer. */
 	cut_to_eol();
     else
-	/* Otherwise, move the entire line into the cutbuffer. */
+#endif
+	/* Move the entire line into the cutbuffer. */
 	cut_line();
 
-    edit_refresh();
-    set_modified();
+#ifndef NANO_TINY
+    if (copy_text) {
+	/* Copy the text that is in the cutbuffer (starting at its saved end,
+	 * if there is one) back into the current buffer.  This effectively
+	 * uncuts the text we just cut. */
+	if (cutbuffer != NULL) {
+	    if (cb_save != NULL) {
+		cb_save->data += cb_save_len;
+		copy_from_filestruct(cb_save);
+		cb_save->data -= cb_save_len;
+	    } else
+		copy_from_filestruct(cutbuffer);
+
+	    /* If the copied region was marked forward, put the new desired
+	     * x position at its end; otherwise, leave it at its beginning. */
+	    if (right_side_up)
+		openfile->placewewant = xplustabs();
+	}
+	/* Restore the magicline behavior now that we're done fiddling. */
+	if (!old_no_newlines)
+	    UNSET(NO_NEWLINES);
+    } else
+#endif /* !NANO_TINY */
+    /* Only set the modification flag if actually something was cut. */
+    if (openfile->totsize != was_totsize)
+	set_modified();
+
+    refresh_needed = TRUE;
+
+#ifndef DISABLE_COLOR
+    reset_multis(openfile->current, FALSE);
+#endif
 
 #ifdef DEBUG
-    dump_buffer(cutbuffer);
+    dump_filestruct(cutbuffer);
 #endif
 }
 
-#ifndef NANO_SMALL
-/* Cut from the current cursor position to the end of the file. */
-void do_cut_till_end(void)
+/* Move text from the current filestruct into the cutbuffer. */
+void do_cut_text_void(void)
 {
-    assert(current != NULL && current->data != NULL);
-
-    check_statusblank();
-
-    move_to_filestruct(&cutbuffer, &cutbottom, current, current_x,
-	filebot, 0);
-
-    edit_refresh();
-    set_modified();
-
-#ifdef DEBUG
-    dump_buffer(cutbuffer);
+#ifndef NANO_TINY
+    add_undo(CUT);
+#endif
+    do_cut_text(FALSE, FALSE);
+#ifndef NANO_TINY
+    update_undo(CUT);
 #endif
 }
-#endif
+
+#ifndef NANO_TINY
+/* Move text from the current filestruct into the cutbuffer, and copy it
+ * back into the filestruct afterward.  If the mark is set or the cursor
+ * was moved, blow away previous contents of the cutbuffer. */
+void do_copy_text(void)
+{
+    static struct filestruct *next_contiguous_line = NULL;
+    bool mark_set = openfile->mark_set;
+
+    /* Remember the current view port and cursor position. */
+    ssize_t is_edittop_lineno = openfile->edittop->lineno;
+    ssize_t is_current_lineno = openfile->current->lineno;
+    size_t is_current_x = openfile->current_x;
+
+    if (mark_set || openfile->current != next_contiguous_line)
+	cutbuffer_reset();
+
+    do_cut_text(TRUE, FALSE);
+
+    /* If the mark was set, blow away the cutbuffer on the next copy. */
+    next_contiguous_line = (mark_set ? NULL : openfile->current);
+
+    if (mark_set) {
+	/* Restore the view port and cursor position. */
+	openfile->edittop = fsfromline(is_edittop_lineno);
+	openfile->current = fsfromline(is_current_lineno);
+	openfile->current_x = is_current_x;
+    }
+}
+
+/* Cut from the current cursor position to the end of the file. */
+void do_cut_till_eof(void)
+{
+    add_undo(CUT_EOF);
+    do_cut_text(FALSE, TRUE);
+    update_undo(CUT_EOF);
+}
+#endif /* !NANO_TINY */
 
 /* Copy text from the cutbuffer into the current filestruct. */
 void do_uncut_text(void)
 {
-    assert(current != NULL && current->data != NULL);
+    ssize_t was_lineno = openfile->current->lineno;
 
-#ifndef DISABLE_WRAPPING
-    wrap_reset();
-#endif
-
-    check_statusblank();
-
-    /* If the cutbuffer is empty, get out. */
+    /* If the cutbuffer is empty, there is nothing to do. */
     if (cutbuffer == NULL)
 	return;
 
+#ifndef NANO_TINY
+    add_undo(PASTE);
+#endif
+
     /* Add a copy of the text in the cutbuffer to the current filestruct
      * at the current cursor position. */
-    copy_from_filestruct(cutbuffer, cutbottom);
+    copy_from_filestruct(cutbuffer);
 
-    /* Set the current place we want to where the text from the
-     * cutbuffer ends. */
-    placewewant = xplustabs();
+#ifndef NANO_TINY
+    update_undo(PASTE);
+#endif
 
-    edit_refresh();
+    if (openfile->current->lineno - was_lineno < editwinrows)
+	focusing = FALSE;
+
+    /* Set the desired x position to where the pasted text ends. */
+    openfile->placewewant = xplustabs();
+
+    /* Mark the file as modified. */
     set_modified();
 
+    /* Update the cursor position to account for the inserted lines. */
+    reset_cursor();
+
+    ensure_line_is_visible();
+
+    refresh_needed = TRUE;
+
+#ifndef DISABLE_COLOR
+    reset_multis(openfile->current, FALSE);
+#endif
+
 #ifdef DEBUG
-    dump_buffer_reverse();
+    dump_filestruct_reverse();
 #endif
 }

src/help.c

@@ -0,0 +1,537 @@
+/**************************************************************************
+ *   help.c  --  This file is part of GNU nano.                           *
+ *                                                                        *
+ *   Copyright (C) 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008,  *
+ *   2009, 2010, 2011, 2013, 2014 Free Software Foundation, Inc.          *
+ *   Copyright (C) 2014, 2015, 2016 Benno Schulenberg                     *
+ *                                                                        *
+ *   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 3 of the License,    *
+ *   or (at your option) any later version.                               *
+ *                                                                        *
+ *   GNU nano 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/.  *
+ *                                                                        *
+ **************************************************************************/
+
+#include "proto.h"
+
+#include <stdio.h>
+#include <string.h>
+#include <ctype.h>
+
+#ifndef DISABLE_HELP
+
+static char *help_text = NULL;
+	/* The text displayed in the help window. */
+
+static char *end_of_intro = NULL;
+	/* The point in the help text where the introductory paragraphs end
+	 * and the shortcut descriptions begin. */
+
+/* Our main help-viewer function. */
+void do_help(void)
+{
+    int kbinput = ERR;
+    bool old_no_help = ISSET(NO_HELP);
+    size_t line = 0;
+	/* The line number in help_text of the first displayed help
+	 * line.  This variable is zero-based. */
+    size_t last_line = 0;
+	/* The line number in help_text of the last help line.  This
+	 * variable is zero-based. */
+    int oldmenu = currmenu;
+	/* The menu we were called from. */
+    const char *ptr;
+	/* The current line of the help text. */
+    size_t old_line = (size_t)-1;
+	/* The line we were on before the current line. */
+    functionptrtype func;
+	/* The function of the key the user typed in. */
+
+    /* Don't show a cursor in the help screen. */
+    curs_set(0);
+    blank_edit();
+    blank_statusbar();
+
+    /* Set help_text as the string to display. */
+    help_init();
+
+    assert(help_text != NULL);
+
+    if (ISSET(NO_HELP)) {
+	/* Make sure that the help screen's shortcut list will actually
+	 * be displayed. */
+	UNSET(NO_HELP);
+	window_init();
+    }
+
+    bottombars(MHELP);
+    wnoutrefresh(bottomwin);
+
+    while (TRUE) {
+	size_t i;
+
+	ptr = help_text;
+
+	/* Find the line number of the last line of the help text. */
+	for (last_line = 0; *ptr != '\0'; last_line++) {
+	    ptr += help_line_len(ptr);
+	    if (*ptr == '\n')
+		ptr++;
+	}
+
+	if (last_line > 0)
+	    last_line--;
+
+	/* Redisplay if the text was scrolled or an invalid key was pressed. */
+	if (line != old_line || kbinput == ERR) {
+	    blank_edit();
+
+	    ptr = help_text;
+
+	    /* Advance in the text to the first line to be displayed. */
+	    for (i = 0; i < line; i++) {
+		ptr += help_line_len(ptr);
+		if (*ptr == '\n')
+		    ptr++;
+	    }
+
+	    /* Now display as many lines as the window will hold. */
+	    for (i = 0; i < editwinrows && *ptr != '\0'; i++) {
+		size_t j = help_line_len(ptr);
+
+		mvwaddnstr(edit, i, 0, ptr, j);
+		ptr += j;
+		if (*ptr == '\n')
+		    ptr++;
+	    }
+	}
+
+	wnoutrefresh(edit);
+
+	old_line = line;
+
+	lastmessage = HUSH;
+
+	kbinput = get_kbinput(edit);
+
+#ifndef NANO_TINY
+	if (kbinput == KEY_WINCH) {
+	    kbinput = ERR;
+	    continue;    /* Redraw the screen. */
+	}
+#endif
+
+#ifndef DISABLE_MOUSE
+	if (kbinput == KEY_MOUSE) {
+	    int mouse_x, mouse_y;
+	    get_mouseinput(&mouse_x, &mouse_y, TRUE);
+	    continue;    /* Redraw the screen. */
+	}
+#endif
+
+	func = parse_help_input(&kbinput);
+
+	if (func == total_refresh) {
+	    total_redraw();
+	} else if (func == do_up_void) {
+	    if (line > 0)
+		line--;
+	} else if (func == do_down_void) {
+	    if (line + (editwinrows - 1) < last_line)
+		line++;
+	} else if (func == do_page_up) {
+	    if (line > editwinrows - 2)
+		line -= editwinrows - 2;
+	    else
+		line = 0;
+	} else if (func == do_page_down) {
+	    if (line + (editwinrows - 1) < last_line)
+		line += editwinrows - 2;
+	} else if (func == do_first_line) {
+	    line = 0;
+	} else if (func == do_last_line) {
+	    if (line + (editwinrows - 1) < last_line)
+		line = last_line - (editwinrows - 1);
+	} else if (func == do_exit) {
+	    /* Exit from the help viewer. */
+	    break;
+	} else
+	    unbound_key(kbinput);
+    }
+
+    if (old_no_help) {
+	blank_bottombars();
+	wnoutrefresh(bottomwin);
+	currmenu = oldmenu;
+	SET(NO_HELP);
+	window_init();
+    } else
+	bottombars(oldmenu);
+
+#ifndef DISABLE_BROWSER
+    if (oldmenu == MBROWSER || oldmenu == MWHEREISFILE || oldmenu == MGOTODIR)
+	browser_refresh();
+    else
+#endif
+	edit_refresh();
+
+    /* We're exiting from the help screen. */
+    free(help_text);
+}
+
+/* Allocate space for the help text for the current menu, and concatenate
+ * the different pieces of text into it. */
+void help_init(void)
+{
+    size_t allocsize = 0;
+	/* Space needed for help_text. */
+    const char *htx[3];
+	/* Untranslated help introduction.  We break it up into three chunks
+	 * in case the full string is too long for the compiler to handle. */
+    char *ptr;
+    const subnfunc *f;
+    const sc *s;
+
+#ifndef NANO_TINY
+    bool old_whitespace = ISSET(WHITESPACE_DISPLAY);
+
+    UNSET(WHITESPACE_DISPLAY);
+#endif
+
+    /* First, set up the initial help text for the current function. */
+    if (currmenu == MWHEREIS || currmenu == MREPLACE || currmenu == MREPLACEWITH) {
+	htx[0] = N_("Search Command Help Text\n\n "
+		"Enter the words or characters you would like to "
+		"search for, and then press Enter.  If there is a "
+		"match for the text you entered, the screen will be "
+		"updated to the location of the nearest match for the "
+		"search string.\n\n The previous search string will be "
+		"shown in brackets after the search prompt.  Hitting "
+		"Enter without entering any text will perform the "
+		"previous search.  ");
+	htx[1] = N_("If you have selected text with the mark and then "
+		"search to replace, only matches in the selected text "
+		"will be replaced.\n\n The following function keys are "
+		"available in Search mode:\n\n");
+	htx[2] = NULL;
+    } else if (currmenu == MGOTOLINE) {
+	htx[0] = N_("Go To Line Help Text\n\n "
+		"Enter the line number that you wish to go to and hit "
+		"Enter.  If there are fewer lines of text than the "
+		"number you entered, you will be brought to the last "
+		"line of the file.\n\n The following function keys are "
+		"available in Go To Line mode:\n\n");
+	htx[1] = NULL;
+	htx[2] = NULL;
+    } else if (currmenu == MINSERTFILE) {
+	htx[0] = N_("Insert File Help Text\n\n "
+		"Type in the name of a file to be inserted into the "
+		"current file buffer at the current cursor "
+		"location.\n\n If you have compiled nano with multiple "
+		"file buffer support, and enable multiple file buffers "
+		"with the -F or --multibuffer command line flags, the "
+		"Meta-F toggle, or a nanorc file, inserting a file "
+		"will cause it to be loaded into a separate buffer "
+		"(use Meta-< and > to switch between file buffers).  ");
+	htx[1] = N_("If you need another blank buffer, do not enter "
+		"any filename, or type in a nonexistent filename at "
+		"the prompt and press Enter.\n\n The following "
+		"function keys are available in Insert File mode:\n\n");
+	htx[2] = NULL;
+    } else if (currmenu == MWRITEFILE) {
+	htx[0] = N_("Write File Help Text\n\n "
+		"Type the name that you wish to save the current file "
+		"as and press Enter to save the file.\n\n If you have "
+		"selected text with the mark, you will be prompted to "
+		"save only the selected portion to a separate file.  To "
+		"reduce the chance of overwriting the current file with "
+		"just a portion of it, the current filename is not the "
+		"default in this mode.\n\n The following function keys "
+		"are available in Write File mode:\n\n");
+	htx[1] = NULL;
+	htx[2] = NULL;
+    }
+#ifndef DISABLE_BROWSER
+    else if (currmenu == MBROWSER) {
+	htx[0] = N_("File Browser Help Text\n\n "
+		"The file browser is used to visually browse the "
+		"directory structure to select a file for reading "
+		"or writing.  You may use the arrow keys or Page Up/"
+		"Down to browse through the files, and S or Enter to "
+		"choose the selected file or enter the selected "
+		"directory.  To move up one level, select the "
+		"directory called \"..\" at the top of the file "
+		"list.\n\n The following function keys are available "
+		"in the file browser:\n\n");
+	htx[1] = NULL;
+	htx[2] = NULL;
+    } else if (currmenu == MWHEREISFILE) {
+	htx[0] = N_("Browser Search Command Help Text\n\n "
+		"Enter the words or characters you would like to "
+		"search for, and then press Enter.  If there is a "
+		"match for the text you entered, the screen will be "
+		"updated to the location of the nearest match for the "
+		"search string.\n\n The previous search string will be "
+		"shown in brackets after the search prompt.  Hitting "
+		"Enter without entering any text will perform the "
+		"previous search.\n\n");
+	htx[1] = N_(" The following function keys are available in "
+		"Browser Search mode:\n\n");
+	htx[2] = NULL;
+    } else if (currmenu == MGOTODIR) {
+	htx[0] = N_("Browser Go To Directory Help Text\n\n "
+		"Enter the name of the directory you would like to "
+		"browse to.\n\n If tab completion has not been "
+		"disabled, you can use the Tab key to (attempt to) "
+		"automatically complete the directory name.\n\n The "
+		"following function keys are available in Browser Go "
+		"To Directory mode:\n\n");
+	htx[1] = NULL;
+	htx[2] = NULL;
+    }
+#endif /* !DISABLE_BROWSER */
+#ifndef DISABLE_SPELLER
+    else if (currmenu == MSPELL) {
+	htx[0] = N_("Spell Check Help Text\n\n "
+		"The spell checker checks the spelling of all text in "
+		"the current file.  When an unknown word is "
+		"encountered, it is highlighted and a replacement can "
+		"be edited.  It will then prompt to replace every "
+		"instance of the given misspelled word in the current "
+		"file, or, if you have selected text with the mark, in "
+		"the selected text.\n\n The following function keys "
+		"are available in Spell Check mode:\n\n");
+	htx[1] = NULL;
+	htx[2] = NULL;
+    }
+#endif /* !DISABLE_SPELLER */
+#ifndef NANO_TINY
+    else if (currmenu == MEXTCMD) {
+	htx[0] = N_("Execute Command Help Text\n\n "
+		"This mode allows you to insert the output of a "
+		"command run by the shell into the current buffer (or "
+		"a new buffer in multiple file buffer mode).  If you "
+		"need another blank buffer, do not enter any "
+		"command.\n\n The following function keys are "
+		"available in Execute Command mode:\n\n");
+	htx[1] = NULL;
+	htx[2] = NULL;
+    }
+#endif /* !NANO_TINY */
+    else {
+	/* Default to the main help list. */
+	htx[0] = N_("Main nano help text\n\n "
+		"The nano editor is designed to emulate the "
+		"functionality and ease-of-use of the UW Pico text "
+		"editor.  There are four main sections of the editor.  "
+		"The top line shows the program version, the current "
+		"filename being edited, and whether or not the file "
+		"has been modified.  Next is the main editor window "
+		"showing the file being edited.  The status line is "
+		"the third line from the bottom and shows important "
+		"messages.  ");
+	htx[1] = N_("The bottom two lines show the most commonly used "
+		"shortcuts in the editor.\n\n Shortcuts are written as "
+		"follows: Control-key sequences are notated with a '^' "
+		"and can be entered either by using the Ctrl key or "
+		"pressing the Esc key twice.  Meta-key sequences are "
+		"notated with 'M-' and can be entered using either the "
+		"Alt, Cmd, or Esc key, depending on your keyboard setup.  ");
+	htx[2] = N_("Also, pressing Esc twice and then typing a "
+		"three-digit decimal number from 000 to 255 will enter "
+		"the character with the corresponding value.  The "
+		"following keystrokes are available in the main editor "
+		"window.  Alternative keys are shown in "
+		"parentheses:\n\n");
+    }
+
+    htx[0] = _(htx[0]);
+    if (htx[1] != NULL)
+	htx[1] = _(htx[1]);
+    if (htx[2] != NULL)
+	htx[2] = _(htx[2]);
+
+    allocsize += strlen(htx[0]);
+    if (htx[1] != NULL)
+	allocsize += strlen(htx[1]);
+    if (htx[2] != NULL)
+	allocsize += strlen(htx[2]);
+
+    /* Calculate the length of the shortcut help text.  Each entry has
+     * one or two keys, which fill 16 columns, plus translated text,
+     * plus one or two \n's. */
+    for (f = allfuncs; f != NULL; f = f->next)
+	if (f->menus & currmenu)
+	    allocsize += (16 * mb_cur_max()) + strlen(f->help) + 2;
+
+#ifndef NANO_TINY
+    /* If we're on the main list, we also count the toggle help text.
+     * Each entry has "M-%c\t\t", five chars which fill 16 columns,
+     * plus a space, plus translated text, plus one or two '\n's. */
+    if (currmenu == MMAIN) {
+	size_t endis_len = strlen(_("enable/disable"));
+
+	for (s = sclist; s != NULL; s = s->next)
+	    if (s->scfunc == do_toggle_void)
+		allocsize += strlen(_(flagtostr(s->toggle))) + endis_len + 8;
+    }
+#endif
+
+    /* Allocate space for the help text. */
+    help_text = charalloc(allocsize + 1);
+
+    /* Now add the text we want. */
+    strcpy(help_text, htx[0]);
+    if (htx[1] != NULL)
+	strcat(help_text, htx[1]);
+    if (htx[2] != NULL)
+	strcat(help_text, htx[2]);
+
+    ptr = help_text + strlen(help_text);
+
+    /* Remember this end-of-introduction, start-of-shortcuts. */
+    end_of_intro = ptr;
+
+    /* Now add our shortcut info. */
+    for (f = allfuncs; f != NULL; f = f->next) {
+	int scsfound = 0;
+
+	if ((f->menus & currmenu) == 0)
+	    continue;
+
+	/* Let's simply show the first two shortcuts from the list. */
+	for (s = sclist; s != NULL; s = s->next) {
+
+	    if ((s->menus & currmenu) == 0)
+		continue;
+
+	    if (s->scfunc == f->scfunc) {
+		scsfound++;
+		/* Make the first column narrower (6) than the second (10),
+		 * but allow it to spill into the second, for "M-Space". */
+		if (scsfound == 1) {
+		    sprintf(ptr, "%s              ", s->keystr);
+		    /* Unicode arrows take three bytes instead of one. */
+		    if (s->keystr[1] == '\xE2')
+			ptr += 8;
+		    else
+			ptr += 6;
+		} else {
+		    ptr += sprintf(ptr, "(%s)\t", s->keystr);
+		    break;
+		}
+	    }
+	}
+
+	if (scsfound == 0)
+	    ptr += sprintf(ptr, "\t\t");
+	else if (scsfound == 1)
+	    ptr += 10;
+
+	/* The shortcut's help text. */
+	ptr += sprintf(ptr, "%s\n", _(f->help));
+
+	if (f->blank_after)
+	    ptr += sprintf(ptr, "\n");
+    }
+
+#ifndef NANO_TINY
+    /* And the toggles... */
+    if (currmenu == MMAIN) {
+	int maximum = 0, counter = 0;
+
+	/* First see how many toggles there are. */
+	for (s = sclist; s != NULL; s = s->next)
+	    maximum = (s->toggle && s->ordinal > maximum) ? s->ordinal : maximum;
+
+	/* Now show them in the original order. */
+	while (counter < maximum) {
+	    counter++;
+	    for (s = sclist; s != NULL; s = s->next)
+		if (s->toggle && s->ordinal == counter) {
+		    ptr += sprintf(ptr, "%s\t\t%s %s\n", (s->menus == MMAIN ? s->keystr : ""),
+				_(flagtostr(s->toggle)), _("enable/disable"));
+		    if (s->toggle == NO_COLOR_SYNTAX || s->toggle == TABS_TO_SPACES)
+			ptr += sprintf(ptr, "\n");
+		    break;
+		}
+	}
+    }
+
+    if (old_whitespace)
+	SET(WHITESPACE_DISPLAY);
+#endif /* !NANO_TINY */
+
+    /* If all went well, we didn't overwrite the allocated space. */
+    assert(strlen(help_text) <= allocsize + 1);
+}
+
+/* Return the function that is bound to the given key, accepting certain
+ * plain characters too, for consistency with the file browser. */
+functionptrtype parse_help_input(int *kbinput)
+{
+    if (!meta_key) {
+	switch (*kbinput) {
+	    case ' ':
+		return do_page_down;
+	    case '-':
+		return do_page_up;
+	    case 'E':
+	    case 'e':
+		return do_exit;
+	}
+    }
+    return func_from_key(kbinput);
+}
+
+/* Calculate the displayable length of the help-text line starting at ptr. */
+size_t help_line_len(const char *ptr)
+{
+    size_t wrapping_point = (COLS > 24) ? COLS - 1 : 24;
+	/* The target width for wrapping long lines. */
+    ssize_t wrap_location;
+	/* Actual position where the line can be wrapped. */
+    size_t length = 0;
+	/* Full length of the line, until the first newline. */
+
+    /* Avoid overwide paragraphs in the introductory text. */
+    if (ptr < end_of_intro && COLS > 74)
+	wrapping_point = 74;
+
+    wrap_location = break_line(ptr, wrapping_point, TRUE);
+
+    /* Get the length of the entire line up to a null or a newline. */
+    while (*(ptr + length) != '\0' && *(ptr + length) != '\n')
+	length = move_mbright(ptr, length);
+
+    /* If the entire line will just fit the screen, don't wrap it. */
+    if (strnlenpt(ptr, length) <= wrapping_point + 1)
+	return length;
+    else if (wrap_location > 0)
+	return wrap_location;
+    else
+	return 0;
+}
+
+#endif /* !DISABLE_HELP */
+
+/* Start the help viewer. */
+void do_help_void(void)
+{
+#ifndef DISABLE_HELP
+    do_help();
+#else
+    if (currmenu == MMAIN)
+	say_there_is_no_help();
+    else
+	beep();
+#endif /* !DISABLE_HELP */
+}

src/move.c

@@ -1,290 +1,591 @@
-/* $Id$ */
 /**************************************************************************
- *   move.c                                                               *
+ *   move.c  --  This file is part of GNU nano.                           *
  *                                                                        *
- *   Copyright (C) 1999-2005 Chris Allegretta                             *
- *   This program is free software; you can redistribute it and/or modify *
- *   it under the terms of the GNU General Public License as published by *
- *   the Free Software Foundation; either version 2, or (at your option)  *
- *   any later version.                                                   *
+ *   Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007,  *
+ *   2008, 2009, 2010, 2011, 2013, 2014 Free Software Foundation, Inc.    *
+ *   Copyright (C) 2014, 2015, 2016 Benno Schulenberg                     *
  *                                                                        *
- *   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.                         *
+ *   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 3 of the License,    *
+ *   or (at your option) any later version.                               *
+ *                                                                        *
+ *   GNU nano 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, write to the Free Software          *
- *   Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.            *
+ *   along with this program.  If not, see http://www.gnu.org/licenses/.  *
  *                                                                        *
  **************************************************************************/
 
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
+#include "proto.h"
 
-#include <stdlib.h>
 #include <string.h>
 #include <ctype.h>
-#include <assert.h>
-#include "proto.h"
-#include "nano.h"
 
+/* Move to the first line of the file. */
 void do_first_line(void)
 {
-    size_t pww_save = placewewant;
-    current = fileage;
-    placewewant = 0;
-    current_x = 0;
-    if (edittop != fileage || need_vertical_update(pww_save))
-	edit_update(TOP);
+    openfile->current = openfile->fileage;
+    openfile->current_x = 0;
+    openfile->placewewant = 0;
+
+    refresh_needed = TRUE;
 }
 
+/* Move to the last line of the file. */
 void do_last_line(void)
 {
-    size_t pww_save = placewewant;
-    current = filebot;
-    placewewant = 0;
-    current_x = 0;
-    if (edittop->lineno + (editwinrows / 2) != filebot->lineno ||
-	need_vertical_update(pww_save))
-	edit_update(CENTER);
-}
-
-void do_home(void)
-{
-    size_t pww_save = placewewant;
-#ifndef NANO_SMALL
-    if (ISSET(SMART_HOME)) {
-	size_t current_x_save = current_x;
-
-	current_x = indent_length(current->data);
-
-	if (current_x == current_x_save ||
-		current->data[current_x] == '\0')
-	    current_x = 0;
-
-	placewewant = xplustabs();
-    } else {
-#endif
-	current_x = 0;
-	placewewant = 0;
-#ifndef NANO_SMALL
-    }
-#endif
-    check_statusblank();
-    if (need_horizontal_update(pww_save))
-	update_line(current, current_x);
-}
-
-void do_end(void)
-{
-    size_t pww_save = placewewant;
-    current_x = strlen(current->data);
-    placewewant = xplustabs();
-    check_statusblank();
-    if (need_horizontal_update(pww_save))
-	update_line(current, current_x);
+    openfile->current = openfile->filebot;
+    openfile->current_x = strlen(openfile->filebot->data);
+    openfile->placewewant = xplustabs();
+
+    /* Set the last line of the screen as the target for the cursor. */
+    openfile->current_y = editwinrows - 1;
+    ensure_line_is_visible();
+
+    refresh_needed = TRUE;
+    focusing = FALSE;
 }
 
+/* Move up one page. */
 void do_page_up(void)
 {
-    size_t pww_save = placewewant;
-    const filestruct *current_save = current;
-#ifndef DISABLE_WRAPPING
-    wrap_reset();
-#endif
+    int i, mustmove, skipped = 0;
 
-    /* If the first line of the file is onscreen, move current up there
-     * and put the cursor at the beginning of the line. */
-    if (edittop == fileage) {
-	current = fileage;
-	placewewant = 0;
-    } else {
-	edit_scroll(UP, editwinrows - 2);
+    /* If the cursor is less than a page away from the top of the file,
+     * put it at the beginning of the first line. */
+    if (openfile->current->lineno == 1 || (!ISSET(SOFTWRAP) &&
+		openfile->current->lineno <= editwinrows - 2)) {
+	do_first_line();
+	return;
+    }
 
-#ifndef NANO_SMALL
-	/* If we're in smooth scrolling mode and there's at least one
-	 * page of text left, move the current line of the edit window
-	 * up a page. */
-	if (ISSET(SMOOTHSCROLL) && current->lineno > editwinrows - 2) {
-	    int i;
-	    for (i = 0; i < editwinrows - 2; i++)
-		current = current->prev;
-	}
-	/* If we're not in smooth scrolling mode or there isn't at least
-	 * one page of text left, put the cursor at the beginning of the
-	 * top line of the edit window, as Pico does. */
-	else {
+    /* If we're not in smooth scrolling mode, put the cursor at the
+     * beginning of the top line of the edit window, as Pico does. */
+    if (!ISSET(SMOOTH_SCROLL)) {
+	openfile->current = openfile->edittop;
+	openfile->placewewant = openfile->current_y = 0;
+    }
+
+    mustmove = (editwinrows < 3) ? 1 : editwinrows - 2;
+
+    for (i = mustmove; i - skipped > 0 && openfile->current != openfile->fileage; i--) {
+	openfile->current = openfile->current->prev;
+#ifndef NANO_TINY
+	if (ISSET(SOFTWRAP) && openfile->current) {
+	    skipped += strlenpt(openfile->current->data) / editwincols;
+#ifdef DEBUG
+	    fprintf(stderr, "paging up: i = %d, skipped = %d based on line %ld len %lu\n",
+			i, skipped, (long)openfile->current->lineno, (unsigned long)strlenpt(openfile->current->data));
 #endif
-	    current = edittop;
-	    placewewant = 0;
-#ifndef NANO_SMALL
 	}
 #endif
     }
 
-    /* Get the equivalent x-coordinate of the new line. */
-    current_x = actual_x(current->data, placewewant);
+    openfile->current_x = actual_x(openfile->current->data,
+					openfile->placewewant);
 
-    /* Update all the lines that need to be updated. */
-    edit_redraw(current_save, pww_save);
-
-    check_statusblank();
+    /* Scroll the edit window up a page. */
+    adjust_viewport(STATIONARY);
+    refresh_needed = TRUE;
 }
 
+/* Move down one page. */
 void do_page_down(void)
 {
-    size_t pww_save = placewewant;
-    const filestruct *current_save = current;
-#ifndef DISABLE_WRAPPING
-    wrap_reset();
-#endif
+    int i, mustmove;
 
-    /* If the last line of the file is onscreen, move current down
-     * there and put the cursor at the beginning of the line. */
-    if (edittop->lineno + editwinrows > filebot->lineno) {
-	current = filebot;
-	placewewant = 0;
-    } else {
-	edit_scroll(DOWN, editwinrows - 2);
-
-#ifndef NANO_SMALL
-	/* If we're in smooth scrolling mode and there's at least one
-	 * page of text left, move the current line of the edit window
-	 * down a page. */
-	if (ISSET(SMOOTHSCROLL) && current->lineno + editwinrows - 2 <=
-		filebot->lineno) {
-	    int i;
-	    for (i = 0; i < editwinrows - 2; i++)
-		current = current->next;
-	}
-	/* If we're not in smooth scrolling mode or there isn't at least
-	 * one page of text left, put the cursor at the beginning of the
-	 * top line of the edit window, as Pico does. */
-	else {
-#endif
-	    current = edittop;
-	    placewewant = 0;
-#ifndef NANO_SMALL
-	}
-#endif
+    /* If the cursor is less than a page away from the bottom of the file,
+     * put it at the end of the last line. */
+    if (openfile->current->lineno + maxrows - 2 >= openfile->filebot->lineno) {
+	do_last_line();
+	return;
     }
 
-    /* Get the equivalent x-coordinate of the new line. */
-    current_x = actual_x(current->data, placewewant);
+    /* If we're not in smooth scrolling mode, put the cursor at the
+     * beginning of the top line of the edit window, as Pico does. */
+    if (!ISSET(SMOOTH_SCROLL)) {
+	openfile->current = openfile->edittop;
+	openfile->placewewant = openfile->current_y = 0;
+    }
 
-    /* Update all the lines that need to be updated. */
-    edit_redraw(current_save, pww_save);
+    mustmove = (maxrows < 3) ? 1 : maxrows - 2;
 
-    check_statusblank();
+    for (i = mustmove; i > 0 && openfile->current != openfile->filebot; i--) {
+	openfile->current = openfile->current->next;
+#ifdef DEBUG
+	fprintf(stderr, "paging down: moving to line %lu\n", (unsigned long)openfile->current->lineno);
+#endif
+
+    }
+
+    openfile->current_x = actual_x(openfile->current->data,
+					openfile->placewewant);
+
+    /* Scroll the edit window down a page. */
+    adjust_viewport(STATIONARY);
+    refresh_needed = TRUE;
 }
 
-void do_up(void)
+#ifndef DISABLE_JUSTIFY
+/* Move up to the beginning of the last beginning-of-paragraph line
+ * before the current line.  If allow_update is TRUE, update the screen
+ * afterwards. */
+void do_para_begin(bool allow_update)
 {
-#ifndef DISABLE_WRAPPING
-    wrap_reset();
-#endif
-    check_statusblank();
+    filestruct *was_current = openfile->current;
 
-    if (current->prev == NULL)
+    if (openfile->current != openfile->fileage) {
+	do
+	    openfile->current = openfile->current->prev;
+	while (!begpar(openfile->current));
+    }
+
+    openfile->current_x = 0;
+
+    if (allow_update)
+	edit_redraw(was_current);
+}
+
+/* Move up to the beginning of the last beginning-of-paragraph line
+ * before the current line, and update the screen afterwards. */
+void do_para_begin_void(void)
+{
+    do_para_begin(TRUE);
+}
+
+/* Move down to the beginning of the last line of the current paragraph.
+ * Then move down one line farther if there is such a line, or to the
+ * end of the current line if not.  If allow_update is TRUE, update the
+ * screen afterwards.  A line is the last line of a paragraph if it is
+ * in a paragraph, and the next line either is the beginning line of a
+ * paragraph or isn't in a paragraph. */
+void do_para_end(bool allow_update)
+{
+    filestruct *was_current = openfile->current;
+
+    while (openfile->current != openfile->filebot &&
+		!inpar(openfile->current))
+	openfile->current = openfile->current->next;
+
+    while (openfile->current != openfile->filebot &&
+		inpar(openfile->current->next) &&
+		!begpar(openfile->current->next)) {
+	openfile->current = openfile->current->next;
+    }
+
+    if (openfile->current != openfile->filebot) {
+	openfile->current = openfile->current->next;
+	openfile->current_x = 0;
+    } else
+	openfile->current_x = strlen(openfile->current->data);
+
+    if (allow_update)
+	edit_redraw(was_current);
+}
+
+/* Move down to the beginning of the last line of the current paragraph.
+ * Then move down one line farther if there is such a line, or to the
+ * end of the current line if not, and update the screen afterwards. */
+void do_para_end_void(void)
+{
+    do_para_end(TRUE);
+}
+#endif /* !DISABLE_JUSTIFY */
+
+/* Move to the preceding block of text in the file. */
+void do_prev_block(void)
+{
+    filestruct *was_current = openfile->current;
+    bool is_text = FALSE, seen_text = FALSE;
+
+    /* Skip backward until first blank line after some nonblank line(s). */
+    while (openfile->current->prev != NULL && (!seen_text || is_text)) {
+	openfile->current = openfile->current->prev;
+	is_text = !white_string(openfile->current->data);
+	seen_text = seen_text || is_text;
+    }
+
+    /* Step forward one line again if this one is blank. */
+    if (openfile->current->next != NULL &&
+		white_string(openfile->current->data))
+	openfile->current = openfile->current->next;
+
+    openfile->current_x = 0;
+    edit_redraw(was_current);
+}
+
+/* Move to the next block of text in the file. */
+void do_next_block(void)
+{
+    filestruct *was_current = openfile->current;
+    bool is_white = white_string(openfile->current->data);
+    bool seen_white = is_white;
+
+    /* Skip forward until first nonblank line after some blank line(s). */
+    while (openfile->current->next != NULL && (!seen_white || is_white)) {
+	openfile->current = openfile->current->next;
+	is_white = white_string(openfile->current->data);
+	seen_white = seen_white || is_white;
+    }
+
+    openfile->current_x = 0;
+    edit_redraw(was_current);
+}
+
+/* Move to the previous word in the file.  If allow_punct is TRUE, treat
+ * punctuation as part of a word.  If allow_update is TRUE, update the
+ * screen afterwards. */
+void do_prev_word(bool allow_punct, bool allow_update)
+{
+    filestruct *was_current = openfile->current;
+    bool seen_a_word = FALSE, step_forward = FALSE;
+
+    assert(openfile->current != NULL && openfile->current->data != NULL);
+
+    /* Move backward until we pass over the start of a word. */
+    while (TRUE) {
+	/* If at the head of a line, move to the end of the preceding one. */
+	if (openfile->current_x == 0) {
+	    if (openfile->current->prev == NULL)
+		break;
+	    openfile->current = openfile->current->prev;
+	    openfile->current_x = strlen(openfile->current->data);
+	}
+
+	/* Step back one character. */
+	openfile->current_x = move_mbleft(openfile->current->data,
+						openfile->current_x);
+
+	if (is_word_mbchar(openfile->current->data + openfile->current_x,
+				allow_punct)) {
+	    seen_a_word = TRUE;
+	    /* If at the head of a line now, this surely is a word start. */
+	    if (openfile->current_x == 0)
+		break;
+	} else if (seen_a_word) {
+	    /* This is space now: we've overshot the start of the word. */
+	    step_forward = TRUE;
+	    break;
+	}
+    }
+
+    if (step_forward)
+	/* Move one character forward again to sit on the start of the word. */
+	openfile->current_x = move_mbright(openfile->current->data,
+						openfile->current_x);
+
+    /* If allow_update is TRUE, update the screen. */
+    if (allow_update) {
+	focusing = FALSE;
+	edit_redraw(was_current);
+    }
+}
+
+/* Move to the previous word in the file, treating punctuation as part of a
+ * word if the WORD_BOUNDS flag is set, and update the screen afterwards. */
+void do_prev_word_void(void)
+{
+    do_prev_word(ISSET(WORD_BOUNDS), TRUE);
+}
+
+/* Move to the next word in the file.  If allow_punct is TRUE, treat
+ * punctuation as part of a word.  If allow_update is TRUE, update the
+ * screen afterwards.  Return TRUE if we started on a word, and FALSE
+ * otherwise. */
+bool do_next_word(bool allow_punct, bool allow_update)
+{
+    filestruct *was_current = openfile->current;
+    bool started_on_word = is_word_mbchar(openfile->current->data +
+				openfile->current_x, allow_punct);
+    bool seen_space = !started_on_word;
+
+    assert(openfile->current != NULL && openfile->current->data != NULL);
+
+    /* Move forward until we reach the start of a word. */
+    while (TRUE) {
+	/* If at the end of a line, move to the beginning of the next one. */
+	if (openfile->current->data[openfile->current_x] == '\0') {
+	    /* If at the end of the file, stop. */
+	    if (openfile->current->next == NULL)
+		break;
+	    openfile->current = openfile->current->next;
+	    openfile->current_x = 0;
+	    seen_space = TRUE;
+	} else {
+	    /* Step forward one character. */
+	    openfile->current_x = move_mbright(openfile->current->data,
+						openfile->current_x);
+	}
+
+	/* If this is not a word character, then it's a separator; else
+	 * if we've already seen a separator, then it's a word start. */
+	if (!is_word_mbchar(openfile->current->data + openfile->current_x,
+				allow_punct))
+	    seen_space = TRUE;
+	else if (seen_space)
+	    break;
+    }
+
+    /* If allow_update is TRUE, update the screen. */
+    if (allow_update) {
+	focusing = FALSE;
+	edit_redraw(was_current);
+    }
+
+    /* Return whether we started on a word. */
+    return started_on_word;
+}
+
+/* Move to the next word in the file, treating punctuation as part of a word
+ * if the WORD_BOUNDS flag is set, and update the screen afterwards. */
+void do_next_word_void(void)
+{
+    do_next_word(ISSET(WORD_BOUNDS), TRUE);
+}
+
+/* Make sure that the current line, when it is partially scrolled off the
+ * screen in softwrap mode, is scrolled fully into view. */
+void ensure_line_is_visible(void)
+{
+#ifndef NANO_TINY
+    if (ISSET(SOFTWRAP) && strlenpt(openfile->current->data) / editwincols +
+				openfile->current_y >= editwinrows) {
+	adjust_viewport(ISSET(SMOOTH_SCROLL) ? FLOWING : CENTERING);
+	refresh_needed = TRUE;
+    }
+#endif
+}
+
+/* Move to the beginning of the current line.  If the SMART_HOME flag is
+ * set, move to the first non-whitespace character of the current line
+ * if we aren't already there, or to the beginning of the current line
+ * if we are. */
+void do_home(void)
+{
+    size_t was_column = xplustabs();
+
+#ifndef NANO_TINY
+    if (ISSET(SMART_HOME)) {
+	size_t current_x_save = openfile->current_x;
+
+	openfile->current_x = indent_length(openfile->current->data);
+
+	if (openfile->current_x == current_x_save ||
+		openfile->current->data[openfile->current_x] == '\0')
+	    openfile->current_x = 0;
+    } else
+#endif
+	openfile->current_x = 0;
+
+    openfile->placewewant = xplustabs();
+
+    if (need_horizontal_scroll(was_column, openfile->placewewant))
+	update_line(openfile->current, openfile->current_x);
+}
+
+/* Move to the end of the current line. */
+void do_end(void)
+{
+    size_t was_column = xplustabs();
+
+    openfile->current_x = strlen(openfile->current->data);
+    openfile->placewewant = xplustabs();
+
+    if (need_horizontal_scroll(was_column, openfile->placewewant))
+	update_line(openfile->current, openfile->current_x);
+
+    ensure_line_is_visible();
+}
+
+/* If scroll_only is FALSE, move up one line.  If scroll_only is TRUE,
+ * scroll up one line without scrolling the cursor. */
+void do_up(bool scroll_only)
+{
+    size_t was_column = xplustabs();
+
+    /* If we're at the top of the file, or if scroll_only is TRUE and
+     * the top of the file is onscreen, get out. */
+    if (openfile->current == openfile->fileage ||
+		(scroll_only && openfile->edittop == openfile->fileage))
 	return;
 
-    assert(current_y == current->lineno - edittop->lineno);
+    assert(ISSET(SOFTWRAP) || openfile->current_y == openfile->current->lineno - openfile->edittop->lineno);
 
-    current = current->prev;
-    current_x = actual_x(current->data, placewewant);
+    /* Move the current line of the edit window up. */
+    openfile->current = openfile->current->prev;
+    openfile->current_x = actual_x(openfile->current->data,
+					openfile->placewewant);
 
-    /* If we're on the first row of the edit window, scroll up one line
-     * if we're in smooth scrolling mode, or up half a page if we're
-     * not. */
-    if (current_y == 0)
-	edit_scroll(UP,
-#ifndef NANO_SMALL
-		ISSET(SMOOTHSCROLL) ? 1 :
-#endif
-		editwinrows / 2);
+    /* When the cursor was on the first line of the edit window (or when just
+     * scrolling without moving the cursor), scroll the edit window up -- one
+     * line if we're in smooth scrolling mode, and half a page otherwise. */
+    if (openfile->current->next == openfile->edittop || scroll_only)
+	edit_scroll(UPWARD, (ISSET(SMOOTH_SCROLL) || scroll_only) ?
+				1 : editwinrows / 2 + 1);
 
-    /* Update the lines left alone by edit_scroll(): the line we were on
-     * before and the line we're on now.  The former needs to be redrawn
-     * if we're not on the first page, and the latter needs to be
-     * drawn. */
-    if (need_vertical_update(0))
-	update_line(current->next, 0);
-    update_line(current, current_x);
+    /* If the lines weren't already redrawn, see if they need to be. */
+    if (openfile->current_y > 0) {
+	/* Redraw the prior line if it was horizontally scrolled. */
+	if (need_horizontal_scroll(was_column, 0))
+	    update_line(openfile->current->next, 0);
+	/* Redraw the current line if it needs to be horizontally scrolled. */
+	if (need_horizontal_scroll(0, xplustabs()))
+	    update_line(openfile->current, openfile->current_x);
+    }
 }
 
-void do_down(void)
+/* Move up one line. */
+void do_up_void(void)
 {
-#ifndef DISABLE_WRAPPING
-    wrap_reset();
-#endif
-    check_statusblank();
+    do_up(FALSE);
+}
 
-    if (current->next == NULL)
+/* If scroll_only is FALSE, move down one line.  If scroll_only is TRUE,
+ * scroll down one line without scrolling the cursor. */
+void do_down(bool scroll_only)
+{
+#ifndef NANO_TINY
+    int amount = 0, enough;
+    filestruct *topline;
+#endif
+    size_t was_column = xplustabs();
+
+    /* If we're at the bottom of the file, get out. */
+    if (openfile->current == openfile->filebot)
 	return;
 
-    assert(current_y == current->lineno - edittop->lineno);
-    current = current->next;
-    current_x = actual_x(current->data, placewewant);
+    assert(ISSET(SOFTWRAP) || openfile->current_y ==
+		openfile->current->lineno - openfile->edittop->lineno);
+    assert(openfile->current->next != NULL);
 
-    /* If we're on the last row of the edit window, scroll down one line
-     * if we're in smooth scrolling mode, or down half a page if we're
-     * not. */
-    if (current_y == editwinrows - 1)
-	edit_scroll(DOWN,
-#ifndef NANO_SMALL
-		ISSET(SMOOTHSCROLL) ? 1 :
+#ifndef NANO_TINY
+    if (ISSET(SOFTWRAP)) {
+	/* Compute the number of lines to scroll. */
+	amount = strlenpt(openfile->current->data) / editwincols -
+			xplustabs() / editwincols +
+			strlenpt(openfile->current->next->data) / editwincols +
+			openfile->current_y - editwinrows + 2;
+	topline = openfile->edittop;
+	/* Reduce the amount when there are overlong lines at the top. */
+	for (enough = 1; enough < amount; enough++) {
+	    amount -= strlenpt(topline->data) / editwincols;
+	    if (amount > 0)
+		topline = topline->next;
+	    if (amount < enough) {
+		amount = enough;
+		break;
+	    }
+	}
+    }
 #endif
-		editwinrows / 2);
 
-    /* Update the lines left alone by edit_scroll(): the line we were on
-     * before and the line we're on now.  The former needs to be redrawn
-     * if we're not on the first page, and the latter needs to be
-     * drawn. */
-    if (need_vertical_update(0))
-	update_line(current->prev, 0);
-    update_line(current, current_x);
-}
+    /* Move to the next line in the file. */
+    openfile->current = openfile->current->next;
+    openfile->current_x = actual_x(openfile->current->data,
+					openfile->placewewant);
 
-void do_left(bool allow_update)
-{
-    size_t pww_save = placewewant;
-    if (current_x > 0)
-	current_x = move_mbleft(current->data, current_x);
-    else if (current != fileage) {
-	do_up();
-	current_x = strlen(current->data);
+    /* If scroll_only is FALSE and if we're on the last line of the
+     * edit window, scroll the edit window down one line if we're in
+     * smooth scrolling mode, or down half a page if we're not.  If
+     * scroll_only is TRUE, scroll the edit window down one line
+     * unconditionally. */
+#ifndef NANO_TINY
+    if (openfile->current_y == editwinrows - 1 || amount > 0 || scroll_only) {
+	if (amount < 1 || scroll_only)
+	    amount = 1;
+
+	edit_scroll(DOWNWARD, (ISSET(SMOOTH_SCROLL) || scroll_only) ?
+				amount : editwinrows / 2 + 1);
+
+	if (ISSET(SOFTWRAP)) {
+	    refresh_needed = TRUE;
+	    return;
+	}
     }
-    placewewant = xplustabs();
-    check_statusblank();
-    if (allow_update && need_horizontal_update(pww_save))
-	update_line(current, current_x);
-}
+#else
+    if (openfile->current_y == editwinrows - 1)
+	edit_scroll(DOWNWARD, editwinrows / 2 + 1);
+#endif
 
-void do_left_void(void)
-{
-    do_left(TRUE);
-}
-
-void do_right(bool allow_update)
-{
-    size_t pww_save = placewewant;
-    assert(current_x <= strlen(current->data));
-
-    if (current->data[current_x] != '\0')
-	current_x = move_mbright(current->data, current_x);
-    else if (current->next != NULL) {
-	do_down();
-	current_x = 0;
+    /* If the lines weren't already redrawn, see if they need to be. */
+    if (openfile->current_y < editwinrows - 1) {
+	/* Redraw the prior line if it was horizontally scrolled. */
+	if (need_horizontal_scroll(was_column, 0))
+	    update_line(openfile->current->prev, 0);
+	/* Redraw the current line if it needs to be horizontally scrolled. */
+	if (need_horizontal_scroll(0, xplustabs()))
+	    update_line(openfile->current, openfile->current_x);
     }
-    placewewant = xplustabs();
-    check_statusblank();
-    if (allow_update && need_horizontal_update(pww_save))
-	update_line(current, current_x);
 }
 
-void do_right_void(void)
+/* Move down one line. */
+void do_down_void(void)
 {
-    do_right(TRUE);
+    do_down(FALSE);
+}
+
+#ifndef NANO_TINY
+/* Scroll up one line without scrolling the cursor. */
+void do_scroll_up(void)
+{
+    do_up(TRUE);
+}
+
+/* Scroll down one line without scrolling the cursor. */
+void do_scroll_down(void)
+{
+    do_down(TRUE);
+}
+#endif
+
+/* Move left one character. */
+void do_left(void)
+{
+    size_t was_column = xplustabs();
+
+    if (openfile->current_x > 0)
+	openfile->current_x = move_mbleft(openfile->current->data,
+						openfile->current_x);
+    else if (openfile->current != openfile->fileage) {
+	do_up_void();
+	openfile->current_x = strlen(openfile->current->data);
+    }
+
+    openfile->placewewant = xplustabs();
+
+    if (need_horizontal_scroll(was_column, openfile->placewewant))
+	update_line(openfile->current, openfile->current_x);
+}
+
+/* Move right one character. */
+void do_right(void)
+{
+    size_t was_column = xplustabs();
+
+    assert(openfile->current_x <= strlen(openfile->current->data));
+
+    if (openfile->current->data[openfile->current_x] != '\0')
+	openfile->current_x = move_mbright(openfile->current->data,
+						openfile->current_x);
+    else if (openfile->current != openfile->filebot) {
+	openfile->current_x = 0;
+#ifndef NANO_TINY
+	if (ISSET(SOFTWRAP))
+	    openfile->current_y -= strlenpt(openfile->current->data) / editwincols;
+#endif
+    }
+
+    openfile->placewewant = xplustabs();
+
+    if (need_horizontal_scroll(was_column, openfile->placewewant))
+	update_line(openfile->current, openfile->current_x);
+
+    if (openfile->current_x == 0)
+	do_down_void();
+    else
+	ensure_line_is_visible();
 }