GNU nano 1.1.8 release

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

.cvsignore

@@ -1,10 +1,21 @@
 Makefile
 Makefile.in
+aclocal.m4
 confdefs.h
 config.cache
 config.h
+config.h.in
 config.log
 config.status
 configure
+config.guess
+config.sub
+depcomp
+install-sh
+missing
+mkinstalldirs
 nano
+nano.info
 stamp-h
+stamp-h.in
+stamp-h1

ABOUT-NLS

@@ -8,7 +8,7 @@ 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*
+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.
 
@@ -22,8 +22,8 @@ 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.
 
-One advise in advance
-=====================
+Quick configuration advice
+==========================
 
    If you want to exploit the full power of internationalization, you
 should configure it using
@@ -34,13 +34,14 @@ 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 or message inheritance) 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.
+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
+   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'.
 
@@ -53,23 +54,20 @@ 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 provides
-usable `catgets' (if using this is selected by the installer) or
-`gettext' functions.  If neither is available, the GNU `gettext' own
+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
+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 --with-catgets
      ./configure --disable-nls
 
-will respectively bypass any pre-existing `catgets' or `gettext' to use
-the internationalizing routines provided within this package, enable
-the use of the `catgets' functions (if found on the locale system), or
-else, *totally* disable translation of messages.
+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
@@ -83,18 +81,10 @@ package is more recent, you should use
 
 to prevent auto-detection.
 
-   By default the configuration process will not test for the `catgets'
-function and therefore they will not be used.  The reasons are already
-given above: the emulation on top of `catgets' cannot provide all the
-extensions provided by the GNU `gettext' library.  If you nevertheless
-want to use the `catgets' functions use
-
-     ./configure --with-catgets
-
-to enable the test for `catgets' (this causes no harm if `catgets' is
-not available on your system).  If you really select this option we
-would like to hear about the reasons because we cannot think of any
-good one ourself.
+   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
@@ -110,22 +100,35 @@ 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
-ISO 639 `LL' two-letter code prior to using the programs in the
-package.  For example, let's suppose that you speak German.  At the
-shell prompt, merely execute `setenv LANG de' (in `csh'),
-`export LANG; LANG=de' (in `sh') or `export LANG=de' (in `bash').  This
-can be done from your `.login' or `.profile' file, once and for all.
+`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.
 
-   An operating system might already offer message localization for
-many of its programs, while other programs have been installed locally
-with the full capabilities of GNU `gettext'.  Just using `gettext'
-extended syntax for `LANG' would break proper localization of already
-available operating system programs.  In this case, users should set
-both `LANGUAGE' and `LANG' variables in their environment, as programs
-using GNU `gettext' give preference to `LANGUAGE'.  For example, some
-Swedish users would rather read translations in German than English for
-when Swedish is not available.  This is easily accomplished by setting
-`LANGUAGE' to `sv:de' while leaving `LANG' to `sv'.
+   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.
+
+   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
 =================
@@ -133,33 +136,21 @@ 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, courtesy of Linux
-International.  You may reach your translation team at the address
-`LL@li.org', replacing LL by the two-letter ISO 639 code for your
-language.  Language codes are *not* the same as the country codes given
-in ISO 3166.  The following translation teams exist, as of December
-1997:
+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.
 
-     Chinese `zh', Czech `cs', Danish `da', Dutch `nl', English `en',
-     Esperanto `eo', Finnish `fi', French `fr', German `de', Hungarian
-     `hu', Irish `ga', Italian `it', Indonesian `id', Japanese `ja',
-     Korean `ko', Latin `la', Norwegian `no', Persian `fa', Polish
-     `pl', Portuguese `pt', Russian `ru', Slovenian `sl', Spanish `es',
-     Swedish `sv', and Turkish `tr'.
-
-For example, you may reach the Chinese translation team by writing to
-`zh@li.org'.
-
-   If you'd like to volunteer to *work* at translating messages, you
+   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
+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,
+_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
@@ -173,42 +164,128 @@ Available Packages
 ==================
 
    Languages are not equally supported in all packages.  The following
-matrix shows the current state of internationalization, as of December
-1997.  The matrix shows, in regard of each package, for which languages
-PO files have been submitted to translation coordination.
+matrix shows the current state of internationalization, as of September
+2001.  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    cs da de en es fi fr it ja ko nl no pl pt ru sl sv
-                     .----------------------------------------------------.
-     bash            |       []          []          []                   |  3
-     bison           |       []          []          []                   |  3
-     clisp           |       [] [] []    []                               |  4
-     cpio            |       []    []    []       [] []    []             |  6
-     diffutils       |       []    []    []                []          [] |  5
-     enscript        |       []    [] [] []          []             []    |  6
-     fileutils       | []    []    []    []       [] []    [] []    [] [] | 10
-     findutils       |       []    []    [] []    [] []    []    []    [] |  9
-     flex            |             []    []       []                   [] |  4
-     gcal            |       []          []          []    []          [] |  5
-     gettext         |    [] []    []    []       [] [] [] [] []    [] [] | 12
-     grep            |       []    []    []       [] [] [] []    [] [] [] | 10
-     hello           |    [] []    []    []       [] [] [] [] []    [] [] | 11
-     id-utils        |       []          []                []             |  3
-     indent          |    [] []                   []       []    []       |  5
-     libc            |       []    []    []       [] []    []          [] |  7
-     m4              |       []          []    []    []          []    [] |  6
-     make            |       []    []    []       [] []    []             |  6
-     music           |                   []                []             |  2
-     ptx             |       []    []    []          [] [] [] []       [] |  8
-     recode          |    [] []    []    []          []    [] []    [] [] |  9
-     sh-utils        |       []    []    []          [] [] [] []       [] |  8
-     sharutils       | []    []    []    []          []                [] |  6
-     tar             | []    []          [] []    [] [] [] [] []    [] [] | 11
-     texinfo         | []    []          []                               |  3
-     textutils       | []    []    []    []       [] [] [] []          [] |  9
-     wdiff           | []    []    []    []          [] [] []          [] |  8
-                     `----------------------------------------------------'
-       17 languages    cs da de en es fi fr it ja ko nl no pl pt ru sl sv
-       27 packages      6  4 25  1 18  1 26  2  1 12 20  9 19  7  4  7 17  179
+     Ready PO files    bg cs da de el en eo es et fi fr gl he hr id it ja
+                     +----------------------------------------------------+
+     a2ps            |          []             []    []                   |
+     bash            |          []       [] []       []                   |
+     bfd             |                                                    |
+     binutils        |                               []                   |
+     bison           |          []          [] []    []                [] |
+     clisp           |          []    []    []       []                   |
+     cpio            |       [] []          []       [] []                |
+     diffutils       |       [] []       [] []       [] []       []       |
+     enscript        |          []                   []                   |
+     error           |                      []       []                   |
+     fetchmail       |                                                    |
+     fileutils       |    [] [] [] []       []       [] []             [] |
+     findutils       |       [] []          [] []    [] []       [] []    |
+     flex            |       []             []       []                   |
+     freetype        |                                                    |
+     gas             |                                                    |
+     gawk            |                               []    []             |
+     gcal            |                                                    |
+     gcc             |                                                    |
+     gettext         |    [] [] [] []       []       [] []       [] [] [] |
+     gnupg           |          []       []    []    [] []          [] [] |
+     gprof           |                                                    |
+     grep            |    []    []       [] [] []    [] []          []    |
+     hello           |       [] [] []    [] [] [] [] [] []          [] [] |
+     id-utils        |       [] []                   []                   |
+     indent          |       [] []             []    [] []                |
+     jpilot          |                               []                   |
+     kbd             |                                                    |
+     ld              |                               []                   |
+     libc            |    [] [] [] []       []       [] []             [] |
+     lilypond        |                                                 [] |
+     lynx            |    [] [] []                                     [] |
+     m4              |    [] [] [] []                [] []       []    [] |
+     make            |       [] []          []       [] []             [] |
+     mysecretdiary   |          []                                        |
+     nano            |                      []          []       []       |
+     opcodes         |                                                    |
+     parted          |          []                      []             [] |
+     ptx             |       [] []          [] []    [] []       []       |
+     python          |                                                    |
+     recode          |       [] [] []    [] []       [] [] []       []    |
+     sed             |    [] [] [] []    []    []    [] [] []    [] [] [] |
+     sh-utils        |    [] [] [] []       [] []    [] []          [] [] |
+     sharutils       |    [] [] [] []       []       [] []             [] |
+     sketch          |                                                    |
+     soundtracker    |          []          []          []                |
+     sp              |                                                    |
+     tar             |    [] [] []          [] []    []             [] [] |
+     texinfo         |    [] [] []       []          []                [] |
+     textutils       |    [] [] [] []       []       [] []             [] |
+     util-linux      |    [] []                                           |
+     wdiff           |       [] []             []                         |
+     wget            |    [] [] [] []       [] []    [] [] []          [] |
+                     +----------------------------------------------------+
+                       bg cs da de el en eo es et fi fr gl he hr id it ja
+                        0 14 24 32 11  1  8 23 13  1 33 22  4  0  7  9 18
+     
+                       ko lv nb nl nn no pl pt pt_BR ru sk sl sv tr uk zh
+                     +----------------------------------------------------+
+     a2ps            |          []                   []    []             |  6
+     bash            |                                                    |  4
+     bfd             |                                                    |  0
+     binutils        |                                                    |  1
+     bison           |                               []                   |  6
+     clisp           |          []                                        |  5
+     cpio            | []       []       []     []   []                   | 10
+     diffutils       |                   []          []       [] []       | 11
+     enscript        |          []              []   []                   |  5
+     error           |                                  []       []       |  4
+     fetchmail       |                                                    |  0
+     fileutils       | []       []       []     []   [] [] [] [] []       | 17
+     findutils       | []       []       []     []   []    [] [] []       | 16
+     flex            | []                            []       []          |  6
+     freetype        |                                                    |  0
+     gas             |                                                    |  0
+     gawk            |                                           []       |  3
+     gcal            |                                                    |  0
+     gcc             |                                                    |  0
+     gettext         | []                []     []   []    [] [] []    [] | 18
+     gnupg           |                   []                   [] []       | 10
+     gprof           |                                                    |  0
+     grep            |                   []                [] [] []       | 12
+     hello           | [] [] [] []    [] []          [] []    [] [] []    | 22
+     id-utils        |          []                   []       []          |  6
+     indent          | []       []       []          [] []    [] []       | 12
+     jpilot          |                                                    |  1
+     kbd             |                                           []       |  1
+     ld              |                                                    |  1
+     libc            | []    []       [] []     []      []    [] []       | 16
+     lilypond        |          []                            []          |  3
+     lynx            |          []              []   []       []          |  8
+     m4              |          []       []          []       []          | 12
+     make            | []       []       []     []   []          []       | 12
+     mysecretdiary   |                                                    |  1
+     nano            |                                        []          |  4
+     opcodes         |                                           []       |  1
+     parted          |          []                   []                   |  5
+     ptx             |       [] []    [] [] []       []       [] []       | 15
+     python          |                                                    |  0
+     recode          |                   []          []    [] []          | 13
+     sed             |          []              []   [] [] [] [] []       | 19
+     sh-utils        |       [] []    [] []     []   [] [] [] [] []    [] | 21
+     sharutils       |          []                   []       []          | 11
+     sketch          |                                                    |  0
+     soundtracker    |                                                    |  3
+     sp              |                                                    |  0
+     tar             |       []       [] []     []         [] [] []       | 15
+     texinfo         |                               []                   |  7
+     textutils       |       [] []    [] []     []   [] [] []             | 16
+     util-linux      |                          []               []       |  4
+     wdiff           |                               [] []    [] []       |  7
+     wget            |          []                   [] [] [] [] [] []    | 17
+                     +----------------------------------------------------+
+       33 teams        ko lv nb nl nn no pl pt pt_BR ru sk sl sv tr uk zh
+       53 domains       9  1  6 20  0  6 17  1  13   25 10 11 23 21  2  2  387
 
    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
@@ -221,7 +298,27 @@ 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 December 1997 seems to be old, you may fetch a more recent copy
-of this `ABOUT-NLS' file on most GNU archive sites.
+   If September 2001 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.
 
-$Id$

AUTHORS

@@ -24,3 +24,8 @@ Rocco Corsi <rocco.corsi@sympatico.ca>
 	* Internal spelling code, many optimizations and bug fixes for 
 	  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.

BUGS

@@ -117,8 +117,21 @@
 - Blank lines are not kept when cutting with -k (discovered by Rocco)
   (61) [FIXED].
 - Nano will not suspend properly inside of mutt (62) [FIXED].
-
-
+- When switching from Pico mode to normal mode, the previous search is
+  not displayed until cancelling the search (63) [FIXED].
+- If you change search options but don't change the search string in
+  normal mode, hitting  enter causes the search/replace to abort (64)
+  (Jordi Mallach) [FIXED].
+- Cutting one line of text causes the screen to recenter the line
+  (reported and fixed by David Lawrence Ramsey) (65) [FIXED].
+- When cutting marked text including the bottom of the file, a new   
+  "magic line" is not created" (reported by David Lawrence
+  Ramsey, fixed by David Lawrence Ramsey & Chris) (66) [FIXED].
+- ^C does not work after a suspend in tcsh (discovered by
+  Trevor Cordes) (68) [FIXED].
+- Home and End control keys (^A, ^E) do not always work in filename
+  prompt (bug found by Ian Turner) (69) [1.0 series only] [FIXED].
+- Trying to insert a file of 0 bytes will hang nano (70) [FIXED].
 ** Open BUGS **
 
 $Id$

ChangeLog

@@ -1,3 +1,650 @@
+GNU nano 1.1.8 - 03/30/2002
+- General
+	- Type misalignments and mem leaks in renumber_all, do_justify
+	  and do_spell (Rocco & Steven Kneizys).
+	- New "External Command" code, originally by Dwayne Rightler,
+	  various fixes and changes by Chris, Rocco and David Benbennick. 
+	  New function nano.c:open_pipe() and signal handler cancel_fork(), 
+	  changes to do_insertfile(), new list extcmd_list, cmd is 
+	  ^X after ^R.
+	- Added separate regex variable (color_regex and colormatches)
+	  so that color syntax and regex search/replace can coexist.
+	- Added new nano.spec file from Brett <brett@bad-sports.com>, 
+	  added because maintaining the spec file is getting to be a large 
+	  hassle ;)
+- files.c:
+  check_writable_directory()
+	- Stat full_path, not path (Steven Kneizys).
+  open_pipe()
+	- I18nize the pipe error (DLR).
+  do_insertfile()
+	- Handle cancel from ExtCmd properly (David Benbennick).
+  read_file()
+	- Abort if we read a file of 0 lines (num_lines == 0), fixes BUG #70.
+	- Reverse tests to stop segfault on editing a new file of 0 
+	  lines (David Benbennick)
+	- Change input var to one char instead of array (David Benbennick).
+	- Move NO_CONVERT check up so chars get read in properly (DLR).
+- nano.c:
+  do_justify()
+	- More fixes for indented justify (David Benbennick).
+  do_int_speller()
+	- Fix zombie processes and spelling buffer issues (Rocco Corsi).
+  help_init()
+	- Capitalize Meta altkeys.
+	- Various fixes and string changes.
+  main()
+	- Put NANO_SMALL defines around toggle pointer (noticed by Jordi);
+  usage()
+	- Rewritten to encompass systems with and without GETOPT_LONG.
+	  New function print1opt does most of the dirty work, stops
+	  duplication of effort and eases translator's jobs.  Also
+	  breaks all the current translations ;-)
+- proto.h:
+	- Missing externs (Rocco).
+- rcfile.c:
+  do_rcfile()
+	- Reset lineno between system and local .nanorc file.
+	- Fix errno->strerror(errno) mismatch.
+  parse_rcfile()
+	- Don't use i for both for loop and atoi(), fixes lots of 
+	  potential crashes, 1st reported by Jean-Philippe Guérard.
+  rcfile_error()
+	- Don't print out the file name if we haven't opened the file
+	 yet (lineno == 0).
+- search.c:
+  search_init()
+	- Fix a missing free (Rocco).
+  do_gotoline() 
+	- Set placewewant if we actually move to a different line.
+- utils.c:
+  stristr() 
+	- Defined regardless of NANO_SMALL (noticed by Jordi).
+  nperror()
+	- New wrapper for perror (David Benbennick).
+- winio.c:
+  do_credits()
+	- Add Thomas Dickey.
+  do_cursorpos()
+	- Make col numbering start from 1 (suggested by Andrew Ho).
+  update_line(), xpt()
+	- Add check for 127 (DLR).
+- po/sv.po:
+	- Swedish translation updates (Christian Rose).
+- po/de.po:
+	- German translation updates (Michael Piefel).
+- po/id.po:
+	- Indonesian translation updates (Tedi Heriyanto).
+- po/it.po:
+	- Serious typo.
+- po/ca.po, po/es.po:
+	- Catalan and Spanish translation updates (Jordi).
+	- Typo (DLR).
+- po/fr.po:
+	- French translation updates (Jean-Philippe Guérard).
+- po/gl.po:
+	- Galician translation updates (Jacobo Tarrio).
+- po/uk.po, po/ru.po:
+	- Russian and Ukrainian translation updates (Sergey A. Ribalchenko).
+- po/pl.po:
+	- Polish translation updates (Wojciech Kotwica).
+- po/fr.po:
+	- French translation updates (Jean-Philippe Guérard).
+- po/it.po:
+	- Italian translation updates (Marco Colombo).
+- po/da.po:
+	- Danish translation updates (Keld Simonsen).
+	  
+GNU nano 1.1.7 - 03/05/2002
+- General
+	- malloc->calloc, etc cleanups (DLR).
+	- New option, noconvert (-N, --noconvert) to completely stop
+	  the translation of files from DOS or Mac format (DLR).
+	- New functions wheck_writable_directory() and safe_tempnam()
+	  to get around the tempnam warning. More improvements (DLR)  
+	  Still needs testing.
+	- Added DOS and Mac format options to write file routine.
+	  Changes to shortcut_init() and do_writeout().	
+	- Removed stupid static definitions of toggles and shortcut
+	  lists.  Many changes to shortcut_init(), toggle_init(),
+	  statusq(), nanogetstr(), main(), and many other places.
+	- Multibuffer mode now allows multiple empty filenames.  
+	  Changes to add_open_files(), removed open_file_dup_search(),
+	  open_file_dup_fix(), etc (DLR).
+	- New code to handle multiple .save files.  Changes to 
+	  die_save_file(), new function files.c:get_next_filename()
+	  and utils.c:num_of_digits(). (Dwayne Rightler, DLR & Chris)
+	- Many malloc() cleanups and files.c tweaks by Steven Kneizys,
+	  new functions utils.c:free_shortcutage() (got to love that
+	  name!) & free_toggles(), and big cleanup program 
+	  thanks_for_all_the_fish() (originally 
+	  thanks_for_the_memories()).  Mods to shortcut_init() by Chris.
+	- Preliminary quoting support for justify.  New arg -Q, --quotestr,
+	  changes to do_justify(), global variable quotestr().
+- Makefile.am:
+	- Add SYSCONFDIR to DEFS, so we can have an /etc/nanorc.
+	- Change localedir line to 1.0's version.
+	- Moved m4/ stuff to its own m4/Makefile.am.
+- m4/aclocal_inc.m4:
+	- New macro AM_ACLOCAL_INCLUDE, tells configure.ac where to look for
+	  macros (Gergely Nagy).
+- configure.in:
+	- Renamed to configure.ac.
+- configure.ac:
+	- Moved to autoconf 2.52 (Jeff Bailey).
+	- Added call to AM_ACLOCAL_INCLUDE.
+- files.c:
+  read_byte()
+	- Added check for conrol characters (indicative of a binary 
+	  file), set NO_CONVERT if found (fixes by DLR).
+ do_insertfile()
+	- Added support for -o in prompt (Steven Kneizys).
+- global.c:
+	- Move openprev and opennext functions to shortcuts, they really
+	  aren't toggles (DLR).
+- rcfile.c:
+  parse_next_regex()
+	- Allow " symbol to be in regex without leading \ by checking
+	  for *ptr+1 is not the end of the regex.
+  do_rcfile()
+	- Parse rcfile in $SYSCONFDIR as well (Dwayne Rightler).
+- nano.1:
+	- Added Noconvert option to man page (DLR).
+- nano.c:
+  justify_format(), do_justify()
+        - Various fixes for starting blank spaces, spaces after
+          punctuation, & segfault with quoting strings (David Benbennick).
+  do_justify()
+	- Don't continue to justify string if it's indented more 
+	  (quoting wise) than the beginning of the justification.
+  help_init()
+	- Added message re: having multiple blank buffers (DLR).
+  main()
+	- Add 407 as equiv of 26, this seems to be sent when using
+	  ^Z in linux console with keypad() enabled.
+- rcfile.c:
+	- Get rid of unneeded relativechars from rcopts (DLR).
+- search.c
+  do_replace(), findnextstr()
+	- Fixes for various search issues (Ken Tyler)
+- winio.c:
+  do_cursorpos()
+	- Rewritten to show col place as well as charcter place, without
+	  needing an entirely separate flag.
+  bottombars(), onekey()
+	- Make bottom list dynamic with screen size (Guus Sliepen & Chris).
+	- More cleanups w/width of shortcut.
+- utils.c:
+  strcasestr(),revstrcasestr()
+	- Renamed to stristr and revstristr since strcasestr has not
+	  been confirmed to be detected properly on various Linux
+	  systems.
+  strstrwrapper()
+	- NANO_SMALL test was backwards (Ken Tyler).
+- winio.c:
+  strlenpt()    
+        - Changed main function to strnlenpt() for new justify changes,
+          original function now just a stub.
+- nanorc.sample
+	- Mention unset in the sample nanorc.
+- po/ca.po, po/es.po:
+	- Catalan and Spanish translation updates (Jordi).
+- po/sv.po:
+	- Swedish translation updates (Christian Rose).
+- po/fr.po:
+	- French translation updates (Jean-Philippe Guérard).
+- po/nn.po:
+	- Norwegian nynorsk translation updates (Kjetil Torgrim Homme).
+- po/de.po:
+	- German translation updates (Michael Piefel).
+- po/it.po:
+	- Italian translation updates (Marco Colombo).
+- po/cs.po:
+	- Partial Czech translation updates (Vaclav Haisman).
+- po/hu.po:
+	- Hungarian translation updates, or to be precise, rewrite
+	  (Gergely Nagy).
+- po/uk.po, po/ru.po:
+	- Russian and Ukrainian translation updates (Sergey A. Ribalchenko).
+- po/da.po:
+	- Danish translation updates (Keld Simonsen).
+- po/nb.po:
+	- Norwegian bokmål translation updates (Stig E Sandoe).
+- po/nl.po:
+	- Dutch translation updates (Guus Sliepen).
+- po/pl.po:
+	- Polish translation updates (Wojciech Kotwica).
+
+nano-1.1.6 - 01/25/2002
+- General
+	- Add Meta-A as alternate keyystroke for ^^ for people with
+	  non-US keyboards.
+	- Add Alt-G (NANO_ALT_GOTO_KEY) as alternate for goto dir in 
+	  browser.
+	- Better partial word checking code. New function 
+	  search.c:is_whole_word(), changes to findnextstr(), 
+	  and nano.c:do_int_spell_fix() (Rocco Corsi).
+	- Added multiple-line regex support.  Format in .nanorc is
+	  start="regex" end="regex".  Cleaned up nanorc:parse_colors(),
+	  added parse_next_regex(), changes to edit_add in winio.c(), 
+	  changes to colortype, cleaning up some old cruft. 
+	- Upgrade to gettext 0.10.40, probably broke everything again :)
+	- Upgraded to and then downgraded from automake 1.5, as there 
+	  are severe security implications.
+- color.c:
+  do_colorinit()
+	- Moved some comments and braces around so color can work 
+	  w/slang (DLR).
+- global.c:
+  shorcut_init()
+	- Replace hard coded ALT_G and ALT_H values in the replace
+	  and goto shortcuts with their macro counterparts NANO_ALT_*_KEY.	
+- nano.c:
+  usage()
+  	- Remove extra \n in --keypad description (Jordi).
+  main()
+	- Check that alt value is an alpha char before comparing to 
+	  val - 32, fixes Alt-R calling doprev instead of replace.
+  do_char()
+	- Run edit_refresh() if ENABLE_COLOR is defined so adding
+	  multi-liners will update (e.g. /* in C).
+  do_int_spell_fix()
+	- Temporarily unset REVERSE_SEARCH if it's set (Rocco Corsi).
+  do_suspend()
+	- Call tcsetattr() to restore the old terminal settings, so
+	  tcsh can use ^C after suspend for example (fixes BUG #68).
+  do_wrap()
+	- Move "right" increment to part where new line is created, 
+	  should change (fix?) some wrapping problems with autoindent.
+  version()
+  	- Show --enable-multibuffer independently of --enable-extra being
+	  compiled in (Jordi).
+- nano.h:
+	- Changed color struct slightly, because of previous issue with
+	  applying color painting in order, the "str" portion was 
+	  uselss.  Renamed "val" in colortype to "start", added "end"
+	  for multi-line color strings.
+- rcfile.c:
+  General
+	- Took silly variables being passed everywhere like lineno and
+	  filename and made them static variables.
+	- Re-indented.
+	- Added stdarg.h to includes.
+  rcfile_error()
+	- Now automatically prpends the "error in line blah at foo"
+	  message to error messages.
+  parse_colors()
+	- Added section for computing "end" section.
+  parse_next_word()
+	- Added support for "\ ", in word parsing.
+- search.c:
+  do_search()
+	- Check position of cursor and return value of findnextstr and
+	  tell user if search string only occurs once (Rocco & Chris).
+  findnextstr()
+	- Fix off by one in check for wrap around (Rocco Corsi).
+- winio.c:
+  edit_refresh()
+	- Rename lines to nlines to fix AIX breakage (reported by
+	  Dennis Cranston, re-reported by arh14@cornell.edu).
+  edit_add()
+	- Refuse to honor regex matches of 0 characters when applying
+	  color highlighting, and say so on the statusbar.  Otherwise
+	  we go into an infinite loop, the error message should clue
+	  users into the fact that their regex is doing something bad.
+- THANKS:
+	- Oops, correct Eivind's entry. His translation was Norwegian nynorsk,
+	  not bokmål as we claimed (Jordi).
+- .cvsignore
+	- Added config.guess config.sub install-sh missing & mkinstalldirs
+- po/ca.po, po/es.po:
+	- Catalan and Spanish translation updates (Jordi).
+- po/sv.po:
+	- Swedish translation update (Christian Rose).
+- po/de.po:
+	- German translation update (Michael Piefel).
+- po/fr.po:
+	- French translation update (Jean-Philippe Guérard).
+- po/ru.po, po/uk.po:
+	- Russian and Ukrainian translation updates (Sergey A. Ribalchenko).
+- po/no.po:
+	- Moved to po/nn.po, which is the correct name for Norwegian nynorsk.
+- po/nn.po:
+	- Norwegian nynorsk translation updates (Kjetil Torgrim Homme).
+- po/nb.po:
+	- New Norwegian bokmål translation (Stig E Sandoe <stig@ii.uib.no>).
+- po/da.po:
+	- Danish translation update (Keld Simonsen).
+
+nano-1.1.5 - 01/05/2002
+- General
+	- Better integration of View mode (-v) and multibuffer.
+	  Fixes to new_file(), do_insertfile_void(), shortcut_init()
+	  (David Lawrence Ramsey).
+	- The keypad handling has changed (again).  We now use 
+	  the keypad() function by default.  New flag -K, --keypad
+	  allows the old behavior for those using the keypad arrow keys
+	  and rxvt-based terminals.
+	- Updated copyright notices to 2002 (Jordi).
+- nano.c:
+  die()
+	- Only save files that were modified (David Lawrence Ramsey).
+  do_cont()
+	- Run signal_init() after doupdate() so ^Y wont suddenly
+	  start suspending after returning from ^Z suspend in Hurd.
+  signal_init()
+	- Unconditionally disable VDSUSP if it exists, stops ^Y
+	  suspending nano on the Hurd.
+  help_init()
+	- Typo fixes in help strings (Jordi).
+	- New variable helplen needes cause currslen is not always
+	  the length we want (bug found by David Lawrence Ramsey).
+	- Typo in file switch string (found by David Lawrence Ramsey).
+  main()
+	- Handle Alt prev/next file keys (,.), as well as normal ones (<>).
+	- Handle OS-specific insert keys by jump to do_insertkey (David
+	  Lawrence Ramsey).
+- files.c:
+  read_file()
+	- Make conversion message less confusing (suggested by Jordi).
+- rcfile.c:
+  parse_next_word()
+	- Get rid of ptr == \n check to abort, screws up option
+	  parsing (bug found by David Lawrence Ramsey)
+- winio.c:
+  update_line()
+	- set realdata check to >= 1 && <= 31, lack of > 0 check screwed
+	  high ascii characters.
+  titlebar()
+	- gettextized a pair of strings.
+  bottombars()
+	- Get rid of that annoying reversed line when color is on! :)
+  edit_add()
+	- Little fixes to let color highlights not bleed onto the next line.
+  statusq()
+	- Initialize "list".
+- m4/gettext.m4:
+	- Back down to 1.1.3 version.
+- faq.html:
+	- Various link updates and other fixes (Aaron S. Hawley).
+	- Typo fixes (David Lawrence Ramsey).
+- AUTHORS
+	- Add DLR.
+- po/sv.po:
+	- Swedish translation update (Christian Rose).
+- po/ru.po, po/uk.po:
+	- Russian and Ukrainian translations updates (Sergey A. Ribalchenko).
+- po/ca.po, po/es.po:
+	- Catalan and Spanish translations updates (Jordi).
+- po/pl.po:
+	- New Polish, partial translation, by Cezary Sliwa <sliwa@cft.edu.pl>.
+	- Wojciech Kotwica <wkotwica@post.pl> completed it and is the new
+	  official maintainer.
+- po/fr.po:
+	- French translation update (Michel Robitaille).
+- po/gl.po:
+	- Galician translation update (Jacobo Tarrío).
+- po/it.po:
+	- Italian translation update (Marco Colombo).
+- po/de.po:
+	- German translation update (Michael Piefel).
+- po/fr.po:
+	- French translation update (Jean-Philippe Guérard).
+
+nano-1.1.4 - 12/11/2001
+- General
+	- Preliminary syntax highlighting support.  New functions
+	  colortoint() and parse_color() in rcfile.c, new code in 
+	  edit_add() in winio.c to actually do the highlighting.  It's
+	  not even close to pretty yet :P
+	- Many int/long alignments (David Lawrence Ramsey).
+- files.c:
+	- Fixes for tab completion and screen refresh (David Lawrence
+	  Ramsey).
+  add_open_file()
+	- Get rid of unsetting MARK_ISSET because otherwise writing
+	  marked text will automatically unset the marker with
+	  multibuffer enabled.
+- global.c:
+	- Define currshortcut and currslen when either DISABLE_MOUSE
+	  or DISABLE_HELP or DISABLE_BROWSER is not defined (Silvan
+	  Minghetti).
+- nano.c:
+  main()
+	- Add Esc-[-[IGL] keys for FreeBSD Console (PgUp,PgDn,Insert).
+        - Added better Hurd support for function keys (Alt-V,U,9,@,F).
+  signal_init()
+        - do SIG_IGN for the SIGTSTP sigaction regardless of whether
+          we have _POSIX_VDISABLE or not (more Hurd fixes)
+  help_init()
+	- Typo fixes and additions to the new help texts.
+  do_curpos()
+	- Now takes arg for constant updating to always show the cursor
+	  position (David Lawrence Ramsey).
+  do_wrap()
+	- Many fixes (David Lawrence Ramsey).
+  do_spell() 
+	- Dont prompt for replace if we don't change the word in
+	  question (Rocco Corsi).
+- po/de.po:
+	- German translation updates (Karl Eichwalder).
+- po/ru.po:
+	- Russian translation updates (Sergey A. Ribalchenko).
+- po/sv.po:
+	- Swedish translation updates (Christian Rose).
+- po/da.po:
+	- Danish translation updates (Keld Simonse).
+- po/es.po:
+	- Spanish translation updates (Jordi).
+- po/fr.po:
+	- French translation updates (Michel Robitaille).
+- m4/gettext.m4:
+	- diff against mutt 1.2.5's gettext.m4.
+
+nano-1.1.3 - 10/26/2001
+- General
+	- Finally wrote function-specific help mode.  Changes to
+	  nano.c:help_init() and winio.c:do_help().  Changed
+	  currshortcut and currslen #ifdefs to depend on both 
+	  DISABLE_HELP and DISABLE_MOUSE being defined to not 
+	  include.  Changed all the shortcuts and lengths.
+	- Fixed null_at to ACTUALLY DO SOMETHING with its arg.  Again,
+	  this was causing nasty errors if the call to nrealloc moved
+	  where the data was located.
+	- Changed header comments to say "version 2" instead of "version
+	  1" as the COPYING file is actually version 2 of the GPL (bug
+	  noticed by Jordi Mallach).
+- cut.c:
+  do_cut_text()
+	-  Check to see whether marked text is contained within edit
+	   window and if so only do an edit_refresh (variable dontupdate
+	   replaces cuttingpartialline).
+  do_uncut_text()
+	- Similar display fixes (David Lawrence Ramsey).
+- faq.html
+	- Removed nano-editor.org FTP site address [deprecated] and added
+	the GNU one.
+- files.c:
+	- Added status messages for converted DOS and Mac files.
+	  People should know that their file wasnt normally formatted.	
+  load_file()
+	- Status message when trying to load an already loaded file with multiple
+	  buffers (David Lawrence Ramsey).
+  read_file()
+	- Get rid of useless linetemp variable and name num_lines int
+	  (David Lawrence Ramsey).
+- nano.c:
+	- New function do_prev_word, similar to do_next_word.  Hard coded as
+	  Alt-space, as next word is hard coded as control-space. Fixed
+	  goofy logic setting x pos to value of last line when hitting the
+	  beginning of first line, prog should simply abort.  Added
+	  the #ifdefs around the code in main().
+- nano.h:
+	- Additional #define, SMALL_TOO to determine how long
+	  MAIN_LIST_LEN is.  We need this because of the find matching
+	  bracket code.
+  main()
+	- Moved #ifndef NANO_SMALL down past the case 0: line so
+	  control-space doesn't insert a \0 (ack!)
+- rcfile.c:
+	- Fix incorrect number of rc options (David Lawrence Ramsey).
+- po/sv.po:
+	- Updated Swedish translation (Christian Rose).
+- po/da.po:
+	- Updated Danish translation (Keld Simonsen).
+- po/es.po:
+	- Style updates to Spanish translation (Santiago Vila).
+- po/ru.po, po/uk.po:
+	- Updated Russian and Ukrainian translation (Sergey A. Ribalchenko).
+
+nano-1.1.2 - 10/03/2001
+- General
+	- Added BUGS #63 & 64.  Fixes in search_init() and nanogetstr(),
+	  new flag CLEAR_BACKUPSTRING because there's no easy way to
+	  clear the backupstring without making it global (messy), so we
+	  use a flag instead (just as messy?)
+	- --enable-tiny now leaves out the Auto Indent code, do you really
+	  need that on a bootdisk? =-)
+	- New flag -o, --operatingdir, similar to Pico's -o mode.  New
+	  function check_operating_dir(), changes to load_file (arg),
+	  open_file_dup_search (arg), new function do_gotopos for -F
+	  (David Lawrence Ramsey).
+	- Code to read/write dos formatted files.  Massive amounts of
+	  new code in read_line and write_file.  New cmdline flag
+	  (-D --dos) to automatically write the file in DOS format,
+	  regardless of the original format.
+	- Mac file writing supported too.  Flag -M, --mac.  Toggle 
+	  Meta-O (MacOS? OS-X? =-)
+	- New smooth scroll code by Ken Tyler.  New flag -S, --smooth,
+	  changes to page_up() and page_down().  Many fixes to paging by
+	  David Lawrence Ramsey.
+	- Bracket (brace, parens, etc) matching code by Ken Tyler.  
+	  New functions do_find_bracket(), changes to findnextstr(),
+	  command is Meta-] (hope you dont mind since I already sold off
+	  Meta-O to the MacOS file code Ken...) Fixes to bracket_msg
+	  by DLR.
+	- Call do_gotopos from do_alt_spell() to keep position
+	  consistent when invoking alt speller (DLR).
+	- Readded DISABLE_CURPOS because in certain instances (like
+	  all the "Search Wrapped" lines) the cursor position will
+	  be different yet we don't want the cursor position displayed.
+	- Take control-space out of -tiny build, unneeded.
+- cut.c:
+  cut_marked_segment()
+	- Add magic line when cutting a selection including filebot
+	  (discovered by DLR, fixed by DLR & Chris, fixes BUG #66).
+  do_cut_text()
+	- Don't recenter the line when cutting one line (DLR) (Bug #65).
+- faq.html:
+	- Notes about the Free Translation Project.
+	- Debian additions.
+- files.c:
+  do_writeout()
+	- Expanded strings to not use %s and ?: to determine
+	  write/append string to be nice to translators.
+  new_file()
+	- Initialize totsize (DLR).
+- nano.c:
+  main()
+	- Added var constcheck as a CRC-like check of whether cursor
+	  pos has changed and if so update the pos with -c.
+	- Many tweaks and changes from numerics to char equivs
+	  (David Lawrence Ramsey).
+	- Fix the KEY_IC being undefined when using slang.
+  do_mouse()
+	- Send 27 when the menu item clicked is an alt key seq... The
+	  lines aren't lined up since the menu width changed though,
+	  this breakage depends on whether the new widths will be kept
+	  or not (FEEDBACK!!)
+	- Change k based on currslen to allow the new widths in
+	  bottombars().
+  do_wrap()
+	- Fixes for Pico incompatibility in cases 2b and 2c.  
+	  (David Lawrence Ramsey).
+  global_init()
+	- New arg save_cutbuffer, allows cutbuffer to not be lost when
+	  using multibuffer.
+- nano.1:
+	- Added new features, fixed some typos (Jordi).
+- nano.texi:
+	- Corrected the Mouse Toggle section, noticed by Daniel Bonniot.
+	- Added many command line options, toggles and other additions
+	  (Jordi).
+- rcfile.c:
+	- NUM_RCOPTS fix (DLR).
+	- Add tabsize support to rc file (Nathan Heagy).
+	- Fix incorrect argument in fill and tabsize error message
+	  (Nathan Heagy)
+- search.c:
+	- Changed search prompt to "Search" followed by a list of
+	  bracketed, free-standing modifiers that do not imply a grammar,
+	  and the (to replace) string separately.  Hopefully this resolves
+	  the i18n problems that this provoked.
+  findnextstr()
+	- Various fixes that need testing (Ken Tyler).
+- winio.c:
+	- Add David Lawrence Ramsey to credits.
+  bottombars()
+	- Spread out the menu items, feedback definitely needed on this.
+  nanogetstr()
+	- More key fixes (David Lawrence Ramsey)
+	- Don't be clever and wasteful, just repaint every iteration.
+- po/nl.po:
+	- New Dutch translation, by Guus Sliepen <guus@nl.linux.org>.
+- po/ca.po, po/es.po:
+	- Updated Catalan and Spanish translation (Jordi).
+- po/gl.po:
+	- Updated Galician translation (Jacobo Tarrío).
+- po/da.po:
+	- New Danish translation, by Keld Simonsen <keld@dkuug.dk>.
+- po/sv.po:
+	- Updated Swedish translation (Christian Rose).
+- po/it.po:
+	- Updated Italian translation (Marco Colombo).
+- po/fi.po:
+	- Updated Finnish translation (Pauli Virtanen).
+
+nano-1.1.1 - 07/28/2001
+- General
+	- Reverted included gettext from 0.10.38 to 0.10.35 in intl/ dir.
+	- Added m4/ directory to allow rebuilding using only the internal
+	  version of gettext.m4 (Albert Chin).
+- nano.c:
+  main()
+	- Change the multibuffer getopt option to 'F' (David Lawrence
+	  Ramsey)
+  do_mark()
+	- Temporarily disable cursorpos when enabled to be able to see
+	  the mark (un)set message (Ken Tyler).
+- nanorc.sample
+	- Typo fixes and updates (David Lawrence Ramsey)
+- files.c:
+  new_file()
+	- Do add_open_files if there aren't any open yet (David Lawrence 
+	  Ramsey).
+  close_open_file()
+	- Try to open the next file first, then the previous one 
+	  (David Lawrence Ramsey).
+- global.c:
+  shortcut_init()
+	- Rewrote the whereis and replace lists to put CANCEL at the end
+	  of the list, and not include the toggle functions when using
+	  NANO_SMALL.
+- nano.h:
+	- Fix type in INSERTFILE_LIST_LEN.
+	- Rewrote all the macro definitions to be a little less messy,
+	  for the #ifdefs anyway.
+- rcfile.c:
+	- Update for the multibuffer option (oops) (David Lawrence Ramsey).
+- search.c:
+	- Added #ifdef NANO_SMALLs around the REVERSE_SEARCH code.
+  search_init()
+	- add #ifdef NANO_SMALL around toggles code.
+- winio.c:
+  bottombars()
+	- Fixed an off by one that wasn't letting lines with odd #
+	  shortcuts work in certain cases.
+
 nano-1.1.0 - 07/15/2001
 - General
 	- New global variables currshortcut and currslen to support using

Makefile.am

@@ -1,4 +1,8 @@
 ## $Id$
+AUTOMAKE_OPTIONS = gnu no-dependencies
+
+DEFS= -DSYSCONFDIR=\"$(sysconfdir)\"
+
 bin_PROGRAMS = 	nano
 nano_SOURCES =	color.c \
 		cut.c \
@@ -14,16 +18,16 @@ nano_SOURCES =	color.c \
 		winio.c 
 
 man_MANS = nano.1
-nano_LDADD = @INTLLIBS@
+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 install-sh missing mkinstalldirs \
-		nano.1 nano.1.html faq.html nanorc.sample
+		nano.1 nano.1.html faq.html nanorc.sample nano.spec
 
-SUBDIRS = po intl
+SUBDIRS = po intl m4
 
 localedir = $(datadir)/locale
 INCLUDES = -Iintl -DLOCALEDIR=\"$(localedir)\" -I@includedir@

Makefile.in

@@ -1,637 +0,0 @@
-# Makefile.in generated automatically by automake 1.4 from Makefile.am
-
-# Copyright (C) 1994, 1995-8, 1999 Free Software Foundation, Inc.
-# This Makefile.in is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
-# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
-# PARTICULAR PURPOSE.
-
-
-SHELL = @SHELL@
-
-srcdir = @srcdir@
-top_srcdir = @top_srcdir@
-VPATH = @srcdir@
-prefix = @prefix@
-exec_prefix = @exec_prefix@
-
-bindir = @bindir@
-sbindir = @sbindir@
-libexecdir = @libexecdir@
-datadir = @datadir@
-sysconfdir = @sysconfdir@
-sharedstatedir = @sharedstatedir@
-localstatedir = @localstatedir@
-libdir = @libdir@
-infodir = @infodir@
-mandir = @mandir@
-includedir = @includedir@
-oldincludedir = /usr/include
-
-DESTDIR =
-
-pkgdatadir = $(datadir)/@PACKAGE@
-pkglibdir = $(libdir)/@PACKAGE@
-pkgincludedir = $(includedir)/@PACKAGE@
-
-top_builddir = .
-
-ACLOCAL = @ACLOCAL@
-AUTOCONF = @AUTOCONF@
-AUTOMAKE = @AUTOMAKE@
-AUTOHEADER = @AUTOHEADER@
-
-INSTALL = @INSTALL@
-INSTALL_PROGRAM = @INSTALL_PROGRAM@ $(AM_INSTALL_PROGRAM_FLAGS)
-INSTALL_DATA = @INSTALL_DATA@
-INSTALL_SCRIPT = @INSTALL_SCRIPT@
-transform = @program_transform_name@
-
-NORMAL_INSTALL = :
-PRE_INSTALL = :
-POST_INSTALL = :
-NORMAL_UNINSTALL = :
-PRE_UNINSTALL = :
-POST_UNINSTALL = :
-host_alias = @host_alias@
-host_triplet = @host@
-BUILD_INCLUDED_LIBINTL = @BUILD_INCLUDED_LIBINTL@
-CATALOGS = @CATALOGS@
-CATOBJEXT = @CATOBJEXT@
-CC = @CC@
-CURSES_LIB = @CURSES_LIB@
-DATADIRNAME = @DATADIRNAME@
-GENCAT = @GENCAT@
-GLIBC21 = @GLIBC21@
-GLIB_CFLAGS = @GLIB_CFLAGS@
-GLIB_CONFIG = @GLIB_CONFIG@
-GLIB_LIBS = @GLIB_LIBS@
-GMOFILES = @GMOFILES@
-GMSGFMT = @GMSGFMT@
-INSTOBJEXT = @INSTOBJEXT@
-INTLBISON = @INTLBISON@
-INTLLIBS = @INTLLIBS@
-INTLOBJS = @INTLOBJS@
-INTL_LIBTOOL_SUFFIX_PREFIX = @INTL_LIBTOOL_SUFFIX_PREFIX@
-LIBICONV = @LIBICONV@
-MKINSTALLDIRS = @MKINSTALLDIRS@
-MSGFMT = @MSGFMT@
-PACKAGE = @PACKAGE@
-POFILES = @POFILES@
-POSUB = @POSUB@
-RANLIB = @RANLIB@
-USE_INCLUDED_LIBINTL = @USE_INCLUDED_LIBINTL@
-USE_NLS = @USE_NLS@
-VERSION = @VERSION@
-
-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 = @INTLLIBS@
-
-info_TEXINFOS = nano.texi
-MAKEINFO = makeinfo --no-split
-
-EXTRA_DIST = ABOUT-NLS AUTHORS BUGS COPYING ChangeLog INSTALL NEWS 		README THANKS TODO install-sh missing mkinstalldirs 		nano.1 nano.1.html faq.html nanorc.sample
-
-
-SUBDIRS = po intl
-
-localedir = $(datadir)/locale
-INCLUDES = -Iintl -DLOCALEDIR=\"$(localedir)\" -I@includedir@
-ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
-CONFIG_HEADER = config.h
-CONFIG_CLEAN_FILES = 
-PROGRAMS =  $(bin_PROGRAMS)
-
-
-DEFS = @DEFS@ -I. -I$(srcdir) -I.
-CPPFLAGS = @CPPFLAGS@
-LDFLAGS = @LDFLAGS@
-LIBS = @LIBS@
-nano_OBJECTS =  color.o cut.o files.o global.o move.o nano.o rcfile.o \
-search.o utils.o winio.o
-nano_DEPENDENCIES = 
-nano_LDFLAGS = 
-CFLAGS = @CFLAGS@
-COMPILE = $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
-CCLD = $(CC)
-LINK = $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(LDFLAGS) -o $@
-TEXI2DVI = texi2dvi
-INFO_DEPS = nano.info
-DVIS = nano.dvi
-TEXINFOS = nano.texi
-man1dir = $(mandir)/man1
-MANS = $(man_MANS)
-
-NROFF = nroff
-DIST_COMMON =  README ./stamp-h.in ABOUT-NLS AUTHORS COPYING ChangeLog \
-INSTALL Makefile.am Makefile.in NEWS THANKS TODO acconfig.h aclocal.m4 \
-config.guess config.h.in config.sub configure configure.in install-sh \
-missing mkinstalldirs texinfo.tex
-
-
-DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST)
-
-TAR = tar
-GZIP_ENV = --best
-SOURCES = $(nano_SOURCES)
-OBJECTS = $(nano_OBJECTS)
-
-all: all-redirect
-.SUFFIXES:
-.SUFFIXES: .S .c .dvi .info .o .ps .s .texi .texinfo .txi
-$(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) 
-	cd $(top_srcdir) && $(AUTOMAKE) --gnu --include-deps Makefile
-
-Makefile: $(srcdir)/Makefile.in  $(top_builddir)/config.status
-	cd $(top_builddir) \
-	  && CONFIG_FILES=$@ CONFIG_HEADERS= $(SHELL) ./config.status
-
-$(ACLOCAL_M4):  configure.in 
-	cd $(srcdir) && $(ACLOCAL)
-
-config.status: $(srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
-	$(SHELL) ./config.status --recheck
-$(srcdir)/configure: $(srcdir)/configure.in $(ACLOCAL_M4) $(CONFIGURE_DEPENDENCIES)
-	cd $(srcdir) && $(AUTOCONF)
-
-config.h: stamp-h
-	@if test ! -f $@; then \
-		rm -f stamp-h; \
-		$(MAKE) stamp-h; \
-	else :; fi
-stamp-h: $(srcdir)/config.h.in $(top_builddir)/config.status
-	cd $(top_builddir) \
-	  && CONFIG_FILES= CONFIG_HEADERS=config.h:config.h.in \
-	     $(SHELL) ./config.status
-	@echo timestamp > stamp-h 2> /dev/null
-$(srcdir)/config.h.in: $(srcdir)/stamp-h.in
-	@if test ! -f $@; then \
-		rm -f $(srcdir)/stamp-h.in; \
-		$(MAKE) $(srcdir)/stamp-h.in; \
-	else :; fi
-$(srcdir)/stamp-h.in: $(top_srcdir)/configure.in $(ACLOCAL_M4) acconfig.h
-	cd $(top_srcdir) && $(AUTOHEADER)
-	@echo timestamp > $(srcdir)/stamp-h.in 2> /dev/null
-
-mostlyclean-hdr:
-
-clean-hdr:
-
-distclean-hdr:
-	-rm -f config.h
-
-maintainer-clean-hdr:
-
-mostlyclean-binPROGRAMS:
-
-clean-binPROGRAMS:
-	-test -z "$(bin_PROGRAMS)" || rm -f $(bin_PROGRAMS)
-
-distclean-binPROGRAMS:
-
-maintainer-clean-binPROGRAMS:
-
-install-binPROGRAMS: $(bin_PROGRAMS)
-	@$(NORMAL_INSTALL)
-	$(mkinstalldirs) $(DESTDIR)$(bindir)
-	@list='$(bin_PROGRAMS)'; for p in $$list; do \
-	  if test -f $$p; then \
-	    echo "  $(INSTALL_PROGRAM) $$p $(DESTDIR)$(bindir)/`echo $$p|sed 's/$(EXEEXT)$$//'|sed '$(transform)'|sed 's/$$/$(EXEEXT)/'`"; \
-	     $(INSTALL_PROGRAM) $$p $(DESTDIR)$(bindir)/`echo $$p|sed 's/$(EXEEXT)$$//'|sed '$(transform)'|sed 's/$$/$(EXEEXT)/'`; \
-	  else :; fi; \
-	done
-
-uninstall-binPROGRAMS:
-	@$(NORMAL_UNINSTALL)
-	list='$(bin_PROGRAMS)'; for p in $$list; do \
-	  rm -f $(DESTDIR)$(bindir)/`echo $$p|sed 's/$(EXEEXT)$$//'|sed '$(transform)'|sed 's/$$/$(EXEEXT)/'`; \
-	done
-
-.c.o:
-	$(COMPILE) -c $<
-
-.s.o:
-	$(COMPILE) -c $<
-
-.S.o:
-	$(COMPILE) -c $<
-
-mostlyclean-compile:
-	-rm -f *.o core *.core
-
-clean-compile:
-
-distclean-compile:
-	-rm -f *.tab.c
-
-maintainer-clean-compile:
-
-nano: $(nano_OBJECTS) $(nano_DEPENDENCIES)
-	@rm -f nano
-	$(LINK) $(nano_LDFLAGS) $(nano_OBJECTS) $(nano_LDADD) $(LIBS)
-
-nano.info: nano.texi
-nano.dvi: nano.texi
-
-
-DVIPS = dvips
-
-.texi.info:
-	@cd $(srcdir) && rm -f $@ $@-[0-9] $@-[0-9][0-9]
-	cd $(srcdir) \
-	  && $(MAKEINFO) `echo $< | sed 's,.*/,,'`
-
-.texi.dvi:
-	TEXINPUTS=.:$$TEXINPUTS \
-	  MAKEINFO='$(MAKEINFO) -I $(srcdir)' $(TEXI2DVI) $<
-
-.texi:
-	@cd $(srcdir) && rm -f $@ $@-[0-9] $@-[0-9][0-9]
-	cd $(srcdir) \
-	  && $(MAKEINFO) `echo $< | sed 's,.*/,,'`
-
-.texinfo.info:
-	@cd $(srcdir) && rm -f $@ $@-[0-9] $@-[0-9][0-9]
-	cd $(srcdir) \
-	  && $(MAKEINFO) `echo $< | sed 's,.*/,,'`
-
-.texinfo:
-	@cd $(srcdir) && rm -f $@ $@-[0-9] $@-[0-9][0-9]
-	cd $(srcdir) \
-	  && $(MAKEINFO) `echo $< | sed 's,.*/,,'`
-
-.texinfo.dvi:
-	TEXINPUTS=.:$$TEXINPUTS \
-	  MAKEINFO='$(MAKEINFO) -I $(srcdir)' $(TEXI2DVI) $<
-
-.txi.info:
-	@cd $(srcdir) && rm -f $@ $@-[0-9] $@-[0-9][0-9]
-	cd $(srcdir) \
-	  && $(MAKEINFO) `echo $< | sed 's,.*/,,'`
-
-.txi.dvi:
-	TEXINPUTS=.:$$TEXINPUTS \
-	  MAKEINFO='$(MAKEINFO) -I $(srcdir)' $(TEXI2DVI) $<
-
-.txi:
-	@cd $(srcdir) && rm -f $@ $@-[0-9] $@-[0-9][0-9]
-	cd $(srcdir) \
-	  && $(MAKEINFO) `echo $< | sed 's,.*/,,'`
-.dvi.ps:
-	$(DVIPS) $< -o $@
-
-install-info-am: $(INFO_DEPS)
-	@$(NORMAL_INSTALL)
-	$(mkinstalldirs) $(DESTDIR)$(infodir)
-	@list='$(INFO_DEPS)'; \
-	for file in $$list; do \
-	  d=$(srcdir); \
-	  for ifile in `cd $$d && echo $$file $$file-[0-9] $$file-[0-9][0-9]`; do \
-	    if test -f $$d/$$ifile; then \
-	      echo " $(INSTALL_DATA) $$d/$$ifile $(DESTDIR)$(infodir)/$$ifile"; \
-	      $(INSTALL_DATA) $$d/$$ifile $(DESTDIR)$(infodir)/$$ifile; \
-	    else : ; fi; \
-	  done; \
-	done
-	@$(POST_INSTALL)
-	@if $(SHELL) -c 'install-info --version | sed 1q | fgrep -s -v -i debian' >/dev/null 2>&1; then \
-	  list='$(INFO_DEPS)'; \
-	  for file in $$list; do \
-	    echo " install-info --info-dir=$(DESTDIR)$(infodir) $(DESTDIR)$(infodir)/$$file";\
-	    install-info --info-dir=$(DESTDIR)$(infodir) $(DESTDIR)$(infodir)/$$file || :;\
-	  done; \
-	else : ; fi
-
-uninstall-info:
-	$(PRE_UNINSTALL)
-	@if $(SHELL) -c 'install-info --version | sed 1q | fgrep -s -v -i debian' >/dev/null 2>&1; then \
-	  ii=yes; \
-	else ii=; fi; \
-	list='$(INFO_DEPS)'; \
-	for file in $$list; do \
-	  test -z "$ii" \
-	    || install-info --info-dir=$(DESTDIR)$(infodir) --remove $$file; \
-	done
-	@$(NORMAL_UNINSTALL)
-	list='$(INFO_DEPS)'; \
-	for file in $$list; do \
-	  (cd $(DESTDIR)$(infodir) && rm -f $$file $$file-[0-9] $$file-[0-9][0-9]); \
-	done
-
-dist-info: $(INFO_DEPS)
-	list='$(INFO_DEPS)'; \
-	for base in $$list; do \
-	  d=$(srcdir); \
-	  for file in `cd $$d && eval echo $$base*`; do \
-	    test -f $(distdir)/$$file \
-	    || ln $$d/$$file $(distdir)/$$file 2> /dev/null \
-	    || cp -p $$d/$$file $(distdir)/$$file; \
-	  done; \
-	done
-
-mostlyclean-aminfo:
-	-rm -f nano.aux nano.cp nano.cps nano.dvi nano.fn nano.fns nano.ky \
-	  nano.kys nano.ps nano.log nano.pg nano.toc nano.tp nano.tps \
-	  nano.vr nano.vrs nano.op nano.tr nano.cv nano.cn
-
-clean-aminfo:
-
-distclean-aminfo:
-
-maintainer-clean-aminfo:
-	cd $(srcdir) && for i in $(INFO_DEPS); do \
-	  rm -f $$i; \
-	  if test "`echo $$i-[0-9]*`" != "$$i-[0-9]*"; then \
-	    rm -f $$i-[0-9]*; \
-	  fi; \
-	done
-
-install-man1:
-	$(mkinstalldirs) $(DESTDIR)$(man1dir)
-	@list='$(man1_MANS)'; \
-	l2='$(man_MANS)'; for i in $$l2; do \
-	  case "$$i" in \
-	    *.1*) list="$$list $$i" ;; \
-	  esac; \
-	done; \
-	for i in $$list; do \
-	  if test -f $(srcdir)/$$i; then file=$(srcdir)/$$i; \
-	  else file=$$i; fi; \
-	  ext=`echo $$i | sed -e 's/^.*\\.//'`; \
-	  inst=`echo $$i | sed -e 's/\\.[0-9a-z]*$$//'`; \
-	  inst=`echo $$inst | sed '$(transform)'`.$$ext; \
-	  echo " $(INSTALL_DATA) $$file $(DESTDIR)$(man1dir)/$$inst"; \
-	  $(INSTALL_DATA) $$file $(DESTDIR)$(man1dir)/$$inst; \
-	done
-
-uninstall-man1:
-	@list='$(man1_MANS)'; \
-	l2='$(man_MANS)'; for i in $$l2; do \
-	  case "$$i" in \
-	    *.1*) list="$$list $$i" ;; \
-	  esac; \
-	done; \
-	for i in $$list; do \
-	  ext=`echo $$i | sed -e 's/^.*\\.//'`; \
-	  inst=`echo $$i | sed -e 's/\\.[0-9a-z]*$$//'`; \
-	  inst=`echo $$inst | sed '$(transform)'`.$$ext; \
-	  echo " rm -f $(DESTDIR)$(man1dir)/$$inst"; \
-	  rm -f $(DESTDIR)$(man1dir)/$$inst; \
-	done
-install-man: $(MANS)
-	@$(NORMAL_INSTALL)
-	$(MAKE) $(AM_MAKEFLAGS) install-man1
-uninstall-man:
-	@$(NORMAL_UNINSTALL)
-	$(MAKE) $(AM_MAKEFLAGS) uninstall-man1
-
-# This directory's subdirectories are mostly independent; you can cd
-# into them and run `make' without going through this Makefile.
-# To change the values of `make' variables: instead of editing Makefiles,
-# (1) if the variable is set in `config.status', edit `config.status'
-#     (which will cause the Makefiles to be regenerated when you run `make');
-# (2) otherwise, pass the desired values on the `make' command line.
-
-@SET_MAKE@
-
-all-recursive install-data-recursive install-exec-recursive \
-installdirs-recursive install-recursive uninstall-recursive  \
-check-recursive installcheck-recursive info-recursive dvi-recursive:
-	@set fnord $(MAKEFLAGS); amf=$$2; \
-	dot_seen=no; \
-	target=`echo $@ | sed s/-recursive//`; \
-	list='$(SUBDIRS)'; for subdir in $$list; do \
-	  echo "Making $$target in $$subdir"; \
-	  if test "$$subdir" = "."; then \
-	    dot_seen=yes; \
-	    local_target="$$target-am"; \
-	  else \
-	    local_target="$$target"; \
-	  fi; \
-	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
-	   || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
-	done; \
-	if test "$$dot_seen" = "no"; then \
-	  $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
-	fi; test -z "$$fail"
-
-mostlyclean-recursive clean-recursive distclean-recursive \
-maintainer-clean-recursive:
-	@set fnord $(MAKEFLAGS); amf=$$2; \
-	dot_seen=no; \
-	rev=''; list='$(SUBDIRS)'; for subdir in $$list; do \
-	  rev="$$subdir $$rev"; \
-	  test "$$subdir" = "." && dot_seen=yes; \
-	done; \
-	test "$$dot_seen" = "no" && rev=". $$rev"; \
-	target=`echo $@ | sed s/-recursive//`; \
-	for subdir in $$rev; do \
-	  echo "Making $$target in $$subdir"; \
-	  if test "$$subdir" = "."; then \
-	    local_target="$$target-am"; \
-	  else \
-	    local_target="$$target"; \
-	  fi; \
-	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
-	   || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
-	done && test -z "$$fail"
-tags-recursive:
-	list='$(SUBDIRS)'; for subdir in $$list; do \
-	  test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \
-	done
-
-tags: TAGS
-
-ID: $(HEADERS) $(SOURCES) $(LISP)
-	list='$(SOURCES) $(HEADERS)'; \
-	unique=`for i in $$list; do echo $$i; done | \
-	  awk '    { files[$$0] = 1; } \
-	       END { for (i in files) print i; }'`; \
-	here=`pwd` && cd $(srcdir) \
-	  && mkid -f$$here/ID $$unique $(LISP)
-
-TAGS: tags-recursive $(HEADERS) $(SOURCES) config.h.in $(TAGS_DEPENDENCIES) $(LISP)
-	tags=; \
-	here=`pwd`; \
-	list='$(SUBDIRS)'; for subdir in $$list; do \
-   if test "$$subdir" = .; then :; else \
-	    test -f $$subdir/TAGS && tags="$$tags -i $$here/$$subdir/TAGS"; \
-   fi; \
-	done; \
-	list='$(SOURCES) $(HEADERS)'; \
-	unique=`for i in $$list; do echo $$i; done | \
-	  awk '    { files[$$0] = 1; } \
-	       END { for (i in files) print i; }'`; \
-	test -z "$(ETAGS_ARGS)config.h.in$$unique$(LISP)$$tags" \
-	  || (cd $(srcdir) && etags $(ETAGS_ARGS) $$tags config.h.in $$unique $(LISP) -o $$here/TAGS)
-
-mostlyclean-tags:
-
-clean-tags:
-
-distclean-tags:
-	-rm -f TAGS ID
-
-maintainer-clean-tags:
-
-distdir = $(PACKAGE)-$(VERSION)
-top_distdir = $(distdir)
-
-# This target untars the dist file and tries a VPATH configuration.  Then
-# it guarantees that the distribution is self-contained by making another
-# tarfile.
-distcheck: dist
-	-rm -rf $(distdir)
-	GZIP=$(GZIP_ENV) $(TAR) zxf $(distdir).tar.gz
-	mkdir $(distdir)/=build
-	mkdir $(distdir)/=inst
-	dc_install_base=`cd $(distdir)/=inst && pwd`; \
-	cd $(distdir)/=build \
-	  && ../configure --with-included-gettext --srcdir=.. --prefix=$$dc_install_base \
-	  && $(MAKE) $(AM_MAKEFLAGS) \
-	  && $(MAKE) $(AM_MAKEFLAGS) dvi \
-	  && $(MAKE) $(AM_MAKEFLAGS) check \
-	  && $(MAKE) $(AM_MAKEFLAGS) install \
-	  && $(MAKE) $(AM_MAKEFLAGS) installcheck \
-	  && $(MAKE) $(AM_MAKEFLAGS) dist
-	-rm -rf $(distdir)
-	@banner="$(distdir).tar.gz is ready for distribution"; \
-	dashes=`echo "$$banner" | sed s/./=/g`; \
-	echo "$$dashes"; \
-	echo "$$banner"; \
-	echo "$$dashes"
-dist: distdir
-	-chmod -R a+r $(distdir)
-	GZIP=$(GZIP_ENV) $(TAR) chozf $(distdir).tar.gz $(distdir)
-	-rm -rf $(distdir)
-dist-all: distdir
-	-chmod -R a+r $(distdir)
-	GZIP=$(GZIP_ENV) $(TAR) chozf $(distdir).tar.gz $(distdir)
-	-rm -rf $(distdir)
-distdir: $(DISTFILES)
-	-rm -rf $(distdir)
-	mkdir $(distdir)
-	-chmod 777 $(distdir)
-	@for file in $(DISTFILES); do \
-	  d=$(srcdir); \
-	  if test -d $$d/$$file; then \
-	    cp -pr $$/$$file $(distdir)/$$file; \
-	  else \
-	    test -f $(distdir)/$$file \
-	    || ln $$d/$$file $(distdir)/$$file 2> /dev/null \
-	    || cp -p $$d/$$file $(distdir)/$$file || :; \
-	  fi; \
-	done
-	for subdir in $(SUBDIRS); do \
-	  if test "$$subdir" = .; then :; else \
-	    test -d $(distdir)/$$subdir \
-	    || mkdir $(distdir)/$$subdir \
-	    || exit 1; \
-	    chmod 777 $(distdir)/$$subdir; \
-	    (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) top_distdir=../$(distdir) distdir=../$(distdir)/$$subdir distdir) \
-	      || exit 1; \
-	  fi; \
-	done
-	$(MAKE) $(AM_MAKEFLAGS) top_distdir="$(top_distdir)" distdir="$(distdir)" dist-info
-info-am: $(INFO_DEPS)
-info: info-recursive
-dvi-am: $(DVIS)
-dvi: dvi-recursive
-check-am: all-am
-check: check-recursive
-installcheck-am:
-installcheck: installcheck-recursive
-all-recursive-am: config.h
-	$(MAKE) $(AM_MAKEFLAGS) all-recursive
-
-install-exec-am: install-binPROGRAMS
-install-exec: install-exec-recursive
-
-install-data-am: install-info-am install-man
-install-data: install-data-recursive
-
-install-am: all-am
-	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
-install: install-recursive
-uninstall-am: uninstall-binPROGRAMS uninstall-info uninstall-man
-uninstall: uninstall-recursive
-all-am: Makefile $(INFO_DEPS) $(PROGRAMS) $(MANS) config.h
-all-redirect: all-recursive-am
-install-strip:
-	$(MAKE) $(AM_MAKEFLAGS) AM_INSTALL_PROGRAM_FLAGS=-s install
-installdirs: installdirs-recursive
-installdirs-am:
-	$(mkinstalldirs)  $(DESTDIR)$(bindir) $(DESTDIR)$(infodir) \
-		$(DESTDIR)$(mandir)/man1
-
-
-mostlyclean-generic:
-
-clean-generic:
-
-distclean-generic:
-	-rm -f Makefile $(CONFIG_CLEAN_FILES)
-	-rm -f config.cache config.log stamp-h stamp-h[0-9]*
-
-maintainer-clean-generic:
-mostlyclean-am:  mostlyclean-hdr mostlyclean-binPROGRAMS \
-		mostlyclean-compile mostlyclean-aminfo mostlyclean-tags \
-		mostlyclean-generic
-
-mostlyclean: mostlyclean-recursive
-
-clean-am:  clean-hdr clean-binPROGRAMS clean-compile clean-aminfo \
-		clean-tags clean-generic mostlyclean-am
-
-clean: clean-recursive
-
-distclean-am:  distclean-hdr distclean-binPROGRAMS distclean-compile \
-		distclean-aminfo distclean-tags distclean-generic \
-		clean-am
-
-distclean: distclean-recursive
-	-rm -f config.status
-
-maintainer-clean-am:  maintainer-clean-hdr maintainer-clean-binPROGRAMS \
-		maintainer-clean-compile maintainer-clean-aminfo \
-		maintainer-clean-tags maintainer-clean-generic \
-		distclean-am
-	@echo "This command is intended for maintainers to use;"
-	@echo "it deletes files that may require special tools to rebuild."
-
-maintainer-clean: maintainer-clean-recursive
-	-rm -f config.status
-
-.PHONY: mostlyclean-hdr distclean-hdr clean-hdr maintainer-clean-hdr \
-mostlyclean-binPROGRAMS distclean-binPROGRAMS clean-binPROGRAMS \
-maintainer-clean-binPROGRAMS uninstall-binPROGRAMS install-binPROGRAMS \
-mostlyclean-compile distclean-compile clean-compile \
-maintainer-clean-compile install-info-am uninstall-info \
-mostlyclean-aminfo distclean-aminfo clean-aminfo \
-maintainer-clean-aminfo install-man1 uninstall-man1 install-man \
-uninstall-man install-data-recursive uninstall-data-recursive \
-install-exec-recursive uninstall-exec-recursive installdirs-recursive \
-uninstalldirs-recursive all-recursive check-recursive \
-installcheck-recursive info-recursive dvi-recursive \
-mostlyclean-recursive distclean-recursive clean-recursive \
-maintainer-clean-recursive tags tags-recursive mostlyclean-tags \
-distclean-tags clean-tags maintainer-clean-tags distdir info-am info \
-dvi-am dvi check check-am installcheck-am installcheck all-recursive-am \
-install-exec-am install-exec install-data-am install-data install-am \
-install uninstall-am uninstall all-redirect all-am all installdirs-am \
-installdirs mostlyclean-generic distclean-generic clean-generic \
-maintainer-clean-generic clean mostlyclean distclean maintainer-clean
-
-
-# Tell versions [3.59,3.63) of GNU make to not export all variables.
-# Otherwise a system limit (for SysV at least) may be exceeded.
-.NOEXPORT:

NEWS

@@ -1,3 +1,120 @@
+03/30/2002 - GNU nano 1.1.8 is released.  New features include an 
+		"Insert Output of External Command", ^R^X, and a .spec
+		file is now included in the distribution.  There are 
+		cleanups in the usage code, fixes for regex parsing, 
+		the file browser, the NO_CONVERT auto-detect, indented 
+		justification, the internal spell checker, and a serious 
+		bug where reading a file of 0 lines would hang nano.  
+		Also, the "show position" code now shows the starting 
+		column as 1 instead of 0.  Have fun!
+
+03/05/2002 - GNU nano 1.1.7 "lets change everything and see what breaks"
+		is released.  New features include new flags 
+		-N,--noconvert to stop any file format conversion and
+		-Q, --quotestr for the new quoted text justification,
+		a new tempnam() implementation to avoid silly warnings,
+		DOS and Mac file options in the Write File dialog,
+		multiple save files (file.1) for abnormal exits, ^C
+		now shows column as well as character position, and 
+		multibuffer allows duplicate files, even unnamed ones.
+		Also, the static shortcut and toggle lengths are
+		history, nano now reads $SYSCONFDIR/nanorc if rc file
+		support is enabled, and nano is now built with (and
+		requires for rebuilding) autoconf 2.5. 
+			This release also includes fixes for some memory
+		leaks, detecting DOS and mac file format, justification,
+		suspending keys, search & replace under various 
+		conditions, variable width for shortcuts, and the usual
+		ton of translation updates.
+
+01/25/2002 - GNU nano 1.1.6 is released.  Lots of new features in this
+		release.  New Meta-keys were added as alternates for 
+		control sequences: Meta-A for the marker key (^^), and
+		Meta-G for the 'goto dir' key in the file browser (^_).
+		The color syntax highlighting now supports multiple
+		lines via start="regex" end="regex" syntax, and the
+		.nanorc regex format itself has changed. Also, the
+		gettext code was upgraded to version 0.10.40, and nano
+		will now display a message if only occurrence of a
+		given search exists. 
+			For bugfixes, there are fixes for spelling,
+		stray newlines in the usage() function, suspend issues
+		with tcsh, auto-indent and wrapping clashes, ugly code 
+		in rcfile.c, global variable compatibility with AIX.
+		There are also oodles of translation updates.
+		Have fun with it.
+
+01/05/2002 - GNU nano 1.1.5 is out.  The main new feature in this 
+		release is the changed behavior of the keypad.  Nano now 
+		does the Right Thing and used keypad() by default.  If
+		you wish to use the keypad arrow keys in certain 
+		terminals, you may use the -K or --keypad flag to
+		use the old behavior.  Users of other OSes should see 
+		better handling of their non-keypad keys in this 
+		release.  Other changes include more Hurd fixes, fixes
+		parsing the .nanorc, display fixes for the color syntax
+		highlighting, gettext stabilization and many translation
+		updates.  This is amost like a stable release, much like
+		in the 0.9.x series when every other release was the
+		mosts stable one :)  Have fun!
+		
+12/11/2001 - GNU nano 1.1.4 is released.  This release contains 
+		rudimentary color syntax support (but it's still
+		broken), compatibility fixes for the Hurd and FreeBSD,
+		spell checker and wrapping fixes, and more.  It seems
+		that the amount of interest in the code is inversely
+		proportional to the amount of time since last release,
+		so it's time to show the world all the changes since 
+		1.1.3 ;)  Have fun with it!
+ 
+10/26/2001 - GNU nano 1.1.3 is released.  As far as new features go, 
+		the help system is now available for all functions in the
+		editor.  Also, nano will also now print a message on
+		the status bar when it automatically converts a file from
+		Mac or DOS format, and trying to load a file that
+		has already been loaded in multibuffer mode will now also
+		cause an error message.  There is now a "goto previous
+		word" which you can use by hitting Meta-Space Bar.
+			As for fixes, a SEVERE bug in the 
+		null_at code which discarded the memory address of
+		reallocated memory has been fixed. This is probably
+		the biggest bug fix in well over the last year of
+		development.  There are also some display fixes for when
+		the screen shouldn't center itself on cut or uncut text.
+		Also, the comments in the header files incorectly said
+		that nano was distributed under version 1 of the GPL when
+		the accompanying license was the GPLv2.  
+			If you're using nano-1.1, it is highly
+		recommeneded you upgrade to this release.  If using 1.0,
+		wait for version 1.0.6 which should be available early
+		next week.  Enjoy!
+
+10/03/2001 - GNU nano 1.1.2 is out there.  Many new features in this
+		release, including support for auto-converting from
+		DOS and Mac formatted files, as well as toggles for
+		writing out files in these formats.  Pico's -o flag has
+		been implemented, as has some new smooth scrolling code
+		(which can be used in place of the default jerky scrolling
+		behavior). Also, there is now a "find matching
+		bracket/brace/etc" feature (Meta-]).  The  .nanorc file
+		now accepts setting the tabsize, and the help text at the
+		bottom of the editor is now better spaced out in the
+		search/replace prompts.  There are also the usual helping
+		of bugfixes, translation updates and, surely a bug or two.
+		You better get ready!
+
+07/28/2001 - GNU nano 1.1.1 is released.  Our second 1.1 unstable release
+		features many bugfixes from the initial release, in
+		particular fixs for the multibuffer code, and various
+		compiler macro fixes.  The shortcut lists for
+		the search and replace prompts are a little more logical
+		(with cancel the last option again), and the included
+		gettext was re-downgraded to 0.10.35 due to problems
+		on the PPC platform.  GNU nano now includes its own
+		aclocal macros in the m4/ directory to allow rebuilding
+		the configure script to work on platforms regardless of
+		their gettext version.
+
 07/15/2001 - GNU nano 1.1.0 is released.  This is the first release
 		in the 1.1.x unstable series of GNU nano. It
 		incorporates all changes up to the 1.0.3 release, 

README

@@ -38,14 +38,17 @@ Web Page
      
 Mailing List and Bug Reports
 
-	SourceForge hosts all the nano-related mailing-lists.
-	+ nano-announce@lists.sourceforge.net is a very low traffic list
+	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.
-	+ nano-devel@lists.sourceforge.net is the list used by the people
+	+ help-nano@gnu.org is for those seeking to get help without
+	  wanting to hear about the technical details of its
+	  development.
+	+ nano-devel@gnu.org is the list used by the people
 	  that make Nano and a general development discussion list, with
 	  moderate traffic.
-	To subscribe, send email to nano-<name>-request@lists.sourceforge.net
+	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
@@ -55,7 +58,7 @@ 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
-	stabiliity is not guaranteed.  If this is not what you're
+	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:
@@ -71,6 +74,14 @@ Current Status
 	  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).
 
    Chris Allegretta (chrisa@asty.org)
 

README.CVS

@@ -0,0 +1,38 @@
+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
+following packages:
+
+- autoconf (version >= 2.52)
+- automake (version 1.4-pl5 recommended)
+- autoheader
+- gettext (version 0.10.40)
+- texinfo
+- cvs
+- make, gcc and the normal development libraries (ncurses, etc)
+These should be available on your GNU mirror.
+
+
+To download the CVS tree, execute the following command:
+$ cvs -z3 -d:pserver:anoncvs@subversions.gnu.org:/cvsroot/nano login
+and press enter at the password prompt.
+Then, do
+$ cvs -z3 -d:pserver:anoncvs@subversions.gnu.org:/cvsroot/nano checkout nano
+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
+$ ./configure [--add-options-here] && make
+Once it's done compiling,
+$ make install
+should put the required files in their respective directories.
+
+
+Please submit any bugs in the CVS branch to nano-devel@gnu.org.

THANKS

@@ -2,21 +2,36 @@ The following people have helped GNU nano in some way or another.
 If we missed you here, let us now!
 
 Marco Colombo <magicdice@inwind.it>		Italian Translator
+Karl Eichwalder <keichwa@gmx.net>		German 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
-Szabolcs Horvath <horvaths@fi.inf.elte.hu>	Hungarian 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
+
 Jim Knoble <jmknoble@pobox.com>			Pico compat for browser
 Thomas Dickey <dickey@herndon4.his.com>		Curses help and advice
 Ryan Krebs <fluffy@highwire.stanford.edu>	Many bug fixes and testing
 Ken Tyler <kent@werple.net.au>			Super bug tester and advice
-David Lawrence Ramsey <pooka_regent@sluggy.net>	Patches galore
 Bill Soudan <wes0472@rit.edu>			Regex code, etc
 Ben Armstrong <synrg@sanctuary.nslug.ns.ca>	Negative -r value idea, code
 Jeremy Robichaud <robicj@yahoo.com>		Beta tester

TODO

@@ -20,16 +20,16 @@ Current Version:
 
 For Next Version:
 - Undo/Redo key?
-- Single line scroll up/down?
+- Single line scroll up/down? [DONE]
 - Color syntax highlighting? (certainly seems like there's a demand for it.)
-- .nanorc ?????
+- .nanorc [DONE]
 - Backup making (filename~)?
 - Search (etc) string history [1.1]
-- Implement Pico's -j and -g flags, as they are pretty easy to do.
+- Implement Pico's -j and -g flags, as they are pretty easy to do. [DONE]
 - Make mouse support work with clicking on the shortcuts (-m).  Must
   make global variable pointing to current shortcut list to determine what
   keystroke to ungetch(). [DONE].
-- Implement -o (chroot of sorts)
+- 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]
 - UTF-8 support.

acconfig.h

@@ -54,7 +54,10 @@
 /* Define this to disable the mouse functions */
 #undef DISABLE_MOUSE
 
-/* Define this to load files upon inserting them, and allow switching between them; this is disabled if NANO_SMALL is defined */
+/* Define this to disable setting of the operating directory (chroot of sorts) */
+#undef DISABLE_OPERATINGDIR
+
+/* Define this to enable multiple file buffers; this is disabled if NANO_SMALL is defined */
 #undef ENABLE_MULTIBUFFER
 
 /* Define this to use the .nanorc file */
@@ -66,3 +69,5 @@
 /* Define this to have syntax hilighting, requires ENABLE_NANORC too! */
 #undef ENABLE_COLOR
 
+/* Define this to enable undoing....something */
+#undef ENABLE_UNDO

aclocal.m4

@@ -1,876 +0,0 @@
-dnl aclocal.m4 generated automatically by aclocal 1.4
-
-dnl Copyright (C) 1994, 1995-8, 1999 Free Software Foundation, Inc.
-dnl This file is free software; the Free Software Foundation
-dnl gives unlimited permission to copy and/or distribute it,
-dnl with or without modifications, as long as this notice is preserved.
-
-dnl This program is distributed in the hope that it will be useful,
-dnl but WITHOUT ANY WARRANTY, to the extent permitted by law; without
-dnl even the implied warranty of MERCHANTABILITY or FITNESS FOR A
-dnl PARTICULAR PURPOSE.
-
-# Do all the work for Automake.  This macro actually does too much --
-# some checks are only needed if your package does certain things.
-# But this isn't really a big deal.
-
-# serial 1
-
-dnl Usage:
-dnl AM_INIT_AUTOMAKE(package,version, [no-define])
-
-AC_DEFUN(AM_INIT_AUTOMAKE,
-[AC_REQUIRE([AC_PROG_INSTALL])
-PACKAGE=[$1]
-AC_SUBST(PACKAGE)
-VERSION=[$2]
-AC_SUBST(VERSION)
-dnl test to see if srcdir already configured
-if test "`cd $srcdir && pwd`" != "`pwd`" && test -f $srcdir/config.status; then
-  AC_MSG_ERROR([source directory already configured; run "make distclean" there first])
-fi
-ifelse([$3],,
-AC_DEFINE_UNQUOTED(PACKAGE, "$PACKAGE", [Name of package])
-AC_DEFINE_UNQUOTED(VERSION, "$VERSION", [Version number of package]))
-AC_REQUIRE([AM_SANITY_CHECK])
-AC_REQUIRE([AC_ARG_PROGRAM])
-dnl FIXME This is truly gross.
-missing_dir=`cd $ac_aux_dir && pwd`
-AM_MISSING_PROG(ACLOCAL, aclocal, $missing_dir)
-AM_MISSING_PROG(AUTOCONF, autoconf, $missing_dir)
-AM_MISSING_PROG(AUTOMAKE, automake, $missing_dir)
-AM_MISSING_PROG(AUTOHEADER, autoheader, $missing_dir)
-AM_MISSING_PROG(MAKEINFO, makeinfo, $missing_dir)
-AC_REQUIRE([AC_PROG_MAKE_SET])])
-
-#
-# Check to make sure that the build environment is sane.
-#
-
-AC_DEFUN(AM_SANITY_CHECK,
-[AC_MSG_CHECKING([whether build environment is sane])
-# Just in case
-sleep 1
-echo timestamp > conftestfile
-# Do `set' in a subshell so we don't clobber the current shell's
-# arguments.  Must try -L first in case configure is actually a
-# symlink; some systems play weird games with the mod time of symlinks
-# (eg FreeBSD returns the mod time of the symlink's containing
-# directory).
-if (
-   set X `ls -Lt $srcdir/configure conftestfile 2> /dev/null`
-   if test "[$]*" = "X"; then
-      # -L didn't work.
-      set X `ls -t $srcdir/configure conftestfile`
-   fi
-   if test "[$]*" != "X $srcdir/configure conftestfile" \
-      && test "[$]*" != "X conftestfile $srcdir/configure"; then
-
-      # If neither matched, then we have a broken ls.  This can happen
-      # if, for instance, CONFIG_SHELL is bash and it inherits a
-      # broken ls alias from the environment.  This has actually
-      # happened.  Such a system could not be considered "sane".
-      AC_MSG_ERROR([ls -t appears to fail.  Make sure there is not a broken
-alias in your environment])
-   fi
-
-   test "[$]2" = conftestfile
-   )
-then
-   # Ok.
-   :
-else
-   AC_MSG_ERROR([newly created file is older than distributed files!
-Check your system clock])
-fi
-rm -f conftest*
-AC_MSG_RESULT(yes)])
-
-dnl AM_MISSING_PROG(NAME, PROGRAM, DIRECTORY)
-dnl The program must properly implement --version.
-AC_DEFUN(AM_MISSING_PROG,
-[AC_MSG_CHECKING(for working $2)
-# Run test in a subshell; some versions of sh will print an error if
-# an executable is not found, even if stderr is redirected.
-# Redirect stdin to placate older versions of autoconf.  Sigh.
-if ($2 --version) < /dev/null > /dev/null 2>&1; then
-   $1=$2
-   AC_MSG_RESULT(found)
-else
-   $1="$3/missing $2"
-   AC_MSG_RESULT(missing)
-fi
-AC_SUBST($1)])
-
-# Like AC_CONFIG_HEADER, but automatically create stamp file.
-
-AC_DEFUN(AM_CONFIG_HEADER,
-[AC_PREREQ([2.12])
-AC_CONFIG_HEADER([$1])
-dnl When config.status generates a header, we must update the stamp-h file.
-dnl This file resides in the same directory as the config header
-dnl that is generated.  We must strip everything past the first ":",
-dnl and everything past the last "/".
-AC_OUTPUT_COMMANDS(changequote(<<,>>)dnl
-ifelse(patsubst(<<$1>>, <<[^ ]>>, <<>>), <<>>,
-<<test -z "<<$>>CONFIG_HEADERS" || echo timestamp > patsubst(<<$1>>, <<^\([^:]*/\)?.*>>, <<\1>>)stamp-h<<>>dnl>>,
-<<am_indx=1
-for am_file in <<$1>>; do
-  case " <<$>>CONFIG_HEADERS " in
-  *" <<$>>am_file "*<<)>>
-    echo timestamp > `echo <<$>>am_file | sed -e 's%:.*%%' -e 's%[^/]*$%%'`stamp-h$am_indx
-    ;;
-  esac
-  am_indx=`expr "<<$>>am_indx" + 1`
-done<<>>dnl>>)
-changequote([,]))])
-
-#serial 1
-# This test replaces the one in autoconf.
-# Currently this macro should have the same name as the autoconf macro
-# because gettext's gettext.m4 (distributed in the automake package)
-# still uses it.  Otherwise, the use in gettext.m4 makes autoheader
-# give these diagnostics:
-#   configure.in:556: AC_TRY_COMPILE was called before AC_ISC_POSIX
-#   configure.in:556: AC_TRY_RUN was called before AC_ISC_POSIX
-
-undefine([AC_ISC_POSIX])
-
-AC_DEFUN([AC_ISC_POSIX],
-  [
-    dnl This test replaces the obsolescent AC_ISC_POSIX kludge.
-    AC_CHECK_LIB(cposix, strerror, [LIBS="$LIBS -lcposix"])
-  ]
-)
-
-# Configure paths for GLIB
-# Owen Taylor     97-11-3
-
-dnl AM_PATH_GLIB([MINIMUM-VERSION, [ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND [, MODULES]]]])
-dnl Test for GLIB, and define GLIB_CFLAGS and GLIB_LIBS, if "gmodule" or 
-dnl gthread is specified in MODULES, pass to glib-config
-dnl
-AC_DEFUN(AM_PATH_GLIB,
-[dnl 
-dnl Get the cflags and libraries from the glib-config script
-dnl
-AC_ARG_WITH(glib-prefix,[  --with-glib-prefix=PFX   Prefix where GLIB is installed (optional)],
-            glib_config_prefix="$withval", glib_config_prefix="")
-AC_ARG_WITH(glib-exec-prefix,[  --with-glib-exec-prefix=PFX Exec prefix where GLIB is installed (optional)],
-            glib_config_exec_prefix="$withval", glib_config_exec_prefix="")
-AC_ARG_ENABLE(glibtest, [  --disable-glibtest       Do not try to compile and run a test GLIB program],
-		    , enable_glibtest=yes)
-
-  if test x$glib_config_exec_prefix != x ; then
-     glib_config_args="$glib_config_args --exec-prefix=$glib_config_exec_prefix"
-     if test x${GLIB_CONFIG+set} != xset ; then
-        GLIB_CONFIG=$glib_config_exec_prefix/bin/glib-config
-     fi
-  fi
-  if test x$glib_config_prefix != x ; then
-     glib_config_args="$glib_config_args --prefix=$glib_config_prefix"
-     if test x${GLIB_CONFIG+set} != xset ; then
-        GLIB_CONFIG=$glib_config_prefix/bin/glib-config
-     fi
-  fi
-
-  for module in . $4
-  do
-      case "$module" in
-         gmodule) 
-             glib_config_args="$glib_config_args gmodule"
-         ;;
-         gthread) 
-             glib_config_args="$glib_config_args gthread"
-         ;;
-      esac
-  done
-
-  AC_PATH_PROG(GLIB_CONFIG, glib-config, no)
-  min_glib_version=ifelse([$1], ,0.99.7,$1)
-  AC_MSG_CHECKING(for GLIB - version >= $min_glib_version)
-  no_glib=""
-  if test "$GLIB_CONFIG" = "no" ; then
-    no_glib=yes
-  else
-    GLIB_CFLAGS=`$GLIB_CONFIG $glib_config_args --cflags`
-    GLIB_LIBS=`$GLIB_CONFIG $glib_config_args --libs`
-    glib_config_major_version=`$GLIB_CONFIG $glib_config_args --version | \
-           sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\1/'`
-    glib_config_minor_version=`$GLIB_CONFIG $glib_config_args --version | \
-           sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\2/'`
-    glib_config_micro_version=`$GLIB_CONFIG $glib_config_args --version | \
-           sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\3/'`
-    if test "x$enable_glibtest" = "xyes" ; then
-      ac_save_CFLAGS="$CFLAGS"
-      ac_save_LIBS="$LIBS"
-      CFLAGS="$CFLAGS $GLIB_CFLAGS"
-      LIBS="$GLIB_LIBS $LIBS"
-dnl
-dnl Now check if the installed GLIB is sufficiently new. (Also sanity
-dnl checks the results of glib-config to some extent
-dnl
-      rm -f conf.glibtest
-      AC_TRY_RUN([
-#include <glib.h>
-#include <stdio.h>
-#include <stdlib.h>
-
-int 
-main ()
-{
-  int major, minor, micro;
-  char *tmp_version;
-
-  system ("touch conf.glibtest");
-
-  /* HP/UX 9 (%@#!) writes to sscanf strings */
-  tmp_version = g_strdup("$min_glib_version");
-  if (sscanf(tmp_version, "%d.%d.%d", &major, &minor, &micro) != 3) {
-     printf("%s, bad version string\n", "$min_glib_version");
-     exit(1);
-   }
-
-  if ((glib_major_version != $glib_config_major_version) ||
-      (glib_minor_version != $glib_config_minor_version) ||
-      (glib_micro_version != $glib_config_micro_version))
-    {
-      printf("\n*** 'glib-config --version' returned %d.%d.%d, but GLIB (%d.%d.%d)\n", 
-             $glib_config_major_version, $glib_config_minor_version, $glib_config_micro_version,
-             glib_major_version, glib_minor_version, glib_micro_version);
-      printf ("*** was found! If glib-config was correct, then it is best\n");
-      printf ("*** to remove the old version of GLIB. You may also be able to fix the error\n");
-      printf("*** by modifying your LD_LIBRARY_PATH enviroment variable, or by editing\n");
-      printf("*** /etc/ld.so.conf. Make sure you have run ldconfig if that is\n");
-      printf("*** required on your system.\n");
-      printf("*** If glib-config was wrong, set the environment variable GLIB_CONFIG\n");
-      printf("*** to point to the correct copy of glib-config, and remove the file config.cache\n");
-      printf("*** before re-running configure\n");
-    } 
-  else if ((glib_major_version != GLIB_MAJOR_VERSION) ||
-	   (glib_minor_version != GLIB_MINOR_VERSION) ||
-           (glib_micro_version != GLIB_MICRO_VERSION))
-    {
-      printf("*** GLIB header files (version %d.%d.%d) do not match\n",
-	     GLIB_MAJOR_VERSION, GLIB_MINOR_VERSION, GLIB_MICRO_VERSION);
-      printf("*** library (version %d.%d.%d)\n",
-	     glib_major_version, glib_minor_version, glib_micro_version);
-    }
-  else
-    {
-      if ((glib_major_version > major) ||
-        ((glib_major_version == major) && (glib_minor_version > minor)) ||
-        ((glib_major_version == major) && (glib_minor_version == minor) && (glib_micro_version >= micro)))
-      {
-        return 0;
-       }
-     else
-      {
-        printf("\n*** An old version of GLIB (%d.%d.%d) was found.\n",
-               glib_major_version, glib_minor_version, glib_micro_version);
-        printf("*** You need a version of GLIB newer than %d.%d.%d. The latest version of\n",
-	       major, minor, micro);
-        printf("*** GLIB is always available from ftp://ftp.gtk.org.\n");
-        printf("***\n");
-        printf("*** If you have already installed a sufficiently new version, this error\n");
-        printf("*** probably means that the wrong copy of the glib-config shell script is\n");
-        printf("*** being found. The easiest way to fix this is to remove the old version\n");
-        printf("*** of GLIB, but you can also set the GLIB_CONFIG environment to point to the\n");
-        printf("*** correct copy of glib-config. (In this case, you will have to\n");
-        printf("*** modify your LD_LIBRARY_PATH enviroment variable, or edit /etc/ld.so.conf\n");
-        printf("*** so that the correct libraries are found at run-time))\n");
-      }
-    }
-  return 1;
-}
-],, no_glib=yes,[echo $ac_n "cross compiling; assumed OK... $ac_c"])
-       CFLAGS="$ac_save_CFLAGS"
-       LIBS="$ac_save_LIBS"
-     fi
-  fi
-  if test "x$no_glib" = x ; then
-     AC_MSG_RESULT(yes)
-     ifelse([$2], , :, [$2])     
-  else
-     AC_MSG_RESULT(no)
-     if test "$GLIB_CONFIG" = "no" ; then
-       echo "*** The glib-config script installed by GLIB could not be found"
-       echo "*** If GLIB was installed in PREFIX, make sure PREFIX/bin is in"
-       echo "*** your path, or set the GLIB_CONFIG environment variable to the"
-       echo "*** full path to glib-config."
-     else
-       if test -f conf.glibtest ; then
-        :
-       else
-          echo "*** Could not run GLIB test program, checking why..."
-          CFLAGS="$CFLAGS $GLIB_CFLAGS"
-          LIBS="$LIBS $GLIB_LIBS"
-          AC_TRY_LINK([
-#include <glib.h>
-#include <stdio.h>
-],      [ return ((glib_major_version) || (glib_minor_version) || (glib_micro_version)); ],
-        [ echo "*** The test program compiled, but did not run. This usually means"
-          echo "*** that the run-time linker is not finding GLIB or finding the wrong"
-          echo "*** version of GLIB. If it is not finding GLIB, you'll need to set your"
-          echo "*** LD_LIBRARY_PATH environment variable, or edit /etc/ld.so.conf to point"
-          echo "*** to the installed location  Also, make sure you have run ldconfig if that"
-          echo "*** is required on your system"
-	  echo "***"
-          echo "*** If you have an old version installed, it is best to remove it, although"
-          echo "*** you may also be able to get things to work by modifying LD_LIBRARY_PATH"
-          echo "***"
-          echo "*** If you have a RedHat 5.0 system, you should remove the GTK package that"
-          echo "*** came with the system with the command"
-          echo "***"
-          echo "***    rpm --erase --nodeps gtk gtk-devel" ],
-        [ echo "*** The test program failed to compile or link. See the file config.log for the"
-          echo "*** exact error that occured. This usually means GLIB was incorrectly installed"
-          echo "*** or that you have moved GLIB since it was installed. In the latter case, you"
-          echo "*** may want to edit the glib-config script: $GLIB_CONFIG" ])
-          CFLAGS="$ac_save_CFLAGS"
-          LIBS="$ac_save_LIBS"
-       fi
-     fi
-     GLIB_CFLAGS=""
-     GLIB_LIBS=""
-     ifelse([$3], , :, [$3])
-  fi
-  AC_SUBST(GLIB_CFLAGS)
-  AC_SUBST(GLIB_LIBS)
-  rm -f conf.glibtest
-])
-
-# Macro to add for using GNU gettext.
-# Ulrich Drepper <drepper@cygnus.com>, 1995.
-#
-# 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 is *not* freely available.
-
-# serial 9
-
-dnl Usage: AM_WITH_NLS([TOOLSYMBOL], [NEEDSYMBOL], [LIBDIR]).
-dnl If TOOLSYMBOL is specified and is 'use-libtool', then a libtool library
-dnl    $(top_builddir)/intl/libintl.la will be created (shared and/or static,
-dnl    depending on --{enable,disable}-{shared,static} and on the presence of
-dnl    AM-DISABLE-SHARED). Otherwise, 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 LIBDIR is used to find the intl libraries.  If empty,
-dnl    the value `$(top_builddir)/intl/' is used.
-dnl
-dnl The result of the configuration is one of three cases:
-dnl 1) GNU gettext, as included in the intl subdirectory, will be compiled
-dnl    and used.
-dnl    Catalog format: GNU --> install in $(datadir)
-dnl    Catalog extension: .mo after installation, .gmo in source tree
-dnl 2) GNU gettext has been found in the system's C library.
-dnl    Catalog format: GNU --> install in $(datadir)
-dnl    Catalog extension: .mo after installation, .gmo in source tree
-dnl 3) No internationalization, always use English msgid.
-dnl    Catalog format: none
-dnl    Catalog extension: none
-dnl The use of .gmo is historical (it was needed to avoid overwriting the
-dnl GNU format catalogs when building on a platform with an X/Open gettext),
-dnl but we keep it in order not to force irrelevant filename changes on the
-dnl maintainers.
-dnl
-AC_DEFUN([AM_WITH_NLS],
-  [AC_MSG_CHECKING([whether NLS is requested])
-    dnl Default is enabled NLS
-    AC_ARG_ENABLE(nls,
-      [  --disable-nls           do not use Native Language Support],
-      USE_NLS=$enableval, USE_NLS=yes)
-    AC_MSG_RESULT($USE_NLS)
-    AC_SUBST(USE_NLS)
-
-    BUILD_INCLUDED_LIBINTL=no
-    USE_INCLUDED_LIBINTL=no
-    INTLLIBS=
-
-    dnl If we use NLS figure out what method
-    if test "$USE_NLS" = "yes"; then
-      AC_DEFINE(ENABLE_NLS, 1,
-        [Define to 1 if translation of program messages to the user's native language
-   is requested.])
-      AC_MSG_CHECKING([whether included gettext is requested])
-      AC_ARG_WITH(included-gettext,
-        [  --with-included-gettext use the GNU gettext library included here],
-        nls_cv_force_use_gnu_gettext=$withval,
-        nls_cv_force_use_gnu_gettext=no)
-      AC_MSG_RESULT($nls_cv_force_use_gnu_gettext)
-
-      nls_cv_use_gnu_gettext="$nls_cv_force_use_gnu_gettext"
-      if test "$nls_cv_force_use_gnu_gettext" != "yes"; then
-        dnl User does not insist on using GNU NLS library.  Figure out what
-        dnl to use.  If GNU gettext is available we use this.  Else we have
-        dnl to fall back to GNU NLS library.
-	CATOBJEXT=NONE
-
-        dnl Add a version number to the cache macros.
-        define(gt_cv_func_gnugettext_libc, [gt_cv_func_gnugettext]ifelse([$2], need-ngettext, 2, 1)[_libc])
-        define(gt_cv_func_gnugettext_libintl, [gt_cv_func_gnugettext]ifelse([$2], need-ngettext, 2, 1)[_libintl])
-
-	AC_CHECK_HEADER(libintl.h,
-	  [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;],
-	       [bindtextdomain ("", "");
-return (int) gettext ("")]ifelse([$2], need-ngettext, [ + (int) ngettext ("", "", 0)], [])[ + _nl_msg_cat_cntr],
-	       gt_cv_func_gnugettext_libc=yes,
-	       gt_cv_func_gnugettext_libc=no)])
-
-	   if test "$gt_cv_func_gnugettext_libc" != "yes"; then
-	     AC_CACHE_CHECK([for GNU gettext in libintl],
-	       gt_cv_func_gnugettext_libintl,
-	       [gt_save_LIBS="$LIBS"
-		LIBS="$LIBS -lintl $LIBICONV"
-		AC_TRY_LINK([#include <libintl.h>
-extern int _nl_msg_cat_cntr;],
-		  [bindtextdomain ("", "");
-return (int) gettext ("")]ifelse([$2], need-ngettext, [ + (int) ngettext ("", "", 0)], [])[ + _nl_msg_cat_cntr],
-		  gt_cv_func_gnugettext_libintl=yes,
-		  gt_cv_func_gnugettext_libintl=no)
-		LIBS="$gt_save_LIBS"])
-	   fi
-
-	   dnl If an already present or preinstalled GNU gettext() is found,
-	   dnl use it.  But if this macro is used in GNU gettext, and GNU
-	   dnl gettext is already preinstalled in libintl, we update this
-	   dnl libintl.  (Cf. the install rule in intl/Makefile.in.)
-	   if test "$gt_cv_func_gnugettext_libc" = "yes" \
-	      || { test "$gt_cv_func_gnugettext_libintl" = "yes" \
-		   && test "$PACKAGE" != gettext; }; then
-	     AC_DEFINE(HAVE_GETTEXT, 1,
-               [Define if the GNU gettext() function is already present or preinstalled.])
-
-	     if test "$gt_cv_func_gnugettext_libintl" = "yes"; then
-	       dnl If iconv() is in a separate libiconv library, then anyone
-	       dnl linking with libintl{.a,.so} also needs to link with
-	       dnl libiconv.
-	       INTLLIBS="-lintl $LIBICONV"
-	     fi
-
-	     gt_save_LIBS="$LIBS"
-	     LIBS="$LIBS $INTLLIBS"
-	     AC_CHECK_FUNCS(dcgettext)
-	     LIBS="$gt_save_LIBS"
-
-	     AM_PATH_PROG_WITH_TEST(MSGFMT, msgfmt,
-	       [test -z "`$ac_dir/$ac_word -h 2>&1 | grep 'dv '`"], no)dnl
-	     if test "$MSGFMT" != "no"; then
-	       AC_PATH_PROG(GMSGFMT, gmsgfmt, $MSGFMT)
-	     fi
-
-	     AM_PATH_PROG_WITH_TEST(XGETTEXT, xgettext,
-	       [test -z "`$ac_dir/$ac_word -h 2>&1 | grep '(HELP)'`"], :)
-
-	     CATOBJEXT=.gmo
-	   fi
-	])
-
-        if test "$CATOBJEXT" = "NONE"; then
-	  dnl GNU gettext is not found in the C library.
-	  dnl Fall back on GNU gettext library.
-	  nls_cv_use_gnu_gettext=yes
-        fi
-      fi
-
-      if test "$nls_cv_use_gnu_gettext" = "yes"; then
-        dnl Mark actions used to generate GNU NLS library.
-        INTLOBJS="\$(GETTOBJS)"
-        AM_PATH_PROG_WITH_TEST(MSGFMT, msgfmt,
-	  [test -z "`$ac_dir/$ac_word -h 2>&1 | grep 'dv '`"], msgfmt)
-        AC_PATH_PROG(GMSGFMT, gmsgfmt, $MSGFMT)
-        AM_PATH_PROG_WITH_TEST(XGETTEXT, xgettext,
-	  [test -z "`$ac_dir/$ac_word -h 2>&1 | grep '(HELP)'`"], :)
-        AC_SUBST(MSGFMT)
-	BUILD_INCLUDED_LIBINTL=yes
-	USE_INCLUDED_LIBINTL=yes
-        CATOBJEXT=.gmo
-	INTLLIBS="ifelse([$3],[],\$(top_builddir)/intl,[$3])/libintl.ifelse([$1], use-libtool, [l], [])a $LIBICONV"
-	LIBS=`echo " $LIBS " | sed -e 's/ -lintl / /' -e 's/^ //' -e 's/ $//'`
-      fi
-
-      dnl Test whether we really found GNU xgettext.
-      if test "$XGETTEXT" != ":"; then
-	dnl If it is no GNU xgettext we define it as : so that the
-	dnl Makefiles still can work.
-	if $XGETTEXT --omit-header /dev/null 2> /dev/null; then
-	  : ;
-	else
-	  AC_MSG_RESULT(
-	    [found xgettext program is not GNU xgettext; ignore it])
-	  XGETTEXT=":"
-	fi
-      fi
-
-      dnl We need to process the po/ directory.
-      POSUB=po
-    fi
-    AC_OUTPUT_COMMANDS(
-     [for ac_file in $CONFIG_FILES; do
-        # Support "outfile[:infile[:infile...]]"
-        case "$ac_file" in
-          *:*) ac_file=`echo "$ac_file"|sed 's%:.*%%'` ;;
-        esac
-        # PO directories have a Makefile.in generated from Makefile.in.in.
-        case "$ac_file" in */Makefile.in)
-          # Adjust a relative srcdir.
-          ac_dir=`echo "$ac_file"|sed 's%/[^/][^/]*$%%'`
-          ac_dir_suffix="/`echo "$ac_dir"|sed 's%^\./%%'`"
-          ac_dots=`echo "$ac_dir_suffix"|sed 's%/[^/]*%../%g'`
-          test -n "$ac_given_srcdir" || ac_given_srcdir="$srcdir"
-          case "$ac_given_srcdir" in
-            .)  top_srcdir=`echo $ac_dots|sed 's%/$%%'` ;;
-            /*) top_srcdir="$ac_given_srcdir" ;;
-            *)  top_srcdir="$ac_dots$ac_given_srcdir" ;;
-          esac
-          if test -f "$ac_given_srcdir/$ac_dir/POTFILES.in"; then
-            rm -f "$ac_dir/POTFILES"
-            test -n "$as_me" && echo "$as_me: creating $ac_dir/POTFILES" || echo "creating $ac_dir/POTFILES"
-            sed -e "/^#/d" -e "/^[ 	]*\$/d" -e "s,.*,     $top_srcdir/& \\\\," -e "\$s/\(.*\) \\\\/\1/" < "$ac_given_srcdir/$ac_dir/POTFILES.in" > "$ac_dir/POTFILES"
-            test -n "$as_me" && echo "$as_me: creating $ac_dir/Makefile" || echo "creating $ac_dir/Makefile"
-            sed -e "/POTFILES =/r $ac_dir/POTFILES" "$ac_dir/Makefile.in" > "$ac_dir/Makefile"
-          fi
-          ;;
-        esac
-      done])
-
-
-    dnl If this is used in GNU gettext we have to set BUILD_INCLUDED_LIBINTL
-    dnl to 'yes' because some of the testsuite requires it.
-    if test "$PACKAGE" = gettext; then
-      BUILD_INCLUDED_LIBINTL=yes
-    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
-    dnl bison-1.26 because earlier versions generate a plural.c that doesn't
-    dnl compile.
-    dnl bison is only needed for the maintainer (who touches plural.y). But in
-    dnl order to avoid separate Makefiles or --enable-maintainer-mode, we put
-    dnl the rule in general Makefile. Now, some people carelessly touch the
-    dnl files or have a broken "make" program, hence the plural.c rule will
-    dnl sometimes fire. To avoid an error, defines BISON to ":" if it is not
-    dnl present or too old.
-    AC_CHECK_PROGS([INTLBISON], [bison])
-    if test -z "$INTLBISON"; then
-      ac_verc_fail=yes
-    else
-      dnl Found it, now check the version.
-      AC_MSG_CHECKING([version of bison])
-changequote(<<,>>)dnl
-      ac_prog_version=`$INTLBISON --version 2>&1 | sed -n 's/^.*GNU Bison .* \([0-9]*\.[0-9.]*\).*$/\1/p'`
-      case $ac_prog_version in
-        '') ac_prog_version="v. ?.??, bad"; ac_verc_fail=yes;;
-        1.2[6-9]* | 1.[3-9][0-9]* | [2-9].*)
-changequote([,])dnl
-           ac_prog_version="$ac_prog_version, ok"; ac_verc_fail=no;;
-        *) ac_prog_version="$ac_prog_version, bad"; ac_verc_fail=yes;;
-      esac
-      AC_MSG_RESULT([$ac_prog_version])
-    fi
-    if test $ac_verc_fail = yes; then
-      INTLBISON=:
-    fi
-
-    dnl These rules are solely for the distribution goal.  While doing this
-    dnl we only have to keep exactly one list of the available catalogs
-    dnl in configure.in.
-    for lang in $ALL_LINGUAS; do
-      GMOFILES="$GMOFILES $lang.gmo"
-      POFILES="$POFILES $lang.po"
-    done
-
-    dnl Make all variables we use known to autoconf.
-    AC_SUBST(BUILD_INCLUDED_LIBINTL)
-    AC_SUBST(USE_INCLUDED_LIBINTL)
-    AC_SUBST(CATALOGS)
-    AC_SUBST(CATOBJEXT)
-    AC_SUBST(GMOFILES)
-    AC_SUBST(INTLLIBS)
-    AC_SUBST(INTLOBJS)
-    AC_SUBST(POFILES)
-    AC_SUBST(POSUB)
-
-    dnl For backward compatibility. Some configure.ins may be using this.
-    nls_cv_header_intl=
-    nls_cv_header_libgt=
-
-    dnl For backward compatibility. Some Makefiles may be using this.
-    DATADIRNAME=share
-    AC_SUBST(DATADIRNAME)
-
-    dnl For backward compatibility. Some Makefiles may be using this.
-    INSTOBJEXT=.mo
-    AC_SUBST(INSTOBJEXT)
-
-    dnl For backward compatibility. Some Makefiles may be using this.
-    GENCAT=gencat
-    AC_SUBST(GENCAT)
-  ])
-
-dnl Usage: Just like AM_WITH_NLS, which see.
-AC_DEFUN([AM_GNU_GETTEXT],
-  [AC_REQUIRE([AC_PROG_MAKE_SET])dnl
-   AC_REQUIRE([AC_PROG_CC])dnl
-   AC_REQUIRE([AC_CANONICAL_HOST])dnl
-   AC_REQUIRE([AC_PROG_RANLIB])dnl
-   AC_REQUIRE([AC_ISC_POSIX])dnl
-   AC_REQUIRE([AC_HEADER_STDC])dnl
-   AC_REQUIRE([AC_C_CONST])dnl
-   AC_REQUIRE([AC_C_INLINE])dnl
-   AC_REQUIRE([AC_TYPE_OFF_T])dnl
-   AC_REQUIRE([AC_TYPE_SIZE_T])dnl
-   AC_REQUIRE([AC_FUNC_ALLOCA])dnl
-   AC_REQUIRE([AC_FUNC_MMAP])dnl
-   AC_REQUIRE([jm_GLIBC21])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])
-   AC_CHECK_FUNCS([feof_unlocked fgets_unlocked getcwd getegid geteuid \
-getgid getuid mempcpy munmap putenv setenv setlocale stpcpy strchr strcasecmp \
-strdup strtoul tsearch __argz_count __argz_stringify __argz_next])
-
-   AM_ICONV
-   AM_LANGINFO_CODESET
-   AM_LC_MESSAGES
-   AM_WITH_NLS([$1],[$2],[$3])
-
-   if test "x$CATOBJEXT" != "x"; then
-     if test "x$ALL_LINGUAS" = "x"; then
-       LINGUAS=
-     else
-       AC_MSG_CHECKING(for catalogs to be installed)
-       NEW_LINGUAS=
-       for presentlang in $ALL_LINGUAS; do
-         useit=no
-         for desiredlang in ${LINGUAS-$ALL_LINGUAS}; do
-           # Use the presentlang catalog if desiredlang is
-           #   a. equal to presentlang, or
-           #   b. a variant of presentlang (because in this case,
-           #      presentlang can be used as a fallback for messages
-           #      which are not translated in the desiredlang catalog).
-           case "$desiredlang" in
-             "$presentlang"*) useit=yes;;
-           esac
-         done
-         if test $useit = yes; then
-           NEW_LINGUAS="$NEW_LINGUAS $presentlang"
-         fi
-       done
-       LINGUAS=$NEW_LINGUAS
-       AC_MSG_RESULT($LINGUAS)
-     fi
-
-     dnl Construct list of names of catalog files to be constructed.
-     if test -n "$LINGUAS"; then
-       for lang in $LINGUAS; do CATALOGS="$CATALOGS $lang$CATOBJEXT"; done
-     fi
-   fi
-
-   dnl If the AC_CONFIG_AUX_DIR macro for autoconf is used we possibly
-   dnl find the mkinstalldirs script in another subdir but $(top_srcdir).
-   dnl Try to locate is.
-   MKINSTALLDIRS=
-   if test -n "$ac_aux_dir"; then
-     MKINSTALLDIRS="$ac_aux_dir/mkinstalldirs"
-   fi
-   if test -z "$MKINSTALLDIRS"; then
-     MKINSTALLDIRS="\$(top_srcdir)/mkinstalldirs"
-   fi
-   AC_SUBST(MKINSTALLDIRS)
-
-   dnl Enable libtool support if the surrounding package wishes it.
-   INTL_LIBTOOL_SUFFIX_PREFIX=ifelse([$1], use-libtool, [l], [])
-   AC_SUBST(INTL_LIBTOOL_SUFFIX_PREFIX)
-  ])
-
-# Search path for a program which passes the given test.
-# Ulrich Drepper <drepper@cygnus.com>, 1996.
-#
-# 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 is *not* freely available.
-
-# serial 1
-
-dnl AM_PATH_PROG_WITH_TEST(VARIABLE, PROG-TO-CHECK-FOR,
-dnl   TEST-PERFORMED-ON-FOUND_PROGRAM [, VALUE-IF-NOT-FOUND [, PATH]])
-AC_DEFUN([AM_PATH_PROG_WITH_TEST],
-[# Extract the first word of "$2", so it can be a program name with args.
-set dummy $2; ac_word=[$]2
-AC_MSG_CHECKING([for $ac_word])
-AC_CACHE_VAL(ac_cv_path_$1,
-[case "[$]$1" in
-  /*)
-  ac_cv_path_$1="[$]$1" # Let the user override the test with a path.
-  ;;
-  *)
-  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS="${IFS}:"
-  for ac_dir in ifelse([$5], , $PATH, [$5]); do
-    test -z "$ac_dir" && ac_dir=.
-    if test -f $ac_dir/$ac_word; then
-      if [$3]; then
-	ac_cv_path_$1="$ac_dir/$ac_word"
-	break
-      fi
-    fi
-  done
-  IFS="$ac_save_ifs"
-dnl If no 4th arg is given, leave the cache variable unset,
-dnl so AC_PATH_PROGS will keep looking.
-ifelse([$4], , , [  test -z "[$]ac_cv_path_$1" && ac_cv_path_$1="$4"
-])dnl
-  ;;
-esac])dnl
-$1="$ac_cv_path_$1"
-if test -n "[$]$1"; then
-  AC_MSG_RESULT([$]$1)
-else
-  AC_MSG_RESULT(no)
-fi
-AC_SUBST($1)dnl
-])
-
-#serial 2
-
-# Test for the GNU C Library, version 2.1 or newer.
-# From Bruno Haible.
-
-AC_DEFUN([jm_GLIBC21],
-  [
-    AC_CACHE_CHECK(whether we are using the GNU C Library 2.1 or newer,
-      ac_cv_gnu_library_2_1,
-      [AC_EGREP_CPP([Lucky GNU user],
-	[
-#include <features.h>
-#ifdef __GNU_LIBRARY__
- #if (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 1) || (__GLIBC__ > 2)
-  Lucky GNU user
- #endif
-#endif
-	],
-	ac_cv_gnu_library_2_1=yes,
-	ac_cv_gnu_library_2_1=no)
-      ]
-    )
-    AC_SUBST(GLIBC21)
-    GLIBC21="$ac_cv_gnu_library_2_1"
-  ]
-)
-
-#serial AM2
-
-dnl From Bruno Haible.
-
-AC_DEFUN([AM_ICONV],
-[
-  dnl Some systems have iconv in libc, some have it in libiconv (OSF/1 and
-  dnl those with the standalone portable GNU libiconv installed).
-
-  AC_ARG_WITH([libiconv-prefix],
-[  --with-libiconv-prefix=DIR  search for libiconv in DIR/include and DIR/lib], [
-    for dir in `echo "$withval" | tr : ' '`; do
-      if test -d $dir/include; then CPPFLAGS="$CPPFLAGS -I$dir/include"; fi
-      if test -d $dir/lib; then LDFLAGS="$LDFLAGS -L$dir/lib"; fi
-    done
-   ])
-
-  AC_CACHE_CHECK(for iconv, am_cv_func_iconv, [
-    am_cv_func_iconv="no, consider installing GNU libiconv"
-    am_cv_lib_iconv=no
-    AC_TRY_LINK([#include <stdlib.h>
-#include <iconv.h>],
-      [iconv_t cd = iconv_open("","");
-       iconv(cd,NULL,NULL,NULL,NULL);
-       iconv_close(cd);],
-      am_cv_func_iconv=yes)
-    if test "$am_cv_func_iconv" != yes; then
-      am_save_LIBS="$LIBS"
-      LIBS="$LIBS -liconv"
-      AC_TRY_LINK([#include <stdlib.h>
-#include <iconv.h>],
-        [iconv_t cd = iconv_open("","");
-         iconv(cd,NULL,NULL,NULL,NULL);
-         iconv_close(cd);],
-        am_cv_lib_iconv=yes
-        am_cv_func_iconv=yes)
-      LIBS="$am_save_LIBS"
-    fi
-  ])
-  if test "$am_cv_func_iconv" = yes; then
-    AC_DEFINE(HAVE_ICONV, 1, [Define if you have the iconv() function.])
-    AC_MSG_CHECKING([for iconv declaration])
-    AC_CACHE_VAL(am_cv_proto_iconv, [
-      AC_TRY_COMPILE([
-#include <stdlib.h>
-#include <iconv.h>
-extern
-#ifdef __cplusplus
-"C"
-#endif
-#if defined(__STDC__) || defined(__cplusplus)
-size_t iconv (iconv_t cd, char * *inbuf, size_t *inbytesleft, char * *outbuf, size_t *outbytesleft);
-#else
-size_t iconv();
-#endif
-], [], am_cv_proto_iconv_arg1="", am_cv_proto_iconv_arg1="const")
-      am_cv_proto_iconv="extern size_t iconv (iconv_t cd, $am_cv_proto_iconv_arg1 char * *inbuf, size_t *inbytesleft, char * *outbuf, size_t *outbytesleft);"])
-    am_cv_proto_iconv=`echo "[$]am_cv_proto_iconv" | tr -s ' ' | sed -e 's/( /(/'`
-    AC_MSG_RESULT([$]{ac_t:-
-         }[$]am_cv_proto_iconv)
-    AC_DEFINE_UNQUOTED(ICONV_CONST, $am_cv_proto_iconv_arg1,
-      [Define as const if the declaration of iconv() needs const.])
-  fi
-  LIBICONV=
-  if test "$am_cv_lib_iconv" = yes; then
-    LIBICONV="-liconv"
-  fi
-  AC_SUBST(LIBICONV)
-])
-
-#serial AM1
-
-dnl From Bruno Haible.
-
-AC_DEFUN([AM_LANGINFO_CODESET],
-[
-  AC_CACHE_CHECK([for nl_langinfo and CODESET], am_cv_langinfo_codeset,
-    [AC_TRY_LINK([#include <langinfo.h>],
-      [char* cs = nl_langinfo(CODESET);],
-      am_cv_langinfo_codeset=yes,
-      am_cv_langinfo_codeset=no)
-    ])
-  if test $am_cv_langinfo_codeset = yes; then
-    AC_DEFINE(HAVE_LANGINFO_CODESET, 1,
-      [Define if you have <langinfo.h> and nl_langinfo(CODESET).])
-  fi
-])
-
-# Check whether LC_MESSAGES is available in <locale.h>.
-# Ulrich Drepper <drepper@cygnus.com>, 1995.
-#
-# 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 is *not* freely available.
-
-# serial 2
-
-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],
-       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])
-

autogen.sh

@@ -0,0 +1,7 @@
+#!/bin/sh
+# Generate configure & friends for CVS users.
+
+aclocal -I ./m4
+autoheader
+automake --add-missing
+autoconf

color.c

@@ -2,10 +2,10 @@
 /**************************************************************************
  *   color.c                                                              *
  *                                                                        *
- *   Copyright (C) 1999 Chris Allegretta                                  *
+ *   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 1, or (at your option)  *
+ *   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,      *
@@ -98,14 +98,73 @@ void colorinit_one(int colortoset, short fg, short bg, int bold)
 
 int do_colorinit(void)
 {
+    int i;
+    colortype *tmpcolor = NULL, *beforenow = NULL;
+    int defok = 0;
+
     if (has_colors()) {
 	start_color();
 	/* Add in colors, if available */
+
 #ifdef HAVE_USE_DEFAULT_COLORS
-	/* Use if at all possible for transparent terminals =-) */
-	use_default_colors();
+ 	if (use_default_colors() != ERR)
+	    defok = 1;
 #endif
-	/* Some defaults values to play with */
+
+	i = 1;
+	for (tmpcolor = colorstrings; tmpcolor != NULL; 
+		tmpcolor = tmpcolor->next) {
+
+	    for (beforenow = colorstrings; beforenow != NULL
+		 && beforenow != tmpcolor && 
+		 (beforenow->fg != tmpcolor->fg || beforenow->bg != tmpcolor->bg
+		 || beforenow->bright != tmpcolor->bright);
+		beforenow = beforenow->next)
+		;
+
+	    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);
+
+#ifdef DEBUG
+	    fprintf(stderr, "Running init_pair with fg = %d and bg = %d\n", tmpcolor->fg, tmpcolor->bg);
+#endif
+
+	    tmpcolor->pairnum = i;
+	    i++;
+	}
+    }
+
+/*
+	if (use_default_colors() != ERR) {
+	    init_pair(COLOR_BLACK, -1, -1);
+	    init_pair(COLOR_GREEN, COLOR_GREEN, -1);
+	    init_pair(COLOR_WHITE, COLOR_WHITE, -1);
+	    init_pair(COLOR_RED, COLOR_RED, -1);
+	    init_pair(COLOR_CYAN, COLOR_CYAN, -1);
+	    init_pair(COLOR_MAGENTA, COLOR_MAGENTA, -1);
+	    init_pair(COLOR_BLUE, COLOR_BLUE, -1);
+	    init_pair(COLOR_YELLOW, COLOR_YELLOW, -1);
+
+	} else {
+	    init_pair(COLOR_BLACK, COLOR_BLACK, COLOR_BLACK);
+	    init_pair(COLOR_GREEN, COLOR_GREEN, COLOR_BLACK);
+	    init_pair(COLOR_WHITE, COLOR_WHITE, COLOR_BLACK);
+	    init_pair(COLOR_RED, COLOR_RED, COLOR_BLACK);
+	    init_pair(COLOR_CYAN, COLOR_CYAN, COLOR_BLACK);
+	    init_pair(COLOR_MAGENTA, COLOR_MAGENTA, COLOR_BLACK);
+	    init_pair(COLOR_BLUE, COLOR_BLUE, COLOR_BLACK);
+	    init_pair(COLOR_YELLOW, COLOR_YELLOW, COLOR_BLACK);
+	}
+*/
 
 	/*  Okay I'll be nice and comment these out for the commit =)
 	colorinit_one(COLOR_TITLEBAR, COLOR_GREEN, COLOR_BLUE, 1);
@@ -113,9 +172,8 @@ int do_colorinit(void)
 	colorinit_one(COLOR_STATUSBAR, COLOR_BLACK, COLOR_CYAN, 0);
 	colorinit_one(COLOR_TEXT, COLOR_WHITE, COLOR_BLACK, 0);
 	colorinit_one(COLOR_MARKER, COLOR_BLACK, COLOR_CYAN, 0);
-	*/
     }
-
+*/
     return 0;
 }
 

config.h.in

@@ -1,256 +0,0 @@
-/* config.h.in.  Generated automatically from configure.in by autoheader 2.13.  */
-
-/* Define if using alloca.c.  */
-#undef C_ALLOCA
-
-/* Define to empty if the keyword does not work.  */
-#undef const
-
-/* Define to one of _getb67, GETB67, getb67 for Cray-2 and Cray-YMP systems.
-   This function is required for alloca.c support on those systems.  */
-#undef CRAY_STACKSEG_END
-
-/* Define if you have alloca, as a function or macro.  */
-#undef HAVE_ALLOCA
-
-/* Define if you have <alloca.h> and it should be used (not on Ultrix).  */
-#undef HAVE_ALLOCA_H
-
-/* Define if you don't have vprintf but do have _doprnt.  */
-#undef HAVE_DOPRNT
-
-/* Define if you have a working `mmap' system call.  */
-#undef HAVE_MMAP
-
-/* Define if you have the vprintf function.  */
-#undef HAVE_VPRINTF
-
-/* Define as __inline if that's what the C compiler calls it.  */
-#undef inline
-
-/* Define to `long' if <sys/types.h> doesn't define.  */
-#undef off_t
-
-/* Define as the return type of signal handlers (int or void).  */
-#undef RETSIGTYPE
-
-/* Define to `unsigned' if <sys/types.h> doesn't define.  */
-#undef size_t
-
-/* If using the C implementation of alloca, define if you know the
-   direction of stack growth for your system; otherwise it will be
-   automatically deduced at run-time.
- STACK_DIRECTION > 0 => grows toward higher addresses
- STACK_DIRECTION < 0 => grows toward lower addresses
- STACK_DIRECTION = 0 => direction of growth unknown
- */
-#undef STACK_DIRECTION
-
-/* Define if you have the ANSI C header files.  */
-#undef STDC_HEADERS
-
-/* Define this if you have the wresize function in your ncurses-type library */
-#undef HAVE_WRESIZE
-
-/* Define this if you have the resizeterm function in your ncurses-type library */
-#undef HAVE_RESIZETERM
-
-/* Define this if your curses lib has the _use_keypad flag */
-#undef HAVE_USEKEYPAD
-
-/* Define this to make the nano executable as small as possible */
-#undef NANO_SMALL
-
-/* Define to use the slang wrappers for curses instead of native curses */
-#undef USE_SLANG
-
-/* Define this to enable the extra stuff */
-#undef NANO_EXTRA
-
-/* Define to disable the tab completion code Chris worked so hard on! */
-#undef DISABLE_TABCOMP
-
-/* Define this to disable the justify routine */
-#undef DISABLE_JUSTIFY
-
-/* Define this to disable the use(full|less) spelling functions */
-#undef DISABLE_SPELLER
-
-/* Define this to disable the ^G help menu */
-#undef DISABLE_HELP
-
-/* Define this to disable the built-in (crappy) file browser */
-#undef DISABLE_BROWSER
-
-/* Define this to disable any and all text wrapping */
-#undef DISABLE_WRAPPING
-
-/* Define this to disable the mouse functions */
-#undef DISABLE_MOUSE
-
-/* Define this to load files upon inserting them, and allow switching between them; this is disabled if NANO_SMALL is defined */
-#undef ENABLE_MULTIBUFFER
-
-/* Define this to use the .nanorc file */
-#undef ENABLE_NANORC
-
-/* Define this if your curses library has the use_default_colors command */
-#undef HAVE_USE_DEFAULT_COLORS
-
-/* Define this to have syntax hilighting, requires ENABLE_NANORC too! */
-#undef ENABLE_COLOR
-
-/* Define if you have the __argz_count function.  */
-#undef HAVE___ARGZ_COUNT
-
-/* Define if you have the __argz_next function.  */
-#undef HAVE___ARGZ_NEXT
-
-/* Define if you have the __argz_stringify function.  */
-#undef HAVE___ARGZ_STRINGIFY
-
-/* Define if you have the dcgettext function.  */
-#undef HAVE_DCGETTEXT
-
-/* Define if you have the feof_unlocked function.  */
-#undef HAVE_FEOF_UNLOCKED
-
-/* Define if you have the fgets_unlocked function.  */
-#undef HAVE_FGETS_UNLOCKED
-
-/* Define if you have the getcwd function.  */
-#undef HAVE_GETCWD
-
-/* Define if you have the getegid function.  */
-#undef HAVE_GETEGID
-
-/* Define if you have the geteuid function.  */
-#undef HAVE_GETEUID
-
-/* Define if you have the getgid function.  */
-#undef HAVE_GETGID
-
-/* Define if you have the getopt_long function.  */
-#undef HAVE_GETOPT_LONG
-
-/* Define if you have the getpagesize function.  */
-#undef HAVE_GETPAGESIZE
-
-/* Define if you have the getuid function.  */
-#undef HAVE_GETUID
-
-/* Define if you have the mempcpy function.  */
-#undef HAVE_MEMPCPY
-
-/* Define if you have the munmap function.  */
-#undef HAVE_MUNMAP
-
-/* Define if you have the putenv function.  */
-#undef HAVE_PUTENV
-
-/* Define if you have the setenv function.  */
-#undef HAVE_SETENV
-
-/* Define if you have the setlocale function.  */
-#undef HAVE_SETLOCALE
-
-/* Define if you have the snprintf function.  */
-#undef HAVE_SNPRINTF
-
-/* Define if you have the stpcpy function.  */
-#undef HAVE_STPCPY
-
-/* Define if you have the strcasecmp function.  */
-#undef HAVE_STRCASECMP
-
-/* Define if you have the strchr function.  */
-#undef HAVE_STRCHR
-
-/* Define if you have the strdup function.  */
-#undef HAVE_STRDUP
-
-/* Define if you have the strtoul function.  */
-#undef HAVE_STRTOUL
-
-/* Define if you have the tsearch function.  */
-#undef HAVE_TSEARCH
-
-/* Define if you have the vsnprintf function.  */
-#undef HAVE_VSNPRINTF
-
-/* Define if you have the <argz.h> header file.  */
-#undef HAVE_ARGZ_H
-
-/* Define if you have the <curses.h> header file.  */
-#undef HAVE_CURSES_H
-
-/* Define if you have the <fcntl.h> header file.  */
-#undef HAVE_FCNTL_H
-
-/* Define if you have the <getopt.h> header file.  */
-#undef HAVE_GETOPT_H
-
-/* Define if you have the <limits.h> header file.  */
-#undef HAVE_LIMITS_H
-
-/* Define if you have the <locale.h> header file.  */
-#undef HAVE_LOCALE_H
-
-/* Define if you have the <malloc.h> header file.  */
-#undef HAVE_MALLOC_H
-
-/* Define if you have the <ncurses.h> header file.  */
-#undef HAVE_NCURSES_H
-
-/* Define if you have the <nl_types.h> header file.  */
-#undef HAVE_NL_TYPES_H
-
-/* Define if you have the <regex.h> header file.  */
-#undef HAVE_REGEX_H
-
-/* Define if you have the <stddef.h> header file.  */
-#undef HAVE_STDDEF_H
-
-/* Define if you have the <stdlib.h> header file.  */
-#undef HAVE_STDLIB_H
-
-/* Define if you have the <string.h> header file.  */
-#undef HAVE_STRING_H
-
-/* Define if you have the <sys/param.h> header file.  */
-#undef HAVE_SYS_PARAM_H
-
-/* Define if you have the <termio.h> header file.  */
-#undef HAVE_TERMIO_H
-
-/* Define if you have the <termios.h> header file.  */
-#undef HAVE_TERMIOS_H
-
-/* Define if you have the <unistd.h> header file.  */
-#undef HAVE_UNISTD_H
-
-/* Name of package */
-#undef PACKAGE
-
-/* Version number of package */
-#undef VERSION
-
-/* Define if you have the iconv() function. */
-#undef HAVE_ICONV
-
-/* Define as const if the declaration of iconv() needs const. */
-#undef ICONV_CONST
-
-/* Define if you have <langinfo.h> and nl_langinfo(CODESET). */
-#undef HAVE_LANGINFO_CODESET
-
-/* Define if your <locale.h> file defines LC_MESSAGES. */
-#undef HAVE_LC_MESSAGES
-
-/* Define to 1 if translation of program messages to the user's native language
-   is requested. */
-#undef ENABLE_NLS
-
-/* Define if the GNU gettext() function is already present or preinstalled. */
-#undef HAVE_GETTEXT
-

configure.ac

@@ -1,13 +1,17 @@
 # $Id$
 dnl Process this file with autoconf to produce a configure script.
-AC_INIT(nano.c)
-AM_INIT_AUTOMAKE(nano, 1.1.0)
+AC_INIT
+AC_CONFIG_SRCDIR([nano.c])
+AC_PREREQ(2.52)
+AM_INIT_AUTOMAKE(nano, 1.1.8)
 AM_CONFIG_HEADER(config.h:config.h.in)
-ALL_LINGUAS="es de fr it id fi hu ca cs gl uk ru sv no"
+AM_ACLOCAL_INCLUDE(m4)
+ALL_LINGUAS="es de fr it id fi hu ca cs gl uk ru sv nn nl da pl nb"
 
 dnl Checks for programs.
 AC_PROG_CC
 AC_ISC_POSIX
+AC_SYS_LARGEFILE
 
 dnl Checks for header files.
 AC_HEADER_STDC
@@ -25,6 +29,7 @@ AC_ARG_ENABLE(tiny,
     AC_DEFINE(DISABLE_JUSTIFY) 
     AC_DEFINE(DISABLE_BROWSER) 
     AC_DEFINE(DISABLE_MOUSE) 
+    AC_DEFINE(DISABLE_OPERATINGDIR)
  fi])
 
 AC_ARG_ENABLE(extra,
@@ -32,10 +37,17 @@ AC_ARG_ENABLE(extra,
 [if test x$enableval = xyes; then
     AC_DEFINE(NANO_EXTRA) extra_support=yes
     AC_DEFINE(ENABLE_MULTIBUFFER) multibuffer_support=yes
+    AC_DEFINE(ENABLE_UNDO) 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) undo_support=yes
  fi])
 
 AC_ARG_ENABLE(multibuffer,
-[  --enable-multibuffer    Enable use of file loading on insertion, and switching between loaded files; this is disabled if --enable-tiny is used],
+[  --enable-multibuffer    Enable multiple file buffers; this is disabled if --enable-tiny is used],
 [if test x$enableval = xyes && test x$tiny_support != xyes; then
     AC_DEFINE(ENABLE_MULTIBUFFER) multibuffer_support=yes
  fi])
@@ -102,6 +114,12 @@ AC_ARG_ENABLE(mouse,
     AC_DEFINE(DISABLE_MOUSE)
  fi])
 
+AC_ARG_ENABLE(operatingdir,
+[  --disable-operatingdir         Disable setting of operating directory (chroot of sorts)],
+ [if test x$enableval != xyes; then
+    AC_DEFINE(DISABLE_OPERATINGDIR)
+ fi])
+
 AC_MSG_CHECKING([whether to use slang])
 CURSES_LIB_NAME=""
 AC_ARG_WITH(slang,
@@ -289,6 +307,7 @@ then
 fi
 
 dnl i18n stuff - pretty incomplete for now
-AM_GNU_GETTEXT
+NANO_AM_GNU_GETTEXT
 
-AC_OUTPUT([Makefile intl/Makefile po/Makefile.in])
+AC_CONFIG_FILES([Makefile intl/Makefile m4/Makefile po/Makefile.in nano.spec])
+AC_OUTPUT

cut.c

@@ -2,10 +2,10 @@
 /**************************************************************************
  *   cut.c                                                                *
  *                                                                        *
- *   Copyright (C) 1999 Chris Allegretta                                  *
+ *   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 1, or (at your option)  *
+ *   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,      *
@@ -141,7 +141,7 @@ void cut_marked_segment(filestruct * top, int top_x, filestruct * bot,
     /* Now, paste bot[bot_x] into top[top_x] */
     if (destructive) {
 
-	tmpstr = charalloc(strlen(top->data) + strlen(&bot->data[bot_x]));
+	tmpstr = charalloc(top_x + strlen(&bot->data[bot_x]) + 1);
 	strncpy(tmpstr, top->data, top_x);
 	strcpy(&tmpstr[top_x], &bot->data[bot_x]);
 	free(top->data);
@@ -157,7 +157,7 @@ void cut_marked_segment(filestruct * top, int top_x, filestruct * bot,
  	screwed somewhere.  Not doing this causes update_line to annihilate
 	the last line copied into the cutbuffer when the mark is set ?!?!? */
     botcopy = copy_node(bot);
-    null_at(botcopy->data, bot_x);
+    null_at(&botcopy->data, bot_x);
     next = botcopy->next;
     add_to_cutbuffer(botcopy);
 
@@ -180,11 +180,14 @@ void cut_marked_segment(filestruct * top, int top_x, filestruct * bot,
 		filebot = next;
 	    } else {
 		filebot = top;
+		if (top_x > 0)
+		    new_magicline();
 	    }
 	}
 	if (top->lineno < edittop->lineno)
 	    edit_update(top, CENTER);
     }
+
 }
 #endif
 
@@ -192,6 +195,7 @@ int do_cut_text(void)
 {
     filestruct *tmp, *fileptr = current;
 #ifndef NANO_SMALL
+    int dontupdate = 0;
     int cuttingtoend = 0;
 #endif
 
@@ -228,7 +232,7 @@ int do_cut_text(void)
 
 		junk = NULL;
 		junk = make_new_node(current);
-	        junk->data = nmalloc(1 * sizeof (char));
+	        junk->data = charalloc(1);
 		junk->data[0] = 0;
 
 		add_to_cutbuffer(junk);
@@ -249,22 +253,40 @@ int do_cut_text(void)
 	    cuttingtoend = 1;
 	}
     }
+
     if (ISSET(MARK_ISSET)) {
-	if (current->lineno <= mark_beginbuf->lineno)
+	if (current->lineno <= mark_beginbuf->lineno) {
+	    /* Don't do_update and move the screen position if the marked
+		area lies entirely within the screen buffer */
+	    if (current->lineno == mark_beginbuf->lineno
+		|| (current->lineno >= edittop->lineno
+		&& mark_beginbuf->lineno <= editbot->lineno))
+		dontupdate = 1;
+
 	    cut_marked_segment(current, current_x, mark_beginbuf,
 			       mark_beginx, 1);
-	else
+	}
+	else {
+	    /* Same as above, easier logic since we know it's a multi-line
+		cut and mark_beginbuf is before current */
+	    if (mark_beginbuf->lineno >= edittop->lineno
+		&& current->lineno <= editbot->lineno)
+		dontupdate = 1;
+
 	    cut_marked_segment(mark_beginbuf, mark_beginx, current,
 			       current_x, 1);
+	}
+
 
 	placewewant = xplustabs();
 	UNSET(MARK_ISSET);
 
 	marked_cut = 1;
 	set_modified();
-	if (cuttingtoend)
+	if (dontupdate || cuttingtoend) {
+	    fix_editbot();
 	    edit_refresh();
-	else
+	} else
 	    edit_update(current, CENTER);
 
 	return 1;
@@ -360,6 +382,10 @@ int do_uncut_text(void)
 	    totsize += strlen(cutbuffer->data);
 	    if (strlen(cutbuffer->data) == 0)
 		totlines++;
+	    /* If we've uncut a line, make sure there's a magicline after
+	       it */
+	    if (current->next == NULL)
+		new_magicline();
 
 	    placewewant = xplustabs();
 	    update_cursor();
@@ -411,8 +437,12 @@ int do_uncut_text(void)
 	    i = editbot->lineno;
 
 	    current = newend;
-	    if (i <= newend->lineno)
+	    if (i < newend->lineno) {
 		edit_update(current, CENTER);
+	    }
+	    else {
+		edit_refresh();
+	    }
 	}
 
 	/* If marked cut == 2, that means that we're doing a cut to end
@@ -425,7 +455,7 @@ int do_uncut_text(void)
 	    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);
+	    null_at(&current->data, current_x);
 	    current = current->next;
 	    current_x = 0;
 	    placewewant = 0;
@@ -470,8 +500,12 @@ int do_uncut_text(void)
 
     i = editbot->lineno;
     renumber(newbuf);
-    if (i < newend->lineno)
+    if (i < newend->lineno) {
 	edit_update(fileptr, CENTER);
+    }
+    else {
+	edit_refresh();
+    }
 
     dump_buffer_reverse(fileptr);
 

faq.html

@@ -45,7 +45,7 @@ packages.</a></font>
 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.2">3.3. Why does everything go into
+<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>
@@ -94,7 +94,7 @@ 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>
+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
@@ -142,7 +142,7 @@ it is useful enough it will be included in future versions.</font></blockquote>
 <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
+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>
@@ -203,7 +203,7 @@ nano was developed).</font></blockquote>
 of nano?</font></h2>
 
 <blockquote><font color="#330000">The current version of nano *should*
-be 1.1.0.&nbsp; Of course you should always check the nano hompage to
+be 1.1.8.&nbsp; Of course you should always check the nano homepage to
 see what the latest and greatest version is.</font></blockquote>
 
 <h2>
@@ -229,12 +229,9 @@ at the following fine web and ftp sites:</font>
 
 <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.nano-editor.org/pub/nano">ftp://ftp.nano-editor.org/pub/nano</a></font></li>
+<font color="#330000"><a href="ftp://ftp.gnu.org/pub/gnu/nano">ftp://ftp.gnu.org/pub/gnu/nano</a></font></li>
 
-<li>
-<font color="#330000"><a href="ftp://nano.sourceforge.net/pub/nano/">ftp://nano.sourceforge.net/pub/nano</a></font></li>
 </ul>
 </blockquote>
 
@@ -250,20 +247,15 @@ packages.</font></h2>
 <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>
 
-<li>
-<font color="#330000"><a href="ftp://ftp.nano-editor.org/pub/nano/RPMS">ftp://ftp.nano-editor.org/pub/nano/RPMS</a></font></li>
-
-<li>
-<font color="#330000"><a href="ftp://nano.sourceforge.net/pub/nano/RPMS">ftp://nano.sourceforge.net/pub/nano/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://metalab.unc.edu/pub/Linux/distributions/redhat/contrib/libc6/i386">http://metalab.unc.edu/pub/Linux/distributions/redhat/contrib/libc6/i386</a></font></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://metalab.unc.edu/pub/Linux/distributions/redhat/contrib/libc6/i386">ftp://metalab.unc.edu/pub/Linux/distributions/redhat/contrib/libc6/i386</a></font></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>
 
@@ -276,9 +268,15 @@ current nano packages for:</font>
 <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 
@@ -291,7 +289,7 @@ tracking unstable, you probably have the newest version already.</font></blockqu
 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="https://sourceforge.net/cvs/?group_id=1304">the
+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%">
@@ -372,6 +370,7 @@ list:
 <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
@@ -381,7 +380,7 @@ 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 with bells and whistles, you could
+<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
@@ -394,29 +393,33 @@ try:
 <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.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,
+<blockquote><font color="#330000"> To use multiple file buffers, you must
+be using nano 1.1.8 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. 
+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.0 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
+<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.8 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>
@@ -438,7 +441,7 @@ 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@lists.sourceforge.net">nano-devel</a> list or
+<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>
@@ -500,7 +503,7 @@ 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:
+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>
@@ -529,20 +532,32 @@ this in your <b>.muttrc</b>:
 <a NAME="5.1"></a><font color="#330000">5.1. There's no translation for
 my language!</font></h2>
 
-<blockquote><font color="#330000">So, uh, get someone who speaks your native
-language to write one =-).&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; Then send it to the <a href="mailto:nano-devel@lists.sourceforge.net">nano-devel</a> list or <a href="mailto:nano@nano-editor.org">nano@nano-editor.org</a>.</font></blockquote>
+<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 <b>&lt;your_language>.po</b> file with your suggested
-corrections and they can in turn forward it to the nano email address,
-or the devel list.</font></blockquote>
+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>
@@ -570,7 +585,7 @@ 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
+<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
@@ -579,7 +594,7 @@ 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 modfify it, but you can not do
+distribute their software, and you can modify it, but you can not do
 both, i.e. distribute modified binaries.</blockquote>
 
 <h2>
@@ -587,7 +602,7 @@ both, i.e. distribute modified binaries.</blockquote>
 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
+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
@@ -621,21 +636,33 @@ any changes in the past few years in a positive direction.</font></blockquote>
 <h2>
 <a NAME="7.1"></a><font color="#330000">7.1. Nano related mailing lists.</font></h2>
 
-<blockquote><font color="#330000">There are two mailing lists for nano
-hosted at <a href="http://www.sourceforge.net">SourceForge</a>, nano-announce
+<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; Here are links to where you can sign up for
+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">nano-announce - <a href="http://lists.sourceforge.net/mailman/listinfo/nano-announce">http://lists.sourceforge.net/mailman/listinfo/nano-announce</a></font>
-<br><font color="#330000">nano-devel - <a href="http://lists.sourceforge.net/mailman/listinfo/nano-devel">http://lists.sourceforge.net/mailman/listinfo/nano-devel</a></font></blockquote>
+<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@lists.sourceforge.net">our
+<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>
@@ -652,7 +679,7 @@ 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 SourceForge development list and be given
+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>
@@ -663,10 +690,29 @@ to your resume.</font></blockquote>
 <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>
 
-<h1>
-<a NAME="8"></a>8. ChangeLog</h1>
+<h2>
+<a NAME="8"></a><font color="#330000">8. ChangeLog</font>
+</h2>
 
-<blockquote>06/31/2000 - Initial framework.</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>

global.c

@@ -2,10 +2,10 @@
 /**************************************************************************
  *   global.c                                                             *
  *                                                                        *
- *   Copyright (C) 1999 Chris Allegretta                                  *
+ *   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 1, or (at your option)  *
+ *   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,      *
@@ -35,6 +35,7 @@
 /*
  * Global variables
  */
+
 int flags = 0;			/* Our new flag containing many options */
 WINDOW *edit;			/* The file portion of the editor  */
 WINDOW *topwin;			/* Top line of screen */
@@ -58,9 +59,13 @@ filestruct *cutbuffer = NULL;	/* A place to store cut text */
 filestruct *open_files = NULL;	/* The list of open files */
 #endif
 
+#ifndef DISABLE_JUSTIFY
+char *quotestr = "> ";		/* Quote string */
+#endif
+
 char *answer = NULL;			/* Answer str to many questions */
 int totlines = 0;		/* Total number of lines in the file */
-int totsize = 0;		/* Total number of bytes in the file */
+long totsize = 0;		/* Total number of bytes in the file */
 int placewewant = 0;		/* The column we'd like the cursor
 				   to jump to when we go to the
 				   next or previous line */
@@ -75,35 +80,41 @@ char *help_text;		/* The text in the help window */
 filestruct *mark_beginbuf;	/* the begin marker buffer */
 int mark_beginx;		/* X value in the string to start */
 
+#ifndef DISABLE_OPERATINGDIR
+char *operating_dir = NULL;	/* Operating directory, which we can't */
+char *full_operating_dir = NULL;/* go higher than */
+#endif
+
 #ifndef DISABLE_SPELLER
 char *alt_speller;		/* Alternative spell command */
 #endif
 
-shortcut main_list[MAIN_LIST_LEN];
-shortcut whereis_list[WHEREIS_LIST_LEN];
-shortcut replace_list[REPLACE_LIST_LEN];
-shortcut replace_list_2[REPLACE_LIST_LEN]; /* 2nd half of replace dialog */
-shortcut goto_list[GOTO_LIST_LEN];
-shortcut gotodir_list[GOTODIR_LIST_LEN];
-shortcut writefile_list[WRITEFILE_LIST_LEN];
-shortcut insertfile_list[INSERTFILE_LIST_LEN];
-shortcut help_list[HELP_LIST_LEN];
-shortcut spell_list[SPELL_LIST_LEN];
+shortcut *main_list = NULL;
+shortcut *whereis_list = NULL;
+shortcut *replace_list = NULL;
+shortcut *replace_list_2 = NULL; 	/* 2nd half of replace dialog */
+shortcut *goto_list = NULL;
+shortcut *gotodir_list = NULL;
+shortcut *writefile_list = NULL;
+shortcut *insertfile_list = NULL;
+shortcut *help_list = NULL;
+shortcut *spell_list = NULL;
+shortcut *extcmd_list = NULL;
 #ifndef DISABLE_BROWSER
-shortcut browser_list[BROWSER_LIST_LEN];
+shortcut *browser_list = NULL;
 #endif
 
 #ifdef ENABLE_COLOR
     colorstruct colors[NUM_NCOLORS];
+    colortype *colorstrings = NULL;
 #endif
 
-#ifndef DISABLE_MOUSE
-shortcut *currshortcut = main_list;	/* Current shortcut list we're using */
-int currslen = MAIN_VISIBLE;		/* Length of current shortcut list */
+#if !defined(DISABLE_BROWSER) || !defined(DISABLE_MOUSE) || !defined (DISABLE_HELP)
+shortcut *currshortcut;			/* Current shortcut list we're using */
 #endif
 
 #ifndef NANO_SMALL
-toggle toggles[TOGGLE_LEN];
+toggle *toggles = NULL;
 #endif
 
 /* Regular expressions */
@@ -112,12 +123,40 @@ toggle toggles[TOGGLE_LEN];
 regex_t search_regexp;		/* Global to store compiled search regexp */
 regmatch_t regmatches[10];	/* Match positions for parenthetical
 				   subexpressions, max of 10 */
+#ifdef ENABLE_COLOR
+regex_t color_regexp;		/* Global to store compiled search regexp */
+regmatch_t colormatches[1];	/* Match positions for parenthetical */
+#endif /* ENABLE_COLOR */
+
 #endif
 
+int length_of_list(shortcut *s) 
+{
+    int i = 0;
+    shortcut *t;
+
+    for (t = s; t != NULL; t = t->next)
+	i++;
+
+    return i;
+}
+
 /* Initialize a struct *without* our lovely braces =( */
-void sc_init_one(shortcut * s, int key, char *desc, char *help, int alt,
+void sc_init_one(shortcut **shortcutage, int key, char *desc, char *help, int alt,
 		 int misc1, int misc2, int view, int (*func) (void))
 {
+    shortcut *s;
+
+    if (*shortcutage == NULL) {
+	*shortcutage = nmalloc(sizeof(shortcut));
+	s = *shortcutage;
+    } else {
+	for (s = *shortcutage; s->next != NULL; s = s->next)
+	    ;
+	s->next = nmalloc(sizeof(shortcut));
+	s = s->next; 
+    }
+
     s->val = key;
     s->desc = desc;
     s->help = help;
@@ -126,17 +165,29 @@ void sc_init_one(shortcut * s, int key, char *desc, char *help, int alt,
     s->misc2 = misc2;
     s->viewok = view;
     s->func = func;
+    s->next = NULL;
 }
 
 #ifndef NANO_SMALL
 /* Initialize the toggles in the same manner */
-void toggle_init_one(toggle * t, int val, char *desc, int flag,
-		     char override_ch)
+void toggle_init_one(int val, char *desc, int flag)
 {
-    t->val = val;
-    t->desc = desc;
-    t->flag = flag;
-    t->override_ch = override_ch;
+    toggle *u;
+
+    if (toggles == NULL) {
+	toggles = nmalloc(sizeof(toggle));
+	u = toggles;
+    } else {
+	for (u = toggles; u->next != NULL; u = u->next)
+	    ;
+	u->next = nmalloc(sizeof(toggle));
+	u = u->next;
+    }
+
+    u->val = val;
+    u->desc = desc;
+    u->flag = flag;
+    u->next = NULL;
 }
 #endif
 
@@ -146,16 +197,17 @@ void toggle_init(void)
     char *toggle_const_msg, *toggle_autoindent_msg, *toggle_suspend_msg,
 	*toggle_nohelp_msg, *toggle_picomode_msg, *toggle_mouse_msg,
 	*toggle_cuttoend_msg, *toggle_wrap_msg, *toggle_case_msg, 
-	*toggle_backwards_msg;
-
-#ifdef ENABLE_MULTIBUFFER
-    char *toggle_load_msg, *nano_openprev_msg, *nano_opennext_msg;
-#endif
+	*toggle_backwards_msg, *toggle_noconvert_msg, *toggle_dos_msg,
+	*toggle_mac_msg, *toggle_smooth_msg;
 
 #ifdef HAVE_REGEX_H
     char *toggle_regexp_msg;
 #endif
 
+#ifdef ENABLE_MULTIBUFFER
+    char *toggle_load_msg;
+#endif
+
     toggle_const_msg = _("Constant cursor position");
     toggle_autoindent_msg = _("Auto indent");
     toggle_suspend_msg = _("Suspend");
@@ -163,54 +215,44 @@ void toggle_init(void)
     toggle_picomode_msg = _("Pico mode");
     toggle_mouse_msg = _("Mouse support");
     toggle_cuttoend_msg = _("Cut to end");
-    toggle_backwards_msg = _("Backwards Search");
-    toggle_case_msg = _("Case Sensitive Search");
+    toggle_backwards_msg = _("Backwards search");
+    toggle_case_msg = _("Case sensitive search");
+
 #ifdef HAVE_REGEX_H
-    toggle_regexp_msg = _("Regular expressions");
+    toggle_regexp_msg = _("Regular expression search");
 #endif
+
+    toggle_noconvert_msg = _("No conversion from DOS/Mac format");
+    toggle_dos_msg = _("Writing file in DOS format");
+    toggle_mac_msg = _("Writing file in Mac format");
+    toggle_smooth_msg = _("Smooth scrolling");
     toggle_wrap_msg = _("Auto wrap");
 
 #ifdef ENABLE_MULTIBUFFER
     toggle_load_msg = _("Multiple file buffers");
-    nano_openprev_msg = _("Open previously loaded file");
-    nano_opennext_msg = _("Open next loaded file");
-#endif
-
-    toggle_init_one(&toggles[0], TOGGLE_CONST_KEY, toggle_const_msg,
-		    CONSTUPDATE, 0);
-    toggle_init_one(&toggles[1], TOGGLE_AUTOINDENT_KEY,
-		    toggle_autoindent_msg, AUTOINDENT, 0);
-    toggle_init_one(&toggles[2], TOGGLE_SUSPEND_KEY, toggle_suspend_msg,
-		    SUSPEND, 0);
-    toggle_init_one(&toggles[3], TOGGLE_NOHELP_KEY, toggle_nohelp_msg,
-		    NO_HELP, 0);
-    toggle_init_one(&toggles[4], TOGGLE_PICOMODE_KEY, toggle_picomode_msg,
-		    PICO_MODE, 0);
-    toggle_init_one(&toggles[5], TOGGLE_WRAP_KEY, toggle_wrap_msg,
-		    NO_WRAP, 0);
-    toggle_init_one(&toggles[6], TOGGLE_MOUSE_KEY, toggle_mouse_msg,
-		    USE_MOUSE, 0);
-    toggle_init_one(&toggles[7], TOGGLE_CUTTOEND_KEY, toggle_cuttoend_msg,
-		    CUT_TO_END, 0);
-    toggle_init_one(&toggles[8], TOGGLE_BACKWARDS_KEY, toggle_backwards_msg,
-		    REVERSE_SEARCH, 0);
-    toggle_init_one(&toggles[9], TOGGLE_CASE_KEY, toggle_case_msg,
-		    CASE_SENSITIVE, 0);
-
-#ifdef ENABLE_MULTIBUFFER
-    toggle_init_one(&toggles[10], TOGGLE_LOAD_KEY, toggle_load_msg,
-		    MULTIBUFFER, 0);
-    toggle_init_one(&toggles[11], NANO_OPENPREV_KEY, nano_openprev_msg,
-		    0, '<');
-    toggle_init_one(&toggles[12], NANO_OPENNEXT_KEY, nano_opennext_msg,
-		    0, '>');
 #endif
 
+    toggle_init_one(TOGGLE_CONST_KEY, toggle_const_msg, CONSTUPDATE);
+    toggle_init_one(TOGGLE_AUTOINDENT_KEY, toggle_autoindent_msg, AUTOINDENT);
+    toggle_init_one(TOGGLE_SUSPEND_KEY, toggle_suspend_msg, SUSPEND);
+    toggle_init_one(TOGGLE_NOHELP_KEY, toggle_nohelp_msg, NO_HELP);
+    toggle_init_one(TOGGLE_PICOMODE_KEY, toggle_picomode_msg, PICO_MODE);
+    toggle_init_one(TOGGLE_WRAP_KEY, toggle_wrap_msg, NO_WRAP);
+    toggle_init_one(TOGGLE_MOUSE_KEY, toggle_mouse_msg, USE_MOUSE);
+    toggle_init_one(TOGGLE_CUTTOEND_KEY, toggle_cuttoend_msg, CUT_TO_END);
+    toggle_init_one(TOGGLE_BACKWARDS_KEY, toggle_backwards_msg, REVERSE_SEARCH);
+    toggle_init_one(TOGGLE_CASE_KEY, toggle_case_msg, CASE_SENSITIVE);
 #ifdef HAVE_REGEX_H
-    toggle_init_one(&toggles[TOGGLE_LEN - 1], TOGGLE_REGEXP_KEY,
-		    toggle_regexp_msg, USE_REGEXP, 0);
+    toggle_init_one(TOGGLE_REGEXP_KEY, toggle_regexp_msg, USE_REGEXP);
 #endif
+#ifdef ENABLE_MULTIBUFFER
+    toggle_init_one(TOGGLE_LOAD_KEY, toggle_load_msg, MULTIBUFFER);
 #endif
+    toggle_init_one(TOGGLE_NOCONVERT_KEY, toggle_noconvert_msg, NO_CONVERT);
+    toggle_init_one(TOGGLE_DOS_KEY, toggle_dos_msg, DOS_FILE);
+    toggle_init_one(TOGGLE_MAC_KEY, toggle_mac_msg, MAC_FILE);
+    toggle_init_one(TOGGLE_SMOOTH_KEY, toggle_smooth_msg, SMOOTHSCROLL);
+#endif /* !NANO_SMALL */
 }
 
 void shortcut_init(int unjustify)
@@ -226,14 +268,21 @@ void shortcut_init(int unjustify)
 	"", *nano_lastline_msg = "", *nano_refresh_msg =
 	"", *nano_mark_msg = "", *nano_delete_msg =
 	"", *nano_backspace_msg = "", *nano_tab_msg =
-	"", *nano_enter_msg = "", *nano_case_msg =
-	"", *nano_cancel_msg = "", *nano_unjustify_msg = 
-	"", *nano_append_msg = "", *nano_reverse_msg = 
-	"", *nano_regexp_msg = "";
+	"", *nano_enter_msg = "", *nano_cancel_msg = 
+	"", *nano_unjustify_msg = "", *nano_append_msg =
+	""; 
 
 #ifndef NANO_SMALL
-    char *nano_tofiles_msg = "";
-    char *nano_gotodir_msg = "";
+    char *nano_tofiles_msg = "", *nano_gotodir_msg = "", *nano_case_msg =
+	"", *nano_reverse_msg = "", *nano_execute_msg = "";
+    char *nano_dos_msg = "", *nano_mac_msg = ""; 
+
+#ifdef HAVE_REGEX_H
+    char *nano_regexp_msg = "", *nano_bracket_msg = "";
+#endif
+#ifdef ENABLE_MULTIBUFFER
+    char *nano_openprev_msg = "", *nano_opennext_msg = "";
+#endif
 
     nano_help_msg = _("Invoke the help menu");
     nano_writeout_msg = _("Write the current file to disk");
@@ -274,262 +323,505 @@ void shortcut_init(int unjustify)
     nano_case_msg =
 	_("Make the current search or replace case (in)sensitive");
     nano_tofiles_msg = _("Go to file browser");
+    nano_execute_msg = _("Execute external command");
     nano_gotodir_msg = _("Goto Directory");
     nano_cancel_msg = _("Cancel the current function");
     nano_append_msg = _("Append to the current file");
-    nano_reverse_msg = _("Search Backwards");
-    nano_regexp_msg = _("Use Regular Expressions");
+    nano_reverse_msg = _("Search backwards");
+    nano_dos_msg = _("Write file out in DOS format");
+    nano_mac_msg = _("Write file out in Mac format");
+#ifdef HAVE_REGEX_H
+    nano_regexp_msg = _("Use Regular expressions");
+    nano_bracket_msg = _("Find other bracket");
 #endif
+#ifdef ENABLE_MULTIBUFFER
+    nano_openprev_msg = _("Open previously loaded file");
+    nano_opennext_msg = _("Open next loaded file");
+#endif
+#endif /* !NANO_SMALL */
 
-	sc_init_one(&main_list[0], NANO_HELP_KEY, _("Get Help"),
+    if (main_list != NULL)
+	free_shortcutage(&main_list);
+
+	sc_init_one(&main_list, NANO_HELP_KEY, _("Get Help"),
 		    nano_help_msg, 0, NANO_HELP_FKEY, 0, VIEW, do_help);
 
 #ifdef ENABLE_MULTIBUFFER
     if (open_files != NULL && (open_files->prev || open_files->next))
-	sc_init_one(&main_list[1], NANO_EXIT_KEY, _("Close"),
+	sc_init_one(&main_list, NANO_EXIT_KEY, _("Close"),
 		nano_exit_msg, 0, NANO_EXIT_FKEY, 0, VIEW, do_exit);
     else
 #endif
-	sc_init_one(&main_list[1], NANO_EXIT_KEY, _("Exit"),
+	sc_init_one(&main_list, NANO_EXIT_KEY, _("Exit"),
 		nano_exit_msg, 0, NANO_EXIT_FKEY, 0, VIEW, do_exit);
 
-    sc_init_one(&main_list[2], NANO_WRITEOUT_KEY, _("WriteOut"),
+    sc_init_one(&main_list, NANO_WRITEOUT_KEY, _("WriteOut"),
 		    nano_writeout_msg,
 		    0, NANO_WRITEOUT_FKEY, 0, NOVIEW, do_writeout_void);
 
     if (ISSET(PICO_MODE))
-	sc_init_one(&main_list[3], NANO_JUSTIFY_KEY, _("Justify"),
+	sc_init_one(&main_list, NANO_JUSTIFY_KEY, _("Justify"),
 		    nano_justify_msg, 0, NANO_JUSTIFY_FKEY, 0,
 		    NOVIEW, do_justify);
     else
-	sc_init_one(&main_list[3], NANO_INSERTFILE_KEY, _("Read File"),
+
+#ifdef ENABLE_MULTIBUFFER
+	/* this is so we can view multiple files */
+	sc_init_one(&main_list, NANO_INSERTFILE_KEY, _("Read File"),
+		nano_insert_msg,
+		0, NANO_INSERTFILE_FKEY, 0, VIEW, do_insertfile_void);
+#else
+	sc_init_one(&main_list, NANO_INSERTFILE_KEY, _("Read File"),
 		nano_insert_msg,
 		0, NANO_INSERTFILE_FKEY, 0, NOVIEW, do_insertfile_void);
-
+#endif
 
     if (ISSET(PICO_MODE))
-	sc_init_one(&main_list[4], NANO_INSERTFILE_KEY, _("Read File"),
+
+#ifdef ENABLE_MULTIBUFFER
+	/* this is so we can view multiple files */
+	sc_init_one(&main_list, NANO_INSERTFILE_KEY, _("Read File"),
+		nano_insert_msg,
+		0, NANO_INSERTFILE_FKEY, 0, VIEW, do_insertfile_void);
+#else
+	sc_init_one(&main_list, NANO_INSERTFILE_KEY, _("Read File"),
 		nano_insert_msg,
 		0, NANO_INSERTFILE_FKEY, 0, NOVIEW, do_insertfile_void);
-    else
-	sc_init_one(&main_list[4], NANO_REPLACE_KEY, _("Replace"),
-		    nano_replace_msg,
-		    NANO_ALT_R, NANO_REPLACE_FKEY, 0, NOVIEW, do_replace);
+#endif
 
-    sc_init_one(&main_list[5], NANO_WHEREIS_KEY, _("Where Is"),
+    else
+	sc_init_one(&main_list, NANO_REPLACE_KEY, _("Replace"),
+		    nano_replace_msg,
+		    NANO_ALT_REPLACE_KEY, NANO_REPLACE_FKEY, 0, NOVIEW, do_replace);
+
+    sc_init_one(&main_list, NANO_WHEREIS_KEY, _("Where Is"),
 		nano_whereis_msg,
 		0, NANO_WHEREIS_FKEY, 0, VIEW, do_search);
 
-    sc_init_one(&main_list[6], NANO_PREVPAGE_KEY, _("Prev Page"),
+    sc_init_one(&main_list, NANO_PREVPAGE_KEY, _("Prev Page"),
 		nano_prevpage_msg,
-		0, NANO_PREVPAGE_FKEY, KEY_PPAGE, VIEW, page_up);
+		0, NANO_PREVPAGE_FKEY, KEY_PPAGE, VIEW, do_page_up);
 
-    sc_init_one(&main_list[7], NANO_NEXTPAGE_KEY, _("Next Page"),
+    sc_init_one(&main_list, NANO_NEXTPAGE_KEY, _("Next Page"),
 		nano_nextpage_msg,
-		0, NANO_NEXTPAGE_FKEY, KEY_NPAGE, VIEW, page_down);
+		0, NANO_NEXTPAGE_FKEY, KEY_NPAGE, VIEW, do_page_down);
 
-    sc_init_one(&main_list[8], NANO_CUT_KEY, _("Cut Text"),
+    sc_init_one(&main_list, NANO_CUT_KEY, _("Cut Text"),
 		nano_cut_msg, 0, NANO_CUT_FKEY, 0, NOVIEW, do_cut_text);
 
     if (unjustify)
-	sc_init_one(&main_list[9], NANO_UNJUSTIFY_KEY, _("UnJustify"),
+	sc_init_one(&main_list, NANO_UNJUSTIFY_KEY, _("UnJustify"),
 		nano_unjustify_msg, 0, 0, 0, NOVIEW, do_uncut_text);
     else
-	sc_init_one(&main_list[9], NANO_UNCUT_KEY, _("UnCut Txt"),
+	sc_init_one(&main_list, NANO_UNCUT_KEY, _("UnCut Txt"),
 		nano_uncut_msg,
 		0, NANO_UNCUT_FKEY, 0, NOVIEW, do_uncut_text);
 
-    sc_init_one(&main_list[10], NANO_CURSORPOS_KEY, _("Cur Pos"),
+    sc_init_one(&main_list, NANO_CURSORPOS_KEY, _("Cur Pos"),
 		nano_cursorpos_msg,
-		0, NANO_CURSORPOS_FKEY, 0, VIEW, do_cursorpos);
+		0, NANO_CURSORPOS_FKEY, 0, VIEW, do_cursorpos_void);
 
-    sc_init_one(&main_list[11], NANO_SPELL_KEY, _("To Spell"),
+    sc_init_one(&main_list, NANO_SPELL_KEY, _("To Spell"),
 		nano_spell_msg, 0, NANO_SPELL_FKEY, 0, NOVIEW, do_spell);
 
 
-    sc_init_one(&main_list[12], NANO_UP_KEY, _("Up"),
+    sc_init_one(&main_list, NANO_UP_KEY, _("Up"),
 		nano_up_msg, 0, KEY_UP, 0, VIEW, do_up);
 
-    sc_init_one(&main_list[13], NANO_DOWN_KEY, _("Down"),
+    sc_init_one(&main_list, NANO_DOWN_KEY, _("Down"),
 		nano_down_msg, 0, KEY_DOWN, 0, VIEW, do_down);
 
-    sc_init_one(&main_list[14], NANO_FORWARD_KEY, _("Forward"),
+    sc_init_one(&main_list, NANO_FORWARD_KEY, _("Forward"),
 		nano_forward_msg, 0, KEY_RIGHT, 0, VIEW, do_right);
 
-    sc_init_one(&main_list[15], NANO_BACK_KEY, _("Back"),
+    sc_init_one(&main_list, NANO_BACK_KEY, _("Back"),
 		nano_back_msg, 0, KEY_LEFT, 0, VIEW, do_left);
 
-    sc_init_one(&main_list[16], NANO_HOME_KEY, _("Home"),
+    sc_init_one(&main_list, NANO_HOME_KEY, _("Home"),
 		nano_home_msg, 0, KEY_HOME, 362, VIEW, do_home);
 
-    sc_init_one(&main_list[17], NANO_END_KEY, _("End"),
+    sc_init_one(&main_list, NANO_END_KEY, _("End"),
 		nano_end_msg, 0, KEY_END, 385, VIEW, do_end);
 
-    sc_init_one(&main_list[18], NANO_REFRESH_KEY, _("Refresh"),
+    sc_init_one(&main_list, NANO_REFRESH_KEY, _("Refresh"),
 		nano_refresh_msg, 0, 0, 0, VIEW, total_refresh);
 
-    sc_init_one(&main_list[19], NANO_MARK_KEY, _("Mark Text"),
-		nano_mark_msg, 0, 0, 0, NOVIEW, do_mark);
+    sc_init_one(&main_list, NANO_MARK_KEY, _("Mark Text"),
+		nano_mark_msg, NANO_ALT_MARK_KEY, 0, 0, NOVIEW, do_mark);
 
-    sc_init_one(&main_list[20], NANO_DELETE_KEY, _("Delete"),
+    sc_init_one(&main_list, NANO_DELETE_KEY, _("Delete"),
 		nano_delete_msg, 0, KEY_DC,
 		NANO_CONTROL_D, NOVIEW, do_delete);
 
-    sc_init_one(&main_list[21], NANO_BACKSPACE_KEY, _("Backspace"),
+    sc_init_one(&main_list, NANO_BACKSPACE_KEY, _("Backspace"),
 		nano_backspace_msg, 0,
 		KEY_BACKSPACE, 127, NOVIEW, do_backspace);
 
-    sc_init_one(&main_list[22], NANO_TAB_KEY, _("Tab"),
+    sc_init_one(&main_list, NANO_TAB_KEY, _("Tab"),
 		nano_tab_msg, 0, 0, 0, NOVIEW, do_tab);
 
     if (ISSET(PICO_MODE))
-	sc_init_one(&main_list[23], NANO_REPLACE_KEY, _("Replace"),
+	sc_init_one(&main_list, NANO_REPLACE_KEY, _("Replace"),
 		    nano_replace_msg,
-		    NANO_ALT_R, NANO_REPLACE_FKEY, 0, NOVIEW, do_replace);
+		    NANO_ALT_REPLACE_KEY, NANO_REPLACE_FKEY, 0, NOVIEW, do_replace);
     else
-	sc_init_one(&main_list[23], NANO_JUSTIFY_KEY, _("Justify"),
+	sc_init_one(&main_list, NANO_JUSTIFY_KEY, _("Justify"),
 		    nano_justify_msg, 0, NANO_JUSTIFY_FKEY, 0,
 		    NOVIEW, do_justify);
 
-    sc_init_one(&main_list[24], NANO_ENTER_KEY, _("Enter"),
+    sc_init_one(&main_list, NANO_ENTER_KEY, _("Enter"),
 		nano_enter_msg,
 		0, KEY_ENTER, NANO_CONTROL_M, NOVIEW, do_enter_void);
 
-    sc_init_one(&main_list[25], NANO_GOTO_KEY, _("Goto Line"),
+    sc_init_one(&main_list, NANO_GOTO_KEY, _("Goto Line"),
 		    nano_goto_msg,
-		    NANO_ALT_G, NANO_GOTO_FKEY, 0, VIEW, do_gotoline_void);
+		    NANO_ALT_GOTO_KEY, NANO_GOTO_FKEY, 0, VIEW, do_gotoline_void);
 
+#if (!defined NANO_SMALL) && (defined HAVE_REGEX_H)
+    sc_init_one(&main_list, -9, _("Find Other Bracket"),
+		    nano_bracket_msg,
+		    NANO_BRACKET_KEY, 0, 0, VIEW, do_find_bracket);
+#endif
 
+#ifdef ENABLE_MULTIBUFFER
+    sc_init_one(&main_list, -9, _("Previous File"),
+		    nano_openprev_msg,
+		    NANO_OPENPREV_KEY, 0, 0, VIEW, open_prevfile_void);
+    sc_init_one(&main_list, -9, _("Next File"),
+		    nano_opennext_msg,
+		    NANO_OPENNEXT_KEY, 0, 0, VIEW, open_nextfile_void);
+#endif
 
-    sc_init_one(&whereis_list[0], NANO_FIRSTLINE_KEY, _("First Line"),
+    if (whereis_list != NULL)
+	free_shortcutage(&whereis_list);
+
+    sc_init_one(&whereis_list, NANO_HELP_KEY,
+		_("Get Help"), nano_help_msg, 0, 0, 0, VIEW, do_help);
+
+    sc_init_one(&whereis_list, NANO_CANCEL_KEY,
+		_("Cancel"), nano_cancel_msg, 0, 0, 0, VIEW, 0);
+
+    sc_init_one(&whereis_list, NANO_FIRSTLINE_KEY, _("First Line"),
 		nano_firstline_msg, 0, 0, 0, VIEW, do_first_line);
 
-    sc_init_one(&whereis_list[1], NANO_LASTLINE_KEY, _("Last Line"),
+    sc_init_one(&whereis_list, NANO_LASTLINE_KEY, _("Last Line"),
 		nano_lastline_msg, 0, 0, 0, VIEW, do_last_line);
 
-    sc_init_one(&whereis_list[2], NANO_OTHERSEARCH_KEY, _("Replace"),
+    sc_init_one(&whereis_list, NANO_OTHERSEARCH_KEY, _("Replace"),
 		nano_replace_msg, 0, 0, 0, VIEW, do_replace);
 
-    sc_init_one(&whereis_list[3], NANO_FROMSEARCHTOGOTO_KEY,
+    sc_init_one(&whereis_list, NANO_FROMSEARCHTOGOTO_KEY,
 		_("Goto Line"), nano_goto_msg, 0, 0, 0, VIEW,
 		do_gotoline_void);
 
-    sc_init_one(&whereis_list[4], NANO_CANCEL_KEY, _("Cancel"),
-		nano_cancel_msg, 0, 0, 0, VIEW, 0);
-
-    sc_init_one(&whereis_list[5], TOGGLE_CASE_KEY, _("Case Sens"),
+#ifndef NANO_SMALL
+    sc_init_one(&whereis_list, TOGGLE_CASE_KEY, _("Case Sens"),
 		nano_case_msg, 0, 0, 0, VIEW, 0);
 
-    sc_init_one(&whereis_list[6], TOGGLE_BACKWARDS_KEY, _("Backward"),
+    sc_init_one(&whereis_list, TOGGLE_BACKWARDS_KEY, _("Direction"),
 		nano_reverse_msg, 0, 0, 0, VIEW, 0);
 
 #ifdef HAVE_REGEX_H
-    sc_init_one(&whereis_list[7], TOGGLE_REGEXP_KEY, _("Regexp"),
-		nano_regexp_msg, 0, 0, 0, VIEW, 0);
+    sc_init_one(&whereis_list, TOGGLE_REGEXP_KEY,
+		_("Regexp"), nano_regexp_msg, 0, 0, 0, VIEW, 0);
 #endif
+#endif /* !NANO_SMALL */
 
-    sc_init_one(&replace_list[0], NANO_FIRSTLINE_KEY, _("First Line"),
+    if (replace_list != NULL)
+	free_shortcutage(&replace_list);
+
+    sc_init_one(&replace_list, NANO_HELP_KEY,
+		_("Get Help"), nano_help_msg, 0, 0, 0, VIEW, do_help);
+
+    sc_init_one(&replace_list, NANO_CANCEL_KEY,
+		_("Cancel"), nano_cancel_msg, 0, 0, 0, VIEW, 0);
+
+    sc_init_one(&replace_list, NANO_FIRSTLINE_KEY, _("First Line"),
 		nano_firstline_msg, 0, 0, 0, VIEW, do_first_line);
 
-    sc_init_one(&replace_list[1], NANO_LASTLINE_KEY, _("Last Line"),
+    sc_init_one(&replace_list, NANO_LASTLINE_KEY, _("Last Line"),
 		nano_lastline_msg, 0, 0, 0, VIEW, do_last_line);
 
-    sc_init_one(&replace_list[2], NANO_OTHERSEARCH_KEY, _("No Replace"),
+    sc_init_one(&replace_list, NANO_OTHERSEARCH_KEY, _("No Replace"),
 		nano_whereis_msg, 0, 0, 0, VIEW, do_search);
 
-    sc_init_one(&replace_list[3], NANO_FROMSEARCHTOGOTO_KEY,
+    sc_init_one(&replace_list, NANO_FROMSEARCHTOGOTO_KEY,
 		_("Goto Line"), nano_goto_msg, 0, 0, 0, VIEW,
 		do_gotoline_void);
 
-    sc_init_one(&replace_list[4], NANO_CANCEL_KEY, _("Cancel"),
-		nano_cancel_msg, 0, 0, 0, VIEW, 0);
-
-    sc_init_one(&replace_list[5], TOGGLE_CASE_KEY, _("Case Sens"),
+#ifndef NANO_SMALL
+    sc_init_one(&replace_list, TOGGLE_CASE_KEY, _("Case Sens"),
 		nano_case_msg, 0, 0, 0, VIEW, 0);
 
-    sc_init_one(&replace_list[6], TOGGLE_BACKWARDS_KEY, _("Backward"),
+    sc_init_one(&replace_list, TOGGLE_BACKWARDS_KEY, _("Direction"),
 		nano_reverse_msg, 0, 0, 0, VIEW, 0);
 
 #ifdef HAVE_REGEX_H
-    sc_init_one(&replace_list[7], TOGGLE_REGEXP_KEY, _("Regexp"),
-		nano_regexp_msg, 0, 0, 0, VIEW, 0);
+    sc_init_one(&replace_list, TOGGLE_REGEXP_KEY, 
+		_("Regexp"), nano_regexp_msg, 0, 0, 0, VIEW, 0);
 #endif
+#endif /* !NANO_SMALL */
 
+    if (replace_list_2 != NULL)
+	free_shortcutage(&replace_list_2);
 
-    sc_init_one(&replace_list_2[0], NANO_FIRSTLINE_KEY, _("First Line"),
+    sc_init_one(&replace_list_2, NANO_HELP_KEY,
+		_("Get Help"), nano_help_msg, 0, 0, 0, VIEW, do_help);
+
+    sc_init_one(&replace_list_2, NANO_CANCEL_KEY,
+		_("Cancel"), nano_cancel_msg, 0, 0, 0, VIEW, 0);
+
+    sc_init_one(&replace_list_2, NANO_FIRSTLINE_KEY, _("First Line"),
 		nano_firstline_msg, 0, 0, 0, VIEW, do_first_line);
 
-    sc_init_one(&replace_list_2[1], NANO_LASTLINE_KEY, _("Last Line"),
+    sc_init_one(&replace_list_2, NANO_LASTLINE_KEY, _("Last Line"),
 		nano_lastline_msg, 0, 0, 0, VIEW, do_last_line);
 
-    sc_init_one(&replace_list_2[2], NANO_CANCEL_KEY, _("Cancel"),
+    if (goto_list != NULL)
+	free_shortcutage(&goto_list);
+
+    sc_init_one(&goto_list, NANO_HELP_KEY,
+		_("Get Help"), nano_help_msg, 0, 0, 0, VIEW, do_help);
+
+    sc_init_one(&goto_list, NANO_CANCEL_KEY, _("Cancel"),
 		nano_cancel_msg, 0, 0, 0, VIEW, 0);
 
-
-    sc_init_one(&goto_list[0], NANO_FIRSTLINE_KEY, _("First Line"),
+    sc_init_one(&goto_list, NANO_FIRSTLINE_KEY, _("First Line"),
 		nano_firstline_msg, 0, 0, 0, VIEW, &do_first_line);
 
-    sc_init_one(&goto_list[1], NANO_LASTLINE_KEY, _("Last Line"),
+    sc_init_one(&goto_list, NANO_LASTLINE_KEY, _("Last Line"),
 		nano_lastline_msg, 0, 0, 0, VIEW, &do_last_line);
 
-    sc_init_one(&goto_list[2], NANO_CANCEL_KEY, _("Cancel"),
-		nano_cancel_msg, 0, 0, 0, VIEW, 0);
+    if (help_list != NULL)
+	free_shortcutage(&help_list);
 
-
-    sc_init_one(&help_list[0], NANO_PREVPAGE_KEY, _("Prev Page"),
+    sc_init_one(&help_list, NANO_PREVPAGE_KEY, _("Prev Page"),
 		nano_prevpage_msg,
-		0, NANO_PREVPAGE_FKEY, KEY_PPAGE, VIEW, page_up);
+		0, NANO_PREVPAGE_FKEY, KEY_PPAGE, VIEW, do_page_up);
 
-    sc_init_one(&help_list[1], NANO_NEXTPAGE_KEY, _("Next Page"),
+    sc_init_one(&help_list, NANO_NEXTPAGE_KEY, _("Next Page"),
 		nano_nextpage_msg,
-		0, NANO_NEXTPAGE_FKEY, KEY_NPAGE, VIEW, page_down);
+		0, NANO_NEXTPAGE_FKEY, KEY_NPAGE, VIEW, do_page_down);
 
-    sc_init_one(&help_list[2], NANO_EXIT_KEY, _("Exit"),
+    sc_init_one(&help_list, NANO_EXIT_KEY, _("Exit"),
 		nano_exit_msg, 0, NANO_EXIT_FKEY, 0, VIEW, do_exit);
 
+    if (writefile_list != NULL)
+	free_shortcutage(&writefile_list);
+
+    sc_init_one(&writefile_list, NANO_HELP_KEY,
+		_("Get Help"), nano_help_msg, 0, 0, 0, VIEW, do_help);
 
 #ifndef DISABLE_BROWSER
-    sc_init_one(&writefile_list[0], NANO_TOFILES_KEY, _("To Files"),
+    sc_init_one(&writefile_list, NANO_TOFILES_KEY, _("To Files"),
 		nano_tofiles_msg, 0, 0, 0, NOVIEW, 0);
 #endif
 
-    sc_init_one(&writefile_list[WRITEFILE_LIST_LEN - 2], NANO_APPEND_KEY, _("Append"),
+#ifndef NANO_SMALL
+    sc_init_one(&writefile_list, TOGGLE_DOS_KEY, 
+		_("DOS Format"), nano_dos_msg, 0, 0, 0, NOVIEW, 0);
+
+    sc_init_one(&writefile_list, TOGGLE_MAC_KEY, 
+		_("Mac Format"), nano_mac_msg, 0, 0, 0, NOVIEW, 0);
+#endif
+
+    sc_init_one(&writefile_list, 
+		NANO_APPEND_KEY, _("Append"),
 		nano_append_msg, 0, 0, 0, NOVIEW, 0);
 
-    sc_init_one(&writefile_list[WRITEFILE_LIST_LEN - 1], NANO_CANCEL_KEY, _("Cancel"),
+    sc_init_one(&writefile_list, NANO_CANCEL_KEY, 
+		_("Cancel"), nano_cancel_msg, 0, 0, 0, VIEW, 0);
+
+    if (insertfile_list != NULL)
+	free_shortcutage(&insertfile_list);
+
+    sc_init_one(&insertfile_list, NANO_HELP_KEY,
+		_("Get Help"), nano_help_msg, 0, 0, 0, VIEW, do_help);
+
+    sc_init_one(&insertfile_list, NANO_CANCEL_KEY, _("Cancel"),
 		nano_cancel_msg, 0, 0, 0, VIEW, 0);
 
 #ifndef DISABLE_BROWSER
-    sc_init_one(&insertfile_list[0], NANO_TOFILES_KEY, _("To Files"),
+    sc_init_one(&insertfile_list, NANO_TOFILES_KEY, _("To Files"),
 		nano_tofiles_msg, 0, 0, 0, NOVIEW, 0);
 #endif
+#ifndef NANO_SMALL
+    sc_init_one(&insertfile_list, NANO_EXTCMD_KEY, _("Execute Command"),
+		nano_execute_msg, 0, 0, 0, NOVIEW, 0);
+#endif
 
-    sc_init_one(&insertfile_list[INSERTFILE_LIST_LEN - 1], NANO_CANCEL_KEY, _("Cancel"),
+    sc_init_one(&spell_list, NANO_HELP_KEY,
+		_("Get Help"), nano_help_msg, 0, 0, 0, VIEW, do_help);
+
+    sc_init_one(&spell_list, NANO_CANCEL_KEY, _("Cancel"),
 		nano_cancel_msg, 0, 0, 0, VIEW, 0);
 
-    sc_init_one(&spell_list[0], NANO_CANCEL_KEY, _("Cancel"),
+#ifndef NANO_SMALL
+    sc_init_one(&extcmd_list, NANO_HELP_KEY,
+		_("Get Help"), nano_help_msg, 0, 0, 0, VIEW, do_help);
+
+    sc_init_one(&extcmd_list, NANO_CANCEL_KEY, _("Cancel"),
 		nano_cancel_msg, 0, 0, 0, VIEW, 0);
+#endif
 
 #ifndef DISABLE_BROWSER
-    sc_init_one(&browser_list[0], NANO_PREVPAGE_KEY, _("Prev Page"),
+
+    if (browser_list != NULL)
+	free_shortcutage(&browser_list);
+
+    sc_init_one(&browser_list, NANO_HELP_KEY,
+		_("Get Help"), nano_help_msg, 0, 0, 0, VIEW, do_help);
+
+    sc_init_one(&browser_list, NANO_EXIT_KEY, _("Exit"),
+		nano_exit_msg, 0, NANO_EXIT_FKEY, 0, VIEW, 0);
+
+    sc_init_one(&browser_list, NANO_PREVPAGE_KEY, _("Prev Page"),
 		nano_prevpage_msg,
 		0, NANO_PREVPAGE_FKEY, KEY_PPAGE, VIEW, 0);
 
-    sc_init_one(&browser_list[1], NANO_NEXTPAGE_KEY, _("Next Page"),
+    sc_init_one(&browser_list, NANO_NEXTPAGE_KEY, _("Next Page"),
 		nano_nextpage_msg,
 		0, NANO_NEXTPAGE_FKEY, KEY_NPAGE, VIEW, 0);
 
-    sc_init_one(&browser_list[2], NANO_GOTO_KEY, _("Goto"),
-		nano_gotodir_msg, 0, NANO_GOTO_FKEY, 0, VIEW, 0);
+    sc_init_one(&browser_list, NANO_GOTO_KEY, _("Goto"),
+		nano_gotodir_msg, NANO_ALT_GOTO_KEY, NANO_GOTO_FKEY, 0, 
+		VIEW, 0);
 
-    sc_init_one(&browser_list[3], NANO_EXIT_KEY, _("Exit"),
-		nano_exit_msg, 0, NANO_EXIT_FKEY, 0, VIEW, 0);
+    if (gotodir_list != NULL)
+	free_shortcutage(&gotodir_list);
 
-    sc_init_one(&gotodir_list[0], NANO_CANCEL_KEY, _("Cancel"),
+    sc_init_one(&gotodir_list, NANO_HELP_KEY,
+		_("Get Help"), nano_help_msg, 0, 0, 0, VIEW, do_help);
+
+    sc_init_one(&gotodir_list, NANO_CANCEL_KEY, _("Cancel"),
 		nano_cancel_msg, 0, 0, 0, VIEW, 0);
 
 #endif
 
 
+#if !defined(DISABLE_BROWSER) || !defined(DISABLE_MOUSE) || !defined (DISABLE_HELP)
+    currshortcut = main_list;
+#endif
+
     toggle_init();
 }
+
+/* delete the structure */
+void free_shortcutage(shortcut **shortcutage)
+{
+    shortcut *s,*ps;
+
+    s = *shortcutage;
+    if (s == NULL) {
+	return;
+    } else {
+	s = *shortcutage;
+	do {
+		ps = s;
+		s = s->next; 
+		free(ps);
+	} while (s->next != NULL);
+	free(s);
+	*shortcutage = NULL;
+    }
+}
+
+#ifndef NANO_SMALL
+/* clear the toggles */
+void free_toggles(void)
+{
+    toggle *u,*lu;
+
+    if (toggles == NULL) {
+	return;
+    } else {
+	lu = NULL;
+	for (u = toggles; u->next != NULL; u = u->next) {
+		if (lu != NULL) free(lu);
+		lu = u;
+	}
+	if (lu != NULL) free(lu);
+	if (u != NULL) free(u);
+    }
+}
+#endif
+
+/* added by SPK for memory cleanup, gracefully return our malloc()s */
+void thanks_for_all_the_fish(void) 
+{
+#ifdef ENABLE_MULTIBUFFER
+    filestruct * current_open_file;
+#endif
+
+#ifndef DISABLE_OPERATINGDIR
+    if (operating_dir != NULL)
+	free(operating_dir);
+    if (full_operating_dir != NULL)
+	free(full_operating_dir);
+#endif
+    if (last_search != NULL)
+	free(last_search);
+    if (last_replace != NULL)
+	free(last_replace);
+    if (hblank != NULL)
+	free(hblank);
+#ifndef DISABLE_SPELLER
+    if (alt_speller != NULL)
+	free(alt_speller);
+#endif
+    if (help_text != NULL)
+	free(help_text);
+    if (filename != NULL)
+	free(filename);
+    if (answer != NULL)
+	free(answer);
+    if (cutbuffer != NULL)
+        free_filestruct(cutbuffer);
+
+    free_shortcutage(&main_list);
+    free_shortcutage(&whereis_list);
+    free_shortcutage(&replace_list);
+    free_shortcutage(&replace_list_2);
+    free_shortcutage(&help_list);
+    free_shortcutage(&writefile_list);
+    free_shortcutage(&insertfile_list);
+    free_shortcutage(&spell_list);
+#ifndef DISABLE_BROWSER
+    free_shortcutage(&browser_list);
+#endif
+    free_shortcutage(&gotodir_list);
+    free_shortcutage(&goto_list);
+
+#ifndef NANO_SMALL
+    free_toggles();
+#endif
+
+#ifdef ENABLE_MULTIBUFFER
+/* Cleanup of Multibuffers . . .
+   Do not cleanup the current one, that is fileage . . . do the
+   rest of them though! (should be none if all went well) */
+    current_open_file = open_files;
+    if (open_files != NULL){
+        while (open_files->prev != NULL) 
+           open_files = open_files->prev;
+        while (open_files->next != NULL) {
+  /* cleanup of a multi buf . . . */
+           if (open_files != current_open_file) 
+             free_filestruct(open_files->file);
+           open_files = open_files->next;
+           free_filestruct(open_files->prev);
+        }
+  /* cleanup of last multi buf . . . */
+        if (open_files != current_open_file) 
+	  free_filestruct(open_files->file);
+        free_filestruct(open_files);
+    }
+#endif
+  /* starting the cleanup of fileage now . . . */
+
+    if (fileage != NULL)
+        free_filestruct(fileage);
+
+    /* that is all for now */
+
+}

install-sh

@@ -1,251 +0,0 @@
-#!/bin/sh
-#
-# install - install a program, script, or datafile
-# This comes from X11R5 (mit/util/scripts/install.sh).
-#
-# Copyright 1991 by the Massachusetts Institute of Technology
-#
-# Permission to use, copy, modify, distribute, and sell this software and its
-# documentation for any purpose is hereby granted without fee, provided that
-# the above copyright notice appear in all copies and that both that
-# copyright notice and this permission notice appear in supporting
-# documentation, and that the name of M.I.T. not be used in advertising or
-# publicity pertaining to distribution of the software without specific,
-# written prior permission.  M.I.T. makes no representations about the
-# suitability of this software for any purpose.  It is provided "as is"
-# without express or implied warranty.
-#
-# Calling this script install-sh is preferred over install.sh, to prevent
-# `make' implicit rules from creating a file called install from it
-# when there is no Makefile.
-#
-# This script is compatible with the BSD install script, but was written
-# from scratch.  It can only install one file at a time, a restriction
-# shared with many OS's install programs.
-
-
-# set DOITPROG to echo to test this script
-
-# Don't use :- since 4.3BSD and earlier shells don't like it.
-doit="${DOITPROG-}"
-
-
-# put in absolute paths if you don't have them in your path; or use env. vars.
-
-mvprog="${MVPROG-mv}"
-cpprog="${CPPROG-cp}"
-chmodprog="${CHMODPROG-chmod}"
-chownprog="${CHOWNPROG-chown}"
-chgrpprog="${CHGRPPROG-chgrp}"
-stripprog="${STRIPPROG-strip}"
-rmprog="${RMPROG-rm}"
-mkdirprog="${MKDIRPROG-mkdir}"
-
-transformbasename=""
-transform_arg=""
-instcmd="$mvprog"
-chmodcmd="$chmodprog 0755"
-chowncmd=""
-chgrpcmd=""
-stripcmd=""
-rmcmd="$rmprog -f"
-mvcmd="$mvprog"
-src=""
-dst=""
-dir_arg=""
-
-while [ x"$1" != x ]; do
-    case $1 in
-	-c) instcmd="$cpprog"
-	    shift
-	    continue;;
-
-	-d) dir_arg=true
-	    shift
-	    continue;;
-
-	-m) chmodcmd="$chmodprog $2"
-	    shift
-	    shift
-	    continue;;
-
-	-o) chowncmd="$chownprog $2"
-	    shift
-	    shift
-	    continue;;
-
-	-g) chgrpcmd="$chgrpprog $2"
-	    shift
-	    shift
-	    continue;;
-
-	-s) stripcmd="$stripprog"
-	    shift
-	    continue;;
-
-	-t=*) transformarg=`echo $1 | sed 's/-t=//'`
-	    shift
-	    continue;;
-
-	-b=*) transformbasename=`echo $1 | sed 's/-b=//'`
-	    shift
-	    continue;;
-
-	*)  if [ x"$src" = x ]
-	    then
-		src=$1
-	    else
-		# this colon is to work around a 386BSD /bin/sh bug
-		:
-		dst=$1
-	    fi
-	    shift
-	    continue;;
-    esac
-done
-
-if [ x"$src" = x ]
-then
-	echo "install:	no input file specified"
-	exit 1
-else
-	true
-fi
-
-if [ x"$dir_arg" != x ]; then
-	dst=$src
-	src=""
-	
-	if [ -d $dst ]; then
-		instcmd=:
-		chmodcmd=""
-	else
-		instcmd=mkdir
-	fi
-else
-
-# Waiting for this to be detected by the "$instcmd $src $dsttmp" command
-# might cause directories to be created, which would be especially bad 
-# if $src (and thus $dsttmp) contains '*'.
-
-	if [ -f $src -o -d $src ]
-	then
-		true
-	else
-		echo "install:  $src does not exist"
-		exit 1
-	fi
-	
-	if [ x"$dst" = x ]
-	then
-		echo "install:	no destination specified"
-		exit 1
-	else
-		true
-	fi
-
-# If destination is a directory, append the input filename; if your system
-# does not like double slashes in filenames, you may need to add some logic
-
-	if [ -d $dst ]
-	then
-		dst="$dst"/`basename $src`
-	else
-		true
-	fi
-fi
-
-## this sed command emulates the dirname command
-dstdir=`echo $dst | sed -e 's,[^/]*$,,;s,/$,,;s,^$,.,'`
-
-# Make sure that the destination directory exists.
-#  this part is taken from Noah Friedman's mkinstalldirs script
-
-# Skip lots of stat calls in the usual case.
-if [ ! -d "$dstdir" ]; then
-defaultIFS='	
-'
-IFS="${IFS-${defaultIFS}}"
-
-oIFS="${IFS}"
-# Some sh's can't handle IFS=/ for some reason.
-IFS='%'
-set - `echo ${dstdir} | sed -e 's@/@%@g' -e 's@^%@/@'`
-IFS="${oIFS}"
-
-pathcomp=''
-
-while [ $# -ne 0 ] ; do
-	pathcomp="${pathcomp}${1}"
-	shift
-
-	if [ ! -d "${pathcomp}" ] ;
-        then
-		$mkdirprog "${pathcomp}"
-	else
-		true
-	fi
-
-	pathcomp="${pathcomp}/"
-done
-fi
-
-if [ x"$dir_arg" != x ]
-then
-	$doit $instcmd $dst &&
-
-	if [ x"$chowncmd" != x ]; then $doit $chowncmd $dst; else true ; fi &&
-	if [ x"$chgrpcmd" != x ]; then $doit $chgrpcmd $dst; else true ; fi &&
-	if [ x"$stripcmd" != x ]; then $doit $stripcmd $dst; else true ; fi &&
-	if [ x"$chmodcmd" != x ]; then $doit $chmodcmd $dst; else true ; fi
-else
-
-# If we're going to rename the final executable, determine the name now.
-
-	if [ x"$transformarg" = x ] 
-	then
-		dstfile=`basename $dst`
-	else
-		dstfile=`basename $dst $transformbasename | 
-			sed $transformarg`$transformbasename
-	fi
-
-# don't allow the sed command to completely eliminate the filename
-
-	if [ x"$dstfile" = x ] 
-	then
-		dstfile=`basename $dst`
-	else
-		true
-	fi
-
-# Make a temp file name in the proper directory.
-
-	dsttmp=$dstdir/#inst.$$#
-
-# Move or copy the file name to the temp name
-
-	$doit $instcmd $src $dsttmp &&
-
-	trap "rm -f ${dsttmp}" 0 &&
-
-# and set any options; do chmod last to preserve setuid bits
-
-# If any of these fail, we abort the whole thing.  If we want to
-# ignore errors from any of these, just make sure not to ignore
-# errors from the above "$doit $instcmd $src $dsttmp" command.
-
-	if [ x"$chowncmd" != x ]; then $doit $chowncmd $dsttmp; else true;fi &&
-	if [ x"$chgrpcmd" != x ]; then $doit $chgrpcmd $dsttmp; else true;fi &&
-	if [ x"$stripcmd" != x ]; then $doit $stripcmd $dsttmp; else true;fi &&
-	if [ x"$chmodcmd" != x ]; then $doit $chmodcmd $dsttmp; else true;fi &&
-
-# Now rename the file to the real destination.
-
-	$doit $rmcmd -f $dstdir/$dstfile &&
-	$doit $mvcmd $dsttmp $dstdir/$dstfile 
-
-fi &&
-
-
-exit 0

intl/ChangeLog

@@ -1,4 +1,4 @@
-2001-05-23  GNU  <bug-gnu-utils@gnu.org>
+2001-09-13  GNU  <bug-gnu-utils@gnu.org>
 
-	* Version 0.10.38 released.
+	* Version 0.10.40 released.
 

intl/Makefile.in

@@ -1,19 +1,20 @@
 # Makefile for directory with message catalog handling in GNU NLS Utilities.
 # Copyright (C) 1995-1998, 2000, 2001 Free Software Foundation, Inc.
 #
-# 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)
+# This program is free software; you can redistribute it and/or modify it
+# under the terms of the GNU Library 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.
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+# Library 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.
+# You should have received a copy of the GNU Library 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.
 
 PACKAGE = @PACKAGE@
 VERSION = @VERSION@
@@ -74,7 +75,7 @@ DISTFILES.common = Makefile.in \
 config.charset locale.alias ref-add.sin ref-del.sin $(HEADERS) $(SOURCES)
 DISTFILES.generated = plural.c
 DISTFILES.normal = VERSION
-DISTFILES.gettext = libintl.glibc
+DISTFILES.gettext = COPYING.LIB-2 COPYING.LIB-2.1 libintl.glibc
 DISTFILES.obsolete = xopen-msg.sed linux-msg.sed po2tbl.sed.in cat-compat.c
 
 # Libtool's library version information for libintl.
@@ -184,7 +185,7 @@ install-data: all
 	  $(mkinstalldirs) $(DESTDIR)$(gettextsrcdir); \
 	  $(INSTALL_DATA) VERSION $(DESTDIR)$(gettextsrcdir)/VERSION; \
 	  $(INSTALL_DATA) ChangeLog.inst $(DESTDIR)$(gettextsrcdir)/ChangeLog; \
-	  dists="$(DISTFILES.common)"; \
+	  dists="COPYING.LIB-2 COPYING.LIB-2.1 $(DISTFILES.common)"; \
 	  for file in $$dists; do \
 	    $(INSTALL_DATA) $(srcdir)/$$file \
 			    $(DESTDIR)$(gettextsrcdir)/$$file; \
@@ -243,7 +244,7 @@ uninstall:
 	  : ; \
 	fi
 	if test "$(PACKAGE)" = "gettext"; then \
-	  for file in VERSION ChangeLog $(DISTFILES.common) $(DISTFILES.generated); do \
+	  for file in VERSION ChangeLog COPYING.LIB-2 COPYING.LIB-2.1 $(DISTFILES.common) $(DISTFILES.generated); do \
 	    rm -f $(DESTDIR)$(gettextsrcdir)/$$file; \
 	  done; \
 	else \

intl/VERSION

@@ -1 +1 @@
-GNU gettext library from gettext-0.10.38
+GNU gettext library from gettext-0.10.40

intl/bindtextdom.c

@@ -1,19 +1,20 @@
 /* Implementation of the bindtextdomain(3) function
    Copyright (C) 1995-1998, 2000, 2001 Free Software Foundation, Inc.
 
-   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)
+   This program is free software; you can redistribute it and/or modify it
+   under the terms of the GNU Library 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.
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+   Library 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.  */
+   You should have received a copy of the GNU Library 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.  */
 
 #ifdef HAVE_CONFIG_H
 # include <config.h>

intl/cat-compat.c

@@ -1,262 +0,0 @@
-/* Compatibility code for gettext-using-catgets interface.
-   Copyright (C) 1995, 1997 Free Software Foundation, Inc.
-
-   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., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
-
-#ifdef HAVE_CONFIG_H
-# include <config.h>
-#endif
-
-#include <stdio.h>
-
-#ifdef STDC_HEADERS
-# include <stdlib.h>
-# include <string.h>
-#else
-char *getenv ();
-# ifdef HAVE_MALLOC_H
-#  include <malloc.h>
-# endif
-#endif
-
-#ifdef HAVE_NL_TYPES_H
-# include <nl_types.h>
-#endif
-
-#include "libgettext.h"
-
-/* @@ end of prolog @@ */
-
-/* XPG3 defines the result of `setlocale (category, NULL)' as:
-   ``Directs `setlocale()' to query `category' and return the current
-     setting of `local'.''
-   However it does not specify the exact format.  And even worse: POSIX
-   defines this not at all.  So we can use this feature only on selected
-   system (e.g. those using GNU C Library).  */
-#ifdef _LIBC
-# define HAVE_LOCALE_NULL
-#endif
-
-/* The catalog descriptor.  */
-static nl_catd catalog = (nl_catd) -1;
-
-/* Name of the default catalog.  */
-static const char default_catalog_name[] = "messages";
-
-/* Name of currently used catalog.  */
-static const char *catalog_name = default_catalog_name;
-
-/* Get ID for given string.  If not found return -1.  */
-static int msg_to_cat_id PARAMS ((const char *msg));
-
-/* Substitution for systems lacking this function in their C library.  */
-#if !_LIBC && !HAVE_STPCPY
-static char *stpcpy PARAMS ((char *dest, const char *src));
-#endif
-
-
-/* Set currently used domain/catalog.  */
-char *
-textdomain (domainname)
-     const char *domainname;
-{
-  nl_catd new_catalog;
-  char *new_name;
-  size_t new_name_len;
-  char *lang;
-
-#if defined HAVE_SETLOCALE && defined HAVE_LC_MESSAGES \
-    && defined HAVE_LOCALE_NULL
-  lang = setlocale (LC_MESSAGES, NULL);
-#else
-  lang = getenv ("LC_ALL");
-  if (lang == NULL || lang[0] == '\0')
-    {
-      lang = getenv ("LC_MESSAGES");
-      if (lang == NULL || lang[0] == '\0')
-	lang = getenv ("LANG");
-    }
-#endif
-  if (lang == NULL || lang[0] == '\0')
-    lang = "C";
-
-  /* See whether name of currently used domain is asked.  */
-  if (domainname == NULL)
-    return (char *) catalog_name;
-
-  if (domainname[0] == '\0')
-    domainname = default_catalog_name;
-
-  /* Compute length of added path element.  */
-  new_name_len = sizeof (LOCALEDIR) - 1 + 1 + strlen (lang)
-		 + sizeof ("/LC_MESSAGES/") - 1 + sizeof (PACKAGE) - 1
-		 + sizeof (".cat");
-
-  new_name = (char *) malloc (new_name_len);
-  if (new_name == NULL)
-    return NULL;
-
-  strcpy (new_name, PACKAGE);
-  new_catalog = catopen (new_name, 0);
-
-  if (new_catalog == (nl_catd) -1)
-    {
-      /* NLSPATH search didn't work, try absolute path */
-      sprintf (new_name, "%s/%s/LC_MESSAGES/%s.cat", LOCALEDIR, lang,
-	       PACKAGE);
-      new_catalog = catopen (new_name, 0);
-
-      if (new_catalog == (nl_catd) -1)
-	{
-	  free (new_name);
-	  return (char *) catalog_name;
-	}
-    }
-
-  /* Close old catalog.  */
-  if (catalog != (nl_catd) -1)
-    catclose (catalog);
-  if (catalog_name != default_catalog_name)
-    free ((char *) catalog_name);
-
-  catalog = new_catalog;
-  catalog_name = new_name;
-
-  return (char *) catalog_name;
-}
-
-char *
-bindtextdomain (domainname, dirname)
-     const char *domainname;
-     const char *dirname;
-{
-#if HAVE_SETENV || HAVE_PUTENV
-  char *old_val, *new_val, *cp;
-  size_t new_val_len;
-
-  /* This does not make much sense here but to be compatible do it.  */
-  if (domainname == NULL)
-    return NULL;
-
-  /* Compute length of added path element.  If we use setenv we don't need
-     the first byts for NLSPATH=, but why complicate the code for this
-     peanuts.  */
-  new_val_len = sizeof ("NLSPATH=") - 1 + strlen (dirname)
-		+ sizeof ("/%L/LC_MESSAGES/%N.cat");
-
-  old_val = getenv ("NLSPATH");
-  if (old_val == NULL || old_val[0] == '\0')
-    {
-      old_val = NULL;
-      new_val_len += 1 + sizeof (LOCALEDIR) - 1
-	             + sizeof ("/%L/LC_MESSAGES/%N.cat");
-    }
-  else
-    new_val_len += strlen (old_val);
-
-  new_val = (char *) malloc (new_val_len);
-  if (new_val == NULL)
-    return NULL;
-
-# if HAVE_SETENV
-  cp = new_val;
-# else
-  cp = stpcpy (new_val, "NLSPATH=");
-# endif
-
-  cp = stpcpy (cp, dirname);
-  cp = stpcpy (cp, "/%L/LC_MESSAGES/%N.cat:");
-
-  if (old_val == NULL)
-    {
-# if __STDC__
-      stpcpy (cp, LOCALEDIR "/%L/LC_MESSAGES/%N.cat");
-# else
-
-      cp = stpcpy (cp, LOCALEDIR);
-      stpcpy (cp, "/%L/LC_MESSAGES/%N.cat");
-# endif
-    }
-  else
-    stpcpy (cp, old_val);
-
-# if HAVE_SETENV
-  setenv ("NLSPATH", new_val, 1);
-  free (new_val);
-# else
-  putenv (new_val);
-  /* Do *not* free the environment entry we just entered.  It is used
-     from now on.   */
-# endif
-
-#endif
-
-  return (char *) domainname;
-}
-
-#undef gettext
-char *
-gettext (msg)
-     const char *msg;
-{
-  int msgid;
-
-  if (msg == NULL || catalog == (nl_catd) -1)
-    return (char *) msg;
-
-  /* Get the message from the catalog.  We always use set number 1.
-     The message ID is computed by the function `msg_to_cat_id'
-     which works on the table generated by `po-to-tbl'.  */
-  msgid = msg_to_cat_id (msg);
-  if (msgid == -1)
-    return (char *) msg;
-
-  return catgets (catalog, 1, msgid, (char *) msg);
-}
-
-/* Look through the table `_msg_tbl' which has `_msg_tbl_length' entries
-   for the one equal to msg.  If it is found return the ID.  In case when
-   the string is not found return -1.  */
-static int
-msg_to_cat_id (msg)
-     const char *msg;
-{
-  int cnt;
-
-  for (cnt = 0; cnt < _msg_tbl_length; ++cnt)
-    if (strcmp (msg, _msg_tbl[cnt]._msg) == 0)
-      return _msg_tbl[cnt]._msg_number;
-
-  return -1;
-}
-
-
-/* @@ begin of epilog @@ */
-
-/* We don't want libintl.a to depend on any other library.  So we
-   avoid the non-standard function stpcpy.  In GNU C Library this
-   function is available, though.  Also allow the symbol HAVE_STPCPY
-   to be defined.  */
-#if !_LIBC && !HAVE_STPCPY
-static char *
-stpcpy (dest, src)
-     char *dest;
-     const char *src;
-{
-  while ((*dest++ = *src++) != '\0')
-    /* Do nothing. */ ;
-  return dest - 1;
-}
-#endif

intl/config.charset

@@ -80,10 +80,10 @@
 #   EUC-KR                    glibc aix hpux irix osf solaris freebsd   yes
 #   EUC-TW                    glibc aix hpux irix osf solaris
 #   BIG5                      glibc aix hpux osf solaris freebsd        yes
-#   BIG5HKSCS                 glibc
+#   BIG5-HKSCS                glibc
 #   GBK                       aix osf win32 dos
 #   GB18030                   glibc
-#   SJIS                      hpux osf solaris freebsd
+#   SHIFT_JIS                 hpux osf solaris freebsd                  yes
 #   JOHAB                     glibc win32
 #   TIS-620                   glibc aix hpux osf solaris
 #   VISCII                    glibc                                     yes
@@ -174,7 +174,7 @@ case "$os" in
 	echo "eucTW EUC-TW"
 	echo "hp15CN GB2312"
 	#echo "ccdc ?" # what is this?
-	echo "SJIS SJIS"
+	echo "SJIS SHIFT_JIS"
 	echo "utf8 UTF-8"
 	;;
     irix*)
@@ -209,7 +209,7 @@ case "$os" in
 	echo "GBK GBK"
 	echo "KSC5601 CP949"
 	echo "sdeckanji EUC-JP"
-	echo "SJIS SJIS"
+	echo "SJIS SHIFT_JIS"
 	echo "TACTIS TIS-620"
 	echo "UTF-8 UTF-8"
 	;;
@@ -230,7 +230,7 @@ case "$os" in
 	echo "cns11643 EUC-TW"
 	echo "5601 EUC-KR"
 	echo "eucJP EUC-JP"
-	echo "PCK SJIS"
+	echo "PCK SHIFT_JIS"
 	echo "TIS620.2533 TIS-620"
 	#echo "sun_eu_greek ?" # what is this?
 	echo "UTF-8 UTF-8"
@@ -266,8 +266,8 @@ case "$os" in
 	echo "zh_TW.Big5 BIG5"
 	echo "zh_CN.EUC GB2312"
 	echo "ja_JP.EUC EUC-JP"
-	echo "ja_JP.SJIS SJIS"
-	echo "ja_JP.Shift_JIS SJIS"
+	echo "ja_JP.SJIS SHIFT_JIS"
+	echo "ja_JP.Shift_JIS SHIFT_JIS"
 	echo "ko_KR.EUC EUC-KR"
 	;;
     beos*)

intl/dcgettext.c

@@ -1,19 +1,20 @@
 /* Implementation of the dcgettext(3) function.
    Copyright (C) 1995-1999, 2000, 2001 Free Software Foundation, Inc.
 
-   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)
+   This program is free software; you can redistribute it and/or modify it
+   under the terms of the GNU Library 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.
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+   Library 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.  */
+   You should have received a copy of the GNU Library 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.  */
 
 #ifdef HAVE_CONFIG_H
 # include <config.h>

intl/dcigettext.c

@@ -1,19 +1,20 @@
 /* Implementation of the internal dcigettext function.
    Copyright (C) 1995-1999, 2000, 2001 Free Software Foundation, Inc.
 
-   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)
+   This program is free software; you can redistribute it and/or modify it
+   under the terms of the GNU Library 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.
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+   Library 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.  */
+   You should have received a copy of the GNU Library 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.  */
 
 /* Tell glibc's <string.h> to provide a prototype for mempcpy().
    This must come before <config.h> because <config.h> may include
@@ -517,6 +518,7 @@ DCIGETTEXT (domainname, msgid1, msgid2, plural, n, category)
 	  /* We cannot get the current working directory.  Don't signal an
 	     error but simply return the default string.  */
 	  FREE_BLOCKS (block_list);
+	  __libc_rwlock_unlock (_nl_state_lock);
 	  __set_errno (saved_errno);
 	  return (plural == 0
 		  ? (char *) msgid1

intl/dcngettext.c

@@ -1,19 +1,20 @@
 /* Implementation of the dcngettext(3) function.
    Copyright (C) 1995-1999, 2000, 2001 Free Software Foundation, Inc.
 
-   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)
+   This program is free software; you can redistribute it and/or modify it
+   under the terms of the GNU Library 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.
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+   Library 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.  */
+   You should have received a copy of the GNU Library 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.  */
 
 #ifdef HAVE_CONFIG_H
 # include <config.h>

intl/dgettext.c

@@ -1,19 +1,20 @@
 /* Implementation of the dgettext(3) function.
    Copyright (C) 1995-1997, 2000, 2001 Free Software Foundation, Inc.
 
-   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)
+   This program is free software; you can redistribute it and/or modify it
+   under the terms of the GNU Library 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.
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+   Library 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.  */
+   You should have received a copy of the GNU Library 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.  */
 
 #ifdef HAVE_CONFIG_H
 # include <config.h>

intl/dngettext.c

@@ -1,19 +1,20 @@
 /* Implementation of the dngettext(3) function.
    Copyright (C) 1995-1997, 2000, 2001 Free Software Foundation, Inc.
 
-   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)
+   This program is free software; you can redistribute it and/or modify it
+   under the terms of the GNU Library 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.
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+   Library 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.  */
+   You should have received a copy of the GNU Library 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.  */
 
 #ifdef HAVE_CONFIG_H
 # include <config.h>

intl/explodename.c

@@ -1,19 +1,20 @@
 /* Copyright (C) 1995-1998, 2000, 2001 Free Software Foundation, Inc.
    Contributed by Ulrich Drepper <drepper@gnu.ai.mit.edu>, 1995.
 
-   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)
+   This program is free software; you can redistribute it and/or modify it
+   under the terms of the GNU Library 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.
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+   Library 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.  */
+   You should have received a copy of the GNU Library 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.  */
 
 #ifdef HAVE_CONFIG_H
 # include <config.h>

intl/finddomain.c

@@ -2,19 +2,20 @@
    Copyright (C) 1995-1999, 2000, 2001 Free Software Foundation, Inc.
    Written by Ulrich Drepper <drepper@gnu.org>, 1995.
 
-   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)
+   This program is free software; you can redistribute it and/or modify it
+   under the terms of the GNU Library 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.
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+   Library 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.  */
+   You should have received a copy of the GNU Library 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.  */
 
 #ifdef HAVE_CONFIG_H
 # include <config.h>

intl/gettext.c

@@ -1,19 +1,20 @@
 /* Implementation of gettext(3) function.
    Copyright (C) 1995, 1997, 2000, 2001 Free Software Foundation, Inc.
 
-   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)
+   This program is free software; you can redistribute it and/or modify it
+   under the terms of the GNU Library 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.
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+   Library 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.  */
+   You should have received a copy of the GNU Library 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.  */
 
 #ifdef HAVE_CONFIG_H
 # include <config.h>

intl/gettext.h

@@ -1,19 +1,20 @@
 /* Description of GNU message catalog format: general file layout.
    Copyright (C) 1995, 1997, 2000, 2001 Free Software Foundation, Inc.
 
-   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)
+   This program is free software; you can redistribute it and/or modify it
+   under the terms of the GNU Library 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.
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+   Library 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.  */
+   You should have received a copy of the GNU Library 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.  */
 
 #ifndef _GETTEXT_H
 #define _GETTEXT_H 1

intl/gettextP.h

@@ -2,19 +2,20 @@
    Copyright (C) 1995-1999, 2000, 2001 Free Software Foundation, Inc.
    Written by Ulrich Drepper <drepper@cygnus.com>, 1995.
 
-   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)
+   This program is free software; you can redistribute it and/or modify it
+   under the terms of the GNU Library 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.
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+   Library 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.  */
+   You should have received a copy of the GNU Library 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.  */
 
 #ifndef _GETTEXTP_H
 #define _GETTEXTP_H

intl/hash-string.h

@@ -1,19 +1,20 @@
 /* Description of GNU message catalog format: string hashing function.
    Copyright (C) 1995, 1997, 1998, 2000, 2001 Free Software Foundation, Inc.
 
-   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)
+   This program is free software; you can redistribute it and/or modify it
+   under the terms of the GNU Library 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.
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+   Library 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.  */
+   You should have received a copy of the GNU Library 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.  */
 
 /* @@ end of prolog @@ */
 

intl/intl-compat.c

@@ -2,19 +2,20 @@
    Library.
    Copyright (C) 1995, 2000, 2001 Software Foundation, Inc.
 
-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 free software; you can redistribute it and/or modify it
+   under the terms of the GNU Library 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.
+   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
+   Library 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.  */
+   You should have received a copy of the GNU Library 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.  */
 
 #ifdef HAVE_CONFIG_H
 # include <config.h>

intl/l10nflist.c

@@ -1,19 +1,20 @@
 /* Copyright (C) 1995-1999, 2000, 2001 Free Software Foundation, Inc.
    Contributed by Ulrich Drepper <drepper@gnu.ai.mit.edu>, 1995.
 
-   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)
+   This program is free software; you can redistribute it and/or modify it
+   under the terms of the GNU Library 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.
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+   Library 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.  */
+   You should have received a copy of the GNU Library 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.  */
 
 /* Tell glibc's <string.h> to provide a prototype for stpcpy().
    This must come before <config.h> because <config.h> may include

intl/libgettext.h

@@ -1,19 +1,20 @@
 /* Convenience header for conditional use of GNU <libintl.h>.
    Copyright (C) 1995-1998, 2000, 2001 Free Software Foundation, Inc.
 
-   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)
+   This program is free software; you can redistribute it and/or modify it
+   under the terms of the GNU Library 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.
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+   Library 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.  */
+   You should have received a copy of the GNU Library 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.  */
 
 #ifndef _LIBGETTEXT_H
 #define _LIBGETTEXT_H 1

intl/libgnuintl.h

@@ -1,19 +1,20 @@
 /* Message catalogs for internationalization.
    Copyright (C) 1995-1997, 2000, 2001 Free Software Foundation, Inc.
 
-   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)
+   This program is free software; you can redistribute it and/or modify it
+   under the terms of the GNU Library 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.
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+   Library 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.  */
+   You should have received a copy of the GNU Library 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.  */
 
 #ifndef _LIBINTL_H
 #define _LIBINTL_H	1

intl/linux-msg.sed

@@ -1,100 +0,0 @@
-# po2msg.sed - Convert Uniforum style .po file to Linux style .msg file
-# Copyright (C) 1995 Free Software Foundation, Inc.
-# Ulrich Drepper <drepper@gnu.ai.mit.edu>, 1995.
-#
-# 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., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
-#
-#
-# The first directive in the .msg should be the definition of the
-# message set number.  We use always set number 1.
-#
-1 {
-  i\
-$set 1 # Automatically created by po2msg.sed
-  h
-  s/.*/0/
-  x
-}
-#
-# Mitch's old catalog format does not allow comments.
-#
-# We copy the original message as a comment into the .msg file.
-#
-/^msgid/ {
-  s/msgid[ 	]*"//
-#
-# This does not work now with the new format.
-# /"$/! {
-#   s/\\$//
-#   s/$/ ... (more lines following)"/
-# }
-  x
-# The following nice solution is by
-# Bruno <Haible@ma2s2.mathematik.uni-karlsruhe.de>
-  td
-# Increment a decimal number in pattern space.
-# First hide trailing `9' digits.
-  :d
-  s/9\(_*\)$/_\1/
-  td
-# Assure at least one digit is available.
-  s/^\(_*\)$/0\1/
-# Increment the last digit.
-  s/8\(_*\)$/9\1/
-  s/7\(_*\)$/8\1/
-  s/6\(_*\)$/7\1/
-  s/5\(_*\)$/6\1/
-  s/4\(_*\)$/5\1/
-  s/3\(_*\)$/4\1/
-  s/2\(_*\)$/3\1/
-  s/1\(_*\)$/2\1/
-  s/0\(_*\)$/1\1/
-# Convert the hidden `9' digits to `0's.
-  s/_/0/g
-  x
-  G
-  s/\(.*\)"\n\([0-9]*\)/$ #\2 Original Message:(\1)/p
-}
-#
-# The .msg file contains, other then the .po file, only the translations
-# but each given a unique ID.  Starting from 1 and incrementing by 1 for
-# each message we assign them to the messages.
-# It is important that the .po file used to generate the cat-id-tbl.c file
-# (with po-to-tbl) is the same as the one used here.  (At least the order
-# of declarations must not be changed.)
-#
-/^msgstr/ {
-  s/msgstr[ 	]*"\(.*\)"/# \1/
-# Clear substitution flag.
-  tb
-# Append the next line.
-  :b
-  N
-# Look whether second part is continuation line.
-  s/\(.*\n\)"\(.*\)"/\1\2/
-# Yes, then branch.
-  ta
-  P
-  D
-# Note that D includes a jump to the start!!
-# We found a continuation line.  But before printing insert '\'.
-  :a
-  s/\(.*\)\(\n.*\)/\1\\\2/
-  P
-# We cannot use D here.
-  s/.*\n\(.*\)/\1/
-  tb
-}
-d

intl/loadinfo.h

@@ -2,19 +2,20 @@
    This file is part of the GNU C Library.
    Contributed by Ulrich Drepper <drepper@cygnus.com>, 1996.
 
-   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)
+   This program is free software; you can redistribute it and/or modify it
+   under the terms of the GNU Library 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.
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+   Library 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.  */
+   You should have received a copy of the GNU Library 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.  */
 
 #ifndef _LOADINFO_H
 #define _LOADINFO_H	1

intl/loadmsgcat.c

@@ -1,19 +1,20 @@
 /* Load needed message catalogs.
    Copyright (C) 1995-1999, 2000, 2001 Free Software Foundation, Inc.
 
-   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)
+   This program is free software; you can redistribute it and/or modify it
+   under the terms of the GNU Library 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.
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+   Library 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.  */
+   You should have received a copy of the GNU Library 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.  */
 
 /* Tell glibc's <string.h> to provide a prototype for mempcpy().
    This must come before <config.h> because <config.h> may include

intl/localcharset.c

@@ -75,13 +75,13 @@
 /* Pointer to the contents of the charset.alias file, if it has already been
    read, else NULL.  Its format is:
    ALIAS_1 '\0' CANONICAL_1 '\0' ... ALIAS_n '\0' CANONICAL_n '\0' '\0'  */
-static char * volatile charset_aliases;
+static const char * volatile charset_aliases;
 
 /* Return a pointer to the contents of the charset.alias file.  */
 static const char *
 get_charset_aliases ()
 {
-  char *cp;
+  const char *cp;
 
   cp = charset_aliases;
   if (cp == NULL)

intl/locale.alias

@@ -1,19 +1,20 @@
 # Locale name alias data base.
 # Copyright (C) 1996,1997,1998,1999,2000,2001 Free Software Foundation, Inc.
 #
-# 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)
+# This program is free software; you can redistribute it and/or modify it
+# under the terms of the GNU Library 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.
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+# Library 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.
+# You should have received a copy of the GNU Library 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.
 
 # The format of this file is the same as for the corresponding file of
 # the X Window System, which normally can be found in
@@ -46,7 +47,7 @@ galego		gl_ES.ISO-8859-1
 galician	gl_ES.ISO-8859-1
 german		de_DE.ISO-8859-1
 greek           el_GR.ISO-8859-7
-hebrew          iw_IL.ISO-8859-8
+hebrew          he_IL.ISO-8859-8
 hrvatski	hr_HR.ISO-8859-2
 hungarian       hu_HU.ISO-8859-2
 icelandic       is_IS.ISO-8859-1

intl/localealias.c

@@ -1,19 +1,20 @@
 /* Handle aliases for locale names.
    Copyright (C) 1995-1999, 2000, 2001 Free Software Foundation, Inc.
 
-   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)
+   This program is free software; you can redistribute it and/or modify it
+   under the terms of the GNU Library 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.
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+   Library 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.  */
+   You should have received a copy of the GNU Library 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.  */
 
 /* Tell glibc's <string.h> to provide a prototype for mempcpy().
    This must come before <config.h> because <config.h> may include

intl/ngettext.c

@@ -1,19 +1,20 @@
 /* Implementation of ngettext(3) function.
    Copyright (C) 1995, 1997, 2000, 2001 Free Software Foundation, Inc.
 
-   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)
+   This program is free software; you can redistribute it and/or modify it
+   under the terms of the GNU Library 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.
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+   Library 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.  */
+   You should have received a copy of the GNU Library 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.  */
 
 #ifdef HAVE_CONFIG_H
 # include <config.h>

intl/plural.c

@@ -23,19 +23,20 @@
    Copyright (C) 2000, 2001 Free Software Foundation, Inc.
    Written by Ulrich Drepper <drepper@cygnus.com>, 2000.
 
-   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)
+   This program is free software; you can redistribute it and/or modify it
+   under the terms of the GNU Library 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.
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+   Library 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.  */
+   You should have received a copy of the GNU Library 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.  */
 
 /* The bison generated parser uses alloca.  AIX 3 forces us to put this
    declaration at the beginning of the file.  The declaration in bison's
@@ -66,13 +67,13 @@
 #define YYLEX_PARAM	&((struct parse_args *) arg)->cp
 #define YYPARSE_PARAM	arg
 
-#line 52 "plural.y"
+#line 53 "plural.y"
 typedef union {
   unsigned long int num;
   enum operator op;
   struct expression *exp;
 } YYSTYPE;
-#line 58 "plural.y"
+#line 59 "plural.y"
 
 /* Prototypes for local functions.  */
 static struct expression *new_exp PARAMS ((int nargs, enum operator op,
@@ -234,8 +235,8 @@ static const short yyrhs[] = {    17,
 
 #if YYDEBUG != 0
 static const short yyrline[] = { 0,
-   177,   185,   189,   193,   197,   201,   205,   209,   213,   217,
-   221,   226
+   178,   186,   190,   194,   198,   202,   206,   210,   214,   218,
+   222,   227
 };
 #endif
 
@@ -845,7 +846,7 @@ yyreduce:
   switch (yyn) {
 
 case 1:
-#line 178 "plural.y"
+#line 179 "plural.y"
 {
 	    if (yyvsp[0].exp == NULL)
 	      YYABORT;
@@ -853,68 +854,68 @@ case 1:
 	  ;
     break;}
 case 2:
-#line 186 "plural.y"
+#line 187 "plural.y"
 {
 	    yyval.exp = new_exp_3 (qmop, yyvsp[-4].exp, yyvsp[-2].exp, yyvsp[0].exp);
 	  ;
     break;}
 case 3:
-#line 190 "plural.y"
+#line 191 "plural.y"
 {
 	    yyval.exp = new_exp_2 (lor, yyvsp[-2].exp, yyvsp[0].exp);
 	  ;
     break;}
 case 4:
-#line 194 "plural.y"
+#line 195 "plural.y"
 {
 	    yyval.exp = new_exp_2 (land, yyvsp[-2].exp, yyvsp[0].exp);
 	  ;
     break;}
 case 5:
-#line 198 "plural.y"
+#line 199 "plural.y"
 {
 	    yyval.exp = new_exp_2 (yyvsp[-1].op, yyvsp[-2].exp, yyvsp[0].exp);
 	  ;
     break;}
 case 6:
-#line 202 "plural.y"
+#line 203 "plural.y"
 {
 	    yyval.exp = new_exp_2 (yyvsp[-1].op, yyvsp[-2].exp, yyvsp[0].exp);
 	  ;
     break;}
 case 7:
-#line 206 "plural.y"
+#line 207 "plural.y"
 {
 	    yyval.exp = new_exp_2 (yyvsp[-1].op, yyvsp[-2].exp, yyvsp[0].exp);
 	  ;
     break;}
 case 8:
-#line 210 "plural.y"
+#line 211 "plural.y"
 {
 	    yyval.exp = new_exp_2 (yyvsp[-1].op, yyvsp[-2].exp, yyvsp[0].exp);
 	  ;
     break;}
 case 9:
-#line 214 "plural.y"
+#line 215 "plural.y"
 {
 	    yyval.exp = new_exp_1 (lnot, yyvsp[0].exp);
 	  ;
     break;}
 case 10:
-#line 218 "plural.y"
+#line 219 "plural.y"
 {
 	    yyval.exp = new_exp_0 (var);
 	  ;
     break;}
 case 11:
-#line 222 "plural.y"
+#line 223 "plural.y"
 {
 	    if ((yyval.exp = new_exp_0 (num)) != NULL)
 	      yyval.exp->val.num = yyvsp[0].num;
 	  ;
     break;}
 case 12:
-#line 227 "plural.y"
+#line 228 "plural.y"
 {
 	    yyval.exp = yyvsp[-1].exp;
 	  ;
@@ -1141,7 +1142,7 @@ yyerrhandle:
     }
   return 1;
 }
-#line 232 "plural.y"
+#line 233 "plural.y"
 
 
 void

intl/plural.y

@@ -3,19 +3,20 @@
    Copyright (C) 2000, 2001 Free Software Foundation, Inc.
    Written by Ulrich Drepper <drepper@cygnus.com>, 2000.
 
-   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)
+   This program is free software; you can redistribute it and/or modify it
+   under the terms of the GNU Library 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.
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+   Library 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.  */
+   You should have received a copy of the GNU Library 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.  */
 
 /* The bison generated parser uses alloca.  AIX 3 forces us to put this
    declaration at the beginning of the file.  The declaration in bison's

intl/po2tbl.sed.in

@@ -1,102 +0,0 @@
-# po2tbl.sed - Convert Uniforum style .po file to lookup table for catgets
-# Copyright (C) 1995 Free Software Foundation, Inc.
-# Ulrich Drepper <drepper@gnu.ai.mit.edu>, 1995.
-#
-# 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., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
-#
-1 {
-  i\
-/* Automatically generated by po2tbl.sed from @PACKAGE NAME@.pot.  */\
-\
-#if HAVE_CONFIG_H\
-# include <config.h>\
-#endif\
-\
-#include "libgettext.h"\
-\
-const struct _msg_ent _msg_tbl[] = {
-  h
-  s/.*/0/
-  x
-}
-#
-# Write msgid entries in C array form.
-#
-/^msgid/ {
-  s/msgid[ 	]*\(".*"\)/  {\1/
-  tb
-# Append the next line
-  :b
-  N
-# Look whether second part is continuation line.
-  s/\(.*\)"\(\n\)"\(.*"\)/\1\2\3/
-# Yes, then branch.
-  ta
-# Because we assume that the input file correctly formed the line
-# just read cannot be again be a msgid line.  So it's safe to ignore
-# it.
-  s/\(.*\)\n.*/\1/
-  bc
-# We found a continuation line.  But before printing insert '\'.
-  :a
-  s/\(.*\)\(\n.*\)/\1\\\2/
-  P
-# We cannot use D here.
-  s/.*\n\(.*\)/\1/
-# Some buggy seds do not clear the `successful substitution since last ``t'''
-# flag on `N', so we do a `t' here to clear it.
-  tb
-# Not reached
-  :c
-  x
-# The following nice solution is by
-# Bruno <Haible@ma2s2.mathematik.uni-karlsruhe.de>
-  td
-# Increment a decimal number in pattern space.
-# First hide trailing `9' digits.
-  :d
-  s/9\(_*\)$/_\1/
-  td
-# Assure at least one digit is available.
-  s/^\(_*\)$/0\1/
-# Increment the last digit.
-  s/8\(_*\)$/9\1/
-  s/7\(_*\)$/8\1/
-  s/6\(_*\)$/7\1/
-  s/5\(_*\)$/6\1/
-  s/4\(_*\)$/5\1/
-  s/3\(_*\)$/4\1/
-  s/2\(_*\)$/3\1/
-  s/1\(_*\)$/2\1/
-  s/0\(_*\)$/1\1/
-# Convert the hidden `9' digits to `0's.
-  s/_/0/g
-  x
-  G
-  s/\(.*\)\n\([0-9]*\)/\1, \2},/
-  s/\(.*\)"$/\1/
-  p
-}
-#
-# Last line.
-#
-$ {
-  i\
-};\
-
-  g
-  s/0*\(.*\)/int _msg_tbl_length = \1;/p
-}
-d

intl/textdomain.c

@@ -1,19 +1,20 @@
 /* Implementation of the textdomain(3) function.
    Copyright (C) 1995-1998, 2000, 2001 Free Software Foundation, Inc.
 
-   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)
+   This program is free software; you can redistribute it and/or modify it
+   under the terms of the GNU Library 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.
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+   Library 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.  */
+   You should have received a copy of the GNU Library 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.  */
 
 #ifdef HAVE_CONFIG_H
 # include <config.h>

intl/xopen-msg.sed

@@ -1,104 +0,0 @@
-# po2msg.sed - Convert Uniforum style .po file to X/Open style .msg file
-# Copyright (C) 1995 Free Software Foundation, Inc.
-# Ulrich Drepper <drepper@gnu.ai.mit.edu>, 1995.
-#
-# 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., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
-#
-#
-# The first directive in the .msg should be the definition of the
-# message set number.  We use always set number 1.
-#
-1 {
-  i\
-$set 1 # Automatically created by po2msg.sed
-  h
-  s/.*/0/
-  x
-}
-#
-# We copy all comments into the .msg file.  Perhaps they can help.
-#
-/^#/ s/^#[ 	]*/$ /p
-#
-# We copy the original message as a comment into the .msg file.
-#
-/^msgid/ {
-# Does not work now
-#  /"$/! {
-#    s/\\$//
-#    s/$/ ... (more lines following)"/
-#  }
-  s/^msgid[ 	]*"\(.*\)"$/$ Original Message: \1/
-  p
-}
-#
-# The .msg file contains, other then the .po file, only the translations
-# but each given a unique ID.  Starting from 1 and incrementing by 1 for
-# each message we assign them to the messages.
-# It is important that the .po file used to generate the cat-id-tbl.c file
-# (with po-to-tbl) is the same as the one used here.  (At least the order
-# of declarations must not be changed.)
-#
-/^msgstr/ {
-  s/msgstr[ 	]*"\(.*\)"/\1/
-  x
-# The following nice solution is by
-# Bruno <Haible@ma2s2.mathematik.uni-karlsruhe.de>
-  td
-# Increment a decimal number in pattern space.
-# First hide trailing `9' digits.
-  :d
-  s/9\(_*\)$/_\1/
-  td
-# Assure at least one digit is available.
-  s/^\(_*\)$/0\1/
-# Increment the last digit.
-  s/8\(_*\)$/9\1/
-  s/7\(_*\)$/8\1/
-  s/6\(_*\)$/7\1/
-  s/5\(_*\)$/6\1/
-  s/4\(_*\)$/5\1/
-  s/3\(_*\)$/4\1/
-  s/2\(_*\)$/3\1/
-  s/1\(_*\)$/2\1/
-  s/0\(_*\)$/1\1/
-# Convert the hidden `9' digits to `0's.
-  s/_/0/g
-  x
-# Bring the line in the format `<number> <message>'
-  G
-  s/^[^\n]*$/& /
-  s/\(.*\)\n\([0-9]*\)/\2 \1/
-# Clear flag from last substitution.
-  tb
-# Append the next line.
-  :b
-  N
-# Look whether second part is a continuation line.
-  s/\(.*\n\)"\(.*\)"/\1\2/
-# Yes, then branch.
-  ta
-  P
-  D
-# Note that `D' includes a jump to the start!!
-# We found a continuation line.  But before printing insert '\'.
-  :a
-  s/\(.*\)\(\n.*\)/\1\\\2/
-  P
-# We cannot use the sed command `D' here
-  s/.*\n\(.*\)/\1/
-  tb
-}
-d

m4/.cvsignore

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

m4/Makefile.am

@@ -0,0 +1,2 @@
+EXTRA_DIST =	codeset.m4 glibc21.m4 progtest.m4 gettext.m4 iconv.m4 \
+		lcmessage.m4

m4/aclocal_inc.m4

@@ -0,0 +1,6 @@
+dnl AM_ACLOCAL_INCLUDE(macrodir)
+AC_DEFUN([AM_ACLOCAL_INCLUDE],
+[
+	test -n "$ACLOCAL_FLAGS" && ACLOCAL="$ACLOCAL $ACLOCAL_FLAGS"
+	for k in $1 ; do ACLOCAL="$ACLOCAL -I $k" ; done
+])

m4/codeset.m4

@@ -0,0 +1,17 @@
+#serial AM1
+
+dnl From Bruno Haible.
+
+AC_DEFUN([NANO_AM_LANGINFO_CODESET],
+[
+  AC_CACHE_CHECK([for nl_langinfo and CODESET], am_cv_langinfo_codeset,
+    [AC_TRY_LINK([#include <langinfo.h>],
+      [char* cs = nl_langinfo(CODESET);],
+      am_cv_langinfo_codeset=yes,
+      am_cv_langinfo_codeset=no)
+    ])
+  if test $am_cv_langinfo_codeset = yes; then
+    AC_DEFINE(HAVE_LANGINFO_CODESET, 1,
+      [Define if you have <langinfo.h> and nl_langinfo(CODESET).])
+  fi
+])

m4/gettext.m4

@@ -0,0 +1,370 @@
+# Macro to add for using GNU gettext.
+# Ulrich Drepper <drepper@cygnus.com>, 1995.
+#
+# 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 or the GNU Library General Public License but which still want
+# to provide support for the GNU gettext functionality.
+# Please note that the actual code of the GNU gettext library is covered
+# by the GNU Library General Public License, and the rest of the GNU
+# gettext package package is covered by the GNU General Public License.
+# They are *not* in the public domain.
+
+# serial 10
+
+dnl Usage: NANO_AM_WITH_NLS([TOOLSYMBOL], [NEEDSYMBOL], [LIBDIR]).
+dnl If TOOLSYMBOL is specified and is 'use-libtool', then a libtool library
+dnl    $(top_builddir)/intl/libintl.la will be created (shared and/or static,
+dnl    depending on --{enable,disable}-{shared,static} and on the presence of
+dnl    AM-DISABLE-SHARED). Otherwise, 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 LIBDIR is used to find the intl libraries.  If empty,
+dnl    the value `$(top_builddir)/intl/' is used.
+dnl
+dnl The result of the configuration is one of three cases:
+dnl 1) GNU gettext, as included in the intl subdirectory, will be compiled
+dnl    and used.
+dnl    Catalog format: GNU --> install in $(datadir)
+dnl    Catalog extension: .mo after installation, .gmo in source tree
+dnl 2) GNU gettext has been found in the system's C library.
+dnl    Catalog format: GNU --> install in $(datadir)
+dnl    Catalog extension: .mo after installation, .gmo in source tree
+dnl 3) No internationalization, always use English msgid.
+dnl    Catalog format: none
+dnl    Catalog extension: none
+dnl The use of .gmo is historical (it was needed to avoid overwriting the
+dnl GNU format catalogs when building on a platform with an X/Open gettext),
+dnl but we keep it in order not to force irrelevant filename changes on the
+dnl maintainers.
+dnl
+AC_DEFUN([NANO_AM_WITH_NLS],
+  [AC_MSG_CHECKING([whether NLS is requested])
+    dnl Default is enabled NLS
+    AC_ARG_ENABLE(nls,
+      [  --disable-nls           do not use Native Language Support],
+      USE_NLS=$enableval, USE_NLS=yes)
+    AC_MSG_RESULT($USE_NLS)
+    AC_SUBST(USE_NLS)
+
+    BUILD_INCLUDED_LIBINTL=no
+    USE_INCLUDED_LIBINTL=no
+    INTLLIBS=
+
+    dnl If we use NLS figure out what method
+    if test "$USE_NLS" = "yes"; then
+      AC_DEFINE(ENABLE_NLS, 1,
+        [Define to 1 if translation of program messages to the user's native language
+   is requested.])
+      AC_MSG_CHECKING([whether included gettext is requested])
+      AC_ARG_WITH(included-gettext,
+        [  --with-included-gettext use the GNU gettext library included here],
+        nls_cv_force_use_gnu_gettext=$withval,
+        nls_cv_force_use_gnu_gettext=no)
+      AC_MSG_RESULT($nls_cv_force_use_gnu_gettext)
+
+      nls_cv_use_gnu_gettext="$nls_cv_force_use_gnu_gettext"
+      if test "$nls_cv_force_use_gnu_gettext" != "yes"; then
+        dnl User does not insist on using GNU NLS library.  Figure out what
+        dnl to use.  If GNU gettext is available we use this.  Else we have
+        dnl to fall back to GNU NLS library.
+	CATOBJEXT=NONE
+
+        dnl Add a version number to the cache macros.
+        define(gt_cv_func_gnugettext_libc, [gt_cv_func_gnugettext]ifelse([$2], need-ngettext, 2, 1)[_libc])
+        define(gt_cv_func_gnugettext_libintl, [gt_cv_func_gnugettext]ifelse([$2], need-ngettext, 2, 1)[_libintl])
+
+	AC_CHECK_HEADER(libintl.h,
+	  [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;],
+	       [bindtextdomain ("", "");
+return (int) gettext ("")]ifelse([$2], need-ngettext, [ + (int) ngettext ("", "", 0)], [])[ + _nl_msg_cat_cntr],
+	       gt_cv_func_gnugettext_libc=yes,
+	       gt_cv_func_gnugettext_libc=no)])
+
+	   if test "$gt_cv_func_gnugettext_libc" != "yes"; then
+	     AC_CACHE_CHECK([for GNU gettext in libintl],
+	       gt_cv_func_gnugettext_libintl,
+	       [gt_save_LIBS="$LIBS"
+		LIBS="$LIBS -lintl $LIBICONV"
+		AC_TRY_LINK([#include <libintl.h>
+extern int _nl_msg_cat_cntr;],
+		  [bindtextdomain ("", "");
+return (int) gettext ("")]ifelse([$2], need-ngettext, [ + (int) ngettext ("", "", 0)], [])[ + _nl_msg_cat_cntr],
+		  gt_cv_func_gnugettext_libintl=yes,
+		  gt_cv_func_gnugettext_libintl=no)
+		LIBS="$gt_save_LIBS"])
+	   fi
+
+	   dnl If an already present or preinstalled GNU gettext() is found,
+	   dnl use it.  But if this macro is used in GNU gettext, and GNU
+	   dnl gettext is already preinstalled in libintl, we update this
+	   dnl libintl.  (Cf. the install rule in intl/Makefile.in.)
+	   if test "$gt_cv_func_gnugettext_libc" = "yes" \
+	      || { test "$gt_cv_func_gnugettext_libintl" = "yes" \
+		   && test "$PACKAGE" != gettext; }; then
+	     AC_DEFINE(HAVE_GETTEXT, 1,
+               [Define if the GNU gettext() function is already present or preinstalled.])
+
+	     if test "$gt_cv_func_gnugettext_libintl" = "yes"; then
+	       dnl If iconv() is in a separate libiconv library, then anyone
+	       dnl linking with libintl{.a,.so} also needs to link with
+	       dnl libiconv.
+	       INTLLIBS="-lintl $LIBICONV"
+	     fi
+
+	     gt_save_LIBS="$LIBS"
+	     LIBS="$LIBS $INTLLIBS"
+	     AC_CHECK_FUNCS(dcgettext)
+	     LIBS="$gt_save_LIBS"
+
+	     dnl Search for GNU msgfmt in the PATH.
+	     NANO_AM_PATH_PROG_WITH_TEST(MSGFMT, msgfmt,
+	       [$ac_dir/$ac_word --statistics /dev/null >/dev/null 2>&1], :)
+	     AC_PATH_PROG(GMSGFMT, gmsgfmt, $MSGFMT)
+
+	     dnl Search for GNU xgettext in the PATH.
+	     NANO_AM_PATH_PROG_WITH_TEST(XGETTEXT, xgettext,
+	       [$ac_dir/$ac_word --omit-header /dev/null >/dev/null 2>&1], :)
+
+	     CATOBJEXT=.gmo
+	   fi
+	])
+
+        if test "$CATOBJEXT" = "NONE"; then
+	  dnl GNU gettext is not found in the C library.
+	  dnl Fall back on GNU gettext library.
+	  nls_cv_use_gnu_gettext=yes
+        fi
+      fi
+
+      if test "$nls_cv_use_gnu_gettext" = "yes"; then
+        dnl Mark actions used to generate GNU NLS library.
+        INTLOBJS="\$(GETTOBJS)"
+        NANO_AM_PATH_PROG_WITH_TEST(MSGFMT, msgfmt,
+	  [$ac_dir/$ac_word --statistics /dev/null >/dev/null 2>&1], :)
+        AC_PATH_PROG(GMSGFMT, gmsgfmt, $MSGFMT)
+        NANO_AM_PATH_PROG_WITH_TEST(XGETTEXT, xgettext,
+	  [$ac_dir/$ac_word --omit-header /dev/null >/dev/null 2>&1], :)
+        AC_SUBST(MSGFMT)
+	BUILD_INCLUDED_LIBINTL=yes
+	USE_INCLUDED_LIBINTL=yes
+        CATOBJEXT=.gmo
+	INTLLIBS="ifelse([$3],[],\$(top_builddir)/intl,[$3])/libintl.ifelse([$1], use-libtool, [l], [])a $LIBICONV"
+	LIBS=`echo " $LIBS " | sed -e 's/ -lintl / /' -e 's/^ //' -e 's/ $//'`
+      fi
+
+      dnl This could go away some day; the PATH_PROG_WITH_TEST already does it.
+      dnl Test whether we really found GNU msgfmt.
+      if test "$GMSGFMT" != ":"; then
+	dnl If it is no GNU msgfmt we define it as : so that the
+	dnl Makefiles still can work.
+	if $GMSGFMT --statistics /dev/null >/dev/null 2>&1; then
+	  : ;
+	else
+	  AC_MSG_RESULT(
+	    [found msgfmt program is not GNU msgfmt; ignore it])
+	  GMSGFMT=":"
+	fi
+      fi
+
+      dnl This could go away some day; the PATH_PROG_WITH_TEST already does it.
+      dnl Test whether we really found GNU xgettext.
+      if test "$XGETTEXT" != ":"; then
+	dnl If it is no GNU xgettext we define it as : so that the
+	dnl Makefiles still can work.
+	if $XGETTEXT --omit-header /dev/null >/dev/null 2>&1; then
+	  : ;
+	else
+	  AC_MSG_RESULT(
+	    [found xgettext program is not GNU xgettext; ignore it])
+	  XGETTEXT=":"
+	fi
+      fi
+
+      dnl We need to process the po/ directory.
+      POSUB=po
+    fi
+    AC_OUTPUT_COMMANDS(
+     [for ac_file in $CONFIG_FILES; do
+        # Support "outfile[:infile[:infile...]]"
+        case "$ac_file" in
+          *:*) ac_file=`echo "$ac_file"|sed 's%:.*%%'` ;;
+        esac
+        # PO directories have a Makefile.in generated from Makefile.in.in.
+        case "$ac_file" in */Makefile.in)
+          # Adjust a relative srcdir.
+          ac_dir=`echo "$ac_file"|sed 's%/[^/][^/]*$%%'`
+          ac_dir_suffix="/`echo "$ac_dir"|sed 's%^\./%%'`"
+          ac_dots=`echo "$ac_dir_suffix"|sed 's%/[^/]*%../%g'`
+          # In autoconf-2.13 it is called $ac_given_srcdir.
+          # In autoconf-2.50 it is called $srcdir.
+          test -n "$ac_given_srcdir" || ac_given_srcdir="$srcdir"
+          case "$ac_given_srcdir" in
+            .)  top_srcdir=`echo $ac_dots|sed 's%/$%%'` ;;
+            /*) top_srcdir="$ac_given_srcdir" ;;
+            *)  top_srcdir="$ac_dots$ac_given_srcdir" ;;
+          esac
+          if test -f "$ac_given_srcdir/$ac_dir/POTFILES.in"; then
+            rm -f "$ac_dir/POTFILES"
+            test -n "$as_me" && echo "$as_me: creating $ac_dir/POTFILES" || echo "creating $ac_dir/POTFILES"
+            sed -e "/^#/d" -e "/^[ 	]*\$/d" -e "s,.*,     $top_srcdir/& \\\\," -e "\$s/\(.*\) \\\\/\1/" < "$ac_given_srcdir/$ac_dir/POTFILES.in" > "$ac_dir/POTFILES"
+            test -n "$as_me" && echo "$as_me: creating $ac_dir/Makefile" || echo "creating $ac_dir/Makefile"
+            sed -e "/POTFILES =/r $ac_dir/POTFILES" "$ac_dir/Makefile.in" > "$ac_dir/Makefile"
+          fi
+          ;;
+        esac
+      done])
+
+
+    dnl If this is used in GNU gettext we have to set BUILD_INCLUDED_LIBINTL
+    dnl to 'yes' because some of the testsuite requires it.
+    if test "$PACKAGE" = gettext; then
+      BUILD_INCLUDED_LIBINTL=yes
+    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
+    dnl bison-1.26 because earlier versions generate a plural.c that doesn't
+    dnl compile.
+    dnl bison is only needed for the maintainer (who touches plural.y). But in
+    dnl order to avoid separate Makefiles or --enable-maintainer-mode, we put
+    dnl the rule in general Makefile. Now, some people carelessly touch the
+    dnl files or have a broken "make" program, hence the plural.c rule will
+    dnl sometimes fire. To avoid an error, defines BISON to ":" if it is not
+    dnl present or too old.
+    AC_CHECK_PROGS([INTLBISON], [bison])
+    if test -z "$INTLBISON"; then
+      ac_verc_fail=yes
+    else
+      dnl Found it, now check the version.
+      AC_MSG_CHECKING([version of bison])
+changequote(<<,>>)dnl
+      ac_prog_version=`$INTLBISON --version 2>&1 | sed -n 's/^.*GNU Bison.* \([0-9]*\.[0-9.]*\).*$/\1/p'`
+      case $ac_prog_version in
+        '') ac_prog_version="v. ?.??, bad"; ac_verc_fail=yes;;
+        1.2[6-9]* | 1.[3-9][0-9]* | [2-9].*)
+changequote([,])dnl
+           ac_prog_version="$ac_prog_version, ok"; ac_verc_fail=no;;
+        *) ac_prog_version="$ac_prog_version, bad"; ac_verc_fail=yes;;
+      esac
+      AC_MSG_RESULT([$ac_prog_version])
+    fi
+    if test $ac_verc_fail = yes; then
+      INTLBISON=:
+    fi
+
+    dnl These rules are solely for the distribution goal.  While doing this
+    dnl we only have to keep exactly one list of the available catalogs
+    dnl in configure.in.
+    for lang in $ALL_LINGUAS; do
+      GMOFILES="$GMOFILES $lang.gmo"
+      POFILES="$POFILES $lang.po"
+    done
+
+    dnl Make all variables we use known to autoconf.
+    AC_SUBST(BUILD_INCLUDED_LIBINTL)
+    AC_SUBST(USE_INCLUDED_LIBINTL)
+    AC_SUBST(CATALOGS)
+    AC_SUBST(CATOBJEXT)
+    AC_SUBST(GMOFILES)
+    AC_SUBST(INTLLIBS)
+    AC_SUBST(INTLOBJS)
+    AC_SUBST(POFILES)
+    AC_SUBST(POSUB)
+
+    dnl For backward compatibility. Some configure.ins may be using this.
+    nls_cv_header_intl=
+    nls_cv_header_libgt=
+
+    dnl For backward compatibility. Some Makefiles may be using this.
+    DATADIRNAME=share
+    AC_SUBST(DATADIRNAME)
+
+    dnl For backward compatibility. Some Makefiles may be using this.
+    INSTOBJEXT=.mo
+    AC_SUBST(INSTOBJEXT)
+
+    dnl For backward compatibility. Some Makefiles may be using this.
+    GENCAT=gencat
+    AC_SUBST(GENCAT)
+  ])
+
+dnl Usage: Just like AM_WITH_NLS, which see.
+AC_DEFUN([NANO_AM_GNU_GETTEXT],
+  [AC_REQUIRE([AC_PROG_MAKE_SET])dnl
+   AC_REQUIRE([AC_PROG_CC])dnl
+   AC_REQUIRE([AC_CANONICAL_HOST])dnl
+   AC_REQUIRE([AC_PROG_RANLIB])dnl
+   AC_REQUIRE([AC_ISC_POSIX])dnl
+   AC_REQUIRE([AC_HEADER_STDC])dnl
+   AC_REQUIRE([AC_C_CONST])dnl
+   AC_REQUIRE([AC_C_INLINE])dnl
+   AC_REQUIRE([AC_TYPE_OFF_T])dnl
+   AC_REQUIRE([AC_TYPE_SIZE_T])dnl
+   AC_REQUIRE([AC_FUNC_ALLOCA])dnl
+   AC_REQUIRE([AC_FUNC_MMAP])dnl
+   AC_REQUIRE([nano_jm_GLIBC21])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])
+   AC_CHECK_FUNCS([feof_unlocked fgets_unlocked getcwd getegid geteuid \
+getgid getuid mempcpy munmap putenv setenv setlocale stpcpy strchr strcasecmp \
+strdup strtoul tsearch __argz_count __argz_stringify __argz_next])
+
+   NANO_AM_ICONV
+   NANO_AM_LANGINFO_CODESET
+   NANO_AM_LC_MESSAGES
+   NANO_AM_WITH_NLS([$1],[$2],[$3])
+
+   if test "x$CATOBJEXT" != "x"; then
+     if test "x$ALL_LINGUAS" = "x"; then
+       LINGUAS=
+     else
+       AC_MSG_CHECKING(for catalogs to be installed)
+       NEW_LINGUAS=
+       for presentlang in $ALL_LINGUAS; do
+         useit=no
+         for desiredlang in ${LINGUAS-$ALL_LINGUAS}; do
+           # Use the presentlang catalog if desiredlang is
+           #   a. equal to presentlang, or
+           #   b. a variant of presentlang (because in this case,
+           #      presentlang can be used as a fallback for messages
+           #      which are not translated in the desiredlang catalog).
+           case "$desiredlang" in
+             "$presentlang"*) useit=yes;;
+           esac
+         done
+         if test $useit = yes; then
+           NEW_LINGUAS="$NEW_LINGUAS $presentlang"
+         fi
+       done
+       LINGUAS=$NEW_LINGUAS
+       AC_MSG_RESULT($LINGUAS)
+     fi
+
+     dnl Construct list of names of catalog files to be constructed.
+     if test -n "$LINGUAS"; then
+       for lang in $LINGUAS; do CATALOGS="$CATALOGS $lang$CATOBJEXT"; done
+     fi
+   fi
+
+   dnl If the AC_CONFIG_AUX_DIR macro for autoconf is used we possibly
+   dnl find the mkinstalldirs script in another subdir but $(top_srcdir).
+   dnl Try to locate is.
+   MKINSTALLDIRS=
+   if test -n "$ac_aux_dir"; then
+     MKINSTALLDIRS="$ac_aux_dir/mkinstalldirs"
+   fi
+   if test -z "$MKINSTALLDIRS"; then
+     MKINSTALLDIRS="\$(top_srcdir)/mkinstalldirs"
+   fi
+   AC_SUBST(MKINSTALLDIRS)
+
+   dnl Enable libtool support if the surrounding package wishes it.
+   INTL_LIBTOOL_SUFFIX_PREFIX=ifelse([$1], use-libtool, [l], [])
+   AC_SUBST(INTL_LIBTOOL_SUFFIX_PREFIX)
+  ])

m4/glibc21.m4

@@ -0,0 +1,26 @@
+#serial 2
+
+# Test for the GNU C Library, version 2.1 or newer.
+# From Bruno Haible.
+
+AC_DEFUN([nano_jm_GLIBC21],
+  [
+    AC_CACHE_CHECK(whether we are using the GNU C Library 2.1 or newer,
+      ac_cv_gnu_library_2_1,
+      [AC_EGREP_CPP([Lucky GNU user],
+	[
+#include <features.h>
+#ifdef __GNU_LIBRARY__
+ #if (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 1) || (__GLIBC__ > 2)
+  Lucky GNU user
+ #endif
+#endif
+	],
+	ac_cv_gnu_library_2_1=yes,
+	ac_cv_gnu_library_2_1=no)
+      ]
+    )
+    AC_SUBST(GLIBC21)
+    GLIBC21="$ac_cv_gnu_library_2_1"
+  ]
+)

m4/iconv.m4

@@ -0,0 +1,69 @@
+#serial AM2
+
+dnl From Bruno Haible.
+
+AC_DEFUN([NANO_AM_ICONV],
+[
+  dnl Some systems have iconv in libc, some have it in libiconv (OSF/1 and
+  dnl those with the standalone portable GNU libiconv installed).
+
+  AC_ARG_WITH([libiconv-prefix],
+[  --with-libiconv-prefix=DIR  search for libiconv in DIR/include and DIR/lib], [
+    for dir in `echo "$withval" | tr : ' '`; do
+      if test -d $dir/include; then CPPFLAGS="$CPPFLAGS -I$dir/include"; fi
+      if test -d $dir/lib; then LDFLAGS="$LDFLAGS -L$dir/lib"; fi
+    done
+   ])
+
+  AC_CACHE_CHECK(for iconv, am_cv_func_iconv, [
+    am_cv_func_iconv="no, consider installing GNU libiconv"
+    am_cv_lib_iconv=no
+    AC_TRY_LINK([#include <stdlib.h>
+#include <iconv.h>],
+      [iconv_t cd = iconv_open("","");
+       iconv(cd,NULL,NULL,NULL,NULL);
+       iconv_close(cd);],
+      am_cv_func_iconv=yes)
+    if test "$am_cv_func_iconv" != yes; then
+      am_save_LIBS="$LIBS"
+      LIBS="$LIBS -liconv"
+      AC_TRY_LINK([#include <stdlib.h>
+#include <iconv.h>],
+        [iconv_t cd = iconv_open("","");
+         iconv(cd,NULL,NULL,NULL,NULL);
+         iconv_close(cd);],
+        am_cv_lib_iconv=yes
+        am_cv_func_iconv=yes)
+      LIBS="$am_save_LIBS"
+    fi
+  ])
+  if test "$am_cv_func_iconv" = yes; then
+    AC_DEFINE(HAVE_ICONV, 1, [Define if you have the iconv() function.])
+    AC_MSG_CHECKING([for iconv declaration])
+    AC_CACHE_VAL(am_cv_proto_iconv, [
+      AC_TRY_COMPILE([
+#include <stdlib.h>
+#include <iconv.h>
+extern
+#ifdef __cplusplus
+"C"
+#endif
+#if defined(__STDC__) || defined(__cplusplus)
+size_t iconv (iconv_t cd, char * *inbuf, size_t *inbytesleft, char * *outbuf, size_t *outbytesleft);
+#else
+size_t iconv();
+#endif
+], [], am_cv_proto_iconv_arg1="", am_cv_proto_iconv_arg1="const")
+      am_cv_proto_iconv="extern size_t iconv (iconv_t cd, $am_cv_proto_iconv_arg1 char * *inbuf, size_t *inbytesleft, char * *outbuf, size_t *outbytesleft);"])
+    am_cv_proto_iconv=`echo "[$]am_cv_proto_iconv" | tr -s ' ' | sed -e 's/( /(/'`
+    AC_MSG_RESULT([$]{ac_t:-
+         }[$]am_cv_proto_iconv)
+    AC_DEFINE_UNQUOTED(ICONV_CONST, $am_cv_proto_iconv_arg1,
+      [Define as const if the declaration of iconv() needs const.])
+  fi
+  LIBICONV=
+  if test "$am_cv_lib_iconv" = yes; then
+    LIBICONV="-liconv"
+  fi
+  AC_SUBST(LIBICONV)
+])

m4/lcmessage.m4

@@ -0,0 +1,24 @@
+# Check whether LC_MESSAGES is available in <locale.h>.
+# Ulrich Drepper <drepper@cygnus.com>, 1995.
+#
+# 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 or the GNU Library General Public License but which still want
+# to provide support for the GNU gettext functionality.
+# Please note that the actual code of the GNU gettext library is covered
+# by the GNU Library General Public License, and the rest of the GNU
+# gettext package package is covered by the GNU General Public License.
+# They are *not* in the public domain.
+
+# serial 2
+
+AC_DEFUN([NANO_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],
+       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])

m4/progtest.m4

@@ -0,0 +1,51 @@
+# Search path for a program which passes the given test.
+# Ulrich Drepper <drepper@cygnus.com>, 1996.
+#
+# 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 or the GNU Library General Public License but which still want
+# to provide support for the GNU gettext functionality.
+# Please note that the actual code of the GNU gettext library is covered
+# by the GNU Library General Public License, and the rest of the GNU
+# gettext package package is covered by the GNU General Public License.
+# They are *not* in the public domain.
+
+# serial 2
+
+dnl NANO_AM_PATH_PROG_WITH_TEST(VARIABLE, PROG-TO-CHECK-FOR,
+dnl   TEST-PERFORMED-ON-FOUND_PROGRAM [, VALUE-IF-NOT-FOUND [, PATH]])
+AC_DEFUN([NANO_AM_PATH_PROG_WITH_TEST],
+[# Extract the first word of "$2", so it can be a program name with args.
+set dummy $2; ac_word=[$]2
+AC_MSG_CHECKING([for $ac_word])
+AC_CACHE_VAL(ac_cv_path_$1,
+[case "[$]$1" in
+  /*)
+  ac_cv_path_$1="[$]$1" # Let the user override the test with a path.
+  ;;
+  *)
+  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS="${IFS}:"
+  for ac_dir in ifelse([$5], , $PATH, [$5]); do
+    test -z "$ac_dir" && ac_dir=.
+    if test -f $ac_dir/$ac_word; then
+      if [$3]; then
+	ac_cv_path_$1="$ac_dir/$ac_word"
+	break
+      fi
+    fi
+  done
+  IFS="$ac_save_ifs"
+dnl If no 4th arg is given, leave the cache variable unset,
+dnl so AC_PATH_PROGS will keep looking.
+ifelse([$4], , , [  test -z "[$]ac_cv_path_$1" && ac_cv_path_$1="$4"
+])dnl
+  ;;
+esac])dnl
+$1="$ac_cv_path_$1"
+if test ifelse([$4], , [-n "[$]$1"], ["[$]$1" != "$4"]); then
+  AC_MSG_RESULT([$]$1)
+else
+  AC_MSG_RESULT(no)
+fi
+AC_SUBST($1)dnl
+])

missing

@@ -1,190 +0,0 @@
-#! /bin/sh
-# Common stub for a few missing GNU programs while installing.
-# Copyright (C) 1996, 1997 Free Software Foundation, Inc.
-# Franc,ois Pinard <pinard@iro.umontreal.ca>, 1996.
-
-# 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., 59 Temple Place - Suite 330, Boston, MA
-# 02111-1307, USA.
-
-if test $# -eq 0; then
-  echo 1>&2 "Try \`$0 --help' for more information"
-  exit 1
-fi
-
-case "$1" in
-
-  -h|--h|--he|--hel|--help)
-    echo "\
-$0 [OPTION]... PROGRAM [ARGUMENT]...
-
-Handle \`PROGRAM [ARGUMENT]...' for when PROGRAM is missing, or return an
-error status if there is no known handling for PROGRAM.
-
-Options:
-  -h, --help      display this help and exit
-  -v, --version   output version information and exit
-
-Supported PROGRAM values:
-  aclocal      touch file \`aclocal.m4'
-  autoconf     touch file \`configure'
-  autoheader   touch file \`config.h.in'
-  automake     touch all \`Makefile.in' files
-  bison        create \`y.tab.[ch]', if possible, from existing .[ch]
-  flex         create \`lex.yy.c', if possible, from existing .c
-  lex          create \`lex.yy.c', if possible, from existing .c
-  makeinfo     touch the output file
-  yacc         create \`y.tab.[ch]', if possible, from existing .[ch]"
-    ;;
-
-  -v|--v|--ve|--ver|--vers|--versi|--versio|--version)
-    echo "missing - GNU libit 0.0"
-    ;;
-
-  -*)
-    echo 1>&2 "$0: Unknown \`$1' option"
-    echo 1>&2 "Try \`$0 --help' for more information"
-    exit 1
-    ;;
-
-  aclocal)
-    echo 1>&2 "\
-WARNING: \`$1' is missing on your system.  You should only need it if
-         you modified \`acinclude.m4' or \`configure.in'.  You might want
-         to install the \`Automake' and \`Perl' packages.  Grab them from
-         any GNU archive site."
-    touch aclocal.m4
-    ;;
-
-  autoconf)
-    echo 1>&2 "\
-WARNING: \`$1' is missing on your system.  You should only need it if
-         you modified \`configure.in'.  You might want to install the
-         \`Autoconf' and \`GNU m4' packages.  Grab them from any GNU
-         archive site."
-    touch configure
-    ;;
-
-  autoheader)
-    echo 1>&2 "\
-WARNING: \`$1' is missing on your system.  You should only need it if
-         you modified \`acconfig.h' or \`configure.in'.  You might want
-         to install the \`Autoconf' and \`GNU m4' packages.  Grab them
-         from any GNU archive site."
-    files=`sed -n 's/^[ ]*A[CM]_CONFIG_HEADER(\([^)]*\)).*/\1/p' configure.in`
-    test -z "$files" && files="config.h"
-    touch_files=
-    for f in $files; do
-      case "$f" in
-      *:*) touch_files="$touch_files "`echo "$f" |
-				       sed -e 's/^[^:]*://' -e 's/:.*//'`;;
-      *) touch_files="$touch_files $f.in";;
-      esac
-    done
-    touch $touch_files
-    ;;
-
-  automake)
-    echo 1>&2 "\
-WARNING: \`$1' is missing on your system.  You should only need it if
-         you modified \`Makefile.am', \`acinclude.m4' or \`configure.in'.
-         You might want to install the \`Automake' and \`Perl' packages.
-         Grab them from any GNU archive site."
-    find . -type f -name Makefile.am -print |
-	   sed 's/\.am$/.in/' |
-	   while read f; do touch "$f"; done
-    ;;
-
-  bison|yacc)
-    echo 1>&2 "\
-WARNING: \`$1' is missing on your system.  You should only need it if
-         you modified a \`.y' file.  You may need the \`Bison' package
-         in order for those modifications to take effect.  You can get
-         \`Bison' from any GNU archive site."
-    rm -f y.tab.c y.tab.h
-    if [ $# -ne 1 ]; then
-        eval LASTARG="\${$#}"
-	case "$LASTARG" in
-	*.y)
-	    SRCFILE=`echo "$LASTARG" | sed 's/y$/c/'`
-	    if [ -f "$SRCFILE" ]; then
-	         cp "$SRCFILE" y.tab.c
-	    fi
-	    SRCFILE=`echo "$LASTARG" | sed 's/y$/h/'`
-	    if [ -f "$SRCFILE" ]; then
-	         cp "$SRCFILE" y.tab.h
-	    fi
-	  ;;
-	esac
-    fi
-    if [ ! -f y.tab.h ]; then
-	echo >y.tab.h
-    fi
-    if [ ! -f y.tab.c ]; then
-	echo 'main() { return 0; }' >y.tab.c
-    fi
-    ;;
-
-  lex|flex)
-    echo 1>&2 "\
-WARNING: \`$1' is missing on your system.  You should only need it if
-         you modified a \`.l' file.  You may need the \`Flex' package
-         in order for those modifications to take effect.  You can get
-         \`Flex' from any GNU archive site."
-    rm -f lex.yy.c
-    if [ $# -ne 1 ]; then
-        eval LASTARG="\${$#}"
-	case "$LASTARG" in
-	*.l)
-	    SRCFILE=`echo "$LASTARG" | sed 's/l$/c/'`
-	    if [ -f "$SRCFILE" ]; then
-	         cp "$SRCFILE" lex.yy.c
-	    fi
-	  ;;
-	esac
-    fi
-    if [ ! -f lex.yy.c ]; then
-	echo 'main() { return 0; }' >lex.yy.c
-    fi
-    ;;
-
-  makeinfo)
-    echo 1>&2 "\
-WARNING: \`$1' is missing on your system.  You should only need it if
-         you modified a \`.texi' or \`.texinfo' file, or any other file
-         indirectly affecting the aspect of the manual.  The spurious
-         call might also be the consequence of using a buggy \`make' (AIX,
-         DU, IRIX).  You might want to install the \`Texinfo' package or
-         the \`GNU make' package.  Grab either from any GNU archive site."
-    file=`echo "$*" | sed -n 's/.*-o \([^ ]*\).*/\1/p'`
-    if test -z "$file"; then
-      file=`echo "$*" | sed 's/.* \([^ ]*\) *$/\1/'`
-      file=`sed -n '/^@setfilename/ { s/.* \([^ ]*\) *$/\1/; p; q; }' $file`
-    fi
-    touch $file
-    ;;
-
-  *)
-    echo 1>&2 "\
-WARNING: \`$1' is needed, and you do not seem to have it handy on your
-         system.  You might have modified some files without having the
-         proper tools for further handling them.  Check the \`README' file,
-         it often tells you about the needed prerequirements for installing
-         this package.  You may also peek at any GNU archive site, in case
-         some other package would contain this missing \`$1' program."
-    exit 1
-    ;;
-esac
-
-exit 0

mkinstalldirs

@@ -1,40 +0,0 @@
-#! /bin/sh
-# mkinstalldirs --- make directory hierarchy
-# Author: Noah Friedman <friedman@prep.ai.mit.edu>
-# Created: 1993-05-16
-# Public domain
-
-# $Id$
-
-errstatus=0
-
-for file
-do
-   set fnord `echo ":$file" | sed -ne 's/^:\//#/;s/^://;s/\// /g;s/^#/\//;p'`
-   shift
-
-   pathcomp=
-   for d
-   do
-     pathcomp="$pathcomp$d"
-     case "$pathcomp" in
-       -* ) pathcomp=./$pathcomp ;;
-     esac
-
-     if test ! -d "$pathcomp"; then
-        echo "mkdir $pathcomp"
-
-        mkdir "$pathcomp" || lasterr=$?
-
-        if test ! -d "$pathcomp"; then
-  	  errstatus=$lasterr
-        fi
-     fi
-
-     pathcomp="$pathcomp/"
-   done
-done
-
-exit $errstatus
-
-# mkinstalldirs ends here

move.c

@@ -2,10 +2,10 @@
 /**************************************************************************
  *   move.c                                                               *
  *                                                                        *
- *   Copyright (C) 1999 Chris Allegretta                                  *
+ *   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 1, or (at your option)  *
+ *   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,      *
@@ -34,20 +34,24 @@
 #define _(string) (string)
 #endif
 
-void page_down_center(void)
+void page_down(void)
 {
-    if (editbot != filebot) {
-	edit_update(editbot->next, CENTER);
-	center_cursor();
+    if (!ISSET(SMOOTHSCROLL)) {
+	if (editbot != filebot) {
+	    edit_update(editbot->next, CENTER);
+	    center_cursor();
+	} else {
+	    while (current != filebot)
+		current = current->next;
+	    edit_update(current, CENTER);
+	}
     } else {
-	while (current != filebot)
-	    current = current->next;
-	edit_update(current, CENTER);
+	    edit_update(editbot, NONE);
     }
     update_cursor();
 }
 
-int page_down(void)
+int do_page_down(void)
 {
     wrap_reset();
     current_x = 0;
@@ -124,7 +128,7 @@ int do_down(void)
     if (current_y < editwinrows - 1 && current != editbot)
 	current_y++;
     else
-	page_down_center();
+	page_down();
 
     update_cursor();
     update_line(current->prev, 0);
@@ -134,11 +138,23 @@ int do_down(void)
     return 1;
 }
 
-void page_up_center(void)
+void page_up(void)
 {
     if (edittop != fileage) {
-	edit_update(edittop, CENTER);
-	center_cursor();
+	if (!ISSET(SMOOTHSCROLL)) {
+	    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 {
+	    edit_update(edittop->prev, NONE);
+	}
     } else
 	current_y = 0;
 
@@ -146,7 +162,7 @@ void page_up_center(void)
 
 }
 
-int page_up(void)
+int do_page_up(void)
 {
    int i;
 
@@ -184,7 +200,7 @@ int do_up(void)
     if (current_y > 0)
 	current_y--;
     else
-	page_up_center();
+	page_up();
 
     update_cursor();
     update_line(current->next, 0);

nano.1

@@ -1,14 +1,12 @@
 .\" Hey, EMACS: -*- nroff -*-
-.\" nano.1 is copyright 1999-2000 by
+.\" 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.
 .\"
-.\" First parameter, NAME, should be all caps
-.\" Second parameter, SECTION, should be 1-8, maybe w/ subsection
-.\" other parameters are allowed: see man(7), man(1)
-.TH NANO 1 "April 30, 2001"
+.\" $Id$
+.TH NANO 1 "January 3, 2002"
 .\" Please adjust this date whenever revising the manpage.
 .\"
 .SH NAME
@@ -33,25 +31,46 @@ also implements some missing (or disabled by default) features in Pico,
 such as "search and replace" and "goto line number".
 .SH OPTIONS
 .TP
+.B \-D (\-\-dos)
+Write file in DOS format.
+.TP
 .B \-F (\-\-multibuffer)
 Enable multiple file buffers (if available).
 .TP
-.B \-T (\-\-tabsize)
-Set the size (width) of a tab.
+.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 [str] (\-\-quotestr=[str])
+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 behaviour.
+.TP
+.B \-T [num] (\-\-tabsize=[num])
+Set the size (width) of a tab.
+.TP
 .B \-V (\-\-version)
 Show the current version number and author.
 .TP
-.B \-h (\-\-help)
-Display a summary of command line options.
-.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.
@@ -66,18 +85,21 @@ a new file, do not follow it.  Good for editing files in /tmp, perhaps?
 .B \-m (\-\-mouse)
 Enable mouse support (if available for your system).
 .TP
+.B \-o [dir] (\-\-operatingdir=[dir])
+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 (\-\-fill)
+.B \-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.
 .TP
-.B \-s (\-\-speller)
+.B \-s [prog] (\-\-speller=[prog])
 Enable alternative spell checker command.
 .TP
 .B \-t (\-\-tempfile)
@@ -95,7 +117,7 @@ Disable help screen at bottom of editor.
 .B \-z (\-\-suspend)
 Enable suspend ability.
 .TP
-.B \-b, \-e, \-f
+.B \-a, \-b, \-e, \-f, \-g, \-j
 Ignored, for compatibility with Pico.
 .TP
 .B \+LINE
@@ -105,8 +127,9 @@ Nano will try to dump the buffer into an emergency file in some cases.
 Mainly, this will happen if Nano 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. Nano will \fBnot\fP write this file if a previous one
-exists in the current directory.
+current filename. In multibuffer mode, nano will write all the open buffers to
+the respective emergency files. Nano will \fBnot\fP write this file if a
+previous one exists in the current directory.
 .SH BUGS
 Please send any comments or bug reports to
 .br
@@ -114,13 +137,14 @@ Please send any comments or bug reports to
 .br
 The nano mailing list is available from
 .br
-.B nano-devel@lists.sourceforge.net.
-To subscribe, email to nano-devel-request@lists.sourceforge.net with a
+.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 for details).
+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/Linux system (but may be
 used by others).

nano.1.html

@@ -3,7 +3,7 @@ Content-type: text/html
 <HTML><HEAD><TITLE>Manpage of NANO</TITLE>
 </HEAD><BODY>
 <H1>NANO</H1>
-Section: User Commands  (1)<BR>Updated: April 30, 2001<BR><A HREF="#index">Index</A>
+Section: User Commands  (1)<BR>Updated: January 3, 2002<BR><A HREF="#index">Index</A>
 <A HREF="http://localhost/cgi-bin/man/man2html">Return to Main Contents</A><HR>
 
 
@@ -44,31 +44,58 @@ such as &quot;search and replace&quot; and &quot;goto line number&quot;.
 <H2>OPTIONS</H2>
 
 <DL COMPACT>
+<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>-T (--tabsize)</B>
+<DT><B>-K (--keypad)</B>
 
 <DD>
-Set the size (width) of a tab.
+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 [str] (--quotestr=[str])</B>
+
+<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 behaviour.
+<DT><B>-T [num] (--tabsize=[num])</B>
+
+<DD>
+Set the size (width) of a tab.
 <DT><B>-V (--version)</B>
 
 <DD>
 Show the current version number and author.
-<DT><B>-h (--help)</B>
-
-<DD>
-Display a summary of command line options.
 <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>
@@ -87,20 +114,24 @@ a new file, do not follow it.  Good for editing files in /tmp, perhaps?
 
 <DD>
 Enable mouse support (if available for your system).
+<DT><B>-o [dir] (--operatingdir=[dir])</B>
+
+<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 (--fill)</B>
+<DT><B>-r [#cols] (--fill=[#cols])</B>
 
 <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 (--speller)</B>
+<DT><B>-s [prog] (--speller=[prog])</B>
 
 <DD>
 Enable alternative spell checker command.
@@ -124,7 +155,7 @@ Disable help screen at bottom of editor.
 
 <DD>
 Enable suspend ability.
-<DT><B>-b, -e, -f</B>
+<DT><B>-a, -b, -e, -f, -g, -j</B>
 
 <DD>
 Ignored, for compatibility with Pico.
@@ -140,8 +171,9 @@ Nano will try to dump the buffer into an emergency file in some cases.
 Mainly, this will happen if Nano 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. Nano will <B>not</B> write this file if a previous one
-exists in the current directory.
+current filename. In multibuffer mode, nano will write all the open buffers to
+the respective emergency files. Nano will <B>not</B> write this file if a
+previous one exists in the current directory.
 <A NAME="lbAG">&nbsp;</A>
 <H2>BUGS</H2>
 
@@ -155,9 +187,9 @@ Please send any comments or bug reports to
 The nano mailing list is available from
 <BR>
 
-<B><A HREF="mailto:nano-devel@lists.sourceforge.net">nano-devel@lists.sourceforge.net</A>.</B>
+<B><A HREF="mailto:nano-devel@gnu.org">nano-devel@gnu.org</A>.</B>
 
-To subscribe, email to <A HREF="mailto:nano-devel-request@lists.sourceforge.net">nano-devel-request@lists.sourceforge.net</A> with a
+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>
@@ -166,7 +198,8 @@ subject of &quot;subscribe&quot;.
 <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 for details).
+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/Linux system (but may be
 used by others).
@@ -188,6 +221,6 @@ used by others).
 This document was created by
 <A HREF="http://localhost/cgi-bin/man/man2html">man2html</A>,
 using the manual pages.<BR>
-Time: 03:54:23 GMT, July 15, 2001
+Time: 12:14:20 GMT, March 04, 2002
 </BODY>
 </HTML>

nano.h

@@ -2,10 +2,10 @@
 /**************************************************************************
  *   nano.h                                                               *
  *                                                                        *
- *   Copyright (C) 1999 Chris Allegretta                                  *
+ *   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 1, or (at your option)  *
+ *   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,      *
@@ -79,13 +79,12 @@ typedef struct filestruct {
     int file_current_x;		/* Current file's x-coordinate position */
     int file_current_y;		/* Current file's y-coordinate position */
     int file_modified;		/* Current file's modification status */
-    char *file_path;		/* Current file's full path location */
     int file_placewewant;	/* Current file's place we want */
     int file_totlines;		/* Current file's total number of lines */
-    int file_totsize;		/* Current file's total size */
+    long file_totsize;		/* Current file's total size */
 #endif
 
-    long lineno;		/* The line number */
+    int lineno;			/* The line number */
 } filestruct;
 
 typedef struct shortcut {
@@ -97,6 +96,7 @@ typedef struct shortcut {
    int (*func) (void);	/* Function to call when we catch this key */
    char *desc;		/* Description, e.g. "Page Up" */
    char *help;		/* Help file entry text */
+   struct shortcut *next;
 } shortcut;
 
 typedef struct toggle {
@@ -105,8 +105,7 @@ typedef struct toggle {
 			   e.g. "Pico Messages"; we'll append Enabled or
 			   Disabled */
    int flag;		/* What flag actually gets toggled */
-   char override_ch;	/* The character to display on the help screen,
-			   if it isn't NULL */
+   struct toggle *next;
 } toggle;
 
 #ifdef ENABLE_NANORC
@@ -117,6 +116,23 @@ typedef struct rcoption {
  
 #endif /* ENABLE_NANORC */
 
+#ifdef ENABLE_COLOR
+
+#define COLORSTRNUM 16
+
+typedef struct colortype {
+    int fg;			/* fg color */
+    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 */
+    struct colortype *next;
+} colortype;
+
+#endif /* ENABLE_COLOR */
+
+
 /* Bitwise flags so we can save space (or more correctly, not waste it) */
 
 #define MODIFIED		(1<<0)
@@ -137,9 +153,15 @@ typedef struct rcoption {
 #define REGEXP_COMPILED         (1<<15)
 #define TEMP_OPT         	(1<<16)
 #define CUT_TO_END         	(1<<17)
-#define DISABLE_CURPOS         	(1<<18)
-#define REVERSE_SEARCH		(1<<19)
-#define MULTIBUFFER		(1<<20)
+#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)
 
 /* Control key sequences, changing these would be very very bad */
 
@@ -201,8 +223,11 @@ typedef struct rcoption {
 #define NANO_ALT_X 'x'
 #define NANO_ALT_Y 'y'
 #define NANO_ALT_Z 'z'
-#define NANO_ALT_LCARAT ','
-#define NANO_ALT_RCARAT '.'
+#define NANO_ALT_PERIOD ','
+#define NANO_ALT_COMMA '.'
+#define NANO_ALT_LCARAT '<'
+#define NANO_ALT_RCARAT '>'
+#define NANO_ALT_BRACKET ']'
 
 /* Some semi-changeable keybindings; don't play with unless you're sure you
 know what you're doing */
@@ -248,6 +273,7 @@ know what you're doing */
 #define NANO_FORWARD_KEY	NANO_CONTROL_F
 #define NANO_BACK_KEY		NANO_CONTROL_B
 #define NANO_MARK_KEY		NANO_CONTROL_6
+#define NANO_ALT_MARK_KEY	NANO_ALT_A
 #define NANO_HOME_KEY		NANO_CONTROL_A
 #define NANO_END_KEY		NANO_CONTROL_E
 #define NANO_DELETE_KEY		NANO_CONTROL_D
@@ -260,6 +286,10 @@ know what you're doing */
 #define NANO_APPEND_KEY		NANO_ALT_A
 #define NANO_OPENPREV_KEY	NANO_ALT_LCARAT
 #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_EXTCMD_KEY		NANO_CONTROL_X
 
 #define TOGGLE_CONST_KEY	NANO_ALT_C
 #define TOGGLE_AUTOINDENT_KEY	NANO_ALT_I
@@ -273,47 +303,12 @@ know what you're doing */
 #define TOGGLE_BACKWARDS_KEY	NANO_ALT_B
 #define TOGGLE_CASE_KEY		NANO_ALT_A
 #define TOGGLE_LOAD_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
 
-/* Toggle stuff, these static lengths need to go away RSN */
-
-#ifdef HAVE_REGEX_H
-
-#ifdef ENABLE_MULTIBUFFER
-#define TOGGLE_LEN 14
-#else
-#define TOGGLE_LEN 11
-#endif
-
-#define WHEREIS_LIST_LEN 8
-#define REPLACE_LIST_LEN 8
-#else
-
-#ifdef ENABLE_MULTIBUFFER
-#define TOGGLE_LEN 13
-#else
-#define TOGGLE_LEN 10
-#endif
-
-#define WHEREIS_LIST_LEN 7
-#define REPLACE_LIST_LEN 7
-#endif
-
-#define MAIN_LIST_LEN 26
 #define MAIN_VISIBLE 12
-#define REPLACE_LIST_2_LEN 3
-#define GOTO_LIST_LEN 3
-#define GOTODIR_LIST_LEN 1
-#define HELP_LIST_LEN 3
-#define SPELL_LIST_LEN 1
-
-#ifndef DISABLE_BROWSER
-#define WRITEFILE_LIST_LEN 3
-#define INSERTFILE_LIST_LEN 2
-#define BROWSER_LIST_LEN 4
-#else
-#define WRITEFILE_LIST_LEN 3
-#define IMSERTFILE_LIST_LEN 1
-#endif
 
 #define VIEW 1
 #define NOVIEW 0

nano.info

@@ -1,411 +0,0 @@
-This is nano.info, produced by makeinfo version 4.0 from nano.texi.
-
-INFO-DIR-SECTION Editors
-START-INFO-DIR-ENTRY
-* Nano: (nano).                 Small and friendly text editor.
-END-INFO-DIR-ENTRY
-
-
-File: nano.info,  Node: Top,  Next: Introduction,  Prev: (dir),  Up: (dir)
-
-   This manual documents GNU nano, a small and friendly text editor.
-
-* Menu:
-
-* Introduction::
-* Editor Basics::
-* Online Help::
-* Feature Toggles::
-* The File Browser::
-* Pico Compatibility::
-* Building and Configure Options::
-
-
-File: nano.info,  Node: Introduction,  Next: Editor Basics,  Prev: Top,  Up: Top
-
-Introduction
-************
-
-   GNU `nano' is a small and friendly text editor.  Besides basic text
-editing, `nano' offers many extra features like an interactive search
-and replace, goto line number, auto-indentation, feature toggles,
-internationalization support, and filename tab completion.
-
-* Menu:
-
-* Overview::
-* Command Line Options::
-
-
-File: nano.info,  Node: Overview,  Next: Command Line Options,  Prev: Introduction,  Up: Introduction
-
-Overview
-========
-
-   `nano' [GNU long option] [option] +LINE [  FILE ... ]
-
-   The original goal for `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
-`nano' by typing Meta-P.  *Note Pico Compatibility::, for more info.
-
-   Email bug reports to <nano@nano-editor.org>.
-
-
-File: nano.info,  Node: Command Line Options,  Prev: Overview,  Up: Introduction
-
-Command Line Options
-====================
-
-   `nano' takes the following options from the command line:
-`-T [num, --tabsize=[num]'
-     Set the displayed tab length to [num] columns.
-
-`-R, --regexp'
-     Turns on regular expression search and search/replace.
-
-`-V, --version'
-     Print the version number and copyright and quit.
-
-`-c, --const'
-     Constantly display the cursor position and line number on the
-     statusbar.
-
-`-h, --help'
-     Print the usage and exit.
-
-`-i, --autoindent'
-     Automatically indent new lines to the same number of spaces and
-     tabs as the previous line.
-
-`-k, --cut'
-     Makes ^K cut from the current cursor position to the end of the
-     current line.
-
-`-l, --nofollow'
-     When writing files, if the given file is a symbolic link it is
-     removed and a new file is created.
-
-`-m, --mouse'
-     Enables the use of the mouse to select text (currently only useful
-     for running under the X window system).
-
-`-p, --pico'
-     Emulate Pico as closely as possible, sacrificing consistency for
-     correct emulation.  *Note Pico Compatibility::, for more info.
-
-`-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.
-
-`-s [prog], --speller=[prog]'
-     Invoke [prog] as the spell checker.  By default, `nano' uses its
-     own interactive spell checker that requires the `spell' program be
-     installed on your system.
-
-`-t, --tempfile'
-     Do not ask whether or not to save the current contents of the file
-     when exiting, assume yes.  This is most useful when using `nano'
-     as the composer of a mailer program.
-
-`-x, --nohelp'
-     In Expert Mode, the Shortcut Lists will not appear at the bottom
-     of the screen.  This affects the location of the statusbar as
-     well, as in Expert Mode it is located at the very bottom of the
-     editor.
-
-     Note: When accessing the help system, Expert Mode is temporarily
-     disabled to display the help system navigation keys.
-
-`-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.
-
-`-w, --nowrap'
-     Do not wrap long lines at any length. This option overrides any
-     value for -r.
-
-`-z, --suspend'
-     Enable suspend ability of `nano' using the system's suspend
-     keystroke (usually ^Z).
-
-`+LINE'
-     Start at line number LINE instead of the default of line 1.
-
-
-File: nano.info,  Node: Editor Basics,  Next: Online Help,  Prev: Introduction,  Up: Top
-
-Editor Basics
-*************
-
-* Menu:
-
-* Entering Text::
-* Special Functions::
-* The Titlebar::
-* The Statusbar::
-* Shortcut Lists::
-
-
-File: nano.info,  Node: Entering Text,  Next: Special Functions,  Prev: Editor Basics,  Up: Editor Basics
-
-Entering Text
-=============
-
-   All key sequences in `nano' are entered using the keyboard.  `nano'
-is a "modeless" editor, all keys with the exception of Control and Meta
-key sequences will enter text into the file being edited.
-
-
-File: nano.info,  Node: Special Functions,  Next: The Titlebar,  Prev: Entering Text,  Up: Editor Basics
-
-Special Functions
-=================
-
-   Special functions use the Control key (displayed in the help and
-shortcut lists as ^) or the Meta key (displayed as M).
-
-   * Control key sequences are entered by holding down the Control key
-     and pressing the desired letter.
-
-   * 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.
-
-
-File: nano.info,  Node: The Titlebar,  Next: The Statusbar,  Prev: Special Functions,  Up: Editor Basics
-
-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 `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 nano is in "File browser" mode, the center
-section will display the current directory instead of the filename.
-*Note The File Browser::.
-
-
-File: nano.info,  Node: The Statusbar,  Next: Shortcut Lists,  Prev: The Titlebar,  Up: Editor Basics
-
-The Statusbar
-=============
-
-   The statusbar is located three lines from the bottom of the screen
-(or the bottom line in Expert Mode.  *Note Expert Mode::, for more info.
-
-   The Statusbar shows important and informational messages.  Any error
-messages that occur from using the editor will appear on the statusbar.
-Any questions that are asked of the user will be asked on the statusbar,
-and any user input (search strings, file names, etc) will be input on
-the statusbar.
-
-
-File: nano.info,  Node: Shortcut Lists,  Prev: The Statusbar,  Up: Editor Basics
-
-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. *Note Pico Compatibility::, for
-more info.
-
-
-File: nano.info,  Node: Online Help,  Next: Feature Toggles,  Prev: Editor Basics,  Up: Top
-
-Online Help
-***********
-
-   The online help system in `nano' is available by pressing ^G.  It is
-fairly self explanatory, documenting the various parts of the editor
-and available keystrokes.  Navigation is via the ^Y (Page Up) and ^V
-(Page Down) keys.  ^X exits the help system.
-
-
-File: nano.info,  Node: Feature Toggles,  Next: The File Browser,  Prev: Online Help,  Up: Top
-
-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. *Note Special Functions::, for more info.  The
-following toggles are available:
-
-`Constant Update Toggle (Meta-C)'
-     toggles the -c (-const) command line flag.
-
-`Regular Expressions Toggle (Meta-E)'
-     toggles the -R (-regexp) command line flag.
-
-`AutoIndent Toggle (Meta-I)'
-     toggles the -i (-autoindent) command line flag.
-
-`Cut To End Toggle (Meta-K)'
-     toggles the -k (-cut) command line flag.
-
-`Cut To End Toggle (Meta-M)'
-     toggles the -m (-mouse) command line flag.
-
-`Pico Mode Toggle (Meta-P)'
-     toggles the -p (-pico) command line flag.  *Note Pico
-     Compatibility::, for more info.
-
-`AutoWrap Toggle (Meta-W)'
-     toggles the -w (-nowrap) command line flag.
-
-`Expert/Nohelp Toggle (Meta-X)'
-     toggles the -x (-nohelp) command line flag.
-
-`Suspend Toggle (Meta-Z)'
-     toggles the -z (-suspend) command line flag.
-
-
-File: nano.info,  Node: The File Browser,  Next: Pico Compatibility,  Prev: Feature Toggles,  Up: Top
-
-The File Browser
-****************
-
-   When reading or writing files, pressing ^T will invoke the file
-browser.  Here, one can navigate directories in a graphical manner in
-order to find the desired file.
-
-   Basic movement in the file browser is accomplished with he arrow keys
-and page up/down.  The behavior of the enter (or 's') key varies by what
-is currently selected.  If the currently selected object is a directory,
-the file browser will enter and display the contents of the directory.
-If the object is a file, this filename and path are copied to the
-statusbar and the file browser is exited.
-
-
-File: nano.info,  Node: Pico Compatibility,  Next: Building and Configure Options,  Prev: The File Browser,  Up: Top
-
-Pico Compatibility
-******************
-
-   Nano does not completely emulate Pico by default.  The following
-differences apply to the default mode and Pico Compatibility mode:
-
-`Displayed Shortcuts'
-     By default, the following shortcuts are displayed in the Shortcut
-     Lists:
-
-     ^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.
-
-     In Pico Compatibility mode, the default Pico shortcuts are
-     displayed:
-
-     ^G ^O ^R ^Y ^K ^C
-     ^X ^J ^W ^V ^U ^T
-
-`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.
-
-`Interactive Replace and Spell Checker'
-     It is worth noting that the `nano' replace function is interactive,
-     i.e. it does not stop after one search string is found and
-     automatically replace it.  The `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.
-
-
-File: nano.info,  Node: Building and Configure Options,  Prev: Pico Compatibility,  Up: Top
-
-Building and Configure Options
-******************************
-
-   Building 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 nano) cd
-nano-x.y.z/ ./configure make make install
-
-   if you are looking to optimize nano for size, you may want to
-consider the following command line options:
-
-`--disable-tabcomp'
-     Disable the tab completion code when reading or writing files.
-
-`--disable-justify'
-     Disable the justify (^J)/unjustify (^U) functions in the editor.
-
-`--disable-speller'
-     Disables spell checker ability.
-
-`--disable-help'
-     Disables 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.
-
-`--disable-browser'
-     Disables the mini file browser (^O) when reading or writing files.
-
-`--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.
-
-`--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-mouse'
-     Disables all mouse functionality.  This also disables the -m
-     commands line flag which enables the mouse functions.
-
-
-
-Tag Table:
-Node: Top199
-Node: Introduction507
-Node: Overview933
-Node: Command Line Options1513
-Ref: Expert Mode3405
-Node: Editor Basics4248
-Node: Entering Text4473
-Node: Special Functions4813
-Node: The Titlebar5668
-Node: The Statusbar6366
-Node: Shortcut Lists6947
-Node: Online Help7340
-Node: Feature Toggles7716
-Node: The File Browser8859
-Node: Pico Compatibility9568
-Node: Building and Configure Options11610
-
-End Tag Table

nano.spec.in

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

nano.texi

@@ -8,8 +8,8 @@
 @c Run `makeinfo' rather than `texinfo-format-buffer'.
 @smallbook
 @set EDITION 0.1
-@set VERSION 1.1.0
-@set UPDATED 12 Feb 2001
+@set VERSION 1.1.8
+@set UPDATED 4 Jan 2002
 
 @dircategory Editors
 @direntry
@@ -23,7 +23,7 @@
 @titlepage
 @title GNU @code{nano}
 @subtitle a small and friendly text editor.
-@subtitle version 1.1.0
+@subtitle version 1.1.8
 
 @author Chris Allegretta
 @page
@@ -33,7 +33,7 @@ editor.
 
 This manual is part of the GNU @code{nano} distribution.@*
 @sp4
-Copyright (C) 1999, 2000, 2001 Chris Allegretta.
+Copyright (C) 1999, 2000, 2001, 2002 Chris Allegretta.
 
 Permission is granted to make and distribute verbatim copies of
 this manual provided the copyright notice and this permission notice
@@ -108,12 +108,35 @@ Email bug reports to @email{nano@@nano-editor.org}.
 @code{nano} takes the following options from the command line:
 @table @code
 
-@item -T [num, --tabsize=[num]
-Set the displayed tab length to [num] columns.
+@item -D, --dos
+Write file in DOS format.
+
+@item -F, --multibuffer
+Enable multiple file buffers.
+
+@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 nano.
+
+@item -M, --mac
+Write file in Mac format.
+
+@item -N, --noconvert
+Do not convert files from DOS/Mac format.
+
+@item -Q [str], --quotestr [str]
+Set the quoting string for justifying.  The default is "> ".
 
 @item -R, --regexp
 Turns on regular expression search and search/replace.
 
+@item -S, --smooth
+Enables smooth scrolling.
+
+@item -T [num], --tabsize=[num]
+Set the displayed tab length to [num] columns.
+
 @item -V, --version 
 Print the version number and copyright and quit.
 
@@ -139,6 +162,9 @@ and a new file is created.
 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 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.
@@ -181,6 +207,9 @@ Do not wrap long lines at any length. This option overrides any value for
 Enable suspend ability of @code{nano} using the system's suspend
 keystroke (usually ^Z).
 
+@item -a, -b, -e, -f, -g, -j
+Ignored, for compatibility with Pico.
+
 @item +LINE
 Start at line number LINE instead of the default of line 1.
 @end table
@@ -277,25 +306,43 @@ The following toggles are available:
 
 @table @code
 
+@item Case Sensitive Search Toggle (Meta-A)
+toggles case sensistive searching functionality on/off.
+
+@item Backwards Search Toggle (Meta-B)
+toggles backwards searching fuctionality on/off.
+
 @item Constant Update Toggle (Meta-C)
 toggles the -c (--const) command line flag.
 
+@item DOS Format Toggle (Meta-D)
+toggles the -D (--dos) command line flag.
+
 @item Regular Expressions Toggle (Meta-E)
 toggles the -R (--regexp) command line flag.
 
+@item Multiple Files Toggle (Meta-F)
+toggles the  -F (--multibuffer) command line flag.
+
 @item AutoIndent Toggle (Meta-I)
 toggles the -i (--autoindent) command line flag.
 
 @item Cut To End Toggle (Meta-K)
 toggles the -k (--cut) command line flag.
 
-@item Cut To End Toggle (Meta-M)
+@item Mouse Toggle (Meta-M)
 toggles the -m (--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.
 
+@item Smooth Scrolling Toggle (Meta-S)
+toggles the -s (--smooth) command line flag.
+
 @item AutoWrap Toggle (Meta-W)
 toggles the -w (--nowrap) command line flag.
 
@@ -305,6 +352,13 @@ toggles the -x (--nohelp) command line flag.
 @item Suspend Toggle (Meta-Z)
 toggles the -z (--suspend) command line flag.
 
+@item Open Previous File Toggle (Meta-<)
+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
@@ -415,6 +469,18 @@ Disables all word wrapping in the editor.  This also eliminates the
 Disables all mouse functionality.  This also disables the -m commands line 
 flag which enables the mouse functions.
 
+@item --disable-operatingdir
+Disables setting of operating directory. This also disables the -o command
+line flag.
+
+@item --disable-nls
+Disables Native Language support. This will make the available GNU nano
+translations unusable.
+
+@item --with-slang
+Compiling GNU nano with Slang is supported, and will make the binary notably
+smaller than if compiled with ncurses or other curses libraries.
+
 @end table
 
 @contents

nanorc.sample

@@ -1,6 +1,8 @@
 # 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 regular expressions by default 
 # set regexp 
@@ -8,6 +10,9 @@
 # Constantly update the cursor position
 # set const
 
+# Show column position relative to the current line, not the whole file
+# set relative
+
 # Use cut to end of line with ^K by default
 # set cut
 
@@ -17,12 +22,18 @@
 # Don't follow symlinks when writing files
 # set nofollow
 
-# Use Pico Compatibility mode for ths shortcut lists and search text
+# Set operating directory (chroot of sorts)
+# set operatingdir "~"
+
+# Use Pico Compatibility mode for the shortcut lists and search text
 # set pico
 
 # Use this value instead of the default
 # set fill -8
 
+# Use this tab size instead of the default
+# set tabsize 4
+
 # Use this spelling checker instead of the default one
 # set speller aspell
 
@@ -38,11 +49,49 @@
 # Don't display the help lists at the bottom of the screen
 # set nohelp
 
-# Allow nano to be suepended with ^Z
+# Allow nano to be suspended with ^Z
 # set suspend
 
-# Load files upon inserting them, and allow switching between them
+# Use smooth scrolling as the default
+# set smooth
+
+# Use alternate keypad routines
+# set keypad
+
+# Don't convert files from DOS/Mac format
+# set noconvert
+
+# 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
+
+# Use this as the quoting string.  You shouldn't need to change this,
+# but...... default "> "
+# set quotestr "// "
+
+#
+# Color setup
+# Format: 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.
+#
+#color brightred "float " "char " "int " "void "  "NULL" "[A-Z_]\{2,\}" 
+#color brightred "static" "const" "[\ ]struct" "^struct" "if " "while[\ \n\(]" 
+#color brightred "do[\ \n\(]" "else[\ \n]" "case " "switch " "break;"
+#color brightcyan "#define" "#include" "#ifn*def" "#endif" "#elif" "#else"
+
+#You will in general want your comments and strings to come last, becase
+#syntax highlighting rules will be applied in the order they are read in
+
+#color brightyellow "<.*[^=\ ]*>" "\".*\""
+#color brightblue "//.*"
+#color brightblue start="/\*.*" end="\*/"

po/ChangeLog

@@ -1 +1,162 @@
+2002-03-29  Jordi Mallach  <jordi@sindominio.net>
+
+	* da.po: Updated translation by Keld Simonsen.
+
+2002-03-27  Jordi Mallach  <jordi@sindominio.net>
+
+	* it.po: Updated translation by Marco Colombo.
+
+2002-03-25  Jordi Mallach  <jordi@sindominio.net>
+
+	* id.po: Updated translation by Tedi Heriyanto.
+
+2002-03-17  Jordi Mallach  <jordi@sindominio.net>
+
+	* fr.po: Updated translation by Jean-Philippe Guérard
+
+2002-03-15  Jordi Mallach  <jordi@sindominio.net>
+
+	* pl.po: Updated translation by Wojciech Kotwica.
+
+2002-03-14  Jordi Mallach  <jordi@sindominio.net>
+
+	* uk.po, ru.po: Updated translations by Sergey A.
+	Ribalchenko.
+
+2002-03-12  Jordi Mallach  <jordi@sindominio.net>
+
+	* ca.po: Updated to current CVS.
+	* es.po: Updated to current CVS.
+	* gl.po: Updated translation to current CVS by Jacobo Tarrio.
+
+2002-03-12  Jordi Mallach  <jordi@sindominio.net>
+
+	* gl.po: Updated translation by Jacobo Tarrio.
+
+2002-03-11  Jordi Mallach  <jordi@sindominio.net>
+
+	* fr.po: Updated translation by Jean-Philippe Guérard.
+
+2002-03-09  Jordi Mallach  <jordi@sindominio.net>
+
+	* id.po: Updated translation by Tedi Heriyanto.
+	* ca.po: Updated.
+	* es.po: Updated.
+
+2002-03-07  Jordi Mallach  <jordi@sindominio.net>
+
+	* sv.po: Updated translation by Christian Rose.
+	* de.po: Updated translation by Michael Piefel.
+
+2002-03-05  Jordi Mallach  <jordi@sindominio.net>
+
+	* pl.po: Updated translation by Wojciech Kotwica.
+
+2002-02-20  Jordi Mallach  <jordi@sindominio.net>
+
+	* nl.po: Updated translation by Guus Sliepen.
+
+2002-02-15  Jordi Mallach  <jordi@sindominio.net>
+
+	* nb.po: Updated translation by Stig E Sandoe.
+
+2002-02-15  Jordi Mallach  <jordi@sindominio.net>
+
+	* nb.po: Updated translation by Stig E Sandoe.
+
+2002-02-14  Jordi Mallach  <jordi@sindominio.net>
+
+	* da.po: Updated translation by Keld Simonsen.
+
+2002-02-10  Jordi Mallach  <jordi@sindominio.net>
+
+	* hu.po: Updated translation by Gergely Nagy.
+
+2002-02-07  Jordi Mallach  <jordi@sindominio.net>
+
+	* uk.po, ru.po: Updated translations by Sergey A.
+	Ribalchenko.
+
+2002-02-06  Jordi Mallach  <jordi@sindominio.net>
+
+	* hu.po: Updated translation by Gergely Nagy.
+
+2002-02-06  Jordi Mallach  <jordi@sindominio.net>
+
+	* cs.po: Incomplete update by Václav Haisman.
+
+2002-01-27  Jordi Mallach  <jordi@sindominio.net>
+
+	* it.po: Updated translation by Marco Colombo.
+
+2002-01-26  Jordi Mallach  <jordi@sindominio.net>
+
+	* 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.
+
+2002-01-25  Jordi Mallach  <jordi@sindominio.net>
+
+	* ca.po: Updated.
+	* es.po: Updated.
+
+2002-01-23  Jordi Mallach  <jordi@sindominio.net>
+
+	* ca.po: Updated.
+	* es.po: Updated.
+
+2002-01-19  gettextize  <bug-gnu-utils@gnu.org>
+
+	* Makefile.in.in: Upgrade to gettext-0.10.40.
+	* cat-id-tbl.c: Remove file.
+	* stamp-cat-id: Remove file.
+
+2002-01-19  Jordi Mallach  <jordi@sindominio.net>
+
+	* ca.po: Updated.
+	* es.po: Updated.
+
+2002-01-19  Jordi Mallach  <jordi@sindominio.net>
+
+	* da.po: Updated translation by Keld Simonsen.
+
+2002-01-17  Jordi Mallach  <jordi@sindominio.net>
+
+	* 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.
+
+2002-01-12  Jordi Mallach  <jordi@sindominio.net>
+
+	* 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.
+
+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.
+
+2002-01-07  Jordi Mallach  <jordi@sindominio.net>
+
+	* de.po: Updated translation by Michael Piefel.
+
+2002-01-07  Jordi Mallach  <jordi@sindominio.net>
+
+	* sv.po: Updated translation by Christian Rose.
+
+2002-01-07  Jordi Mallach  <jordi@sindominio.net>
+
+	* ca.po: Updated.
+	* es.po: Updated.
+
+
 $Id$

proto.h

@@ -2,10 +2,10 @@
 /**************************************************************************
  *   proto.h                                                              *
  *                                                                        *
- *   Copyright (C) 1999 Chris Allegretta                                  *
+ *   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 1, or (at your option)  *
+ *   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,      *
@@ -33,17 +33,26 @@ extern int editwinrows;
 extern int current_x, current_y, posible_max, totlines;
 extern int placewewant;
 extern int mark_beginx, samelinewrap;
-extern int totsize, temp_opt;
+extern long totsize;
+extern int temp_opt;
 extern int fill, 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 char *answer;
 extern char *hblank, *help_text;
 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
@@ -55,14 +64,18 @@ extern filestruct *cutbuffer, *mark_beginbuf;
 extern filestruct *open_files;
 #endif
 
+#ifdef ENABLE_COLOR
+extern colortype *colorstrings;
+#endif
+
 extern shortcut *shortcut_list;
-extern shortcut main_list[MAIN_LIST_LEN], whereis_list[WHEREIS_LIST_LEN];
-extern shortcut replace_list[REPLACE_LIST_LEN], goto_list[GOTO_LIST_LEN];
-extern shortcut writefile_list[WRITEFILE_LIST_LEN], insertfile_list[INSERTFILE_LIST_LEN];
-extern shortcut spell_list[SPELL_LIST_LEN], replace_list_2[REPLACE_LIST_LEN];
-extern shortcut help_list[HELP_LIST_LEN];
+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, *extcmd_list;
+extern shortcut *help_list;
 #ifndef DISABLE_BROWSER
-extern shortcut browser_list[BROWSER_LIST_LEN], gotodir_list[GOTODIR_LIST_LEN];
+extern shortcut *browser_list, *gotodir_list;
 #endif
 extern shortcut *currshortcut;
 
@@ -70,15 +83,20 @@ extern shortcut *currshortcut;
 extern int use_regexp, regexp_compiled;
 extern regex_t search_regexp;
 extern regmatch_t regmatches[10];  
+
+#ifdef ENABLE_COLOR
+extern regex_t color_regexp;
+extern regmatch_t colormatches[1];  
+#endif /* HJAVE_COLOR */
 #endif
 
-extern toggle toggles[TOGGLE_LEN];
+extern toggle *toggles;
 
 /* Programs we want available */
 
 char *revstrstr(char *haystack, char *needle, char *rev_start);
-char *strcasestr(char *haystack, char *needle);
-char *revstrcasestr(char *haystack, char *needle, char *rev_start);
+char *stristr(char *haystack, char *needle);
+char *revstristr(char *haystack, char *needle, char *rev_start);
 char *strstrwrapper(char *haystack, char *needle, char *rev_start);
 int search_init(int replacing);
 int renumber(filestruct * fileptr);
@@ -86,8 +104,9 @@ int free_filestruct(filestruct * src);
 int xplustabs(void);
 int do_yesno(int all, int leavecursor, char *msg, ...);
 int actual_x(filestruct * fileptr, int xplus);
+int strnlenpt(char *buf, int size);
 int strlenpt(char *buf);
-int statusq(int allowtabs, shortcut s[], int slen, char *def, char *msg, ...);
+int statusq(int allowtabs, shortcut s[], char *def, char *msg, ...);
 int write_file(char *name, int tmpfile, int append, int nonamechange);
 int do_cut_text(void);
 int do_uncut_text(void);
@@ -95,15 +114,30 @@ int no_help(void);
 int renumber_all(void);
 int open_file(char *filename, int insert, int quiet);
 int do_insertfile(int loading_file);
+int length_of_list(shortcut *s);
+int num_of_digits(int n);
+int open_pipe(char *command);
+int read_file(int fd, char *filename, int quiet);
 
 #ifdef ENABLE_MULTIBUFFER
-int add_open_file(int update, int dup_fix);
+int add_open_file(int update);
+#endif
+
+#ifndef DISABLE_OPERATINGDIR
+int check_operating_dir(char *currpath, int allow_tabcomp);
 #endif
 
 int do_writeout(char *path, int exiting, int append);
-int do_gotoline(long line, int save_pos);
+int do_gotoline(int line, int save_pos);
+int is_whole_word(int curr_pos, filestruct *fileptr, char *searchword);
 int do_replace_loop(char *prevanswer, 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
+
 /* Now in move.c */
 int do_up(void);
 int do_down(void);
@@ -111,10 +145,11 @@ int do_left(void);
 int do_right(void);
 int check_wildcard_match(const char *text, const char *pattern);
 
-char *input_tab(char *buf, int place, int *lastWasTab, int *newplace);
+char *input_tab(char *buf, int place, int *lastWasTab, int *newplace, int *list);
 char *real_dir_from_tilde(char *buf);
 
 void shortcut_init(int unjustify);
+void signal_init(void);
 void lowercase(char *src);
 void blank_bottombars(void);
 void check_wrap(filestruct * inptr, char ch);
@@ -135,9 +170,10 @@ void blank_statusbar(void);
 void titlebar(char *path);
 void previous_line(void);
 void center_cursor(void);
-void bottombars(shortcut s[], int slen);
+void bottombars(shortcut *s);
 void blank_statusbar_refresh(void);
 void *nmalloc (size_t howmuch);
+void nperror(const char *s);
 void *mallocstrcpy(char *dest, char *src);
 void wrap_reset(void);
 void display_main_list(void);
@@ -151,8 +187,8 @@ void die_save_file(char *die_filename);
 void new_file(void);
 void new_magicline(void);
 void splice_node(filestruct *begin, filestruct *newnode, filestruct *end);
-void null_at(char *data, int index);
-void page_up_center(void);
+void null_at(char **data, int index);
+void page_up(void);
 void blank_edit(void);
 void search_init_globals(void);
 void replace_abort(void);
@@ -165,6 +201,8 @@ void print_view_warning(void);
 void unlink_node(filestruct * fileptr);
 void cut_marked_segment(filestruct * top, int top_x, filestruct * bot,
                         int bot_x, int destructive);
+void free_shortcutage(shortcut **src);
+void thanks_for_all_the_fish(void);
 
 #ifdef ENABLE_NANORC
 void do_rcfile(void);
@@ -174,7 +212,6 @@ void do_rcfile(void);
 void do_credits(void);
 #endif
 
-
 int do_writeout_void(void), do_exit(void), do_gotoline_void(void);
 int do_insertfile_void(void), do_search(void);
 
@@ -182,8 +219,8 @@ int do_insertfile_void(void), do_search(void);
 int load_open_file(void), close_open_file(void);
 #endif
 
-int page_up(void), page_down(void);
-int do_cursorpos(void), do_spell(void);
+int do_page_up(void), do_page_down(void);
+int do_cursorpos(int constant), do_cursorpos_void(void), do_spell(void);
 int do_up(void), do_down (void), do_right(void), do_left (void);
 int do_home(void), do_end(void), total_refresh(void), do_mark(void);
 int do_delete(void), do_backspace(void), do_tab(void), do_justify(void);
@@ -192,16 +229,22 @@ int do_replace(void), do_help(void), do_enter_void(void);
 int keypad_on(WINDOW * win, int newval);
 
 #ifdef ENABLE_MULTIBUFFER
-int open_file_dup_fix(int update);
 int open_prevfile(int closing_file), open_nextfile(int closing_file);
+int open_prevfile_void(void), open_nextfile_void(void);
 #endif
 
 char *charalloc (size_t howmuch);
+char *get_next_filename(char *name);
 
-#ifdef ENABLE_MULTIBUFFER
+#if !defined (DISABLE_SPELLER) || !defined (DISABLE_OPERATINGDIR)
 char *get_full_path(const char *origpath);
 #endif
 
+#ifndef DISABLE_SPELLER
+char *check_writable_directory(const char *path);
+char *safe_tempnam(const char *dirname, const char *filename_prefix);
+#endif
+
 #ifndef DISABLE_BROWSER
 char *do_browser(char *path);
 struct stat filestat(const char *path);
@@ -221,9 +264,9 @@ RETSIGTYPE main_loop (int junk);
 filestruct *copy_node(filestruct * src);
 filestruct *copy_filestruct(filestruct * src);
 filestruct *make_new_node(filestruct * prevnode);
-filestruct *findnextstr(int quiet, filestruct * begin,
+filestruct *findnextstr(int quiet, int bracket_mode, filestruct * begin,
 			int beginx, char *needle);
 
-#ifdef ENABLE_MULTIBUFFER
-filestruct *open_file_dup_search(void);
+#ifndef DISABLE_HELP
+void help_init(void);
 #endif