GNU nano 1.3.2

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

.cvsignore

@@ -1,3 +1,6 @@
+ABOUT-NLS
+COPYING
+INSTALL
 Makefile
 Makefile.in
 aclocal.m4
@@ -15,8 +18,6 @@ depcomp
 install-sh
 missing
 mkinstalldirs
-nano
-nano.info
 nano.spec
 stamp-h
 stamp-h.in

ABOUT-NLS

@@ -1,405 +0,0 @@
-Notes on the Free Translation Project
-*************************************
-
-   Free software is going international!  The Free Translation Project
-is a way to get maintainers of free software, translators, and users all
-together, so that will gradually become able to speak many languages.
-A few packages already provide translations for their messages.
-
-   If you found this `ABOUT-NLS' file inside a distribution, you may
-assume that the distributed package does use GNU `gettext' internally,
-itself available at your nearest GNU archive site.  But you do _not_
-need to install GNU `gettext' prior to configuring, installing or using
-this package with messages translated.
-
-   Installers will find here some useful hints.  These notes also
-explain how users should proceed for getting the programs to use the
-available translations.  They tell how people wanting to contribute and
-work at translations should contact the appropriate team.
-
-   When reporting bugs in the `intl/' directory or bugs which may be
-related to internationalization, you should tell about the version of
-`gettext' which is used.  The information can be found in the
-`intl/VERSION' file, in internationalized packages.
-
-Quick configuration advice
-==========================
-
-   If you want to exploit the full power of internationalization, you
-should configure it using
-
-     ./configure --with-included-gettext
-
-to force usage of internationalizing routines provided within this
-package, despite the existence of internationalizing capabilities in the
-operating system where this package is being installed.  So far, only
-the `gettext' implementation in the GNU C library version 2 provides as
-many features (such as locale alias, message inheritance, automatic
-charset conversion or plural form handling) as the implementation here.
-It is also not possible to offer this additional functionality on top
-of a `catgets' implementation.  Future versions of GNU `gettext' will
-very likely convey even more functionality.  So it might be a good idea
-to change to GNU `gettext' as soon as possible.
-
-   So you need _not_ provide this option if you are using GNU libc 2 or
-you have installed a recent copy of the GNU gettext package with the
-included `libintl'.
-
-INSTALL Matters
-===============
-
-   Some packages are "localizable" when properly installed; the
-programs they contain can be made to speak your own native language.
-Most such packages use GNU `gettext'.  Other packages have their own
-ways to internationalization, predating GNU `gettext'.
-
-   By default, this package will be installed to allow translation of
-messages.  It will automatically detect whether the system already
-provides the GNU `gettext' functions.  If not, the GNU `gettext' own
-library will be used.  This library is wholly contained within this
-package, usually in the `intl/' subdirectory, so prior installation of
-the GNU `gettext' package is _not_ required.  Installers may use
-special options at configuration time for changing the default
-behaviour.  The commands:
-
-     ./configure --with-included-gettext
-     ./configure --disable-nls
-
-will respectively bypass any pre-existing `gettext' to use the
-internationalizing routines provided within this package, or else,
-_totally_ disable translation of messages.
-
-   When you already have GNU `gettext' installed on your system and run
-configure without an option for your new package, `configure' will
-probably detect the previously built and installed `libintl.a' file and
-will decide to use this.  This might be not what is desirable.  You
-should use the more recent version of the GNU `gettext' library.  I.e.
-if the file `intl/VERSION' shows that the library which comes with this
-package is more recent, you should use
-
-     ./configure --with-included-gettext
-
-to prevent auto-detection.
-
-   The configuration process will not test for the `catgets' function
-and therefore it will not be used.  The reason is that even an
-emulation of `gettext' on top of `catgets' could not provide all the
-extensions of the GNU `gettext' library.
-
-   Internationalized packages have usually many `po/LL.po' files, where
-LL gives an ISO 639 two-letter code identifying the language.  Unless
-translations have been forbidden at `configure' time by using the
-`--disable-nls' switch, all available translations are installed
-together with the package.  However, the environment variable `LINGUAS'
-may be set, prior to configuration, to limit the installed set.
-`LINGUAS' should then contain a space separated list of two-letter
-codes, stating which languages are allowed.
-
-Using This Package
-==================
-
-   As a user, if your language has been installed for this package, you
-only have to set the `LANG' environment variable to the appropriate
-`LL_CC' combination.  Here `LL' is an ISO 639 two-letter language code,
-and `CC' is an ISO 3166 two-letter country code.  For example, let's
-suppose that you speak German and live in Germany.  At the shell
-prompt, merely execute `setenv LANG de_DE' (in `csh'),
-`export LANG; LANG=de_DE' (in `sh') or `export LANG=de_DE' (in `bash').
-This can be done from your `.login' or `.profile' file, once and for
-all.
-
-   You might think that the country code specification is redundant.
-But in fact, some languages have dialects in different countries.  For
-example, `de_AT' is used for Austria, and `pt_BR' for Brazil.  The
-country code serves to distinguish the dialects.
-
-   The locale naming convention of `LL_CC', with `LL' denoting the
-language and `CC' denoting the country, is the one use on systems based
-on GNU libc.  On other systems, some variations of this scheme are
-used, such as `LL' or `LL_CC.ENCODING'.  You can get the list of
-locales supported by your system for your country by running the command
-`locale -a | grep '^LL''.
-
-   Not all programs have translations for all languages.  By default, an
-English message is shown in place of a nonexistent translation.  If you
-understand other languages, you can set up a priority list of languages.
-This is done through a different environment variable, called
-`LANGUAGE'.  GNU `gettext' gives preference to `LANGUAGE' over `LANG'
-for the purpose of message handling, but you still need to have `LANG'
-set to the primary language; this is required by other parts of the
-system libraries.  For example, some Swedish users who would rather
-read translations in German than English for when Swedish is not
-available, set `LANGUAGE' to `sv:de' while leaving `LANG' to `sv_SE'.
-
-   In the `LANGUAGE' environment variable, but not in the `LANG'
-environment variable, `LL_CC' combinations can be abbreviated as `LL'
-to denote the language's main dialect.  For example, `de' is equivalent
-to `de_DE' (German as spoken in Germany), and `pt' to `pt_PT'
-(Portuguese as spoken in Portugal) in this context.
-
-Translating Teams
-=================
-
-   For the Free Translation Project to be a success, we need interested
-people who like their own language and write it well, and who are also
-able to synergize with other translators speaking the same language.
-Each translation team has its own mailing list.  The up-to-date list of
-teams can be found at the Free Translation Project's homepage,
-`http://www.iro.umontreal.ca/contrib/po/HTML/', in the "National teams"
-area.
-
-   If you'd like to volunteer to _work_ at translating messages, you
-should become a member of the translating team for your own language.
-The subscribing address is _not_ the same as the list itself, it has
-`-request' appended.  For example, speakers of Swedish can send a
-message to `sv-request@li.org', having this message body:
-
-     subscribe
-
-   Keep in mind that team members are expected to participate
-_actively_ in translations, or at solving translational difficulties,
-rather than merely lurking around.  If your team does not exist yet and
-you want to start one, or if you are unsure about what to do or how to
-get started, please write to `translation@iro.umontreal.ca' to reach the
-coordinator for all translator teams.
-
-   The English team is special.  It works at improving and uniformizing
-the terminology in use.  Proven linguistic skill are praised more than
-programming skill, here.
-
-Available Packages
-==================
-
-   Languages are not equally supported in all packages.  The following
-matrix shows the current state of internationalization, as of April
-2002.  The matrix shows, in regard of each package, for which languages
-PO files have been submitted to translation coordination, with a
-translation percentage of at least 50%.
-
-     Ready PO files    bg ca cs da de el en eo es et fi fr
-                     +-------------------------------------+
-     a2ps            |          [] []             []    [] |
-     bash            |             []       [] []       [] |
-     bfd             |                         []       [] |
-     binutils        |                         []       [] |
-     bison           |             []          [] []    [] |
-     clisp           |             []    []    []       [] |
-     cpio            |          [] []          []       [] |
-     diffutils       |       [] [] []       [] []       [] |
-     enscript        |             []                   [] |
-     error           |                         []       [] |
-     fetchmail       |    [] () [] []          []       () |
-     fileutils       |          [] []          [] []    [] |
-     findutils       |          [] []          [] []    [] |
-     flex            |    []    [] []          []       [] |
-     gas             |                         []       [] |
-     gawk            |             []          []       [] |
-     gcal            |    []                            [] |
-     gcc             |                         []       [] |
-     gettext         |    []    [] []          []       [] |
-     gnupg           |             [] []    [] [] []    [] |
-     gprof           |                         []       [] |
-     gpsdrive        |          () ()    ()    ()       () |
-     grep            | [] []       [] []       [] []    [] |
-     gretl           |                                     |
-     hello           |          [] [] []    [] [] [] [] [] |
-     id-utils        |          [] []                   [] |
-     indent          |    []       []       []    []    [] |
-     jpilot          |       () [] []                   [] |
-     jwhois          |                         []       [] |
-     kbd             |                         []       [] |
-     ld              |                         []       [] |
-     libc            |    [] [] [] [] []       []       [] |
-     lilypond        |          []                      [] |
-     lynx            |       [] [] []             []       |
-     m4              |       [] [] [] []                [] |
-     make            |          [] []          []       [] |
-     mysecretdiary   |             []                   [] |
-     nano            |    [] () [] []          []       [] |
-     nano_1_0        |    [] () [] []          []       [] |
-     opcodes         |          []             []       [] |
-     parted          |    []    [] []          []       [] |
-     ptx             |          [] []          [] []    [] |
-     python          |                                     |
-     recode          |          [] [] []    [] []       [] |
-     sed             |       [] [] [] []    [] [] []    [] |
-     sh-utils        |    [] [] [] [] []       [] []    [] |
-     sharutils       |       [] [] [] []       []       [] |
-     sketch          |             ()          []       () |
-     soundtracker    |             []          []       [] |
-     sp              |             []                      |
-     tar             |       [] [] []          [] []    [] |
-     texinfo         |       [] [] []       []          [] |
-     textutils       |    []    [] []          []       [] |
-     util-linux      |       [] [] []          [] []    [] |
-     vorbis-tools    |                                     |
-     wastesedge      |                                     |
-     wdiff           |    []    [] []          [] []    [] |
-     wget            | [] [] [] [] [] []       [] []    [] |
-                     +-------------------------------------+
-                       bg ca cs da de el en eo es et fi fr
-                        2 14 11 31 40 10  1  8 41 16  1 50
-     
-                       gl he hr hu id it ja ko lv nb nl nn
-                     +-------------------------------------+
-     a2ps            |                ()    ()       []    |
-     bash            |                                     |
-     bfd             |                   []                |
-     binutils        |                   []                |
-     bison           |                   []          []    |
-     clisp           |                               []    |
-     cpio            | []                   []       []    |
-     diffutils       | [] []       []    []                |
-     enscript        |       []                      []    |
-     error           |          []                         |
-     fetchmail       |                   []                |
-     fileutils       |          []    [] []                |
-     findutils       | []    []    [] [] [] []       []    |
-     flex            |                      []             |
-     gas             |                                     |
-     gawk            |    []                               |
-     gcal            |                                     |
-     gcc             |                                     |
-     gettext         |                   [] []             |
-     gnupg           | []          [] [] []                |
-     gprof           |                                     |
-     gpsdrive        |                ()             ()    |
-     grep            | [] [] []    [] [] []                |
-     gretl           |                                     |
-     hello           | [] [] [] [] [] [] [] [] [] [] [] [] |
-     id-utils        |                               []    |
-     indent          | []                []          []    |
-     jpilot          |                   ()          ()    |
-     jwhois          |             []                      |
-     kbd             |                                     |
-     ld              |                                     |
-     libc            | []                [] []    []       |
-     lilypond        |                   []          []    |
-     lynx            |                [] []          []    |
-     m4              | []          []    []          []    |
-     make            | [] [] []          [] []       []    |
-     mysecretdiary   |                                     |
-     nano            | []          [] [] ()       [] [] [] |
-     nano_1_0        | []          [] [] ()       []    [] |
-     opcodes         |                               []    |
-     parted          | []                []             [] |
-     ptx             | []          []             [] []    |
-     python          |                                     |
-     recode          | [] []          []                   |
-     sed             | [] []       [] [] [] []       []    |
-     sh-utils        | []             [] []       [] []    |
-     sharutils       | []                []          []    |
-     sketch          |                ()                   |
-     soundtracker    | []                                  |
-     sp              |                                     |
-     tar             | []    []       [] []       []       |
-     texinfo         |    [] []          []                |
-     textutils       | []                   []    []       |
-     util-linux      |                () []                |
-     vorbis-tools    |                                     |
-     wastesedge      |                                     |
-     wdiff           | []          []                      |
-     wget            | [] [] [] []       []          []    |
-                     +-------------------------------------+
-                       gl he hr hu id it ja ko lv nb nl nn
-                       23  9  8  4 12 12 25  9  1  8 20  4
-     
-                       no pl pt pt_BR ru sk sl sv tr uk zh_TW
-                     +----------------------------------------+
-     a2ps            | () () ()  []   []    [] [] ()          |  9
-     bash            |                                        |  4
-     bfd             |                         [] []          |  5
-     binutils        |                            []          |  4
-     bison           |                []       [] []          |  9
-     clisp           |                                        |  5
-     cpio            |    []     []   []       []             | 11
-     diffutils       |    []     []   []       [] []     []   | 16
-     enscript        |           []   []       []             |  7
-     error           |                   []       []     []   |  6
-     fetchmail       |    ()     ()               []          |  6
-     fileutils       |                []    [] [] []     []   | 13
-     findutils       |    []     []   [] [] [] [] []          | 19
-     flex            |                []       [] []          |  9
-     gas             |                            []          |  3
-     gawk            |                         [] []          |  6
-     gcal            |                         [] []          |  4
-     gcc             |                            []          |  3
-     gettext         |                [] [] [] [] []     []   | 13
-     gnupg           |    []                   [] []          | 13
-     gprof           |                         [] []          |  4
-     gpsdrive        |                            ()          |  0
-     grep            |    []          []    []    []          | 17
-     gretl           |                                        |  0
-     hello           | [] []          [] []    [] [] []       | 27
-     id-utils        |                []       []             |  6
-     indent          |                [] []    [] []          | 12
-     jpilot          | ()                      () []          |  4
-     jwhois          |                ()       () []     []   |  5
-     kbd             |                         [] []          |  4
-     ld              |                         [] []          |  4
-     libc            | [] []     []      []    [] []          | 17
-     lilypond        |                         []             |  5
-     lynx            |           []   []       []             | 10
-     m4              |    []          []       []             | 12
-     make            |    []     []   []          []          | 14
-     mysecretdiary   |                         [] []          |  4
-     nano            | () []          []       []    []       | 15
-     nano_1_0        | () []          []       []    []       | 14
-     opcodes         |                         [] []          |  6
-     parted          |       []  []            []             | 11
-     ptx             | [] [] []       []       [] []          | 15
-     python          |                                        |  0
-     recode          |    []          []    [] []             | 13
-     sed             |           []   [] [] [] [] []          | 21
-     sh-utils        | [] []     []   [] [] [] [] []     []   | 22
-     sharutils       |                []       [] []     []   | 13
-     sketch          |           []   ()                      |  3
-     soundtracker    |                         []             |  5
-     sp              |                                        |  1
-     tar             | [] []     []      [] [] [] []          | 18
-     texinfo         |                []       []             | 10
-     textutils       |                []    [] [] []     []   | 13
-     util-linux      |           []            [] []          | 10
-     vorbis-tools    |                         []             |  1
-     wastesedge      |                                        |  0
-     wdiff           |                [] []    [] []          | 12
-     wget            |    []          [] [] [] [] [] []  []   | 23
-                     +----------------------------------------+
-       35 teams        no pl pt pt_BR ru sk sl sv tr uk zh_TW
-       58 domains       5 16  2  14   27 11 11 41 36  4   9    536
-
-   Some counters in the preceding matrix are higher than the number of
-visible blocks let us expect.  This is because a few extra PO files are
-used for implementing regional variants of languages, or language
-dialects.
-
-   For a PO file in the matrix above to be effective, the package to
-which it applies should also have been internationalized and
-distributed as such by its maintainer.  There might be an observable
-lag between the mere existence a PO file and its wide availability in a
-distribution.
-
-   If April 2002 seems to be old, you may fetch a more recent copy of
-this `ABOUT-NLS' file on most GNU archive sites.  The most up-to-date
-matrix with full percentage details can be found at
-`http://www.iro.umontreal.ca/contrib/po/HTML/matrix.html'.
-
-Using `gettext' in new packages
-===============================
-
-   If you are writing a freely available program and want to
-internationalize it you are welcome to use GNU `gettext' in your
-package.  Of course you have to respect the GNU Library General Public
-License which covers the use of the GNU `gettext' library.  This means
-in particular that even non-free programs can use `libintl' as a shared
-library, whereas only free software can use `libintl' as a static
-library or use modified versions of `libintl'.
-
-   Once the sources are changed appropriately and the setup can handle
-to use of `gettext' the only thing missing are the translations.  The
-Free Translation Project is also available for packages which are not
-developed inside the GNU project.  Therefore the information given above
-applies also for every other Free Software Project.  Contact
-`translation@iro.umontreal.ca' to make the `.pot' files available to
-the translation teams.
-

AUTHORS

@@ -4,11 +4,17 @@ editor.  Please see the ChangeLog for specific changes by author.
 -------------------------------------------------------------------------
 
 Chris Allegretta <chrisa@asty.org>
-	* Main program author and maintainer.
+	* Original program author, stable series maintainer.
+
+David Lawrence Ramsey <pooka_regent@sluggy.net>
+	* Development series maintainer.  Multiple buffer support, 
+	  operating dir (-o) option, bug fixes for display routines, 
+	  wrapping code, spelling fixes, const mode and various other 
+	  fixes.
 
 Jordi Mallach <jordi@sindominio.net>
 	* Debian package maintainer, fellow bug squasher.
-	* Internationalization support head, es.po maintainer.
+	* Internationalization support head, ca.po maintainer.
 
 Adam Rogoyski <rogoyski@cs.utexas.edu>
 	* New write_file() function, read_file() optimization, mouse
@@ -25,7 +31,6 @@ Rocco Corsi <rocco.corsi@sympatico.ca>
 	  findnextstr and search-related functions, various display and
 	  file handling fixes.
 
-David Lawrence Ramsey <pooka_regent@sluggy.net>
-	* Multiple buffer support, operating dir (-o) option, bug fixes
-	  for display routines, wrapping code, spelling fixes, const
-	  mode and various other fixes.
+David Benbennick <dbenbenn@math.cornell.edu>
+	* Wrap and justify bugfixes/enhancements, new color syntax
+	  code, memleak fixes and other miscellaneous fixes.

COPYING

@@ -1,340 +0,0 @@
-		    GNU GENERAL PUBLIC LICENSE
-		       Version 2, June 1991
-
- Copyright (C) 1989, 1991 Free Software Foundation, Inc.
-                       59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- Everyone is permitted to copy and distribute verbatim copies
- of this license document, but changing it is not allowed.
-
-			    Preamble
-
-  The licenses for most software are designed to take away your
-freedom to share and change it.  By contrast, the GNU General Public
-License is intended to guarantee your freedom to share and change free
-software--to make sure the software is free for all its users.  This
-General Public License applies to most of the Free Software
-Foundation's software and to any other program whose authors commit to
-using it.  (Some other Free Software Foundation software is covered by
-the GNU Library General Public License instead.)  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
-this service 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 make restrictions that forbid
-anyone to deny you these rights or to ask you to surrender the rights.
-These restrictions translate to certain responsibilities for you if you
-distribute copies of the software, or if you modify it.
-
-  For example, if you distribute copies of such a program, whether
-gratis or for a fee, you must give the recipients all the rights that
-you have.  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.
-
-  We protect your rights with two steps: (1) copyright the software, and
-(2) offer you this license which gives you legal permission to copy,
-distribute and/or modify the software.
-
-  Also, for each author's protection and ours, we want to make certain
-that everyone understands that there is no warranty for this free
-software.  If the software is modified by someone else and passed on, we
-want its recipients to know that what they have is not the original, so
-that any problems introduced by others will not reflect on the original
-authors' reputations.
-
-  Finally, any free program is threatened constantly by software
-patents.  We wish to avoid the danger that redistributors of a free
-program will individually obtain patent licenses, in effect making the
-program proprietary.  To prevent this, we have made it clear that any
-patent must be licensed for everyone's free use or not licensed at all.
-
-  The precise terms and conditions for copying, distribution and
-modification follow.
-
-		    GNU GENERAL PUBLIC LICENSE
-   TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
-
-  0. This License applies to any program or other work which contains
-a notice placed by the copyright holder saying it may be distributed
-under the terms of this General Public License.  The "Program", below,
-refers to any such program or work, and a "work based on the Program"
-means either the Program or any derivative work under copyright law:
-that is to say, a work containing the Program or a portion of it,
-either verbatim or with modifications and/or translated into another
-language.  (Hereinafter, translation is included without limitation in
-the term "modification".)  Each licensee is addressed as "you".
-
-Activities other than copying, distribution and modification are not
-covered by this License; they are outside its scope.  The act of
-running the Program is not restricted, and the output from the Program
-is covered only if its contents constitute a work based on the
-Program (independent of having been made by running the Program).
-Whether that is true depends on what the Program does.
-
-  1. You may copy and distribute 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 and disclaimer of warranty; keep intact all the
-notices that refer to this License and to the absence of any warranty;
-and give any other recipients of the Program a copy of this License
-along with the Program.
-
-You may charge a fee for the physical act of transferring a copy, and
-you may at your option offer warranty protection in exchange for a fee.
-
-  2. You may modify your copy or copies of the Program or any portion
-of it, thus forming a work based on the Program, and copy and
-distribute such modifications or work under the terms of Section 1
-above, provided that you also meet all of these conditions:
-
-    a) You must cause the modified files to carry prominent notices
-    stating that you changed the files and the date of any change.
-
-    b) You must cause any work that you distribute or publish, that in
-    whole or in part contains or is derived from the Program or any
-    part thereof, to be licensed as a whole at no charge to all third
-    parties under the terms of this License.
-
-    c) If the modified program normally reads commands interactively
-    when run, you must cause it, when started running for such
-    interactive use in the most ordinary way, to print or display an
-    announcement including an appropriate copyright notice and a
-    notice that there is no warranty (or else, saying that you provide
-    a warranty) and that users may redistribute the program under
-    these conditions, and telling the user how to view a copy of this
-    License.  (Exception: if the Program itself is interactive but
-    does not normally print such an announcement, your work based on
-    the Program is not required to print an announcement.)
-
-These requirements apply to the modified work as a whole.  If
-identifiable sections of that work are not derived from the Program,
-and can be reasonably considered independent and separate works in
-themselves, then this License, and its terms, do not apply to those
-sections when you distribute them as separate works.  But when you
-distribute the same sections as part of a whole which is a work based
-on the Program, the distribution of the whole must be on the terms of
-this License, whose permissions for other licensees extend to the
-entire whole, and thus to each and every part regardless of who wrote it.
-
-Thus, it is not the intent of this section to claim rights or contest
-your rights to work written entirely by you; rather, the intent is to
-exercise the right to control the distribution of derivative or
-collective works based on the Program.
-
-In addition, mere aggregation of another work not based on the Program
-with the Program (or with a work based on the Program) on a volume of
-a storage or distribution medium does not bring the other work under
-the scope of this License.
-
-  3. You may copy and distribute the Program (or a work based on it,
-under Section 2) in object code or executable form under the terms of
-Sections 1 and 2 above provided that you also do one of the following:
-
-    a) Accompany it with the complete corresponding machine-readable
-    source code, which must be distributed under the terms of Sections
-    1 and 2 above on a medium customarily used for software interchange; or,
-
-    b) Accompany it with a written offer, valid for at least three
-    years, to give any third party, for a charge no more than your
-    cost of physically performing source distribution, a complete
-    machine-readable copy of the corresponding source code, to be
-    distributed under the terms of Sections 1 and 2 above on a medium
-    customarily used for software interchange; or,
-
-    c) Accompany it with the information you received as to the offer
-    to distribute corresponding source code.  (This alternative is
-    allowed only for noncommercial distribution and only if you
-    received the program in object code or executable form with such
-    an offer, in accord with Subsection b above.)
-
-The source code for a work means the preferred form of the work for
-making modifications to it.  For an executable work, complete source
-code means all the source code for all modules it contains, plus any
-associated interface definition files, plus the scripts used to
-control compilation and installation of the executable.  However, as a
-special exception, the source code distributed need not include
-anything that is normally distributed (in either source or binary
-form) with the major components (compiler, kernel, and so on) of the
-operating system on which the executable runs, unless that component
-itself accompanies the executable.
-
-If distribution of executable or object code is made by offering
-access to copy from a designated place, then offering equivalent
-access to copy the source code from the same place counts as
-distribution of the source code, even though third parties are not
-compelled to copy the source along with the object code.
-
-  4. You may not copy, modify, sublicense, or distribute the Program
-except as expressly provided under this License.  Any attempt
-otherwise to copy, modify, sublicense or distribute the Program 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.
-
-  5. You are not required to accept this License, since you have not
-signed it.  However, nothing else grants you permission to modify or
-distribute the Program or its derivative works.  These actions are
-prohibited by law if you do not accept this License.  Therefore, by
-modifying or distributing the Program (or any work based on the
-Program), you indicate your acceptance of this License to do so, and
-all its terms and conditions for copying, distributing or modifying
-the Program or works based on it.
-
-  6. Each time you redistribute the Program (or any work based on the
-Program), the recipient automatically receives a license from the
-original licensor to copy, distribute or modify the Program subject to
-these terms and conditions.  You may not impose any further
-restrictions on the recipients' exercise of the rights granted herein.
-You are not responsible for enforcing compliance by third parties to
-this License.
-
-  7. If, as a consequence of a court judgment or allegation of patent
-infringement or for any other reason (not limited to patent issues),
-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
-distribute so as to satisfy simultaneously your obligations under this
-License and any other pertinent obligations, then as a consequence you
-may not distribute the Program at all.  For example, if a patent
-license would not permit royalty-free redistribution of the Program by
-all those who receive copies directly or indirectly through you, then
-the only way you could satisfy both it and this License would be to
-refrain entirely from distribution of the Program.
-
-If any portion of this section is held invalid or unenforceable under
-any particular circumstance, the balance of the section is intended to
-apply and the section as a whole is intended to apply in other
-circumstances.
-
-It is not the purpose of this section to induce you to infringe any
-patents or other property right claims or to contest validity of any
-such claims; this section has the sole purpose of protecting the
-integrity of the free software distribution system, which is
-implemented by public license practices.  Many people have made
-generous contributions to the wide range of software distributed
-through that system in reliance on consistent application of that
-system; it is up to the author/donor to decide if he or she is willing
-to distribute software through any other system and a licensee cannot
-impose that choice.
-
-This section is intended to make thoroughly clear what is believed to
-be a consequence of the rest of this License.
-
-  8. If the distribution and/or use of the Program is restricted in
-certain countries either by patents or by copyrighted interfaces, the
-original copyright holder who places the Program under this License
-may add an explicit geographical distribution limitation excluding
-those countries, so that distribution is permitted only in or among
-countries not thus excluded.  In such case, this License incorporates
-the limitation as if written in the body of this License.
-
-  9. The Free Software Foundation may publish revised and/or new versions
-of the 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 a version number of this License which applies to it and "any
-later version", you have the option of following the terms and conditions
-either of that version or of any later version published by the Free
-Software Foundation.  If the Program does not specify a version number of
-this License, you may choose any version ever published by the Free Software
-Foundation.
-
-  10. If you wish to incorporate parts of the Program into other free
-programs whose distribution conditions are different, write to the author
-to ask for permission.  For software which is copyrighted by the Free
-Software Foundation, write to the Free Software Foundation; we sometimes
-make exceptions for this.  Our decision will be guided by the two goals
-of preserving the free status of all derivatives of our free software and
-of promoting the sharing and reuse of software generally.
-
-			    NO WARRANTY
-
-  11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, 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.
-
-  12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
-WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR
-REDISTRIBUTE 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.
-
-		     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
-convey 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) 19yy  <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 2 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, write to the Free Software
-    Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
-
-
-Also add information on how to contact you by electronic and paper mail.
-
-If the program is interactive, make it output a short notice like this
-when it starts in an interactive mode:
-
-    Gnomovision version 69, Copyright (C) 19yy name of author
-    Gnomovision 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, the commands you use may
-be called something other than `show w' and `show c'; they could even be
-mouse-clicks or menu items--whatever suits your program.
-
-You should also get your employer (if you work as a programmer) or your
-school, if any, to sign a "copyright disclaimer" for the program, if
-necessary.  Here is a sample; alter the names:
-
-  Yoyodyne, Inc., hereby disclaims all copyright interest in the program
-  `Gnomovision' (which makes passes at compilers) written by James Hacker.
-
-  <signature of Ty Coon>, 1 April 1989
-  Ty Coon, President of Vice
-
-This 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 Library General
-Public License instead of this License.

INSTALL

@@ -1,184 +0,0 @@
-Basic Installation
-==================
-
-   These are generic installation instructions.
-
-   The `configure' shell script attempts to guess correct values for
-various system-dependent variables used during compilation.  It uses
-those values to create a `Makefile' in each directory of the package.
-It may also create one or more `.h' files containing system-dependent
-definitions.  Finally, it creates a shell script `config.status' that
-you can run in the future to recreate the current configuration, a file
-`config.cache' that saves the results of its tests to speed up
-reconfiguring, and a file `config.log' containing compiler output
-(useful mainly for debugging `configure').
-
-   If you need to do unusual things to compile the package, please try
-to figure out how `configure' could check whether to do them, and mail
-diffs or instructions to the address given in the `README' so they can
-be considered for the next release.  If at some point `config.cache'
-contains results you don't want to keep, you may remove or edit it.
-
-   The file `configure.in' is used to create `configure' by a program
-called `autoconf'.  You only need `configure.in' if you want to change
-it or regenerate `configure' using a newer version of `autoconf'.
-
-The simplest way to compile this package is:
-
-  1. `cd' to the directory containing the package's source code and type
-     `./configure' to configure the package for your system.  If you're
-     using `csh' on an old version of System V, you might need to type
-     `sh ./configure' instead to prevent `csh' from trying to execute
-     `configure' itself.
-
-     Running `configure' takes awhile.  While running, it prints some
-     messages telling which features it is checking for.
-
-  2. Type `make' to compile the package.
-
-  3. Optionally, type `make check' to run any self-tests that come with
-     the package.
-
-  4. Type `make install' to install the programs and any data files and
-     documentation.
-
-  5. You can remove the program binaries and object files from the
-     source code directory by typing `make clean'.  To also remove the
-     files that `configure' created (so you can compile the package for
-     a different kind of computer), type `make distclean'.  There is
-     also a `make maintainer-clean' target, but that is intended mainly
-     for the package's developers.  If you use it, you may have to get
-     all sorts of other programs in order to regenerate files that came
-     with the distribution.
-
-Compilers and Options
-=====================
-
-   Some systems require unusual options for compilation or linking that
-the `configure' script does not know about.  You can give `configure'
-initial values for variables by setting them in the environment.  Using
-a Bourne-compatible shell, you can do that on the command line like
-this:
-     CC=c89 CFLAGS=-O2 LIBS=-lposix ./configure
-
-Or on systems that have the `env' program, you can do it like this:
-     env CPPFLAGS=-I/usr/local/include LDFLAGS=-s ./configure
-
-Compiling For Multiple Architectures
-====================================
-
-   You can compile the package for more than one kind of computer at the
-same time, by placing the object files for each architecture in their
-own directory.  To do this, you must use a version of `make' that
-supports the `VPATH' variable, such as GNU `make'.  `cd' to the
-directory where you want the object files and executables to go and run
-the `configure' script.  `configure' automatically checks for the
-source code in the directory that `configure' is in and in `..'.
-
-   If you have to use a `make' that does not supports the `VPATH'
-variable, you have to compile the package for one architecture at a time
-in the source code directory.  After you have installed the package for
-one architecture, use `make distclean' before reconfiguring for another
-architecture.
-
-Installation Names
-==================
-
-   By default, `make install' will install the package's files in
-`/usr/local/bin', `/usr/local/man', etc.  You can specify an
-installation prefix other than `/usr/local' by giving `configure' the
-option `--prefix=PATH'.
-
-   You can specify separate installation prefixes for
-architecture-specific files and architecture-independent files.  If you
-give `configure' the option `--exec-prefix=PATH', the package will use
-PATH as the prefix for installing programs and libraries.
-Documentation and other data files will still use the regular prefix.
-
-   In addition, if you use an unusual directory layout you can give
-options like `--bindir=PATH' to specify different values for particular
-kinds of files.  Run `configure --help' for a list of the directories
-you can set and what kinds of files go in them.
-
-   If the package supports it, you can cause programs to be installed
-with an extra prefix or suffix on their names by giving `configure' the
-option `--program-prefix=PREFIX' or `--program-suffix=SUFFIX'.
-
-Optional Features
-=================
-
-   Some packages pay attention to `--enable-FEATURE' options to
-`configure', where FEATURE indicates an optional part of the package.
-They may also pay attention to `--with-PACKAGE' options, where PACKAGE
-is something like `gnu-as' or `x' (for the X Window System).  The
-`README' should mention any `--enable-' and `--with-' options that the
-package recognizes.
-
-   For packages that use the X Window System, `configure' can usually
-find the X include and library files automatically, but if it doesn't,
-you can use the `configure' options `--x-includes=DIR' and
-`--x-libraries=DIR' to specify their locations.
-
-Specifying the System Type
-==========================
-
-   There may be some features `configure' can not figure out
-automatically, but needs to determine by the type of host the package
-will run on.  Usually `configure' can figure that out, but if it prints
-a message saying it can not guess the host type, give it the
-`--host=TYPE' option.  TYPE can either be a short name for the system
-type, such as `sun4', or a canonical name with three fields:
-     CPU-COMPANY-SYSTEM
-
-See the file `config.sub' for the possible values of each field.  If
-`config.sub' isn't included in this package, then this package doesn't
-need to know the host type.
-
-   If you are building compiler tools for cross-compiling, you can also
-use the `--target=TYPE' option to select the type of system they will
-produce code for and the `--build=TYPE' option to select the type of
-system on which you are compiling the package.
-
-Sharing Defaults
-================
-
-   If you want to set default values for `configure' scripts to share,
-you can create a site shell script called `config.site' that gives
-default values for variables like `CC', `cache_file', and `prefix'.
-`configure' looks for `PREFIX/share/config.site' if it exists, then
-`PREFIX/etc/config.site' if it exists.  Or, you can set the
-`CONFIG_SITE' environment variable to the location of the site script.
-A warning: not all `configure' scripts look for a site script.
-
-Operation Controls
-==================
-
-   `configure' recognizes the following options to control how it
-operates.
-
-`--cache-file=FILE'
-     Use and save the results of the tests in FILE instead of
-     `./config.cache'.  Set FILE to `/dev/null' to disable caching, for
-     debugging `configure'.
-
-`--help'
-     Print a summary of the options to `configure', and exit.
-
-`--quiet'
-`--silent'
-`-q'
-     Do not print messages saying which checks are being made.  To
-     suppress all normal output, redirect it to `/dev/null' (any error
-     messages will still be shown).
-
-`--srcdir=DIR'
-     Look for the package's source code in directory DIR.  Usually
-     `configure' can determine that directory automatically.
-
-`--version'
-     Print the version of Autoconf used to generate the `configure'
-     script, and exit.
-
-`configure' also accepts some other, not widely useful, options.
-
-$Id$

Makefile.am

@@ -1,36 +1,11 @@
 ## $Id$
 AUTOMAKE_OPTIONS = gnu no-dependencies
 
-DEFS= -DSYSCONFDIR=\"$(sysconfdir)\"
+SUBDIRS = doc m4 po src
 
-bin_PROGRAMS = 	nano
-nano_SOURCES =	color.c \
-		cut.c \
-		files.c \
-		global.c \
-		move.c \
-		nano.c \
-		nano.h \
-		proto.h \
-		rcfile.c \
-		search.c \
-		utils.c \
-		winio.c 
-
-man_MANS = nano.1
-nano_LDADD = @GLIB_LIBS@ @INTLLIBS@
-
-info_TEXINFOS = nano.texi
-MAKEINFO = makeinfo --no-split
 
 EXTRA_DIST =	ABOUT-NLS AUTHORS BUGS COPYING ChangeLog INSTALL NEWS \
-		README THANKS TODO config.rpath install-sh missing \
-		mkinstalldirs nano.1 nano.1.html faq.html nanorc.sample \
-		nano.spec
-
-SUBDIRS = po m4
-
-localedir = $(datadir)/locale
-INCLUDES = -Iintl -DLOCALEDIR=\"$(localedir)\" -I@includedir@
+		README THANKS TODO UPGRADE config.rpath install-sh missing \
+		mkinstalldirs nano.spec
 
 ACLOCAL_AMFLAGS = -I m4

README

@@ -7,19 +7,20 @@ Overview
      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.
+     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.
 
      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.
 
-     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 now 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:
@@ -28,60 +29,41 @@ How to compile and install nano
      ./configure
      make
      make install
-     
-     It's that simple. Use --prefix with configure to override the 
+
+     It's that simple.  Use --prefix with configure to override the
      default installation directory of /usr/local.
-     
+
 Web Page
 
 	http://www.nano-editor.org
-     
+
 Mailing List and Bug Reports
 
 	Savannah hosts all the nano-related mailing-lists.
+
 	+ info-nano@gnu.org is a very low traffic list
-	  used to announce new Nano versions or other important information
-	  about the project.
+	  used to announce new nano versions or other important
+	  information about the project.
 	+ help-nano@gnu.org is for those seeking to get help without
 	  wanting to hear about the technical details of its
 	  development.
 	+ nano-devel@gnu.org is the list used by the people
-	  that make Nano and a general development discussion list, with
+	  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
+
+	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.
+
 	For general bug reports, send a description of the problem to
 	nano@nano-editor.org or directly to the development list.
 
 Current Status
 
-	This is the 1.1 or unstable branch of nano.  New features
-	will be added and things will be changed around and basically
-	stability is not guaranteed.  If this is not what you're
-	interested in, please use the latest 1.0.x release of nano.
-
-	New features in this branch include:
-	+ .nanorc file support (--enable-nanorc configure option, 
-	  see sample.nanorc file)
-	+ Negative -r value for "#cols from right", allows dynamic adjustment
-	  of wrap margin based on window size.
-	+ Write marked text to separate file (^O after selecting with ^^).
-	+ Append to file (Meta-A at write file menu).
-	+ Multiple file buffers! (--enable-multibuffer configure option,
-	  --multibuffer, -F cmdline flag, Meta-F toggle, then ^R to load).
-	+ Better compatibility with Pico.  Mouse mode now supports clicking
-	  shortcuts and files in browser, search toggles that are Pico 
-	  extensions moved to Meta keys so as to not interfere with Pico
-	  control sequences.
-	+ Smooth scrolling through files, instead of the jerky half-page
-	  down, half-page up method.  This is available by using the 
-	  -S or --smooth switch, or the Meta-S toggle.
-	+ Better non-*nix file support.  GNU nano now automatically
-	  converts files from DOS format or Mac format to standard file
-	  format.  It can also write files in either format by using the
-	  appropriate command line (-D, --dos or -M, --mac) or toggle
-	  (Meta-D, Meta-O).
+	GNU nano has reached its second major milestone, 1.2.x.
+	Development of new features will continue in the 1.3.x branch,
+	while 1.2.x versions will be dedicated to bugfixing and
+	polishing.
 
    Chris Allegretta (chrisa@asty.org)
 

README.CVS

@@ -4,12 +4,12 @@ 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 succesfully compile GNU nano from CVS, you'll need the
+To successfully compile GNU nano from CVS, you'll need the
 following packages:
 
 - autoconf (version >= 2.52)
-- automake (version >= 1.5-pl5, 1.6.x recommended)
-- gettext (version 0.10.40, >= 0.11 recommended)
+- automake (version >= 1.6, 1.7.x recommended)
+- gettext (version >= 0.11.5)
 - texinfo
 - cvs
 - glib (if your system doesn't have snprintf() and/or vsnprintf())
@@ -26,13 +26,13 @@ and the nano tree will download.
 If you want to checkout the stable CVS branch, append -r nano_1_0_branch:
 $ cvs -z3 -d:pserver:anonymous@subversions.gnu.org:/cvsroot/nano checkout -r nano_1_0_branch nano
 
-One you have the sources in the "nano" directory, cd into it, and execute
-the "autogen.sh" script in the top dir. This will setup a configure script
-and Makefile.in, and you will be ready to compile with
+Once you have the sources in the "nano" directory, cd into it, and
+execute the "autogen.sh" script in the top dir. This will setup 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
-should put the required files in their respective directories.
+(as root) should put the required files in their respective directories.
 
 
 Please submit any bugs in the CVS branch to nano-devel@gnu.org.

THANKS

@@ -2,36 +2,44 @@ 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>
-						Bahasa Melayu Translator
-Marco Colombo <magicdice@inwind.it>		Italian Translator
-Karl Eichwalder <keichwa@gmx.net>		German Translator
+						Malay translator
+Laurentiu Buzdugan <buzdugan@voyager.net>	Romanian 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
-Tedi Heriyanto <tedi_h@gmx.net>			Indonesian Translator
-Václav Haisman <V.Haisman@sh.cvut.cz>		Czech Translator
+						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
-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
-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
-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
+						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
 
 Ben Armstrong <synrg@sanctuary.nslug.ns.ca>	Negative -r value idea, code
-David Benbennick <dbenbenn@math.cornell.edu>	Misc fixes and enhancements
 Thomas Dickey <dickey@herndon4.his.com>		Curses help and advice
 Sven Guckes <guckes@math.fu-berlin.de>		Advice and Advocacy
 Jim Knoble <jmknoble@pobox.com>			Pico compat for browser

TODO

@@ -1,26 +1,40 @@
 TODO file (? means the feature may be implemented, but not definitely)
 -----------------------------------------------------------------------------
 
+For version 1.4:
+- UTF-8 support.
+- Support for paragraph searches. [DONE]
+- Support for filename searches in the file browser.
+- Undo/Redo key?
+- Rebindable keys?
+- Keystroke to implement "Add next sequence as raw" like vi's ^V.
+  [DONE for edit window, needs to be done for statusbar prompt]
+- Spell check selected text only. [DONE]
+- Make "To line" (^W^T) and "Read from Command" (^R^X) re-enter their
+  parent menu when their keystroke is entered a second time (^W^T^T and
+  (^R^X^X)(requires figuring out when to keep cursor pos and when not
+  to).
+- Fix resetstatuspos global which we shouldn't have.
+- 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 it.)
+- Color syntax highlighting? (certainly seems like there's a demand for
+  it.) [DONE]
 - .nanorc [DONE]
 - Backup making (filename~)? [DONE]
-- Search (etc) string history [1.2]
-- Implement Pico's -j and -g flags, as they are pretty easy to do. [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].
+  make global variable pointing to current shortcut list to determine
+  what keystroke to ungetch(). [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.4:
-- UTF-8 support.
-- Undo/Redo key?
-
-Old requests:
-
 For version 1.0:
 - Implement Spelling [DONE]
 - Implement Help [DONE]

UPGRADE

@@ -0,0 +1,28 @@
+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,7 +1,4 @@
 #!/bin/sh
 # Generate configure & friends for CVS users.
 
-aclocal -I ./m4
-autoheader
-automake --add-missing
-autoconf
+autoreconf -f -i -s

configure.ac

@@ -1,110 +1,84 @@
+# Configuration for GNU nano - a small and user-friendly text editor
+#
+# Copyright (C) 1999, 2000, 2001, 2002, 2003 Free Software Foundation, Inc.
+#
+# GNU nano is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any 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 GNU nano; if not, write to the Free Software
+# Foundation, Inc.
+# 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+#
 # $Id$
-dnl Process this file with autoconf to produce a configure script.
-AC_INIT
-AC_CONFIG_SRCDIR([nano.c])
+
+AC_INIT([GNU nano], [1.3.2], [nano-devel@gnu.org], [nano])
+AC_CONFIG_SRCDIR([src/nano.c])
+AM_INIT_AUTOMAKE
+AM_CONFIG_HEADER([config.h:config.h.in])
+
 AC_PREREQ(2.52)
-AM_INIT_AUTOMAKE(nano, 1.1.10)
-AM_CONFIG_HEADER(config.h:config.h.in)
-dnl AM_ACLOCAL_INCLUDE(m4)
-ALL_LINGUAS="es de fr it id fi hu ca cs gl uk ru sv nn nl da pl nb ms"
 
 dnl Checks for programs.
 AC_PROG_CC
 AC_ISC_POSIX
 AC_SYS_LARGEFILE
 
+dnl Internationalization macros.
+AM_GNU_GETTEXT_VERSION(0.11.5)
+AM_GNU_GETTEXT([external], [need-ngettext])
+
 dnl Checks for header files.
 AC_HEADER_STDC
-AC_CHECK_HEADERS(fcntl.h unistd.h malloc.h termios.h termio.h limits.h getopt.h regex.h)
+AC_CHECK_HEADERS(fcntl.h getopt.h libintl.h limits.h regex.h termio.h termios.h unistd.h)
+AC_CHECK_HEADER(regex.h,
+    AC_MSG_CHECKING([for broken regexec])
+    AC_TRY_RUN([
+#include <sys/types.h>
+#include <regex.h>
+int main(void) { regex_t reg; size_t n = 1; regmatch_t r; regcomp(&reg, "\\<", 0); regexec(&reg, "", n, &r, 0); regfree(&reg); return 0; }],
+	AC_MSG_RESULT(no),
+	AC_MSG_RESULT(yes); AC_DEFINE(BROKEN_REGEXEC, 1, [Define this if your regexec() function segfaults when passed an empty string under certain conditions.])
+    )
+)
 
 dnl options
 AC_ARG_ENABLE(debug, 
 [  --enable-debug          Enable debugging (disabled by default)],
  [if test x$enableval = xyes; then
-    AC_DEFINE(DEBUG, 1, [Define this to enable nano debug messages and assert warnings.]) 
+    AC_DEFINE(DEBUG, 1, [Define this to enable nano debug messages and assert warnings.])
     debug_support=yes
  fi])
 
 if test "$debug_support" != "yes"; then
-    AC_DEFINE(NDEBUG, 1, [Shut up the assert warnings :-)]) 
+    AC_DEFINE(NDEBUG, 1, [Shut up the assert warnings :-)])
 fi
 
-AC_ARG_ENABLE(tiny,
-[  --enable-tiny           Disable features for the sake of size
-                          (currently disables detailed help and i18n)],
-[if test x$enableval = xyes; then
-    AC_DEFINE(NANO_SMALL, 1, [Define this to make the nano executable as small as possible.]) tiny_support=yes
-    AC_DEFINE(DISABLE_TABCOMP, 1, [Define to disable the tab completion code Chris worked so hard on!]) 
-    AC_DEFINE(DISABLE_SPELLER, 1, [Define this to disable the use(full|less) spelling functions.]) 
-    AC_DEFINE(DISABLE_HELP, 1, [Define this to disable the ^G help menu.]) 
-    AC_DEFINE(DISABLE_JUSTIFY, 1, [Define this to disable the justify routine.]) 
-    AC_DEFINE(DISABLE_BROWSER, 1, [Define this to disable the built-in (crappy) file browser.]) 
-    AC_DEFINE(DISABLE_MOUSE, 1, [Define this to disable the mouse functions.]) 
-    AC_DEFINE(DISABLE_OPERATINGDIR, 1, [Define this to disable setting of the operating directory (chroot of sorts).]) 
- fi])
-
 AC_ARG_ENABLE(extra,
 [  --enable-extra          Enable extra (optional) functions, including easter eggs],
 [if test x$enableval = xyes; then
     AC_DEFINE(NANO_EXTRA, 1, [Define this to enable the extra stuff.]) extra_support=yes
     AC_DEFINE(ENABLE_MULTIBUFFER, 1, [Define this to enable multiple file buffers.]) multibuffer_support=yes
-    AC_DEFINE(ENABLE_UNDO, 1, [Define this to enable undoing... something]) undo_support=yes
  fi])
 
-AC_ARG_ENABLE(undo,
-[  --enable-undo           Enable undo support],
-[if test x$enableval = xyes && test x$tiny_support != xyes; then
-    AC_DEFINE(ENABLE_UNDO, 1, [Define this to enable undoing... something.]) undo_support=yes
- fi])
-
-AC_ARG_ENABLE(multibuffer,
-[  --enable-multibuffer    Enable multiple file buffers],
+AC_ARG_ENABLE(tiny,
+[  --enable-tiny           Disable features for the sake of size],
 [if test x$enableval = xyes; then
-    AC_DEFINE(ENABLE_MULTIBUFFER, 1, [Define this to enable multiple file buffers.]) multibuffer_support=yes
- fi])
-
-AC_ARG_ENABLE(nanorc,
-[  --enable-nanorc         Enable use of .nanorc file],
-[if test x$enableval = xyes; then
-    AC_DEFINE(ENABLE_NANORC, 1, [Define this to use the .nanorc file.]) nanorc_support=yes
- fi])
-
-AC_ARG_ENABLE(color,
-[  --enable-color          Enable color and syntax highlighting],
-[if test x$enableval = xyes; then
-    AC_DEFINE(ENABLE_NANORC, 1, [Define this to use the .nanorc file.]) nanorc_support=yes
-    AC_DEFINE(ENABLE_COLOR, 1, [Define this to have syntax highlighting, requires ENABLE_NANORC too!]) color_support=yes
-    AC_MSG_WARN([
-
-***********************************************************************
-*** WARNING: Color support is currently BROKEN.  Don't expect it to ***
-*** work AT ALL until more is implemented.                          ***
-***********************************************************************
-])
-fi])
-
-AC_ARG_ENABLE(tabcomp,
-[  --disable-tabcomp       Disable tab completion code for a smaller binary],
- [if test x$enableval != xyes; then
-    AC_DEFINE(DISABLE_TABCOMP, 1, [Define to disable the tab completion code Chris worked so hard on!]) 
- fi])
-
-AC_ARG_ENABLE(justify,
-[  --disable-justify       Disable justify/unjustify function],
- [if test x$enableval != xyes; then
+    AC_DEFINE(NANO_SMALL, 1, [Define this to make the nano executable as small as possible.]) tiny_support=yes
+    AC_DEFINE(DISABLE_BROWSER, 1, [Define this to disable the built-in (crappy) file browser.]) 
+    AC_DEFINE(DISABLE_HELP, 1, [Define this to disable the ^G help menu.]) 
     AC_DEFINE(DISABLE_JUSTIFY, 1, [Define this to disable the justify routine.]) 
- fi])
-
-AC_ARG_ENABLE(speller,
-[  --disable-speller       Disable spell checker function],
- [if test x$enableval != xyes; then
-    AC_DEFINE(DISABLE_SPELLER, 1, [Define this to disable the use(full|less) spelling functions.])
- fi])
-
-AC_ARG_ENABLE(help,
-[  --disable-help          Disable help function (^G)],
- [if test x$enableval != xyes; then
-    AC_DEFINE(DISABLE_HELP, 1, [Define this to disable the ^G help menu.])
+    AC_DEFINE(DISABLE_MOUSE, 1, [Define this to disable the mouse functions.]) 
+    AC_DEFINE(DISABLE_OPERATINGDIR, 1, [Define this to disable setting of the operating directory (chroot of sorts).]) 
+    AC_DEFINE(DISABLE_SPELLER, 1, [Define this to disable the use(full|less) spelling functions.]) 
+    AC_DEFINE(DISABLE_TABCOMP, 1, [Define to disable the tab completion code Chris worked so hard on!]) 
  fi])
 
 AC_ARG_ENABLE(browser,
@@ -113,10 +87,16 @@ AC_ARG_ENABLE(browser,
     AC_DEFINE(DISABLE_BROWSER, 1, [Define this to disable the built-in (crappy) file browser.])
  fi])
 
-AC_ARG_ENABLE(wrapping,
-[  --disable-wrapping      Disable all wrapping of text (and -w flag)],
+AC_ARG_ENABLE(help,
+[  --disable-help          Disable help function (^G)],
  [if test x$enableval != xyes; then
-    AC_DEFINE(DISABLE_WRAPPING, 1, [Define this to disable any and all text wrapping.])
+    AC_DEFINE(DISABLE_HELP, 1, [Define this to disable the ^G help menu.])
+ fi])
+
+AC_ARG_ENABLE(justify,
+[  --disable-justify       Disable justify/unjustify function],
+ [if test x$enableval != xyes; then
+    AC_DEFINE(DISABLE_JUSTIFY, 1, [Define this to disable the justify routine.]) 
  fi])
 
 AC_ARG_ENABLE(mouse,
@@ -131,6 +111,72 @@ AC_ARG_ENABLE(operatingdir,
     AC_DEFINE(DISABLE_OPERATINGDIR, 1, [Define this to disable setting of the operating directory (chroot of sorts).])
  fi])
 
+AC_ARG_ENABLE(speller,
+[  --disable-speller       Disable spell checker function],
+ [if test x$enableval != xyes; then
+    AC_DEFINE(DISABLE_SPELLER, 1, [Define this to disable the use(full|less) spelling functions.])
+ fi])
+
+AC_ARG_ENABLE(tabcomp,
+[  --disable-tabcomp       Disable tab completion code for a smaller binary],
+ [if test x$enableval != xyes; then
+    AC_DEFINE(DISABLE_TABCOMP, 1, [Define to disable the tab completion code Chris worked so hard on!]) 
+ fi])
+
+AC_ARG_ENABLE(wrapping,
+[  --disable-wrapping      Disable all wrapping of text (and -w flag)],
+ [if test x$enableval != xyes; then
+    AC_DEFINE(DISABLE_WRAPPING, 1, [Define this to disable any and all text wrapping.])
+ fi])
+
+AC_ARG_ENABLE(wrapping-as-root,
+[  --disable-wrapping-as-root  Disable wrapping of text as root by default],
+ [if test x$enableval != xyes; then
+    AC_DEFINE(DISABLE_ROOTWRAP, 1, [Define this to disable wrapping as root by default.])
+ fi])
+
+AC_ARG_ENABLE(color,
+[  --enable-color          Enable color and syntax highlighting],
+[if test x$enableval = xyes; then
+    AC_DEFINE(ENABLE_NANORC, 1, [Define this to use the .nanorc file.]) nanorc_support=yes
+    AC_DEFINE(ENABLE_COLOR, 1, [Define this to have syntax highlighting, requires ENABLE_NANORC too!]) color_support=yes
+    AC_MSG_WARN([
+
+***********************************************************************
+*** WARNING: Color support is far from perfect, but functional.     ***
+*** Be careful with syntax in your .nanorc or nano may malfunction. ***
+***********************************************************************
+])
+fi])
+
+AC_ARG_ENABLE(multibuffer,
+[  --enable-multibuffer    Enable multiple file buffers],
+[if test x$enableval = xyes; then
+    AC_DEFINE(ENABLE_MULTIBUFFER, 1, [Define this to enable multiple file buffers.]) multibuffer_support=yes
+ fi])
+
+AC_ARG_ENABLE(nanorc,
+[  --enable-nanorc         Enable use of .nanorc file],
+[if test x$enableval = xyes; then
+    AC_DEFINE(ENABLE_NANORC, 1, [Define this to use the .nanorc file.]) nanorc_support=yes
+ fi])
+
+AC_ARG_ENABLE(all,
+[  --enable-all            Enable ALL extra nano functionality (kitchen sink option)],
+[if test x$enableval = xyes; then
+    AC_DEFINE(ENABLE_NANORC, 1, [Define this to use the .nanorc file.]) nanorc_support=yes
+    AC_DEFINE(ENABLE_COLOR, 1, [Define this to have syntax highlighting, requires ENABLE_NANORC too!]) color_support=yes
+    AC_DEFINE(ENABLE_MULTIBUFFER, 1, [Define this to enable multiple file buffers.]) multibuffer_support=yes
+    AC_DEFINE(NANO_EXTRA, 1, [Define this to enable the extra stuff.]) extra_support=yes
+    AC_MSG_WARN([
+
+***********************************************************************
+*** WARNING: Color support is far from perfect, but functional.     ***
+*** Be careful with syntax in your .nanorc or nano may malfunction. ***
+***********************************************************************
+])
+fi])
+
 AC_MSG_CHECKING([whether to use slang])
 CURSES_LIB_NAME=""
 AC_ARG_WITH(slang,
@@ -155,7 +201,7 @@ AC_ARG_WITH(slang,
 	    AC_TRY_RUN([
 #include <stdio.h>
 #include <slcurses.h>
-int main () { SLtt_initialize (NULL); return 0; }],
+int main(void) { SLtt_initialize(NULL); return 0; }],
 		[AC_MSG_RESULT(yes)
 		AC_DEFINE(USE_SLANG, 1, [Define to use the slang wrappers for curses instead of native curses.])
 		slang_support=yes
@@ -177,7 +223,7 @@ int main () { SLtt_initialize (NULL); return 0; }],
 		AC_TRY_RUN([
 #include <stdio.h>
 #include <slcurses.h>
-int main () { SLtt_initialize (NULL); return 0; }],
+int main(void) { SLtt_initialize(NULL); return 0; }],
 		    [AC_MSG_RESULT(yes)
 		    AC_DEFINE(USE_SLANG, 1, [Define to use the slang wrappers for curses instead of native curses.])
 		    slang_support=yes
@@ -194,7 +240,7 @@ int main () { SLtt_initialize (NULL); return 0; }],
 		    AC_TRY_RUN([
 #include <stdio.h>
 #include <slcurses.h>
-int main () { SLtt_initialize (NULL); return 0; }],
+int main(void) { SLtt_initialize(NULL); return 0; }],
 			[AC_MSG_RESULT(yes)
 			AC_DEFINE(USE_SLANG, 1, [Define to use the slang wrappers for curses instead of native curses.])
 			slang_support=yes
@@ -224,17 +270,16 @@ AC_MSG_WARN([*** Can not use slang when cross-compiling])),
     esac], [AC_MSG_RESULT(no)])
 
 dnl Checks for functions
-AC_CHECK_FUNCS(snprintf vsnprintf)
+AC_CHECK_FUNCS(snprintf vsnprintf strcasecmp strncasecmp)
 if test "x$ac_cv_func_snprintf" = "xno" -o "xac_cv_func_vsnprintf" = "xno"
 then
-	AM_PATH_GLIB(1.2.4,,
-	    [AC_MSG_ERROR([
+	AM_PATH_GLIB_2_0(2.0.0,,
+	    [AM_PATH_GLIB(1.2.4,,
+		[AC_MSG_ERROR([
 *** snprintf() and/or vsnprintf() not found.  GLIB not found either.
 *** You need both snprintf() and vsnprintf().  Alternatively you can
 *** install the GLIB library which can be found at ftp://ftp.gtk.org/.])],
-	    glib)
-	glib_cflags=`$GLIB_CONFIG --cflags glib`
-	glib_libs=`$GLIB_CONFIG --libs glib`
+		glib)])
 fi
 
 dnl Checks for typedefs, structures, and compiler characteristics.
@@ -284,20 +329,6 @@ AC_CHECK_LIB([$CURSES_LIB_NAME], use_default_colors, AC_DEFINE(HAVE_USE_DEFAULT_
 if test x$slang_support != xyes; then
     AC_CHECK_LIB([$CURSES_LIB_NAME], wresize, AC_DEFINE(HAVE_WRESIZE, 1, [Define this if you have the wresize function in your ncurses-type library.]))
     AC_CHECK_LIB([$CURSES_LIB_NAME], resizeterm, AC_DEFINE(HAVE_RESIZETERM, 1, [Define this if you have the resizeterm function in your ncurses-type library.]))
-
-    # Taken from aumix (can't tell form the variable name?)
-    AC_CACHE_CHECK([for private member _use_keypad in WINDOW],
-    aumix_cv_struct_window_usekeypad,
-    [AC_TRY_COMPILE([#ifdef HAVE_NCURSES_H
-#include <ncurses.h>
-#else
-#include <curses.h>
-#endif], [WINDOW w; w._use_keypad;],
-    aumix_cv_struct_window_usekeypad=yes, aumix_cv_struct_window_usekeypad=no)])
-    
-    if test $aumix_cv_struct_window_usekeypad = yes; then
-	AC_DEFINE(HAVE_USEKEYPAD, 1, [Define this if your curses lib has the _use_keypad flag.])
-    fi
 fi
 
 dnl Parse any configure options
@@ -306,17 +337,25 @@ LIBS="$LIBS $CURSES_LIB"
 
 AC_SUBST(CURSES_LIB)
 
-if test "x$glib_cflags" != "x"
+if test "x$GLIB_CFLAGS" != "x"
 then
-	CFLAGS="$CFLAGS $glib_cflags"
+	CFLAGS="$CFLAGS $GLIB_CFLAGS"
 fi
-if test "x$glib_libs" != "x"
+if test "x$GLIB_LIBS" != "x"
 then
-	LDFLAGS="$LDFLAGS $glib_libs"
+	LDFLAGS="$LDFLAGS $GLIB_LIBS"
 fi
 
-dnl i18n stuff - pretty incomplete for now
-AM_GNU_GETTEXT([external])
+AC_CONFIG_FILES([
+Makefile
+doc/Makefile
+doc/man/Makefile
+doc/man/fr/Makefile
+doc/texinfo/Makefile
+m4/Makefile
+po/Makefile.in
+src/Makefile
+nano.spec
+])
 
-AC_CONFIG_FILES([Makefile m4/Makefile po/Makefile.in nano.spec])
 AC_OUTPUT

cut.c

@@ -1,471 +0,0 @@
-/* $Id$ */
-/**************************************************************************
- *   cut.c                                                                *
- *                                                                        *
- *   Copyright (C) 1999-2002 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.                                                   *
- *                                                                        *
- *   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, write to the Free Software          *
- *   Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.            *
- *                                                                        *
- **************************************************************************/
-
-#include "config.h"
-
-#include <stdlib.h>
-#include <string.h>
-#include <stdio.h>
-#include <assert.h>
-#include "proto.h"
-#include "nano.h"
-
-#ifdef ENABLE_NLS
-#include <libintl.h>
-#define _(string) gettext(string)
-#else
-#define _(string) (string)
-#endif
-
-static int marked_cut;		/* Is the cutbuffer from a mark? */
-static filestruct *cutbottom = NULL; /* Pointer to end of cutbuffer */
-
-filestruct *get_cutbottom(void)
-{
-    return cutbottom;
-}
-
-void add_to_cutbuffer(filestruct *inptr)
-{
-#ifdef DEBUG
-    fprintf(stderr, _("add_to_cutbuffer called with inptr->data = %s\n"),
-	    inptr->data);
-#endif
-
-    if (cutbuffer == NULL) {
-	cutbuffer = inptr;
-	inptr->prev = NULL;
-    } else {
-	cutbottom->next = inptr;
-	inptr->prev = cutbottom;
-    }
-
-    inptr->next = NULL;
-    cutbottom = inptr;
-}
-
-#ifndef NANO_SMALL
-/* Cut a marked segment instead of a whole line.
- * The first cut character is top->data[top_x].  Unless top == bot, the
- * last cut line has length bot_x.  That is, if bot_x > 0 then we cut to
- * bot->data[bot_x - 1].
- *
- * destructive is whether to actually modify the file structure, if not
- * then just copy the buffer into cutbuffer and don't pull it from the
- * file.
- *
- * If destructive, then we maintain totsize, totlines, filebot, the
- * magic line, and line numbers.  Also, we set current and current_x so
- * the cursor will be on the first character after what was cut.  We do
- * not do any screen updates. */
-void cut_marked_segment(filestruct *top, size_t top_x, filestruct *bot,
-			size_t bot_x, int destructive)
-{
-    filestruct *tmp, *next;
-    size_t newsize;
-
-    if (top == bot && top_x == bot_x)
-	return;
-    assert(top != NULL && bot != NULL);
-
-    /* Make top be no later than bot. */
-    if (top->lineno > bot->lineno) {
-	filestruct *swap = top;
-	int swap2 = top_x;
-
-	top = bot;
-	bot = swap;
-
-	top_x = bot_x;
-	bot_x = swap2;
-    } else if (top == bot && top_x > bot_x) {
-	/* And bot_x can't be an earlier character than top_x. */
-	int swap = top_x;
-
-	top_x = bot_x;
-	bot_x = swap;
-    }
-
-    /* Make the first cut line manually. */
-    tmp = copy_node(top);
-    newsize = (top == bot ? bot_x - top_x : strlen(top->data + top_x));
-    memmove(tmp->data, top->data + top_x, newsize);
-    null_at(&tmp->data, newsize);
-    add_to_cutbuffer(tmp);
-
-    /* And make the remainder line manually too. */
-    if (destructive) {
-	current_x = top_x;
-	totsize -= newsize;
-	totlines -= bot->lineno - top->lineno;
-
-	newsize = top_x + strlen(bot->data + bot_x) + 1;
-	if (top == bot) {
-	    /* In this case, the remainder line is shorter, so we must
-	       move text from the end forward first. */
-	    memmove(top->data + top_x, bot->data + bot_x,
-			newsize - top_x);
-	    top->data = (char *)nrealloc(top->data,
-					sizeof(char) * newsize);
-	} else {
-	    totsize -= bot_x + 1;
-
-	    /* Here, the remainder line might get longer, so we realloc
-	       it first. */
-	    top->data = (char *)nrealloc(top->data,
-					sizeof(char) * newsize);
-	    memmove(top->data + top_x, bot->data + bot_x,
-			newsize - top_x);
-	}
-    }
-
-    if (top == bot) {
-#ifdef DEBUG
-	dump_buffer(cutbuffer);
-#endif
-	return;
-    }
-
-    tmp = top->next;
-    while (tmp != bot) {
-	next = tmp->next;
-	if (!destructive)
-	    tmp = copy_node(tmp);
-	else
-	    totsize -= strlen(tmp->data) + 1;
-	add_to_cutbuffer(tmp);
-	tmp = next;
-    }
-
-    /* Make the last cut line manually. */
-    tmp = copy_node(bot);
-    null_at(&tmp->data, bot_x);
-    add_to_cutbuffer(tmp);
-#ifdef DEBUG
-    dump_buffer(cutbuffer);
-#endif
-
-    if (destructive) {
-	top->next = bot->next;
-	if (top->next != NULL)
-	    top->next->prev = top;
-	delete_node(bot);
-	renumber(top);
-	current = top;
-	if (bot == filebot) {
-	    filebot = top;
-	    assert(bot_x == 0);
-	    if (top_x > 0)
-		new_magicline();
-	}
-    }
-}
-#endif
-
-int do_cut_text(void)
-{
-    filestruct *fileptr;
-#ifndef NANO_SMALL
-    int dontupdate = 0;
-#endif
-
-    assert(current != NULL && current->data != NULL);
-
-    check_statblank();
-
-    if (!ISSET(KEEP_CUTBUFFER)) {
-	free_filestruct(cutbuffer);
-	cutbuffer = NULL;
-	marked_cut = 0;
-#ifdef DEBUG
-	fprintf(stderr, _("Blew away cutbuffer =)\n"));
-#endif
-    }
-
-    /* You can't cut the magic line except with the mark.  But
-       trying does clear the cutbuffer if KEEP_CUTBUFFER is not set. */
-    if (current == filebot
-#ifndef NANO_SMALL
-			&& !ISSET(MARK_ISSET)
-#endif
-						)
-	return 0;
-
-#ifndef NANO_SMALL
-    if (ISSET(CUT_TO_END) && !ISSET(MARK_ISSET)) {
-	assert(current_x >= 0 && current_x <= strlen(current->data));
-
-	if (current->data[current_x] == '\0') {
-	    /* If the line is empty and we didn't just cut a non-blank
-	       line, create a dummy line and add it to the cutbuffer */
-	    if (marked_cut != 1 && current->next != filebot) {
-		filestruct *junk = make_new_node(current);
-
-	        junk->data = charalloc(1);
-		junk->data[0] = '\0';
-		add_to_cutbuffer(junk);
-#ifdef DEBUG
-		dump_buffer(cutbuffer);
-#endif
-	    }
-
-	    do_delete();
-	    SET(KEEP_CUTBUFFER);
-	    marked_cut = 2;
-	    return 1;
-	} else {
-	    SET(MARK_ISSET);
-	    SET(KEEP_CUTBUFFER);
-
-	    mark_beginx = strlen(current->data);
-	    mark_beginbuf = current;
-	    dontupdate = 1;
-	}
-    }
-
-    if (ISSET(MARK_ISSET)) {
-	/* Don't do_update() and move the screen position if the marked
-	   area lies entirely within the screen buffer */
-	dontupdate |= current->lineno >= edittop->lineno &&
-			current->lineno <= editbot->lineno &&
-			mark_beginbuf->lineno >= edittop->lineno &&
-			mark_beginbuf->lineno <= editbot->lineno;
-	cut_marked_segment(current, current_x, mark_beginbuf,
-				mark_beginx, 1);
-
-	placewewant = xplustabs();
-	UNSET(MARK_ISSET);
-
-	marked_cut = 1;
-	set_modified();
-	if (dontupdate) {
-	    fix_editbot();
-	    edit_refresh();
-	} else
-	    edit_update(current, CENTER);
-
-	return 1;
-    }
-#endif /* !NANO_SMALL */
-
-    totlines--;
-    totsize -= strlen(current->data) + 1;
-    fileptr = current;
-    current = current->next;
-    current->prev = fileptr->prev;
-    add_to_cutbuffer(fileptr);
-#ifdef DEBUG
-    dump_buffer(cutbuffer);
-#endif
-	
-    if (fileptr == fileage)
-	fileage = current;
-    else
-	current->prev->next = current;
-
-    if (fileptr == edittop)
-	edittop = current;
-
-    renumber(current);
-    edit_refresh();
-    set_modified();
-    marked_cut = 0;
-    current_x = 0;
-    placewewant = 0;
-    reset_cursor();
-    SET(KEEP_CUTBUFFER);
-    return 1;
-}
-
-int do_uncut_text(void)
-{
-    filestruct *tmp = current, *fileptr = current;
-    filestruct *newbuf = NULL;
-    filestruct *newend = NULL;
-#ifndef NANO_SMALL
-    char *tmpstr, *tmpstr2;
-    filestruct *hold = current;
-#endif
-    int i;
-
-    wrap_reset();
-    check_statblank();
-    if (cutbuffer == NULL || fileptr == NULL)
-	return 0;		/* AIEEEEEEEEEEEE */
-
-#ifndef NANO_SMALL
-    if (!marked_cut || cutbuffer->next != NULL)
-#endif
-    {
-	newbuf = copy_filestruct(cutbuffer);
-	for (newend = newbuf; newend->next != NULL && newend != NULL;
-		newend = newend->next)
-	    totlines++;
-    }
-
-    /* Hook newbuf into fileptr */
-#ifndef NANO_SMALL
-    if (marked_cut) {
-	int recenter_me = 0;
-	    /* Should we eventually use edit_update(CENTER)? */
-
-	/* If there's only one line in the cutbuffer */
-	if (cutbuffer->next == NULL) {
-	    size_t buf_len = strlen(cutbuffer->data);
-	    size_t cur_len = strlen(current->data);
-
-	    current->data = nrealloc(current->data, cur_len + buf_len + 1);
-	    memmove(current->data + current_x + buf_len,
-			current->data + current_x, cur_len - current_x + 1);
-	    strncpy(current->data + current_x, cutbuffer->data, buf_len);
-		/* Use strncpy to not copy the terminal '\0'. */
-
-	    current_x += buf_len;
-	    totsize += buf_len;
-	    /* If we've uncut a line, make sure there's a magicline after
-	       it */
-	    if (current->next == NULL)
-		new_magicline();
-
-	    placewewant = xplustabs();
-	    update_cursor();
-	} else {		/* yuck -- no kidding! */
-	    tmp = current->next;
-	    /* New beginning */
-	    tmpstr = charalloc(current_x + strlen(newbuf->data) + 1);
-	    strncpy(tmpstr, current->data, current_x);
-	    strcpy(&tmpstr[current_x], newbuf->data);
-	    totsize += strlen(newbuf->data) + strlen(newend->data) + 1;
-
-	    /* New end */
-	    tmpstr2 = charalloc(strlen(newend->data) +
-			      strlen(&current->data[current_x]) + 1);
-	    strcpy(tmpstr2, newend->data);
-	    strcat(tmpstr2, &current->data[current_x]);
-
-	    free(current->data);
-	    current->data = tmpstr;
-	    current->next = newbuf->next;
-	    newbuf->next->prev = current;
-	    delete_node(newbuf);
-
-	    current_x = strlen(newend->data);
-	    placewewant = xplustabs();
-	    free(newend->data);
-	    newend->data = tmpstr2;
-
-	    newend->next = tmp;
-
-	    /* If tmp isn't null, we're in the middle: update the
-	       prev pointer.  If it IS null, we're at the end; update
-	       the filebot pointer */
-
-	    if (tmp != NULL)
-		tmp->prev = newend;
-	    else {
-		/* Fix the editbot pointer too */
-		if (editbot == filebot)
-		    editbot = newend;
-		filebot = newend;
-		new_magicline();
-	    }
-
-	    /* Now why don't we update the totsize also */
-	    for (tmp = current->next; tmp != newend; tmp = tmp->next)
-		totsize += strlen(tmp->data) + 1;
-
-	    current = newend;
-	    if (editbot->lineno < newend->lineno)
-		recenter_me = 1;
-	}
-
-	/* If marked cut == 2, that means that we're doing a cut to end
-	   and we don't want anything else on the line, so we have to
-	   screw up all the work we just did and separate the line.
-	   There must be a better way to do this, but not at 1AM on a
-	   work night. */
-
-	if (marked_cut == 2) {
-	    tmp = make_new_node(current);
-	    tmp->data = charalloc(strlen(&current->data[current_x]) + 1);
-	    strcpy(tmp->data, &current->data[current_x]);
-	    splice_node(current, tmp, current->next);
-	    null_at(&current->data, current_x);
-	    current = current->next;
-	    current_x = 0;
-	    placewewant = 0;
-
-	    /* Extra line added, update stuff */
-	    totlines++;
-	    totsize++;
-	}
-	/* Renumber from BEFORE where we pasted ;) */
-	renumber(hold);
-
-#ifdef DEBUG
-	dump_buffer(fileage);
-	dump_buffer(cutbuffer);
-#endif
-	set_modified();
-	if (recenter_me)
-	    edit_update(current, CENTER);
-	else
-	    edit_refresh();
-	UNSET(KEEP_CUTBUFFER);
-	return 0;
-    }
-#endif
-
-    if (fileptr != fileage) {
-	tmp = fileptr->prev;
-	tmp->next = newbuf;
-	newbuf->prev = tmp;
-    } else
-	fileage = newbuf;
-    totlines++;		/* Unmarked uncuts don't split lines */
-
-    /* This is so uncutting at the top of the buffer will work => */
-    if (current_y == 0)
-	edittop = newbuf;
-
-    /* Connect the end of the buffer to the filestruct */
-    newend->next = fileptr;
-    fileptr->prev = newend;
-
-    /* Recalculate size *sigh* */
-    for (tmp = newbuf; tmp != fileptr; tmp = tmp->next)
-	totsize += strlen(tmp->data) + 1;
-
-    i = editbot->lineno;
-    renumber(newbuf);
-    if (i < newend->lineno)
-	edit_update(fileptr, CENTER);
-    else
-	edit_refresh();
-
-#ifdef DEBUG
-    dump_buffer_reverse();
-#endif
-
-    set_modified();
-    UNSET(KEEP_CUTBUFFER);
-    return 1;
-}

doc/.cvsignore

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

doc/Makefile.am

@@ -0,0 +1,3 @@
+SUBDIRS = man texinfo
+
+EXTRA_DIST = faq.html nanorc.sample

doc/faq.html

@@ -0,0 +1,274 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
+<html>
+<head>
+  <title>The GNU nano editor FAQ</title>
+  <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
+  <meta name="GENERATOR" content="Mozilla/4.73 [en] (X11; U; Linux 2.2.16 i586) [Netscape]">
+</head>
+<body text="#330000" bgcolor="#ffffff" link="#0000ef" vlink="#51188e" alink="#ff0000">
+<h1>The nano FAQ</h1>
+<h2>Table of Contents</h2>
+<h2><a href="#1">1. General</a></h2>
+<blockquote><p><a href="#1.1">1.1 About this FAQ</a><br>
+  <a href="#1.2">1.2. How do I contribute to it?</a><br>
+  <a href="#1.3">1.3. What is GNU nano?</a><br>
+  <a href="#1.4">1.4. What is the history behind nano?</a><br>
+  <a href="#1.5">1.5. Why the name change from TIP?</a><br>
+  <a href="#1.6">1.6. What is the current version of nano?</a><br>
+  <a href="#1.7">1.7. I want to read the manpage without having to download the program!</a></p></blockquote>
+<h2><a href="#2">2. Where to get GNU nano.</a></h2>
+<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>
+<h2><a href="#3">3. Installation and Configuration</a></h2>
+<blockquote><p><a href="#3.1">3.1. How do I install the RPM or DEB package?</a><br>
+  <a href="#3.2">3.2. Compiling from source: WHAT THE HECK DO I DO NOW?</a><br>
+  <a href="#3.3">3.3. Why does everything go into /usr/local?</a><br>
+  <a href="#3.4">3.4. I get errors about 'bindtextdomain','gettext' and/or 'gettextdomain'. What can I do about it?</a><br>
+  <a href="#3.5">3.5. Nano should automatically run strip on the binary when installing it!</a><br>
+  <a href="#3.6">3.6. How can I make the executable smaller? This is too bloated!</a><br>
+  <a href="#3.7">3.7. Tell me more about this multibuffer stuff!</a><br>
+  <a href="#3.8">3.8. Tell me more about this verbatim input stuff!</a><br>
+  <a href="#3.9">3.9. How do I make a .nanorc file that nano will read when I start it?</a></p></blockquote>
+<h2><a href="#4">4. Running</a></h2>
+<blockquote><p><a href="#4.1">4.1. Ack! My backspace/delete/enter/double bucky/meta key doesn't seem to work! What can I do?</a><br>
+  <a href="#4.2">4.2. Nano crashes when I type &lt;insert keystroke here&gt;!</a><br>
+  <a href="#4.3">4.3. Nano crashes when I resize my window. How can I fix that?</a><br>
+  <a href="#4.4">4.4. [version 1.1.12 and earlier] Why does nano show ^\ in the shortcut list instead of ^J?</a><br>
+  <a href="#4.5a">4.5a. [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.5b">4.5b. [version 1.2.2 and later] Hey, the search string behavior has reverted, it's now like Pico, what happened to the consistency?</a><br>
+  <a href="#4.6">4.6. I get the message &quot;NumLock glitch detected. Keypad will malfunction with NumLock off.&quot; What gives?</a><br>
+  <a href="#4.7">4.7. How do I make nano my default editor (in Pine, mutt, etc.)?</a><br>
+  <a href="#4.8">4.8. I've compiled nano with color support, but I don't see any color when I run it!</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>
+<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>
+<h2><a href="#7">7. Miscellaneous</a></h2>
+<blockquote><p><a href="#7.1">7.1. Nano related mailing lists.</a><br>
+  <a href="#7.2">7.2. I want to send the development team a big load of cash (or just a thank you).</a><br>
+  <a href="#7.3">7.3. How do I submit a patch?</a><br>
+  <a href="#7.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>
+<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>
+<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>
+<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><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>
+<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.2. Of course you should always check the nano homepage to see what the latest and greatest version is.</p></blockquote>
+<h2><a name="1.7"></a>1.7. I want to read the man page without having to download the program!</h2>
+<blockquote><p>Jeez, demanding, aren't we? Okay, look <a href="http://www.nano-editor.org/dist/v1.2/nano.1.html">here</a>.</p></blockquote>
+<hr width="100%">
+<h1><a name="2"></a>2. Where to get GNU nano.</h1>
+<h2><a name="2.1"></a>2.1. FTP and WWW sites that carry nano.</h2>
+<blockquote><p>The nano distribution can be downloaded at the following fine web and ftp sites:</p>
+  <ul>
+    <li><a href="http://www.nano-editor.org/dist/">http://www.nano-editor.org/dist/</a></li>
+    <li><a href="http://www.ewtoo.org/~astyanax/nano/dist/">http://www.ewtoo.org/~astyanax/nano/dist/</a></li>
+    <li><a href="ftp://ftp.gnu.org/pub/gnu/nano/">ftp://ftp.gnu.org/pub/gnu/nano/</a></li>
+  </ul>
+</blockquote>
+<h2><a name="2.2"></a>2.2. RedHat and derivatives (.rpm) packages.</h2>
+<blockquote>
+  <ul>
+    <li><a href="http://www.nano-editor.org/dist/v1.2/RPMS/">http://www.nano-editor.org/dist/v1.2/RPMS/</a></li>
+    <li><a href="http://www.ewtoo.org/~astyanax/nano/dist/v1.2/RPMS/">http://www.ewtoo.org/~astyanax/nano/dist/v1.2/RPMS/</a></li>
+  </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>
+  </ul>
+</blockquote>
+<h2><a name="2.3"></a>2.3. Debian (.deb) packages.</h2>
+<blockquote><p>Debian users can check out the current nano packages for:</p>
+  <ul>
+    <li><a href="http://packages.debian.org/stable/editors/nano.html">stable</a></li>
+    <li><a href="http://packages.debian.org/testing/editors/nano.html">testing</a></li>
+    <li><a href="http://packages.debian.org/unstable/editors/nano.html">unstable</a></li>
+  </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>
+<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>
+<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>The average case is this:</p>
+  <p><b>cd nano-x.y.z/</b><br>
+  <b>./configure</b><br>
+  <b>make</b><br>
+  <b>make install</b> (as root, of course)</p></blockquote>
+<h2><a name="3.3"></a>3.3. Why does everything go into /usr/local?</h2>
+<blockquote><p>Well, that's what the <b>configure</b> script defaults to. If you wish to change this, simply do this:</p>
+  <p><b>./configure --prefix=/usr</b></p>
+  <p>to put nano into /usr/bin when you run <b>make install</b>.</p></blockquote>
+<h2><a name="3.4"></a>3.4. I get errors about 'bindtextdomain', 'gettext' and/or 'gettextdomain'. What can I do about it?</h2>
+<blockquote><p>Try doing a <b>./configure --with-included-gettext</b> and see if that solves your problem. You may need to do a <b>make clean; make</b> to get it to work fully.</p></blockquote>
+<h2><a name="3.5"></a>3.5. Nano should automatically run strip on the binary when installing it!</h2>
+<blockquote><p>Actually, it does, but you have to use <b>make install-strip</b>. The default make install does not, and will not, run strip automatically.</p></blockquote>
+<h2><a name="3.6"></a>3.6. How can I make the executable smaller? This is too bloated!</h2>
+<blockquote><p>Actually, there are several parts of the editor that can be disabled. You can pass arguments to the <b>configure</b> script that disable certain features. Here's a brief list:</p>
+  <pre>
+  <b>--disable-tabcomp</b>       Disables tab completion code for a smaller binary
+  <b>--disable-justify</b>       Disable justify/unjustify function
+  <b>--disable-speller</b>       Disables spell checker function
+  <b>--disable-help</b>          Disables help function (^G)
+  <b>--disable-browser</b>       Disables mini file browser
+  <b>--disable-wrapping</b>      Disables all wrapping of text (and -w flag)
+  <b>--disable-mouse</b>         Disables 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>          Enables color and syntax highlighting
+  <b>--enable-multibuffer</b>    Enables having multiple file buffers open
+  <b>--enable-all</b>            Enables all of the above features</pre></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>
+<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 three-digit ASCII code from 000 to 255, and the character with that ASCII code will be inserted instead.</p>
+  <p><b>NOTE:</b> Verbatim input doesn't work at prompts right now. This will be fixed soon.</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>
+<hr width="100%">
+<h1><a name="4"></a>4. Running</h1>
+<h2><a name="4.1"></a>4.1. 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>
+  <p>Bourne shell users (like bash): <b>export TERM=vt100</b><br>
+  C Shell users (tcsh and csh): <b>setenv TERM vt100</b></p></blockquote>
+<h2><a name="4.2"></a>4.2. 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.3"></a>4.3. 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.4"></a>4.4. [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>
+<a name="4.5"></a>
+<h2><a name="4.5a"></a>4.5a. [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.5b"></a>4.5b. [version 1.2.2 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.6"></a>4.6. I get the message &quot;NumLock glitch detected. Keypad will malfunction with NumLock off.&quot; What gives?</h2>
+<blockquote><p>Nano (and actually almost all console editors) has issues when cycling the NumLock key in certain X terminals (rxvt, aterm, wterm, etc...). When you switch NumLock from on to off, you put the terminal into an &quot;application mode&quot; that changes what sequences are sent by the keypad. These sequences vary sufficiently from terminal to terminal that it is nearly impossible to work around them from within nano.</p>
+  <p>In a nutshell, if you want to be able to use the keypad with the arrow and page up/down functionality, you have to exit nano and reset your terminal (presumably with &quot;reset&quot; or &quot;stty sane&quot; or similar) and then run nano again with NumLock off. If you know an easier way to restore &quot;normal mode&quot;, please mail <a href="mailto:nano@nano-editor.org">nano@nano-editor.org</a>.</p></blockquote>
+<h2><a name="4.7"></a>4.7. 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><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><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><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.8"></a>4.8. 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>
+<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>
+<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>
+<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>
+<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>
+<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>
+  <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.2/BUGS">bug</a> in the program or implement a <a href="http://www.nano-editor.org/dist/v1.2/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>
+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>
+</body>
+</html>

doc/man/.cvsignore

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

doc/man/Makefile.am

@@ -0,0 +1,12 @@
+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

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

doc/man/fr/Makefile.am

@@ -0,0 +1,10 @@
+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

@@ -0,0 +1,229 @@
+.\" Hey, EMACS: -*- nroff -*-
+.\" nano.1 is copyright (C) 1999, 2000, 2001, 2002, 2003 by
+.\" Chris Allegretta <chrisa@asty.org>
+.\"
+.\" (c) 2003 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.
+.\"
+.TH NANO 1 "19 juin 2003 (v.f. du 25 août 2003)"
+.\" 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\fP.
+.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 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.
+
+.SH OPTIONS
+.TP
+.B \+\fILIGNE\fP
+Démarre avec le curseur positionné à la ligne numéro \fILIGNE\fP.
+.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 \-F (\-\-multibuffer)
+Active le mode multifichiers, 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
+.I ~/.nano_history
+afin de permettre leur réutilisation. Ceci n'est possible que si
+.B nano
+est capable d'utiliser les fichiers
+nanorc.
+.TP
+.B \-I (\-\-ignorercfiles)
+N'utilise pas les fichiers
+.I $SYSCONFDIR/nanorc
+et
+.IR ~/.nanorc ,
+même si
+.B nano
+est capable de les utiliser.
+.TP
+.B \-K (\-\-keypad)
+Essaie au maximum de ne pas utiliser les appels keypad() de ncurses. 
+Utilisez ce paramètre si vous vous apercevez que les flèches du pavé 
+numérique ne fonctionnent pas sous nano.
+.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 \\\fIn\fP dans les chaînes de 
+remplacement pour faire référence à la \fIn\fP-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
+.IR .nanorc ,
+si cette fonctionnalité est disponible.
+.TP
+.B \-c (\-\-const)
+Affiche en permanence la position du curseur.
+.TP
+.B \-h (\-\-help)
+Affiche de la liste 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
+.IR /tmp \ ?
+.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 à une cage chroot.
+.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\fP. 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\fP lit les fichiers d'initialisation dans l'ordre suivant\ : 
+\fI$SYSCONFDIR/nanorc\fP, puis \fI~/.nanorc\fP. Reportez-vous à la page 
+de manuel de \fBnanorc\fP(5) et au fichier-exemple \fInanorc.sample\fP 
+qui devrait être livré avec \fBnano\fP.
+
+.SH NOTES
+Dans certains cas, \fBnano\fP essaiera de sauvegarder le fichier en 
+cours d'édition dans un fichier de secours. Cela arrivera 
+principalement si \fBnano\fP 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\fP 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ée à la fin du nom du fichier en cours afin de le 
+rendre unique (par exemple, «\ .save.1\ »). En mode multifichiers, 
+\fBnano\fP 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, à
+.BR nano@nano-editor.org .
+
+N'hésitez pas à faire parvenir vos suggestions et commentaires relatifs 
+à la version française de \fBnano\fP à
+.BR jean-philippe.guerard@corbeaunoir.org .
+
+La liste de discussion anglophone \fBnano\fP est disponible via
+.BR nano-devel@gnu.org .
+Pour vous abonner, envoyez un courrier électronique à
+.BR nano-devel-request@gnu.org ,
+ayant pour objet «\ subscribe\ ».
+
+.SH SITE INTERNET
+http://www.nano-editor.org/
+
+.SH VOIR AUSSI
+.PD 0
+.TP
+\fBnanorc\fP(5)
+.PP
+\fI/usr/share/doc/nano/\fP (ou son équivalent sur votre système)
+
+.SH AUTEUR
+Chris Allegretta <chrisa@asty.org> et d'autres (voir les fichiers 
+\fIAUTHORS\fP et \fITHANKS\fP pour plus d'information). Cette page de 
+manuel a été initialement rédigée par Jordi Mallach 
+<jordi@sindominio.net> pour le système GNU Debian (mais elle peut être 
+utilisée par d'autres).
+
+.SH TRADUCTION
+Jean-Philippe Guérard <jean-philippe.guerard@corbeaunoir.org>, 2003.

doc/man/fr/nanorc.5

@@ -0,0 +1,198 @@
+.\" Hey, EMACS: -*- nroff -*-
+.\" nanorc.5 is Copyright (C) 2003 Free Software Foundation, Inc.
+.\"
+.\" (c) 2003 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.
+.\"
+.TH NANORC 5 "19 juin 2003 (v.f. du 25 août 2003)"
+.\" Please adjust this date whenever revising the manpage.
+.\" Merci de modifier ces dates à chaque mise à jour de cette page.
+
+.SH NAME
+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 \fI$SYSCONFDIR/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 données sur la ligne de commande 
+permettent d'outrepasser les 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é appelées
+.IR nom_du_fichier~ .
+.TP
+\fBset/unset const\fP
+Affiche en permanence la position du curseur dans la barre 
+d'information.
+.TP
+\fBset/unset cut\fP
+Par défaut, utilise ^K  pour couper le texte du curseur à 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 keypad\fP
+Utilise l'autre gestion du pavé numérique.
+.TP
+\fBset/unset multibuffer\fP
+Permet de charger simultanément plusieurs fichiers.
+.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 la barre 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 écrits dans ce 
+dossier. 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 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 regexp\fP
+Utilise par défaut des expressions rationnelles pour les recherches.
+.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
+sans demande de confirmation.
+.TP
+\fBset/unset view\fP
+Interdit la modification du fichier.
+.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 de colorisation \fBcolor\fP suivantes 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 coloré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
+Jean-Philippe Guérard <jean-philippe.guerard@corbeaunoir.org>, 2003.

doc/man/nano.1

@@ -0,0 +1,208 @@
+.\" Hey, EMACS: -*- nroff -*-
+.\" nano.1 is copyright (C) 1999, 2000, 2001, 2002, 2003 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.2" "March 31, 2004"
+.\" 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 \-B (\-\-backup)
+When saving a file, back up the previous version of it to the current
+filename suffixed with a ~.
+.TP
+.B \-D (\-\-dos)
+Write file in DOS format.
+.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 \-M (\-\-mac)
+Write file in Mac format.
+.TP
+.B \-N (\-\-noconvert)
+Disable automatic conversion of files from DOS/Mac format.
+.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 \-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 with ^K.
+.TP
+.B \-l (\-\-nofollow)
+If the file being edited is a symbolic link, replace the link with
+a new file, do not follow 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 -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
+\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

@@ -0,0 +1,174 @@
+.\" Hey, EMACS: -*- nroff -*-
+.\" nanorc.5 is Copyright (C) 2003 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.2" "March 31, 2004"
+.\" 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.
+.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 with ^K 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 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 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 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 with ^Z.
+.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
+.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/nanorc.sample

@@ -0,0 +1,215 @@
+## 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 ""
+
+## Constantly display the cursor position in the status bar.
+# set const
+
+## Use cut to end of line with ^K 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
+
+## Allow multiple file buffers (using ^R inserts into 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 help 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 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
+
+## 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 -c"
+
+## Allow nano to be suspended with ^Z
+# 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 rc file? ;)
+# set view
+
+## 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|char|int|void|static|const|struct)\>" 
+# color brightyellow "\<(if|while|do|else|case|switch)\>"
+# color brightcyan "^ *# *(define|include|ifn?def|endif|elif|else|if)" 
+##
+## 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 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|const|cut|fill|historylog|multibuffer|noconvert|nofollow|nohelp|nowrap|operatingdir|preserve|quotestr|rebinddelete|regexp|smooth|speller|suspend|tabsize|tempfile|view)"
+#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/texinfo/.cvsignore

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

doc/texinfo/Makefile.am

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

doc/texinfo/nano.texi

@@ -8,8 +8,8 @@
 @c Run `makeinfo' rather than `texinfo-format-buffer'.
 @smallbook
 @set EDITION 0.1
-@set VERSION 1.1.10
-@set UPDATED 14 Jul 2002
+@set VERSION 1.3.2
+@set UPDATED 31 Mar 2004
 
 @dircategory Editors
 @direntry
@@ -23,7 +23,7 @@
 @titlepage
 @title GNU @code{nano}
 @subtitle a small and friendly text editor.
-@subtitle version 1.1.10
+@subtitle version 1.3.2
 
 @author Chris Allegretta
 @page
@@ -40,7 +40,7 @@ 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
+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).
@@ -56,7 +56,7 @@ 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:
+You may contact the author by
 e-mail: @email{chrisa@@asty.org}@*
 @end titlepage
 
@@ -91,16 +91,14 @@ internationalization support, and filename tab completion.
 @node Overview, Command Line Options, Introduction, Introduction
 @section Overview
 
-@code{nano} [GNU long option] [option] +LINE [ @var{ file ...} ]
+@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 consistency is now a slightly higher priority. 
-There is a flag to implement (nearly) complete Pico emulation, (option -p
-or GNU long option --pico).  This can also be toggled from within
-@code{nano} by typing Meta-P.  @xref{Pico Compatibility}, for more
-info.
+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}. 
+Email bug reports to @email{nano@@nano-editor.org}.
 
 @node Command Line Options, , Overview, Introduction
 @section Command Line Options
@@ -116,16 +114,16 @@ filename suffixed with a ~.
 @item -D, --dos
 Write file in DOS format.
 
+@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 /etc/nanorc or ~/.nanorc, if nanorc support is available.
-
-@item -K, --keypad
-Do not use the ncurses keypad() call unless necessary.  Try this flag if
-you find that the arrow keys on the numeric keypad do not work for you
-under @code{nano}.
+Don't look at SYSCONFDIR/nanorc or ~/.nanorc, if nanorc support is
+available.
 
 @item -M, --mac
 Write file in Mac format.
@@ -134,18 +132,25 @@ Write file in Mac format.
 Do not convert files from DOS/Mac format.
 
 @item -Q [str], --quotestr [str]
-Set the quoting string for justifying.  The default is "> ".
+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
-Turns on regular expression search and search/replace.
+Turn on regular expression search and search/replace.
 
 @item -S, --smooth
-Enables smooth scrolling.
+Enable smooth scrolling.
 
-@item -T [num], --tabsize=[num]
-Set the displayed tab length to [num] columns.
+@item -T [num], --tabsize=[#cols]
+Set the displayed tab length to [#cols] columns.
 
-@item -V, --version 
+@item -V, --version
 Print the version number and copyright and quit.
 
 @item -Y, --syntax=[str]
@@ -155,6 +160,11 @@ available.
 @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.
 
@@ -175,18 +185,18 @@ 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.
+Set operating directory.  Makes @code{nano} set up something similar to
+a chroot.
 
-@item -p, --pico
-Emulate Pico as closely as possible, sacrificing consistency for correct
-emulation.  @xref{Pico Compatibility}, for more info.
+@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.
+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 its
@@ -200,21 +210,21 @@ 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.
+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.
+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.
+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.
+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
@@ -241,42 +251,45 @@ Start at line number LINE instead of the default of line 1.
 @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
+@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.  
+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 ^) or the Meta key (displayed as M).
-     
+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 letter.  
+pressing the desired key, or by pressing the Esc key twice and pressing
+the desired key.
 @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.
+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.
+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
+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}.
 
@@ -284,7 +297,7 @@ section will display the current directory instead of the filename.
 @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 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.
@@ -296,15 +309,13 @@ the statusbar.
 @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. The exact
-functions which are displayed depend on whether Pico Compatibility Mode
-mode is enabled. @xref{Pico Compatibility}, for more info.
+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 
+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.
 
@@ -313,48 +324,44 @@ and ^V (Page Down) keys.  ^X exits the help system.
 @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 sequenced. @xref{Special Functions}, for more info.
+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 (--backup) command line flag.
+toggles the -B (@code{--backup}) command line flag.
 
 @item DOS Format Toggle (Meta-D)
-toggles the -D (--dos) command line flag.
+toggles the -D (@code{--dos}) command line flag.
 
 @item Multiple Files Toggle (Meta-F)
-toggles the  -F (--multibuffer) command line flag.
+toggles the -F (@code{--multibuffer}) command line flag.
 
 @item AutoIndent Toggle (Meta-I)
-toggles the -i (--autoindent) command line flag.
+toggles the -i (@code{--autoindent}) command line flag.
 
 @item Cut To End Toggle (Meta-K)
-toggles the -k (--cut) command line flag.
+toggles the -k (@code{--cut}) command line flag.
 
 @item Mouse Toggle (Meta-M)
-toggles the -m (--mouse) command line flag.
+toggles the -m (@code{--mouse}) command line flag.
 
 @item Mac Format Toggle (Meta-O)
-toggles the -M (--mac) command line flag.
-
-@item Pico Mode Toggle (Meta-P)
-toggles the -p (--pico) command line flag.
-@xref{Pico Compatibility}, for more info.
+toggles the -M (@code{--mac}) command line flag.
 
 @item Smooth Scrolling Toggle (Meta-S)
-toggles the -s (--smooth) command line flag.
+toggles the -S (@code{--smooth}) command line flag.
 
 @item AutoWrap Toggle (Meta-W)
-toggles the -w (--nowrap) command line flag.
+toggles the -w (@code{--nowrap}) command line flag.
 
 @item Expert/Nohelp Toggle (Meta-X)
-toggles the -x (--nohelp) command line flag.
+toggles the -x (@code{--nohelp}) command line flag.
 
 @item Suspend Toggle (Meta-Z)
-toggles the -z (--suspend) command line flag.
+toggles the -z (@code{--suspend}) command line flag.
 
 @item Open Previous File Toggle (Meta-<)
 changes buffer to previously loaded file.
@@ -362,9 +369,9 @@ changes buffer to previously loaded file.
 @item Open Next File Toggle (Meta->)
 changes buffer to next loaded file.
 
-
 @end table
 
+
 @node The File Browser, Pico Compatibility, Feature Toggles, Top
 @chapter The File Browser
 
@@ -372,69 +379,76 @@ 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 he arrow keys
-and page up/down.  The behavior of the enter (or 's') key varies by what
+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. 
+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
 
-nano does not completely emulate Pico by default.  The following
-differences apply to the default mode and Pico Compatibility mode:
+@code{nano} attempts to emulate Pico as closely as possible, but there
+are certain differences between the editors:
 
 @table @code
-@item Displayed Shortcuts
-By default, the following shortcuts are displayed in the Shortcut Lists:
+@item Search and Replace History
+As of version 1.2.2 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.
 
-^G ^O ^\ ^Y ^K ^C@*
-^X ^R ^W ^V ^U ^T
 
-Related functions are listed above or below each other by default.  The
-Justify function is not listed, instead the "Replace" function is
-displayed. Also, he "Read File" and "WriteOut" functions are aligned for
-consistency.
+@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).
 
-In Pico Compatibility mode, the default Pico shortcuts are displayed:
+@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.
 
-^G ^O ^R ^Y ^K ^C@*
-^X ^J ^W ^V ^U ^T   
-
-@item Previous String Text
-By default, previously entered string for a function (search string,
-file name) will be placed on the statusbar, and is editable.  This is
-done so there is consistency across all functions.  For example: even if
-there is a previous replace string, it can always be deleted if one
-wishes to perform an empty string replace.
-
-In Pico Compatibility Mode, the previously entered text in a search or
-replace will appear in brackets, and is not editable.  It is not a
-simple matter to do an empty string replace when a previous replace
-string exists, for example.  When writing a file, the previous filename
-will be displayed in the editable text portion of the editor.
+@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 
+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.
+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.2.2, 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:
+Building @code{nano} from source is fairly straightforward if you are
+familiar with compiling programs with autoconf support:
 
-tar xvfz nano-x.y.z.tar.gz (where x.y.z is the version of @code{nano})
-cd nano-x.y.z/
-./configure
-make
-make install
+@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:
@@ -449,36 +463,36 @@ Disable the tab completion code when reading or writing files.
 Disable the justify (^J)/unjustify (^U) functions in the editor.
 
 @item --disable-speller
-Disables spell checker ability.
+Disable spell checker ability.
 
 @item --disable-help
-Disables the help function (^G).  Disabling this option makes the binary
+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
-Disables the mini file browser (^O) when reading or writing files.
-
-@item --enable-tiny
-This options 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 it depends on to work properly.  It also disables the
-function toggles and mouse support.
-
-@item --disable-wrapping
-Disables all word wrapping in the editor.  This also eliminates the -w
-command line flag, as nonwrapping is then the default behavior.
+Disable the mini file browser (^T) when reading or writing files.
 
 @item --disable-mouse
-Disables all mouse functionality.  This also disables the -m command
-line flag which enables the mouse functions.
+Disable all mouse functionality.  This also disables the -m command line
+flag, which enables the mouse functions.
 
 @item --disable-operatingdir
-Disables setting of operating directory. This also disables the -o
+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
+Disables Native Language support.  This will make the available GNU
 @code{nano} translations unusable.
 
 @item --with-slang

faq.html

@@ -1,720 +0,0 @@
-<!doctype html public "-//w3c//dtd html 4.0 transitional//en">
-<html>
-<title>The GNU nano editor FAQ</title>
-<head>
-   <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
-   <meta name="GENERATOR" content="Mozilla/4.73 [en] (X11; U; Linux 2.2.16 i586) [Netscape]">
-</head>
-<body text="#000000" bgcolor="#FFFFFF" link="#0000EF" vlink="#51188E" alink="#FF0000">
-
-<h1>
-<font color="#CC0000">The nano FAQ</font></h1>
-<h2>
-<font color="#330000">Table of Contents</font></h2>
-
-<h2>
-<font color="#330000"><a href="#1">1.&nbsp; General</a></font></h2>
-
-<blockquote><font color="#330000"><a href="#1.1">1.1 About this FAQ.</a></font>
-<br><font color="#330000"><a href="#1.2">1.2. How do I contribute to it?</a></font>
-<br><font color="#330000"><a href="#1.3">1.3. What is GNU nano?</a></font>
-<br><font color="#330000"><a href="#1.4">1.4. What is the history behind
-nano?</a></font>
-<br><font color="#330000"><a href="#1.5">1.5. Why the name change from
-TIP?</a></font>
-<br><font color="#330000"><a href="#1.6">1.6. What is the current version
-of nano?</a></font>
-<br><font color="#330000"><a href="#1.7">1.7. I want to read the manpage
-without having to download the program!</a></font></blockquote>
-
-<h2>
-<font color="#330000"><a href="#2">2. Where to get GNU 
-nano</a></font></h2>
-
-<blockquote><font color="#330000"><a href="#2.1">2.1. FTP and WWW sites
-that carry nano.</a></font>
-<br><font color="#330000"><a href="#2.2">2.2. Redhat and derivatives (.rpm)
-packages.</a></font>
-<br><font color="#330000"><a href="#2.3">2.3. Debian (.deb) packages.</a></font>
-<br><font color="#330000"><a href="#2.4">2.4. By CVS (for the brave).</a></font></blockquote>
-
-<h2>
-<font color="#330000"><a href="#3">3. Installation and Configuration</a></font></h2>
-
-<blockquote><font color="#330000"><a href="#3.1">3.1. How do install the
-RPM or DEB package?</a></font>
-<br><font color="#330000"><a href="#3.2">3.2. Compiling from source: WHAT
-THE HECK DO I DO NOW?</a></font>
-<br><font color="#330000"><a href="#3.3">3.3. Why does everything go into
-/usr/local?</a></font>
-<br><font color="#330000"><a href="#3.4">3.4. I get errors about 'bindtextdomain',
-'gettext' and/or 'gettextdomain'.&nbsp; What can I do about it?</a></font>
-<br><font color="#330000"><a href="#3.5">3.5. Nano should automatically 
-run strip on the binary when installing it!</a></font>
-<br><font color="#330000"><a href="#3.6">3.6. How can I make the
-executable smaller?  This is too bloated!</a></font>
-<br><font color="#330000"><a href="#3.7">3.7. Tell me more about this
-multibuffer stuff!</a></font>
-<br><font color="#330000"><a href="#3.8">3.8. How do I make a .nanorc file
-that nano will read when I start it?</a></font></blockquote>
-
-<h2>
-<font color="#330000"><a href="#4">4. Running</a></font></h2>
-
-<blockquote><font color="#330000"><a href="#4.1">4.1. Ack!&nbsp; My backspace/delete/enter/double
-bucky/meta key doesn't seem to work!&nbsp; What can I do?</a></font>
-<br><font color="#330000"><a href="#4.2">4.2. Nano crashes when I type
-&lt;insert keystroke here>!</a></font>
-<br><font color="#330000"><a href="#4.3">4.3. Nano crashes when I resize
-my window.&nbsp;&nbsp; How can I fix that?</a></font>
-<br><font color="#330000"><a href="#4.4">4.4. Why does nano show ^\
-in the shortcut list instead of ^J?</a></font>
-<br><font color="#330000"><a href="#4.5">4.5. When I type in a
-search string, the string I last searched for is already in front of
-my cursor!  What happened?!</a></font>
-<br><font color="#330000"><a href="#4.6">4.6. I get the message "NumLock
-glitch detected.  Keypad will malfunction with NumLock off." What
-gives?</a></font>
-<br><font color="#330000"><a href="#4.7">4.7. How do I make nano my
-default editor (in Pine, mutt, etc.)?</a></font></blockquote>
-
-<h2>
-<font color="#330000"><a href="#5">5. Internationalization</a></font></h2>
-
-<blockquote><font color="#330000"><a href="#5.1">5.1. There's no translation
-for my language!</a></font>
-<br><font color="#330000"><a href="#5.2">5.2. I don't like the translation
-for &lt;x> in my language.&nbsp;&nbsp; How can I fix it?</a></font></blockquote>
-
-<h2>
-<font color="#330000"><a href="#6">6. Advocacy and Licensing</a></font></h2>
-
-<blockquote><font color="#330000"><a href="#6.1">6.1. Why should I use
-nano instead of Pico?</a></font>
-<br><font color="#330000"><a href="#6.2">6.2. Why should I use Pico instead
-of nano?</a></font>
-<br><font color="#330000"><a href="#6.3">6.3. What is so bad about the
-Pine license?</a></font>
-<br><font color="#330000"><a href="#6.4">6.4. Okay, well what mail program
-should I use then?</a></font>
-<br><font color="#330000"><a href="#6.5">6.5. Why doesn't UW simply change
-their license?</a></font>
-<br><font color="#330000"><a href="#6.6">6.6. What if tomorrow UW changes
-the license to be truly Free Software?</a></font></blockquote>
-
-<h2>
-<font color="#330000"><a href="#7">7. Miscellaneous</a></font></h2>
-
-<blockquote><font color="#330000"><a href="#7.1">7.1. Nano related mailing
-lists.</a></font>
-<br><font color="#330000"><a href="#7.2">7.2. I want to send the development
-team a big load of cash (or just a thank you).</a></font>
-<br><font color="#330000"><a href="#7.3">7.3. How do I submit a patch?</a></font>
-<br><font color="#330000"><a href="#7.4">7.4. How do I join the development
-team?</a></font>
-<br><font color="#330000"><a href="#7.5">7.5. Can I have CVS write access?</a></font></blockquote>
-
-<h2>
-<a href="#8">8. ChangeLog</a></h2>
-
-<hr WIDTH="100%">
-<br>&nbsp;
-<h1>
-<a NAME="1"></a><font color="#330000">1.&nbsp; General</font></h1>
-
-<h2>
-<a NAME="1.1"></a><font color="#330000">1.1 About this FAQ.</font></h2>
-
-<blockquote><font color="#330000">This FAQ was written and is maintained
-by Chris Allegretta &lt;<a href="mailto:chrisa@asty.org">chrisa@asty.org</a>>,
-who also happens to be the creator of nano.&nbsp;&nbsp; Maybe someone else
-will volunteer to maintain this FAQ someday, who knows...</font></blockquote>
-
-<h2>
-<a NAME="1.2"></a><font color="#330000">1.2. How do I contribute to it?</font></h2>
-
-<blockquote><font color="#330000">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.</font></blockquote>
-
-<h2>
-<a NAME="1.3"></a><font color="#330000">1.3. What is GNU nano?</font></h2>
-
-<blockquote><font color="#330000">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>.&nbsp; It aims to "emulate Pico as closely as possible and
-perhaps include extra functionality.</font></blockquote>
-
-<h2>
-<a NAME="1.4"></a><font color="#330000">1.4. What is the history behind
-nano?</font></h2>
-
-<blockquote><font color="#330000">Funny you should ask!</font>
-<p><b><font color="#330000">In the beginning...</font></b>
-<p><font color="#330000">For years Pine was THE program used to read email
-on a Unix system.&nbsp; The Pico text editor is the portion of the program
-one would use to compose his or her mail messages.&nbsp; Many beginners
-to Unix flocked to Pico and Pine because of their well organized, easy
-to use interfaces.&nbsp; 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.</font>
-<p><b><font color="#330000">Then came Debian...</font></b>
-<p><font color="#330000">The <a href="http://www.debian.org">Debian GNU/Linux</a>
-distribution, known for its strict standards in distributing truly "free"
-software (i.e. had no restrictions on redistribution), would not include
-a binary package for Pine or Pico.&nbsp; Many people had a serious dilemma:&nbsp;
-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.</font>
-<p><b><font color="#330000">The event...</font></b>
-<p><font color="#330000">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).&nbsp; 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.</font>
-<p><font color="#330000">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).&nbsp;
-The program could not be invoked without a filename, could not save files,
-had no help menu, spell checker, and so forth.&nbsp; 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><font color="#330000">In February 2001, nano has been declared an
-official GNU program by Richard Stallman.  Nano also reached its first
-production release on March 22, 2001.</font></blockquote>
-
-<h2>
-<a NAME="1.5"></a><font color="#330000">1.5. Why the name change from TIP?</font></h2>
-
-<blockquote><font color="#330000">On January 10, 2000, TIP was officially
-renamed to nano because of a namespace conflict with another program called
-'tip'.&nbsp; The original 'tip' program "establishes a full duplex terminal
-connection to a remote host", 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).</font></blockquote>
-
-<h2>
-<a NAME="1.6"></a><font color="#330000">1.6 What is the current version
-of nano?</font></h2>
-
-<blockquote><font color="#330000">The current version of nano *should*
-be 1.1.10.&nbsp; Of course you should always check the nano homepage to
-see what the latest and greatest version is.</font></blockquote>
-
-<h2>
-<a NAME="1.7"></a><font color="#330000">1.7. I want to read the man page
-without having to download the program!</font></h2>
-
-<blockquote><font color="#330000">Jeez, demanding, aren't we?&nbsp;&nbsp;
-Okay, look <a href="http://www.nano-editor.org/dist/nano.1.html">here</a>.</font></blockquote>
-
-<hr WIDTH="100%">
-<h1>
-<a NAME="2"></a><font color="#330000">2. Where to get GNU nano</font></h1>
-
-<h2>
-<a NAME="2.1"></a><font color="#330000">2.1. FTP and WWW sites that carry
-nano.</font></h2>
-
-<blockquote><font color="#330000">The nano distribution can be downloaded
-at the following fine web and ftp sites:</font>
-<ul>
-<li>
-<font color="#330000"><a href="http://www.nano-editor.org/dist">http://www.nano-editor.org/dist</a></font></li>
-
-<li>
-<font color="#330000"><a href="http://www.ewtoo.org/~astyanax/nano/dist">http://www.ewtoo.org/~astyanax/nano/dist</a></font></li>
-<li>
-<font color="#330000"><a href="ftp://ftp.gnu.org/pub/gnu/nano">ftp://ftp.gnu.org/pub/gnu/nano</a></font></li>
-
-</ul>
-</blockquote>
-
-<h2>
-<a NAME="2.2"></a><font color="#330000">2.2. Redhat and derivatives (.rpm)
-packages.</font></h2>
-
-<blockquote>
-<ul>
-<li>
-<font color="#330000"><a href="http://www.nano-editor.org/dist/RPMS">http://www.nano-editor.org/dist/RPMS</a></font></li>
-
-<li>
-<font color="#330000"><a href="http://www.ewtoo.org/~astyanax/nano/dist/RPMS">http://www.ewtoo.org/~astyanax/nano/dist/RPMS</a></font></li>
-
-</ul>
-<font color="#330000">Additionally, check out the Redhat contribs section
-at:</font>
-<ul>
-<li>
-<font color="#330000"><a href="http://distro.ibiblio.org/pub/Linux/distributions/redhat/contrib/libc6/i386">http://metalab.unc.edu/pub/Linux/distributions/redhat/contrib/libc6/i386</a></font></li>
-
-<li>
-<font color="#330000"><a href="ftp://distro.ibiblio.org/pub/Linux/distributions/redhat/contrib/libc6/i386">ftp://metalab.unc.edu/pub/Linux/distributions/redhat/contrib/libc6/i386</a></font></li>
-</ul>
-</blockquote>
-
-<h2>
-<a NAME="2.3"></a><font color="#330000">2.3. Debian (.deb) packages.</font></h2>
-
-<blockquote><font color="#330000">For Debian users, you can check out the
-current nano packages for:</font>
-<ul>
-<li>
-<font color="#330000"><a href="http://www.debian.org/Packages/stable/editors/nano.html">stable</a></font></li>
-
-<li>
-<font color="#330000"><a href="http://www.debian.org/Packages/testing/editors/nano.html">testing</a></font></li>
-
-<li>
-<font color="#330000"><a href="http://www.debian.org/Packages/unstable/editors/nano.html">unstable</a></font></li>
-</ul>
-<p><font color="#330000">You can also have a look at the</font>
-<font color="#330000"><a href="ftp://ftp.debian.org/debian/pool/main/n/nano/">Package Pool</a> to see all the available binary and source packages.</font></p>
-
-<font color="#330000">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.</font></blockquote>
-
-<h2>
-<a NAME="2.4"></a><font color="#330000">2.4. By CVS (for the brave).</font></h2>
-
-<blockquote><font color="#330000">For the 'bleeding edge' current version
-of nano, you can use CVS to download the current source code.&nbsp; <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!&nbsp; 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.</font></blockquote>
-
-<hr WIDTH="100%">
-<h1>
-<a NAME="3"></a><font color="#330000">3. Installation and Configuration</font></h1>
-
-<h2>
-<a NAME="3.1"></a><font color="#330000">3.1. How do install the RPM or
-DEB package?</font></h2>
-
-<blockquote><font color="#330000">It's simple really!&nbsp; 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.&nbsp; There are other programs to install packages,
-and if you wish to use those, knock yourself out.</font></blockquote>
-
-<h2>
-<a NAME="3.2"></a><font color="#330000">3.2. Compiling from source: WHAT
-THE HECK DO I DO NOW?</font></h2>
-
-<blockquote><font color="#330000">Okay, take a deep breath, this really
-isn't hard.&nbsp; Unpack the nano source with a command like:</font>
-<p><b><font color="#330000">tar -zxvf nano-x.y.z.tar.gz</font></b>
-<p><font color="#330000">If you get error messages about the -z option,
-try this:</font>
-<p><b><font color="#330000">gzip -dc nano-x.y.z.tar.gz | tar xvf -</font></b>
-<p><font color="#330000">(again, where x.y.z is the version number in question).&nbsp;
-Then you need to run configure with any options you might want (if any).</font>
-<p><font color="#330000">The average case is this:</font>
-<p><b><font color="#330000">cd nano-x.y.z/</font></b>
-<br><b><font color="#330000">./configure</font></b>
-<br><b><font color="#330000">make</font></b>
-<br><font color="#330000"><b>make install </b>(as root, of course)</font></blockquote>
-
-<h2>
-<a NAME="3.3"></a><font color="#330000">3.3. Why does everything go into
-/usr/local?</font></h2>
-
-<blockquote><font color="#330000">Well, that's what the <b>configure</b>
-script defaults to.&nbsp; If you wish to change this, simply do this:</font>
-<p><b><font color="#330000">./configure --prefix=/usr</font></b>
-<p><font color="#330000">to put nano into /usr/bin when you run <b>make
-install</b>.</font></blockquote>
-
-<h2>
-<a NAME="3.4"></a><font color="#330000">3.4. I get errors about 'bindtextdomain',
-'gettext' and/or 'gettextdomain'.&nbsp; What can I do about it?</font></h2>
-
-<blockquote><font color="#330000">Try doing a <b>./configure --with-included-gettext</b>
-and see if that solves your problem.&nbsp; You may need to do a <b>make
-clean ; make</b> to get it to work fully.</font></blockquote>
-
-<h2>
-<a NAME="3.5"></a><font color="#330000">3.5. Nano should automatically 
-run strip on the binary when installing it!</font></h2>
-
-<blockquote><font color="#330000">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.</font></blockquote>
-
-<h2>
-<a NAME="3.6"></a><font color="#330000">
-3.6. How can I make the executable smaller?  This is too
-bloated!</font></h2>
-
-<blockquote><font color="#330000">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:
-<pre>
-<b>--disable-tabcomp</b>       Disables tab completion code for a smaller binary
-<b>--disable-justify</b>       Disable justify/unjustify function
-<b>--disable-speller</b>       Disables spell checker function
-<b>--disable-help</b>          Disables help function (^G)
-<b>--disable-browser</b>       Disables mini file browser
-<b>--disable-wrapping</b>      Disables all wrapping of text (and -w flag)
-<b>--disable-mouse</b>         Disables mouse support (and -m flag)
-<b>--disable-operatingdir</b>  Disable setting of operating directory
-</pre><br>
-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>If, in the other hand, you can't live without bells and whistles, you could
-try:
-<pre>
-<b>--enable-extra</b>          Enable extra functions, including easter eggs
-<b>--enable-nanorc</b>         Enable use of .nanorc file
-<b>--enable-color</b>          Enables color and syntax highlighting
-<b>--enable-multibuffer</b>    Enables having multiple file buffers open
-</font></blockquote>
-
-<h2>
-<a NAME="3.7"></a><font color="#330000">
-3.7. Tell me more about this multibuffer stuff!</font></h2>
-
-<blockquote><font color="#330000"> To use multiple file buffers, you must
-be using nano 1.1.10 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>
-
-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 "Close", instead of the normal "Exit" when only one
-buffer is open. 
-</font></blockquote>
-
-<h2>
-<a NAME="3.8"></a><font color="#330000">
-3.8. How do I make a .nanorc file that nano will read when I start it?</font></h2>
-
-<blockquote><font color="#330000"> It's not hard at all!  But, your version
-of nano must have beem compiled with <b>--enable-nanorc</b>, and again must
-be version 1.1.10 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 "set
-pico" or "set nowrap". </font></blockquote> <hr WIDTH="100%">
-
-<h1><a NAME="4"></a><font color="#330000">4. Running</font></h1>
-
-<h2>
-<a NAME="4.1"></a><font color="#330000">4.1. Ack!&nbsp; My backspace/delete/enter/double
-bucky/meta key doesn't seem to work!&nbsp; What can I do?</font></h2>
-
-<blockquote><font color="#330000">Try setting your $TERM variable to 'vt100'.&nbsp;
-Nano doesn't yet support every term entry under the sun.</font>
-<p><font color="#330000">Bourne shell users (like bash): <b>export TERM=vt100</b></font>
-<br><font color="#330000">C Shell users (tcsh and csh): <b>setenv TERM
-vt100</b></font></blockquote>
-
-<h2>
-<a NAME="4.2"></a><font color="#330000">4.2. Nano crashes when I type &lt;insert
-keystroke here>!</font></h2>
-
-<blockquote><font color="#330000">If you aren't trying some bizarre keystroke
-combination with some bizarre $TERM entry, chances are you have found a
-bug.&nbsp;&nbsp; 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>.</font></blockquote>
-
-<h2>
-<a NAME="4.3"></a><font color="#330000">4.3. Nano crashes when I resize
-my window.&nbsp;&nbsp; How can I fix that?</font></h2>
-
-<blockquote><font color="#330000">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).</font></blockquote>
-
-<h2>
-<a NAME="4.4"></a><font color="#330000">4.4. Why does nano show ^\ in the
-shortcut list instead of ^J?</font></h2>
-
-<blockquote><font color="#330000">The help (^G) and justify (^J) function
-were among the last to be written.&nbsp; To show the improvements that
-nano had over Pico (goto line # and replace), ^_ and ^\ were put on the
-shortcut list.&nbsp;&nbsp; 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.</font></blockquote>
-
-<h2>
-<a name="4.5"><font color="#330000">4.5. When I type in a search
-string, the string I last searched for is already in front of my
-cursor!  What happened?!</font></h2>
-
-<blockquote><font color="#330000">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).</font></blockquote>
-
-<h2>
-<a NAME="4.6"></a>I get the message "NumLock glitch detected.  Keypad
-will malfunction with NumLock off." What gives?</h2>
-
-<blockquote>
-Nano (actually almost all console editors do) has issues when cycling
-the NumLock key in certain X terminals (rxvt, aterm, wterm, etc...).  When
-you switch NumLock on to off, you put the terminal into an "application
-mode" that changes what sequences are sent by the keypad.  These sequences
-vary sufficiently from terminal to terminal that it is nearly impossible
-to work around them from within nano.  
-<br><br>
-In a nutshell, if you want to be able to use the keypad with the arrow and
-page up/down functionality, you have to exit nano and reset your terminal
-(presumably with "reset" or "stty sane" or similar) and then run nano
-again with NumLock off.  If you know an easier way to restore "normal
-mode", please mail <A href="mailto:nano@nano-editor.org">nano@nano-editor.org</A>.
-<br>&nbsp;</blockquote>
-
-<h2>
-<a NAME="4.7"></a>4.7. How do I make nano my default editor (in Pine,
-mutt, etc)?</h2>
-
-<blockquote>You need to make nano your $EDITOR.&nbsp; 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><b>export EDITOR=/usr/local/bin/nano</b>
-<p>or if you use tcsh put this in your <b>.cshrc</b> file:
-<p><b>setenv EDITOR /usr/local/bin/nano</b>
-<p>Change /usr/local/bin/nano to wherever nano is installed in your system.&nbsp;
-Type which nano to find out. This will not take effect until the next time
-you login.&nbsp; So log out and back in again.
-<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>).&nbsp; Hit enter on the
-lines that say:
-<p><b>[ ]&nbsp; enable-alternate-editor-cmd</b>
-<br><b>[ ]&nbsp; enable-alternate-editor-implicitly</b>
-<p>Then exit (<b>E</b>) and select Yes (<b>Y</b>).
-<p>Mutt users should see an effect immediately the next time you log in,
-no further configuration is needed.&nbsp; 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><b>my_hdr X-Composer: nano x.y.z</b>
-<p>Again, replace x.y.z with the version of nano you use.
-<br>&nbsp;</blockquote>
-
-<hr WIDTH="100%">
-<h1>
-<a NAME="5"></a><font color="#330000">5. Internationalization</font></h1>
-
-<h2>
-<a NAME="5.1"></a><font color="#330000">5.1. There's no translation for
-my language!</font></h2>
-
-<blockquote><font color="#330000">On June of 2001, GNU nano entered the
-<a href="www.iro.umontreal.ca/contrib/po/HTML">Free Translation Project</a>
-and since then, translations should be managed from there.
-<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 tranlate 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 <strong>not</strong> mean that
-you transfer the rights of your work to the FSF, it's just so the FSF can
-legaly manage them).</p>
-<p>In any case, translating nano is very easy.&nbsp; 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.&nbsp; When you're done, you should
-send it to the TP's central po repository.
-
-<h2>
-<a NAME="5.2"></a><font color="#330000">5.2. I don't like the translation
-for &lt;x> in my language.&nbsp;&nbsp; How can I fix it?</font></h2>
-
-<blockquote><font color="#330000">The best way would probably be to e-mail
-the person listed in the <code>Last-Translator:</code> field in
-<b>&lt;your_language&gt;.po</b> file with your suggested corrections and
-they can make the changes reach the nano devel list.</font></blockquote>
-
-<hr WIDTH="100%">
-<h1>
-<a NAME="6"></a><font color="#330000">6. Advocacy and Licensing</font></h1>
-
-<h2>
-<a NAME="6.1"></a><font color="#330000">6.1. Why should I use nano instead
-of Pico?</font></h2>
-
-<blockquote><font color="#330000">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>.</font></blockquote>
-
-<h2>
-<a NAME="6.2"></a><font color="#330000">6.2. Why should I use Pico instead
-of nano?</font></h2>
-
-<blockquote>Again, check out the <a href="http://www.nano-editor.org">nano
-homepage</a> for a good summary of reasons.&nbsp; It really is a matter
-of personal preference as to which editor you should use.&nbsp; If you're
-the type of person who likes using the original version of a program, then
-Pico is the editor for you.&nbsp;&nbsp; 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.
-</blockquote>
-
-<h2>
-<a NAME="6.3"></a><font color="#330000">6.3. What is so bad about the Pine
-license?</font></h2>
-
-<blockquote><font color="#330000">The U of W license for Pine and
-Pico is not considered truly Free Software according to both the Free
-Software Foundation and the  the <a
-href="http://www.debian.org/social_contract#guidelines">Debian
-Free Software Guidelines</a>.&nbsp; 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.</blockquote>
-
-<h2>
-<a NAME="6.4"></a><font color="#330000">6.4. Okay, well what mail program
-should I use then?</font></h2>
-
-<blockquote><font color="#330000"> 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>.&nbsp; 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.&nbsp; It's also licensed under the GPL.</font></blockquote>
-
-<h2>
-<a NAME="6.5"></a><font color="#330000">6.5. Why doesn't UW simply change
-their license?</font></h2>
-
-<blockquote><font color="#330000">You're really not asking the right person
-here.&nbsp; 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.</font></blockquote>
-
-<h2>
-<a NAME="6.6"></a><font color="#330000">6.6. What if tomorrow UW changes
-the license to be truly Free Software?</font></h2>
-
-<blockquote><font color="#330000">Honestly nothing would make me happier
-than to see that happen.&nbsp; Nano would continue to be developed independently
-until such time as Pico had all the features nano did or the projects merged.&nbsp;
-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.</font></blockquote>
-
-<hr WIDTH="100%">
-<h1>
-<a NAME="7"></a><font color="#330000">7. Miscellaneous</font></h1>
-
-<h2>
-<a NAME="7.1"></a><font color="#330000">7.1. Nano related mailing lists.</font></h2>
-
-<blockquote><font color="#330000">There are three mailing lists for nano
-hosted at <a href="http://savannah.gnu.org">Savannah</a>, info-nano, help-nano 
-and nano-devel.&nbsp; Nano-announce is a very low traffic list where new
-versions of nano are announced (surprise!)&nbsp; Nano-devel is a normally
-low, sometimes high traffic list for discussing the present and future
-development of nano.&nbsp; Help-nano is for getting help with the editor
-without needing to hear all of the development issues surrunding it.
-&nbsp; Here are links to where you can sign up for
-a given list:</font><font color="#330000"></font>
-<p><font color="#330000">info-nano - <a href="
-http://mail.gnu.org/mailman/listinfo/info-nano">
-http://mail.gnu.org/mailman/listinfo/info-nano</a></font>
-<br>
-<font color="#330000">help-nano - 
-<a href="http://mail.gnu.org/mailman/listinfo/help-nano">
-http://mail.gnu.org/mailman/listinfo/help-nano</a></font>
-<br>
-<font color="#330000">nano-devel - 
-<a href="http://mail.gnu.org/mailman/listinfo/nano-devel">
-http://mail.gnu.org/mailman/listinfo/nano-devel</a></font>
-</blockquote>
-
-<h2>
-<a NAME="7.2"></a><font color="#330000">7.2. I want to send the development
-team a big load of cash (or just a thank you).</font></h2>
-
-<blockquote><font color="#330000">That's fine.&nbsp; Send it <a href="mailto:nano-devel@gnu.org">our
-way</a>!&nbsp; Better yet, fix a <a href="http://www.nano-editor.org/dist/BUGS">bug</a>
-in the program or implement a <a href="http://www.nano-editor.org/dist/TODO">cool
-feature</a> and send us that instead (though cash is fine too).</font></blockquote>
-
-<h2>
-<a NAME="7.3"></a><font color="#330000">7.3. How do I submit a patch?</font></h2>
-
-<blockquote><font color="#330000">See Section <a href="#7.2">7.2</a>.</font></blockquote>
-
-<h2>
-<a NAME="7.4"></a><font color="#330000">7.4. How do I join the development
-team?</font></h2>
-
-<blockquote><font color="#330000">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.&nbsp; Then ask nicely and you
-will probably be added to the Savannah development list and be given
-CVS write after awhile.&nbsp; 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.</font></blockquote>
-
-<h2>
-<a NAME="7.5"></a><font color="#330000">7.5. Can I have CVS write access?</font></h2>
-
-<blockquote><font color="#330000">Re-read Section </font><a href="#7.4">7.4</a><font color="#330000">
-and you should know the answer.</font></blockquote>
-
-<h2>
-<a NAME="8"></a><font color="#330000">8. ChangeLog</font>
-</h2>
-
-<blockquote>2002/05/15 - Typo fix (DLR).</blockquote>
-<blockquote>2001/12/26 - Misc. fixes (Aaron S. Hawley, DLR).</blockquote>
-<blockquote>2001/10/02 - Update for Free Translation Project.</blockquote>
-<blockquote>2001/10/02 - Assorted fixes, Debian additions.</blockquote>
-<blockquote>2001/06/30 - Silly typo fix.</blockquote>
-<blockquote>2001/05/05 - Spelling fixes by David Lawrence Ramsey.</blockquote>
-<blockquote>2001/05/02 - Misc fixes.</blockquote>
-<blockquote>2001/03/26 - Typo fix in an URL.</blockquote>
-<blockquote>2001/02/17 - Advocacy updates.</blockquote>
-<blockquote>2001/02/15 - Added GNU notes for 0.9.99pre3.</blockquote>
-<blockquote>2001/02/06 - Typo fixes.</blockquote>
-<blockquote>2001/01/14 - Added note about numlock glitch.</blockquote>
-<blockquote>2001/01/10 - Linux --&gt; GNU/Linux.</blockquote>
-<blockquote>2001/01/09 - Added "making exe smaller section.</blockquote>
-<blockquote>2000/12/19 - Typo and assorted error fixes.</blockquote>
-<blockquote>2000/11/28 - Added blurb about make install-strip.</blockquote>
-<blockquote>2000/11/19 - Changed Debian frozen to stable.</blockquote>
-<blockquote>2000/11/18 - Previous string display (4.5).</blockquote>
-<blockquote>2000/09/27 - Moved addresses to nano-editor.org.</blockquote>
-<blockquote>2000/06/31 - Initial framework.</blockquote>
-<P>
-$Id$
-</body>
-</html>

m4/ChangeLog

@@ -1,3 +1,18 @@
+2002-08-21  gettextize  <bug-gnu-gettext@gnu.org>
+
+	* gettext.m4: Upgrade to gettext-0.11.5.
+	* ulonglong.m4: New file, from gettext-0.11.5.
+	* iconv.m4: Upgrade to gettext-0.11.5.
+	* intdiv0.m4: New file, from gettext-0.11.5.
+	* inttypes.m4: New file, from gettext-0.11.5.
+	* inttypes_h.m4: New file, from gettext-0.11.5.
+	* inttypes-pri.m4: New file, from gettext-0.11.5.
+	* lcmessage.m4: Upgrade to gettext-0.11.5.
+	* lib-link.m4: Upgrade to gettext-0.11.5.
+	* stdint_h.m4: New file, from gettext-0.11.5.
+	* uintmax_t.m4: New file, from gettext-0.11.5.
+	* Makefile.am (EXTRA_DIST): Add the new files.
+
 2002-06-03  gettextize  <bug-gnu-gettext@gnu.org>
 
 	* codeset.m4: Upgrade to gettext-0.11.2.

m4/Makefile.am

@@ -1,2 +1,4 @@
-EXTRA_DIST =	isc-posix.m4 lib-ld.m4 lib-link.m4 lib-prefix.m4 codeset.m4 \
-		glibc21.m4 progtest.m4 gettext.m4 iconv.m4 lcmessage.m4
+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

m4/gettext.m4

@@ -1,4 +1,4 @@
-# gettext.m4 serial 14 (gettext-0.11.2)
+# gettext.m4 serial 17 (gettext-0.11.5)
 dnl Copyright (C) 1995-2002 Free Software Foundation, Inc.
 dnl This file is free software, distributed under the terms of the GNU
 dnl General Public License.  As a special exception to the GNU General
@@ -33,7 +33,9 @@ dnl    AM-DISABLE-SHARED). If INTLSYMBOL is 'no-libtool', a static library
 dnl    $(top_builddir)/intl/libintl.a will be created.
 dnl If NEEDSYMBOL is specified and is 'need-ngettext', then GNU gettext
 dnl    implementations (in libc or libintl) without the ngettext() function
-dnl    will be ignored.
+dnl    will be ignored.  If NEEDSYMBOL is specified and is
+dnl    'need-formatstring-macros', then GNU gettext implementations that don't
+dnl    support the ISO C 99 <inttypes.h> formatstring macros will be ignored.
 dnl INTLDIR is used to find the intl libraries.  If empty,
 dnl    the value `$(top_builddir)/intl/' is used.
 dnl
@@ -60,9 +62,9 @@ AC_DEFUN([AM_GNU_GETTEXT],
   ifelse([$1], [], , [ifelse([$1], [external], , [ifelse([$1], [no-libtool], , [ifelse([$1], [use-libtool], ,
     [errprint([ERROR: invalid first argument to AM_GNU_GETTEXT
 ])])])])])
-  ifelse([$2], [], , [ifelse([$2], [need-ngettext], ,
+  ifelse([$2], [], , [ifelse([$2], [need-ngettext], , [ifelse([$2], [need-formatstring-macros], ,
     [errprint([ERROR: invalid second argument to AM_GNU_GETTEXT
-])])])
+])])])])
   define(gt_included_intl, ifelse([$1], [external], [no], [yes]))
   define(gt_libtool_suffix_prefix, ifelse([$1], [use-libtool], [l], []))
 
@@ -75,6 +77,21 @@ AC_DEFUN([AM_GNU_GETTEXT],
   AC_REQUIRE([AC_LIB_PREPARE_PREFIX])
   AC_REQUIRE([AC_LIB_RPATH])
 
+  dnl Sometimes libintl requires libiconv, so first search for libiconv.
+  dnl Ideally we would do this search only after the
+  dnl      if test "$USE_NLS" = "yes"; then
+  dnl        if test "$gt_cv_func_gnugettext_libc" != "yes"; then
+  dnl tests. But if configure.in invokes AM_ICONV after AM_GNU_GETTEXT
+  dnl the configure script would need to contain the same shell code
+  dnl again, outside any 'if'. There are two solutions:
+  dnl - Invoke AM_ICONV_LINKFLAGS_BODY here, outside any 'if'.
+  dnl - Control the expansions in more detail using AC_PROVIDE_IFELSE.
+  dnl Since AC_PROVIDE_IFELSE is only in autoconf >= 2.52 and not
+  dnl documented, we avoid it.
+  ifelse(gt_included_intl, yes, , [
+    AC_REQUIRE([AM_ICONV_LINKFLAGS_BODY])
+  ])
+
   AC_MSG_CHECKING([whether NLS is requested])
   dnl Default is enabled NLS
   AC_ARG_ENABLE(nls,
@@ -110,13 +127,20 @@ AC_DEFUN([AM_GNU_GETTEXT],
         dnl to fall back to GNU NLS library.
 
         dnl Add a version number to the cache macros.
-        define([gt_api_version], ifelse([$2], [need-ngettext], 2, 1))
+        define([gt_api_version], ifelse([$2], [need-formatstring-macros], 3, ifelse([$2], [need-ngettext], 2, 1)))
         define([gt_cv_func_gnugettext_libc], [gt_cv_func_gnugettext]gt_api_version[_libc])
         define([gt_cv_func_gnugettext_libintl], [gt_cv_func_gnugettext]gt_api_version[_libintl])
 
         AC_CACHE_CHECK([for GNU gettext in libc], gt_cv_func_gnugettext_libc,
          [AC_TRY_LINK([#include <libintl.h>
-extern int _nl_msg_cat_cntr;
+]ifelse([$2], [need-formatstring-macros],
+[#ifndef __GNU_GETTEXT_SUPPORTED_REVISION
+#define __GNU_GETTEXT_SUPPORTED_REVISION(major) ((major) == 0 ? 0 : -1)
+#endif
+changequote(,)dnl
+typedef int array [2 * (__GNU_GETTEXT_SUPPORTED_REVISION(0) >= 1) - 1];
+changequote([,])dnl
+], [])[extern int _nl_msg_cat_cntr;
 extern int *_nl_domain_bindings;],
             [bindtextdomain ("", "");
 return (int) gettext ("")]ifelse([$2], [need-ngettext], [ + (int) ngettext ("", "", 0)], [])[ + _nl_msg_cat_cntr + *_nl_domain_bindings],
@@ -141,7 +165,14 @@ return (int) gettext ("")]ifelse([$2], [need-ngettext], [ + (int) ngettext ("",
             LIBS="$LIBS $LIBINTL"
             dnl Now see whether libintl exists and does not depend on libiconv.
             AC_TRY_LINK([#include <libintl.h>
-extern int _nl_msg_cat_cntr;
+]ifelse([$2], [need-formatstring-macros],
+[#ifndef __GNU_GETTEXT_SUPPORTED_REVISION
+#define __GNU_GETTEXT_SUPPORTED_REVISION(major) ((major) == 0 ? 0 : -1)
+#endif
+changequote(,)dnl
+typedef int array [2 * (__GNU_GETTEXT_SUPPORTED_REVISION(0) >= 1) - 1];
+changequote([,])dnl
+], [])[extern int _nl_msg_cat_cntr;
 extern
 #ifdef __cplusplus
 "C"
@@ -155,7 +186,14 @@ return (int) gettext ("")]ifelse([$2], [need-ngettext], [ + (int) ngettext ("",
             if test "$gt_cv_func_gnugettext_libintl" != yes && test -n "$LIBICONV"; then
               LIBS="$LIBS $LIBICONV"
               AC_TRY_LINK([#include <libintl.h>
-extern int _nl_msg_cat_cntr;
+]ifelse([$2], [need-formatstring-macros],
+[#ifndef __GNU_GETTEXT_SUPPORTED_REVISION
+#define __GNU_GETTEXT_SUPPORTED_REVISION(major) ((major) == 0 ? 0 : -1)
+#endif
+changequote(,)dnl
+typedef int array [2 * (__GNU_GETTEXT_SUPPORTED_REVISION(0) >= 1) - 1];
+changequote([,])dnl
+], [])[extern int _nl_msg_cat_cntr;
 extern
 #ifdef __cplusplus
 "C"
@@ -450,7 +488,7 @@ AC_DEFUN([AM_PO_SUBDIRS],
         ;;
       esac
     done],
-   [# Capture the value of obsolete $ALL_LINGUAS because we need it to compute
+   [# Capture the value of obsolete ALL_LINGUAS because we need it to compute
     # POFILES, GMOFILES, UPDATEPOFILES, DUMMYPOFILES, CATALOGS. But hide it
     # from automake.
     eval 'ALL_LINGUAS''="$ALL_LINGUAS"'
@@ -479,6 +517,10 @@ AC_DEFUN([AM_INTL_SUBDIR],
   AC_REQUIRE([AC_FUNC_ALLOCA])dnl
   AC_REQUIRE([AC_FUNC_MMAP])dnl
   AC_REQUIRE([jm_GLIBC21])dnl
+  AC_REQUIRE([gt_INTDIV0])dnl
+  AC_REQUIRE([jm_AC_TYPE_UINTMAX_T])dnl
+  AC_REQUIRE([gt_HEADER_INTTYPES_H])dnl
+  AC_REQUIRE([gt_INTTYPES_PRI])dnl
 
   AC_CHECK_HEADERS([argz.h limits.h locale.h nl_types.h malloc.h stddef.h \
 stdlib.h string.h unistd.h sys/param.h])
@@ -488,7 +530,9 @@ strcasecmp strdup strtoul tsearch __argz_count __argz_stringify __argz_next])
 
   AM_ICONV
   AM_LANGINFO_CODESET
-  AM_LC_MESSAGES
+  if test $ac_cv_header_locale_h = yes; then
+    AM_LC_MESSAGES
+  fi
 
   dnl intl/plural.c is generated from intl/plural.y. It requires bison,
   dnl because plural.y uses bison specific features. It requires at least
@@ -537,3 +581,7 @@ AC_DEFUN([AM_MKINSTALLDIRS],
   fi
   AC_SUBST(MKINSTALLDIRS)
 ])
+
+
+dnl Usage: AM_GNU_GETTEXT_VERSION([gettext-version])
+AC_DEFUN([AM_GNU_GETTEXT_VERSION], [])

m4/iconv.m4

@@ -1,4 +1,4 @@
-# iconv.m4 serial AM3 (gettext-0.11)
+# iconv.m4 serial AM4 (gettext-0.11.3)
 dnl Copyright (C) 2000-2002 Free Software Foundation, Inc.
 dnl This file is free software, distributed under the terms of the GNU
 dnl General Public License.  As a special exception to the GNU General
@@ -8,11 +8,8 @@ dnl the same distribution terms as the rest of that program.
 
 dnl From Bruno Haible.
 
-AC_DEFUN([AM_ICONV_LINK],
+AC_DEFUN([AM_ICONV_LINKFLAGS_BODY],
 [
-  dnl Some systems have iconv in libc, some have it in libiconv (OSF/1 and
-  dnl those with the standalone portable GNU libiconv installed).
-
   dnl Prerequisites of AC_LIB_LINKFLAGS_BODY.
   AC_REQUIRE([AC_LIB_PREPARE_PREFIX])
   AC_REQUIRE([AC_LIB_RPATH])
@@ -20,6 +17,16 @@ AC_DEFUN([AM_ICONV_LINK],
   dnl Search for libiconv and define LIBICONV, LTLIBICONV and INCICONV
   dnl accordingly.
   AC_LIB_LINKFLAGS_BODY([iconv])
+])
+
+AC_DEFUN([AM_ICONV_LINK],
+[
+  dnl Some systems have iconv in libc, some have it in libiconv (OSF/1 and
+  dnl those with the standalone portable GNU libiconv installed).
+
+  dnl Search for libiconv and define LIBICONV, LTLIBICONV and INCICONV
+  dnl accordingly.
+  AC_REQUIRE([AM_ICONV_LINKFLAGS_BODY])
 
   dnl Add $INCICONV to CPPFLAGS before performing the following checks,
   dnl because if the user has installed libiconv and not disabled its use
@@ -69,7 +76,7 @@ AC_DEFUN([AM_ICONV_LINK],
 
 AC_DEFUN([AM_ICONV],
 [
-  AC_REQUIRE([AM_ICONV_LINK])
+  AM_ICONV_LINK
   if test "$am_cv_func_iconv" = yes; then
     AC_MSG_CHECKING([for iconv declaration])
     AC_CACHE_VAL(am_cv_proto_iconv, [

m4/intdiv0.m4

@@ -0,0 +1,72 @@
+# intdiv0.m4 serial 1 (gettext-0.11.3)
+dnl Copyright (C) 2002 Free Software Foundation, Inc.
+dnl This file is free software, distributed under the terms of the GNU
+dnl General Public License.  As a special exception to the GNU General
+dnl Public License, this file may be distributed as part of a program
+dnl that contains a configuration script generated by Autoconf, under
+dnl the same distribution terms as the rest of that program.
+
+dnl From Bruno Haible.
+
+AC_DEFUN([gt_INTDIV0],
+[
+  AC_REQUIRE([AC_PROG_CC])dnl
+  AC_REQUIRE([AC_CANONICAL_HOST])dnl
+
+  AC_CACHE_CHECK([whether integer division by zero raises SIGFPE],
+    gt_cv_int_divbyzero_sigfpe,
+    [
+      AC_TRY_RUN([
+#include <stdlib.h>
+#include <signal.h>
+
+static void
+#ifdef __cplusplus
+sigfpe_handler (int sig)
+#else
+sigfpe_handler (sig) int sig;
+#endif
+{
+  /* Exit with code 0 if SIGFPE, with code 1 if any other signal.  */
+  exit (sig != SIGFPE);
+}
+
+int x = 1;
+int y = 0;
+int z;
+int nan;
+
+int main ()
+{
+  signal (SIGFPE, sigfpe_handler);
+/* IRIX and AIX (when "xlc -qcheck" is used) yield signal SIGTRAP.  */
+#if (defined (__sgi) || defined (_AIX)) && defined (SIGTRAP)
+  signal (SIGTRAP, sigfpe_handler);
+#endif
+/* Linux/SPARC yields signal SIGILL.  */
+#if defined (__sparc__) && defined (__linux__)
+  signal (SIGILL, sigfpe_handler);
+#endif
+
+  z = x / y;
+  nan = y / y;
+  exit (1);
+}
+], gt_cv_int_divbyzero_sigfpe=yes, gt_cv_int_divbyzero_sigfpe=no,
+        [
+          # Guess based on the CPU.
+          case "$host_cpu" in
+            alpha* | i[34567]86 | m68k | s390*)
+              gt_cv_int_divbyzero_sigfpe="guessing yes";;
+            *)
+              gt_cv_int_divbyzero_sigfpe="guessing no";;
+          esac
+        ])
+    ])
+  case "$gt_cv_int_divbyzero_sigfpe" in
+    *yes) value=1;;
+    *) value=0;;
+  esac
+  AC_DEFINE_UNQUOTED(INTDIV0_RAISES_SIGFPE, $value,
+    [Define if integer division by zero raises signal SIGFPE.])
+])

m4/inttypes-pri.m4

@@ -0,0 +1,32 @@
+# inttypes-pri.m4 serial 1 (gettext-0.11.4)
+dnl Copyright (C) 1997-2002 Free Software Foundation, Inc.
+dnl This file is free software, distributed under the terms of the GNU
+dnl General Public License.  As a special exception to the GNU General
+dnl Public License, this file may be distributed as part of a program
+dnl that contains a configuration script generated by Autoconf, under
+dnl the same distribution terms as the rest of that program.
+
+dnl From Bruno Haible.
+
+# Define PRI_MACROS_BROKEN if <inttypes.h> exists and defines the PRI*
+# macros to non-string values.  This is the case on AIX 4.3.3.
+
+AC_DEFUN([gt_INTTYPES_PRI],
+[
+  AC_REQUIRE([gt_HEADER_INTTYPES_H])
+  if test $gt_cv_header_inttypes_h = yes; then
+    AC_CACHE_CHECK([whether the inttypes.h PRIxNN macros are broken],
+      gt_cv_inttypes_pri_broken,
+      [
+        AC_TRY_COMPILE([#include <inttypes.h>
+#ifdef PRId32
+char *p = PRId32;
+#endif
+], [], gt_cv_inttypes_pri_broken=no, gt_cv_inttypes_pri_broken=yes)
+      ])
+  fi
+  if test "$gt_cv_inttypes_pri_broken" = yes; then
+    AC_DEFINE_UNQUOTED(PRI_MACROS_BROKEN, 1,
+      [Define if <inttypes.h> exists and defines unusable PRI* macros.])
+  fi
+])

m4/inttypes.m4

@@ -0,0 +1,27 @@
+# inttypes.m4 serial 1 (gettext-0.11.4)
+dnl Copyright (C) 1997-2002 Free Software Foundation, Inc.
+dnl This file is free software, distributed under the terms of the GNU
+dnl General Public License.  As a special exception to the GNU General
+dnl Public License, this file may be distributed as part of a program
+dnl that contains a configuration script generated by Autoconf, under
+dnl the same distribution terms as the rest of that program.
+
+dnl From Paul Eggert.
+
+# Define HAVE_INTTYPES_H if <inttypes.h> exists and doesn't clash with
+# <sys/types.h>.
+
+AC_DEFUN([gt_HEADER_INTTYPES_H],
+[
+  AC_CACHE_CHECK([for inttypes.h], gt_cv_header_inttypes_h,
+  [
+    AC_TRY_COMPILE(
+      [#include <sys/types.h>
+#include <inttypes.h>],
+      [], gt_cv_header_inttypes_h=yes, gt_cv_header_inttypes_h=no)
+  ])
+  if test $gt_cv_header_inttypes_h = yes; then
+    AC_DEFINE_UNQUOTED(HAVE_INTTYPES_H, 1,
+      [Define if <inttypes.h> exists and doesn't clash with <sys/types.h>.])
+  fi
+])

m4/inttypes_h.m4

@@ -0,0 +1,28 @@
+# inttypes_h.m4 serial 4 (gettext-0.11.4)
+dnl Copyright (C) 1997-2002 Free Software Foundation, Inc.
+dnl This file is free software, distributed under the terms of the GNU
+dnl General Public License.  As a special exception to the GNU General
+dnl Public License, this file may be distributed as part of a program
+dnl that contains a configuration script generated by Autoconf, under
+dnl the same distribution terms as the rest of that program.
+
+dnl From Paul Eggert.
+
+# Define HAVE_INTTYPES_H_WITH_UINTMAX if <inttypes.h> exists,
+# doesn't clash with <sys/types.h>, and declares uintmax_t.
+
+AC_DEFUN([jm_AC_HEADER_INTTYPES_H],
+[
+  AC_CACHE_CHECK([for inttypes.h], jm_ac_cv_header_inttypes_h,
+  [AC_TRY_COMPILE(
+    [#include <sys/types.h>
+#include <inttypes.h>],
+    [uintmax_t i = (uintmax_t) -1;],
+    jm_ac_cv_header_inttypes_h=yes,
+    jm_ac_cv_header_inttypes_h=no)])
+  if test $jm_ac_cv_header_inttypes_h = yes; then
+    AC_DEFINE_UNQUOTED(HAVE_INTTYPES_H_WITH_UINTMAX, 1,
+[Define if <inttypes.h> exists, doesn't clash with <sys/types.h>,
+   and declares uintmax_t. ])
+  fi
+])

m4/lcmessage.m4

@@ -1,4 +1,4 @@
-# lcmessage.m4 serial 2 (gettext-0.10.40)
+# lcmessage.m4 serial 3 (gettext-0.11.3)
 dnl Copyright (C) 1995-2002 Free Software Foundation, Inc.
 dnl This file is free software, distributed under the terms of the GNU
 dnl General Public License.  As a special exception to the GNU General
@@ -21,12 +21,12 @@ dnl   Ulrich Drepper <drepper@cygnus.com>, 1995.
 # Check whether LC_MESSAGES is available in <locale.h>.
 
 AC_DEFUN([AM_LC_MESSAGES],
-  [if test $ac_cv_header_locale_h = yes; then
-    AC_CACHE_CHECK([for LC_MESSAGES], am_cv_val_LC_MESSAGES,
-      [AC_TRY_LINK([#include <locale.h>], [return LC_MESSAGES],
+[
+  AC_CACHE_CHECK([for LC_MESSAGES], am_cv_val_LC_MESSAGES,
+    [AC_TRY_LINK([#include <locale.h>], [return LC_MESSAGES],
        am_cv_val_LC_MESSAGES=yes, am_cv_val_LC_MESSAGES=no)])
-    if test $am_cv_val_LC_MESSAGES = yes; then
-      AC_DEFINE(HAVE_LC_MESSAGES, 1,
-        [Define if your <locale.h> file defines LC_MESSAGES.])
-    fi
-  fi])
+  if test $am_cv_val_LC_MESSAGES = yes; then
+    AC_DEFINE(HAVE_LC_MESSAGES, 1,
+      [Define if your <locale.h> file defines LC_MESSAGES.])
+  fi
+])

m4/lib-link.m4

@@ -1,4 +1,4 @@
-# lib-link.m4 serial 2 (gettext-0.11.2)
+# lib-link.m4 serial 3 (gettext-0.11.3)
 dnl Copyright (C) 2001-2002 Free Software Foundation, Inc.
 dnl This file is free software, distributed under the terms of the GNU
 dnl General Public License.  As a special exception to the GNU General
@@ -116,6 +116,10 @@ AC_DEFUN([AC_LIB_RPATH],
   hardcode_minus_L="$acl_cv_hardcode_minus_L"
   sys_lib_search_path_spec="$acl_cv_sys_lib_search_path_spec"
   sys_lib_dlsearch_path_spec="$acl_cv_sys_lib_dlsearch_path_spec"
+  dnl Determine whether the user wants rpath handling at all.
+  AC_ARG_ENABLE(rpath,
+    [  --disable-rpath         do not hardcode runtime library paths],
+    :, enable_rpath=yes)
 ])
 
 dnl AC_LIB_LINKFLAGS_BODY(name [, dependencies]) searches for libname and
@@ -245,7 +249,7 @@ AC_DEFUN([AC_LIB_LINKFLAGS_BODY],
               dnl Linking with a shared library. We attempt to hardcode its
               dnl directory into the executable's runpath, unless it's the
               dnl standard /usr/lib.
-              if test "X$found_dir" = "X/usr/lib"; then
+              if test "$enable_rpath" = no || test "X$found_dir" = "X/usr/lib"; then
                 dnl No hardcoding is needed.
                 LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }$found_so"
               else
@@ -436,29 +440,31 @@ AC_DEFUN([AC_LIB_LINKFLAGS_BODY],
                     ;;
                   -R*)
                     dir=`echo "X$dep" | sed -e 's/^X-R//'`
-                    dnl Potentially add DIR to rpathdirs.
-                    dnl The rpathdirs will be appended to $LIBNAME at the end.
-                    haveit=
-                    for x in $rpathdirs; do
-                      if test "X$x" = "X$dir"; then
-                        haveit=yes
-                        break
+                    if test "$enable_rpath" != no; then
+                      dnl Potentially add DIR to rpathdirs.
+                      dnl The rpathdirs will be appended to $LIBNAME at the end.
+                      haveit=
+                      for x in $rpathdirs; do
+                        if test "X$x" = "X$dir"; then
+                          haveit=yes
+                          break
+                        fi
+                      done
+                      if test -z "$haveit"; then
+                        rpathdirs="$rpathdirs $dir"
                       fi
-                    done
-                    if test -z "$haveit"; then
-                      rpathdirs="$rpathdirs $dir"
-                    fi
-                    dnl Potentially add DIR to ltrpathdirs.
-                    dnl The ltrpathdirs will be appended to $LTLIBNAME at the end.
-                    haveit=
-                    for x in $ltrpathdirs; do
-                      if test "X$x" = "X$dir"; then
-                        haveit=yes
-                        break
+                      dnl Potentially add DIR to ltrpathdirs.
+                      dnl The ltrpathdirs will be appended to $LTLIBNAME at the end.
+                      haveit=
+                      for x in $ltrpathdirs; do
+                        if test "X$x" = "X$dir"; then
+                          haveit=yes
+                          break
+                        fi
+                      done
+                      if test -z "$haveit"; then
+                        ltrpathdirs="$ltrpathdirs $dir"
                       fi
-                    done
-                    if test -z "$haveit"; then
-                      ltrpathdirs="$ltrpathdirs $dir"
                     fi
                     ;;
                   -l*)

m4/stdint_h.m4

@@ -0,0 +1,28 @@
+# stdint_h.m4 serial 2 (gettext-0.11.4)
+dnl Copyright (C) 1997-2002 Free Software Foundation, Inc.
+dnl This file is free software, distributed under the terms of the GNU
+dnl General Public License.  As a special exception to the GNU General
+dnl Public License, this file may be distributed as part of a program
+dnl that contains a configuration script generated by Autoconf, under
+dnl the same distribution terms as the rest of that program.
+
+dnl From Paul Eggert.
+
+# Define HAVE_STDINT_H_WITH_UINTMAX if <stdint.h> exists,
+# doesn't clash with <sys/types.h>, and declares uintmax_t.
+
+AC_DEFUN([jm_AC_HEADER_STDINT_H],
+[
+  AC_CACHE_CHECK([for stdint.h], jm_ac_cv_header_stdint_h,
+  [AC_TRY_COMPILE(
+    [#include <sys/types.h>
+#include <stdint.h>],
+    [uintmax_t i = (uintmax_t) -1;],
+    jm_ac_cv_header_stdint_h=yes,
+    jm_ac_cv_header_stdint_h=no)])
+  if test $jm_ac_cv_header_stdint_h = yes; then
+    AC_DEFINE_UNQUOTED(HAVE_STDINT_H_WITH_UINTMAX, 1,
+[Define if <stdint.h> exists, doesn't clash with <sys/types.h>,
+   and declares uintmax_t. ])
+  fi
+])

m4/uintmax_t.m4

@@ -0,0 +1,29 @@
+# uintmax_t.m4 serial 6 (gettext-0.11)
+dnl Copyright (C) 1997-2002 Free Software Foundation, Inc.
+dnl This file is free software, distributed under the terms of the GNU
+dnl General Public License.  As a special exception to the GNU General
+dnl Public License, this file may be distributed as part of a program
+dnl that contains a configuration script generated by Autoconf, under
+dnl the same distribution terms as the rest of that program.
+
+dnl From Paul Eggert.
+
+AC_PREREQ(2.13)
+
+# Define uintmax_t to `unsigned long' or `unsigned long long'
+# if <inttypes.h> does not exist.
+
+AC_DEFUN([jm_AC_TYPE_UINTMAX_T],
+[
+  AC_REQUIRE([jm_AC_HEADER_INTTYPES_H])
+  AC_REQUIRE([jm_AC_HEADER_STDINT_H])
+  if test $jm_ac_cv_header_inttypes_h = no && test $jm_ac_cv_header_stdint_h = no; then
+    AC_REQUIRE([jm_AC_TYPE_UNSIGNED_LONG_LONG])
+    test $ac_cv_type_unsigned_long_long = yes \
+      && ac_type='unsigned long long' \
+      || ac_type='unsigned long'
+    AC_DEFINE_UNQUOTED(uintmax_t, $ac_type,
+  [Define to unsigned long or unsigned long long
+   if <inttypes.h> and <stdint.h> don't define.])
+  fi
+])

m4/ulonglong.m4

@@ -0,0 +1,23 @@
+# ulonglong.m4 serial 2 (fileutils-4.0.32, gettext-0.10.40)
+dnl Copyright (C) 1999-2002 Free Software Foundation, Inc.
+dnl This file is free software, distributed under the terms of the GNU
+dnl General Public License.  As a special exception to the GNU General
+dnl Public License, this file may be distributed as part of a program
+dnl that contains a configuration script generated by Autoconf, under
+dnl the same distribution terms as the rest of that program.
+
+dnl From Paul Eggert.
+
+AC_DEFUN([jm_AC_TYPE_UNSIGNED_LONG_LONG],
+[
+  AC_CACHE_CHECK([for unsigned long long], ac_cv_type_unsigned_long_long,
+  [AC_TRY_LINK([unsigned long long ull = 1; int i = 63;],
+    [unsigned long long ullmax = (unsigned long long) -1;
+     return ull << i | ull >> i | ullmax / ull | ullmax % ull;],
+    ac_cv_type_unsigned_long_long=yes,
+    ac_cv_type_unsigned_long_long=no)])
+  if test $ac_cv_type_unsigned_long_long = yes; then
+    AC_DEFINE(HAVE_UNSIGNED_LONG_LONG, 1,
+      [Define if you have the unsigned long long type.])
+  fi
+])

move.c

@@ -1,232 +0,0 @@
-/* $Id$ */
-/**************************************************************************
- *   move.c                                                               *
- *                                                                        *
- *   Copyright (C) 1999-2002 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.                                                   *
- *                                                                        *
- *   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, write to the Free Software          *
- *   Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.            *
- *                                                                        *
- **************************************************************************/
-
-#include "config.h"
-
-#include <stdlib.h>
-#include <string.h>
-#include <stdio.h>
-#include <assert.h>
-#include "proto.h"
-#include "nano.h"
-
-#ifdef ENABLE_NLS
-#include <libintl.h>
-#define _(string) gettext(string)
-#else
-#define _(string) (string)
-#endif
-
-int do_page_down(void)
-{
-    wrap_reset();
-    current_x = 0;
-    placewewant = 0;
-
-    if (current == filebot)
-	return 0;
-
-    /* AHEM, if we only have a screen or less of text, DON'T do an
-       edit_update, just move the cursor to editbot! */
-    if (edittop == fileage && editbot == filebot && totlines < editwinrows) {
-	current = editbot;
-	reset_cursor();
-    } else if (editbot != filebot || edittop == fileage) {
-	current_y = 0;
-	current = editbot;
-
-	if (current->prev != NULL)
-	    current = current->prev;
-	if (current->prev != NULL)
-	    current = current->prev;
-	edit_update(current, TOP);
-    } else {
-	while (current != filebot) {
-	    current = current->next;
-	    current_y++;
-	}
-	edit_update(edittop, TOP);
-    }
-
-    update_cursor();
-    UNSET(KEEP_CUTBUFFER);
-    check_statblank();
-    return 1;
-}
-
-int do_home(void)
-{
-    UNSET(KEEP_CUTBUFFER);
-    current_x = 0;
-    placewewant = 0;
-    update_line(current, current_x);
-    return 1;
-}
-
-int do_end(void)
-{
-    UNSET(KEEP_CUTBUFFER);
-    current_x = strlen(current->data);
-    placewewant = xplustabs();
-    update_line(current, current_x);
-    return 1;
-}
-
-void page_up(void)
-{
-    if (edittop != fileage) {
-#ifndef NANO_SMALL
-	if (ISSET(SMOOTHSCROLL))
-	    edit_update(edittop->prev, TOP);
-	else
-#endif
-	{
-	    edit_update(edittop, CENTER);
-	    /* Now that we've updated the edit window, edittop might be
-	       at the top of the file; if so, just move the cursor up one
-	       line and don't center it. */
-	    if (edittop != fileage)
-		center_cursor();
-	    else {
-		current = current->prev;
-		reset_cursor();
-	    }
-	}
-    } else
-	current_y = 0;
-
-    update_cursor();
-}
-
-int do_page_up(void)
-{
-    int i;
-
-    wrap_reset();
-    current_x = 0;
-    placewewant = 0;
-
-    if (current == fileage)
-	return 0;
-
-    current_y = 0;
-    current = edittop;
-    for (i = 0; i <= editwinrows - 3 && current->prev != NULL; i++)
-	current = current->prev;
-
-    edit_update(current, TOP);
-    update_cursor();
-
-    UNSET(KEEP_CUTBUFFER);
-    check_statblank();
-    return 1;
-}
-
-int do_up(void)
-{
-    wrap_reset();
-    if (current->prev != NULL) {
-	current_x = actual_x(current->prev, placewewant);
-	current = current->prev;
-	if (current_y > 0) {
-	    update_line(current->next, 0);
-		/* It is necessary to change current first, so the mark
-		   display will change! */
-	    current_y--;
-	    update_line(current, current_x);
-	} else
-	    page_up();
-	UNSET(KEEP_CUTBUFFER);
-	check_statblank();
-    }
-    return 1;
-}
-
-/* Return value 1 means we moved down, 0 means we were already at the
- * bottom. */
-int do_down(void) {
-    wrap_reset();
-    UNSET(KEEP_CUTBUFFER);
-    check_statblank();
-
-    if (current->next == NULL)
-	return 0;
-
-    current = current->next;
-    current_x = actual_x(current, placewewant);
-
-    /* Note current_y is zero-based.  This test checks for the cursor
-     * being on the last row of the edit window. */
-    if (current_y == editwinrows - 1) {
-#ifndef NANO_SMALL
-	if (ISSET(SMOOTHSCROLL)) {
-	    /* In this case current_y does not change.  The cursor
-	     * remains at the bottom of the edit window. */
-	    edittop = edittop->next;
-	    editbot = editbot->next;
-	    edit_refresh();
-	} else
-#endif
-	{
-	    edit_update(editbot->next, CENTER);
-		/* sets edittop so editbot->next is centered */
-	    center_cursor();
-		/* sets current_y = editwinrows / 2 */
-	}
-    } else {
-	update_line(current->prev, 0);
-	update_line(current, current_x);
-	current_y++;
-    }
-    return 1;
-}
-
-int do_right(void)
-{
-    assert(current_x <= strlen(current->data));
-
-    if (current->data[current_x] != '\0')
-	current_x++;
-    else if (current->next) {
-	do_down();
-	current_x = 0;
-    }
-    placewewant = xplustabs();
-    update_line(current, current_x);
-    UNSET(KEEP_CUTBUFFER);
-    check_statblank();
-    return 1;
-}
-
-int do_left(void)
-{
-    if (current_x > 0)
-	current_x--;
-    else if (current != fileage) {
-	do_up();
-	current_x = strlen(current->data);
-    }
-    placewewant = xplustabs();
-    update_line(current, current_x);
-    UNSET(KEEP_CUTBUFFER);
-    check_statblank();
-    return 1;
-}

nano.1

@@ -1,161 +0,0 @@
-.\" Hey, EMACS: -*- nroff -*-
-.\" nano.1 is copyright 1999-2002 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 "July 14, 2002"
-.\" 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 \-B (\-\-backup)
-When saving a file, back up the previous version of it to the current
-filename suffixed with a ~.
-.TP
-.B \-D (\-\-dos)
-Write file in DOS format.
-.TP
-.B \-F (\-\-multibuffer)
-Enable multiple file buffers, if available.
-.TP
-.B \-I (\-\-ignorercfiles)
-Don't look at /etc/nanorc or ~/.nanorc, if nanorc support is available.
-.TP
-.B \-K (\-\-keypad)
-Do not use the ncurses keypad() call unless necessary.  Try this flag if 
-you find that the arrow keys on the numeric keypad do not work for you 
-under nano.
-.TP
-.B \-M (\-\-mac)
-Write file in Mac format.
-.TP
-.B \-N (\-\-noconvert)
-Disable automatic conversion of files from DOS/Mac format.
-.TP
-.B \-Q \fI[str]\fP (\-\-quotestr=\fI[str]\fP)
-Set the quoting string for justifying.  The default is "> ".
-.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 \fI[num]\fP (\-\-tabsize=\fI[num]\fP)
-Set the size (width) of a tab.
-.TP
-.B \-V (\-\-version)
-Show the current version number and author.
-.TP
-.B \-Y \fI[str]\fP (\-\-syntax=\fI[str]\fP)
-Specify a specific syntax highlighting from the .nanorc to use, if
-available.
-.TP
-.B \-c (\-\-const)
-Constantly show the cursor position.
-.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 with ^K.
-.TP
-.B \-l (\-\-nofollow)
-If the file being edited is a symbolic link, replace the link with
-a new file, do not follow it.  Good for editing files in /tmp, perhaps?
-.TP
-.B \-m (\-\-mouse)
-Enable mouse support (if available for your system).
-.TP
-.B \-o \fI[dir]\fP (\-\-operatingdir=\fI[dir]\fP)
-Set operating directory. Makes nano set up something similar to a
-chroot.
-.TP
-.B \-p (\-\-pico)
-Emulate Pico as closely as possible.  This affects both the "shortcut
-list" at the bottom of the screen, as well as the display and entry of
-previous search and replace strings.
-.TP
-.B \-r \fI[#cols]\fP (\-\-fill=\fI[#cols]\fP)
-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.
-.TP
-.B \-s \fI[prog]\fP (\-\-speller=\fI[prog]\fP)
-Enable alternative spell checker command.
-.TP
-.B \-t (\-\-tempfile)
-Always save changed buffer without prompting.  Same as Pico -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 NOTES
-\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 runs
-out of memory, when it will write the buffer into a file named
-"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
-.B nano@nano-editor.org.
-.br
-The \fBnano\fP mailing list is available from
-.br
-.B nano-devel@gnu.org.
-To subscribe, email to nano-devel-request@gnu.org with a
-subject of "subscribe".
-.SH HOMEPAGE
-http://www.nano-editor.org
-.SH AUTHOR
-Chris Allegretta <chrisa@asty.org>, et al (see AUTHORS and 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).

nano.1.html

@@ -1,238 +0,0 @@
-Content-type: text/html
-
-<HTML><HEAD><TITLE>Manpage of NANO</TITLE>
-</HEAD><BODY>
-<H1>NANO</H1>
-Section: User Commands  (1)<BR>Updated: July 14, 2002<BR><A HREF="#index">Index</A>
-<A HREF="http://localhost/cgi-bin/man/man2html">Return to Main Contents</A><HR>
-
-
-
-<A NAME="lbAB">&nbsp;</A>
-<H2>NAME</H2>
-
-nano - Nano's ANOther editor, an enhanced free Pico Clone
-<A NAME="lbAC">&nbsp;</A>
-<H2>SYNOPSIS</H2>
-
-<B>nano</B>
-
-<I>[+LINE]&nbsp;[options]&nbsp;[file]</I>
-
-<BR>
-
-<A NAME="lbAD">&nbsp;</A>
-<H2>DESCRIPTION</H2>
-
-This manual page documents briefly the <B>nano</B> command.
-<P>
-
-
-
-
-<B>nano</B> 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, <B>nano</B> also implements some
-missing (or disabled by default) features in Pico, such as &quot;search and
-replace&quot; and &quot;go to line number&quot;.
-<A NAME="lbAE">&nbsp;</A>
-<H2>OPTIONS</H2>
-
-<DL COMPACT>
-<DT><B>+</B><I>LINE</I>
-
-<DD>
-Places cursor at <I>LINE</I> on startup.
-<DT><B>-B (--backup)</B>
-
-<DD>
-When saving a file, back up the previous version of it to the current
-filename suffixed with a ~.
-<DT><B>-D (--dos)</B>
-
-<DD>
-Write file in DOS format.
-<DT><B>-F (--multibuffer)</B>
-
-<DD>
-Enable multiple file buffers, if available.
-<DT><B>-I (--ignorercfiles)</B>
-
-<DD>
-Don't look at /etc/nanorc or ~/.nanorc, if nanorc support is available.
-<DT><B>-K (--keypad)</B>
-
-<DD>
-Do not use the ncurses keypad() call unless necessary.  Try this flag if 
-you find that the arrow keys on the numeric keypad do not work for you 
-under nano.
-<DT><B>-M (--mac)</B>
-
-<DD>
-Write file in Mac format.
-<DT><B>-N (--noconvert)</B>
-
-<DD>
-Disable automatic conversion of files from DOS/Mac format.
-<DT><B>-Q </B><I>[str]</I> (--quotestr=<I>[str]</I>)
-
-<DD>
-Set the quoting string for justifying.  The default is &quot;&gt; &quot;.
-<DT><B>-R (--regexp)</B>
-
-<DD>
-Enable regular expression matching for search strings, as well as
-\n subexpression replacement for replace strings, if available.
-<DT><B>-S (--smooth)</B>
-
-<DD>
-Enable smooth scrolling. Text will scroll line-by-line, instead of the
-usual chunk-by-chunk behavior.
-<DT><B>-T </B><I>[num]</I> (--tabsize=<I>[num]</I>)
-
-<DD>
-Set the size (width) of a tab.
-<DT><B>-V (--version)</B>
-
-<DD>
-Show the current version number and author.
-<DT><B>-Y </B><I>[str]</I> (--syntax=<I>[str]</I>)
-
-<DD>
-Specify a specific syntax highlighting from the .nanorc to use, if
-available.
-<DT><B>-c (--const)</B>
-
-<DD>
-Constantly show the cursor position.
-<DT><B>-h (--help)</B>
-
-<DD>
-Display a summary of command line options.
-<DT><B>-i (--autoindent)</B>
-
-<DD>
-Indent new lines to the previous line's indentation. Useful when editing
-source code.
-<DT><B>-k (--cut)</B>
-
-<DD>
-Enable cut from cursor to end of line with ^K.
-<DT><B>-l (--nofollow)</B>
-
-<DD>
-If the file being edited is a symbolic link, replace the link with
-a new file, do not follow it.  Good for editing files in /tmp, perhaps?
-<DT><B>-m (--mouse)</B>
-
-<DD>
-Enable mouse support (if available for your system).
-<DT><B>-o </B><I>[dir]</I> (--operatingdir=<I>[dir]</I>)
-
-<DD>
-Set operating directory. Makes nano set up something similar to a
-chroot.
-<DT><B>-p (--pico)</B>
-
-<DD>
-Emulate Pico as closely as possible.  This affects both the &quot;shortcut
-list&quot; at the bottom of the screen, as well as the display and entry of
-previous search and replace strings.
-<DT><B>-r </B><I>[#cols]</I> (--fill=<I>[#cols]</I>)
-
-<DD>
-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.
-<DT><B>-s </B><I>[prog]</I> (--speller=<I>[prog]</I>)
-
-<DD>
-Enable alternative spell checker command.
-<DT><B>-t (--tempfile)</B>
-
-<DD>
-Always save changed buffer without prompting.  Same as Pico -t option.
-<DT><B>-v (--view)</B>
-
-<DD>
-View file (read only) mode.
-<DT><B>-w (--nowrap)</B>
-
-<DD>
-Disable wrapping of long lines.
-<DT><B>-x (--nohelp)</B>
-
-<DD>
-Disable help screen at bottom of editor.
-<DT><B>-z (--suspend)</B>
-
-<DD>
-Enable suspend ability.
-<DT><B>-a, -b, -e, -f, -g, -j</B>
-
-<DD>
-Ignored, for compatibility with Pico.
-</DL>
-<A NAME="lbAF">&nbsp;</A>
-<H2>NOTES</H2>
-
-<B>nano</B> will try to dump the buffer into an emergency file in some
-cases.  Mainly, this will happen if <B>nano</B> receives a SIGHUP or runs
-out of memory, when it will write the buffer into a file named
-&quot;nano.save&quot; if the buffer didn't have a name already, or will add a
-&quot;.save&quot; suffix to the current filename. If an emergency file with that
-name already exists in the current directory, &quot;.save&quot; and a number (e.g.
-&quot;.save.1&quot;) will be suffixed to the current filename in order to make it
-unique. In multibuffer mode, <B>nano</B> will write all the open buffers
-to the respective emergency files.
-<A NAME="lbAG">&nbsp;</A>
-<H2>BUGS</H2>
-
-Please send any comments or bug reports to
-<BR>
-
-<B><A HREF="mailto:nano@nano-editor.org">nano@nano-editor.org</A>.</B>
-
-<BR>
-
-The <B>nano</B> mailing list is available from
-<BR>
-
-<B><A HREF="mailto:nano-devel@gnu.org">nano-devel@gnu.org</A>.</B>
-
-To subscribe, email to <A HREF="mailto:nano-devel-request@gnu.org">nano-devel-request@gnu.org</A> with a
-subject of &quot;subscribe&quot;.
-<A NAME="lbAH">&nbsp;</A>
-<H2>HOMEPAGE</H2>
-
-<A HREF="http://www.nano-editor.org">http://www.nano-editor.org</A>
-<A NAME="lbAI">&nbsp;</A>
-<H2>AUTHOR</H2>
-
-Chris Allegretta &lt;<A HREF="mailto:chrisa@asty.org">chrisa@asty.org</A>&gt;, et al (see AUTHORS and THANKS for
-details).
-This manual page was originally written by Jordi Mallach
-&lt;<A HREF="mailto:jordi@sindominio.net">jordi@sindominio.net</A>&gt;, for the Debian GNU system (but may be
-used by others).
-<P>
-
-<HR>
-<A NAME="index">&nbsp;</A><H2>Index</H2>
-<DL>
-<DT><A HREF="#lbAB">NAME</A><DD>
-<DT><A HREF="#lbAC">SYNOPSIS</A><DD>
-<DT><A HREF="#lbAD">DESCRIPTION</A><DD>
-<DT><A HREF="#lbAE">OPTIONS</A><DD>
-<DT><A HREF="#lbAF">NOTES</A><DD>
-<DT><A HREF="#lbAG">BUGS</A><DD>
-<DT><A HREF="#lbAH">HOMEPAGE</A><DD>
-<DT><A HREF="#lbAI">AUTHOR</A><DD>
-</DL>
-<HR>
-This document was created by
-<A HREF="http://localhost/cgi-bin/man/man2html">man2html</A>,
-using the manual pages.<BR>
-Time: 00:51:19 GMT, July 14, 2002
-</BODY>
-</HTML>

nano.spec.in

@@ -9,7 +9,7 @@ Release		: %{rel}
 Copyright	: GPL
 Group		: Console/Editors
 URL		: http://www.nano-editor.org
-Source		: http://www.nano-editor.org/dist/v1.1/%{name}-%{ver}.tar.gz
+Source		: http://www.nano-editor.org/dist/v1.3/%{name}-%{ver}.tar.gz
 BuildRoot	: /var/tmp/%{name}-buildroot
 Requires	: ncurses
 
@@ -21,7 +21,7 @@ text editor while also offering a few enhancements.
 %setup -q
 
 %build
-%configure --enable-extra
+%configure --enable-all
 make RPM_OPT_FLAGS="$RPM_OPT_FLAGS"
 
 %install
@@ -30,7 +30,7 @@ make DESTDIR="$RPM_BUILD_ROOT" install
 
 %files
 %defattr(-,root,root)
-%doc AUTHORS BUGS COPYING ChangeLog INSTALL NEWS README THANKS TODO nanorc.sample
+%doc AUTHORS BUGS COPYING ChangeLog INSTALL NEWS README THANKS TODO doc/faq.html doc/nanorc.sample
 %{_bindir}/nano
 %{_mandir}/*/*
 %{_datadir}/locale/*/LC_MESSAGES/nano.mo

nanorc.sample

@@ -1,112 +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!
-#
-# To make sure a value is not enabled, use "unset <option>"
-
-# Use auto-indentation
-# set autoindent
-
-# Backup files to filename~
-# set backup
-
-# Constantly update the cursor position
-# set const
-
-# Use cut to end of line with ^K by default
-# set cut
-
-# Use this value instead of the default
-# An out-of-range negative value can make nano die complaining that the
-# screen is too small
-# set fill -8
-
-# Use alternate keypad routines
-# set keypad
-
-# Allow multiple file buffers (using ^R inserts into 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 help lists at the bottom of the screen
-# set nohelp
-
-# Don't wrap text at all
-# set nowrap
-
-# Set operating directory (chroot of sorts)
-# set operatingdir "~"
-
-# Use Pico Compatibility mode for the shortcut lists and search text
-# set pico
-
-# The email-quote string.  This is a "regular expression" if your
-# system supports them, otherwise a literal string.  Default
-# set quotestr "^([ \t]*[|>:}#])+" if you have regexps, otherwise
-# set quotestr "> ".
-# You can get old nano quoted-justify behavior via:
-# set quotestr "(> )+"
-
-# Do regular expression searches by default 
-# set regexp
-
-# Use smooth scrolling as the default
-# set smooth
-
-# Use this spelling checker instead of the default one
-# set speller aspell
-
-# Allow nano to be suspended with ^Z
-# set suspend
-
-# Use this tab size instead of the default; it must be greater than 0
-# set tabsize 4
-
-# Save automatically on exit, don't prompt
-# set tempfile
-
-# Disallow file modification, why would you want this in an rc file? ;)
-# set view
-
-# Color setup
-# Format: 
-# syntax "short description" ["filename regex" ...]
-# color foreground,background "regex" ["regex"...]
-#
-# Legal colors are: white, black, red, blue, green, yellow, purple, 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\>" "\<char\>" "\<int\>" "\<void\>"
-# color green "\<static\>" "\<const\>" "\<struct\>" 
-# color brightyellow "\<if\>" "\<while\>" "\<do\>" "\<else\>" "\<case\>" "\<switch\>"
-# color brightcyan "#define" "#include" "#ifn*def" "#endif" 
-# color brightcyan "#elif" "#else" "#if"
-
-# 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 "<[^= ]*>" "\"[^"]*\""
-# color brightblue "//.*"
-# color brightblue start="/\*" end="\*/"
-
-# For this you will probably want to set your editor to "nano -Y mutt"
-
-# syntax "mutt"
-# color green "^>.*"

po/.cvsignore

@@ -1,10 +1,18 @@
 Makefile
 Makefile.in
+Makefile.in.in
 POTFILES
-*.gmo
-*.pot
+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/ChangeLog

@@ -1,3 +1,313 @@
+2004-02-24  Jordi Mallach  <jordi@gnu.org>
+
+	* ms.po: Updated Malay translation by Sharuzzaman Ahmat Raslan.
+
+2003-11-25  Jordi Mallach  <jordi@gnu.org>
+
+	* ro.po: Updated Romanian translation by Laurentiu Buzdugan.
+
+2003-11-06  Jordi Mallach  <jordi@gnu.org>
+
+	* sr.po: Added Serbian translation by Danilo Segan <dsegan@gmx.net>.
+	* LINGUAS: Added "sr" (Serbian), and alphabetize.
+	* ChangeLog: Recoded as UTF-8.
+
+2003-10-30  Jordi Mallach  <jordi@gnu.org>
+
+	* fi.po: Patch from Martin-Eric Racine <q-funk@pp.fishpool.fi>
+	to accept "Yy" and "Nn" as well as the Finnish letters in Yes/No
+	prompts.
+
+2003-10-18  Jordi Mallach  <jordi@gnu.org>
+
+	* ca.po: Updated Catalan translation.
+
+2003-09-12  Jordi Mallach  <jordi@gnu.org>
+
+	* POTFILES.in: Updated path to sources.
+
+2003-09-01  Jordi Mallach  <jordi@gnu.org>
+
+	* fr.po: Updated French translation by Jean-Philippe Guérard.
+
+2003-08-17  Jordi Mallach  <jordi@gnu.org>
+
+	* tr.po: Updated Turkish translation by A. Murat EREN.
+
+2003-08-05  Jordi Mallach  <jordi@gnu.org>
+
+	* ca.po: Updated Catalan translation.
+
+2003-06-11  Jordi Mallach  <jordi@gnu.org>
+
+	* nb.po: Updated Norwegian bokmål translation by Geir Helland.
+
+2003-06-10  Jordi Mallach  <jordi@gnu.org>
+
+	* fr.po: Updated French translation by Jean-Philippe Guérard.
+
+2003-06-02  Jordi Mallach  <jordi@gnu.org>
+
+	* de.po: Updated German translation by Michael Piefel.
+
+2003-05-06  Jordi Mallach  <jordi@gnu.org>
+
+	* ms.po: Updated Malay translation by Sharuzzaman Ahmat Raslan.
+
+2003-04-24  Jordi Mallach  <jordi@gnu.org>
+
+	* ro.po: New Romanian translation by Laurentiu Buzdugan.
+	* id.po: Updated Indonesian translation by Tedi Heriyanto.
+	* LINGUAS: Added "ro" (Romanian).
+
+2003-04-12  Jordi Mallach  <jordi@gnu.org>
+
+	* ms.po: Updated Malay translation by Sharuzzaman Ahmat Raslan.
+
+2003-04-04  Jordi Mallach  <jordi@gnu.org>
+
+	* fr.po: Updated French translation by Jean-Philippe Guérard.
+
+2003-03-17  Jordi Mallach  <jordi@gnu.org>
+
+	* ms.po: Updated Malay translation by Sharuzzaman Ahmat Raslan.
+
+2003-03-10  Jordi Mallach  <jordi@gnu.org>
+
+	* da.po: Updated Danish translation by Keld Simonsen.
+
+2003-03-06  Jordi Mallach  <jordi@gnu.org>
+
+	* ms.po: Updated Malay translation by Sharuzzaman Ahmat Raslan.
+	* id.po: Updated Indonesian translation by Tedi Heriyanto.
+
+2003-02-23  Jordi Mallach  <jordi@gnu.org>
+
+	* nl.po: Updated Dutch translation by Guus Sliepen.
+
+2003-02-19  Jordi Mallach  <jordi@gnu.org>
+
+	* fi.po: Updated Finnish translation by Kalle Olavi Niemitalo.
+	* es.po: Updated Spanish translation by Ricardo Javier Cárdenes
+	Medina.
+
+2003-02-17  Jordi Mallach  <jordi@gnu.org>
+
+	* de.po: Updated German translation by Michael Piefel.
+	* ru.po: Updated Russian translation by Sergey A. Ribalchenko.
+	* uk.po: Updated Ukrainian translation by Sergey A. Ribalchenko.
+
+2003-02-16  Jordi Mallach  <jordi@gnu.org>
+
+	* gl.po: Updated Galician translation by Jacobo Tarrío.
+	* fr.po: Updated French translation by Jean-Philippe Guérard.
+
+2003-02-15  Jordi Mallach  <jordi@gnu.org>
+
+	* fr.po: Updated French translation by Jean-Philippe Guérard.
+	* nl.po: Updated Dutch translation by Guus Sliepen.
+	* sv.po: Updated Swedish translation by Christian Rose.
+	* ca.po: Updated Catalan translation.
+
+2003-02-13  Jordi Mallach  <jordi@gnu.org>
+
+	* ru.po: Updated Russian translation from Sergey A. Ribalchenko.
+
+2003-02-10  Jordi Mallach  <jordi@gnu.org>
+
+	* Makevars (XGETTEXT_OPTIONS): Added --keyword=P_:1,2.
+	* update.pl: likewise.
+	* fi.po: Added Plural-Forms: header.
+
+2003-02-10  Jordi Mallach  <jordi@gnu.org>
+
+	* fi.po: Updated Finnish translation by Kalle Kivimaa and
+	Kalle Olavi Niemitalo.
+
+2003-02-08  Chris Allegretta <chrisa@asty.org>
+
+	* it.po: Fix broken format string in translation.
+
+2003-02-08  Jordi Mallach  <jordi@gnu.org>
+
+	* it.po: Updated Italian translation by Marco Colombo.
+	* gl.po: Updated Galician translation by Jacobo Tarrío.
+	* es.po: Updated Spanish translation by Ricardo Javier Cárdenes
+	Medina.
+
+2003-02-06  Jordi Mallach  <jordi@gnu.org>
+
+	* pl.po: Updated Polish translation by Wojciech Kotwica.
+	* sv.po: Updated Swedish translation by Christian Rose.
+
+2003-02-04  Jordi Mallach  <jordi@gnu.org>
+
+	* ca.po: Updated Catalan translation.
+	* fr.po: Updated French translation by Jean-Philippe Guérard.
+	* uk.po: Updated Ukrainian translation by Sergey A. Ribalchenko.
+	* de.po: Updated German translation by Michael Piefel.
+
+2003-01-27  Jordi Mallach  <jordi@gnu.org>
+
+	* es.po: Updated translation by Ricardo Javier Cárdenes Medina.
+
+2002-01-26  Jordi Mallach  <jordi@gnu.org>
+
+	* pl.po: Updated translation by Wojciech Kotwica.
+
+2002-01-25  Jordi Mallach  <jordi@gnu.org>
+
+	* gl.po: Updated translation by Jacobo Tarrío.
+
+2002-01-22  Jordi Mallach  <jordi@gnu.org>
+
+	* de.po: Updated translation by Michael Piefel.
+
+2003-01-21  Jordi Mallach  <jordi@gnu.org>
+
+	* fr.po: Updated translation by Jean-Philippe Guérard.
+	* ms.po: Updated translation by Sharuzzaman Ahmat Raslan.
+	* uk.po: Updated translation by Sergey A. Ribalchenko. 
+
+2003-01-18  Jordi Mallach  <jordi@gnu.org>
+
+	* fr.po: Updated translation by Jean-Philippe Guérard.
+	* sv.po: Updated translation by Christian Rose.
+	* nl.po: Updated translation by Guus Sliepen.
+	* ca.po: Updated translation.
+
+2003-01-15  Jordi Mallach  <jordi@gnu.org>
+
+	* Makefile.in.in: Removed, generated by autopoint.
+	* Rules-quot: Likewise.
+	* boldquot.sed: Likewise.
+	* en@boldquot.header: Likewise.
+	* en@quot.header: Likewise.
+	* insert-header.sin: Likewise.
+	* quot.sed: Likewise.
+	* remove-potcdate.sin: Likewise.
+
+2003-01-15  Jordi Mallach  <jordi@gnu.org>
+
+	* LINGUAS: New file, exported values from configure.ac's ALL_LINGUAS.
+	* it.po: Updated translation by Marco Colombo.
+	* eu.po: New Basque translation by Peio Ziarsolo.
+
+2002-12-14  Jordi Mallach  <jordi@sindominio.net>
+
+	* fr.po: Updated translation by Jean-Philippe Guérard.
+	* tr.po: New Turkish translation by Doruk Fisek.
+
+2002-11-10  Jordi Mallach  <jordi@sindominio.net>
+
+	* uk.po: Updated translation by Sergey A. Ribalchenko.
+	* da.po: Updated translation by Keld Simonsen.
+
+2002-11-05  Jordi Mallach  <jordi@sindominio.net>
+
+	* ms.po: Updated translation by Sharuzzaman Ahmat Raslan.
+
+2002-11-03  Jordi Mallach  <jordi@sindominio.net>
+
+	* sv.po: Updated translation by Christian Rose.
+	* pl.po: Updated translation by Wojciech Kotwica.
+
+2002-10-29  Jordi Mallach  <jordi@sindominio.net>
+
+	* id.po: Updated translation by Tedi Heriyanto.
+	* fr.po: Updated translation by Jean-Philippe Guérard.
+
+2002-10-27  Jordi Mallach  <jordi@sindominio.net>
+
+	* fr.po: Updated translation by Jean-Philippe Guérard.
+
+2002-10-26  Jordi Mallach  <jordi@sindominio.net>
+
+	* es.po: Updated translation by Ricardo Javier Cárdenes Medina.
+
+2002-10-26  Jordi Mallach  <jordi@sindominio.net>
+
+	* gl.po: Updated translation by Jacobo Tarrío.
+	* sv.po: Updated translation by Christian Rose.
+	* de.po: Updated translation by Michael Piefel.
+	* fr.po: Updated translation by Jean-Philippe Guérard.
+	* ca.po: Updated translation.
+
+2002-10-17  Jordi Mallach  <jordi@sindominio.net>
+
+	* de.po: Updated translation by Michel Piefel.
+
+2002-10-14  Jordi Mallach  <jordi@sindominio.net>
+
+	* fr.po: Updated translation by Jean-Philippe Guérard.
+
+2002-10-13  Jordi Mallach  <jordi@sindominio.net>
+
+	* es.po: Updated translation by Ricardo Javier Cárdenes Medina.
+
+2002-10-08  Jordi Mallach  <jordi@sindominio.net>
+
+	* id.po: Updated translation by Tedi Heriyanto.
+	* ms.po: Updated translation by Sharuzzaman Ahmat Raslan.
+
+2002-10-07  Jordi Mallach  <jordi@sindominio.net>
+
+	* de.po: Updated translation by Michel Piefel.
+
+2002-10-07  Jordi Mallach  <jordi@sindominio.net>
+
+	* ca.po: Updated translation.
+
+2002-10-07  Jordi Mallach  <jordi@sindominio.net>
+
+	* sv.po: Updated translation by Christian Rose.
+	* gl.po: Updated translation by Jacobo Tarrío.
+	* pl.po: Updated translation by Wojciech Kotwica.
+
+2002-09-08  Jordi Mallach  <jordi@sindominio.net>
+
+	* ms.po: Updated translation by Sharuzzaman Ahmat Raslan.
+
+2002-09-08  Jordi Mallach  <jordi@sindominio.net>
+
+	* fr.po: Updated translation by Jean-Philippe Guérard. 
+	* da.po: Updated translation by Keld Simonsen.
+
+2002-08-19  Jordi Mallach  <jordi@sindominio.net>
+
+	* de.po: Updated translation by Michael Piefel.
+	* ms.po: Updated translation by Sharuzzaman Ahmat Raslan.
+
+2002-07-31  Jordi Mallach  <jordi@sindominio.net>
+
+	* gl.po: Updated translation by Jacobo Tarrío.
+
+2002-07-31  Jordi Mallach  <jordi@sindominio.net>
+
+	* es.po: Updated translation by Ricardo Javier Cárdenes Medina.
+
+2002-07-31  Jordi Mallach  <jordi@sindominio.net>
+
+	* fr.po: Updated translation by Jean-Philippe Guérard.
+
+2002-07-30  Jordi Mallach  <jordi@sindominio.net>
+
+	* pl.po: Updated translation by Wojciech Kotwica.
+	* sv.po: Upadted translation by Christian Rose.
+
+2002-07-29  Jordi Mallach  <jordi@sindominio.net>
+
+	* ca.po: Updated translation.
+
+2002-07-29  Jordi Mallach  <jordi@sindominio.net>
+
+	* sv.po: Updated translation by Christian Rose.
+
+2002-07-27  Jordi Mallach  <jordi@sindominio.net>
+
+	* pt_BR.po: New Brazilian Portuguese translation by
+	Claudio Neves.
+
 2002-07-25  Jordi Mallach  <jordi@sindominio.net>
 
 	* id.po: Updated translation by Tedi Heriyanto.
@@ -28,13 +338,13 @@
 
 2002-05-13  Jordi Mallach  <jordi@sindominio.net>
 
-	* fr.po: Updated translation by Jean-Philippe Guérard.
+	* fr.po: Updated translation by Jean-Philippe Guérard.
 	* de.po: Updated translation by Michael Piefel.
 
 2002-05-13  Jordi Mallach  <jordi@sindominio.net>
 
 	* it.po: Updated translation by Marco Colombo.
-	* gl.po: Updated translation by Jacobo Tarrío.
+	* gl.po: Updated translation by Jacobo Tarrío.
 	* ca.po: Updated translation.
 	* es.po: Updated translation.
 
@@ -71,7 +381,7 @@
 
 	* gl.po: Updated translation by Jacobo Tarrio.
 	* de.po: Updated translation by Michael Piefel.
-	* fr.po: Updated translation by Jean-Philippe Guérard.
+	* fr.po: Updated translation by Jean-Philippe Guérard.
 	* ca.po: Updated.
 	* es.po: Updated.
 
@@ -89,7 +399,7 @@
 
 2002-03-17  Jordi Mallach  <jordi@sindominio.net>
 
-	* fr.po: Updated translation by Jean-Philippe Guérard.
+	* fr.po: Updated translation by Jean-Philippe Guérard.
 
 2002-03-15  Jordi Mallach  <jordi@sindominio.net>
 
@@ -112,7 +422,7 @@
 
 2002-03-11  Jordi Mallach  <jordi@sindominio.net>
 
-	* fr.po: Updated translation by Jean-Philippe Guérard.
+	* fr.po: Updated translation by Jean-Philippe Guérard.
 
 2002-03-09  Jordi Mallach  <jordi@sindominio.net>
 
@@ -160,7 +470,7 @@
 
 2002-02-06  Jordi Mallach  <jordi@sindominio.net>
 
-	* cs.po: Incomplete update by Václav Haisman.
+	* cs.po: Incomplete update by Václav Haisman.
 
 2002-01-27  Jordi Mallach  <jordi@sindominio.net>
 
@@ -168,14 +478,14 @@
 
 2002-01-26  Jordi Mallach  <jordi@sindominio.net>
 
-	* fr.po: Updated translation by Jean-Philippe Guérard.
+	* fr.po: Updated translation by Jean-Philippe Guérard.
 	* nn.po: Updated translation by Kjetil Torgrim Homme.
 	* de.po: Updated translation by Michael Piefel.
 
 2002-01-25  Jordi Mallach  <jordi@sindominio.net>
 
 	* sv.po: Updated translation by Christian Rose.
-	* fr.po: Updated translation by Jean-Philippe Guérard.
+	* fr.po: Updated translation by Jean-Philippe Guérard.
 
 2002-01-25  Jordi Mallach  <jordi@sindominio.net>
 
@@ -206,21 +516,21 @@
 
 	* no.po: Removed, replaced by nn.po.
 	* nn.po: Updated translation by Kjetil Torgrim Homme.
-	* nb.po: New Norwegian bokmål translation by Stig E Sandoe.
+	* nb.po: New Norwegian bokmål translation by Stig E Sandoe.
 
 2002-01-12  Jordi Mallach  <jordi@sindominio.net>
 
-	* fr.po: Updated translation by Jean-Philippe Guérard.
+	* fr.po: Updated translation by Jean-Philippe Guérard.
 
 2002-01-10  Jordi Mallach  <jordi@sindominio.net>
 
-	* fr.po: Updated translation by Jean-Philippe Guérard.
+	* fr.po: Updated translation by Jean-Philippe Guérard.
 
 2002-01-08  Jordi Mallach  <jordi@sindominio.net>
 
 	* ru.po, uk.po: Updated translations by Sergey A.
 	Ribalchenko.
-	* fr.po: Updated translation by Jean-Philippe Guérard.
+	* fr.po: Updated translation by Jean-Philippe Guérard.
 
 2002-01-07  Jordi Mallach  <jordi@sindominio.net>
 

po/LINGUAS

@@ -0,0 +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

po/Makefile.in.in

@@ -1,317 +0,0 @@
-# Makefile for PO directory in any package using GNU gettext.
-# Copyright (C) 1995-1997, 2000-2002 by Ulrich Drepper <drepper@gnu.ai.mit.edu>
-#
-# This file can be copied and used freely without restrictions.  It can
-# be used in projects which are not available under the GNU General Public
-# License but which still want to provide support for the GNU gettext
-# functionality.
-# Please note that the actual code of GNU gettext is covered by the GNU
-# General Public License and is *not* in the public domain.
-
-PACKAGE = @PACKAGE@
-VERSION = @VERSION@
-
-SHELL = /bin/sh
-@SET_MAKE@
-
-srcdir = @srcdir@
-top_srcdir = @top_srcdir@
-VPATH = @srcdir@
-
-prefix = @prefix@
-exec_prefix = @exec_prefix@
-datadir = @datadir@
-localedir = $(datadir)/locale
-gettextsrcdir = $(datadir)/gettext/po
-
-INSTALL = @INSTALL@
-INSTALL_DATA = @INSTALL_DATA@
-MKINSTALLDIRS = @MKINSTALLDIRS@
-mkinstalldirs = $(SHELL) `case "$(MKINSTALLDIRS)" in /*) echo "$(MKINSTALLDIRS)" ;; *) echo "$(top_builddir)/$(MKINSTALLDIRS)" ;; esac`
-
-GMSGFMT = @GMSGFMT@
-MSGFMT = @MSGFMT@
-XGETTEXT = @XGETTEXT@
-MSGMERGE = msgmerge
-MSGMERGE_UPDATE = @MSGMERGE@ --update
-MSGINIT = msginit
-MSGCONV = msgconv
-MSGFILTER = msgfilter
-
-POFILES = @POFILES@
-GMOFILES = @GMOFILES@
-UPDATEPOFILES = @UPDATEPOFILES@
-DUMMYPOFILES = @DUMMYPOFILES@
-DISTFILES.common = Makefile.in.in Makevars remove-potcdate.sin \
-$(DISTFILES.common.extra1) $(DISTFILES.common.extra2) $(DISTFILES.common.extra3)
-DISTFILES = $(DISTFILES.common) POTFILES.in $(DOMAIN).pot \
-$(POFILES) $(GMOFILES) \
-$(DISTFILES.extra1) $(DISTFILES.extra2) $(DISTFILES.extra3)
-
-POTFILES = \
-
-CATALOGS = @CATALOGS@
-
-# Makevars gets inserted here. (Don't remove this line!)
-
-.SUFFIXES:
-.SUFFIXES: .po .gmo .mo .sed .sin .nop .po-update
-
-.po.mo:
-	@echo "$(MSGFMT) -c -o $@ $<"; \
-	$(MSGFMT) -c -o t-$@ $< && mv t-$@ $@
-
-.po.gmo:
-	@lang=`echo $* | sed -e 's,.*/,,'`; \
-	test "$(srcdir)" = . && cdcmd="" || cdcmd="cd $(srcdir) && "; \
-	echo "$${cdcmd}rm -f $${lang}.gmo && $(GMSGFMT) -c --statistics -o $${lang}.gmo $${lang}.po"; \
-	cd $(srcdir) && rm -f $${lang}.gmo && $(GMSGFMT) -c --statistics -o t-$${lang}.gmo $${lang}.po && mv t-$${lang}.gmo $${lang}.gmo
-
-.sin.sed:
-	sed -e '/^#/d' $< > t-$@
-	mv t-$@ $@
-
-
-all: all-@USE_NLS@
-
-all-yes: $(CATALOGS)
-all-no:
-
-# Note: Target 'all' must not depend on target '$(DOMAIN).pot-update',
-# otherwise packages like GCC can not be built if only parts of the source
-# have been downloaded.
-
-$(DOMAIN).pot-update: $(POTFILES) $(srcdir)/POTFILES.in remove-potcdate.sed
-	$(XGETTEXT) --default-domain=$(DOMAIN) --directory=$(top_srcdir) \
-	  --add-comments=TRANSLATORS: $(XGETTEXT_OPTIONS) \
-	  --files-from=$(srcdir)/POTFILES.in \
-	  --copyright-holder='$(COPYRIGHT_HOLDER)'
-	test ! -f $(DOMAIN).po || { \
-	  if test -f $(srcdir)/$(DOMAIN).pot; then \
-	    sed -f remove-potcdate.sed < $(srcdir)/$(DOMAIN).pot > $(DOMAIN).1po && \
-	    sed -f remove-potcdate.sed < $(DOMAIN).po > $(DOMAIN).2po && \
-	    if cmp $(DOMAIN).1po $(DOMAIN).2po >/dev/null 2>&1; then \
-	      rm -f $(DOMAIN).1po $(DOMAIN).2po $(DOMAIN).po; \
-	    else \
-	      rm -f $(DOMAIN).1po $(DOMAIN).2po $(srcdir)/$(DOMAIN).pot && \
-	      mv $(DOMAIN).po $(srcdir)/$(DOMAIN).pot; \
-	    fi; \
-	  else \
-	    mv $(DOMAIN).po $(srcdir)/$(DOMAIN).pot; \
-	  fi; \
-	}
-
-$(srcdir)/$(DOMAIN).pot:
-	$(MAKE) $(DOMAIN).pot-update
-
-$(POFILES): $(srcdir)/$(DOMAIN).pot
-	@lang=`echo $@ | sed -e 's,.*/,,' -e 's/\.po$$//'`; \
-	test "$(srcdir)" = . && cdcmd="" || cdcmd="cd $(srcdir) && "; \
-	echo "$${cdcmd}$(MSGMERGE_UPDATE) $${lang}.po $(DOMAIN).pot"; \
-	cd $(srcdir) && $(MSGMERGE_UPDATE) $${lang}.po $(DOMAIN).pot
-
-
-install: install-exec install-data
-install-exec:
-install-data: install-data-@USE_NLS@
-	if test "$(PACKAGE)" = "gettext"; then \
-	  $(mkinstalldirs) $(DESTDIR)$(gettextsrcdir); \
-	  for file in $(DISTFILES.common); do \
-	    $(INSTALL_DATA) $(srcdir)/$$file \
-			    $(DESTDIR)$(gettextsrcdir)/$$file; \
-	  done; \
-	else \
-	  : ; \
-	fi
-install-data-no: all
-install-data-yes: all
-	$(mkinstalldirs) $(DESTDIR)$(datadir)
-	@catalogs='$(CATALOGS)'; \
-	for cat in $$catalogs; do \
-	  cat=`basename $$cat`; \
-	  lang=`echo $$cat | sed -e 's/\.gmo$$//'`; \
-	  dir=$(localedir)/$$lang/LC_MESSAGES; \
-	  $(mkinstalldirs) $(DESTDIR)$$dir; \
-	  if test -r $$cat; then realcat=$$cat; else realcat=$(srcdir)/$$cat; fi; \
-	  $(INSTALL_DATA) $$realcat $(DESTDIR)$$dir/$(DOMAIN).mo; \
-	  echo "installing $$realcat as $(DESTDIR)$$dir/$(DOMAIN).mo"; \
-	  for lc in '' $(EXTRA_LOCALE_CATEGORIES); do \
-	    if test -n "$$lc"; then \
-	      if (cd $(DESTDIR)$(localedir)/$$lang && LC_ALL=C ls -l -d $$lc 2>/dev/null) | grep ' -> ' >/dev/null; then \
-	        link=`cd $(DESTDIR)$(localedir)/$$lang && LC_ALL=C ls -l -d $$lc | sed -e 's/^.* -> //'`; \
-	        mv $(DESTDIR)$(localedir)/$$lang/$$lc $(DESTDIR)$(localedir)/$$lang/$$lc.old; \
-	        mkdir $(DESTDIR)$(localedir)/$$lang/$$lc; \
-	        (cd $(DESTDIR)$(localedir)/$$lang/$$lc.old && \
-	         for file in *; do \
-	           if test -f $$file; then \
-	             ln -s ../$$link/$$file $(DESTDIR)$(localedir)/$$lang/$$lc/$$file; \
-	           fi; \
-	         done); \
-	        rm -f $(DESTDIR)$(localedir)/$$lang/$$lc.old; \
-	      else \
-	        if test -d $(DESTDIR)$(localedir)/$$lang/$$lc; then \
-	          :; \
-	        else \
-	          rm -f $(DESTDIR)$(localedir)/$$lang/$$lc; \
-	          mkdir $(DESTDIR)$(localedir)/$$lang/$$lc; \
-	        fi; \
-	      fi; \
-	      rm -f $(DESTDIR)$(localedir)/$$lang/$$lc/$(DOMAIN).mo; \
-	      ln -s ../LC_MESSAGES/$(DOMAIN).mo $(DESTDIR)$(localedir)/$$lang/$$lc/$(DOMAIN).mo 2>/dev/null || \
-	      ln $(DESTDIR)$(localedir)/$$lang/LC_MESSAGES/$(DOMAIN).mo $(DESTDIR)$(localedir)/$$lang/$$lc/$(DOMAIN).mo 2>/dev/null || \
-	      cp -p $(DESTDIR)$(localedir)/$$lang/LC_MESSAGES/$(DOMAIN).mo $(DESTDIR)$(localedir)/$$lang/$$lc/$(DOMAIN).mo; \
-	      echo "installing $$realcat link as $(DESTDIR)$(localedir)/$$lang/$$lc/$(DOMAIN).mo"; \
-	    fi; \
-	  done; \
-	done
-
-install-strip: install
-
-installdirs: installdirs-exec installdirs-data
-installdirs-exec:
-installdirs-data: installdirs-data-@USE_NLS@
-	if test "$(PACKAGE)" = "gettext"; then \
-	  $(mkinstalldirs) $(DESTDIR)$(gettextsrcdir); \
-	else \
-	  : ; \
-	fi
-installdirs-data-no:
-installdirs-data-yes:
-	$(mkinstalldirs) $(DESTDIR)$(datadir)
-	@catalogs='$(CATALOGS)'; \
-	for cat in $$catalogs; do \
-	  cat=`basename $$cat`; \
-	  lang=`echo $$cat | sed -e 's/\.gmo$$//'`; \
-	  dir=$(localedir)/$$lang/LC_MESSAGES; \
-	  $(mkinstalldirs) $(DESTDIR)$$dir; \
-	  for lc in '' $(EXTRA_LOCALE_CATEGORIES); do \
-	    if test -n "$$lc"; then \
-	      if (cd $(DESTDIR)$(localedir)/$$lang && LC_ALL=C ls -l -d $$lc 2>/dev/null) | grep ' -> ' >/dev/null; then \
-	        link=`cd $(DESTDIR)$(localedir)/$$lang && LC_ALL=C ls -l -d $$lc | sed -e 's/^.* -> //'`; \
-	        mv $(DESTDIR)$(localedir)/$$lang/$$lc $(DESTDIR)$(localedir)/$$lang/$$lc.old; \
-	        mkdir $(DESTDIR)$(localedir)/$$lang/$$lc; \
-	        (cd $(DESTDIR)$(localedir)/$$lang/$$lc.old && \
-	         for file in *; do \
-	           if test -f $$file; then \
-	             ln -s ../$$link/$$file $(DESTDIR)$(localedir)/$$lang/$$lc/$$file; \
-	           fi; \
-	         done); \
-	        rm -f $(DESTDIR)$(localedir)/$$lang/$$lc.old; \
-	      else \
-	        if test -d $(DESTDIR)$(localedir)/$$lang/$$lc; then \
-	          :; \
-	        else \
-	          rm -f $(DESTDIR)$(localedir)/$$lang/$$lc; \
-	          mkdir $(DESTDIR)$(localedir)/$$lang/$$lc; \
-	        fi; \
-	      fi; \
-	    fi; \
-	  done; \
-	done
-
-# Define this as empty until I found a useful application.
-installcheck:
-
-uninstall: uninstall-exec uninstall-data
-uninstall-exec:
-uninstall-data: uninstall-data-@USE_NLS@
-	if test "$(PACKAGE)" = "gettext"; then \
-	  for file in $(DISTFILES.common); do \
-	    rm -f $(DESTDIR)$(gettextsrcdir)/$$file; \
-	  done; \
-	else \
-	  : ; \
-	fi
-uninstall-data-no:
-uninstall-data-yes:
-	catalogs='$(CATALOGS)'; \
-	for cat in $$catalogs; do \
-	  cat=`basename $$cat`; \
-	  lang=`echo $$cat | sed -e 's/\.gmo$$//'`; \
-	  for lc in LC_MESSAGES $(EXTRA_LOCALE_CATEGORIES); do \
-	    rm -f $(DESTDIR)$(localedir)/$$lang/$$lc/$(DOMAIN).mo; \
-	  done; \
-	done
-
-check: all
-
-dvi info tags TAGS ID:
-
-mostlyclean:
-	rm -f remove-potcdate.sed
-	rm -f core core.* $(DOMAIN).po $(DOMAIN).1po $(DOMAIN).2po *.new.po
-	rm -fr *.o
-
-clean: mostlyclean
-
-distclean: clean
-	rm -f Makefile Makefile.in POTFILES *.mo
-
-maintainer-clean: distclean
-	@echo "This command is intended for maintainers to use;"
-	@echo "it deletes files that may require special tools to rebuild."
-	rm -f $(GMOFILES)
-
-distdir = $(top_builddir)/$(PACKAGE)-$(VERSION)/$(subdir)
-dist distdir:
-	$(MAKE) update-po
-	@$(MAKE) dist2
-# This is a separate target because 'update-po' must be executed before.
-dist2: $(DISTFILES)
-	dists="$(DISTFILES)"; \
-	if test -f $(srcdir)/ChangeLog; then dists="$$dists ChangeLog"; fi; \
-	if test -f $(srcdir)/LINGUAS; then dists="$$dists LINGUAS"; fi; \
-	for file in $$dists; do \
-	  if test -f $$file; then \
-	    cp -p $$file $(distdir); \
-	  else \
-	    cp -p $(srcdir)/$$file $(distdir); \
-	  fi; \
-	done
-
-update-po: Makefile
-	$(MAKE) $(DOMAIN).pot-update
-	$(MAKE) $(UPDATEPOFILES)
-	$(MAKE) update-gmo
-
-# General rule for updating PO files.
-
-.nop.po-update:
-	@lang=`echo $@ | sed -e 's/\.po-update$$//'`; \
-	if test "$(PACKAGE)" = "gettext"; then PATH=`pwd`/../src:$$PATH; fi; \
-	tmpdir=`pwd`; \
-	echo "$$lang:"; \
-	test "$(srcdir)" = . && cdcmd="" || cdcmd="cd $(srcdir) && "; \
-	echo "$${cdcmd}$(MSGMERGE) $$lang.po $(DOMAIN).pot -o $$lang.new.po"; \
-	cd $(srcdir); \
-	if $(MSGMERGE) $$lang.po $(DOMAIN).pot -o $$tmpdir/$$lang.new.po; then \
-	  if cmp $$lang.po $$tmpdir/$$lang.new.po >/dev/null 2>&1; then \
-	    rm -f $$tmpdir/$$lang.new.po; \
-	  else \
-	    if mv -f $$tmpdir/$$lang.new.po $$lang.po; then \
-	      :; \
-	    else \
-	      echo "msgmerge for $$lang.po failed: cannot move $$tmpdir/$$lang.new.po to $$lang.po" 1>&2; \
-	      exit 1; \
-	    fi; \
-	  fi; \
-	else \
-	  echo "msgmerge for $$lang.po failed!" 1>&2; \
-	  rm -f $$tmpdir/$$lang.new.po; \
-	fi
-
-$(DUMMYPOFILES):
-
-update-gmo: Makefile $(GMOFILES)
-	@:
-
-Makefile: Makefile.in.in $(top_builddir)/config.status POTFILES.in
-	cd $(top_builddir) \
-	  && CONFIG_FILES=$(subdir)/$@.in CONFIG_HEADERS= \
-	       $(SHELL) ./config.status
-
-force:
-
-# Tell versions [3.59,3.63) of GNU make not to export all variables.
-# Otherwise a system limit (for SysV at least) may be exceeded.
-.NOEXPORT:

po/Makevars

@@ -8,7 +8,7 @@ subdir = po
 top_builddir = ..
 
 # These options get passed to xgettext.
-XGETTEXT_OPTIONS = --keyword=_ --keyword=N_
+XGETTEXT_OPTIONS = --keyword=_ --keyword=N_ --keyword=P_:1,2
 
 # This is the copyright holder that gets inserted into the header of the
 # $(DOMAIN).pot file.  Set this to the copyright holder of the surrounding

po/POTFILES.in

@@ -2,16 +2,16 @@
 # List of source files containing translatable strings.
 
 # Package source files
-cut.c
-files.c
-global.c
-move.c
-nano.c
-rcfile.c
-search.c
-utils.c
-winio.c
+src/cut.c
+src/files.c
+src/global.c
+src/move.c
+src/nano.c
+src/rcfile.c
+src/search.c
+src/utils.c
+src/winio.c
 
 # Package header files
-nano.h
-proto.h
+src/nano.h
+src/proto.h

po/Rules-quot

@@ -1,42 +0,0 @@
-# Special Makefile rules for English message catalogs with quotation marks.
-
-DISTFILES.common.extra1 = quot.sed boldquot.sed en@quot.header en@boldquot.header insert-header.sin Rules-quot
-
-.SUFFIXES: .insert-header .po-update-en
-
-en@quot.po-update: en@quot.po-update-en
-en@boldquot.po-update: en@boldquot.po-update-en
-
-.insert-header.po-update-en:
-	@lang=`echo $@ | sed -e 's/\.po-update-en$$//'`; \
-	if test "$(PACKAGE)" = "gettext"; then PATH=`pwd`/../src:$$PATH; GETTEXTLIBDIR=`cd $(top_srcdir)/src && pwd`; export GETTEXTLIBDIR; fi; \
-	tmpdir=`pwd`; \
-	echo "$$lang:"; \
-	ll=`echo $$lang | sed -e 's/@.*//'`; \
-	LC_ALL=C; export LC_ALL; \
-	cd $(srcdir); \
-	if $(MSGINIT) -i $(DOMAIN).pot --no-translator -l $$ll -o - 2>/dev/null | sed -f $$tmpdir/$$lang.insert-header | $(MSGCONV) -t UTF-8 | $(MSGFILTER) sed -f `echo $$lang | sed -e 's/.*@//'`.sed 2>/dev/null > $$tmpdir/$$lang.new.po; then \
-	  if cmp $$lang.po $$tmpdir/$$lang.new.po >/dev/null 2>&1; then \
-	    rm -f $$tmpdir/$$lang.new.po; \
-	  else \
-	    if mv -f $$tmpdir/$$lang.new.po $$lang.po; then \
-	      :; \
-	    else \
-	      echo "creation of $$lang.po failed: cannot move $$tmpdir/$$lang.new.po to $$lang.po" 1>&2; \
-	      exit 1; \
-	    fi; \
-	  fi; \
-	else \
-	  echo "creation of $$lang.po failed!" 1>&2; \
-	  rm -f $$tmpdir/$$lang.new.po; \
-	fi
-
-en@quot.insert-header: insert-header.sin
-	sed -e '/^#/d' -e 's/HEADER/en@quot.header/g' $(srcdir)/insert-header.sin > en@quot.insert-header
-
-en@boldquot.insert-header: insert-header.sin
-	sed -e '/^#/d' -e 's/HEADER/en@boldquot.header/g' $(srcdir)/insert-header.sin > en@boldquot.insert-header
-
-mostlyclean: mostlyclean-quot
-mostlyclean-quot:
-	rm -f *.insert-header

po/boldquot.sed

@@ -1,10 +0,0 @@
-s/"\([^"]*\)"/“\1”/g
-s/`\([^`']*\)'/‘\1’/g
-s/ '\([^`']*\)' / ‘\1’ /g
-s/ '\([^`']*\)'$/ ‘\1’/g
-s/^'\([^`']*\)' /‘\1’ /g
-s/“”/""/g
-s/“/“/g
-s/”/”/g
-s/‘/‘/g
-s/’/’/g

po/en@boldquot.header

@@ -1,25 +0,0 @@
-# All this catalog "translates" are quotation characters.
-# The msgids must be ASCII and therefore cannot contain real quotation
-# characters, only substitutes like grave accent (0x60), apostrophe (0x27)
-# and double quote (0x22). These substitutes look strange; see
-# http://www.cl.cam.ac.uk/~mgk25/ucs/quotes.html
-#
-# This catalog translates grave accent (0x60) and apostrophe (0x27) to
-# left single quotation mark (U+2018) and right single quotation mark (U+2019).
-# It also translates pairs of apostrophe (0x27) to
-# left single quotation mark (U+2018) and right single quotation mark (U+2019)
-# and pairs of quotation mark (0x22) to
-# left double quotation mark (U+201C) and right double quotation mark (U+201D).
-#
-# When output to an UTF-8 terminal, the quotation characters appear perfectly.
-# When output to an ISO-8859-1 terminal, the single quotation marks are
-# transliterated to apostrophes (by iconv in glibc 2.2 or newer) or to
-# grave/acute accent (by libiconv), and the double quotation marks are
-# transliterated to 0x22.
-# When output to an ASCII terminal, the single quotation marks are
-# transliterated to apostrophes, and the double quotation marks are
-# transliterated to 0x22.
-#
-# This catalog furthermore displays the text between the quotation marks in
-# bold face, assuming the VT100/XTerm escape sequences.
-#

po/en@quot.header

@@ -1,22 +0,0 @@
-# All this catalog "translates" are quotation characters.
-# The msgids must be ASCII and therefore cannot contain real quotation
-# characters, only substitutes like grave accent (0x60), apostrophe (0x27)
-# and double quote (0x22). These substitutes look strange; see
-# http://www.cl.cam.ac.uk/~mgk25/ucs/quotes.html
-#
-# This catalog translates grave accent (0x60) and apostrophe (0x27) to
-# left single quotation mark (U+2018) and right single quotation mark (U+2019).
-# It also translates pairs of apostrophe (0x27) to
-# left single quotation mark (U+2018) and right single quotation mark (U+2019)
-# and pairs of quotation mark (0x22) to
-# left double quotation mark (U+201C) and right double quotation mark (U+201D).
-#
-# When output to an UTF-8 terminal, the quotation characters appear perfectly.
-# When output to an ISO-8859-1 terminal, the single quotation marks are
-# transliterated to apostrophes (by iconv in glibc 2.2 or newer) or to
-# grave/acute accent (by libiconv), and the double quotation marks are
-# transliterated to 0x22.
-# When output to an ASCII terminal, the single quotation marks are
-# transliterated to apostrophes, and the double quotation marks are
-# transliterated to 0x22.
-#

po/insert-header.sin

@@ -1,23 +0,0 @@
-# Sed script that inserts the file called HEADER before the header entry.
-#
-# At each occurrence of a line starting with "msgid ", we execute the following
-# commands. At the first occurrence, insert the file. At the following
-# occurrences, do nothing. The distinction between the first and the following
-# occurrences is achieved by looking at the hold space.
-/^msgid /{
-x
-# Test if the hold space is empty.
-s/m/m/
-ta
-# Yes it was empty. First occurrence. Read the file.
-r HEADER
-# Output the file's contents by reading the next line. But don't lose the
-# current line while doing this.
-g
-N
-bb
-:a
-# The hold space was nonempty. Following occurrences. Do nothing.
-x
-:b
-}

po/quot.sed

@@ -1,6 +0,0 @@
-s/"\([^"]*\)"/“\1”/g
-s/`\([^`']*\)'/‘\1’/g
-s/ '\([^`']*\)' / ‘\1’ /g
-s/ '\([^`']*\)'$/ ‘\1’/g
-s/^'\([^`']*\)' /‘\1’ /g
-s/“”/""/g

po/remove-potcdate.sin

@@ -1,19 +0,0 @@
-# Sed script that remove the POT-Creation-Date line in the header entry
-# from a POT file.
-#
-# The distinction between the first and the following occurrences of the
-# pattern is achieved by looking at the hold space.
-/^"POT-Creation-Date: .*"$/{
-x
-# Test if the hold space is empty.
-s/P/P/
-ta
-# Yes it was empty. First occurrence. Remove the line.
-g
-d
-bb
-:a
-# The hold space was nonempty. Following occurrences. Do nothing.
-x
-:b
-}

po/update.pl

@@ -293,7 +293,7 @@ sub GeneratePot{
     close INFILE;
 
     $GETTEXT ="xgettext --default-domain\=$PACKAGE --directory\=\.\."
-             ." --add-comments --keyword\=\_ --keyword\=N\_"
+             ." --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 \)";

proto.h

@@ -1,296 +0,0 @@
-/* $Id$ */
-/**************************************************************************
- *   proto.h                                                              *
- *                                                                        *
- *   Copyright (C) 1999-2002 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.                                                   *
- *                                                                        *
- *   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, write to the Free Software          *
- *   Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.            *
- *                                                                        *
- **************************************************************************/
-
-/* Externs */
-
-#include <sys/stat.h>
-
-#ifdef HAVE_REGEX_H
-#include <regex.h>
-#endif
-
-#include "nano.h"
-
-extern int wrap_at;
-extern int editwinrows;
-extern int current_x, current_y, totlines;
-extern int placewewant;
-extern int mark_beginx;
-extern long totsize;
-extern int temp_opt;
-extern int wrap_at, flags, tabsize;
-extern int search_last_line;
-extern int currslen;
-
-#ifndef DISABLE_JUSTIFY
-extern char *quotestr;
-#endif
-
-extern WINDOW *edit, *topwin, *bottomwin;
-extern char *filename;
-extern struct stat originalfilestat;
-extern char *answer;
-extern char *hblank;
-#ifndef DISABLE_HELP
-extern char *help_text;
-#endif
-extern char *last_search;
-extern char *last_replace;
-#ifndef DISABLE_OPERATINGDIR
-extern char *operating_dir;
-extern char *full_operating_dir;
-#endif
-#ifndef DISABLE_SPELLER
-extern  char *alt_speller;
-#endif
-#ifndef DISABLE_TABCOMP
-char *real_dir_from_tilde(char *buf);
-#endif
-#ifndef DISABLE_BROWSER
-char *do_browse_from(char *inpath);
-#endif
-
-extern struct stat fileinfo;
-extern filestruct *current, *fileage, *edittop, *editbot, *filebot; 
-extern filestruct *cutbuffer, *mark_beginbuf;
-
-#ifdef ENABLE_MULTIBUFFER
-extern openfilestruct *open_files;
-#endif
-
-#ifdef ENABLE_COLOR
-extern colortype *colorstrings;
-extern syntaxtype *syntaxes;
-extern char *syntaxstr;
-extern regex_t color_regexp;
-extern regmatch_t colormatches[1];
-#endif
-
-extern shortcut *shortcut_list;
-extern shortcut *main_list, *whereis_list;
-extern shortcut *replace_list, *goto_list;
-extern shortcut *writefile_list, *insertfile_list;
-extern shortcut *spell_list, *replace_list_2;
-#ifndef NANO_SMALL
-extern shortcut *extcmd_list;
-#endif
-extern shortcut *help_list;
-#ifndef DISABLE_BROWSER
-extern shortcut *browser_list, *gotodir_list;
-#endif
-extern const shortcut *currshortcut;
-
-#ifdef HAVE_REGEX_H
-extern int use_regexp, regexp_compiled;
-extern regex_t search_regexp;
-extern regmatch_t regmatches[10];  
-#ifdef ENABLE_COLOR
-extern regex_t syntaxfile_regexp;
-extern regmatch_t synfilematches[1];  
-#endif /* ENABLE_COLOR */
-#endif /* HAVE_REGEX_H */
-
-#ifndef NANO_SMALL
-extern toggle *toggles;
-#endif
-
-/* Functions we want available */
-
-/* Public functions in color.c */
-#ifdef ENABLE_COLOR
-void set_colorpairs(void);
-void do_colorinit(void);
-void update_color(void);
-#endif /* ENABLE_COLOR */
-
-/* Public functions in cut.c */
-int do_cut_text(void);
-int do_uncut_text(void);
-filestruct *get_cutbottom(void);
-void add_to_cutbuffer(filestruct *inptr);
-void cut_marked_segment(filestruct *top, size_t top_x, filestruct *bot,
-                        size_t bot_x, int destructive);
-
-/* Public functions in files.c */
-int write_file(char *name, int tmpfile, int append, int nonamechange);
-int open_file(const char *filename, int insert, int quiet);
-int read_file(FILE *f, const char *filename, int quiet);
-#ifdef ENABLE_MULTIBUFFER
-openfilestruct *make_new_opennode(openfilestruct *prevnode);
-void splice_opennode(openfilestruct *begin, openfilestruct *newnode, openfilestruct *end);
-void unlink_opennode(const openfilestruct *fileptr);
-void delete_opennode(openfilestruct *fileptr);
-void free_openfilestruct(openfilestruct *src);
-int add_open_file(int update);
-int close_open_file(void);
-int open_prevfile_void(void);
-int open_nextfile_void(void);
-#endif
-#ifndef DISABLE_OPERATINGDIR
-int check_operating_dir(char *currpath, int allow_tabcomp);
-#endif
-int do_writeout(char *path, int exiting, int append);
-char *input_tab(char *buf, int place, int *lastwastab, int *newplace, int *list);
-void new_file(void);
-int do_writeout_void(void);
-int do_insertfile_void(void);
-char *get_next_filename(const char *name);
-#ifndef DISABLE_SPELLER
-char *safe_tempnam(const char *dirname, const char *filename_prefix);
-#endif
-
-/* Public functions in global.c */
-int length_of_list(const shortcut *s);
-void shortcut_init(int unjustify);
-#ifdef DEBUG
-void thanks_for_all_the_fish(void);
-#endif
-
-/* Public functions in move.c */
-int do_first_line(void);
-int do_last_line(void);
-size_t xplustabs(void);
-size_t actual_x(const filestruct *fileptr, size_t xplus);
-size_t strnlenpt(const char *buf, size_t size);
-size_t strlenpt(const char *buf);
-void reset_cursor(void);
-void blank_bottombars(void);
-void blank_edit(void);
-void blank_statusbar(void);
-void blank_statusbar_refresh(void);
-void check_statblank(void);
-void titlebar(const char *path);
-void bottombars(const shortcut *s);
-void set_modified(void);
-int do_up(void);
-int do_down(void);
-int do_left(void);
-int do_right(void);
-void page_up(void);
-int do_page_up(void);
-int do_page_down(void);
-int do_home(void);
-int do_end(void);
-
-/* Public functions in nano.c */
-void renumber(filestruct *fileptr);
-void free_filestruct(filestruct *src);
-int no_help(void);
-void renumber_all(void);
-int open_pipe(const char *command);
-int do_prev_word(void);
-int do_next_word(void);
-void delete_node(filestruct *fileptr);
-void wrap_reset(void);
-void do_early_abort(void);
-void die(const char *msg, ...);
-void splice_node(filestruct *begin, filestruct *newnode, filestruct *end);
-void nano_disabled_msg(void);
-void window_init(void);
-void do_mouse(void);
-void print_view_warning(void);
-int do_exit(void);
-int do_spell(void);
-int do_mark(void);
-int do_delete(void);
-int do_backspace(void);
-int do_tab(void);
-int do_justify(void);
-int do_enter(void);
-int do_wrap(filestruct *inptr);
-void signal_init(void);
-void handle_sigwinch(int s);
-void die_save_file(const char *die_filename);
-size_t indent_length(const char *line);
-
-filestruct *copy_node(const filestruct *src);
-filestruct *copy_filestruct(const filestruct *src);
-filestruct *make_new_node(filestruct *prevnode);
-#ifndef DISABLE_HELP
-void help_init(void);
-#endif
-
-/* Public functions in rcfile.c */
-#ifdef ENABLE_NANORC
-void do_rcfile(void);
-#endif
-
-/* Public functions in search.c */
-int do_gotoline(int line, int save_pos);
-int is_whole_word(int curr_pos, const char *datastr, const char *searchword);
-int do_replace_loop(const char *prevanswer, const filestruct *begin,
-			int *beginx, int wholewords, int *i);
-int do_find_bracket(void);
-#if defined (ENABLE_MULTIBUFFER) || !defined (DISABLE_SPELLER)
-void do_gotopos(int line, int pos_x, int pos_y, int pos_placewewant);
-#endif
-void search_init_globals(void);
-void replace_abort(void);
-int do_gotoline_void(void);
-int do_search(void);
-int do_replace(void);
-filestruct *findnextstr(int quiet, int bracket_mode, const filestruct *begin,
-		int beginx, const char *needle);
-
-/* Public functions in utils.c */
-const char *stristr(const char *haystack, const char *needle);
-const char *strstrwrapper(const char *haystack, const char *needle,
-		const char *rev_start, int line_pos);
-int is_cntrl_char(int c);
-int num_of_digits(int n);
-int check_wildcard_match(const char *text, const char *pattern);
-void align(char **strp);
-void null_at(char **data, size_t index);
-void unsunder(char *str, size_t true_len);
-void sunder(char *str);
-void nperror(const char *s);
-char *mallocstrcpy(char *dest, const char *src);
-void *nmalloc(size_t howmuch);
-void *nrealloc(void *ptr, size_t howmuch);
-void new_magicline(void);
-char *charalloc(size_t howmuch);
-
-/* Public functions in winio.c */
-int do_yesno(int all, int leavecursor, const char *msg, ...);
-int statusq(int allowtabs, const shortcut *s, const char *def,
-		const char *msg, ...);
-void do_replace_highlight(int highlight_flag, const char *word);
-void edit_refresh(void);
-void edit_refresh_clearok(void);
-void edit_update(filestruct *fileptr, topmidbotnone location);
-void update_cursor(void);
-#ifdef DEBUG
-void dump_buffer(const filestruct *inptr);
-void dump_buffer_reverse(void);
-#endif
-void update_line(filestruct *fileptr, int index);
-void fix_editbot(void);
-void statusbar(const char *msg, ...);
-void center_cursor(void);
-void display_main_list(void);
-#ifdef NANO_EXTRA
-void do_credits(void);
-#endif
-int do_cursorpos(int constant);
-int do_cursorpos_void(void);
-int total_refresh(void);
-int do_help(void);
-int keypad_on(WINDOW *win, int newval);

search.c

@@ -1,886 +0,0 @@
-/* $Id$ */
-/**************************************************************************
- *   search.c                                                             *
- *                                                                        *
- *   Copyright (C) 2000-2002 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.                                                   *
- *                                                                        *
- *   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, write to the Free Software          *
- *   Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.            *
- *                                                                        *
- **************************************************************************/
-
-#include "config.h"
-
-#include <stdlib.h>
-#include <string.h>
-#include <unistd.h>
-#include <stdio.h>
-#include <ctype.h>
-#include <assert.h>
-#include "proto.h"
-#include "nano.h"
-
-#ifdef ENABLE_NLS
-#include <libintl.h>
-#define _(string) gettext(string)
-#else
-#define _(string) (string)
-#endif
-
-/* Regular expression helper functions */
-
-#ifdef HAVE_REGEX_H
-void regexp_init(const char *regexp)
-{
-    regcomp(&search_regexp, regexp, ISSET(CASE_SENSITIVE) ? 0 : REG_ICASE);
-    SET(REGEXP_COMPILED);
-}
-
-void regexp_cleanup(void)
-{
-    UNSET(REGEXP_COMPILED);
-    regfree(&search_regexp);
-}
-#endif
-
-void search_init_globals(void)
-{
-    if (last_search == NULL) {
-	last_search = charalloc(1);
-	last_search[0] = '\0';
-    }
-    if (last_replace == NULL) {
-	last_replace = charalloc(1);
-	last_replace[0] = '\0';
-    }
-}
-
-/* Set up the system variables for a search or replace.  Returns -1 on
-   abort, 0 on success, and 1 on rerun calling program 
-   Return -2 to run opposite program (search -> replace, replace -> search)
-
-   replacing = 1 if we call from do_replace, 0 if called from do_search func.
-*/
-static int search_init(int replacing)
-{
-    int i = 0;
-    char *buf;
-    static char *backupstring = NULL;
-
-    search_init_globals();
-
-    /* Clear the backupstring if we've changed from Pico mode to regular
-	mode */
-    if (ISSET(CLEAR_BACKUPSTRING)) {
-	free(backupstring);
-	backupstring = NULL;
-	UNSET(CLEAR_BACKUPSTRING);
-    }
-	
-     /* Okay, fun time.  backupstring is our holder for what is being 
-	returned from the statusq call.  Using answer for this would be tricky.
-	Here, if we're using PICO_MODE, we only want nano to put the
-	old string back up as editable if it's not the same as last_search.
-
-	Otherwise, if we don't already have a backupstring, set it to
-	last_search. */
-
-    if (ISSET(PICO_MODE)) {
-	if (backupstring == NULL || !strcmp(backupstring, last_search))
-	    backupstring = mallocstrcpy(backupstring, "");
-    }
-    else if (backupstring == NULL)
-	backupstring = mallocstrcpy(backupstring, last_search);
-
-    /* If using Pico messages, we do things the old fashioned way... */
-    if (ISSET(PICO_MODE) && last_search[0]) {
-	buf = charalloc(COLS / 3 + 7);
-	/* We use COLS / 3 here because we need to see more on the line */
-	sprintf(buf, " [%.*s%s]", COLS / 3, last_search,
-		strlen(last_search) > COLS / 3 ? "..." : "");
-    } else {
-	buf = charalloc(1);
-	buf[0] = '\0';
-    }
-
-    /* This is now one simple call.  It just does a lot */
-    i = statusq(0, replacing ? replace_list : whereis_list, backupstring,
-	"%s%s%s%s%s%s", 
-	_("Search"),
-
-	/* This string is just a modifier for the search prompt,
-	   no grammar is implied */
-	ISSET(CASE_SENSITIVE) ? _(" [Case Sensitive]") : "",
-
-	/* This string is just a modifier for the search prompt,
-	   no grammar is implied */
-	ISSET(USE_REGEXP) ? _(" [Regexp]") : "",
-
-	/* This string is just a modifier for the search prompt,
-	   no grammar is implied */
-	ISSET(REVERSE_SEARCH) ? _(" [Backwards]") : "",
-
-	replacing ? _(" (to replace)") : "",
-	buf);
-
-    /* Release buf now that we don't need it anymore */
-    free(buf);
-
-    /* Cancel any search, or just return with no previous search */
-    if (i == -1 || (i < 0 && last_search[0] == '\0')) {
-	statusbar(_("Search Cancelled"));
-	reset_cursor();
-	free(backupstring);
-	backupstring = NULL;
-	return -1;
-    } else {
-	switch (i) {
-	case -2:	/* Same string */
-#ifdef HAVE_REGEX_H
-	    if (ISSET(USE_REGEXP))
-		/* If we're in Pico mode, and answer is "", use
-		   last_search! */
-		regexp_init(ISSET(PICO_MODE) ? last_search : answer);
-#endif
-	    break;
-	case 0:		/* They entered something new */
-#ifdef HAVE_REGEX_H
-	    if (ISSET(USE_REGEXP))
-		regexp_init(answer);
-#endif
-	    free(backupstring);
-	    backupstring = NULL;
-	    last_replace[0] = '\0';
-	    break;
-#ifndef NANO_SMALL
-	case TOGGLE_CASE_KEY:
-	    TOGGLE(CASE_SENSITIVE);
-	    backupstring = mallocstrcpy(backupstring, answer);
-	    return 1;
-	case TOGGLE_BACKWARDS_KEY:
-	    TOGGLE(REVERSE_SEARCH);
-	    backupstring = mallocstrcpy(backupstring, answer);
-	    return 1;
-#ifdef HAVE_REGEX_H
-	case TOGGLE_REGEXP_KEY:
-	    TOGGLE(USE_REGEXP);
-	    backupstring = mallocstrcpy(backupstring, answer);
-	    return 1;
-#endif
-#endif /* !NANO_SMALL */
-	case NANO_OTHERSEARCH_KEY:
-	    backupstring = mallocstrcpy(backupstring, answer);
-	    return -2;		/* Call the opposite search function */
-	case NANO_FROMSEARCHTOGOTO_KEY:
-	    free(backupstring);
-	    backupstring = NULL;
-	    do_gotoline_void();
-	    return -3;
-	default:
-	    do_early_abort();
-	    free(backupstring);
-	    backupstring = NULL;
-	    return -3;
-	}
-    }
-    return 0;
-}
-
-void not_found_msg(const char *str)
-{
-    if (strlen(str) <= COLS / 2)
-	statusbar(_("\"%s\" not found"), str);
-    else {
-	char *foo = mallocstrcpy(NULL, str);
-
-	foo[COLS / 2] = '\0';
-	statusbar(_("\"%s...\" not found"), foo);
-	free(foo);
-    }
-}
-
-int is_whole_word(int curr_pos, const char *datastr, const char *searchword)
-{
-    size_t sln = curr_pos + strlen(searchword);
-
-    /* start of line or previous character not a letter and end of line
-     * or next character not a letter */
-    return (curr_pos < 1 || !isalpha((int) datastr[curr_pos - 1])) &&
-	(sln == strlen(datastr) || !isalpha((int) datastr[sln]));
-}
-
-static int past_editbuff;
-	/* findnextstr() is now searching lines not displayed */
-
-filestruct *findnextstr(int quiet, int bracket_mode,
-		const filestruct *begin, int beginx, const char *needle)
-{
-    filestruct *fileptr = current;
-    const char *searchstr, *rev_start = NULL, *found = NULL;
-    int current_x_find = 0;
-
-    past_editbuff = 0;
-
-    if (!ISSET(REVERSE_SEARCH)) {		/* forward search */
-	/* Argh, current_x is set to -1 by nano.c:do_int_spell_fix(), and
-	 * strlen returns size_t, which is unsigned. */
-	assert(current_x < 0 || current_x <= strlen(fileptr->data));
-	current_x_find = current_x;
-	if (current_x_find < 0 || fileptr->data[current_x_find] != '\0')
-	    current_x_find++;
-
-	searchstr = &fileptr->data[current_x_find];
-
-	/* Look for needle in searchstr */
-	while ((found = strstrwrapper(searchstr, needle, rev_start, current_x_find)) == NULL) {
-
-	    /* finished processing file, get out */
-	    if (search_last_line) {
-		if (!quiet)
-		    not_found_msg(needle);
-		update_line(fileptr, current_x);
-	        return NULL;
-	    }
-
-	    update_line(fileptr, 0);
-
-	    /* reset current_x_find between lines */
-	    current_x_find = 0;
-
-	    fileptr = fileptr->next;
-
-	    if (fileptr == editbot)
-		past_editbuff = 1;
-
-	    /* EOF reached ?, wrap around once */
-	    if (fileptr == NULL) {
-		/* don't wrap if looking for bracket match */
-		if (bracket_mode)
-		    return NULL;
-		fileptr = fileage;
-		past_editbuff = 1;
-		if (!quiet) {
-		    statusbar(_("Search Wrapped"));
-		    SET(DISABLE_CURPOS);
-		}
-	    }
-
-	    /* Original start line reached */
-	    if (fileptr == begin)
-		search_last_line = 1;
-
-	    searchstr = fileptr->data;
-	}
-
-	/* We found an instance */
-	current_x_find = found - fileptr->data;
-	/* Ensure we haven't wrapped around again! */
-	if ((search_last_line) && (current_x_find > beginx)) {
-	    if (!quiet)
-		not_found_msg(needle);
-	    return NULL;
-	}
-    } 
-#ifndef NANO_SMALL
-    else {	/* reverse search */
-	current_x_find = current_x - 1;
-	/* Make sure we haven't passed the begining of the string */
-	rev_start = &fileptr->data[current_x_find];
-	searchstr = fileptr->data;
-
-	/* Look for needle in searchstr */
-	while ((found = strstrwrapper(searchstr, needle, rev_start, current_x_find)) == NULL) {
-	    /* finished processing file, get out */
-	    if (search_last_line) {
-		if (!quiet)
-		    not_found_msg(needle);
-		return NULL;
-	    }
-
-	    update_line(fileptr, 0);
-
-	    /* reset current_x_find between lines */
-	    current_x_find = 0;
-
-	    fileptr = fileptr->prev;
-
-	    if (fileptr == edittop->prev)
-		past_editbuff = 1;
-
-	    /* SOF reached ?, wrap around once */
-/* ? */	    if (fileptr == NULL) {
-		if (bracket_mode)
-		   return NULL;
-		fileptr = filebot;
-		past_editbuff = 1;
-		if (!quiet) {
-		    statusbar(_("Search Wrapped"));
-		    SET(DISABLE_CURPOS);
-		}
-	    }
-	    /* Original start line reached */
-	    if (fileptr == begin)
-		search_last_line = 1;
-
-	    searchstr = fileptr->data;
-	    rev_start = fileptr->data + strlen(fileptr->data);
-	}
-
-	/* We found an instance */
-	current_x_find = found - fileptr->data;
-	/* Ensure we haven't wrapped around again! */
-	if ((search_last_line) && (current_x_find < beginx)) {
-	    if (!quiet)
-		not_found_msg(needle);
-	    return NULL;
-	}
-    }
-#endif /* !NANO_SMALL */
-
-    /* Set globals now that we are sure we found something */
-    current = fileptr;
-    current_x = current_x_find;
-
-    if (!bracket_mode) {
-	if (past_editbuff)
-	   edit_update(fileptr, CENTER);
-	else
-	   update_line(current, current_x);
-
-	placewewant = xplustabs();
-	reset_cursor();
-    }
-    return fileptr;
-}
-
-void search_abort(void)
-{
-    UNSET(KEEP_CUTBUFFER);
-    display_main_list();
-    wrefresh(bottomwin);
-    if (ISSET(MARK_ISSET))
-	edit_refresh_clearok();
-
-#ifdef HAVE_REGEX_H
-    if (ISSET(REGEXP_COMPILED))
-	regexp_cleanup();
-#endif
-}
-
-/* Search for a string. */
-int do_search(void)
-{
-    int i;
-    filestruct *fileptr = current, *didfind;
-    int fileptr_x = current_x;
-
-    wrap_reset();
-    i = search_init(0);
-    switch (i) {
-    case -1:
-	current = fileptr;
-	search_abort();
-	return 0;
-    case -3:
-	search_abort();
-	return 0;
-    case -2:
-	do_replace();
-	return 0;
-    case 1:
-	do_search();
-	search_abort();
-	return 1;
-    }
-
-    /* The sneaky user deleted the previous search string */
-    if (!ISSET(PICO_MODE) && answer[0] == '\0') {
-	statusbar(_("Search Cancelled"));
-	search_abort();
-	return 0;
-    }
-
-     /* If answer is now == "", then PICO_MODE is set.  So, copy
-	last_search into answer... */
-
-    if (answer[0] == '\0')
-	answer = mallocstrcpy(answer, last_search);
-    else
-	last_search = mallocstrcpy(last_search, answer);
-
-    search_last_line = 0;
-    didfind = findnextstr(FALSE, FALSE, current, current_x, answer);
-
-    if ((fileptr == current) && (fileptr_x == current_x) &&
-	didfind != NULL)
-	statusbar(_("This is the only occurrence"));
-
-    search_abort();
-
-    return 1;
-}
-
-void print_replaced(int num)
-{
-    if (num > 1)
-	statusbar(_("Replaced %d occurrences"), num);
-    else if (num == 1)
-	statusbar(_("Replaced 1 occurrence"));
-}
-
-void replace_abort(void)
-{
-    /* Identical to search_abort, so we'll call it here.  If it
-       does something different later, we can change it back.  For now
-       it's just a waste to duplicate code */
-    search_abort();
-    placewewant = xplustabs();
-}
-
-#ifdef HAVE_REGEX_H
-int replace_regexp(char *string, int create_flag)
-{
-    /* split personality here - if create_flag is null, just calculate
-     * the size of the replacement line (necessary because of
-     * subexpressions like \1 \2 \3 in the replaced text) */
-
-    char *c;
-    int new_size = strlen(current->data) + 1;
-    int search_match_count = regmatches[0].rm_eo - regmatches[0].rm_so;
-
-    new_size -= search_match_count;
-
-    /* Iterate through the replacement text to handle subexpression
-     * replacement using \1, \2, \3, etc. */
-
-    c = last_replace;
-    while (*c) {
-	if (*c != '\\') {
-	    if (create_flag)
-		*string++ = *c;
-	    c++;
-	    new_size++;
-	} else {
-	    int num = (int) *(c + 1) - (int) '0';
-	    if (num >= 1 && num <= 9) {
-
-		int i = regmatches[num].rm_so;
-
-		if (num > search_regexp.re_nsub) {
-		    /* Ugh, they specified a subexpression that doesn't
-		       exist. */
-		    return -1;
-		}
-
-		/* Skip over the replacement expression */
-		c += 2;
-
-		/* But add the length of the subexpression to new_size */
-		new_size += regmatches[num].rm_eo - regmatches[num].rm_so;
-
-		/* And if create_flag is set, append the result of the
-		 * subexpression match to the new line */
-		while (create_flag && i < regmatches[num].rm_eo)
-		    *string++ = *(current->data + i++);
-
-	    } else {
-		if (create_flag)
-		    *string++ = *c;
-		c++;
-		new_size++;
-	    }
-	}
-    }
-
-    if (create_flag)
-	*string = 0;
-
-    return new_size;
-}
-#endif
-
-char *replace_line(void)
-{
-    char *copy, *tmp;
-    int new_line_size;
-    int search_match_count;
-
-    /* Calculate size of new line */
-#ifdef HAVE_REGEX_H
-    if (ISSET(USE_REGEXP)) {
-	search_match_count = regmatches[0].rm_eo - regmatches[0].rm_so;
-	new_line_size = replace_regexp(NULL, 0);
-	/* If they specified an invalid subexpression in the replace
-	 * text, return NULL, indicating an error */
-	if (new_line_size < 0)
-	    return NULL;
-    } else {
-#else
-    {
-#endif
-	search_match_count = strlen(last_search);
-	new_line_size = strlen(current->data) - strlen(last_search) +
-	    strlen(last_replace) + 1;
-    }
-
-    /* Create buffer */
-    copy = charalloc(new_line_size);
-
-    /* Head of Original Line */
-    strncpy(copy, current->data, current_x);
-    copy[current_x] = '\0';
-
-    /* Replacement Text */
-    if (!ISSET(USE_REGEXP))
-	strcat(copy, last_replace);
-#ifdef HAVE_REGEX_H
-    else
-	(void) replace_regexp(copy + current_x, 1);
-#endif
-
-    /* The tail of the original line */
-
-    /* This may expose other bugs, because it no longer goes through
-     * each character in the string and tests for string goodness.  But
-     * because we can assume the invariant that current->data is less
-     * than current_x + strlen(last_search) long, this should be safe. 
-     * Or it will expose bugs ;-) */
-    tmp = current->data + current_x + search_match_count;
-    strcat(copy, tmp);
-
-    return copy;
-}
-
-/* step through each replace word and prompt user before replacing word */
-int do_replace_loop(const char *prevanswer, const filestruct *begin,
-			int *beginx, int wholewords, int *i)
-{
-    int replaceall = 0, numreplaced = 0;
-
-    filestruct *fileptr = NULL;
-    char *copy;
-
-    switch (*i) {
-    case -1:		/* Aborted enter */
-	if (last_replace[0] != '\0')
-	    answer = mallocstrcpy(answer, last_replace);
-	statusbar(_("Replace Cancelled"));
-	replace_abort();
-	return 0;
-    case 0:		/* They actually entered something */
-	break;
-    default:
-        if (*i != -2) {	/* First page, last page, for example, could
-			   get here */
-	    do_early_abort();
-	    replace_abort();
-	    return 0;
-        }
-    }
-
-    if (ISSET(PICO_MODE) && answer[0] == '\0')
-	answer = mallocstrcpy(answer, last_replace);
-
-    last_replace = mallocstrcpy(last_replace, answer);
-    while (1) {
-	/* Sweet optimization by Rocco here */
-	fileptr = findnextstr(fileptr || replaceall || search_last_line,
-				FALSE, begin, *beginx, prevanswer);
-
-	/* No more matches.  Done! */
-	if (!fileptr)
-	    break;
-
-	/* Make sure only whole words are found */
-	if (wholewords && !is_whole_word(current_x, fileptr->data, prevanswer))
-	    continue;
-
-	/* If we're here, we've found the search string */
-	if (!replaceall) {
-	    curs_set(0);
-	    do_replace_highlight(TRUE, prevanswer);
-
-	    *i = do_yesno(1, 1, _("Replace this instance?"));
-
-	    do_replace_highlight(FALSE, prevanswer);
-	    curs_set(1);
-	}
-
-	if (*i > 0 || replaceall) {	/* Yes, replace it!!!! */
-	    if (*i == 2)
-		replaceall = 1;
-
-	    copy = replace_line();
-	    if (!copy) {
-		statusbar(_("Replace failed: unknown subexpression!"));
-		replace_abort();
-		return 0;
-	    }
-
-	    /* Cleanup */
-	    totsize -= strlen(current->data);
-	    free(current->data);
-	    current->data = copy;
-	    totsize += strlen(current->data);
-
-	    if (!ISSET(REVERSE_SEARCH)) {
-		/* Stop bug where we replace a substring of the
-		   replacement text */
-		current_x += strlen(last_replace) - 1;
-
-		/* Adjust the original cursor position - COULD BE IMPROVED */
-		if (search_last_line) {
-		    *beginx += strlen(last_replace) - strlen(last_search);
-
-		    /* For strings that cross the search start/end boundary */
-
-		    /* Don't go outside of allocated memory */
-		    if (*beginx < 1)
-			*beginx = 1;
-		}
-	    } else {
-		if (current_x > 1)
-		    current_x--;
-
-		if (search_last_line) {
-		    *beginx += strlen(last_replace) - strlen(last_search);
-
-		    if (*beginx > strlen(current->data))
-			*beginx = strlen(current->data);
-		}
-	    }
-
-	    edit_refresh();
-	    set_modified();
-	    numreplaced++;
-	} else if (*i == -1)	/* Abort, else do nothing and continue
-				   loop */
-	    break;
-    }
-
-    return numreplaced;
-}
-
-/* Replace a string */
-int do_replace(void)
-{
-    int i, numreplaced, beginx;
-    filestruct *begin;
-    char *prevanswer = NULL;
-
-    if (ISSET(VIEW_MODE)) {
-	print_view_warning();
-	replace_abort();
-	return 0;
-    }
-
-    i = search_init(1);
-    switch (i) {
-    case -1:
-	statusbar(_("Replace Cancelled"));
-	replace_abort();
-	return 0;
-    case 1:
-	do_replace();
-	return 1;
-    case -2:
-	do_search();
-	return 0;
-    case -3:
-	replace_abort();
-	return 0;
-    }
-
-    /* Again, there was a previous string, but they deleted it and hit enter */
-    if (!ISSET(PICO_MODE) && answer[0] == '\0') {
-	statusbar(_("Replace Cancelled"));
-	replace_abort();
-	return 0;
-    }
-
-     /* If answer is now == "", then PICO_MODE is set.  So, copy
-	last_search into answer (and prevanswer)... */
-    if (answer[0] == '\0')
-	answer = mallocstrcpy(answer, last_search);
-    else
-	last_search = mallocstrcpy(last_search, answer);
-    prevanswer = mallocstrcpy(prevanswer, last_search);
-
-    if (ISSET(PICO_MODE) && last_replace[0] != '\0') {
-	if (strlen(last_replace) > COLS / 3) {
-	    char *buf = charalloc(COLS / 3 + 3);
-
-	    strncpy(buf, last_replace, COLS / 3 - 1);
-	    strcpy(buf + COLS / 3 - 1, "...");
-	    i = statusq(0, replace_list_2, "", _("Replace with [%s]"),
-			buf);
-	    free(buf);
-	} else
-	    i = statusq(0, replace_list_2, "", _("Replace with [%s]"),
-			last_replace);
-    } else
-	i = statusq(0, replace_list_2, last_replace, _("Replace with"));
-
-    /* save where we are */
-    begin = current;
-    beginx = current_x;
-    search_last_line = 0;
-
-    numreplaced = do_replace_loop(prevanswer, begin, &beginx, FALSE, &i);
-
-    /* restore where we were */
-    current = begin;
-    current_x = beginx;
-    renumber_all();
-    edit_update(current, CENTER);
-    print_replaced(numreplaced);
-    replace_abort();
-    return 1;
-}
-
-void goto_abort(void)
-{
-    UNSET(KEEP_CUTBUFFER);
-    display_main_list();
-}
-
-int do_gotoline(int line, int save_pos)
-{
-    if (line <= 0) {		/* Ask for it */
-	if (statusq(0, goto_list, "", _("Enter line number"))) {
-	    statusbar(_("Aborted"));
-	    goto_abort();
-	    return 0;
-	}
-
-	line = atoi(answer);
-
-	/* Bounds check */
-	if (line <= 0) {
-	    statusbar(_("Come on, be reasonable"));
-	    goto_abort();
-	    return 0;
-	}
-    }
-
-    for (current = fileage; current->next != NULL && line > 1; line--)
-	current = current->next;
-
-    current_x = 0;
-
-    /* if save_pos is non-zero, don't change the cursor position when
-       updating the edit window */
-    if (save_pos)
-    	edit_update(current, NONE);
-    else
-	edit_update(current, CENTER);
-
-    placewewant = 0;
-    goto_abort();
-    return 1;
-}
-
-int do_gotoline_void(void)
-{
-    return do_gotoline(0, 0);
-}
-
-#if defined(ENABLE_MULTIBUFFER) || !defined(DISABLE_SPELLER)
-void do_gotopos(int line, int pos_x, int pos_y, int pos_placewewant)
-{
-    /* since do_gotoline() resets the x-coordinate but not the
-       y-coordinate, set the coordinates up this way */
-    current_y = pos_y;
-    do_gotoline(line, 1);
-
-    /* make sure that the x-coordinate is sane here */
-    if (pos_x > strlen(current->data))
-	pos_x = strlen(current->data);
-
-    /* set the rest of the coordinates up */
-    current_x = pos_x;
-    placewewant = pos_placewewant;
-    update_line(current, pos_x);
-}
-#endif
-
-#if !defined(NANO_SMALL) && defined(HAVE_REGEX_H)
-int do_find_bracket(void)
-{
-    char ch_under_cursor, wanted_ch;
-    char *pos, *brackets = "([{<>}])";
-    char regexp_pat[] = "[  ]";
-    int offset, have_past_editbuff = 0, flagsave, current_x_save, count = 1;
-    filestruct *current_save;
-
-    ch_under_cursor = current->data[current_x];
- 
-    if ((!(pos = strchr(brackets, ch_under_cursor))) || (!((offset = pos - brackets) < 8))) {
-	statusbar(_("Not a bracket"));
-	return 1;
-    }
-
-    blank_statusbar_refresh();
-
-    wanted_ch = *(brackets + ((strlen(brackets) - (offset + 1))));
-
-    current_x_save = current_x;
-    current_save = current;
-    flagsave = flags;
-    SET(USE_REGEXP);
-
-/* apparent near redundancy with regexp_pat[] here is needed, [][] works, [[]] doesn't */ 
-
-    if (offset < (strlen(brackets) / 2)) {			/* on a left bracket */
-	regexp_pat[1] = wanted_ch;
-	regexp_pat[2] = ch_under_cursor;
-	UNSET(REVERSE_SEARCH);
-    } else {							/* on a right bracket */
-	regexp_pat[1] = ch_under_cursor;
-	regexp_pat[2] = wanted_ch;
-	SET(REVERSE_SEARCH);
-    }
-
-    regexp_init(regexp_pat);
-
-    while (1) {
-	search_last_line = 0;
-	if (findnextstr(1, 1, current, current_x, regexp_pat)) {
-	    have_past_editbuff |= past_editbuff;
-	    if (current->data[current_x] == ch_under_cursor)	/* found identical bracket  */
-		count++;
-	    else {						/* found complementary bracket */
-		if (!(--count)) {
-		    if (have_past_editbuff)
-			edit_update(current, CENTER);
-		    else
-			update_line(current, current_x);
-		    placewewant = xplustabs();
-		    reset_cursor();
-		    break ;
-		}
-	    }
-	} else {						/* didn't find either left or right bracket */
-	    statusbar(_("No matching bracket"));
-	    current_x = current_x_save;
-	    current = current_save;
-	    break;
-	}
-    }
-
-    if (ISSET(REGEXP_COMPILED))
-	regexp_cleanup();
-    flags = flagsave;
-    return 0;
-}
-#endif

src/.cvsignore

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

src/Makefile.am

@@ -0,0 +1,22 @@
+
+DEFS= -DSYSCONFDIR=\"$(sysconfdir)\"
+localedir = $(datadir)/locale
+INCLUDES = -Iintl -DLOCALEDIR=\"$(localedir)\" -I@includedir@
+
+ACLOCAL_AMFLAGS = -I m4
+
+bin_PROGRAMS = 	nano
+nano_SOURCES =	color.c \
+		cut.c \
+		files.c \
+		global.c \
+		move.c \
+		nano.c \
+		nano.h \
+		proto.h \
+		rcfile.c \
+		search.c \
+		utils.c \
+		winio.c 
+
+nano_LDADD = @GLIB_LIBS@ @LIBINTL@

src/color.c

@@ -2,7 +2,7 @@
 /**************************************************************************
  *   color.c                                                              *
  *                                                                        *
- *   Copyright (C) 1999-2002 Chris Allegretta                             *
+ *   Copyright (C) 1999-2004 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)  *
@@ -33,79 +33,87 @@
 
 #ifdef ENABLE_COLOR
 
-#ifdef ENABLE_NLS
-#include <libintl.h>
-#define _(string) gettext(string)
-#else
-#define _(string) (string)
-#endif
+/* For each syntax list entry, we go through the list of colors and
+ * assign color pairs. */
+void set_colorpairs(void)
+{
+    const syntaxtype *this_syntax = syntaxes;
+
+    for (; this_syntax != NULL; this_syntax = this_syntax->next) {
+	colortype *this_color = this_syntax->color;
+	int color_pair = 1;
+
+	for (; this_color != NULL; this_color = this_color->next) {
+	    const colortype *beforenow = this_syntax->color;
+
+	    for (; beforenow != NULL && beforenow != this_color && 
+			(beforenow->fg != this_color->fg ||
+			 beforenow->bg != this_color->bg ||
+			 beforenow->bright != this_color->bright);
+		    beforenow = beforenow->next)
+		;
+
+	    if (beforenow != NULL && beforenow != this_color)
+		this_color->pairnum = beforenow->pairnum;
+	    else {
+		this_color->pairnum = color_pair;
+		color_pair++;
+	    }
+	}
+    }
+}
 
 void do_colorinit(void)
 {
-    int i;
-    colortype *tmpcolor = NULL, *beforenow = NULL;
-    int defok = 0;
-
     if (has_colors()) {
+	const colortype *tmpcolor = NULL;
+#ifdef HAVE_USE_DEFAULT_COLORS
+	int defok;
+#endif
+
 	start_color();
 	/* Add in colors, if available */
 
 #ifdef HAVE_USE_DEFAULT_COLORS
- 	if (use_default_colors() != ERR)
-	    defok = 1;
+	defok = use_default_colors() != ERR;
 #endif
 
-	i = 1;
-	for (tmpcolor = colorstrings; tmpcolor != NULL; 
+	for (tmpcolor = colorstrings; tmpcolor != NULL;
 		tmpcolor = tmpcolor->next) {
+	    short background = tmpcolor->bg;
 
-	    for (beforenow = colorstrings; beforenow != NULL
-		 && beforenow != tmpcolor && 
-		 (beforenow->fg != tmpcolor->fg || beforenow->bg != tmpcolor->bg
-		 || beforenow->bright != tmpcolor->bright);
-		beforenow = beforenow->next)
-		;
+	    if (background == -1)
+#ifdef HAVE_USE_DEFAULT_COLORS
+		if (!defok)
+#endif
+		    background = COLOR_BLACK;
 
-	    if (beforenow != NULL && beforenow != tmpcolor) {
-		tmpcolor->pairnum = beforenow->pairnum;
-		continue;
-	    }
-	    
-	    if (defok && tmpcolor->bg == -1)
-		init_pair(i, tmpcolor->fg, -1);
-            else if (tmpcolor->bg == -1)
-		init_pair(i, tmpcolor->fg, COLOR_BLACK);
-	    else /* They picked a fg and bg color */
-		init_pair(i, tmpcolor->fg, tmpcolor->bg);
+	    init_pair(tmpcolor->pairnum, tmpcolor->fg, background);
 
 #ifdef DEBUG
-	    fprintf(stderr, _("Running init_pair with fg = %d and bg = %d\n"), tmpcolor->fg, tmpcolor->bg);
+	    fprintf(stderr, "Running %s with fg = %d and bg = %d\n",
+		"init_pair()", tmpcolor->fg, tmpcolor->bg);
 #endif
-
-	    tmpcolor->pairnum = i;
-	    i++;
 	}
     }
-
-    return;
 }
 
-/* Update the color information based on the current filename */
+/* Update the color information based on the current filename. */
 void update_color(void)
 {
-    syntaxtype *tmpsyntax;
+    const syntaxtype *tmpsyntax;
 
     colorstrings = NULL;
     for (tmpsyntax = syntaxes; tmpsyntax != NULL; tmpsyntax = tmpsyntax->next) {
-	exttype *e;
+	const exttype *e;
+
 	for (e = tmpsyntax->extensions; e != NULL; e = e->next) {
-	    regcomp(&syntaxfile_regexp, e->val, 0);
-
 	    /* Set colorstrings if we matched the extension regex */
-            if (!regexec(&syntaxfile_regexp, filename, 1, synfilematches, 0)) 
-		colorstrings = tmpsyntax->color; 
+	    if (regexec(&e->val, filename, 0, NULL, 0) == 0)
+		colorstrings = tmpsyntax->color;
 
-	    regfree(&syntaxfile_regexp);
+	    if (colorstrings != NULL)
+		break;
 	}
     }
 
@@ -118,7 +126,6 @@ void update_color(void)
 	}
     }
     do_colorinit();
-    edit_refresh();
 }
 
 #endif /* ENABLE_COLOR */

src/cut.c

@@ -0,0 +1,467 @@
+/* $Id$ */
+/**************************************************************************
+ *   cut.c                                                                *
+ *                                                                        *
+ *   Copyright (C) 1999-2004 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.                                                   *
+ *                                                                        *
+ *   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, write to the Free Software          *
+ *   Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.            *
+ *                                                                        *
+ **************************************************************************/
+
+#include "config.h"
+
+#include <stdlib.h>
+#include <string.h>
+#include <stdio.h>
+#include <assert.h>
+#include "proto.h"
+#include "nano.h"
+
+static int marked_cut;		/* Is the cutbuffer from a mark?
+				 * 0 means whole-line cut, 1 means mark,
+				 * 2 means cut-from-cursor. */
+
+#ifndef NANO_SMALL
+static int concatenate_cut;	/* Should we add this cut string to the
+				 * end of the last one? */
+#endif
+
+static filestruct *cutbottom = NULL;
+				/* Pointer to end of cutbuffer. */
+
+filestruct *get_cutbottom(void)
+{
+    return cutbottom;
+}
+
+void add_to_cutbuffer(filestruct *inptr, int allow_concat)
+{
+#ifdef DEBUG
+    fprintf(stderr, "add_to_cutbuffer(): inptr->data = %s\n", inptr->data);
+#endif
+
+    if (cutbuffer == NULL)
+	cutbuffer = inptr;
+#ifndef NANO_SMALL
+    else if (allow_concat && concatenate_cut) {
+	/* Just tack the text in inptr onto the text in cutbottom,
+	 * unless allow_concat is false. */
+	cutbottom->data = charealloc(cutbottom->data,
+		strlen(cutbottom->data) + strlen(inptr->data) + 1);
+	strcat(cutbottom->data, inptr->data);
+	return;
+    }
+#endif
+    else {
+	cutbottom->next = inptr;
+	inptr->prev = cutbottom;
+    }
+    cutbottom = inptr;
+    cutbottom->next = NULL;
+}
+
+#ifndef NANO_SMALL
+/* Cut a marked segment instead of a whole line.
+ *
+ * The first cut character is top->data[top_x].  Unless top == bot, the
+ * last cut line has length bot_x.  That is, if bot_x > 0 then we cut to
+ * bot->data[bot_x - 1].
+ *
+ * We maintain totsize, totlines, filebot, the magicline, and line
+ * numbers.  Also, we set current and current_x so the cursor will be on
+ * the first character after what was cut.  We do not do any screen
+ * updates.
+ *
+ * Note cutbuffer might not be NULL if cut to end is used. */
+void cut_marked_segment(void)
+{
+    filestruct *top;
+    filestruct *bot;
+    filestruct *tmp;
+    size_t top_x;
+    size_t bot_x;
+    size_t newsize;
+
+    /* If the mark doesn't cover any text, get out. */
+    if (current == mark_beginbuf && current_x == mark_beginx)
+	return;
+    assert(current != NULL && mark_beginbuf != NULL);
+
+    /* Set up the top and bottom lines and coordinates of the marked
+     * text. */
+    mark_order((const filestruct **)&top, &top_x,
+		(const filestruct **)&bot, &bot_x);
+
+    /* Make the first cut line manually.  Move the cut part of the top
+     * line into tmp, and set newsize to that partial line's length. */
+    tmp = copy_node(top);
+    newsize = (top == bot ? bot_x - top_x : strlen(top->data + top_x));
+    charmove(tmp->data, tmp->data + top_x, newsize);
+    null_at(&tmp->data, newsize);
+
+    /* Add the contents of tmp to the cutbuffer.  Note that cutbuffer
+     * might be non-NULL if we have cut to end enabled. */
+    if (cutbuffer == NULL) {
+	cutbuffer = tmp;
+	cutbottom = tmp;
+    } else {
+	cutbottom->next = tmp;
+	tmp->prev = cutbottom;
+	cutbottom = tmp;
+    }
+
+    /* And make the top remainder line manually too.  Update current_x
+     * and totlines to account for all the cut text, and update totsize
+     * to account for the length of the cut part of the first line. */
+    current_x = top_x;
+    totsize -= newsize;
+    totlines -= bot->lineno - top->lineno;
+
+    /* Now set newsize to be the length of the top remainder line plus
+     * the bottom remainder line, plus one for the null terminator. */
+    newsize = top_x + strlen(bot->data + bot_x) + 1;
+
+    if (top == bot) {
+	/* In this case, we're only cutting one line or part of one
+	 * line, so the remainder line is shorter.  This means that we
+	 * must move text from the end forward first. */
+	charmove(top->data + top_x, bot->data + bot_x, newsize - top_x);
+	top->data = charealloc(top->data, newsize);
+
+	cutbottom->next = NULL;
+#ifdef DEBUG
+	dump_buffer(cutbuffer);
+#endif
+	return;
+    }
+
+    /* Update totsize to account for the cut part of the last line. */
+    totsize -= bot_x + 1;
+
+    /* Here, the top remainder line might get longer (if the bottom
+     * remainder line is added to the end of it), so we realloc() it
+     * first. */
+    top->data = charealloc(top->data, newsize);
+    charmove(top->data + top_x, bot->data + bot_x, newsize - top_x);
+
+    assert(cutbottom != NULL && cutbottom->next != NULL);
+    /* We're cutting multiple lines, so in particular the next line is
+     * cut too. */
+    cutbottom->next->prev = cutbottom;
+
+    /* Update totsize to account for all the complete lines that have
+     * been cut.  After this, totsize is fully up to date. */
+    for (tmp = top->next; tmp != bot; tmp = tmp->next)
+	totsize -= strlen(tmp->data) + 1;
+
+    /* Make the last cut line manually. */
+    null_at(&bot->data, bot_x);
+
+    /* Move the rest of the cut text (other than the cut part of the top
+     * line) from the buffer to the end of the cutbuffer, and fix the
+     * edit buffer to account for the cut text. */
+    top->next = bot->next;
+    cutbottom = bot;
+    cutbottom->next = NULL;
+    if (top->next != NULL)
+	top->next->prev = top;
+    renumber(top);
+    current = top;
+
+    /* If the bottom line of the cut was the magicline, set filebot
+     * properly, and add a new magicline if the top remainder line
+     * (which is now the new bottom line) is non-blank. */
+    if (bot == filebot) {
+	filebot = top;
+	assert(bot_x == 0);
+	if (top_x > 0)
+	    new_magicline();
+    }
+#ifdef DEBUG
+    dump_buffer(cutbuffer);
+#endif
+}
+#endif
+
+int do_cut_text(void)
+{
+    filestruct *fileptr;
+
+    assert(current != NULL && current->data != NULL);
+
+    check_statblank();
+
+    if (!ISSET(KEEP_CUTBUFFER)) {
+	free_filestruct(cutbuffer);
+	cutbuffer = NULL;
+	marked_cut = 0;
+#ifndef NANO_SMALL
+	concatenate_cut = FALSE;
+#endif
+#ifdef DEBUG
+	fprintf(stderr, "Blew away cutbuffer =)\n");
+#endif
+    }
+
+    /* You can't cut the magicline except with the mark.  But trying
+     * does clear the cutbuffer if KEEP_CUTBUFFER is not set. */
+    if (current == filebot
+#ifndef NANO_SMALL
+			&& !ISSET(MARK_ISSET)
+#endif
+						)
+	return 0;
+
+    SET(KEEP_CUTBUFFER);
+
+#ifndef NANO_SMALL
+    if (ISSET(CUT_TO_END) && !ISSET(MARK_ISSET)) {
+	assert(current_x >= 0 && current_x <= strlen(current->data));
+
+	if (current->data[current_x] == '\0') {
+	    /* If the line is empty and we didn't just cut a non-blank
+	     * line, create a dummy blank line and add it to the
+	     * cutbuffer. */
+	    if (marked_cut != 1 && current->next != filebot) {
+		filestruct *junk = make_new_node(current);
+
+		junk->data = charalloc(1);
+		junk->data[0] = '\0';
+		add_to_cutbuffer(junk, TRUE);
+#ifdef DEBUG
+		dump_buffer(cutbuffer);
+#endif
+	    }
+
+	    do_delete();
+	    marked_cut = 2;
+	    return 1;
+	} else {
+	    SET(MARK_ISSET);
+
+	    mark_beginx = strlen(current->data);
+	    mark_beginbuf = current;
+	}
+    }
+
+    if (ISSET(MARK_ISSET)) {
+	cut_marked_segment();
+
+	placewewant = xplustabs();
+	UNSET(MARK_ISSET);
+
+	/* If we just did a marked cut of part of a line, we should add
+	 * the first line of any cut done immediately afterward to the
+	 * end of this cut, as Pico does. */
+	if (current == mark_beginbuf && current_x < strlen(current->data))
+	    concatenate_cut = TRUE;
+	marked_cut = 1;
+	edit_refresh();
+	set_modified();
+
+	return 1;
+    }
+#endif /* !NANO_SMALL */
+
+    totlines--;
+    totsize -= strlen(current->data) + 1;
+    fileptr = current;
+    current = current->next;
+    current->prev = fileptr->prev;
+    add_to_cutbuffer(fileptr, TRUE);
+#ifdef DEBUG
+    dump_buffer(cutbuffer);
+#endif
+
+    if (fileptr == fileage)
+	fileage = current;
+    else
+	current->prev->next = current;
+
+    if (fileptr == edittop)
+	edittop = current;
+
+    renumber(current);
+    current_x = 0;
+    edit_refresh();
+    set_modified();
+    marked_cut = 0;
+#ifndef NANO_SMALL
+    concatenate_cut = FALSE;
+#endif
+    return 1;
+}
+
+int do_uncut_text(void)
+{
+    filestruct *tmp = current;
+    filestruct *newbuf = NULL;
+    filestruct *newend = NULL;
+
+#ifndef DISABLE_WRAPPING
+    wrap_reset();
+#endif
+    check_statblank();
+    if (cutbuffer == NULL || current == NULL)
+	return 0;		/* AIEEEEEEEEEEEE */
+
+    /* If we're uncutting a previously non-marked block, uncut to end if
+     * we're not at the beginning of the line.  If we are at the
+     * beginning of the line, set placewewant to 0.  Pico does both of
+     * these. */
+    if (marked_cut == 0) {
+	if (current_x != 0)
+	    marked_cut = 2;
+	else
+	    placewewant = 0;
+    }
+
+    /* If we're going to uncut on the magicline, always make a new
+     * magicline in advance, as Pico does. */
+    if (current->next == NULL)
+	new_magicline();
+
+    if (marked_cut == 0 || cutbuffer->next != NULL) {
+	newbuf = copy_filestruct(cutbuffer);
+	for (newend = newbuf; newend->next != NULL && newend != NULL;
+		newend = newend->next)
+	    totlines++;
+    }
+
+    /* Hook newbuf in at current. */
+    if (marked_cut != 0) {
+	filestruct *hold = current;
+
+	/* If there's only one line in the cutbuffer... */
+	if (cutbuffer->next == NULL) {
+	    size_t buf_len = strlen(cutbuffer->data);
+	    size_t cur_len = strlen(current->data);
+
+	    current->data = charealloc(current->data, cur_len + buf_len + 1);
+	    charmove(current->data + current_x + buf_len,
+			current->data + current_x, cur_len - current_x + 1);
+	    strncpy(current->data + current_x, cutbuffer->data, buf_len);
+		/* Use strncpy() to not copy the null terminator. */
+
+	    current_x += buf_len;
+	    totsize += buf_len;
+
+	    placewewant = xplustabs();
+	} else {		/* Yuck -- no kidding! */
+	    char *tmpstr, *tmpstr2;
+
+	    tmp = current->next;
+
+	    /* New beginning. */
+	    tmpstr = charalloc(current_x + strlen(newbuf->data) + 1);
+	    strncpy(tmpstr, current->data, current_x);
+	    strcpy(&tmpstr[current_x], newbuf->data);
+	    totsize += strlen(newbuf->data) + strlen(newend->data) + 1;
+
+	    /* New end. */
+	    tmpstr2 = charalloc(strlen(newend->data) +
+			      strlen(&current->data[current_x]) + 1);
+	    strcpy(tmpstr2, newend->data);
+	    strcat(tmpstr2, &current->data[current_x]);
+
+	    free(current->data);
+	    current->data = tmpstr;
+	    current->next = newbuf->next;
+	    newbuf->next->prev = current;
+	    delete_node(newbuf);
+
+	    current_x = strlen(newend->data);
+	    placewewant = xplustabs();
+	    free(newend->data);
+	    newend->data = tmpstr2;
+
+	    newend->next = tmp;
+
+	    /* If tmp isn't NULL, we're in the middle: update the
+	     * prev pointer.  If it IS NULL, we're at the end; update
+	     * the filebot pointer. */
+	    if (tmp != NULL)
+		tmp->prev = newend;
+	    else {
+		filebot = newend;
+		new_magicline();
+	    }
+
+	    /* Now why don't we update the totsize also? */
+	    for (tmp = current->next; tmp != newend; tmp = tmp->next)
+		totsize += strlen(tmp->data) + 1;
+
+	    current = newend;
+	}
+
+	/* If marked cut == 2, that means that we're doing a cut to end
+	 * and we don't want anything else on the line, so we have to
+	 * screw up all the work we just did and separate the line.
+	 * There must be a better way to do this, but not at 1 AM on a
+	 * work night. */
+	if (marked_cut == 2) {
+	    tmp = make_new_node(current);
+	    tmp->data = mallocstrcpy(NULL, current->data + current_x);
+	    splice_node(current, tmp, current->next);
+	    null_at(&current->data, current_x);
+	    current = current->next;
+	    current_x = 0;
+	    placewewant = 0;
+
+	    /* Extra line added; update stuff. */
+	    totlines++;
+	    totsize++;
+	}
+	/* Renumber from BEFORE where we pasted ;) */
+	renumber(hold);
+
+#ifdef DEBUG
+	dump_buffer(fileage);
+	dump_buffer(cutbuffer);
+#endif
+	set_modified();
+	edit_refresh();
+	return 0;
+    }
+
+    if (current != fileage) {
+	tmp = current->prev;
+	tmp->next = newbuf;
+	newbuf->prev = tmp;
+    } else
+	fileage = newbuf;
+    totlines++;		/* Unmarked uncuts don't split lines. */
+
+    /* This is so uncutting at the top of the buffer will work => */
+    if (current_y == 0)
+	edittop = newbuf;
+
+    /* Connect the end of the buffer to the filestruct. */
+    newend->next = current;
+    current->prev = newend;
+
+    /* Recalculate size *sigh* */
+    for (tmp = newbuf; tmp != current; tmp = tmp->next)
+	totsize += strlen(tmp->data) + 1;
+
+    renumber(newbuf);
+    edit_refresh();
+
+#ifdef DEBUG
+    dump_buffer_reverse();
+#endif
+
+    set_modified();
+    return 1;
+}

src/move.c

@@ -0,0 +1,225 @@
+/* $Id$ */
+/**************************************************************************
+ *   move.c                                                               *
+ *                                                                        *
+ *   Copyright (C) 1999-2004 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.                                                   *
+ *                                                                        *
+ *   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, write to the Free Software          *
+ *   Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.            *
+ *                                                                        *
+ **************************************************************************/
+
+#include "config.h"
+
+#include <stdlib.h>
+#include <string.h>
+#include <assert.h>
+#include "proto.h"
+#include "nano.h"
+
+int do_home(void)
+{
+    current_x = 0;
+    placewewant = 0;
+    check_statblank();
+    update_line(current, current_x);
+    return 1;
+}
+
+int do_end(void)
+{
+    current_x = strlen(current->data);
+    placewewant = xplustabs();
+    check_statblank();
+    update_line(current, current_x);
+    return 1;
+}
+
+int do_page_up(void)
+{
+    int i;
+
+#ifndef DISABLE_WRAPPING
+    wrap_reset();
+#endif
+
+    /* If edittop is the first line of the file, move current up there
+     * and put the cursor at the beginning of the line. */
+    if (edittop == fileage) {
+	current = fileage;
+	placewewant = 0;
+    } else {
+	/* Move the top line of the edit window up a page. */
+	for (i = 0; i < editwinrows - 2 && edittop->prev != NULL; i++)
+	    edittop = edittop->prev;
+#ifndef NANO_SMALL
+	/* If we're in smooth scrolling mode and there was 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)
+	    for (i = 0; i < editwinrows - 2; i++)
+		current = current->prev;
+	/* If we're not in smooth scrolling mode and there was 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
+    }
+    /* Get the equivalent x-coordinate of the new line. */
+    current_x = actual_x(current->data, placewewant);
+
+    edit_refresh();
+
+    check_statblank();
+    return 1;
+}
+
+int do_page_down(void)
+{
+    int i;
+
+#ifndef DISABLE_WRAPPING
+    wrap_reset();
+#endif
+
+    /* 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 {
+	/* Move the top line of the edit window down a page. */
+	for (i = 0; i < editwinrows - 2; i++)
+	    edittop = edittop->next;
+#ifndef NANO_SMALL
+	/* If we're in smooth scrolling mode and there was 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)
+	    for (i = 0; i < editwinrows - 2; i++)
+		current = current->next;
+	/* If we're not in smooth scrolling mode and there was 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
+    }
+    /* Get the equivalent x-coordinate of the new line. */
+    current_x = actual_x(current->data, placewewant);
+
+    edit_refresh();
+
+    check_statblank();
+    return 1;
+}
+
+int do_up(void)
+{
+#ifndef DISABLE_WRAPPING
+    wrap_reset();
+#endif
+    check_statblank();
+
+    if (current->prev == NULL)
+	return 0;
+
+    assert(current_y == current->lineno - edittop->lineno);
+    current = current->prev;
+    current_x = actual_x(current->data, placewewant);
+    if (current_y > 0) {
+	update_line(current->next, 0);
+	    /* It was necessary to change current first, so that the
+	     * mark display will change! */
+	update_line(current, current_x);
+    } else
+#ifndef NANO_SMALL
+    if (ISSET(SMOOTHSCROLL))
+	edit_update(current, TOP);
+    else
+#endif
+	edit_update(current, CENTER);
+    return 1;
+}
+
+/* Return value 1 means we moved down, 0 means we were already at the
+ * bottom. */
+int do_down(void)
+{
+#ifndef DISABLE_WRAPPING
+    wrap_reset();
+#endif
+    check_statblank();
+
+    if (current->next == NULL)
+	return 0;
+
+    assert(current_y == current->lineno - edittop->lineno);
+    current = current->next;
+    current_x = actual_x(current->data, placewewant);
+
+    /* Note that current_y is zero-based.  This test checks for the
+     * cursor's being not on the last row of the edit window. */
+    if (current_y != editwinrows - 1) {
+	update_line(current->prev, 0);
+	update_line(current, current_x);
+    } else
+#ifndef NANO_SMALL
+    if (ISSET(SMOOTHSCROLL))
+	/* In this case current_y does not change.  The cursor remains
+	 * at the bottom of the edit window. */
+	edit_update(edittop->next, TOP);
+    else
+#endif
+	edit_update(current, CENTER);
+    return 1;
+}
+
+int do_left(void)
+{
+    if (current_x > 0)
+	current_x--;
+    else if (current != fileage) {
+	do_up();
+	current_x = strlen(current->data);
+    }
+    placewewant = xplustabs();
+    check_statblank();
+    update_line(current, current_x);
+    return 1;
+}
+
+int do_right(void)
+{
+    assert(current_x <= strlen(current->data));
+
+    if (current->data[current_x] != '\0')
+	current_x++;
+    else if (current->next != NULL) {
+	do_down();
+	current_x = 0;
+    }
+    placewewant = xplustabs();
+    check_statblank();
+    update_line(current, current_x);
+    return 1;
+}

src/nano.h

@@ -2,7 +2,7 @@
 /**************************************************************************
  *   nano.h                                                               *
  *                                                                        *
- *   Copyright (C) 1999-2002 Chris Allegretta                             *
+ *   Copyright (C) 1999-2004 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)  *
@@ -19,67 +19,138 @@
  *                                                                        *
  **************************************************************************/
 
-#ifdef HAVE_MALLOC_H
-#include <malloc.h>
+#ifndef NANO_H
+#define NANO_H 1
+
+#ifdef __TANDEM
+/* Tandem NonStop Kernel */
+#include <floss.h>
+#define NANO_ROOT_UID 65535
+#else
+#define NANO_ROOT_UID 0
 #endif
 
 #ifdef HAVE_LIMITS_H
 #include <limits.h>
 #endif
 
-#ifndef NANO_H
-#define NANO_H 1
-
 /* Macros for the flags int... */
 #define SET(bit) flags |= bit
 #define UNSET(bit) flags &= ~bit
-#define ISSET(bit) (flags & bit)
+#define ISSET(bit) ((flags & bit) != 0)
 #define TOGGLE(bit) flags ^= bit
 
-#ifndef NANO_SMALL
-  /* For the backup file copy ... */
-# define COPYFILEBLOCKSIZE 1024
+/* Define charalloc as a macro rather than duplicating code */
+#define charalloc(howmuch) (char *)nmalloc((howmuch) * sizeof(char))
+#define charealloc(ptr, howmuch) (char *)nrealloc(ptr, (howmuch) * sizeof(char))
+#define charmove(dest, src, n) memmove(dest, src, (n) * sizeof(char))
+#ifdef BROKEN_REGEXEC
+#define regexec(preg, string, nmatch, pmatch, eflags) regexec_safe(preg, string, nmatch, pmatch, eflags)
 #endif
 
-#ifdef USE_SLANG	/* Slang support enabled */
+#ifndef NANO_SMALL
+/* For the backup file copy ... */
+#define COPYFILEBLOCKSIZE 1024
+#endif
+
+#ifdef USE_SLANG
+/* Slang support enabled.  Work around Slang's not defining KEY_DC or
+ * KEY_IC. */
 #include <slcurses.h>
-#define KEY_DC 0x113
+#define KEY_DC SL_KEY_DELETE
+#define KEY_IC SL_KEY_IC
 #elif defined(HAVE_NCURSES_H)
 #include <ncurses.h>
-#else /* Uh oh */
-#include <curses.h> 
+#else /* Uh oh. */
+#include <curses.h>
 #endif /* CURSES_H */
 
-#ifdef HAVE_LIBINTL_H
-#include <libintl.h>
+#ifdef ENABLE_NLS
+#  ifdef HAVE_LIBINTL_H
+#    include <libintl.h>
+#  endif
+#  define _(string) gettext(string)
+#  define P_(singular, plural, number) ngettext(singular, plural, number)
+#else
+#  define _(string) (string)
+#  define P_(singular, plural, number) (number == 1 ? singular : plural)
 #endif
 
 #include <sys/types.h>
 #include <sys/stat.h>
 #include "config.h"
 
+/* If no snprintf()/vsnprintf(), use the versions from glib. */
 #if !defined(HAVE_SNPRINTF) || !defined(HAVE_VSNPRINTF)
 #include <glib.h>
 # ifndef HAVE_SNPRINTF
-#  define snprintf	g_snprintf
+#  define snprintf g_snprintf
 # endif
 # ifndef HAVE_VSNPRINTF
-#  define vsnprintf	g_vsnprintf
+#  define vsnprintf g_vsnprintf
 # endif
 #endif
 
+/* If no strcasecmp()/strncasecmp(), use the versions we have. */
+#ifndef HAVE_STRCASECMP
+#define strcasecmp nstricmp
+#endif
+
+#ifndef HAVE_STRNCASECMP
+#define strncasecmp nstrnicmp
+#endif
+
+/* Assume ERR is defined as -1.  To avoid duplicate case values when
+ * some key definitions are missing, we have to set all of these, and
+ * all of the special sentinel values below, to different negative
+ * values other than -1. */
+
+/* HP-UX 10 & 11 do not seem to support KEY_HOME and KEY_END. */
+#ifndef KEY_HOME
+#define KEY_HOME -2
+#endif
+
+#ifndef KEY_END
+#define KEY_END -3
+#endif
+
+/* Slang and SunOS 5.7-5.9 do not seem to support KEY_RESIZE. */
+#ifndef KEY_RESIZE
+#define KEY_RESIZE -4
+#endif
+
+/* Slang does not seem to support KEY_SUSPEND, KEY_SLEFT, or
+ * KEY_SRIGHT. */
+#ifndef KEY_SUSPEND
+#define KEY_SUSPEND -5
+#endif
+
+#ifndef KEY_SLEFT
+#define KEY_SLEFT -6
+#endif
+
+#ifndef KEY_SRIGHT
+#define KEY_SRIGHT -7
+#endif
+
 #define VERMSG "GNU nano " VERSION
 
+/* If we aren't using ncurses, turn the mouse support off, as it's
+ * ncurses-specific. */
+#ifndef NCURSES_MOUSE_VERSION
+#define DISABLE_MOUSE 1
+#endif
+
 #if defined(DISABLE_WRAPPING) && defined(DISABLE_JUSTIFY)
 #define DISABLE_WRAPJUSTIFY 1
 #endif
 
-/* Structure types */
+/* Structure types. */
 typedef struct filestruct {
     char *data;
-    struct filestruct *next;	/* Next node */
-    struct filestruct *prev;	/* Previous node */
-    int lineno;			/* The line number */
+    struct filestruct *next;	/* Next node. */
+    struct filestruct *prev;	/* Previous node. */
+    int lineno;			/* The line number. */
 } filestruct;
 
 #ifdef ENABLE_MULTIBUFFER
@@ -88,56 +159,63 @@ typedef struct openfilestruct {
 #ifndef NANO_SMALL
     struct stat originalfilestat;
 #endif
-    struct openfilestruct *next;	/* Next node */
-    struct openfilestruct *prev;	/* Previous node */
-    struct filestruct *fileage;	/* Current file */
-    struct filestruct *filebot;	/* Current file's last line */
+    struct openfilestruct *next;	/* Next node. */
+    struct openfilestruct *prev;	/* Previous node. */
+    struct filestruct *fileage;	/* Current file. */
+    struct filestruct *filebot;	/* Current file's last line. */
 #ifndef NANO_SMALL
     struct filestruct *file_mark_beginbuf;
-				/* Current file's beginning marked line */
-    int file_mark_beginx;	/* Current file's beginning marked line's
-				   x-coordinate position */
+				/* Current file's beginning marked
+				 * line. */
+    int file_mark_beginx;	/* Current file's beginning marked
+				 * line's x-coordinate position. */
 #endif
-    int file_current_x;		/* Current file's x-coordinate position */
-    int file_current_y;		/* Current file's y-coordinate position */
+    int file_current_x;		/* Current file's x-coordinate
+				 * position. */
+    int file_current_y;		/* Current file's y-coordinate
+				 * position. */
     int file_flags;		/* Current file's flags: modification
-				   status (and marking status, if
-				   available) */
-    int file_placewewant;	/* Current file's place we want */
-    int file_totlines;		/* Current file's total number of lines */
-    long file_totsize;		/* Current file's total size */
-    int file_lineno;		/* Current file's line number */
+				 * status (and marking status, if
+				 * available). */
+    int file_placewewant;	/* Current file's place we want. */
+    int file_totlines;		/* Current file's total number of
+				 * lines. */
+    long file_totsize;		/* Current file's total size. */
+    int file_lineno;		/* Current file's line number. */
 } openfilestruct;
 #endif
 
 typedef struct shortcut {
-   int val;		/* Actual sequence that generates the keystroke */
-   int altval;		/* Alt key # for this function, or 0 for none */
-   int misc1;		/* Other int functions we want bound */
-   int misc2;
-   int viewok;		/* is this function legal in view mode? */
-   int (*func) (void);	/* Function to call when we catch this key */
-   const char *desc;	/* Description, e.g. "Page Up" */
+    /* Key values that aren't used should be set to NANO_NO_KEY. */
+    int ctrlval;	/* Special sentinel key or control key we want
+			 * bound. */
+    int metaval;	/* Meta key we want bound. */
+    int funcval;	/* Function key we want bound. */
+    int miscval;	/* Other Meta key we want bound. */
+    int viewok;		/* Is this function legal in view mode? */
+    int (*func) (void);	/* Function to call when we catch this key. */
+    const char *desc;	/* Description, e.g. "Page Up". */
 #ifndef DISABLE_HELP
-   const char *help;	/* Help file entry text */
+    const char *help;	/* Help file entry text. */
 #endif
-   struct shortcut *next;
+    struct shortcut *next;
 } shortcut;
 
 #ifndef NANO_SMALL
 typedef struct toggle {
-   int val;		/* Sequence to toggle the key.  Should only need 1 */
+   int val;		/* Sequence to toggle the key.  Should only need
+			 * one. */
    const char *desc;	/* Description for when toggle is, uh, toggled,
-			   e.g. "Pico Messages"; we'll append Enabled or
-			   Disabled */
-   int flag;		/* What flag actually gets toggled */
+			 * e.g. "Cut to end"; we'll append Enabled or
+			 * Disabled. */
+   int flag;		/* What flag actually gets toggled. */
    struct toggle *next;
 } toggle;
 #endif /* !NANO_SMALL */
 
 #ifdef ENABLE_NANORC
 typedef struct rcoption {
-   char *name;
+   const char *name;
    int flag;
 } rcoption;
 #endif /* ENABLE_NANORC */
@@ -149,13 +227,13 @@ typedef struct colortype {
     int bg;			/* bg color */
     int bright;			/* Is this color A_BOLD? */
     int pairnum;		/* Color pair number used for this fg/bg */
-    char *start;		/* Start (or all) of the regex string */
-    char *end;			/* End of the regex string */
+    regex_t start;		/* Start (or all) of the regex string */
+    regex_t *end;		/* End of the regex string */
     struct colortype *next;
 } colortype;
 
 typedef struct exttype {
-    char *val;
+    regex_t val;		/* The extensions that match this syntax. */
     struct exttype *next;
 } exttype;
 
@@ -164,46 +242,62 @@ typedef struct syntaxtype {
     exttype *extensions;	/* List of extensions that this applies to */
     colortype *color;		/* color struct for this syntax */
     struct syntaxtype *next;
-
 } syntaxtype;
 
 #endif /* ENABLE_COLOR */
 
+#ifndef NANO_SMALL
+typedef struct historytype {
+    struct historytype *next;
+    struct historytype *prev;
+    char *data;
+} historytype;
+typedef struct historyheadtype {
+    struct historytype *next;	/* Keep *next and *prev members
+				 * together. */
+    struct historytype *prev;	/* And in same order as in
+				 * historytype. */
+    struct historytype *tail;
+    struct historytype *current;
+    int count;
+    int len;
+} historyheadtype;
+#endif /* !NANO_SMALL */
 
-/* Bitwise flags so we can save space (or more correctly, not waste it) */
-
+/* Bitwise flags so we can save space (or more correctly, not waste
+ * it). */
 #define MODIFIED		(1<<0)
 #define KEEP_CUTBUFFER		(1<<1)
 #define CASE_SENSITIVE		(1<<2)
 #define MARK_ISSET		(1<<3)
 #define CONSTUPDATE		(1<<4)
 #define NO_HELP			(1<<5)
-#define PICO_MODE		(1<<6)
-#define FOLLOW_SYMLINKS		(1<<7)
-#define SUSPEND			(1<<8)
-#define NO_WRAP			(1<<9)
-#define AUTOINDENT		(1<<10)
-#define SAMELINEWRAP		(1<<11)
-#define VIEW_MODE		(1<<12)
-#define USE_MOUSE		(1<<13)
-#define USE_REGEXP		(1<<14)
-#define REGEXP_COMPILED		(1<<15)
-#define TEMP_OPT		(1<<16)
-#define CUT_TO_END		(1<<17)
-#define REVERSE_SEARCH		(1<<18)
-#define MULTIBUFFER		(1<<19)
-#define CLEAR_BACKUPSTRING	(1<<20)
-#define DOS_FILE		(1<<21)
-#define MAC_FILE		(1<<22)
-#define SMOOTHSCROLL		(1<<23)
-#define DISABLE_CURPOS		(1<<24)	/* Damn, we still need it */
-#define ALT_KEYPAD		(1<<25)
-#define NO_CONVERT		(1<<26)
-#define BACKUP_FILE		(1<<27)
-#define NO_RCFILE		(1<<28)
-
-/* Control key sequences, changing these would be very very bad */
+#define NOFOLLOW_SYMLINKS	(1<<6)
+#define SUSPEND			(1<<7)
+#define NO_WRAP			(1<<8)
+#define AUTOINDENT		(1<<9)
+#define VIEW_MODE		(1<<10)
+#define USE_MOUSE		(1<<11)
+#define USE_REGEXP		(1<<12)
+#define REGEXP_COMPILED		(1<<13)
+#define TEMP_OPT		(1<<14)
+#define CUT_TO_END		(1<<15)
+#define REVERSE_SEARCH		(1<<16)
+#define MULTIBUFFER		(1<<17)
+#define DOS_FILE		(1<<18)
+#define MAC_FILE		(1<<19)
+#define SMOOTHSCROLL		(1<<20)
+#define DISABLE_CURPOS		(1<<21)	/* Damn, we still need it. */
+#define REBIND_DELETE		(1<<22)
+#define NO_CONVERT		(1<<23)
+#define BACKUP_FILE		(1<<24)
+#define NO_RCFILE		(1<<25)
+#define COLOR_SYNTAX		(1<<26)
+#define PRESERVE		(1<<27)
+#define HISTORY_CHANGED		(1<<28)
+#define HISTORYLOG		(1<<29)
 
+/* Control key sequences, changing these would be very very bad. */
 #define NANO_CONTROL_SPACE 0
 #define NANO_CONTROL_A 1
 #define NANO_CONTROL_B 2
@@ -231,11 +325,12 @@ typedef struct syntaxtype {
 #define NANO_CONTROL_X 24
 #define NANO_CONTROL_Y 25
 #define NANO_CONTROL_Z 26
-
+#define NANO_CONTROL_3 27
 #define NANO_CONTROL_4 28
 #define NANO_CONTROL_5 29
 #define NANO_CONTROL_6 30
 #define NANO_CONTROL_7 31
+#define NANO_CONTROL_8 127
 
 #define NANO_ALT_A 'a'
 #define NANO_ALT_B 'b'
@@ -267,16 +362,23 @@ typedef struct syntaxtype {
 #define NANO_ALT_COMMA ','
 #define NANO_ALT_LCARAT '<'
 #define NANO_ALT_RCARAT '>'
-#define NANO_ALT_BRACKET ']'
+#define NANO_ALT_RBRACKET ']'
 #define NANO_ALT_SPACE ' '
 
-/* Some semi-changeable keybindings; don't play with unless you're sure you
-know what you're doing */
+/* Some semi-changeable keybindings; don't play with these unless you're
+ * sure you know what you're doing. */
 
+/* No key at all. */
+#define NANO_NO_KEY		-8
+
+/* Special sentinel key used for search string history. */
+#define NANO_HISTORY_KEY	-9
+
+/* Normal keys. */
 #define NANO_INSERTFILE_KEY	NANO_CONTROL_R
 #define NANO_INSERTFILE_FKEY	KEY_F(5)
-#define NANO_EXIT_KEY 		NANO_CONTROL_X
-#define NANO_EXIT_FKEY 		KEY_F(2)
+#define NANO_EXIT_KEY		NANO_CONTROL_X
+#define NANO_EXIT_FKEY		KEY_F(2)
 #define NANO_WRITEOUT_KEY	NANO_CONTROL_O
 #define NANO_WRITEOUT_FKEY	KEY_F(3)
 #define NANO_GOTO_KEY		NANO_CONTROL_7
@@ -286,6 +388,7 @@ know what you're doing */
 #define NANO_HELP_FKEY		KEY_F(1)
 #define NANO_WHEREIS_KEY	NANO_CONTROL_W
 #define NANO_WHEREIS_FKEY	KEY_F(6)
+#define NANO_WHEREIS_NEXT_KEY	NANO_ALT_W
 #define NANO_REPLACE_KEY	NANO_CONTROL_4
 #define NANO_REPLACE_FKEY	KEY_F(14)
 #define NANO_ALT_REPLACE_KEY	NANO_ALT_R
@@ -303,14 +406,17 @@ know what you're doing */
 #define NANO_SPELL_KEY		NANO_CONTROL_T
 #define NANO_SPELL_FKEY		KEY_F(12)
 #define NANO_FIRSTLINE_KEY	NANO_PREVPAGE_KEY
+#define NANO_FIRSTLINE_FKEY	NANO_PREVPAGE_FKEY
 #define NANO_LASTLINE_KEY	NANO_NEXTPAGE_KEY
+#define NANO_LASTLINE_FKEY	NANO_NEXTPAGE_FKEY
 #define NANO_CANCEL_KEY		NANO_CONTROL_C
 #define NANO_REFRESH_KEY	NANO_CONTROL_L
 #define NANO_JUSTIFY_KEY	NANO_CONTROL_J
 #define NANO_JUSTIFY_FKEY	KEY_F(4)
-#define NANO_UNJUSTIFY_KEY	NANO_CONTROL_U
-#define NANO_UP_KEY		NANO_CONTROL_P
-#define NANO_DOWN_KEY		NANO_CONTROL_N
+#define NANO_UNJUSTIFY_KEY	NANO_UNCUT_KEY	/* Same key as uncut. */
+#define NANO_UNJUSTIFY_FKEY	NANO_UNCUT_FKEY	/* Same key as uncut. */
+#define NANO_PREVLINE_KEY	NANO_CONTROL_P
+#define NANO_NEXTLINE_KEY	NANO_CONTROL_N
 #define NANO_FORWARD_KEY	NANO_CONTROL_F
 #define NANO_BACK_KEY		NANO_CONTROL_B
 #define NANO_MARK_KEY		NANO_CONTROL_6
@@ -330,10 +436,13 @@ know what you're doing */
 #define NANO_OPENNEXT_KEY	NANO_ALT_RCARAT
 #define NANO_OPENPREV_ALTKEY	NANO_ALT_COMMA
 #define NANO_OPENNEXT_ALTKEY	NANO_ALT_PERIOD
-#define NANO_BRACKET_KEY	NANO_ALT_BRACKET
+#define NANO_BRACKET_KEY	NANO_ALT_RBRACKET
 #define NANO_EXTCMD_KEY		NANO_CONTROL_X
 #define NANO_NEXTWORD_KEY	NANO_CONTROL_SPACE
 #define NANO_PREVWORD_KEY	NANO_ALT_SPACE
+#define NANO_PARABEGIN_KEY	NANO_CONTROL_W
+#define NANO_PARAEND_KEY	NANO_CONTROL_O
+#define NANO_VERBATIM_KEY	NANO_ALT_V
 
 #ifndef NANO_SMALL
 /* Toggles do not exist with NANO_SMALL. */
@@ -341,19 +450,19 @@ know what you're doing */
 #define TOGGLE_AUTOINDENT_KEY	NANO_ALT_I
 #define TOGGLE_SUSPEND_KEY	NANO_ALT_Z
 #define TOGGLE_NOHELP_KEY	NANO_ALT_X
-#define TOGGLE_PICOMODE_KEY	NANO_ALT_P
 #define TOGGLE_MOUSE_KEY	NANO_ALT_M
 #define TOGGLE_CUTTOEND_KEY	NANO_ALT_K
-#define TOGGLE_REGEXP_KEY	NANO_ALT_E
-#define TOGGLE_WRAP_KEY		NANO_ALT_W
+#define TOGGLE_REGEXP_KEY	NANO_ALT_R
+#define TOGGLE_WRAP_KEY		NANO_ALT_L
 #define TOGGLE_BACKWARDS_KEY	NANO_ALT_B
-#define TOGGLE_CASE_KEY		NANO_ALT_A
-#define TOGGLE_LOAD_KEY		NANO_ALT_F
+#define TOGGLE_CASE_KEY		NANO_ALT_C
+#define TOGGLE_MULTIBUFFER_KEY	NANO_ALT_F
 #define TOGGLE_DOS_KEY		NANO_ALT_D
 #define TOGGLE_MAC_KEY		NANO_ALT_O
 #define TOGGLE_SMOOTH_KEY	NANO_ALT_S
 #define TOGGLE_NOCONVERT_KEY	NANO_ALT_N
 #define TOGGLE_BACKUP_KEY	NANO_ALT_B
+#define TOGGLE_SYNTAX_KEY	NANO_ALT_Y
 #endif /* !NANO_SMALL */
 
 #define MAIN_VISIBLE 12
@@ -362,16 +471,21 @@ know what you're doing */
 #define NOVIEW 0
 
 typedef enum {
-    CENTER, TOP, NONE
-} topmidbotnone;
+    TOP, CENTER, NONE
+} topmidnone;
 
-/* Minimum editor window rows required for nano to work correctly */
+/* Minimum editor window rows required for nano to work correctly. */
 #define MIN_EDITOR_ROWS 3
 
-/* Default number of characters from end-of-line where text wrapping occurs */
+/* Minimum editor window cols required for nano to work correctly. */
+#define MIN_EDITOR_COLS 10
+
+/* Default number of characters from end-of-line where text wrapping
+ * occurs. */
 #define CHARS_FROM_EOL 8
 
-/* Minimum fill length (space available for text before wrapping occurs) */
-#define MIN_FILL_LENGTH 10
+/* Maximum number of search history strings saved, same value used for
+ * replace history. */
+#define MAX_SEARCH_HISTORY 100
 
-#endif /* !NANO_H */ 
+#endif /* !NANO_H */