GNU nano 1.1.7 release

git-svn-id: svn://svn.savannah.gnu.org/nano/trunk/nano@1105 35c25a1d-7b9e-4130-9fde-d3aeb78583b8
nano.c:do_justify() - Don't continue to justify string if it's indented more (quoting wise) than the beginning of the justification
2002-03-05 23:47:44 +00:00 · 2002-03-05 19:58:45 +00:00 · 2002-03-05 19:55:55 +00:00 · 2002-03-05 18:59:56 +00:00 · 2002-03-05 17:58:34 +00:00 · 2002-03-05 11:23:17 +00:00
97 changed files with 18469 additions and 14415 deletions
--- a/.cvsignore
+++ b/.cvsignore
@@ -8,6 +8,12 @@ config.h.in
 config.log
 config.status
 configure
+config.guess
+config.sub
+depcomp
+install-sh
+missing
+mkinstalldirs
 nano
 nano.info
 stamp-h
--- a/301
+++ b/301
@@ -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$
--- a/5
+++ b/5
@@ -127,7 +127,10 @@
 - 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].
 ** Open BUGS **

 $Id$
--- a/227
+++ b/227
@@ -1,3 +1,224 @@
+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.
@@ -54,9 +275,9 @@ nano-1.1.5 - 01/05/2002
 	- Add DLR.
 - po/sv.po:
 	- Swedish translation update (Christian Rose).
- po/ru.po, uk.po:
+- po/ru.po, po/uk.po:
 	- Russian and Ukrainian translations updates (Sergey A. Ribalchenko).
- po/ca.po, es.po:
+- 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>.
@@ -176,7 +397,7 @@ nano-1.1.3 - 10/26/2001
 	- Updated Danish translation (Keld Simonsen).
 - po/es.po:
 	- Style updates to Spanish translation (Santiago Vila).
- po/ru.po, uk.po:
+- po/ru.po, po/uk.po:
 	- Updated Russian and Ukrainian translation (Sergey A. Ribalchenko).

 nano-1.1.2 - 10/03/2001
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,9 +1,7 @@
 ## $Id$
 AUTOMAKE_OPTIONS = gnu no-dependencies
-M4DIR = $(srcdir)/m4
-ACLOCAL_AMFLAGS = -I $(M4DIR)
-ACINCLUDE_INPUTS = $(M4DIR)/gettext.m4 $(M4DIR)/largefile.m4 \
-	$(M4DIR)/lcmessage.m4 $(M4DIR)/progtest.m4
+
+DEFS= -DSYSCONFDIR=\"$(sysconfdir)\"

 bin_PROGRAMS = 	nano
 nano_SOURCES =	color.c \
@@ -27,12 +25,9 @@ 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 $(ACINCLUDE_INPUTS)
+		nano.1 nano.1.html faq.html nanorc.sample

-SUBDIRS = po intl
+SUBDIRS = po intl m4

-localedir = @LOCALE_DIR@
+localedir = $(datadir)/locale
 INCLUDES = -Iintl -DLOCALEDIR=\"$(localedir)\" -I@includedir@
-
-$(srcdir)/acinclude.m4: $(ACINCLUDE_INPUTS)
-	cat $(ACINCLUDE_INPUTS) > $@
--- a/38
+++ b/38
@@ -1,5 +1,41 @@
+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 if the changed behavior of the keypad.  Nano now 
+		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
--- a/11
+++ b/11
@@ -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
--- a/README.CVS
+++ b/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.
--- a/5
+++ b/5
@@ -9,19 +9,22 @@ Tedi Heriyanto <tedi_h@gmx.net>			Indonesian Translator
 Václav Haisman <V.Haisman@sh.cvut.cz>		Czech Translator
 Szabolcs Horvath <horvaths@janus.gimsz.sulinet.hu>
 						Hungarian Translator
-Eivind Kjørstad <ekj@vestdata.no>		Norwegian (Bokmål) 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

--- a/autogen.sh
+++ b/autogen.sh
@@ -2,6 +2,6 @@
 # Generate configure & friends for CVS users.

 aclocal -I ./m4
-automake --add-missing
 autoheader
+automake --add-missing
 autoconf
--- a/color.c
+++ b/color.c
@@ -107,7 +107,7 @@ int do_colorinit(void)
 	/* Add in colors, if available */

 #ifdef HAVE_USE_DEFAULT_COLORS
- 	if (use_default_colors() != ERR) {
+ 	if (use_default_colors() != ERR)
 	    defok = 1;
 #endif

@@ -172,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;
 }

--- a/config.guess
+++ b/config.guess
--- a/config.sub
+++ b/config.sub
--- a/configure.ac
+++ b/configure.ac
@@ -1,14 +1,17 @@
 # $Id$
 dnl Process this file with autoconf to produce a configure script.
-AC_INIT(nano.c)
-AM_INIT_AUTOMAKE(nano, 1.1.5)
+AC_INIT
+AC_CONFIG_SRCDIR([nano.c])
+AC_PREREQ(2.52)
+AM_INIT_AUTOMAKE(nano, 1.1.7)
 AM_CONFIG_HEADER(config.h:config.h.in)
-ALL_LINGUAS="es de fr it id fi hu ca cs gl uk ru sv no nl da pl"
+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
-NANO_AC_SYS_LARGEFILE
+AC_SYS_LARGEFILE

 dnl Checks for header files.
 AC_HEADER_STDC
@@ -306,4 +309,5 @@ fi
 dnl i18n stuff - pretty incomplete for now
 NANO_AM_GNU_GETTEXT

-AC_OUTPUT([Makefile intl/Makefile po/Makefile.in])
+AC_CONFIG_FILES([Makefile intl/Makefile m4/Makefile po/Makefile.in])
+AC_OUTPUT
--- a/cut.c
+++ b/cut.c
@@ -232,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);
--- a/faq.html
+++ b/faq.html
@@ -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.5.&nbsp; Of course you should always check the nano homepage to
+be 1.1.7.&nbsp; Of course you should always check the nano homepage to
 see what the latest and greatest version is.</font></blockquote>

 <h2>
@@ -289,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%">
@@ -394,7 +394,7 @@ try:
 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.5 or newer, and you must have configured nano with
+be using nano 1.1.7 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
@@ -414,7 +414,7 @@ buffer is open.

 <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.5 or newer (use nano -V to check your version and compiled
+be version 1.1.7 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,
@@ -441,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>
@@ -594,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>
@@ -636,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>
@@ -667,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>
--- a/files.c
+++ b/files.c
@@ -54,18 +54,10 @@ void load_file(int quiet)
    current = fileage;

 #ifdef ENABLE_MULTIBUFFER
-    /* if quiet is zero, add a new entry to the open_files structure, and
-       do duplicate checking; otherwise, update the current entry and
-       don't do duplicate checking (the latter is needed in the case of
-       the alternate spell checker); if a duplicate entry was found,
-       reload the currently open file (it may have been changed during
-       duplicate handling) */
-    if (quiet != 0)
-	quiet = 1;
-    if (add_open_file(quiet, 1 - quiet) == 2) {
-	load_open_file();
-	statusbar(_("File already loaded"));
-    }
+    /* if quiet is zero, add a new entry to the open_files structure;
+       otherwise, update the current entry (the latter is needed in the
+       case of the alternate spell checker) */
+    add_open_file(quiet);
 #endif

    wmove(edit, current_y, current_x);
@@ -89,12 +81,11 @@ void new_file(void)

 #ifdef ENABLE_MULTIBUFFER
    /* if there aren't any entries in open_files, create the entry for
-       this new file, and, of course, don't bother checking for
-       duplicates; without this, if nano is started without a filename on
-       the command line, a new file will be created, but it will be given
-       no open_files entry, leading to problems later on */
+       this new file; without this, if nano is started without a filename
+       on the command line, a new file will be created, but it will be
+       given no open_files entry, leading to problems later on */
    if (!open_files) {
-	add_open_file(0, 0);
+	add_open_file(0);
 	/* turn off view mode in this case; this is for consistency
 	   whether multibuffers are compiled in or not */
 	UNSET(VIEW_MODE);
@@ -108,7 +99,6 @@ void new_file(void)

 }

-
 int read_byte(int fd, char *filename, char *input)
 {
    static char buf[BUFSIZ];
@@ -141,8 +131,9 @@ filestruct *read_line(char *buf, filestruct * prev, int *line1ins)
    strcpy(fileptr->data, buf);

 #ifndef NANO_SMALL
-    /* If it's a DOS file (CRLF), strip out the CR part*/
-    if (buf[strlen(buf) - 1] == '\r') {
+    /* If it's a DOS file (CRLF), and file conversion isn't disabled,
+       strip out the CR part */
+    if (!ISSET(NO_CONVERT) && buf[strlen(buf) - 1] == '\r') {
 	fileptr->data[strlen(buf) - 1] = 0;
 	totsize--;

@@ -179,7 +170,6 @@ filestruct *read_line(char *buf, filestruct * prev, int *line1ins)
    return fileptr;
 }

-
 int read_file(int fd, char *filename, int quiet)
 {
    long size;
@@ -211,8 +201,16 @@ int read_file(int fd, char *filename, int quiet)
 	    buf[0] = 0;
 	    i = 0;
 #ifndef NANO_SMALL
-	/* If it's a Mac file (no LF just a CR), handle it! */
-	} else if (i > 0 && buf[i-1] == '\r') {
+	 } else if (!ISSET(NO_CONVERT) && input[0] >= 0 && input[0] <= 31 
+			&& input[0] != '\t' && input[0] != '\r'
+			&& input[0] != '\n') 
+	    /* If the file has binary chars in it, don't stupidly
+		assume it's a DOS or Mac formatted file! */
+	    SET(NO_CONVERT);
+
+	/* If it's a Mac file (no LF just a CR), and file conversion
+	   isn't disabled, handle it! */
+	else if (!ISSET(NO_CONVERT) && i > 0 && buf[i-1] == '\r') {
 	    fileformat = 2;
 	    fileptr = read_line(buf, fileptr, &line1ins);
 	    num_lines++;
@@ -289,9 +287,8 @@ int open_file(char *filename, int insert, int quiet)
    struct stat fileinfo;

    if (!strcmp(filename, "") || stat(filename, &fileinfo) == -1) {
-	if (insert) {
-	    if (!quiet)
-		statusbar(_("\"%s\" not found"), filename);
+	if (insert && !quiet) {
+	    statusbar(_("\"%s\" not found"), filename);
 	    return -1;
 	} else {
 	    /* We have a new file */
@@ -326,6 +323,38 @@ int open_file(char *filename, int insert, int quiet)
    return 1;
 }

+
+/* This function will return the name of the first available extension
+   of a filename (starting with the filename, then filename.1, etc).
+   Memory is allocated for the return value.  If no writable extension 
+   exists we return "" */
+char *get_next_filename(char *name)
+{
+    int i = 0;
+    char *buf = NULL;
+    struct stat fs;
+
+    buf = charalloc(strlen(name) + num_of_digits(INT_MAX) + 2);
+    strcpy(buf, name);
+
+    while(1) {
+
+	if (stat(buf, &fs) == -1)
+	    break;
+	if (i == INT_MAX)
+	    break;
+
+	i++;
+	strcpy(buf, name);
+	sprintf(&buf[strlen(name)], ".%d", i);
+    }
+
+    if (i == INT_MAX)
+	buf[0] = '\0';
+
+    return buf;
+}
+
 int do_insertfile(int loading_file)
 {
    int i;
@@ -335,11 +364,19 @@ int do_insertfile(int loading_file)

 #if !defined(DISABLE_BROWSER) || !defined(DISABLE_MOUSE)
    currshortcut = insertfile_list;
-    currslen = INSERTFILE_LIST_LEN;
 #endif

-    i = statusq(1, insertfile_list, INSERTFILE_LIST_LEN, "",
-		_("File to insert [from ./] "));
+#ifndef DISABLE_OPERATINGDIR
+    if ((operating_dir) && (strcmp(operating_dir,"."))){
+	i = statusq(1, insertfile_list, "", _("File to insert [from %s] "),
+		operating_dir);
+    } else {
+#endif
+    i = statusq(1, insertfile_list, "", _("File to insert [from ./] "));
+#ifndef DISABLE_OPERATINGDIR
+    }
+#endif
+
    if (i != -1) {

 #ifdef DEBUG
@@ -358,7 +395,6 @@ int do_insertfile(int loading_file)
 	    char *tmp = do_browse_from(realname);
 #if !defined(DISABLE_HELP) || !defined(DISABLE_MOUSE)
 	    currshortcut = insertfile_list;
-	    currslen = INSERTFILE_LIST_LEN;
 #endif

 #ifdef DISABLE_TABCOMP
@@ -383,18 +419,15 @@ int do_insertfile(int loading_file)
 #ifdef ENABLE_MULTIBUFFER
 	if (loading_file) {

-	    /* update the current entry in the open_files structure; we
-	       don't need to check for duplicate entries (the conditions
-	       that could create them are taken care of elsewhere) */
-	    add_open_file(1, 0);
+	    /* update the current entry in the open_files structure */
+	    add_open_file(1);

-	    free_filestruct(fileage);
 	    new_file();
 	    UNSET(MODIFIED);
 	}
 #endif

-	i = open_file(realname, 1, 0);
+	i = open_file(realname, 1, loading_file);

 #ifdef ENABLE_MULTIBUFFER
 	if (loading_file)
@@ -468,25 +501,15 @@ int do_insertfile_void(void)
 /*
 * Add/update an entry to the open_files filestruct.  If update is
 * zero, a new entry is created; otherwise, the current entry is updated.
- * If dup_fix is zero, checking for and handling duplicate entries is not
- * done; otherwise, it is.  Return 0 on success, 1 on error, or 2 on
- * finding a duplicate entry.
+ * Return 0 on success or 1 on error.
 */
-int add_open_file(int update, int dup_fix)
+int add_open_file(int update)
 {
    filestruct *tmp;

    if (!fileage || !current || !filename)
 	return 1;

-    /* first, if duplicate checking is allowed, do it */
-    if (dup_fix) {
-
-	/* if duplicates were found and handled, we're done */
-	if (open_file_dup_fix(update))
-	    return 2;
-    }
-
    /* if no entries, make the first one */
    if (!open_files) {
 	open_files = make_new_node(NULL);
@@ -494,6 +517,7 @@ int add_open_file(int update, int dup_fix)
 	/* if open_files->file is NULL at the nrealloc() below, we get a
 	   segfault
 	open_files->file = open_files; */
+	open_files->file = NULL;
    }

    else if (!update) {
@@ -512,14 +536,12 @@ int add_open_file(int update, int dup_fix)
 	/* if open_files->file is NULL at the nrealloc() below, we get a
 	   segfault
 	open_files->file = open_files; */
+	open_files->file = NULL;
    }

    /* save current filename */
    open_files->data = mallocstrcpy(open_files->data, filename);

-    /* save the full path location */
-    open_files->file_path = get_full_path(open_files->data);
-
    /* save current total number of lines */
    open_files->file_totlines = totlines;

@@ -544,8 +566,7 @@ int add_open_file(int update, int dup_fix)
    if (!(ISSET(VIEW_MODE) && !update)) {
 	/* save current filestruct and restore full file position
 	   afterward */
-	open_files->file = nmalloc(sizeof(filestruct));
-	open_files->file = copy_filestruct(fileage);
+	open_files->file = fileage; 
 	do_gotopos(open_files->lineno, open_files->file_current_x, open_files->file_current_y, open_files->file_placewewant);
    }

@@ -571,9 +592,6 @@ int open_file_change_name(void)
    /* save current filename */
    open_files->data = mallocstrcpy(open_files->data, filename);

-    /* save the full path location */
-    open_files->file_path = get_full_path(open_files->data);
-
    return 0;
 }

@@ -590,7 +608,7 @@ int load_open_file(void)
    /* set up the filename, the file buffer, the total number of lines in
       the file, and the total file size */
    filename = mallocstrcpy(filename, open_files->data);
-    fileage = copy_filestruct(open_files->file);
+    fileage = open_files->file;
    current = fileage;
    totlines = open_files->file_totlines;
    totsize = open_files->file_totsize;
@@ -626,95 +644,6 @@ int load_open_file(void)
    return 0;
 }

-/*
- * Search the open_files structure for an entry with the same value for
- * the file_path member as the current entry (i. e. a duplicate entry).
- * If one is found, return a pointer to it; otherwise, return NULL.
- *
- * Note: This should only be called inside open_file_dup_fix().
- */
-filestruct *open_file_dup_search(int update)
-{
-    filestruct *tmp;
-    char *path;
-
-    if (!open_files || !filename)
-	return NULL;
-
-    tmp = open_files;
-    path = get_full_path(filename);
-
-    /* if there's only one entry, handle it */
-    if (!tmp->prev && !tmp->next) {
-	if (!strcmp(tmp->file_path, path))
-	    return tmp;
-    }
-
-    /* otherwise, go to the beginning */
-    while (tmp->prev)
-	tmp = tmp->prev;
-
-    /* and search the entries one by one */
-    while (tmp) {
-
-	if (!strcmp(tmp->file_path, path)) {
-
-	    if (!update)
-		/* if we're making a new entry and there's an entry with
-		   the same full path, we've found a duplicate */
-		return tmp;
-	    else {
-
-		/* if we're updating an existing entry and there's an
-		   entry with the same full path that isn't the current
-		   entry, we've	found a duplicate */
-		if (tmp != open_files) 
-		    return tmp;
-	    }
-	}
-
-	/* go to the next entry */
-	tmp = tmp->next;
-
-    }
-
-    return NULL;
-}
-
-/*
- * Search for duplicate entries in the open_files structure using
- * open_file_dup_search(), and, if one is found, handle it properly.
- * Return 0 if no duplicates were found, and 1 otherwise.
- */
-int open_file_dup_fix(int update)
-{
-    filestruct *tmp = open_file_dup_search(update);
-
-    if (!tmp)
-	return 0;
-
-    /* if there's only one entry, handle it */
-    if (!tmp->prev && !tmp->next)
-	return 1;
-
-    /* otherwise, if we're not updating, the user's trying to load a
-       duplicate; switch to the original instead */
-    if (!update) {
-	open_files = tmp;
-	return 1;
-    }
-
-    /* if we are updating, the filename's been changed via a save; it's
-       thus more recent than the original, so remove the original */
-    else {
-	unlink_node(tmp);
-	free_filestruct(tmp->file);
-	free(tmp->file_path);
-	delete_node(tmp);
-    }
-    return 0;
-}
-
 /*
 * Open the previous entry in the open_files structure.  If closing_file
 * is zero, update the current entry before switching from it.
@@ -727,10 +656,9 @@ int open_prevfile(int closing_file)
 	return 1;

    /* if we're not about to close the current entry, update it before
-       doing anything; since we're only switching, we don't need to check
-       for duplicate entries */
+       doing anything */
    if (!closing_file)
-	add_open_file(1, 0);
+	add_open_file(1);

    if (!open_files->prev && !open_files->next) {

@@ -761,8 +689,12 @@ int open_prevfile(int closing_file)

    }

+/*    free_filestruct(fileage);  // delete this before reloading */
    load_open_file();

+    statusbar(_("Switched to %s"),
+      ((open_files->data[0] == '\0') ? "New Buffer" : open_files->data ));
+
 #ifdef DEBUG
    dump_buffer(current);
 #endif
@@ -770,6 +702,13 @@ int open_prevfile(int closing_file)
    return 0;
 }

+/* This function is used by the shortcut list. */
+int open_prevfile_void(void)
+{
+    open_prevfile(0);
+    return 0;
+}
+
 /*
 * Open the next entry in the open_files structure.  If closing_file is
 * zero, update the current entry before switching from it.  Otherwise, we
@@ -782,10 +721,9 @@ int open_nextfile(int closing_file)
 	return 1;

    /* if we're not about to close the current entry, update it before
-       doing anything; since we're only switching, we don't need to check
-       for duplicate entries */
+       doing anything */
    if (!closing_file)
-	add_open_file(1, 0);
+	add_open_file(1);

    if (!open_files->prev && !open_files->next) {

@@ -818,6 +756,9 @@ int open_nextfile(int closing_file)

    load_open_file();

+    statusbar(_("Switched to %s"),
+      ((open_files->data[0] == '\0') ? "New Buffer" : open_files->data ));
+
 #ifdef DEBUG
    dump_buffer(current);
 #endif
@@ -825,6 +766,13 @@ int open_nextfile(int closing_file)
    return 0;
 }

+/* This function is used by the shortcut list. */
+int open_nextfile_void(void)
+{
+    open_nextfile(0);
+    return 0;
+}
+
 /*
 * Delete an entry from the open_files filestruct.  After deletion of an
 * entry, the next or previous entry is opened, whichever is found first.
@@ -845,16 +793,15 @@ int close_open_file(void)

    unlink_node(tmp);
    free_filestruct(tmp->file);
-    free(tmp->file_path);
    delete_node(tmp);

    shortcut_init(0);
    display_main_list();
    return 0;
 }
-#endif
+#endif /* MULTIBUFFER */

-#if defined (ENABLE_MULTIBUFFER) || !defined (DISABLE_OPERATINGDIR)
+#if !defined (DISABLE_SPELLER) || !defined (DISABLE_OPERATINGDIR)
 /*
 * When passed "[relative path]" or "[relative path][filename]" in
 * origpath, return "[full path]" or "[full path][filename]" on success,
@@ -863,7 +810,7 @@ int close_open_file(void)
 * yet on disk); it is not done if the relative path doesn't exist (since
 * the first call to chdir() will fail then).
 */
-char *get_full_path(char *origpath)
+char *get_full_path(const char *origpath)
 {
    char *newpath = NULL, *last_slash, *d_here, *d_there, *d_there_file, tmp;
    int path_only, last_slash_index;
@@ -1003,7 +950,132 @@ char *get_full_path(char *origpath)

    return newpath;
 }
-#endif /* ENABLE_MULTIBUFFER || !DISABLE_OPERATINGDIR */
+#endif /* !DISABLE_SPELLER || !DISABLE_OPERATINGDIR */
+
+#ifndef DISABLE_SPELLER
+/*
+ * This function accepts a path and returns the full path (via
+ * get_full_path()).  On error, if the path doesn't reference a
+ * directory, or if the directory isn't writable, it returns NULL.
+ */
+char *check_writable_directory(const char *path) {
+
+    char *full_path = get_full_path(path);
+    int writable;
+    struct stat fileinfo;
+
+    /* if get_full_path() failed, return NULL */
+    if (!full_path)
+	return NULL;
+
+    /* otherwise, stat() the full path to see if it's writable by the
+       user; set writable to 1 if it is, or 0 if it isn't */
+    stat(path, &fileinfo);
+    if (fileinfo.st_mode & S_IWUSR)
+	writable = 1;
+    else
+	writable = 0;
+
+    /* if the full path doesn't end in a slash (meaning get_full_path()
+       found that it isn't a directory) or isn't writable, free full_path
+       and return NULL */
+    if (full_path[strlen(full_path) - 1] != '/' || writable == 0) {
+	free(full_path);
+	return NULL;
+    }
+
+    /* otherwise, return the full path */
+    return full_path;
+}
+
+/*
+ * This function accepts a directory name and filename prefix the same
+ * way that tempnam() does, determines the location for its temporary
+ * file the same way that tempnam() does, safely creates the temporary
+ * file there via mkstemp(), and returns the name of the temporary file
+ * the same way that tempnam() does.  It does not reference the value of
+ * TMP_MAX because the total number of random filenames that it can
+ * generate using one prefix is equal to 256**6, which is a sufficiently
+ * large number to handle most cases.  Since the behavior after tempnam()
+ * generates TMP_MAX random filenames is implementation-defined, my
+ * implementation is to go on generating random filenames regardless of
+ * it.
+ */
+char *safe_tempnam(const char *dirname, const char *filename_prefix) {
+
+    char *buf, *tempdir = NULL, *full_tempdir = NULL;
+    int filedesc;
+
+    /* if $TMPDIR is set and non-empty, set tempdir to it, run it through
+       get_full_path(), and save the result in full_tempdir; otherwise,
+       leave full_tempdir set to to NULL */
+    if (getenv("TMPDIR") && strcmp(getenv("TMPDIR"),"")) {
+
+	/* store the value of $TMPDIR in tempdir, run its value through
+	   get_full_path(), and save the result in full_tempdir */
+	tempdir = charalloc(strlen(getenv("TMPDIR")) + 1);
+	sprintf(tempdir, "%s", getenv("TMPDIR"));
+	full_tempdir = check_writable_directory(tempdir);
+
+	/* we don't need the value of tempdir anymore */
+	free(tempdir);
+    }
+
+    if (!full_tempdir) {
+
+	/* if $TMPDIR is blank or isn't set, or isn't a writable
+	   directory, and dirname isn't NULL, try it; otherwise, leave
+	   full_tempdir set to NULL */
+	if (dirname) {
+	    tempdir = charalloc(strlen(dirname) + 1);
+	    strcpy(tempdir, dirname);
+	    full_tempdir = check_writable_directory(tempdir);
+
+	    /* we don't need the value of tempdir anymore */
+	    free(tempdir);
+	}
+    }
+
+    /* if $TMPDIR is blank or isn't set, or if it isn't a writable
+       directory, and dirname is NULL, try P_tmpdir instead */
+    if (!full_tempdir) {
+	tempdir = charalloc(strlen(P_tmpdir) + 1);
+	strcpy(tempdir, P_tmpdir);
+	full_tempdir = check_writable_directory(tempdir);
+
+	/* we don't need the value of tempdir anymore */
+	free(tempdir);
+    }
+
+    /* if P_tmpdir didn't work, use /tmp instead */
+    if (!full_tempdir) {
+	full_tempdir = charalloc(6);
+	strcpy(full_tempdir, "/tmp/");
+    }
+
+    buf = charalloc(strlen(full_tempdir) + 12);
+    sprintf(buf, "%s", full_tempdir);
+
+    /* like tempnam(), use only the first 5 characters of the prefix */
+    strncat(buf, filename_prefix, 5);
+
+    strcat(buf, "XXXXXX");
+    filedesc = mkstemp(buf);
+
+    /* if mkstemp() failed, get out */
+    if (filedesc == -1)
+	return NULL;
+
+    /* otherwise, close the resulting file; afterwards, it'll be 0 bytes
+       long, so delete it; finally, return the filename (all that's left
+       of it) */
+    else {
+	close(filedesc);
+	unlink(buf);
+	return buf;
+    }
+}
+#endif /* !DISABLE_SPELLER */

 #ifndef DISABLE_OPERATINGDIR
 /*
@@ -1014,10 +1086,10 @@ char *get_full_path(char *origpath)
 */
 int check_operating_dir(char *currpath, int allow_tabcomp)
 {
-    /* this is static so that we only need to get it the first time this
-       function is called; also, a relative operating directory path will
+    /* The char *full_operating_dir is global for mem cleanup, and
+       therefore we only need to get it the first time this function
+       is called; also, a relative operating directory path will
       only be handled properly if this is done */
-    static char *full_operating_dir = NULL;

    char *fullpath, *whereami1, *whereami2 = NULL;

@@ -1096,11 +1168,11 @@ int check_operating_dir(char *currpath, int allow_tabcomp)
 int write_file(char *name, int tmp, int append, int nonamechange)
 {
    long size, lineswritten = 0;
-    static char *buf = NULL;
+    char *buf = NULL;
    filestruct *fileptr;
    int fd, mask = 0, realexists, anyexists;
    struct stat st, lst;
-    static char *realname = NULL;
+    char *realname = NULL;

    if (!strcmp(name, "")) {
 	statusbar(_("Cancelled"));
@@ -1308,6 +1380,7 @@ int write_file(char *name, int tmp, int append, int nonamechange)
 int do_writeout(char *path, int exiting, int append)
 {
    int i = 0;
+    char *formatstr = NULL;

 #ifdef NANO_EXTRA
    static int did_cred = 0;
@@ -1315,7 +1388,6 @@ int do_writeout(char *path, int exiting, int append)

 #if !defined(DISABLE_BROWSER) || !defined(DISABLE_MOUSE)
    currshortcut = writefile_list;
-    currslen = WRITEFILE_LIST_LEN;
 #endif

    answer = mallocstrcpy(answer, path);
@@ -1336,24 +1408,32 @@ int do_writeout(char *path, int exiting, int append)

    while (1) {

-	/* Be nice to the translation folks */
 #ifndef NANO_SMALL
+
+	if (ISSET(MAC_FILE))
+	   formatstr = _(" [Mac Format]");
+	else if (ISSET(DOS_FILE))
+	   formatstr = _(" [DOS Format]");
+	else
+	   formatstr = "";
+
+	/* Be nice to the translation folks */
 	if (ISSET(MARK_ISSET) && !exiting) {
 	    if (append)
-		i = statusq(1, writefile_list, WRITEFILE_LIST_LEN, "",
-		    _("Append Selection to File"));
+		i = statusq(1, writefile_list, "",
+		    "%s%s", _("Append Selection to File"), formatstr);
 	    else
-		i = statusq(1, writefile_list, WRITEFILE_LIST_LEN, "",
-		    _("Write Selection to File"));
+		i = statusq(1, writefile_list, "",
+		    "%s%s", _("Write Selection to File"), formatstr);
 	} else
 #endif
 	{
 	    if (append)
-		i = statusq(1, writefile_list, WRITEFILE_LIST_LEN, answer,
-		    _("File Name to Append"));
+		i = statusq(1, writefile_list, answer,
+		    "%s%s", _("File Name to Append"), formatstr);
 	    else
-		i = statusq(1, writefile_list, WRITEFILE_LIST_LEN, answer,
-		    _("File Name to Write"));
+		i = statusq(1, writefile_list, answer,
+		    "%s%s", _("File Name to Write"), formatstr);

 	}

@@ -1366,7 +1446,6 @@ int do_writeout(char *path, int exiting, int append)

 #if !defined(DISABLE_BROWSER) || !defined(DISABLE_MOUSE)
 	    currshortcut = writefile_list;
-	    currslen = WRITEFILE_LIST_LEN;
 #endif

 	    if (tmp != NULL) {
@@ -1375,7 +1454,15 @@ int do_writeout(char *path, int exiting, int append)
 		return do_writeout(answer, exiting, append);
 	} else
 #endif
-	if (i == NANO_APPEND_KEY)
+	if (i == TOGGLE_DOS_KEY) {
+	    UNSET(MAC_FILE);
+	    TOGGLE(DOS_FILE);
+	    return(do_writeout(answer, exiting, append));
+	} else if (i == TOGGLE_MAC_KEY) {
+	    UNSET(DOS_FILE);
+	    TOGGLE(MAC_FILE);
+	    return(do_writeout(answer, exiting, append));
+	} else if (i == NANO_APPEND_KEY)
 	    return(do_writeout(answer, exiting, 1 - append));

 #ifdef DEBUG
@@ -1445,18 +1532,16 @@ int do_writeout(char *path, int exiting, int append)
 	    if (!exiting) {

 		/* first, if the filename was changed during the save,
-		   update the filename and full path stored in the
-		   current entry, and then update the current entry,
-		   checking for duplicate entries */
+		   update the filename stored in the current entry, and
+		   then update the current entry */
 		if (strcmp(open_files->data, filename)) {
 		    open_file_change_name();
-		    add_open_file(1, 1);
+		    add_open_file(1);
 		}
 		else {

-		    /* otherwise, just update the current entry without
-		       checking for duplicate entries */
-		    add_open_file(1, 0);
+		    /* otherwise, just update the current entry */
+		    add_open_file(1);
 		}
 	    }
 #endif
@@ -1970,7 +2055,6 @@ int diralphasort(const void *va, const void *vb) {

 }

-
 /* Initialize the browser code, including the list of files in *path */
 char **browser_init(char *path, int *longest, int *numents)
 {
@@ -2021,7 +2105,7 @@ void free_charptrarray(char **array, int len)
 {
    int i;

-    for (i = 0; i < len - 1; i++)
+    for (i = 0; i < len; i++)
 	free(array[i]);
    free(array);
 }
@@ -2060,7 +2144,10 @@ void striponedir(char *foo)
    if (tmp != foo)
 	*tmp = 0;
    else
+    { /* SPK may need to make a 'default' path here */
+        if (*tmp != '/') *(tmp) = '.';
 	*(tmp+1) = 0;
+    }

    return;
 }
@@ -2101,7 +2188,7 @@ char *do_browser(char *inpath)

    kb = keypad_on(edit, 1);
    titlebar(path);
-    bottombars(browser_list, BROWSER_LIST_LEN);
+    bottombars(browser_list);
    curs_set(0);
    wmove(edit, 0, 0);
    i = 0;
@@ -2116,7 +2203,6 @@ char *do_browser(char *inpath)

 #if !defined DISABLE_HELP || !defined(DISABLE_MOUSE)
 	currshortcut = browser_list;
-	currslen = BROWSER_LIST_LEN;
 #endif

 	editline = 0;
@@ -2255,6 +2341,17 @@ char *do_browser(char *inpath)
 	    }
 #endif

+	    /* SPK for '.' path, get the current path via getcwd */
+	    if (!strcmp(path, "./..")) {
+		free(path);
+		path = getcwd(NULL, 0);
+		striponedir(path);		    
+		align(&path);
+		free_charptrarray(filelist, numents);
+		free(foo);
+		return do_browser(path);
+	    }
+
 	    st = filestat(path);
 	    if (S_ISDIR(st.st_mode)) {
 		if ((test_dir = opendir(path)) == NULL) {
@@ -2275,6 +2372,8 @@ char *do_browser(char *inpath)
 		}

 		/* Start over again with the new path value */
+		free_charptrarray(filelist, numents);
+		free(foo);
 		return do_browser(path);
 	    } else {
 		retval = path;
@@ -2287,8 +2386,8 @@ char *do_browser(char *inpath)
 	case NANO_GOTO_KEY:

 	    curs_set(1);
-	    j = statusq(0, gotodir_list, GOTODIR_LIST_LEN, "", _("Goto Directory"));
-	    bottombars(browser_list, BROWSER_LIST_LEN);
+	    j = statusq(0, gotodir_list, "", _("Goto Directory"));
+	    bottombars(browser_list);
 	    curs_set(0);

 #ifndef DISABLE_OPERATINGDIR
@@ -2309,7 +2408,7 @@ char *do_browser(char *inpath)
 		char *saveanswer = NULL;

 		saveanswer = mallocstrcpy(saveanswer, answer);
-		answer = realloc(answer, strlen(path) + strlen(saveanswer) + 2);
+		answer = nrealloc(answer, strlen(path) + strlen(saveanswer) + 2);
 		sprintf(answer, "%s/%s", path, saveanswer);
 		free(saveanswer);
 	    }
@@ -2462,8 +2561,4 @@ char *do_browse_from(char *inpath)
    return do_browser(tmp);

 }
-
-
-
 #endif
-
--- a/global.c
+++ b/global.c
@@ -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,6 +59,10 @@ 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 */
 long totsize = 0;		/* Total number of bytes in the file */
@@ -76,26 +81,26 @@ 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 go
-				   higher than */
+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;
 #ifndef DISABLE_BROWSER
-shortcut browser_list[BROWSER_LIST_LEN];
+shortcut *browser_list = NULL;
 #endif

 #ifdef ENABLE_COLOR
@@ -104,12 +109,11 @@ shortcut browser_list[BROWSER_LIST_LEN];
 #endif

 #if !defined(DISABLE_BROWSER) || !defined(DISABLE_MOUSE) || !defined (DISABLE_HELP)
-shortcut *currshortcut = main_list;	/* Current shortcut list we're using */
-int currslen = MAIN_VISIBLE;		/* Length of current shortcut list */
+shortcut *currshortcut;			/* Current shortcut list we're using */
 #endif

 #ifndef NANO_SMALL
-toggle toggles[TOGGLE_LEN];
+toggle *toggles = NULL;
 #endif

 /* Regular expressions */
@@ -120,10 +124,33 @@ regmatch_t regmatches[10];	/* Match positions for parenthetical
 				   subexpressions, max of 10 */
 #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;
@@ -132,17 +159,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

@@ -152,17 +191,16 @@ 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, *toggle_dos_msg, *toggle_mac_msg,
-	*toggle_smooth_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");
@@ -173,62 +211,42 @@ void toggle_init(void)
    toggle_cuttoend_msg = _("Cut to end");
    toggle_backwards_msg = _("Backwards search");
    toggle_case_msg = _("Case sensitive search");
+
+#ifdef HAVE_REGEX_H
+    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");
-
-#ifdef HAVE_REGEX_H
-    toggle_regexp_msg = _("Regular expressions");
-#endif
    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);
-    toggle_init_one(&toggles[10], TOGGLE_DOS_KEY, toggle_dos_msg,
-		    DOS_FILE, 0);
-    toggle_init_one(&toggles[11], TOGGLE_MAC_KEY, toggle_mac_msg,
-		    MAC_FILE, 0);
-    toggle_init_one(&toggles[12], TOGGLE_SMOOTH_KEY, toggle_smooth_msg,
-		    SMOOTHSCROLL, 0);
-
-#ifdef ENABLE_MULTIBUFFER
-    toggle_init_one(&toggles[13], TOGGLE_LOAD_KEY, toggle_load_msg,
-		    MULTIBUFFER, 0);
-    toggle_init_one(&toggles[14], NANO_OPENPREV_KEY, nano_openprev_msg,
-		    0, '<');
-    toggle_init_one(&toggles[15], 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)
@@ -245,14 +263,20 @@ void shortcut_init(int unjustify)
 	"", *nano_mark_msg = "", *nano_delete_msg =
 	"", *nano_backspace_msg = "", *nano_tab_msg =
 	"", *nano_enter_msg = "", *nano_cancel_msg = 
-	"", *nano_unjustify_msg = "", *nano_append_msg = ""; 
+	"", *nano_unjustify_msg = "", *nano_append_msg =
+	""; 

 #ifndef NANO_SMALL
    char *nano_tofiles_msg = "", *nano_gotodir_msg = "", *nano_case_msg =
 	"", *nano_reverse_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");
@@ -297,41 +321,50 @@ void shortcut_init(int unjustify)
    nano_cancel_msg = _("Cancel the current function");
    nano_append_msg = _("Append to the current file");
    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

 #ifdef ENABLE_MULTIBUFFER
 	/* this is so we can view multiple files */
-	sc_init_one(&main_list[3], NANO_INSERTFILE_KEY, _("Read File"),
+	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[3], NANO_INSERTFILE_KEY, _("Read File"),
+	sc_init_one(&main_list, NANO_INSERTFILE_KEY, _("Read File"),
 		nano_insert_msg,
 		0, NANO_INSERTFILE_FKEY, 0, NOVIEW, do_insertfile_void);
 #endif
@@ -340,272 +373,437 @@ void shortcut_init(int unjustify)

 #ifdef ENABLE_MULTIBUFFER
 	/* this is so we can view multiple files */
-	sc_init_one(&main_list[4], NANO_INSERTFILE_KEY, _("Read File"),
+	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[4], NANO_INSERTFILE_KEY, _("Read File"),
+	sc_init_one(&main_list, NANO_INSERTFILE_KEY, _("Read File"),
 		nano_insert_msg,
 		0, NANO_INSERTFILE_FKEY, 0, NOVIEW, do_insertfile_void);
 #endif

    else
-	sc_init_one(&main_list[4], 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);

-    sc_init_one(&main_list[5], NANO_WHEREIS_KEY, _("Where Is"),
+    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, 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, 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_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[26], -9, _("Find Other Bracket"),
+    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_HELP_KEY,
+    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[1], NANO_CANCEL_KEY,
+    sc_init_one(&whereis_list, NANO_CANCEL_KEY,
 		_("Cancel"), nano_cancel_msg, 0, 0, 0, VIEW, 0);

-    sc_init_one(&whereis_list[2], NANO_FIRSTLINE_KEY, _("First Line"),
+    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[3], 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[4], 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[5], NANO_FROMSEARCHTOGOTO_KEY,
+    sc_init_one(&whereis_list, NANO_FROMSEARCHTOGOTO_KEY,
 		_("Goto Line"), nano_goto_msg, 0, 0, 0, VIEW,
 		do_gotoline_void);

 #ifndef NANO_SMALL
-    sc_init_one(&whereis_list[6], TOGGLE_CASE_KEY, _("Case Sens"),
+    sc_init_one(&whereis_list, TOGGLE_CASE_KEY, _("Case Sens"),
 		nano_case_msg, 0, 0, 0, VIEW, 0);

-    sc_init_one(&whereis_list[7], TOGGLE_BACKWARDS_KEY, _("Direction"),
+    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[REPLACE_LIST_LEN - 1], TOGGLE_REGEXP_KEY,
+    sc_init_one(&whereis_list, TOGGLE_REGEXP_KEY,
 		_("Regexp"), nano_regexp_msg, 0, 0, 0, VIEW, 0);
 #endif
-#endif /* NANO_SMALL */
+#endif /* !NANO_SMALL */

+    if (replace_list != NULL)
+	free_shortcutage(&replace_list);

-    sc_init_one(&replace_list[0], NANO_HELP_KEY,
+    sc_init_one(&replace_list, NANO_HELP_KEY,
 		_("Get Help"), nano_help_msg, 0, 0, 0, VIEW, do_help);

-    sc_init_one(&replace_list[1], NANO_CANCEL_KEY,
+    sc_init_one(&replace_list, NANO_CANCEL_KEY,
 		_("Cancel"), nano_cancel_msg, 0, 0, 0, VIEW, 0);

-    sc_init_one(&replace_list[2], NANO_FIRSTLINE_KEY, _("First Line"),
+    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[3], 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[4], 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[5], NANO_FROMSEARCHTOGOTO_KEY,
+    sc_init_one(&replace_list, NANO_FROMSEARCHTOGOTO_KEY,
 		_("Goto Line"), nano_goto_msg, 0, 0, 0, VIEW,
 		do_gotoline_void);

 #ifndef NANO_SMALL
-    sc_init_one(&replace_list[6], TOGGLE_CASE_KEY, _("Case Sens"),
+    sc_init_one(&replace_list, TOGGLE_CASE_KEY, _("Case Sens"),
 		nano_case_msg, 0, 0, 0, VIEW, 0);

-    sc_init_one(&replace_list[7], TOGGLE_BACKWARDS_KEY, _("Direction"),
+    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[REPLACE_LIST_LEN - 1], TOGGLE_REGEXP_KEY, 
+    sc_init_one(&replace_list, TOGGLE_REGEXP_KEY, 
 		_("Regexp"), nano_regexp_msg, 0, 0, 0, VIEW, 0);
 #endif
-#endif /* NANO_SMALL */
+#endif /* !NANO_SMALL */

+    if (replace_list_2 != NULL)
+	free_shortcutage(&replace_list_2);

-    sc_init_one(&replace_list_2[0], NANO_HELP_KEY,
+    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[1], NANO_CANCEL_KEY,
+    sc_init_one(&replace_list_2, NANO_CANCEL_KEY,
 		_("Cancel"), nano_cancel_msg, 0, 0, 0, VIEW, 0);

-    sc_init_one(&replace_list_2[2], NANO_FIRSTLINE_KEY, _("First Line"),
+    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[3], 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);

+    if (goto_list != NULL)
+	free_shortcutage(&goto_list);

-    sc_init_one(&goto_list[0], NANO_HELP_KEY,
+    sc_init_one(&goto_list, NANO_HELP_KEY,
 		_("Get Help"), nano_help_msg, 0, 0, 0, VIEW, do_help);

-    sc_init_one(&goto_list[1], NANO_CANCEL_KEY, _("Cancel"),
+    sc_init_one(&goto_list, NANO_CANCEL_KEY, _("Cancel"),
 		nano_cancel_msg, 0, 0, 0, VIEW, 0);

-    sc_init_one(&goto_list[2], 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[3], 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);

+    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, 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, 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[0], NANO_HELP_KEY,
+    sc_init_one(&writefile_list, NANO_HELP_KEY,
 		_("Get Help"), nano_help_msg, 0, 0, 0, VIEW, do_help);

-    sc_init_one(&writefile_list[1], NANO_CANCEL_KEY, _("Cancel"),
-		nano_cancel_msg, 0, 0, 0, VIEW, 0);
-
 #ifndef DISABLE_BROWSER
-    sc_init_one(&writefile_list[2], 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 - 1], 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(&insertfile_list[0], NANO_HELP_KEY,
+    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[1], NANO_CANCEL_KEY, _("Cancel"),
+    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[2], NANO_TOFILES_KEY, _("To Files"),
+    sc_init_one(&insertfile_list, NANO_TOFILES_KEY, _("To Files"),
 		nano_tofiles_msg, 0, 0, 0, NOVIEW, 0);
 #endif

-    sc_init_one(&spell_list[0], NANO_HELP_KEY,
+    sc_init_one(&spell_list, NANO_HELP_KEY,
 		_("Get Help"), nano_help_msg, 0, 0, 0, VIEW, do_help);

-    sc_init_one(&spell_list[1], NANO_CANCEL_KEY, _("Cancel"),
+    sc_init_one(&spell_list, NANO_CANCEL_KEY, _("Cancel"),
 		nano_cancel_msg, 0, 0, 0, VIEW, 0);


 #ifndef DISABLE_BROWSER
-    sc_init_one(&browser_list[0], NANO_HELP_KEY,
+
+    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[1], NANO_EXIT_KEY, _("Exit"),
+    sc_init_one(&browser_list, NANO_EXIT_KEY, _("Exit"),
 		nano_exit_msg, 0, NANO_EXIT_FKEY, 0, VIEW, 0);

-    sc_init_one(&browser_list[2], NANO_PREVPAGE_KEY, _("Prev Page"),
+    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[3], 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[4], 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(&gotodir_list[0], NANO_HELP_KEY,
+    if (gotodir_list != NULL)
+	free_shortcutage(&gotodir_list);
+
+    sc_init_one(&gotodir_list, NANO_HELP_KEY,
 		_("Get Help"), nano_help_msg, 0, 0, 0, VIEW, do_help);

-    sc_init_one(&gotodir_list[1], NANO_CANCEL_KEY, _("Cancel"),
+    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
+
+#ifdef ENABLE_MULTIBUFFER
+    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 */
+
+}
--- a/251
+++ b/251
@@ -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
--- a/intl/ChangeLog
+++ b/intl/ChangeLog
--- a/intl/Makefile.in
+++ b/intl/Makefile.in
@@ -1,19 +1,20 @@
 # Makefile for directory with message catalog handling in GNU NLS Utilities.
-# Copyright (C) 1995, 1996, 1997 Free Software Foundation, Inc.
+# 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@
@@ -28,75 +29,106 @@ VPATH = @srcdir@
 prefix = @prefix@
 exec_prefix = @exec_prefix@
 transform = @program_transform_name@
-libdir = $(exec_prefix)/lib
-includedir = $(prefix)/include
-datadir = $(prefix)/@DATADIRNAME@
+libdir = @libdir@
+includedir = @includedir@
+datadir = @datadir@
 localedir = $(datadir)/locale
-gnulocaledir = $(prefix)/share/locale
-gettextsrcdir = @datadir@/gettext/intl
-aliaspath = $(localedir):.
+gettextsrcdir = $(datadir)/gettext/intl
+aliaspath = $(localedir)
 subdir = intl

 INSTALL = @INSTALL@
 INSTALL_DATA = @INSTALL_DATA@
 MKINSTALLDIRS = @MKINSTALLDIRS@
+mkinstalldirs = $(SHELL) `case "$(MKINSTALLDIRS)" in /*) echo "$(MKINSTALLDIRS)" ;; *) echo "$(top_builddir)/$(MKINSTALLDIRS)" ;; esac`

-l = @l@
+l = @INTL_LIBTOOL_SUFFIX_PREFIX@

 AR = ar
 CC = @CC@
 LIBTOOL = @LIBTOOL@
 RANLIB = @RANLIB@
+YACC = @INTLBISON@ -y -d
+YFLAGS = --name-prefix=__gettext

-DEFS = -DLOCALEDIR=\"$(localedir)\" -DGNULOCALEDIR=\"$(gnulocaledir)\" \
-DLOCALE_ALIAS_PATH=\"$(aliaspath)\" @DEFS@
+DEFS = -DLOCALEDIR=\"$(localedir)\" -DLOCALE_ALIAS_PATH=\"$(aliaspath)\" \
+-DLIBDIR=\"$(libdir)\" @DEFS@
 CPPFLAGS = @CPPFLAGS@
 CFLAGS = @CFLAGS@
 LDFLAGS = @LDFLAGS@

 COMPILE = $(CC) -c $(DEFS) $(INCLUDES) $(CPPFLAGS) $(CFLAGS) $(XCFLAGS)

-HEADERS = $(COMHDRS) libgettext.h loadinfo.h
+HEADERS = $(COMHDRS) libgnuintl.h libgettext.h loadinfo.h
 COMHDRS = gettext.h gettextP.h hash-string.h
-SOURCES = $(COMSRCS) intl-compat.c cat-compat.c
+SOURCES = $(COMSRCS) intl-compat.c
 COMSRCS = bindtextdom.c dcgettext.c dgettext.c gettext.c \
 finddomain.c loadmsgcat.c localealias.c textdomain.c l10nflist.c \
-explodename.c
+explodename.c dcigettext.c dcngettext.c dngettext.c ngettext.c plural.y \
+localcharset.c
 OBJECTS = @INTLOBJS@ bindtextdom.$lo dcgettext.$lo dgettext.$lo gettext.$lo \
 finddomain.$lo loadmsgcat.$lo localealias.$lo textdomain.$lo l10nflist.$lo \
-explodename.$lo
-CATOBJS = cat-compat.$lo ../po/cat-id-tbl.$lo
+explodename.$lo dcigettext.$lo dcngettext.$lo dngettext.$lo ngettext.$lo \
+plural.$lo localcharset.$lo
 GETTOBJS = intl-compat.$lo
-DISTFILES.common = ChangeLog Makefile.in linux-msg.sed po2tbl.sed.in \
-xopen-msg.sed $(HEADERS) $(SOURCES)
+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 intlh.inst.in
+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.
+# Before making a gettext release, the gettext maintainer must change this
+# according to the libtool documentation, section "Library interface versions".
+# Maintainers of other packages that include the intl directory must *not*
+# change these values.
+LTV_CURRENT=1
+LTV_REVISION=1
+LTV_AGE=0

 .SUFFIXES:
-.SUFFIXES: .c .o .lo
+.SUFFIXES: .c .y .o .lo .sin .sed
 .c.o:
 	$(COMPILE) $<
 .c.lo:
 	$(LIBTOOL) --mode=compile $(COMPILE) $<

-INCLUDES = -I.. -I. -I$(top_srcdir)/intl -I$(top_srcdir)/lib
+.y.c:
+	$(YACC) $(YFLAGS) --output $@ $<
+	rm -f $*.h
+
+.sin.sed:
+	sed -e '/^#/d' -e 's/@''PACKAGE''@/@PACKAGE@/g' $< > t-$@
+	mv t-$@ $@
+
+INCLUDES = -I.. -I. -I$(top_srcdir)/intl

 all: all-@USE_INCLUDED_LIBINTL@
+all-yes: libintl.$la libintl.h charset.alias ref-add.sed ref-del.sed
+all-no: all-no-@BUILD_INCLUDED_LIBINTL@
+all-no-yes: libgnuintl.$la
+all-no-no:

-all-yes: libintl.$la intlh.inst
-all-no:
-
-libintl.a: $(OBJECTS)
+libintl.a libgnuintl.a: $(OBJECTS)
 	rm -f $@
 	$(AR) cru $@ $(OBJECTS)
 	$(RANLIB) $@

-libintl.la: $(OBJECTS)
-	$(LIBTOOL) --mode=link $(CC) $(LDFLAGS) -o $@ $(OBJECTS) \
-		   -version-info 1:0 -rpath $(libdir)
+libintl.la libgnuintl.la: $(OBJECTS)
+	$(LIBTOOL) --mode=link \
+	  $(CC) $(CPPFLAGS) $(CFLAGS) $(XCFLAGS) $(LDFLAGS) -o $@ \
+	  $(OBJECTS) @LIBICONV@ \
+	  -version-info $(LTV_CURRENT):$(LTV_REVISION):$(LTV_AGE) \
+	  -rpath $(libdir) \
+	  -no-undefined

-../po/cat-id-tbl.$lo: ../po/cat-id-tbl.c $(top_srcdir)/po/$(PACKAGE).pot
-	cd ../po && $(MAKE) cat-id-tbl.$lo
+libintl.h: libgnuintl.h
+	cp $(srcdir)/libgnuintl.h libintl.h
+
+charset.alias: config.charset
+	$(SHELL) $(srcdir)/config.charset '@host@' > t-$@
+	mv t-$@ $@

 check: all

@@ -104,36 +136,70 @@ check: all
 # only use the library should use install instead.

 # We must not install the libintl.h/libintl.a files if we are on a
-# system which has the gettext() function in its C library or in a
-# separate library or use the catgets interface.  A special case is
-# where configure found a previously installed GNU gettext library.
+# system which has the GNU gettext() function in its C library or in a
+# separate library.
 # If you want to use the one which comes with this version of the
 # package, you have to use `configure --with-included-gettext'.
 install: install-exec install-data
 install-exec: all
 	if test "$(PACKAGE)" = "gettext" \
 	   && test '@INTLOBJS@' = '$(GETTOBJS)'; then \
-	  if test -r $(MKINSTALLDIRS); then \
-	    $(MKINSTALLDIRS) $(libdir) $(includedir); \
+	  $(mkinstalldirs) $(DESTDIR)$(libdir) $(DESTDIR)$(includedir); \
+	  $(INSTALL_DATA) libintl.h $(DESTDIR)$(includedir)/libintl.h; \
+	  $(LIBTOOL) --mode=install \
+	    $(INSTALL_DATA) libintl.$la $(DESTDIR)$(libdir)/libintl.$la; \
+	else \
+	  : ; \
+	fi
+	if test '@USE_INCLUDED_LIBINTL@' = yes; then \
+	  $(mkinstalldirs) $(DESTDIR)$(libdir); \
+	  temp=$(DESTDIR)$(libdir)/t-charset.alias; \
+	  dest=$(DESTDIR)$(libdir)/charset.alias; \
+	  if test -f $(DESTDIR)$(libdir)/charset.alias; then \
+	    orig=$(DESTDIR)$(libdir)/charset.alias; \
+	    sed -f ref-add.sed $$orig > $$temp; \
+	    $(INSTALL_DATA) $$temp $$dest; \
+	    rm -f $$temp; \
 	  else \
-	    $(top_srcdir)/mkinstalldirs $(libdir) $(includedir); \
+	    if test @GLIBC21@ = no; then \
+	      orig=charset.alias; \
+	      sed -f ref-add.sed $$orig > $$temp; \
+	      $(INSTALL_DATA) $$temp $$dest; \
+	      rm -f $$temp; \
+	    fi; \
 	  fi; \
-	  $(INSTALL_DATA) intlh.inst $(includedir)/libintl.h; \
-	  $(INSTALL_DATA) libintl.a $(libdir)/libintl.a; \
+	  $(mkinstalldirs) $(DESTDIR)$(localedir); \
+	  test -f $(DESTDIR)$(localedir)/locale.alias \
+	    && orig=$(DESTDIR)$(localedir)/locale.alias \
+	    || orig=$(srcdir)/locale.alias; \
+	  temp=$(DESTDIR)$(localedir)/t-locale.alias; \
+	  dest=$(DESTDIR)$(localedir)/locale.alias; \
+	  sed -f ref-add.sed $$orig > $$temp; \
+	  $(INSTALL_DATA) $$temp $$dest; \
+	  rm -f $$temp; \
 	else \
 	  : ; \
 	fi
 install-data: all
 	if test "$(PACKAGE)" = "gettext"; then \
-	  if test -r $(MKINSTALLDIRS); then \
-	    $(MKINSTALLDIRS) $(gettextsrcdir); \
-	  else \
-	    $(top_srcdir)/mkinstalldirs $(gettextsrcdir); \
-	  fi; \
-	  $(INSTALL_DATA) VERSION $(gettextsrcdir)/VERSION; \
-	  dists="$(DISTFILES.common)"; \
+	  $(mkinstalldirs) $(DESTDIR)$(gettextsrcdir); \
+	  $(INSTALL_DATA) VERSION $(DESTDIR)$(gettextsrcdir)/VERSION; \
+	  $(INSTALL_DATA) ChangeLog.inst $(DESTDIR)$(gettextsrcdir)/ChangeLog; \
+	  dists="COPYING.LIB-2 COPYING.LIB-2.1 $(DISTFILES.common)"; \
 	  for file in $$dists; do \
-	    $(INSTALL_DATA) $(srcdir)/$$file $(gettextsrcdir)/$$file; \
+	    $(INSTALL_DATA) $(srcdir)/$$file \
+			    $(DESTDIR)$(gettextsrcdir)/$$file; \
+	  done; \
+	  chmod a+x $(DESTDIR)$(gettextsrcdir)/config.charset; \
+	  dists="$(DISTFILES.generated)"; \
+	  for file in $$dists; do \
+	    if test -f $$file; then dir=.; else dir=$(srcdir); fi; \
+	    $(INSTALL_DATA) $$dir/$$file \
+			    $(DESTDIR)$(gettextsrcdir)/$$file; \
+	  done; \
+	  dists="$(DISTFILES.obsolete)"; \
+	  for file in $$dists; do \
+	    rm -f $(DESTDIR)$(gettextsrcdir)/$$file; \
 	  done; \
 	else \
 	  : ; \
@@ -143,14 +209,51 @@ install-data: all
 installcheck:

 uninstall:
-	dists="$(DISTFILES.common)"; \
-	for file in $$dists; do \
-	  rm -f $(gettextsrcdir)/$$file; \
-	done
+	if test "$(PACKAGE)" = "gettext" \
+	   && test '@INTLOBJS@' = '$(GETTOBJS)'; then \
+	  rm -f $(DESTDIR)$(includedir)/libintl.h; \
+	  $(LIBTOOL) --mode=uninstall \
+	    rm -f $(DESTDIR)$(libdir)/libintl.$la; \
+	else \
+	  : ; \
+	fi
+	if test '@USE_INCLUDED_LIBINTL@' = yes; then \
+	  if test -f $(DESTDIR)$(libdir)/charset.alias; then \
+	    temp=$(DESTDIR)$(libdir)/t-charset.alias; \
+	    dest=$(DESTDIR)$(libdir)/charset.alias; \
+	    sed -f ref-del.sed $$dest > $$temp; \
+	    if grep '^# Packages using this file: $$' $$temp > /dev/null; then \
+	      rm -f $$dest; \
+	    else \
+	      $(INSTALL_DATA) $$temp $$dest; \
+	    fi; \
+	    rm -f $$temp; \
+	  fi; \
+	  if test -f $(DESTDIR)$(localedir)/locale.alias; then \
+	    temp=$(DESTDIR)$(localedir)/t-locale.alias; \
+	    dest=$(DESTDIR)$(localedir)/locale.alias; \
+	    sed -f ref-del.sed $$dest > $$temp; \
+	    if grep '^# Packages using this file: $$' $$temp > /dev/null; then \
+	      rm -f $$dest; \
+	    else \
+	      $(INSTALL_DATA) $$temp $$dest; \
+	    fi; \
+	    rm -f $$temp; \
+	  fi; \
+	else \
+	  : ; \
+	fi
+	if test "$(PACKAGE)" = "gettext"; then \
+	  for file in VERSION ChangeLog COPYING.LIB-2 COPYING.LIB-2.1 $(DISTFILES.common) $(DISTFILES.generated); do \
+	    rm -f $(DESTDIR)$(gettextsrcdir)/$$file; \
+	  done; \
+	else \
+	  : ; \
+	fi

 info dvi:

-$(OBJECTS): ../config.h libgettext.h
+$(OBJECTS): ../config.h libgnuintl.h
 bindtextdom.$lo finddomain.$lo loadmsgcat.$lo: gettextP.h gettext.h loadinfo.h
 dcgettext.$lo: gettextP.h gettext.h hash-string.h loadinfo.h

@@ -166,12 +269,19 @@ ID: $(HEADERS) $(SOURCES)


 mostlyclean:
-	rm -f *.a *.o *.lo core core.*
+	rm -f *.a *.la *.o *.lo core core.*
+	rm -f libintl.h charset.alias ref-add.sed ref-del.sed
+	rm -f -r .libs _libs

 clean: mostlyclean

 distclean: clean
-	rm -f Makefile ID TAGS po2msg.sed po2tbl.sed libintl.h
+	rm -f Makefile ID TAGS
+	if test "$(PACKAGE)" = gettext; then \
+	  rm -f ChangeLog.inst $(DISTFILES.normal); \
+	else \
+	  : ; \
+	fi

 maintainer-clean: distclean
 	@echo "This command is intended for maintainers to use;"
@@ -181,34 +291,23 @@ maintainer-clean: distclean
 # GNU gettext needs not contain the file `VERSION' but contains some
 # other files which should not be distributed in other packages.
 distdir = ../$(PACKAGE)-$(VERSION)/$(subdir)
-dist distdir: Makefile $(DISTFILES)
+dist distdir: Makefile
 	if test "$(PACKAGE)" = gettext; then \
 	  additional="$(DISTFILES.gettext)"; \
 	else \
 	  additional="$(DISTFILES.normal)"; \
 	fi; \
-	for file in $(DISTFILES.common) $$additional; do \
-	  ln $(srcdir)/$$file $(distdir) 2> /dev/null \
-	    || cp -p $(srcdir)/$$file $(distdir); \
+	$(MAKE) $(DISTFILES.common) $(DISTFILES.generated) $$additional; \
+	for file in ChangeLog $(DISTFILES.common) $(DISTFILES.generated) $$additional; do \
+	  if test -f $$file; then dir=.; else dir=$(srcdir); fi; \
+	  ln $$dir/$$file $(distdir) 2> /dev/null \
+	    || cp -p $$dir/$$file $(distdir); \
 	done

-dist-libc:
-	tar zcvf intl-glibc.tar.gz $(COMSRCS) $(COMHDRS) libintl.h.glibc
-
 Makefile: Makefile.in ../config.status
 	cd .. \
 	  && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status

-# The dependency for intlh.inst is different in gettext and all other
-# packages.  Because we cannot you GNU make features we have to solve
-# the problem while rewriting Makefile.in.
-@GT_YES@intlh.inst: intlh.inst.in ../config.status
-@GT_YES@	cd .. \
-@GT_YES@	&& CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= \
-@GT_YES@	  $(SHELL) ./config.status
-@GT_NO@.PHONY: intlh.inst
-@GT_NO@intlh.inst:
-
 # Tell versions [3.59,3.63) of GNU make not to export all variables.
 # Otherwise a system limit (for SysV at least) may be exceeded.
 .NOEXPORT:
--- a/intl/VERSION
+++ b/intl/VERSION
@@ -1 +1 @@
-GNU gettext library from gettext-0.10.35
+GNU gettext library from gettext-0.10.40
--- a/intl/bindtextdom.c
+++ b/intl/bindtextdom.c
@@ -1,51 +1,59 @@
 /* Implementation of the bindtextdomain(3) function
-   Copyright (C) 1995, 1996, 1997, 1998 Free Software Foundation, Inc.
+   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>
 #endif

-#if defined STDC_HEADERS || defined _LIBC
-# include <stdlib.h>
-#else
-# ifdef HAVE_MALLOC_H
-#  include <malloc.h>
-# else
-void free ();
-# endif
-#endif
-
-#if defined HAVE_STRING_H || defined _LIBC
-# include <string.h>
-#else
-# include <strings.h>
-# ifndef memcpy
-#  define memcpy(Dst, Src, Num) bcopy (Src, Dst, Num)
-# endif
-#endif
+#include <stddef.h>
+#include <stdlib.h>
+#include <string.h>

 #ifdef _LIBC
 # include <libintl.h>
 #else
-# include "libgettext.h"
+# include "libgnuintl.h"
 #endif
-#include "gettext.h"
 #include "gettextP.h"

+#ifdef _LIBC
+/* We have to handle multi-threaded applications.  */
+# include <bits/libc-lock.h>
+#else
+/* Provide dummy implementation if this is outside glibc.  */
+# define __libc_rwlock_define(CLASS, NAME)
+# define __libc_rwlock_wrlock(NAME)
+# define __libc_rwlock_unlock(NAME)
+#endif
+
+/* The internal variables in the standalone libintl.a must have different
+   names than the internal variables in GNU libc, otherwise programs
+   using libintl.a cannot be linked statically.  */
+#if !defined _LIBC
+# define _nl_default_dirname _nl_default_dirname__
+# define _nl_domain_bindings _nl_domain_bindings__
+#endif
+
+/* Some compilers, like SunOS4 cc, don't have offsetof in <stddef.h>.  */
+#ifndef offsetof
+# define offsetof(type,ident) ((size_t)&(((type*)0)->ident))
+#endif
+
 /* @@ end of prolog @@ */

 /* Contains the default location of the message catalogs.  */
@@ -54,6 +62,9 @@ extern const char _nl_default_dirname[];
 /* List with bindings of specific domains.  */
 extern struct binding *_nl_domain_bindings;

+/* Lock variable to protect the global data in the gettext implementation.  */
+__libc_rwlock_define (extern, _nl_state_lock)
+

 /* Names for the libintl functions are a problem.  They must not clash
   with existing names and they should follow ANSI C.  But this source
@@ -61,25 +72,48 @@ extern struct binding *_nl_domain_bindings;
   prefix.  So we have to make a difference here.  */
 #ifdef _LIBC
 # define BINDTEXTDOMAIN __bindtextdomain
+# define BIND_TEXTDOMAIN_CODESET __bind_textdomain_codeset
 # ifndef strdup
 #  define strdup(str) __strdup (str)
 # endif
 #else
 # define BINDTEXTDOMAIN bindtextdomain__
+# define BIND_TEXTDOMAIN_CODESET bind_textdomain_codeset__
 #endif

-/* Specify that the DOMAINNAME message catalog will be found
-   in DIRNAME rather than in the system locale data base.  */
-char *
-BINDTEXTDOMAIN (domainname, dirname)
+/* Prototypes for local functions.  */
+static void set_binding_values PARAMS ((const char *domainname,
+					const char **dirnamep,
+					const char **codesetp));
+     
+/* Specifies the directory name *DIRNAMEP and the output codeset *CODESETP
+   to be used for the DOMAINNAME message catalog.
+   If *DIRNAMEP or *CODESETP is NULL, the corresponding attribute is not
+   modified, only the current value is returned.
+   If DIRNAMEP or CODESETP is NULL, the corresponding attribute is neither
+   modified nor returned.  */
+static void
+set_binding_values (domainname, dirnamep, codesetp)
     const char *domainname;
-     const char *dirname;
+     const char **dirnamep;
+     const char **codesetp;
 {
  struct binding *binding;
+  int modified;

  /* Some sanity checks.  */
  if (domainname == NULL || domainname[0] == '\0')
-    return NULL;
+    {
+      if (dirnamep)
+	*dirnamep = NULL;
+      if (codesetp)
+	*codesetp = NULL;
+      return;
+    }
+
+  __libc_rwlock_wrlock (_nl_state_lock);
+
+  modified = 0;

  for (binding = _nl_domain_bindings; binding != NULL; binding = binding->next)
    {
@@ -95,83 +129,173 @@ BINDTEXTDOMAIN (domainname, dirname)
 	}
    }

-  if (dirname == NULL)
-    /* The current binding has be to returned.  */
-    return binding == NULL ? (char *) _nl_default_dirname : binding->dirname;
-
  if (binding != NULL)
    {
-      /* The domain is already bound.  If the new value and the old
-	 one are equal we simply do nothing.  Otherwise replace the
-	 old binding.  */
-      if (strcmp (dirname, binding->dirname) != 0)
+      if (dirnamep)
 	{
-	  char *new_dirname;
+	  const char *dirname = *dirnamep;

-	  if (strcmp (dirname, _nl_default_dirname) == 0)
-	    new_dirname = (char *) _nl_default_dirname;
+	  if (dirname == NULL)
+	    /* The current binding has be to returned.  */
+	    *dirnamep = binding->dirname;
 	  else
 	    {
+	      /* The domain is already bound.  If the new value and the old
+		 one are equal we simply do nothing.  Otherwise replace the
+		 old binding.  */
+	      char *result = binding->dirname;
+	      if (strcmp (dirname, result) != 0)
+		{
+		  if (strcmp (dirname, _nl_default_dirname) == 0)
+		    result = (char *) _nl_default_dirname;
+		  else
+		    {
 #if defined _LIBC || defined HAVE_STRDUP
-	      new_dirname = strdup (dirname);
-	      if (new_dirname == NULL)
-		return NULL;
+		      result = strdup (dirname);
 #else
-	      size_t len = strlen (dirname) + 1;
-	      new_dirname = (char *) malloc (len);
-	      if (new_dirname == NULL)
-		return NULL;
-
-	      memcpy (new_dirname, dirname, len);
+		      size_t len = strlen (dirname) + 1;
+		      result = (char *) malloc (len);
+		      if (__builtin_expect (result != NULL, 1))
+			memcpy (result, dirname, len);
 #endif
+		    }
+
+		  if (__builtin_expect (result != NULL, 1))
+		    {
+		      if (binding->dirname != _nl_default_dirname)
+			free (binding->dirname);
+
+		      binding->dirname = result;
+		      modified = 1;
+		    }
+		}
+	      *dirnamep = result;
 	    }
-
-	  if (binding->dirname != _nl_default_dirname)
-	    free (binding->dirname);
-
-	  binding->dirname = new_dirname;
 	}
+
+      if (codesetp)
+	{
+	  const char *codeset = *codesetp;
+
+	  if (codeset == NULL)
+	    /* The current binding has be to returned.  */
+	    *codesetp = binding->codeset;
+	  else
+	    {
+	      /* The domain is already bound.  If the new value and the old
+		 one are equal we simply do nothing.  Otherwise replace the
+		 old binding.  */
+	      char *result = binding->codeset;
+	      if (result == NULL || strcmp (codeset, result) != 0)
+		{
+#if defined _LIBC || defined HAVE_STRDUP
+		  result = strdup (codeset);
+#else
+		  size_t len = strlen (codeset) + 1;
+		  result = (char *) malloc (len);
+		  if (__builtin_expect (result != NULL, 1))
+		    memcpy (result, codeset, len);
+#endif
+
+		  if (__builtin_expect (result != NULL, 1))
+		    {
+		      if (binding->codeset != NULL)
+			free (binding->codeset);
+
+		      binding->codeset = result;
+		      binding->codeset_cntr++;
+		      modified = 1;
+		    }
+		}
+	      *codesetp = result;
+	    }
+	}
+    }
+  else if ((dirnamep == NULL || *dirnamep == NULL)
+	   && (codesetp == NULL || *codesetp == NULL))
+    {
+      /* Simply return the default values.  */
+      if (dirnamep)
+	*dirnamep = _nl_default_dirname;
+      if (codesetp)
+	*codesetp = NULL;
    }
  else
    {
      /* We have to create a new binding.  */
-#if !defined _LIBC && !defined HAVE_STRDUP
-      size_t len;
-#endif
+      size_t len = strlen (domainname) + 1;
      struct binding *new_binding =
-	(struct binding *) malloc (sizeof (*new_binding));
+	(struct binding *) malloc (offsetof (struct binding, domainname) + len);

-      if (new_binding == NULL)
-	return NULL;
+      if (__builtin_expect (new_binding == NULL, 0))
+	goto failed;

-#if defined _LIBC || defined HAVE_STRDUP
-      new_binding->domainname = strdup (domainname);
-      if (new_binding->domainname == NULL)
-	return NULL;
-#else
-      len = strlen (domainname) + 1;
-      new_binding->domainname = (char *) malloc (len);
-      if (new_binding->domainname == NULL)
-	return NULL;
      memcpy (new_binding->domainname, domainname, len);
-#endif

-      if (strcmp (dirname, _nl_default_dirname) == 0)
-	new_binding->dirname = (char *) _nl_default_dirname;
-      else
+      if (dirnamep)
 	{
+	  const char *dirname = *dirnamep;
+
+	  if (dirname == NULL)
+	    /* The default value.  */
+	    dirname = _nl_default_dirname;
+	  else
+	    {
+	      if (strcmp (dirname, _nl_default_dirname) == 0)
+		dirname = _nl_default_dirname;
+	      else
+		{
+		  char *result;
 #if defined _LIBC || defined HAVE_STRDUP
-	  new_binding->dirname = strdup (dirname);
-	  if (new_binding->dirname == NULL)
-	    return NULL;
+		  result = strdup (dirname);
+		  if (__builtin_expect (result == NULL, 0))
+		    goto failed_dirname;
 #else
-	  len = strlen (dirname) + 1;
-	  new_binding->dirname = (char *) malloc (len);
-	  if (new_binding->dirname == NULL)
-	    return NULL;
-	  memcpy (new_binding->dirname, dirname, len);
+		  size_t len = strlen (dirname) + 1;
+		  result = (char *) malloc (len);
+		  if (__builtin_expect (result == NULL, 0))
+		    goto failed_dirname;
+		  memcpy (result, dirname, len);
 #endif
+		  dirname = result;
+		}
+	    }
+	  *dirnamep = dirname;
+	  new_binding->dirname = (char *) dirname;
 	}
+      else
+	/* The default value.  */
+	new_binding->dirname = (char *) _nl_default_dirname;
+
+      new_binding->codeset_cntr = 0;
+
+      if (codesetp)
+	{
+	  const char *codeset = *codesetp;
+
+	  if (codeset != NULL)
+	    {
+	      char *result;
+
+#if defined _LIBC || defined HAVE_STRDUP
+	      result = strdup (codeset);
+	      if (__builtin_expect (result == NULL, 0))
+		goto failed_codeset;
+#else
+	      size_t len = strlen (codeset) + 1;
+	      result = (char *) malloc (len);
+	      if (__builtin_expect (result == NULL, 0))
+		goto failed_codeset;
+	      memcpy (result, codeset, len);
+#endif
+	      codeset = result;
+	      new_binding->codeset_cntr++;
+	    }
+	  *codesetp = codeset;
+	  new_binding->codeset = (char *) codeset;
+	}
+      else
+	new_binding->codeset = NULL;

      /* Now enqueue it.  */
      if (_nl_domain_bindings == NULL
@@ -191,13 +315,55 @@ BINDTEXTDOMAIN (domainname, dirname)
 	  binding->next = new_binding;
 	}

-      binding = new_binding;
+      modified = 1;
+
+      /* Here we deal with memory allocation failures.  */
+      if (0)
+	{
+	failed_codeset:
+	  if (new_binding->dirname != _nl_default_dirname)
+	    free (new_binding->dirname);
+	failed_dirname:
+	  free (new_binding);
+	failed:
+	  if (dirnamep)
+	    *dirnamep = NULL;
+	  if (codesetp)
+	    *codesetp = NULL;
+	}
    }

-  return binding->dirname;
+  /* If we modified any binding, we flush the caches.  */
+  if (modified)
+    ++_nl_msg_cat_cntr;
+
+  __libc_rwlock_unlock (_nl_state_lock);
+}
+
+/* Specify that the DOMAINNAME message catalog will be found
+   in DIRNAME rather than in the system locale data base.  */
+char *
+BINDTEXTDOMAIN (domainname, dirname)
+     const char *domainname;
+     const char *dirname;
+{
+  set_binding_values (domainname, &dirname, NULL);
+  return (char *) dirname;
+}
+
+/* Specify the character encoding in which the messages from the
+   DOMAINNAME message catalog will be returned.  */
+char *
+BIND_TEXTDOMAIN_CODESET (domainname, codeset)
+     const char *domainname;
+     const char *codeset;
+{
+  set_binding_values (domainname, NULL, &codeset);
+  return (char *) codeset;
 }

 #ifdef _LIBC
-/* Alias for function name in GNU C Library.  */
+/* Aliases for function names in GNU C Library.  */
 weak_alias (__bindtextdomain, bindtextdomain);
+weak_alias (__bind_textdomain_codeset, bind_textdomain_codeset);
 #endif
--- a/intl/cat-compat.c
+++ b/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
--- a/intl/config.charset
+++ b/intl/config.charset
@@ -0,0 +1,438 @@
+#! /bin/sh
+# Output a system dependent table of character encoding aliases.
+#
+#   Copyright (C) 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 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
+#   Library General Public License for more details.
+#
+#   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 table consists of lines of the form
+#    ALIAS  CANONICAL
+#
+# ALIAS is the (system dependent) result of "nl_langinfo (CODESET)".
+# ALIAS is compared in a case sensitive way.
+#
+# CANONICAL is the GNU canonical name for this character encoding.
+# It must be an encoding supported by libiconv. Support by GNU libc is
+# also desirable. CANONICAL is case insensitive. Usually an upper case
+# MIME charset name is preferred.
+# The current list of GNU canonical charset names is as follows.
+#
+#       name                         used by which systems         a MIME name?
+#   ASCII, ANSI_X3.4-1968     glibc solaris freebsd
+#   ISO-8859-1                glibc aix hpux irix osf solaris freebsd   yes
+#   ISO-8859-2                glibc aix hpux irix osf solaris freebsd   yes
+#   ISO-8859-3                glibc                                     yes
+#   ISO-8859-4                osf solaris freebsd                       yes
+#   ISO-8859-5                glibc aix hpux irix osf solaris freebsd   yes
+#   ISO-8859-6                glibc aix hpux solaris                    yes
+#   ISO-8859-7                glibc aix hpux irix osf solaris           yes
+#   ISO-8859-8                glibc aix hpux osf solaris                yes
+#   ISO-8859-9                glibc aix hpux irix osf solaris           yes
+#   ISO-8859-13               glibc
+#   ISO-8859-15               glibc aix osf solaris freebsd
+#   KOI8-R                    glibc solaris freebsd                     yes
+#   KOI8-U                    glibc freebsd                             yes
+#   CP437                     dos
+#   CP775                     dos
+#   CP850                     aix osf dos
+#   CP852                     dos
+#   CP855                     dos
+#   CP856                     aix
+#   CP857                     dos
+#   CP861                     dos
+#   CP862                     dos
+#   CP864                     dos
+#   CP865                     dos
+#   CP866                     freebsd dos
+#   CP869                     dos
+#   CP874                     win32 dos
+#   CP922                     aix
+#   CP932                     aix win32 dos
+#   CP943                     aix
+#   CP949                     osf win32 dos
+#   CP950                     win32 dos
+#   CP1046                    aix
+#   CP1124                    aix
+#   CP1129                    aix
+#   CP1250                    win32
+#   CP1251                    glibc win32
+#   CP1252                    aix win32
+#   CP1253                    win32
+#   CP1254                    win32
+#   CP1255                    win32
+#   CP1256                    win32
+#   CP1257                    win32
+#   GB2312                    glibc aix hpux irix solaris freebsd       yes
+#   EUC-JP                    glibc aix hpux irix osf solaris freebsd   yes
+#   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
+#   BIG5-HKSCS                glibc
+#   GBK                       aix osf win32 dos
+#   GB18030                   glibc
+#   SHIFT_JIS                 hpux osf solaris freebsd                  yes
+#   JOHAB                     glibc win32
+#   TIS-620                   glibc aix hpux osf solaris
+#   VISCII                    glibc                                     yes
+#   HP-ROMAN8                 hpux
+#   HP-ARABIC8                hpux
+#   HP-GREEK8                 hpux
+#   HP-HEBREW8                hpux
+#   HP-TURKISH8               hpux
+#   HP-KANA8                  hpux
+#   DEC-KANJI                 osf
+#   DEC-HANYU                 osf
+#   UTF-8                     glibc aix hpux osf solaris                yes
+#
+# Note: Names which are not marked as being a MIME name should not be used in
+# Internet protocols for information interchange (mail, news, etc.).
+#
+# Note: ASCII and ANSI_X3.4-1968 are synonymous canonical names. Applications
+# must understand both names and treat them as equivalent.
+#
+# The first argument passed to this file is the canonical host specification,
+#    CPU_TYPE-MANUFACTURER-OPERATING_SYSTEM
+# or
+#    CPU_TYPE-MANUFACTURER-KERNEL-OPERATING_SYSTEM
+
+host="$1"
+os=`echo "$host" | sed -e 's/^[^-]*-[^-]*-\(.*\)$/\1/'`
+echo "# This file contains a table of character encoding aliases,"
+echo "# suitable for operating system '${os}'."
+echo "# It was automatically generated from config.charset."
+# List of references, updated during installation:
+echo "# Packages using this file: "
+case "$os" in
+    linux* | *-gnu*)
+	# With glibc-2.1 or newer, we don't need any canonicalization,
+	# because glibc has iconv and both glibc and libiconv support all
+	# GNU canonical names directly. Therefore, the Makefile does not
+	# need to install the alias file at all.
+	# The following applies only to glibc-2.0.x and older libcs.
+	echo "ISO_646.IRV:1983 ASCII"
+	;;
+    aix*)
+	echo "ISO8859-1 ISO-8859-1"
+	echo "ISO8859-2 ISO-8859-2"
+	echo "ISO8859-5 ISO-8859-5"
+	echo "ISO8859-6 ISO-8859-6"
+	echo "ISO8859-7 ISO-8859-7"
+	echo "ISO8859-8 ISO-8859-8"
+	echo "ISO8859-9 ISO-8859-9"
+	echo "ISO8859-15 ISO-8859-15"
+	echo "IBM-850 CP850"
+	echo "IBM-856 CP856"
+	echo "IBM-921 ISO-8859-13"
+	echo "IBM-922 CP922"
+	echo "IBM-932 CP932"
+	echo "IBM-943 CP943"
+	echo "IBM-1046 CP1046"
+	echo "IBM-1124 CP1124"
+	echo "IBM-1129 CP1129"
+	echo "IBM-1252 CP1252"
+	echo "IBM-eucCN GB2312"
+	echo "IBM-eucJP EUC-JP"
+	echo "IBM-eucKR EUC-KR"
+	echo "IBM-eucTW EUC-TW"
+	echo "big5 BIG5"
+	echo "GBK GBK"
+	echo "TIS-620 TIS-620"
+	echo "UTF-8 UTF-8"
+	;;
+    hpux*)
+	echo "iso88591 ISO-8859-1"
+	echo "iso88592 ISO-8859-2"
+	echo "iso88595 ISO-8859-5"
+	echo "iso88596 ISO-8859-6"
+	echo "iso88597 ISO-8859-7"
+	echo "iso88598 ISO-8859-8"
+	echo "iso88599 ISO-8859-9"
+	echo "iso885915 ISO-8859-15"
+	echo "roman8 HP-ROMAN8"
+	echo "arabic8 HP-ARABIC8"
+	echo "greek8 HP-GREEK8"
+	echo "hebrew8 HP-HEBREW8"
+	echo "turkish8 HP-TURKISH8"
+	echo "kana8 HP-KANA8"
+	echo "tis620 TIS-620"
+	echo "big5 BIG5"
+	echo "eucJP EUC-JP"
+	echo "eucKR EUC-KR"
+	echo "eucTW EUC-TW"
+	echo "hp15CN GB2312"
+	#echo "ccdc ?" # what is this?
+	echo "SJIS SHIFT_JIS"
+	echo "utf8 UTF-8"
+	;;
+    irix*)
+	echo "ISO8859-1 ISO-8859-1"
+	echo "ISO8859-2 ISO-8859-2"
+	echo "ISO8859-5 ISO-8859-5"
+	echo "ISO8859-7 ISO-8859-7"
+	echo "ISO8859-9 ISO-8859-9"
+	echo "eucCN GB2312"
+	echo "eucJP EUC-JP"
+	echo "eucKR EUC-KR"
+	echo "eucTW EUC-TW"
+	;;
+    osf*)
+	echo "ISO8859-1 ISO-8859-1"
+	echo "ISO8859-2 ISO-8859-2"
+	echo "ISO8859-4 ISO-8859-4"
+	echo "ISO8859-5 ISO-8859-5"
+	echo "ISO8859-7 ISO-8859-7"
+	echo "ISO8859-8 ISO-8859-8"
+	echo "ISO8859-9 ISO-8859-9"
+	echo "ISO8859-15 ISO-8859-15"
+	echo "cp850 CP850"
+	echo "big5 BIG5"
+	echo "dechanyu DEC-HANYU"
+	echo "dechanzi GB2312"
+	echo "deckanji DEC-KANJI"
+	echo "deckorean EUC-KR"
+	echo "eucJP EUC-JP"
+	echo "eucKR EUC-KR"
+	echo "eucTW EUC-TW"
+	echo "GBK GBK"
+	echo "KSC5601 CP949"
+	echo "sdeckanji EUC-JP"
+	echo "SJIS SHIFT_JIS"
+	echo "TACTIS TIS-620"
+	echo "UTF-8 UTF-8"
+	;;
+    solaris*)
+	echo "646 ASCII"
+	echo "ISO8859-1 ISO-8859-1"
+	echo "ISO8859-2 ISO-8859-2"
+	echo "ISO8859-4 ISO-8859-4"
+	echo "ISO8859-5 ISO-8859-5"
+	echo "ISO8859-6 ISO-8859-6"
+	echo "ISO8859-7 ISO-8859-7"
+	echo "ISO8859-8 ISO-8859-8"
+	echo "ISO8859-9 ISO-8859-9"
+	echo "ISO8859-15 ISO-8859-15"
+	echo "koi8-r KOI8-R"
+	echo "BIG5 BIG5"
+	echo "gb2312 GB2312"
+	echo "cns11643 EUC-TW"
+	echo "5601 EUC-KR"
+	echo "eucJP EUC-JP"
+	echo "PCK SHIFT_JIS"
+	echo "TIS620.2533 TIS-620"
+	#echo "sun_eu_greek ?" # what is this?
+	echo "UTF-8 UTF-8"
+	;;
+    freebsd*)
+	# FreeBSD 4.2 doesn't have nl_langinfo(CODESET); therefore
+	# localcharset.c falls back to using the full locale name
+	# from the environment variables.
+	echo "C ASCII"
+	echo "US-ASCII ASCII"
+	for l in la_LN lt_LN; do
+	  echo "$l.ASCII ASCII"
+	done
+	for l in da_DK de_AT de_CH de_DE en_AU en_CA en_GB en_US es_ES \
+	         fi_FI fr_BE fr_CA fr_CH fr_FR is_IS it_CH it_IT la_LN \
+	         lt_LN nl_BE nl_NL no_NO pt_PT sv_SE; do
+	  echo "$l.ISO_8859-1 ISO-8859-1"
+	  echo "$l.DIS_8859-15 ISO-8859-15"
+	done
+	for l in cs_CZ hr_HR hu_HU la_LN lt_LN pl_PL sl_SI; do
+	  echo "$l.ISO_8859-2 ISO-8859-2"
+	done
+	for l in la_LN lt_LT; do
+	  echo "$l.ISO_8859-4 ISO-8859-4"
+	done
+	for l in ru_RU ru_SU; do
+	  echo "$l.KOI8-R KOI8-R"
+	  echo "$l.ISO_8859-5 ISO-8859-5"
+	  echo "$l.CP866 CP866"
+	done
+	echo "uk_UA.KOI8-U KOI8-U"
+	echo "zh_TW.BIG5 BIG5"
+	echo "zh_TW.Big5 BIG5"
+	echo "zh_CN.EUC GB2312"
+	echo "ja_JP.EUC EUC-JP"
+	echo "ja_JP.SJIS SHIFT_JIS"
+	echo "ja_JP.Shift_JIS SHIFT_JIS"
+	echo "ko_KR.EUC EUC-KR"
+	;;
+    beos*)
+	# BeOS has a single locale, and it has UTF-8 encoding.
+	echo "* UTF-8"
+	;;
+    msdosdjgpp*)
+	# DJGPP 2.03 doesn't have nl_langinfo(CODESET); therefore
+	# localcharset.c falls back to using the full locale name
+	# from the environment variables.
+	echo "#"
+	echo "# The encodings given here may not all be correct."
+	echo "# If you find that the encoding given for your language and"
+	echo "# country is not the one your DOS machine actually uses, just"
+	echo "# correct it in this file, and send a mail to"
+	echo "# Juan Manuel Guerrero <st001906@hrz1.hrz.tu-darmstadt.de>"
+	echo "# and Bruno Haible <haible@clisp.cons.org>."
+	echo "#"
+	echo "C ASCII"
+	# ISO-8859-1 languages
+	echo "ca CP850"
+	echo "ca_ES CP850"
+	echo "da CP865"    # not CP850 ??
+	echo "da_DK CP865" # not CP850 ??
+	echo "de CP850"
+	echo "de_AT CP850"
+	echo "de_CH CP850"
+	echo "de_DE CP850"
+	echo "en CP850"
+	echo "en_AU CP850" # not CP437 ??
+	echo "en_CA CP850"
+	echo "en_GB CP850"
+	echo "en_NZ CP437"
+	echo "en_US CP437"
+	echo "en_ZA CP850" # not CP437 ??
+	echo "es CP850"
+	echo "es_AR CP850"
+	echo "es_BO CP850"
+	echo "es_CL CP850"
+	echo "es_CO CP850"
+	echo "es_CR CP850"
+	echo "es_CU CP850"
+	echo "es_DO CP850"
+	echo "es_EC CP850"
+	echo "es_ES CP850"
+	echo "es_GT CP850"
+	echo "es_HN CP850"
+	echo "es_MX CP850"
+	echo "es_NI CP850"
+	echo "es_PA CP850"
+	echo "es_PY CP850"
+	echo "es_PE CP850"
+	echo "es_SV CP850"
+	echo "es_UY CP850"
+	echo "es_VE CP850"
+	echo "et CP850"
+	echo "et_EE CP850"
+	echo "eu CP850"
+	echo "eu_ES CP850"
+	echo "fi CP850"
+	echo "fi_FI CP850"
+	echo "fr CP850"
+	echo "fr_BE CP850"
+	echo "fr_CA CP850"
+	echo "fr_CH CP850"
+	echo "fr_FR CP850"
+	echo "ga CP850"
+	echo "ga_IE CP850"
+	echo "gd CP850"
+	echo "gd_GB CP850"
+	echo "gl CP850"
+	echo "gl_ES CP850"
+	echo "id CP850"    # not CP437 ??
+	echo "id_ID CP850" # not CP437 ??
+	echo "is CP861"    # not CP850 ??
+	echo "is_IS CP861" # not CP850 ??
+	echo "it CP850"
+	echo "it_CH CP850"
+	echo "it_IT CP850"
+	echo "lt CP775"
+	echo "lt_LT CP775"
+	echo "lv CP775"
+	echo "lv_LV CP775"
+	echo "nb CP865"    # not CP850 ??
+	echo "nb_NO CP865" # not CP850 ??
+	echo "nl CP850"
+	echo "nl_BE CP850"
+	echo "nl_NL CP850"
+	echo "nn CP865"    # not CP850 ??
+	echo "nn_NO CP865" # not CP850 ??
+	echo "no CP865"    # not CP850 ??
+	echo "no_NO CP865" # not CP850 ??
+	echo "pt CP850"
+	echo "pt_BR CP850"
+	echo "pt_PT CP850"
+	echo "sv CP850"
+	echo "sv_SE CP850"
+	# ISO-8859-2 languages
+	echo "cs CP852"
+	echo "cs_CZ CP852"
+	echo "hr CP852"
+	echo "hr_HR CP852"
+	echo "hu CP852"
+	echo "hu_HU CP852"
+	echo "pl CP852"
+	echo "pl_PL CP852"
+	echo "ro CP852"
+	echo "ro_RO CP852"
+	echo "sk CP852"
+	echo "sk_SK CP852"
+	echo "sl CP852"
+	echo "sl_SI CP852"
+	echo "sq CP852"
+	echo "sq_AL CP852"
+	echo "sr CP852"    # CP852 or CP866 or CP855 ??
+	echo "sr_YU CP852" # CP852 or CP866 or CP855 ??
+	# ISO-8859-3 languages
+	echo "mt CP850"
+	echo "mt_MT CP850"
+	# ISO-8859-5 languages
+	echo "be CP866"
+	echo "be_BE CP866"
+	echo "bg CP866"    # not CP855 ??
+	echo "bg_BG CP866" # not CP855 ??
+	echo "mk CP866"    # not CP855 ??
+	echo "mk_MK CP866" # not CP855 ??
+	echo "ru KOI8-R"    # not CP866 ??
+	echo "ru_RU KOI8-R" # not CP866 ??
+	# ISO-8859-6 languages
+	echo "ar CP864"
+	echo "ar_AE CP864"
+	echo "ar_DZ CP864"
+	echo "ar_EG CP864"
+	echo "ar_IQ CP864"
+	echo "ar_IR CP864"
+	echo "ar_JO CP864"
+	echo "ar_KW CP864"
+	echo "ar_MA CP864"
+	echo "ar_OM CP864"
+	echo "ar_QA CP864"
+	echo "ar_SA CP864"
+	echo "ar_SY CP864"
+	# ISO-8859-7 languages
+	echo "el CP869"
+	echo "el_GR CP869"
+	# ISO-8859-8 languages
+	echo "he CP862"
+	echo "he_IL CP862"
+	# ISO-8859-9 languages
+	echo "tr CP857"
+	echo "tr_TR CP857"
+	# Japanese
+	echo "ja CP932"
+	echo "ja_JP CP932"
+	# Chinese
+	echo "zh_CN GBK"
+	echo "zh_TW CP950" # not CP938 ??
+	# Korean
+	echo "kr CP949"    # not CP934 ??
+	echo "kr_KR CP949" # not CP934 ??
+	# Thai
+	echo "th CP874"
+	echo "th_TH CP874"
+	# Other
+	echo "eo CP850"
+	echo "eo_EO CP850"
+	;;
+esac
--- a/intl/dcgettext.c
+++ b/intl/dcgettext.c
@@ -1,238 +1,44 @@
 /* Implementation of the dcgettext(3) function.
-   Copyright (C) 1995, 1996, 1997, 1998 Free Software Foundation, Inc.
+   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>
 #endif

-#include <sys/types.h>
-
-#if defined __GNUC__ && !defined C_ALLOCA
-# define alloca __builtin_alloca
-# define HAVE_ALLOCA 1
-#else
-# if (defined HAVE_ALLOCA_H || defined _LIBC) && !defined C_ALLOCA
-#  include <alloca.h>
-# else
-#  ifdef _AIX
- #pragma alloca
-#  else
-#   ifndef alloca
-char *alloca ();
-#   endif
-#  endif
-# endif
-#endif
-
-#include <errno.h>
-#ifndef errno
-extern int errno;
-#endif
-#ifndef __set_errno
-# define __set_errno(val) errno = (val)
-#endif
-
-#if defined STDC_HEADERS || defined _LIBC
-# include <stdlib.h>
-#else
-char *getenv ();
-# ifdef HAVE_MALLOC_H
-#  include <malloc.h>
-# else
-void free ();
-# endif
-#endif
-
-#if defined HAVE_STRING_H || defined _LIBC
-# ifndef _GNU_SOURCE
-#  define _GNU_SOURCE	1
-# endif
-# include <string.h>
-#else
-# include <strings.h>
-#endif
-#if !HAVE_STRCHR && !defined _LIBC
-# ifndef strchr
-#  define strchr index
-# endif
-#endif
-
-#if defined HAVE_UNISTD_H || defined _LIBC
-# include <unistd.h>
-#endif
-
-#include "gettext.h"
 #include "gettextP.h"
 #ifdef _LIBC
 # include <libintl.h>
 #else
-# include "libgettext.h"
+# include "libgnuintl.h"
 #endif
-#include "hash-string.h"

 /* @@ end of prolog @@ */

-#ifdef _LIBC
-/* Rename the non ANSI C functions.  This is required by the standard
-   because some ANSI C functions will require linking with this object
-   file and the name space must not be polluted.  */
-# define getcwd __getcwd
-# ifndef stpcpy
-#  define stpcpy __stpcpy
-# endif
-#else
-# if !defined HAVE_GETCWD
-char *getwd ();
-#  define getcwd(buf, max) getwd (buf)
-# else
-char *getcwd ();
-# endif
-# ifndef HAVE_STPCPY
-static char *stpcpy PARAMS ((char *dest, const char *src));
-# endif
-#endif
-
-/* Amount to increase buffer size by in each try.  */
-#define PATH_INCR 32
-
-/* The following is from pathmax.h.  */
-/* Non-POSIX BSD systems might have gcc's limits.h, which doesn't define
-   PATH_MAX but might cause redefinition warnings when sys/param.h is
-   later included (as on MORE/BSD 4.3).  */
-#if defined(_POSIX_VERSION) || (defined(HAVE_LIMITS_H) && !defined(__GNUC__))
-# include <limits.h>
-#endif
-
-#ifndef _POSIX_PATH_MAX
-# define _POSIX_PATH_MAX 255
-#endif
-
-#if !defined(PATH_MAX) && defined(_PC_PATH_MAX)
-# define PATH_MAX (pathconf ("/", _PC_PATH_MAX) < 1 ? 1024 : pathconf ("/", _PC_PATH_MAX))
-#endif
-
-/* Don't include sys/param.h if it already has been.  */
-#if defined(HAVE_SYS_PARAM_H) && !defined(PATH_MAX) && !defined(MAXPATHLEN)
-# include <sys/param.h>
-#endif
-
-#if !defined(PATH_MAX) && defined(MAXPATHLEN)
-# define PATH_MAX MAXPATHLEN
-#endif
-
-#ifndef PATH_MAX
-# define PATH_MAX _POSIX_PATH_MAX
-#endif
-
-/* 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
-
-/* Name of the default domain used for gettext(3) prior any call to
-   textdomain(3).  The default value for this is "messages".  */
-const char _nl_default_default_domain[] = "messages";
-
-/* Value used as the default domain for gettext(3).  */
-const char *_nl_current_default_domain = _nl_default_default_domain;
-
-/* Contains the default location of the message catalogs.  */
-const char _nl_default_dirname[] = GNULOCALEDIR;
-
-/* List with bindings of specific domains created by bindtextdomain()
-   calls.  */
-struct binding *_nl_domain_bindings;
-
-/* Prototypes for local functions.  */
-static char *find_msg PARAMS ((struct loaded_l10nfile *domain_file,
-			       const char *msgid)) internal_function;
-static const char *category_to_name PARAMS ((int category)) internal_function;
-static const char *guess_category_value PARAMS ((int category,
-						 const char *categoryname))
-     internal_function;
-
-
-/* For those loosing systems which don't have `alloca' we have to add
-   some additional code emulating it.  */
-#ifdef HAVE_ALLOCA
-/* Nothing has to be done.  */
-# define ADD_BLOCK(list, address) /* nothing */
-# define FREE_BLOCKS(list) /* nothing */
-#else
-struct block_list
-{
-  void *address;
-  struct block_list *next;
-};
-# define ADD_BLOCK(list, addr)						      \
-  do {									      \
-    struct block_list *newp = (struct block_list *) malloc (sizeof (*newp));  \
-    /* If we cannot get a free block we cannot add the new element to	      \
-       the list.  */							      \
-    if (newp != NULL) {							      \
-      newp->address = (addr);						      \
-      newp->next = (list);						      \
-      (list) = newp;							      \
-    }									      \
-  } while (0)
-# define FREE_BLOCKS(list)						      \
-  do {									      \
-    while (list != NULL) {						      \
-      struct block_list *old = list;					      \
-      list = list->next;						      \
-      free (old);							      \
-    }									      \
-  } while (0)
-# undef alloca
-# define alloca(size) (malloc (size))
-#endif	/* have alloca */
-
-
 /* Names for the libintl functions are a problem.  They must not clash
   with existing names and they should follow ANSI C.  But this source
   code is also used in GNU C Library where the names have a __
   prefix.  So we have to make a difference here.  */
 #ifdef _LIBC
 # define DCGETTEXT __dcgettext
+# define DCIGETTEXT __dcigettext
 #else
 # define DCGETTEXT dcgettext__
-#endif
-
-/* Checking whether the binaries runs SUID must be done and glibc provides
-   easier methods therefore we make a difference here.  */
-#ifdef _LIBC
-# define ENABLE_SECURE __libc_enable_secure
-# define DETERMINE_SECURE
-#else
-static int enable_secure;
-# define ENABLE_SECURE (enable_secure == 1)
-# define DETERMINE_SECURE \
-  if (enable_secure == 0)						      \
-    {									      \
-      if (getuid () != geteuid () || getgid () != getegid ())		      \
-	enable_secure = 1;						      \
-      else								      \
-	enable_secure = -1;						      \
-    }
+# define DCIGETTEXT dcigettext__
 #endif

 /* Look up MSGID in the DOMAINNAME message catalog for the current CATEGORY
@@ -243,413 +49,10 @@ DCGETTEXT (domainname, msgid, category)
     const char *msgid;
     int category;
 {
-#ifndef HAVE_ALLOCA
-  struct block_list *block_list = NULL;
-#endif
-  struct loaded_l10nfile *domain;
-  struct binding *binding;
-  const char *categoryname;
-  const char *categoryvalue;
-  char *dirname, *xdomainname;
-  char *single_locale;
-  char *retval;
-  int saved_errno = errno;
-
-  /* If no real MSGID is given return NULL.  */
-  if (msgid == NULL)
-    return NULL;
-
-  /* See whether this is a SUID binary or not.  */
-  DETERMINE_SECURE;
-
-  /* If DOMAINNAME is NULL, we are interested in the default domain.  If
-     CATEGORY is not LC_MESSAGES this might not make much sense but the
-     definition left this undefined.  */
-  if (domainname == NULL)
-    domainname = _nl_current_default_domain;
-
-  /* First find matching binding.  */
-  for (binding = _nl_domain_bindings; binding != NULL; binding = binding->next)
-    {
-      int compare = strcmp (domainname, binding->domainname);
-      if (compare == 0)
-	/* We found it!  */
-	break;
-      if (compare < 0)
-	{
-	  /* It is not in the list.  */
-	  binding = NULL;
-	  break;
-	}
-    }
-
-  if (binding == NULL)
-    dirname = (char *) _nl_default_dirname;
-  else if (binding->dirname[0] == '/')
-    dirname = binding->dirname;
-  else
-    {
-      /* We have a relative path.  Make it absolute now.  */
-      size_t dirname_len = strlen (binding->dirname) + 1;
-      size_t path_max;
-      char *ret;
-
-      path_max = (unsigned int) PATH_MAX;
-      path_max += 2;		/* The getcwd docs say to do this.  */
-
-      dirname = (char *) alloca (path_max + dirname_len);
-      ADD_BLOCK (block_list, dirname);
-
-      __set_errno (0);
-      while ((ret = getcwd (dirname, path_max)) == NULL && errno == ERANGE)
-	{
-	  path_max += PATH_INCR;
-	  dirname = (char *) alloca (path_max + dirname_len);
-	  ADD_BLOCK (block_list, dirname);
-	  __set_errno (0);
-	}
-
-      if (ret == NULL)
-	{
-	  /* We cannot get the current working directory.  Don't signal an
-	     error but simply return the default string.  */
-	  FREE_BLOCKS (block_list);
-	  __set_errno (saved_errno);
-	  return (char *) msgid;
-	}
-
-      stpcpy (stpcpy (strchr (dirname, '\0'), "/"), binding->dirname);
-    }
-
-  /* Now determine the symbolic name of CATEGORY and its value.  */
-  categoryname = category_to_name (category);
-  categoryvalue = guess_category_value (category, categoryname);
-
-  xdomainname = (char *) alloca (strlen (categoryname)
-				 + strlen (domainname) + 5);
-  ADD_BLOCK (block_list, xdomainname);
-
-  stpcpy (stpcpy (stpcpy (stpcpy (xdomainname, categoryname), "/"),
-		  domainname),
-	  ".mo");
-
-  /* Creating working area.  */
-  single_locale = (char *) alloca (strlen (categoryvalue) + 1);
-  ADD_BLOCK (block_list, single_locale);
-
-
-  /* Search for the given string.  This is a loop because we perhaps
-     got an ordered list of languages to consider for the translation.  */
-  while (1)
-    {
-      /* Make CATEGORYVALUE point to the next element of the list.  */
-      while (categoryvalue[0] != '\0' && categoryvalue[0] == ':')
-	++categoryvalue;
-      if (categoryvalue[0] == '\0')
-	{
-	  /* The whole contents of CATEGORYVALUE has been searched but
-	     no valid entry has been found.  We solve this situation
-	     by implicitly appending a "C" entry, i.e. no translation
-	     will take place.  */
-	  single_locale[0] = 'C';
-	  single_locale[1] = '\0';
-	}
-      else
-	{
-	  char *cp = single_locale;
-	  while (categoryvalue[0] != '\0' && categoryvalue[0] != ':')
-	    *cp++ = *categoryvalue++;
-	  *cp = '\0';
-
-	  /* When this is a SUID binary we must not allow accessing files
-	     outside the dedicated directories.  */
-	  if (ENABLE_SECURE
-	      && (memchr (single_locale, '/',
-			  _nl_find_language (single_locale) - single_locale)
-		  != NULL))
-	    /* Ingore this entry.  */
-	    continue;
-	}
-
-      /* If the current locale value is C (or POSIX) we don't load a
-	 domain.  Return the MSGID.  */
-      if (strcmp (single_locale, "C") == 0
-	  || strcmp (single_locale, "POSIX") == 0)
-	{
-	  FREE_BLOCKS (block_list);
-	  __set_errno (saved_errno);
-	  return (char *) msgid;
-	}
-
-
-      /* Find structure describing the message catalog matching the
-	 DOMAINNAME and CATEGORY.  */
-      domain = _nl_find_domain (dirname, single_locale, xdomainname);
-
-      if (domain != NULL)
-	{
-	  retval = find_msg (domain, msgid);
-
-	  if (retval == NULL)
-	    {
-	      int cnt;
-
-	      for (cnt = 0; domain->successor[cnt] != NULL; ++cnt)
-		{
-		  retval = find_msg (domain->successor[cnt], msgid);
-
-		  if (retval != NULL)
-		    break;
-		}
-	    }
-
-	  if (retval != NULL)
-	    {
-	      FREE_BLOCKS (block_list);
-	      __set_errno (saved_errno);
-	      return retval;
-	    }
-	}
-    }
-  /* NOTREACHED */
+  return DCIGETTEXT (domainname, msgid, NULL, 0, 0, category);
 }

 #ifdef _LIBC
 /* Alias for function name in GNU C Library.  */
 weak_alias (__dcgettext, dcgettext);
 #endif
-
-
-static char *
-internal_function
-find_msg (domain_file, msgid)
-     struct loaded_l10nfile *domain_file;
-     const char *msgid;
-{
-  size_t act = 0;
-  size_t top, bottom;
-  struct loaded_domain *domain;
-
-  if (domain_file->decided == 0)
-    _nl_load_domain (domain_file);
-
-  if (domain_file->data == NULL)
-    return NULL;
-
-  domain = (struct loaded_domain *) domain_file->data;
-
-  /* Locate the MSGID and its translation.  */
-  if (domain->hash_size > 2 && domain->hash_tab != NULL)
-    {
-      /* Use the hashing table.  */
-      nls_uint32 len = strlen (msgid);
-      nls_uint32 hash_val = hash_string (msgid);
-      nls_uint32 idx = hash_val % domain->hash_size;
-      nls_uint32 incr = 1 + (hash_val % (domain->hash_size - 2));
-      nls_uint32 nstr = W (domain->must_swap, domain->hash_tab[idx]);
-
-      if (nstr == 0)
-	/* Hash table entry is empty.  */
-	return NULL;
-
-      if (W (domain->must_swap, domain->orig_tab[nstr - 1].length) == len
-	  && strcmp (msgid,
-		     domain->data + W (domain->must_swap,
-				       domain->orig_tab[nstr - 1].offset)) == 0)
-	return (char *) domain->data + W (domain->must_swap,
-					  domain->trans_tab[nstr - 1].offset);
-
-      while (1)
-	{
-	  if (idx >= domain->hash_size - incr)
-	    idx -= domain->hash_size - incr;
-	  else
-	    idx += incr;
-
-	  nstr = W (domain->must_swap, domain->hash_tab[idx]);
-	  if (nstr == 0)
-	    /* Hash table entry is empty.  */
-	    return NULL;
-
-	  if (W (domain->must_swap, domain->orig_tab[nstr - 1].length) == len
-	      && strcmp (msgid,
-			 domain->data + W (domain->must_swap,
-					   domain->orig_tab[nstr - 1].offset))
-	         == 0)
-	    return (char *) domain->data
-	      + W (domain->must_swap, domain->trans_tab[nstr - 1].offset);
-	}
-      /* NOTREACHED */
-    }
-
-  /* Now we try the default method:  binary search in the sorted
-     array of messages.  */
-  bottom = 0;
-  top = domain->nstrings;
-  while (bottom < top)
-    {
-      int cmp_val;
-
-      act = (bottom + top) / 2;
-      cmp_val = strcmp (msgid, domain->data
-			       + W (domain->must_swap,
-				    domain->orig_tab[act].offset));
-      if (cmp_val < 0)
-	top = act;
-      else if (cmp_val > 0)
-	bottom = act + 1;
-      else
-	break;
-    }
-
-  /* If an translation is found return this.  */
-  return bottom >= top ? NULL : (char *) domain->data
-                                + W (domain->must_swap,
-				     domain->trans_tab[act].offset);
-}
-
-
-/* Return string representation of locale CATEGORY.  */
-static const char *
-internal_function
-category_to_name (category)
-     int category;
-{
-  const char *retval;
-
-  switch (category)
-  {
-#ifdef LC_COLLATE
-  case LC_COLLATE:
-    retval = "LC_COLLATE";
-    break;
-#endif
-#ifdef LC_CTYPE
-  case LC_CTYPE:
-    retval = "LC_CTYPE";
-    break;
-#endif
-#ifdef LC_MONETARY
-  case LC_MONETARY:
-    retval = "LC_MONETARY";
-    break;
-#endif
-#ifdef LC_NUMERIC
-  case LC_NUMERIC:
-    retval = "LC_NUMERIC";
-    break;
-#endif
-#ifdef LC_TIME
-  case LC_TIME:
-    retval = "LC_TIME";
-    break;
-#endif
-#ifdef LC_MESSAGES
-  case LC_MESSAGES:
-    retval = "LC_MESSAGES";
-    break;
-#endif
-#ifdef LC_RESPONSE
-  case LC_RESPONSE:
-    retval = "LC_RESPONSE";
-    break;
-#endif
-#ifdef LC_ALL
-  case LC_ALL:
-    /* This might not make sense but is perhaps better than any other
-       value.  */
-    retval = "LC_ALL";
-    break;
-#endif
-  default:
-    /* If you have a better idea for a default value let me know.  */
-    retval = "LC_XXX";
-  }
-
-  return retval;
-}
-
-/* Guess value of current locale from value of the environment variables.  */
-static const char *
-internal_function
-guess_category_value (category, categoryname)
-     int category;
-     const char *categoryname;
-{
-  const char *retval;
-
-  /* The highest priority value is the `LANGUAGE' environment
-     variable.  This is a GNU extension.  */
-  retval = getenv ("LANGUAGE");
-  if (retval != NULL && retval[0] != '\0')
-    return retval;
-
-  /* `LANGUAGE' is not set.  So we have to proceed with the POSIX
-     methods of looking to `LC_ALL', `LC_xxx', and `LANG'.  On some
-     systems this can be done by the `setlocale' function itself.  */
-#if defined HAVE_SETLOCALE && defined HAVE_LC_MESSAGES && defined HAVE_LOCALE_NULL
-  return setlocale (category, NULL);
-#else
-  /* Setting of LC_ALL overwrites all other.  */
-  retval = getenv ("LC_ALL");
-  if (retval != NULL && retval[0] != '\0')
-    return retval;
-
-  /* Next comes the name of the desired category.  */
-  retval = getenv (categoryname);
-  if (retval != NULL && retval[0] != '\0')
-    return retval;
-
-  /* Last possibility is the LANG environment variable.  */
-  retval = getenv ("LANG");
-  if (retval != NULL && retval[0] != '\0')
-    return retval;
-
-  /* We use C as the default domain.  POSIX says this is implementation
-     defined.  */
-  return "C";
-#endif
-}
-
-/* @@ 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
-
-
-#ifdef _LIBC
-/* If we want to free all resources we have to do some work at
-   program's end.  */
-static void __attribute__ ((unused))
-free_mem (void)
-{
-  struct binding *runp;
-
-  for (runp = _nl_domain_bindings; runp != NULL; runp = runp->next)
-    {
-      free (runp->domainname);
-      if (runp->dirname != _nl_default_dirname)
-	/* Yes, this is a pointer comparison.  */
-	free (runp->dirname);
-    }
-
-  if (_nl_current_default_domain != _nl_default_default_domain)
-    /* Yes, again a pointer comparison.  */
-    free ((char *) _nl_current_default_domain);
-}
-
-text_set_element (__libc_subfreeres, free_mem);
-#endif
--- a/intl/dcigettext.c
+++ b/intl/dcigettext.c
--- a/intl/dcngettext.c
+++ b/intl/dcngettext.c
@@ -0,0 +1,60 @@
+/* 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 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
+   Library General Public License for more details.
+
+   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>
+#endif
+
+#include "gettextP.h"
+#ifdef _LIBC
+# include <libintl.h>
+#else
+# include "libgnuintl.h"
+#endif
+
+/* @@ end of prolog @@ */
+
+/* Names for the libintl functions are a problem.  They must not clash
+   with existing names and they should follow ANSI C.  But this source
+   code is also used in GNU C Library where the names have a __
+   prefix.  So we have to make a difference here.  */
+#ifdef _LIBC
+# define DCNGETTEXT __dcngettext
+# define DCIGETTEXT __dcigettext
+#else
+# define DCNGETTEXT dcngettext__
+# define DCIGETTEXT dcigettext__
+#endif
+
+/* Look up MSGID in the DOMAINNAME message catalog for the current CATEGORY
+   locale.  */
+char *
+DCNGETTEXT (domainname, msgid1, msgid2, n, category)
+     const char *domainname;
+     const char *msgid1;
+     const char *msgid2;
+     unsigned long int n;
+     int category;
+{
+  return DCIGETTEXT (domainname, msgid1, msgid2, 1, n, category);
+}
+
+#ifdef _LIBC
+/* Alias for function name in GNU C Library.  */
+weak_alias (__dcngettext, dcngettext);
+#endif
--- a/intl/dgettext.c
+++ b/intl/dgettext.c
@@ -1,32 +1,32 @@
-/* Implementation of the dgettext(3) function
-   Copyright (C) 1995, 1996, 1997 Free Software Foundation, Inc.
+/* 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>
 #endif

-#if defined HAVE_LOCALE_H || defined _LIBC
-# include <locale.h>
-#endif
+#include <locale.h>

+#include "gettextP.h"
 #ifdef _LIBC
 # include <libintl.h>
 #else
-# include "libgettext.h"
+# include "libgnuintl.h"
 #endif

 /* @@ end of prolog @@ */
--- a/intl/dngettext.c
+++ b/intl/dngettext.c
@@ -0,0 +1,61 @@
+/* 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 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
+   Library General Public License for more details.
+
+   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>
+#endif
+
+#include <locale.h>
+
+#include "gettextP.h"
+#ifdef _LIBC
+# include <libintl.h>
+#else
+# include "libgnuintl.h"
+#endif
+
+/* @@ end of prolog @@ */
+
+/* Names for the libintl functions are a problem.  They must not clash
+   with existing names and they should follow ANSI C.  But this source
+   code is also used in GNU C Library where the names have a __
+   prefix.  So we have to make a difference here.  */
+#ifdef _LIBC
+# define DNGETTEXT __dngettext
+# define DCNGETTEXT __dcngettext
+#else
+# define DNGETTEXT dngettext__
+# define DCNGETTEXT dcngettext__
+#endif
+
+/* Look up MSGID in the DOMAINNAME message catalog of the current
+   LC_MESSAGES locale and skip message according to the plural form.  */
+char *
+DNGETTEXT (domainname, msgid1, msgid2, n)
+     const char *domainname;
+     const char *msgid1;
+     const char *msgid2;
+     unsigned long int n;
+{
+  return DCNGETTEXT (domainname, msgid1, msgid2, n, LC_MESSAGES);
+}
+
+#ifdef _LIBC
+/* Alias for function name in GNU C Library.  */
+weak_alias (__dngettext, dngettext);
+#endif
--- a/intl/explodename.c
+++ b/intl/explodename.c
@@ -1,33 +1,27 @@
-/* Copyright (C) 1995, 1996, 1997, 1998 Free Software Foundation, Inc.
+/* 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>
 #endif

-#if defined STDC_HEADERS || defined _LIBC
-# include <stdlib.h>
-#endif
-
-#if defined HAVE_STRING_H || defined _LIBC
-# include <string.h>
-#else
-# include <strings.h>
-#endif
+#include <stdlib.h>
+#include <string.h>
 #include <sys/types.h>

 #include "loadinfo.h"
--- a/intl/finddomain.c
+++ b/intl/finddomain.c
@@ -1,64 +1,40 @@
 /* Handle list of needed message catalogs
-   Copyright (C) 1995, 1996, 1997, 1998 Free Software Foundation, Inc.
-   Written by Ulrich Drepper <drepper@gnu.ai.mit.edu>, 1995.
+   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>
 #endif

-#include <ctype.h>
-#include <errno.h>
 #include <stdio.h>
 #include <sys/types.h>
-
-#if defined STDC_HEADERS || defined _LIBC
-# include <stdlib.h>
-#else
-# ifdef HAVE_MALLOC_H
-#  include <malloc.h>
-# else
-void free ();
-# endif
-#endif
-
-#if defined HAVE_STRING_H || defined _LIBC
-# include <string.h>
-#else
-# include <strings.h>
-# ifndef memcpy
-#  define memcpy(Dst, Src, Num) bcopy (Src, Dst, Num)
-# endif
-#endif
-#if !HAVE_STRCHR && !defined _LIBC
-# ifndef strchr
-#  define strchr index
-# endif
-#endif
+#include <stdlib.h>
+#include <string.h>

 #if defined HAVE_UNISTD_H || defined _LIBC
 # include <unistd.h>
 #endif

-#include "gettext.h"
 #include "gettextP.h"
 #ifdef _LIBC
 # include <libintl.h>
 #else
-# include "libgettext.h"
+# include "libgnuintl.h"
 #endif

 /* @@ end of prolog @@ */
@@ -71,10 +47,11 @@ static struct loaded_l10nfile *_nl_loaded_domains;
   established bindings.  */
 struct loaded_l10nfile *
 internal_function
-_nl_find_domain (dirname, locale, domainname)
+_nl_find_domain (dirname, locale, domainname, domainbinding)
     const char *dirname;
     char *locale;
     const char *domainname;
+     struct binding *domainbinding;
 {
  struct loaded_l10nfile *retval;
  const char *language;
@@ -120,7 +97,7 @@ _nl_find_domain (dirname, locale, domainname)
      int cnt;

      if (retval->decided == 0)
-	_nl_load_domain (retval);
+	_nl_load_domain (retval, domainbinding);

      if (retval->data != NULL)
 	return retval;
@@ -128,7 +105,7 @@ _nl_find_domain (dirname, locale, domainname)
      for (cnt = 0; retval->successor[cnt] != NULL; ++cnt)
 	{
 	  if (retval->successor[cnt]->decided == 0)
-	    _nl_load_domain (retval->successor[cnt]);
+	    _nl_load_domain (retval->successor[cnt], domainbinding);

 	  if (retval->successor[cnt]->data != NULL)
 	    break;
@@ -175,14 +152,14 @@ _nl_find_domain (dirname, locale, domainname)
    return NULL;

  if (retval->decided == 0)
-    _nl_load_domain (retval);
+    _nl_load_domain (retval, domainbinding);
  if (retval->data == NULL)
    {
      int cnt;
      for (cnt = 0; retval->successor[cnt] != NULL; ++cnt)
 	{
 	  if (retval->successor[cnt]->decided == 0)
-	    _nl_load_domain (retval->successor[cnt]);
+	    _nl_load_domain (retval->successor[cnt], domainbinding);
 	  if (retval->successor[cnt]->data != NULL)
 	    break;
 	}
@@ -192,6 +169,10 @@ _nl_find_domain (dirname, locale, domainname)
  if (alias_value != NULL)
    free (locale);

+  /* The space for normalized_codeset is dynamically allocated.  Free it.  */
+  if (mask & XPG_NORM_CODESET)
+    free ((void *) normalized_codeset);
+
  return retval;
 }

@@ -208,6 +189,7 @@ free_mem (void)
      if (runp->data != NULL)
 	_nl_unload_domain ((struct loaded_domain *) runp->data);
      runp = runp->next;
+      free ((char *) here->filename);
      free (here);
    }
 }
--- a/intl/gettext.c
+++ b/intl/gettext.c
@@ -1,19 +1,20 @@
 /* Implementation of gettext(3) function.
-   Copyright (C) 1995, 1997 Free Software Foundation, Inc.
+   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>
@@ -23,21 +24,14 @@
 # define __need_NULL
 # include <stddef.h>
 #else
-# ifdef STDC_HEADERS
-#  include <stdlib.h>		/* Just for NULL.  */
-# else
-#  ifdef HAVE_STRING_H
-#   include <string.h>
-#  else
-#   define NULL ((void *) 0)
-#  endif
-# endif
+# include <stdlib.h>		/* Just for NULL.  */
 #endif

+#include "gettextP.h"
 #ifdef _LIBC
 # include <libintl.h>
 #else
-# include "libgettext.h"
+# include "libgnuintl.h"
 #endif

 /* @@ end of prolog @@ */
@@ -48,10 +42,10 @@
   prefix.  So we have to make a difference here.  */
 #ifdef _LIBC
 # define GETTEXT __gettext
-# define DGETTEXT __dgettext
+# define DCGETTEXT __dcgettext
 #else
 # define GETTEXT gettext__
-# define DGETTEXT dgettext__
+# define DCGETTEXT dcgettext__
 #endif

 /* Look up MSGID in the current default message catalog for the current
@@ -61,7 +55,7 @@ char *
 GETTEXT (msgid)
     const char *msgid;
 {
-  return DGETTEXT (NULL, msgid);
+  return DCGETTEXT (NULL, msgid, LC_MESSAGES);
 }

 #ifdef _LIBC
--- a/intl/gettext.h
+++ b/intl/gettext.h
@@ -1,26 +1,24 @@
-/* Internal header for GNU gettext internationalization functions.
-   Copyright (C) 1995, 1997 Free Software Foundation, Inc.
+/* 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 Library General Public
-   License along with the GNU C Library; see the file COPYING.LIB.  If not,
-   write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-   Boston, MA 02111-1307, USA.  */
+   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

-#include <stdio.h>
-
 #if HAVE_LIMITS_H || _LIBC
 # include <limits.h>
 #endif
@@ -37,9 +35,8 @@
 /* The following contortions are an attempt to use the C preprocessor
   to determine an unsigned integral type that is 32 bits wide.  An
   alternative approach is to use autoconf's AC_CHECK_SIZEOF macro, but
-   doing that would require that the configure script compile and *run*
-   the resulting executable.  Locally running cross-compiled executables
-   is usually not possible.  */
+   as of version autoconf-2.13, the AC_CHECK_SIZEOF macro doesn't work
+   when cross-compiling.  */

 #if __STDC__
 # define UINT_MAX_32_BITS 4294967295U
--- a/intl/gettextP.h
+++ b/intl/gettextP.h
@@ -1,26 +1,39 @@
-/* Header describing internals of gettext library
-   Copyright (C) 1995, 1996, 1997, 1998 Free Software Foundation, Inc.
-   Written by Ulrich Drepper <drepper@gnu.ai.mit.edu>, 1995.
+/* Header describing internals of libintl library.
+   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

+#include <stddef.h>		/* Get size_t.  */
+
+#ifdef _LIBC
+# include "../iconv/gconv_int.h"
+#else
+# if HAVE_ICONV
+#  include <iconv.h>
+# endif
+#endif
+
 #include "loadinfo.h"

+#include "gettext.h"		/* Get nls_uint32.  */
+
 /* @@ end of prolog @@ */

 #ifndef PARAMS
@@ -35,6 +48,12 @@
 # define internal_function
 #endif

+/* Tell the compiler when a conditional or integer expression is
+   almost always true or almost always false.  */
+#ifndef HAVE_BUILTIN_EXPECT
+# define __builtin_expect(expr, val) (expr)
+#endif
+
 #ifndef W
 # define W(flag, data) ((flag) ? SWAP (data) : (data))
 #endif
@@ -44,8 +63,6 @@
 # include <byteswap.h>
 # define SWAP(i) bswap_32 (i)
 #else
-static nls_uint32 SWAP PARAMS ((nls_uint32 i));
-
 static inline nls_uint32
 SWAP (i)
     nls_uint32 i;
@@ -55,6 +72,52 @@ SWAP (i)
 #endif


+/* This is the representation of the expressions to determine the
+   plural form.  */
+struct expression
+{
+  int nargs;			/* Number of arguments.  */
+  enum operator
+  {
+    /* Without arguments:  */
+    var,			/* The variable "n".  */
+    num,			/* Decimal number.  */
+    /* Unary operators:  */
+    lnot,			/* Logical NOT.  */
+    /* Binary operators:  */
+    mult,			/* Multiplication.  */
+    divide,			/* Division.  */
+    module,			/* Module operation.  */
+    plus,			/* Addition.  */
+    minus,			/* Subtraction.  */
+    less_than,			/* Comparison.  */
+    greater_than,		/* Comparison.  */
+    less_or_equal,		/* Comparison.  */
+    greater_or_equal,		/* Comparison.  */
+    equal,			/* Comparision for equality.  */
+    not_equal,			/* Comparision for inequality.  */
+    land,			/* Logical AND.  */
+    lor,			/* Logical OR.  */
+    /* Ternary operators:  */
+    qmop			/* Question mark operator.  */
+  } operation;
+  union
+  {
+    unsigned long int num;	/* Number value for `num'.  */
+    struct expression *args[3];	/* Up to three arguments.  */
+  } val;
+};
+
+/* This is the data structure to pass information to the parser and get
+   the result in a thread-safe way.  */
+struct parse_args
+{
+  const char *cp;
+  struct expression *res;
+};
+
+
+/* The representation of an opened message catalog.  */
 struct loaded_domain
 {
  const char *data;
@@ -66,23 +129,123 @@ struct loaded_domain
  struct string_desc *trans_tab;
  nls_uint32 hash_size;
  nls_uint32 *hash_tab;
+  int codeset_cntr;
+#ifdef _LIBC
+  __gconv_t conv;
+#else
+# if HAVE_ICONV
+  iconv_t conv;
+# endif
+#endif
+  char **conv_tab;
+
+  struct expression *plural;
+  unsigned long int nplurals;
 };

+/* We want to allocate a string at the end of the struct.  But ISO C
+   doesn't allow zero sized arrays.  */
+#ifdef __GNUC__
+# define ZERO 0
+#else
+# define ZERO 1
+#endif
+
+/* A set of settings bound to a message domain.  Used to store settings
+   from bindtextdomain() and bind_textdomain_codeset().  */
 struct binding
 {
  struct binding *next;
-  char *domainname;
  char *dirname;
+  int codeset_cntr;	/* Incremented each time codeset changes.  */
+  char *codeset;
+  char domainname[ZERO];
 };

+/* A counter which is incremented each time some previous translations
+   become invalid.
+   This variable is part of the external ABI of the GNU libintl.  */
+extern int _nl_msg_cat_cntr;
+
 struct loaded_l10nfile *_nl_find_domain PARAMS ((const char *__dirname,
 						 char *__locale,
-						 const char *__domainname))
+						 const char *__domainname,
+					      struct binding *__domainbinding))
     internal_function;
-void _nl_load_domain PARAMS ((struct loaded_l10nfile *__domain))
+void _nl_load_domain PARAMS ((struct loaded_l10nfile *__domain,
+			      struct binding *__domainbinding))
     internal_function;
 void _nl_unload_domain PARAMS ((struct loaded_domain *__domain))
     internal_function;
+const char *_nl_init_domain_conv PARAMS ((struct loaded_l10nfile *__domain_file,
+					  struct loaded_domain *__domain,
+					  struct binding *__domainbinding))
+     internal_function;
+void _nl_free_domain_conv PARAMS ((struct loaded_domain *__domain))
+     internal_function;
+
+char *_nl_find_msg PARAMS ((struct loaded_l10nfile *domain_file,
+			    struct binding *domainbinding,
+			    const char *msgid, size_t *lengthp))
+     internal_function;
+
+#ifdef _LIBC
+extern char *__gettext PARAMS ((const char *__msgid));
+extern char *__dgettext PARAMS ((const char *__domainname,
+				 const char *__msgid));
+extern char *__dcgettext PARAMS ((const char *__domainname,
+				  const char *__msgid, int __category));
+extern char *__ngettext PARAMS ((const char *__msgid1, const char *__msgid2,
+				 unsigned long int __n));
+extern char *__dngettext PARAMS ((const char *__domainname,
+				  const char *__msgid1, const char *__msgid2,
+				  unsigned long int n));
+extern char *__dcngettext PARAMS ((const char *__domainname,
+				   const char *__msgid1, const char *__msgid2,
+				   unsigned long int __n, int __category));
+extern char *__dcigettext PARAMS ((const char *__domainname,
+				   const char *__msgid1, const char *__msgid2,
+				   int __plural, unsigned long int __n,
+				   int __category));
+extern char *__textdomain PARAMS ((const char *__domainname));
+extern char *__bindtextdomain PARAMS ((const char *__domainname,
+				       const char *__dirname));
+extern char *__bind_textdomain_codeset PARAMS ((const char *__domainname,
+						const char *__codeset));
+#else
+extern char *gettext__ PARAMS ((const char *__msgid));
+extern char *dgettext__ PARAMS ((const char *__domainname,
+				 const char *__msgid));
+extern char *dcgettext__ PARAMS ((const char *__domainname,
+				  const char *__msgid, int __category));
+extern char *ngettext__ PARAMS ((const char *__msgid1, const char *__msgid2,
+				 unsigned long int __n));
+extern char *dngettext__ PARAMS ((const char *__domainname,
+				  const char *__msgid1, const char *__msgid2,
+				  unsigned long int __n));
+extern char *dcngettext__ PARAMS ((const char *__domainname,
+				   const char *__msgid1, const char *__msgid2,
+				   unsigned long int __n, int __category));
+extern char *dcigettext__ PARAMS ((const char *__domainname,
+				   const char *__msgid1, const char *__msgid2,
+				   int __plural, unsigned long int __n,
+				   int __category));
+extern char *textdomain__ PARAMS ((const char *__domainname));
+extern char *bindtextdomain__ PARAMS ((const char *__domainname,
+				       const char *__dirname));
+extern char *bind_textdomain_codeset__ PARAMS ((const char *__domainname,
+						const char *__codeset));
+#endif
+
+#ifdef _LIBC
+extern void __gettext_free_exp PARAMS ((struct expression *exp))
+     internal_function;
+extern int __gettextparse PARAMS ((void *arg));
+#else
+extern void gettext_free_exp__ PARAMS ((struct expression *exp))
+     internal_function;
+extern int gettextparse__ PARAMS ((void *arg));
+#endif

 /* @@ begin of epilog @@ */

--- a/intl/hash-string.h
+++ b/intl/hash-string.h
@@ -1,20 +1,20 @@
-/* Implements a string hashing function.
-   Copyright (C) 1995, 1997 Free Software Foundation, Inc.
+/* 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 Library General Public
-   License along with the GNU C Library; see the file COPYING.LIB.  If not,
-   write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-   Boston, MA 02111-1307, USA.  */
+   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 @@ */

--- a/intl/intl-compat.c
+++ b/intl/intl-compat.c
@@ -1,43 +1,99 @@
 /* intl-compat.c - Stub functions to call gettext functions from GNU gettext
   Library.
-   Copyright (C) 1995 Software Foundation, Inc.
+   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>
 #endif

-#include "libgettext.h"
+#include "libgnuintl.h"
+#include "gettextP.h"

 /* @@ end of prolog @@ */

+/* This file redirects the gettext functions (without prefix or suffix) to
+   those defined in the included GNU gettext library (with "__" suffix).
+   It is compiled into libintl when the included GNU gettext library is
+   configured --with-included-gettext.
+
+   This redirection works also in the case that the system C library or
+   the system libintl library contain gettext/textdomain/... functions.
+   If it didn't, we would need to add preprocessor level redirections to
+   libgnuintl.h of the following form:
+
+#    define gettext gettext__
+#    define dgettext dgettext__
+#    define dcgettext dcgettext__
+#    define ngettext ngettext__
+#    define dngettext dngettext__
+#    define dcngettext dcngettext__
+#    define textdomain textdomain__
+#    define bindtextdomain bindtextdomain__
+#    define bind_textdomain_codeset bind_textdomain_codeset__
+
+   How does this redirection work? There are two cases.
+   A. When libintl.a is linked into an executable, it works because
+      functions defined in the executable always override functions in
+      the shared libraries.
+   B. When libintl.so is used, it works because
+      1. those systems defining gettext/textdomain/... in the C library
+         (namely, Solaris 2.4 and newer, and GNU libc 2.0 and newer) are
+         ELF systems and define these symbols as weak, thus explicitly
+         letting other shared libraries override it.
+      2. those systems defining gettext/textdomain/... in a standalone
+         libintl.so library (namely, Solaris 2.3 and newer) have this
+         shared library in /usr/lib, and the linker will search /usr/lib
+         *after* the directory where the GNU gettext library is installed.
+
+   A third case, namely when libintl.a is linked into a shared library
+   whose name is not libintl.so, is not supported. In this case, on
+   Solaris, when -lintl precedes the linker option for the shared library
+   containing GNU gettext, the system's gettext would indeed override
+   the GNU gettext. Anyone doing this kind of stuff must be clever enough
+   to 1. compile libintl.a with -fPIC, 2. remove -lintl from his linker
+   command line.  */
+

 #undef gettext
 #undef dgettext
 #undef dcgettext
+#undef ngettext
+#undef dngettext
+#undef dcngettext
 #undef textdomain
 #undef bindtextdomain
+#undef bind_textdomain_codeset


 char *
-bindtextdomain (domainname, dirname)
-     const char *domainname;
-     const char *dirname;
+gettext (msgid)
+     const char *msgid;
 {
-  return bindtextdomain__ (domainname, dirname);
+  return gettext__ (msgid);
+}
+
+
+char *
+dgettext (domainname, msgid)
+     const char *domainname;
+     const char *msgid;
+{
+  return dgettext__ (domainname, msgid);
 }


@@ -52,19 +108,35 @@ dcgettext (domainname, msgid, category)


 char *
-dgettext (domainname, msgid)
-     const char *domainname;
-     const char *msgid;
+ngettext (msgid1, msgid2, n)
+     const char *msgid1;
+     const char *msgid2;
+     unsigned long int n;
 {
-  return dgettext__ (domainname, msgid);
+  return ngettext__ (msgid1, msgid2, n);
 }


 char *
-gettext (msgid)
-     const char *msgid;
+dngettext (domainname, msgid1, msgid2, n)
+     const char *domainname;
+     const char *msgid1;
+     const char *msgid2;
+     unsigned long int n;
 {
-  return gettext__ (msgid);
+  return dngettext__ (domainname, msgid1, msgid2, n);
+}
+
+
+char *
+dcngettext (domainname, msgid1, msgid2, n, category)
+     const char *domainname;
+     const char *msgid1;
+     const char *msgid2;
+     unsigned long int n;
+     int category;
+{
+  return dcngettext__ (domainname, msgid1, msgid2, n, category);
 }


@@ -74,3 +146,21 @@ textdomain (domainname)
 {
  return textdomain__ (domainname);
 }
+
+
+char *
+bindtextdomain (domainname, dirname)
+     const char *domainname;
+     const char *dirname;
+{
+  return bindtextdomain__ (domainname, dirname);
+}
+
+
+char *
+bind_textdomain_codeset (domainname, codeset)
+     const char *domainname;
+     const char *codeset;
+{
+  return bind_textdomain_codeset__ (domainname, codeset);
+}
--- a/intl/l10nflist.c
+++ b/intl/l10nflist.c
@@ -1,37 +1,33 @@
-/* Handle list of needed message catalogs
-   Copyright (C) 1995, 1996, 1997 Free Software Foundation, Inc.
+/* 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
+   <features.h>, and once <features.h> has been included, it's too late.  */
+#ifndef _GNU_SOURCE
+# define _GNU_SOURCE	1
+#endif

 #ifdef HAVE_CONFIG_H
 # include <config.h>
 #endif

-
-#if defined HAVE_STRING_H || defined _LIBC
-# ifndef _GNU_SOURCE
-#  define _GNU_SOURCE	1
-# endif
-# include <string.h>
-#else
-# include <strings.h>
-# ifndef memcpy
-#  define memcpy(Dst, Src, Num) bcopy (Src, Dst, Num)
-# endif
-#endif
+#include <string.h>
 #if !HAVE_STRCHR && !defined _LIBC
 # ifndef strchr
 #  define strchr index
@@ -43,10 +39,7 @@
 #endif
 #include <ctype.h>
 #include <sys/types.h>
-
-#if defined STDC_HEADERS || defined _LIBC
-# include <stdlib.h>
-#endif
+#include <stdlib.h>

 #include "loadinfo.h"

@@ -224,7 +217,7 @@ _nl_make_l10nflist (l10nfile_list, dirlist, dirlist_len, mask, language,

  /* Construct file name.  */
  memcpy (abs_filename, dirlist, dirlist_len);
-  __argz_stringify (abs_filename, dirlist_len, ':');
+  __argz_stringify (abs_filename, dirlist_len, PATH_SEPARATOR);
  cp = abs_filename + (dirlist_len - 1);
  *cp++ = '/';
  cp = stpcpy (cp, language);
@@ -349,7 +342,8 @@ _nl_make_l10nflist (l10nfile_list, dirlist, dirlist_len, mask, language,

 /* Normalize codeset name.  There is no standard for the codeset
   names.  Normalization allows the user to use any of the common
-   names.  */
+   names.  The return value is dynamically allocated and has to be
+   freed by the caller.  */
 const char *
 _nl_normalize_codeset (codeset, name_len)
     const char *codeset;
--- a/intl/libgettext.h
+++ b/intl/libgettext.h
@@ -1,182 +1,49 @@
-/* Message catalogs for internationalization.
-   Copyright (C) 1995, 1996, 1997, 1998 Free Software Foundation, Inc.
+/* 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.  */

-/* Because on some systems (e.g. Solaris) we sometimes have to include
-   the systems libintl.h as well as this file we have more complex
-   include protection above.  But the systems header might perhaps also
-   define _LIBINTL_H and therefore we have to protect the definition here.  */
-
-#if !defined _LIBINTL_H || !defined _LIBGETTEXT_H
-#ifndef _LIBINTL_H
-# define _LIBINTL_H	1
-#endif
-#define _LIBGETTEXT_H	1
-
-/* We define an additional symbol to signal that we use the GNU
-   implementation of gettext.  */
-#define __USE_GNU_GETTEXT 1
-
-#include <sys/types.h>
-
-#if HAVE_LOCALE_H
-# include <locale.h>
-#endif
-
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-/* @@ end of prolog @@ */
-
-#ifndef PARAMS
-# if __STDC__ || defined __cplusplus
-#  define PARAMS(args) args
-# else
-#  define PARAMS(args) ()
-# endif
-#endif
-
-#ifndef NULL
-# if !defined __cplusplus || defined __GNUC__
-#  define NULL ((void *) 0)
-# else
-#  define NULL (0)
-# endif
-#endif
-
-#if !HAVE_LC_MESSAGES
-/* This value determines the behaviour of the gettext() and dgettext()
-   function.  But some system does not have this defined.  Define it
-   to a default value.  */
-# define LC_MESSAGES (-1)
-#endif
-
-
-/* Declarations for gettext-using-catgets interface.  Derived from
-   Jim Meyering's libintl.h.  */
-struct _msg_ent
-{
-  const char *_msg;
-  int _msg_number;
-};
-
-
-#if HAVE_CATGETS
-/* These two variables are defined in the automatically by po-to-tbl.sed
-   generated file `cat-id-tbl.c'.  */
-extern const struct _msg_ent _msg_tbl[];
-extern int _msg_tbl_length;
-#endif
-
-
-/* For automatical extraction of messages sometimes no real
-   translation is needed.  Instead the string itself is the result.  */
-#define gettext_noop(Str) (Str)
-
-/* Look up MSGID in the current default message catalog for the current
-   LC_MESSAGES locale.  If not found, returns MSGID itself (the default
-   text).  */
-extern char *gettext PARAMS ((const char *__msgid));
-extern char *gettext__ PARAMS ((const char *__msgid));
-
-/* Look up MSGID in the DOMAINNAME message catalog for the current
-   LC_MESSAGES locale.  */
-extern char *dgettext PARAMS ((const char *__domainname, const char *__msgid));
-extern char *dgettext__ PARAMS ((const char *__domainname,
-				 const char *__msgid));
-
-/* Look up MSGID in the DOMAINNAME message catalog for the current CATEGORY
-   locale.  */
-extern char *dcgettext PARAMS ((const char *__domainname, const char *__msgid,
-				int __category));
-extern char *dcgettext__ PARAMS ((const char *__domainname,
-				  const char *__msgid, int __category));
-
-
-/* Set the current default message catalog to DOMAINNAME.
-   If DOMAINNAME is null, return the current default.
-   If DOMAINNAME is "", reset to the default of "messages".  */
-extern char *textdomain PARAMS ((const char *__domainname));
-extern char *textdomain__ PARAMS ((const char *__domainname));
-
-/* Specify that the DOMAINNAME message catalog will be found
-   in DIRNAME rather than in the system locale data base.  */
-extern char *bindtextdomain PARAMS ((const char *__domainname,
-				  const char *__dirname));
-extern char *bindtextdomain__ PARAMS ((const char *__domainname,
-				    const char *__dirname));
+#ifndef _LIBGETTEXT_H
+#define _LIBGETTEXT_H 1

+/* NLS can be disabled through the configure --disable-nls option.  */
 #if ENABLE_NLS

-/* Solaris 2.3 has the gettext function but dcgettext is missing.
-   So we omit this optimization for Solaris 2.3.  BTW, Solaris 2.4
-   has dcgettext.  */
-# if !HAVE_CATGETS && (!HAVE_GETTEXT || HAVE_DCGETTEXT)
-
-#  define gettext(Msgid)						      \
-     dgettext (NULL, Msgid)
-
-#  define dgettext(Domainname, Msgid)					      \
-     dcgettext (Domainname, Msgid, LC_MESSAGES)
-
-#  if defined __GNUC__ && __GNUC__ == 2 && __GNUC_MINOR__ >= 7
-/* This global variable is defined in loadmsgcat.c.  We need a sign,
-   whether a new catalog was loaded, which can be associated with all
-   translations.  */
-extern int _nl_msg_cat_cntr;
-
-#   define dcgettext(Domainname, Msgid, Category)			      \
-  (__extension__							      \
-   ({									      \
-     char *__result;							      \
-     if (__builtin_constant_p (Msgid))					      \
-       {								      \
-	 static char *__translation__;					      \
-	 static int __catalog_counter__;				      \
-	 if (! __translation__ || __catalog_counter__ != _nl_msg_cat_cntr)    \
-	   {								      \
-	     __translation__ =						      \
-	       dcgettext__ (Domainname, Msgid, Category);		      \
-	     __catalog_counter__ = _nl_msg_cat_cntr;			      \
-	   }								      \
-	 __result = __translation__;					      \
-       }								      \
-     else								      \
-       __result = dcgettext__ (Domainname, Msgid, Category);		      \
-     __result;								      \
-    }))
-#  endif
-# endif
+/* Get declarations of GNU message catalog functions.  */
+# include <libintl.h>

 #else

 # define gettext(Msgid) (Msgid)
 # define dgettext(Domainname, Msgid) (Msgid)
 # define dcgettext(Domainname, Msgid, Category) (Msgid)
-# define textdomain(Domainname) ((char *) Domainname)
-# define bindtextdomain(Domainname, Dirname) ((char *) Dirname)
+# define ngettext(Msgid1, Msgid2, N) \
+    ((N) == 1 ? (char *) (Msgid1) : (char *) (Msgid2))
+# define dngettext(Domainname, Msgid1, Msgid2, N) \
+    ((N) == 1 ? (char *) (Msgid1) : (char *) (Msgid2))
+# define dcngettext(Domainname, Msgid1, Msgid2, N, Category) \
+    ((N) == 1 ? (char *) (Msgid1) : (char *) (Msgid2))
+# define textdomain(Domainname) ((char *) (Domainname))
+# define bindtextdomain(Domainname, Dirname) ((char *) (Dirname))
+# define bind_textdomain_codeset(Domainname, Codeset) ((char *) (Codeset))

 #endif

-/* @@ begin of epilog @@ */
+/* For automatical extraction of messages sometimes no real
+   translation is needed.  Instead the string itself is the result.  */
+#define gettext_noop(Str) (Str)

-#ifdef __cplusplus
-}
-#endif
-
-#endif
+#endif /* _LIBGETTEXT_H */
--- a/intl/libgnuintl.h
+++ b/intl/libgnuintl.h
@@ -0,0 +1,128 @@
+/* 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 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
+   Library General Public License for more details.
+
+   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
+
+#include <locale.h>
+
+/* The LC_MESSAGES locale category is the category used by the functions
+   gettext() and dgettext().  It is specified in POSIX, but not in ANSI C.
+   On systems that don't define it, use an arbitrary value instead.
+   On Solaris, <locale.h> defines __LOCALE_H then includes <libintl.h> (i.e.
+   this file!) and then only defines LC_MESSAGES.  To avoid a redefinition
+   warning, don't define LC_MESSAGES in this case.  */
+#if !defined LC_MESSAGES && !defined __LOCALE_H
+# define LC_MESSAGES 1729
+#endif
+
+/* We define an additional symbol to signal that we use the GNU
+   implementation of gettext.  */
+#define __USE_GNU_GETTEXT 1
+
+/* Resolve a platform specific conflict on DJGPP.  GNU gettext takes
+   precedence over _conio_gettext.  */
+#ifdef __DJGPP__
+# undef gettext
+# define gettext gettext
+#endif
+
+#ifndef PARAMS
+# if __STDC__ || defined __cplusplus
+#  define PARAMS(args) args
+# else
+#  define PARAMS(args) ()
+# endif
+#endif
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/* Look up MSGID in the current default message catalog for the current
+   LC_MESSAGES locale.  If not found, returns MSGID itself (the default
+   text).  */
+extern char *gettext PARAMS ((const char *__msgid));
+
+/* Look up MSGID in the DOMAINNAME message catalog for the current
+   LC_MESSAGES locale.  */
+extern char *dgettext PARAMS ((const char *__domainname, const char *__msgid));
+
+/* Look up MSGID in the DOMAINNAME message catalog for the current CATEGORY
+   locale.  */
+extern char *dcgettext PARAMS ((const char *__domainname, const char *__msgid,
+				int __category));
+
+
+/* Similar to `gettext' but select the plural form corresponding to the
+   number N.  */
+extern char *ngettext PARAMS ((const char *__msgid1, const char *__msgid2,
+			       unsigned long int __n));
+
+/* Similar to `dgettext' but select the plural form corresponding to the
+   number N.  */
+extern char *dngettext PARAMS ((const char *__domainname, const char *__msgid1,
+				const char *__msgid2, unsigned long int __n));
+
+/* Similar to `dcgettext' but select the plural form corresponding to the
+   number N.  */
+extern char *dcngettext PARAMS ((const char *__domainname, const char *__msgid1,
+				 const char *__msgid2, unsigned long int __n,
+				 int __category));
+
+
+/* Set the current default message catalog to DOMAINNAME.
+   If DOMAINNAME is null, return the current default.
+   If DOMAINNAME is "", reset to the default of "messages".  */
+extern char *textdomain PARAMS ((const char *__domainname));
+
+/* Specify that the DOMAINNAME message catalog will be found
+   in DIRNAME rather than in the system locale data base.  */
+extern char *bindtextdomain PARAMS ((const char *__domainname,
+				     const char *__dirname));
+
+/* Specify the character encoding in which the messages from the
+   DOMAINNAME message catalog will be returned.  */
+extern char *bind_textdomain_codeset PARAMS ((const char *__domainname,
+					      const char *__codeset));
+
+
+/* Optimized version of the functions above.  */
+#if defined __OPTIMIZED
+/* These are macros, but could also be inline functions.  */
+
+# define gettext(msgid)							      \
+  dgettext (NULL, msgid)
+
+# define dgettext(domainname, msgid)					      \
+  dcgettext (domainname, msgid, LC_MESSAGES)
+
+# define ngettext(msgid1, msgid2, n)					      \
+  dngettext (NULL, msgid1, msgid2, n)
+
+# define dngettext(domainname, msgid1, msgid2, n)			      \
+  dcngettext (domainname, msgid1, msgid2, n, LC_MESSAGES)
+
+#endif /* Optimizing. */
+
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* libintl.h */
--- a/intl/linux-msg.sed
+++ b/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
--- a/intl/loadinfo.h
+++ b/intl/loadinfo.h
@@ -1,20 +1,24 @@
-/* Copyright (C) 1996, 1997 Free Software Foundation, Inc.
+/* Copyright (C) 1996-1999, 2000, 2001 Free Software Foundation, Inc.
   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

 #ifndef PARAMS
 # if __STDC__
@@ -24,6 +28,25 @@
 # endif
 #endif

+#ifndef internal_function
+# define internal_function
+#endif
+
+/* Tell the compiler when a conditional or integer expression is
+   almost always true or almost always false.  */
+#ifndef HAVE_BUILTIN_EXPECT
+# define __builtin_expect(expr, val) (expr)
+#endif
+
+/* Separator in PATH like lists of pathnames.  */
+#if defined _WIN32 || defined __WIN32__ || defined __EMX__ || defined __DJGPP__
+  /* Win32, OS/2, DOS */
+# define PATH_SEPARATOR ';'
+#else
+  /* Unix */
+# define PATH_SEPARATOR ':'
+#endif
+
 /* Encoding of locale name parts.  */
 #define CEN_REVISION		1
 #define CEN_SPONSOR		2
@@ -50,6 +73,10 @@ struct loaded_l10nfile
 };


+/* Normalize codeset name.  There is no standard for the codeset
+   names.  Normalization allows the user to use any of the common
+   names.  The return value is dynamically allocated and has to be
+   freed by the caller.  */
 extern const char *_nl_normalize_codeset PARAMS ((const char *codeset,
 						  size_t name_len));

@@ -66,6 +93,8 @@ _nl_make_l10nflist PARAMS ((struct loaded_l10nfile **l10nfile_list,

 extern const char *_nl_expand_alias PARAMS ((const char *name));

+/* normalized_codeset is dynamically allocated and has to be freed by
+   the caller.  */
 extern int _nl_explode_name PARAMS ((char *name, const char **language,
 				     const char **modifier,
 				     const char **territory,
@@ -76,3 +105,5 @@ extern int _nl_explode_name PARAMS ((char *name, const char **language,
 				     const char **revision));

 extern char *_nl_find_language PARAMS ((const char *name));
+
+#endif	/* loadinfo.h */
--- a/intl/loadmsgcat.c
+++ b/intl/loadmsgcat.c
@@ -1,36 +1,67 @@
 /* Load needed message catalogs.
-   Copyright (C) 1995, 1996, 1997, 1998 Free Software Foundation, Inc.
+   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
+   <features.h>, and once <features.h> has been included, it's too late.  */
+#ifndef _GNU_SOURCE
+# define _GNU_SOURCE    1
+#endif

 #ifdef HAVE_CONFIG_H
 # include <config.h>
 #endif

+#include <ctype.h>
+#include <errno.h>
 #include <fcntl.h>
 #include <sys/types.h>
 #include <sys/stat.h>

-#if defined STDC_HEADERS || defined _LIBC
-# include <stdlib.h>
+#ifdef __GNUC__
+# define alloca __builtin_alloca
+# define HAVE_ALLOCA 1
+#else
+# if defined HAVE_ALLOCA_H || defined _LIBC
+#  include <alloca.h>
+# else
+#  ifdef _AIX
+ #pragma alloca
+#  else
+#   ifndef alloca
+char *alloca ();
+#   endif
+#  endif
+# endif
 #endif

+#include <stdlib.h>
+#include <string.h>
+
 #if defined HAVE_UNISTD_H || defined _LIBC
 # include <unistd.h>
 #endif

+#ifdef _LIBC
+# include <langinfo.h>
+# include <locale.h>
+#endif
+
 #if (defined HAVE_MMAP && defined HAVE_MUNMAP && !defined DISALLOW_MMAP) \
    || (defined _LIBC && defined _POSIX_MAPPED_FILES)
 # include <sys/mman.h>
@@ -43,6 +74,10 @@
 #include "gettext.h"
 #include "gettextP.h"

+#ifdef _LIBC
+# include "../locale/localeinfo.h"
+#endif
+
 /* @@ end of prolog @@ */

 #ifdef _LIBC
@@ -56,29 +91,275 @@
 # define munmap __munmap
 #endif

+/* Names for the libintl functions are a problem.  They must not clash
+   with existing names and they should follow ANSI C.  But this source
+   code is also used in GNU C Library where the names have a __
+   prefix.  So we have to make a difference here.  */
+#ifdef _LIBC
+# define PLURAL_PARSE __gettextparse
+#else
+# define PLURAL_PARSE gettextparse__
+#endif
+
+/* For those losing systems which don't have `alloca' we have to add
+   some additional code emulating it.  */
+#ifdef HAVE_ALLOCA
+# define freea(p) /* nothing */
+#else
+# define alloca(n) malloc (n)
+# define freea(p) free (p)
+#endif
+
+/* For systems that distinguish between text and binary I/O.
+   O_BINARY is usually declared in <fcntl.h>. */
+#if !defined O_BINARY && defined _O_BINARY
+  /* For MSC-compatible compilers.  */
+# define O_BINARY _O_BINARY
+# define O_TEXT _O_TEXT
+#endif
+#ifdef __BEOS__
+  /* BeOS 5 has O_BINARY and O_TEXT, but they have no effect.  */
+# undef O_BINARY
+# undef O_TEXT
+#endif
+/* On reasonable systems, binary I/O is the default.  */
+#ifndef O_BINARY
+# define O_BINARY 0
+#endif
+
 /* We need a sign, whether a new catalog was loaded, which can be associated
   with all translations.  This is important if the translations are
   cached by one of GCC's features.  */
-int _nl_msg_cat_cntr = 0;
+int _nl_msg_cat_cntr;

+#if (defined __GNUC__ && !defined __APPLE_CC__) \
+    || (defined __STDC_VERSION__ && __STDC_VERSION__ >= 199901L)
+
+/* These structs are the constant expression for the germanic plural
+   form determination.  It represents the expression  "n != 1".  */
+static const struct expression plvar =
+{
+  .nargs = 0,
+  .operation = var,
+};
+static const struct expression plone =
+{
+  .nargs = 0,
+  .operation = num,
+  .val =
+  {
+    .num = 1
+  }
+};
+static struct expression germanic_plural =
+{
+  .nargs = 2,
+  .operation = not_equal,
+  .val =
+  {
+    .args =
+    {
+      [0] = (struct expression *) &plvar,
+      [1] = (struct expression *) &plone
+    }
+  }
+};
+
+# define INIT_GERMANIC_PLURAL()
+
+#else
+
+/* For compilers without support for ISO C 99 struct/union initializers:
+   Initialization at run-time.  */
+
+static struct expression plvar;
+static struct expression plone;
+static struct expression germanic_plural;
+
+static void
+init_germanic_plural ()
+{
+  if (plone.val.num == 0)
+    {
+      plvar.nargs = 0;
+      plvar.operation = var;
+
+      plone.nargs = 0;
+      plone.operation = num;
+      plone.val.num = 1;
+
+      germanic_plural.nargs = 2;
+      germanic_plural.operation = not_equal;
+      germanic_plural.val.args[0] = &plvar;
+      germanic_plural.val.args[1] = &plone;
+    }
+}
+
+# define INIT_GERMANIC_PLURAL() init_germanic_plural ()
+
+#endif
+
+
+/* Initialize the codeset dependent parts of an opened message catalog.
+   Return the header entry.  */
+const char *
+internal_function
+_nl_init_domain_conv (domain_file, domain, domainbinding)
+     struct loaded_l10nfile *domain_file;
+     struct loaded_domain *domain;
+     struct binding *domainbinding;
+{
+  /* Find out about the character set the file is encoded with.
+     This can be found (in textual form) in the entry "".  If this
+     entry does not exist or if this does not contain the `charset='
+     information, we will assume the charset matches the one the
+     current locale and we don't have to perform any conversion.  */
+  char *nullentry;
+  size_t nullentrylen;
+
+  /* Preinitialize fields, to avoid recursion during _nl_find_msg.  */
+  domain->codeset_cntr =
+    (domainbinding != NULL ? domainbinding->codeset_cntr : 0);
+#ifdef _LIBC
+  domain->conv = (__gconv_t) -1;
+#else
+# if HAVE_ICONV
+  domain->conv = (iconv_t) -1;
+# endif
+#endif
+  domain->conv_tab = NULL;
+
+  /* Get the header entry.  */
+  nullentry = _nl_find_msg (domain_file, domainbinding, "", &nullentrylen);
+
+  if (nullentry != NULL)
+    {
+#if defined _LIBC || HAVE_ICONV
+      const char *charsetstr;
+
+      charsetstr = strstr (nullentry, "charset=");
+      if (charsetstr != NULL)
+	{
+	  size_t len;
+	  char *charset;
+	  const char *outcharset;
+
+	  charsetstr += strlen ("charset=");
+	  len = strcspn (charsetstr, " \t\n");
+
+	  charset = (char *) alloca (len + 1);
+# if defined _LIBC || HAVE_MEMPCPY
+	  *((char *) mempcpy (charset, charsetstr, len)) = '\0';
+# else
+	  memcpy (charset, charsetstr, len);
+	  charset[len] = '\0';
+# endif
+
+	  /* The output charset should normally be determined by the
+	     locale.  But sometimes the locale is not used or not correctly
+	     set up, so we provide a possibility for the user to override
+	     this.  Moreover, the value specified through
+	     bind_textdomain_codeset overrides both.  */
+	  if (domainbinding != NULL && domainbinding->codeset != NULL)
+	    outcharset = domainbinding->codeset;
+	  else
+	    {
+	      outcharset = getenv ("OUTPUT_CHARSET");
+	      if (outcharset == NULL || outcharset[0] == '\0')
+		{
+# ifdef _LIBC
+		  outcharset = (*_nl_current[LC_CTYPE])->values[_NL_ITEM_INDEX (CODESET)].string;
+# else
+#  if HAVE_ICONV
+		  extern const char *locale_charset (void);
+		  outcharset = locale_charset ();
+#  endif
+# endif
+		}
+	    }
+
+# ifdef _LIBC
+	  /* We always want to use transliteration.  */
+	  outcharset = norm_add_slashes (outcharset, "TRANSLIT");
+	  charset = norm_add_slashes (charset, NULL);
+	  if (__gconv_open (outcharset, charset, &domain->conv,
+			    GCONV_AVOID_NOCONV)
+	      != __GCONV_OK)
+	    domain->conv = (__gconv_t) -1;
+# else
+#  if HAVE_ICONV
+	  /* When using GNU libiconv, we want to use transliteration.  */
+#   if _LIBICONV_VERSION >= 0x0105
+	  len = strlen (outcharset);
+	  {
+	    char *tmp = (char *) alloca (len + 10 + 1);
+	    memcpy (tmp, outcharset, len);
+	    memcpy (tmp + len, "//TRANSLIT", 10 + 1);
+	    outcharset = tmp;
+	  }
+#   endif
+	  domain->conv = iconv_open (outcharset, charset);
+#   if _LIBICONV_VERSION >= 0x0105
+	  freea (outcharset);
+#   endif
+#  endif
+# endif
+
+	  freea (charset);
+	}
+#endif /* _LIBC || HAVE_ICONV */
+    }
+
+  return nullentry;
+}
+
+/* Frees the codeset dependent parts of an opened message catalog.  */
+void
+internal_function
+_nl_free_domain_conv (domain)
+     struct loaded_domain *domain;
+{
+  if (domain->conv_tab != NULL && domain->conv_tab != (char **) -1)
+    free (domain->conv_tab);
+
+#ifdef _LIBC
+  if (domain->conv != (__gconv_t) -1)
+    __gconv_close (domain->conv);
+#else
+# if HAVE_ICONV
+  if (domain->conv != (iconv_t) -1)
+    iconv_close (domain->conv);
+# endif
+#endif
+}

 /* Load the message catalogs specified by FILENAME.  If it is no valid
   message catalog do nothing.  */
 void
 internal_function
-_nl_load_domain (domain_file)
+_nl_load_domain (domain_file, domainbinding)
     struct loaded_l10nfile *domain_file;
+     struct binding *domainbinding;
 {
  int fd;
  size_t size;
+#ifdef _LIBC
+  struct stat64 st;
+#else
  struct stat st;
+#endif
  struct mo_file_header *data = (struct mo_file_header *) -1;
  int use_mmap = 0;
  struct loaded_domain *domain;
+  const char *nullentry;

  domain_file->decided = 1;
  domain_file->data = NULL;

+  /* Note that it would be useless to store domainbinding in domain_file
+     because domainbinding might be == NULL now but != NULL later (after
+     a call to bind_textdomain_codeset).  */
+
  /* If the record does not represent a valid locale the FILENAME
     might be NULL.  This can happen when according to the given
     specification the locale file name is different for XPG and CEN
@@ -87,14 +368,19 @@ _nl_load_domain (domain_file)
    return;

  /* Try to open the addressed file.  */
-  fd = open (domain_file->filename, O_RDONLY);
+  fd = open (domain_file->filename, O_RDONLY | O_BINARY);
  if (fd == -1)
    return;

  /* We must know about the size of the file.  */
-  if (fstat (fd, &st) != 0
-      || (size = (size_t) st.st_size) != st.st_size
-      || size < sizeof (struct mo_file_header))
+  if (
+#ifdef _LIBC
+      __builtin_expect (fstat64 (fd, &st) != 0, 0)
+#else
+      __builtin_expect (fstat (fd, &st) != 0, 0)
+#endif
+      || __builtin_expect ((size = (size_t) st.st_size) != st.st_size, 0)
+      || __builtin_expect (size < sizeof (struct mo_file_header), 0))
    {
      /* Something went wrong.  */
      close (fd);
@@ -107,7 +393,7 @@ _nl_load_domain (domain_file)
  data = (struct mo_file_header *) mmap (NULL, size, PROT_READ,
 					 MAP_PRIVATE, fd, 0);

-  if (data != (struct mo_file_header *) -1)
+  if (__builtin_expect (data != (struct mo_file_header *) -1, 1))
    {
      /* mmap() call was successful.  */
      close (fd);
@@ -131,12 +417,15 @@ _nl_load_domain (domain_file)
      do
 	{
 	  long int nb = (long int) read (fd, read_ptr, to_read);
-	  if (nb == -1)
+	  if (nb <= 0)
 	    {
+#ifdef EINTR
+	      if (nb == -1 && errno == EINTR)
+		continue;
+#endif
 	      close (fd);
 	      return;
 	    }
-
 	  read_ptr += nb;
 	  to_read -= nb;
 	}
@@ -147,7 +436,8 @@ _nl_load_domain (domain_file)

  /* Using the magic number we can test whether it really is a message
     catalog file.  */
-  if (data->magic != _MAGIC && data->magic != _MAGIC_SWAPPED)
+  if (__builtin_expect (data->magic != _MAGIC && data->magic != _MAGIC_SWAPPED,
+			0))
    {
      /* The magic number is wrong: not a message catalog file.  */
 #ifdef HAVE_MMAP
@@ -159,12 +449,11 @@ _nl_load_domain (domain_file)
      return;
    }

-  domain_file->data
-    = (struct loaded_domain *) malloc (sizeof (struct loaded_domain));
-  if (domain_file->data == NULL)
+  domain = (struct loaded_domain *) malloc (sizeof (struct loaded_domain));
+  if (domain == NULL)
    return;
+  domain_file->data = domain;

-  domain = (struct loaded_domain *) domain_file->data;
  domain->data = (char *) data;
  domain->use_mmap = use_mmap;
  domain->mmap_size = size;
@@ -196,9 +485,62 @@ _nl_load_domain (domain_file)
      return;
    }

-  /* Show that one domain is changed.  This might make some cached
-     translations invalid.  */
-  ++_nl_msg_cat_cntr;
+  /* Now initialize the character set converter from the character set
+     the file is encoded with (found in the header entry) to the domain's
+     specified character set or the locale's character set.  */
+  nullentry = _nl_init_domain_conv (domain_file, domain, domainbinding);
+
+  /* Also look for a plural specification.  */
+  if (nullentry != NULL)
+    {
+      const char *plural;
+      const char *nplurals;
+
+      plural = strstr (nullentry, "plural=");
+      nplurals = strstr (nullentry, "nplurals=");
+      if (plural == NULL || nplurals == NULL)
+	goto no_plural;
+      else
+	{
+	  /* First get the number.  */
+	  char *endp;
+	  unsigned long int n;
+	  struct parse_args args;
+
+	  nplurals += 9;
+	  while (*nplurals != '\0' && isspace (*nplurals))
+	    ++nplurals;
+#if defined HAVE_STRTOUL || defined _LIBC
+	  n = strtoul (nplurals, &endp, 10);
+#else
+	  for (endp = nplurals, n = 0; *endp >= '0' && *endp <= '9'; endp++)
+	    n = n * 10 + (*endp - '0');
+#endif
+	  domain->nplurals = n;
+	  if (nplurals == endp)
+	    goto no_plural;
+
+	  /* Due to the restrictions bison imposes onto the interface of the
+	     scanner function we have to put the input string and the result
+	     passed up from the parser into the same structure which address
+	     is passed down to the parser.  */
+	  plural += 7;
+	  args.cp = plural;
+	  if (PLURAL_PARSE (&args) != 0)
+	    goto no_plural;
+	  domain->plural = args.res;
+	}
+    }
+  else
+    {
+      /* By default we are using the Germanic form: singular form only
+         for `one', the plural form otherwise.  Yes, this is also what
+         English is using since English is a Germanic language.  */
+    no_plural:
+      INIT_GERMANIC_PLURAL ();
+      domain->plural = &germanic_plural;
+      domain->nplurals = 2;
+    }
 }


@@ -208,11 +550,16 @@ internal_function
 _nl_unload_domain (domain)
     struct loaded_domain *domain;
 {
-#ifdef _POSIX_MAPPED_FILES
+  if (domain->plural != &germanic_plural)
+    __gettext_free_exp (domain->plural);
+
+  _nl_free_domain_conv (domain);
+
+# ifdef _POSIX_MAPPED_FILES
  if (domain->use_mmap)
    munmap ((caddr_t) domain->data, domain->mmap_size);
  else
-#endif	/* _POSIX_MAPPED_FILES */
+# endif	/* _POSIX_MAPPED_FILES */
    free ((void *) domain->data);

  free (domain);
--- a/intl/localcharset.c
+++ b/intl/localcharset.c
@@ -0,0 +1,271 @@
+/* Determine a canonical name for the current locale's character encoding.
+
+   Copyright (C) 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 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
+   Library General Public License for more details.
+
+   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.  */
+
+/* Written by Bruno Haible <haible@clisp.cons.org>.  */
+
+#ifdef HAVE_CONFIG_H
+# include <config.h>
+#endif
+
+#if HAVE_STDDEF_H
+# include <stddef.h>
+#endif
+
+#include <stdio.h>
+#if HAVE_STRING_H
+# include <string.h>
+#else
+# include <strings.h>
+#endif
+#if HAVE_STDLIB_H
+# include <stdlib.h>
+#endif
+
+#if defined _WIN32 || defined __WIN32__
+# undef WIN32   /* avoid warning on mingw32 */
+# define WIN32
+#endif
+
+#ifndef WIN32
+# if HAVE_LANGINFO_CODESET
+#  include <langinfo.h>
+# else
+#  if HAVE_SETLOCALE
+#   include <locale.h>
+#  endif
+# endif
+#else /* WIN32 */
+# define WIN32_LEAN_AND_MEAN
+# include <windows.h>
+#endif
+
+#ifndef DIRECTORY_SEPARATOR
+# define DIRECTORY_SEPARATOR '/'
+#endif
+
+#ifndef ISSLASH
+# define ISSLASH(C) ((C) == DIRECTORY_SEPARATOR)
+#endif
+
+/* The following static variable is declared 'volatile' to avoid a
+   possible multithread problem in the function get_charset_aliases. If we
+   are running in a threaded environment, and if two threads initialize
+   'charset_aliases' simultaneously, both will produce the same value,
+   and everything will be ok if the two assignments to 'charset_aliases'
+   are atomic. But I don't know what will happen if the two assignments mix.  */
+#if __STDC__ != 1
+# define volatile /* empty */
+#endif
+/* 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 const char * volatile charset_aliases;
+
+/* Return a pointer to the contents of the charset.alias file.  */
+static const char *
+get_charset_aliases ()
+{
+  const char *cp;
+
+  cp = charset_aliases;
+  if (cp == NULL)
+    {
+#ifndef WIN32
+      FILE *fp;
+      const char *dir = LIBDIR;
+      const char *base = "charset.alias";
+      char *file_name;
+
+      /* Concatenate dir and base into freshly allocated file_name.  */
+      {
+	size_t dir_len = strlen (dir);
+	size_t base_len = strlen (base);
+	int add_slash = (dir_len > 0 && !ISSLASH (dir[dir_len - 1]));
+	file_name = (char *) malloc (dir_len + add_slash + base_len + 1);
+	if (file_name != NULL)
+	  {
+	    memcpy (file_name, dir, dir_len);
+	    if (add_slash)
+	      file_name[dir_len] = DIRECTORY_SEPARATOR;
+	    memcpy (file_name + dir_len + add_slash, base, base_len + 1);
+	  }
+      }
+
+      if (file_name == NULL || (fp = fopen (file_name, "r")) == NULL)
+	/* Out of memory or file not found, treat it as empty.  */
+	cp = "";
+      else
+	{
+	  /* Parse the file's contents.  */
+	  int c;
+	  char buf1[50+1];
+	  char buf2[50+1];
+	  char *res_ptr = NULL;
+	  size_t res_size = 0;
+	  size_t l1, l2;
+
+	  for (;;)
+	    {
+	      c = getc (fp);
+	      if (c == EOF)
+		break;
+	      if (c == '\n' || c == ' ' || c == '\t')
+		continue;
+	      if (c == '#')
+		{
+		  /* Skip comment, to end of line.  */
+		  do
+		    c = getc (fp);
+		  while (!(c == EOF || c == '\n'));
+		  if (c == EOF)
+		    break;
+		  continue;
+		}
+	      ungetc (c, fp);
+	      if (fscanf(fp, "%50s %50s", buf1, buf2) < 2)
+		break;
+	      l1 = strlen (buf1);
+	      l2 = strlen (buf2);
+	      if (res_size == 0)
+		{
+		  res_size = l1 + 1 + l2 + 1;
+		  res_ptr = malloc (res_size + 1);
+		}
+	      else
+		{
+		  res_size += l1 + 1 + l2 + 1;
+		  res_ptr = realloc (res_ptr, res_size + 1);
+		}
+	      if (res_ptr == NULL)
+		{
+		  /* Out of memory. */
+		  res_size = 0;
+		  break;
+		}
+	      strcpy (res_ptr + res_size - (l2 + 1) - (l1 + 1), buf1);
+	      strcpy (res_ptr + res_size - (l2 + 1), buf2);
+	    }
+	  fclose (fp);
+	  if (res_size == 0)
+	    cp = "";
+	  else
+	    {
+	      *(res_ptr + res_size) = '\0';
+	      cp = res_ptr;
+	    }
+	}
+
+      if (file_name != NULL)
+	free (file_name);
+
+#else /* WIN32 */
+
+      /* To avoid the troubles of installing a separate file in the same
+	 directory as the DLL and of retrieving the DLL's directory at
+	 runtime, simply inline the aliases here.  */
+
+      cp = "CP936" "\0" "GBK" "\0"
+	   "CP1361" "\0" "JOHAB" "\0";
+#endif
+
+      charset_aliases = cp;
+    }
+
+  return cp;
+}
+
+/* Determine the current locale's character encoding, and canonicalize it
+   into one of the canonical names listed in config.charset.
+   The result must not be freed; it is statically allocated.
+   If the canonical name cannot be determined, the result is a non-canonical
+   name.  */
+
+#ifdef STATIC
+STATIC
+#endif
+const char *
+locale_charset ()
+{
+  const char *codeset;
+  const char *aliases;
+
+#ifndef WIN32
+
+# if HAVE_LANGINFO_CODESET
+
+  /* Most systems support nl_langinfo (CODESET) nowadays.  */
+  codeset = nl_langinfo (CODESET);
+
+# else
+
+  /* On old systems which lack it, use setlocale or getenv.  */
+  const char *locale = NULL;
+
+  /* But most old systems don't have a complete set of locales.  Some
+     (like SunOS 4 or DJGPP) have only the C locale.  Therefore we don't
+     use setlocale here; it would return "C" when it doesn't support the
+     locale name the user has set.  */
+#  if HAVE_SETLOCALE && 0
+  locale = setlocale (LC_CTYPE, NULL);
+#  endif
+  if (locale == NULL || locale[0] == '\0')
+    {
+      locale = getenv ("LC_ALL");
+      if (locale == NULL || locale[0] == '\0')
+	{
+	  locale = getenv ("LC_CTYPE");
+	  if (locale == NULL || locale[0] == '\0')
+	    locale = getenv ("LANG");
+	}
+    }
+
+  /* On some old systems, one used to set locale = "iso8859_1". On others,
+     you set it to "language_COUNTRY.charset". In any case, we resolve it
+     through the charset.alias file.  */
+  codeset = locale;
+
+# endif
+
+#else /* WIN32 */
+
+  static char buf[2 + 10 + 1];
+
+  /* Win32 has a function returning the locale's codepage as a number.  */
+  sprintf (buf, "CP%u", GetACP ());
+  codeset = buf;
+
+#endif
+
+  if (codeset == NULL)
+    /* The canonical name cannot be determined.  */
+    codeset = "";
+
+  /* Resolve alias. */
+  for (aliases = get_charset_aliases ();
+       *aliases != '\0';
+       aliases += strlen (aliases) + 1, aliases += strlen (aliases) + 1)
+    if (strcmp (codeset, aliases) == 0
+	|| (aliases[0] == '*' && aliases[1] == '\0'))
+      {
+	codeset = aliases + strlen (aliases) + 1;
+	break;
+      }
+
+  return codeset;
+}
--- a/intl/locale.alias
+++ b/intl/locale.alias
@@ -0,0 +1,78 @@
+# 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 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
+# Library General Public License for more details.
+#
+# 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
+#	/usr/lib/X11/locale/locale.alias
+# A single line contains two fields: an alias and a substitution value.
+# All entries are case independent.
+
+# Note: This file is far from being complete.  If you have a value for
+# your own site which you think might be useful for others too, share
+# it with the rest of us.  Send it using the `glibcbug' script to
+# bugs@gnu.org.
+
+# Packages using this file: 
+
+bokmal		no_NO.ISO-8859-1
+bokmål		no_NO.ISO-8859-1
+catalan		ca_ES.ISO-8859-1
+croatian	hr_HR.ISO-8859-2
+czech		cs_CZ.ISO-8859-2
+danish          da_DK.ISO-8859-1
+dansk		da_DK.ISO-8859-1
+deutsch		de_DE.ISO-8859-1
+dutch		nl_NL.ISO-8859-1
+eesti		et_EE.ISO-8859-1
+estonian	et_EE.ISO-8859-1
+finnish         fi_FI.ISO-8859-1
+français	fr_FR.ISO-8859-1
+french		fr_FR.ISO-8859-1
+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          he_IL.ISO-8859-8
+hrvatski	hr_HR.ISO-8859-2
+hungarian       hu_HU.ISO-8859-2
+icelandic       is_IS.ISO-8859-1
+italian         it_IT.ISO-8859-1
+japanese	ja_JP.eucJP
+japanese.euc	ja_JP.eucJP
+ja_JP		ja_JP.eucJP
+ja_JP.ujis	ja_JP.eucJP
+japanese.sjis	ja_JP.SJIS
+korean		ko_KR.eucKR
+korean.euc 	ko_KR.eucKR
+ko_KR		ko_KR.eucKR
+lithuanian      lt_LT.ISO-8859-13
+nb_NO		no_NO.ISO-8859-1
+nb_NO.ISO-8859-1 no_NO.ISO-8859-1
+norwegian       no_NO.ISO-8859-1
+nynorsk		nn_NO.ISO-8859-1
+polish          pl_PL.ISO-8859-2
+portuguese      pt_PT.ISO-8859-1
+romanian        ro_RO.ISO-8859-2
+russian         ru_RU.ISO-8859-5
+slovak          sk_SK.ISO-8859-2
+slovene         sl_SI.ISO-8859-2
+slovenian       sl_SI.ISO-8859-2
+spanish         es_ES.ISO-8859-1
+swedish         sv_SE.ISO-8859-1
+thai		th_TH.TIS-620
+turkish         tr_TR.ISO-8859-9
--- a/intl/localealias.c
+++ b/intl/localealias.c
@@ -1,20 +1,27 @@
 /* Handle aliases for locale names.
-   Copyright (C) 1995, 1996, 1997, 1998 Free Software Foundation, Inc.
-   Written by Ulrich Drepper <drepper@gnu.ai.mit.edu>, 1995.
+   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
+   <features.h>, and once <features.h> has been included, it's too late.  */
+#ifndef _GNU_SOURCE
+# define _GNU_SOURCE    1
+#endif

 #ifdef HAVE_CONFIG_H
 # include <config.h>
@@ -41,35 +48,15 @@ char *alloca ();
 # endif
 #endif

-#if defined STDC_HEADERS || defined _LIBC
-# include <stdlib.h>
-#else
-char *getenv ();
-# ifdef HAVE_MALLOC_H
-#  include <malloc.h>
-# else
-void free ();
-# endif
-#endif
+#include <stdlib.h>

-#if defined HAVE_STRING_H || defined _LIBC
-# ifndef _GNU_SOURCE
-#  define _GNU_SOURCE	1
-# endif
-# include <string.h>
-#else
-# include <strings.h>
-# ifndef memcpy
-#  define memcpy(Dst, Src, Num) bcopy (Src, Dst, Num)
-# endif
-#endif
+#include <string.h>
 #if !HAVE_STRCHR && !defined _LIBC
 # ifndef strchr
 #  define strchr index
 # endif
 #endif

-#include "gettext.h"
 #include "gettextP.h"

 /* @@ end of prolog @@ */
@@ -95,40 +82,14 @@ __libc_lock_define_initialized (static, lock);
 # define internal_function
 #endif

-/* For those loosing systems which don't have `alloca' we have to add
+/* For those losing systems which don't have `alloca' we have to add
   some additional code emulating it.  */
 #ifdef HAVE_ALLOCA
-/* Nothing has to be done.  */
-# define ADD_BLOCK(list, address) /* nothing */
-# define FREE_BLOCKS(list) /* nothing */
+# define freea(p) /* nothing */
 #else
-struct block_list
-{
-  void *address;
-  struct block_list *next;
-};
-# define ADD_BLOCK(list, addr)						      \
-  do {									      \
-    struct block_list *newp = (struct block_list *) malloc (sizeof (*newp));  \
-    /* If we cannot get a free block we cannot add the new element to	      \
-       the list.  */							      \
-    if (newp != NULL) {							      \
-      newp->address = (addr);						      \
-      newp->next = (list);						      \
-      (list) = newp;							      \
-    }									      \
-  } while (0)
-# define FREE_BLOCKS(list)						      \
-  do {									      \
-    while (list != NULL) {						      \
-      struct block_list *old = list;					      \
-      list = list->next;						      \
-      free (old);							      \
-    }									      \
-  } while (0)
-# undef alloca
-# define alloca(size) (malloc (size))
-#endif	/* have alloca */
+# define alloca(n) malloc (n)
+# define freea(p) free (p)
+#endif

 #if defined _LIBC_REENTRANT || defined HAVE_FGETS_UNLOCKED
 # undef fgets
@@ -147,18 +108,18 @@ struct alias_map
 };


-static char *string_space = NULL;
-static size_t string_space_act = 0;
-static size_t string_space_max = 0;
+static char *string_space;
+static size_t string_space_act;
+static size_t string_space_max;
 static struct alias_map *map;
-static size_t nmap = 0;
-static size_t maxmap = 0;
+static size_t nmap;
+static size_t maxmap;


 /* Prototypes for local functions.  */
 static size_t read_alias_file PARAMS ((const char *fname, int fname_len))
     internal_function;
-static void extend_alias_table PARAMS ((void));
+static int extend_alias_table PARAMS ((void));
 static int alias_compare PARAMS ((const struct alias_map *map1,
 				  const struct alias_map *map2));

@@ -204,11 +165,12 @@ _nl_expand_alias (name)
 	{
 	  const char *start;

-	  while (locale_alias_path[0] == ':')
+	  while (locale_alias_path[0] == PATH_SEPARATOR)
 	    ++locale_alias_path;
 	  start = locale_alias_path;

-	  while (locale_alias_path[0] != '\0' && locale_alias_path[0] != ':')
+	  while (locale_alias_path[0] != '\0'
+		 && locale_alias_path[0] != PATH_SEPARATOR)
 	    ++locale_alias_path;

 	  if (start < locale_alias_path)
@@ -231,16 +193,12 @@ read_alias_file (fname, fname_len)
     const char *fname;
     int fname_len;
 {
-#ifndef HAVE_ALLOCA
-  struct block_list *block_list = NULL;
-#endif
  FILE *fp;
  char *full_fname;
  size_t added;
  static const char aliasfile[] = "/locale.alias";

  full_fname = (char *) alloca (fname_len + sizeof aliasfile);
-  ADD_BLOCK (block_list, full_fname);
 #ifdef HAVE_MEMPCPY
  mempcpy (mempcpy (full_fname, fname, fname_len),
 	   aliasfile, sizeof aliasfile);
@@ -250,11 +208,9 @@ read_alias_file (fname, fname_len)
 #endif

  fp = fopen (full_fname, "r");
+  freea (full_fname);
  if (fp == NULL)
-    {
-      FREE_BLOCKS (block_list);
-      return 0;
-    }
+    return 0;

  added = 0;
  while (!feof (fp))
@@ -326,7 +282,8 @@ read_alias_file (fname, fname_len)
 		*cp++ = '\0';

 	      if (nmap >= maxmap)
-		extend_alias_table ();
+		if (__builtin_expect (extend_alias_table (), 0))
+		  return added;

 	      alias_len = strlen (alias) + 1;
 	      value_len = strlen (value) + 1;
@@ -339,10 +296,19 @@ read_alias_file (fname, fname_len)
 					? alias_len + value_len : 1024));
 		  char *new_pool = (char *) realloc (string_space, new_size);
 		  if (new_pool == NULL)
+		    return added;
+
+		  if (__builtin_expect (string_space != new_pool, 0))
 		    {
-		      FREE_BLOCKS (block_list);
-		      return added;
+		      size_t i;
+
+		      for (i = 0; i < nmap; i++)
+			{
+			  map[i].alias += new_pool - string_space;
+			  map[i].value += new_pool - string_space;
+			}
 		    }
+
 		  string_space = new_pool;
 		  string_space_max = new_size;
 		}
@@ -369,12 +335,11 @@ read_alias_file (fname, fname_len)
    qsort (map, nmap, sizeof (struct alias_map),
 	   (int (*) PARAMS ((const void *, const void *))) alias_compare);

-  FREE_BLOCKS (block_list);
  return added;
 }


-static void
+static int
 extend_alias_table ()
 {
  size_t new_size;
@@ -385,10 +350,11 @@ extend_alias_table ()
 						* sizeof (struct alias_map)));
  if (new_map == NULL)
    /* Simply don't extend: we don't have any more core.  */
-    return;
+    return -1;

  map = new_map;
  maxmap = new_size;
+  return 0;
 }


--- a/intl/ngettext.c
+++ b/intl/ngettext.c
@@ -0,0 +1,68 @@
+/* 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 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
+   Library General Public License for more details.
+
+   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>
+#endif
+
+#ifdef _LIBC
+# define __need_NULL
+# include <stddef.h>
+#else
+# include <stdlib.h>		/* Just for NULL.  */
+#endif
+
+#include "gettextP.h"
+#ifdef _LIBC
+# include <libintl.h>
+#else
+# include "libgnuintl.h"
+#endif
+
+#include <locale.h>
+
+/* @@ end of prolog @@ */
+
+/* Names for the libintl functions are a problem.  They must not clash
+   with existing names and they should follow ANSI C.  But this source
+   code is also used in GNU C Library where the names have a __
+   prefix.  So we have to make a difference here.  */
+#ifdef _LIBC
+# define NGETTEXT __ngettext
+# define DCNGETTEXT __dcngettext
+#else
+# define NGETTEXT ngettext__
+# define DCNGETTEXT dcngettext__
+#endif
+
+/* Look up MSGID in the current default message catalog for the current
+   LC_MESSAGES locale.  If not found, returns MSGID itself (the default
+   text).  */
+char *
+NGETTEXT (msgid1, msgid2, n)
+     const char *msgid1;
+     const char *msgid2;
+     unsigned long int n;
+{
+  return DCNGETTEXT (NULL, msgid1, msgid2, n, LC_MESSAGES);
+}
+
+#ifdef _LIBC
+/* Alias for function name in GNU C Library.  */
+weak_alias (__ngettext, ngettext);
+#endif
--- a/intl/plural.c
+++ b/intl/plural.c
--- a/intl/plural.y
+++ b/intl/plural.y
@@ -0,0 +1,413 @@
+%{
+/* Expression parsing for plural form selection.
+   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 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
+   Library General Public License for more details.
+
+   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
+   skeleton file comes too late.  This must come before <config.h>
+   because <config.h> may include arbitrary system headers.  */
+#if defined _AIX && !defined __GNUC__
+ #pragma alloca
+#endif
+
+#ifdef HAVE_CONFIG_H
+# include <config.h>
+#endif
+
+#include <stdlib.h>
+#include "gettextP.h"
+
+/* Names for the libintl functions are a problem.  They must not clash
+   with existing names and they should follow ANSI C.  But this source
+   code is also used in GNU C Library where the names have a __
+   prefix.  So we have to make a difference here.  */
+#ifdef _LIBC
+# define FREE_EXPRESSION __gettext_free_exp
+#else
+# define FREE_EXPRESSION gettext_free_exp__
+# define __gettextparse gettextparse__
+#endif
+
+#define YYLEX_PARAM	&((struct parse_args *) arg)->cp
+#define YYPARSE_PARAM	arg
+%}
+%pure_parser
+%expect 10
+
+%union {
+  unsigned long int num;
+  enum operator op;
+  struct expression *exp;
+}
+
+%{
+/* Prototypes for local functions.  */
+static struct expression *new_exp PARAMS ((int nargs, enum operator op,
+					   struct expression * const *args));
+static inline struct expression *new_exp_0 PARAMS ((enum operator op));
+static inline struct expression *new_exp_1 PARAMS ((enum operator op,
+						   struct expression *right));
+static struct expression *new_exp_2 PARAMS ((enum operator op,
+					     struct expression *left,
+					     struct expression *right));
+static inline struct expression *new_exp_3 PARAMS ((enum operator op,
+						   struct expression *bexp,
+						   struct expression *tbranch,
+						   struct expression *fbranch));
+static int yylex PARAMS ((YYSTYPE *lval, const char **pexp));
+static void yyerror PARAMS ((const char *str));
+
+/* Allocation of expressions.  */
+
+static struct expression *
+new_exp (nargs, op, args)
+     int nargs;
+     enum operator op;
+     struct expression * const *args;
+{
+  int i;
+  struct expression *newp;
+
+  /* If any of the argument could not be malloc'ed, just return NULL.  */
+  for (i = nargs - 1; i >= 0; i--)
+    if (args[i] == NULL)
+      goto fail;
+
+  /* Allocate a new expression.  */
+  newp = (struct expression *) malloc (sizeof (*newp));
+  if (newp != NULL)
+    {
+      newp->nargs = nargs;
+      newp->operation = op;
+      for (i = nargs - 1; i >= 0; i--)
+	newp->val.args[i] = args[i];
+      return newp;
+    }
+
+ fail:
+  for (i = nargs - 1; i >= 0; i--)
+    FREE_EXPRESSION (args[i]);
+
+  return NULL;
+}
+
+static inline struct expression *
+new_exp_0 (op)
+     enum operator op;
+{
+  return new_exp (0, op, NULL);
+}
+
+static inline struct expression *
+new_exp_1 (op, right)
+     enum operator op;
+     struct expression *right;
+{
+  struct expression *args[1];
+
+  args[0] = right;
+  return new_exp (1, op, args);
+}
+
+static struct expression *
+new_exp_2 (op, left, right)
+     enum operator op;
+     struct expression *left;
+     struct expression *right;
+{
+  struct expression *args[2];
+
+  args[0] = left;
+  args[1] = right;
+  return new_exp (2, op, args);
+}
+
+static inline struct expression *
+new_exp_3 (op, bexp, tbranch, fbranch)
+     enum operator op;
+     struct expression *bexp;
+     struct expression *tbranch;
+     struct expression *fbranch;
+{
+  struct expression *args[3];
+
+  args[0] = bexp;
+  args[1] = tbranch;
+  args[2] = fbranch;
+  return new_exp (3, op, args);
+}
+
+%}
+
+/* This declares that all operators have the same associativity and the
+   precedence order as in C.  See [Harbison, Steele: C, A Reference Manual].
+   There is no unary minus and no bitwise operators.
+   Operators with the same syntactic behaviour have been merged into a single
+   token, to save space in the array generated by bison.  */
+%right '?'		/*   ?		*/
+%left '|'		/*   ||		*/
+%left '&'		/*   &&		*/
+%left EQUOP2		/*   == !=	*/
+%left CMPOP2		/*   < > <= >=	*/
+%left ADDOP2		/*   + -	*/
+%left MULOP2		/*   * / %	*/
+%right '!'		/*   !		*/
+
+%token <op> EQUOP2 CMPOP2 ADDOP2 MULOP2
+%token <num> NUMBER
+%type <exp> exp
+
+%%
+
+start:	  exp
+	  {
+	    if ($1 == NULL)
+	      YYABORT;
+	    ((struct parse_args *) arg)->res = $1;
+	  }
+	;
+
+exp:	  exp '?' exp ':' exp
+	  {
+	    $$ = new_exp_3 (qmop, $1, $3, $5);
+	  }
+	| exp '|' exp
+	  {
+	    $$ = new_exp_2 (lor, $1, $3);
+	  }
+	| exp '&' exp
+	  {
+	    $$ = new_exp_2 (land, $1, $3);
+	  }
+	| exp EQUOP2 exp
+	  {
+	    $$ = new_exp_2 ($2, $1, $3);
+	  }
+	| exp CMPOP2 exp
+	  {
+	    $$ = new_exp_2 ($2, $1, $3);
+	  }
+	| exp ADDOP2 exp
+	  {
+	    $$ = new_exp_2 ($2, $1, $3);
+	  }
+	| exp MULOP2 exp
+	  {
+	    $$ = new_exp_2 ($2, $1, $3);
+	  }
+	| '!' exp
+	  {
+	    $$ = new_exp_1 (lnot, $2);
+	  }
+	| 'n'
+	  {
+	    $$ = new_exp_0 (var);
+	  }
+	| NUMBER
+	  {
+	    if (($$ = new_exp_0 (num)) != NULL)
+	      $$->val.num = $1;
+	  }
+	| '(' exp ')'
+	  {
+	    $$ = $2;
+	  }
+	;
+
+%%
+
+void
+internal_function
+FREE_EXPRESSION (exp)
+     struct expression *exp;
+{
+  if (exp == NULL)
+    return;
+
+  /* Handle the recursive case.  */
+  switch (exp->nargs)
+    {
+    case 3:
+      FREE_EXPRESSION (exp->val.args[2]);
+      /* FALLTHROUGH */
+    case 2:
+      FREE_EXPRESSION (exp->val.args[1]);
+      /* FALLTHROUGH */
+    case 1:
+      FREE_EXPRESSION (exp->val.args[0]);
+      /* FALLTHROUGH */
+    default:
+      break;
+    }
+
+  free (exp);
+}
+
+
+static int
+yylex (lval, pexp)
+     YYSTYPE *lval;
+     const char **pexp;
+{
+  const char *exp = *pexp;
+  int result;
+
+  while (1)
+    {
+      if (exp[0] == '\0')
+	{
+	  *pexp = exp;
+	  return YYEOF;
+	}
+
+      if (exp[0] != ' ' && exp[0] != '\t')
+	break;
+
+      ++exp;
+    }
+
+  result = *exp++;
+  switch (result)
+    {
+    case '0': case '1': case '2': case '3': case '4':
+    case '5': case '6': case '7': case '8': case '9':
+      {
+	unsigned long int n = result - '0';
+	while (exp[0] >= '0' && exp[0] <= '9')
+	  {
+	    n *= 10;
+	    n += exp[0] - '0';
+	    ++exp;
+	  }
+	lval->num = n;
+	result = NUMBER;
+      }
+      break;
+
+    case '=':
+      if (exp[0] == '=')
+	{
+	  ++exp;
+	  lval->op = equal;
+	  result = EQUOP2;
+	}
+      else
+	result = YYERRCODE;
+      break;
+
+    case '!':
+      if (exp[0] == '=')
+	{
+	  ++exp;
+	  lval->op = not_equal;
+	  result = EQUOP2;
+	}
+      break;
+
+    case '&':
+    case '|':
+      if (exp[0] == result)
+	++exp;
+      else
+	result = YYERRCODE;
+      break;
+
+    case '<':
+      if (exp[0] == '=')
+	{
+	  ++exp;
+	  lval->op = less_or_equal;
+	}
+      else
+	lval->op = less_than;
+      result = CMPOP2;
+      break;
+
+    case '>':
+      if (exp[0] == '=')
+	{
+	  ++exp;
+	  lval->op = greater_or_equal;
+	}
+      else
+	lval->op = greater_than;
+      result = CMPOP2;
+      break;
+
+    case '*':
+      lval->op = mult;
+      result = MULOP2;
+      break;
+
+    case '/':
+      lval->op = divide;
+      result = MULOP2;
+      break;
+
+    case '%':
+      lval->op = module;
+      result = MULOP2;
+      break;
+
+    case '+':
+      lval->op = plus;
+      result = ADDOP2;
+      break;
+
+    case '-':
+      lval->op = minus;
+      result = ADDOP2;
+      break;
+
+    case 'n':
+    case '?':
+    case ':':
+    case '(':
+    case ')':
+      /* Nothing, just return the character.  */
+      break;
+
+    case ';':
+    case '\n':
+    case '\0':
+      /* Be safe and let the user call this function again.  */
+      --exp;
+      result = YYEOF;
+      break;
+
+    default:
+      result = YYERRCODE;
+#if YYDEBUG != 0
+      --exp;
+#endif
+      break;
+    }
+
+  *pexp = exp;
+
+  return result;
+}
+
+
+static void
+yyerror (str)
+     const char *str;
+{
+  /* Do nothing.  We don't print error messages here.  */
+}
--- a/intl/po2tbl.sed.in
+++ b/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
--- a/intl/ref-add.sin
+++ b/intl/ref-add.sin
@@ -0,0 +1,31 @@
+# Add this package to a list of references stored in a text file.
+#
+#   Copyright (C) 2000 Free Software Foundation, Inc.
+#
+#   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
+#   Library General Public License for more details.
+#
+#   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.
+#
+# Written by Bruno Haible <haible@clisp.cons.org>.
+#
+/^# Packages using this file: / {
+  s/# Packages using this file://
+  ta
+  :a
+  s/ @PACKAGE@ / @PACKAGE@ /
+  tb
+  s/ $/ @PACKAGE@ /
+  :b
+  s/^/# Packages using this file:/
+}
--- a/intl/ref-del.sin
+++ b/intl/ref-del.sin
@@ -0,0 +1,26 @@
+# Remove this package from a list of references stored in a text file.
+#
+#   Copyright (C) 2000 Free Software Foundation, Inc.
+#
+#   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
+#   Library General Public License for more details.
+#
+#   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.
+#
+# Written by Bruno Haible <haible@clisp.cons.org>.
+#
+/^# Packages using this file: / {
+  s/# Packages using this file://
+  s/ @PACKAGE@ / /
+  s/^/# Packages using this file:/
+}
--- a/intl/textdomain.c
+++ b/intl/textdomain.c
@@ -1,42 +1,51 @@
 /* Implementation of the textdomain(3) function.
-   Copyright (C) 1995, 1996, 1997, 1998 Free Software Foundation, Inc.
-   Written by Ulrich Drepper <drepper@gnu.ai.mit.edu>, 1995.
+   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>
 #endif

-#if defined STDC_HEADERS || defined _LIBC
-# include <stdlib.h>
-#endif
-
-#if defined STDC_HEADERS || defined HAVE_STRING_H || defined _LIBC
-# include <string.h>
-#else
-# include <strings.h>
-# ifndef memcpy
-#  define memcpy(Dst, Src, Num) bcopy (Src, Dst, Num)
-# endif
-#endif
+#include <stdlib.h>
+#include <string.h>

 #ifdef _LIBC
 # include <libintl.h>
 #else
-# include "libgettext.h"
+# include "libgnuintl.h"
+#endif
+#include "gettextP.h"
+
+#ifdef _LIBC
+/* We have to handle multi-threaded applications.  */
+# include <bits/libc-lock.h>
+#else
+/* Provide dummy implementation if this is outside glibc.  */
+# define __libc_rwlock_define(CLASS, NAME)
+# define __libc_rwlock_wrlock(NAME)
+# define __libc_rwlock_unlock(NAME)
+#endif
+
+/* The internal variables in the standalone libintl.a must have different
+   names than the internal variables in GNU libc, otherwise programs
+   using libintl.a cannot be linked statically.  */
+#if !defined _LIBC
+# define _nl_default_default_domain _nl_default_default_domain__
+# define _nl_current_default_domain _nl_current_default_domain__
 #endif

 /* @@ end of prolog @@ */
@@ -61,6 +70,9 @@ extern const char *_nl_current_default_domain;
 # define TEXTDOMAIN textdomain__
 #endif

+/* Lock variable to protect the global data in the gettext implementation.  */
+__libc_rwlock_define (extern, _nl_state_lock)
+
 /* Set the current default message catalog to DOMAINNAME.
   If DOMAINNAME is null, return the current default.
   If DOMAINNAME is "", reset to the default of "messages".  */
@@ -68,38 +80,60 @@ char *
 TEXTDOMAIN (domainname)
     const char *domainname;
 {
-  char *old;
+  char *new_domain;
+  char *old_domain;

  /* A NULL pointer requests the current setting.  */
  if (domainname == NULL)
    return (char *) _nl_current_default_domain;

-  old = (char *) _nl_current_default_domain;
+  __libc_rwlock_wrlock (_nl_state_lock);
+
+  old_domain = (char *) _nl_current_default_domain;

  /* If domain name is the null string set to default domain "messages".  */
  if (domainname[0] == '\0'
      || strcmp (domainname, _nl_default_default_domain) == 0)
-    _nl_current_default_domain = _nl_default_default_domain;
+    {
+      _nl_current_default_domain = _nl_default_default_domain;
+      new_domain = (char *) _nl_current_default_domain;
+    }
+  else if (strcmp (domainname, old_domain) == 0)
+    /* This can happen and people will use it to signal that some
+       environment variable changed.  */
+    new_domain = old_domain;
  else
    {
      /* If the following malloc fails `_nl_current_default_domain'
 	 will be NULL.  This value will be returned and so signals we
 	 are out of core.  */
 #if defined _LIBC || defined HAVE_STRDUP
-      _nl_current_default_domain = strdup (domainname);
+      new_domain = strdup (domainname);
 #else
      size_t len = strlen (domainname) + 1;
-      char *cp = (char *) malloc (len);
-      if (cp != NULL)
-	memcpy (cp, domainname, len);
-      _nl_current_default_domain = cp;
+      new_domain = (char *) malloc (len);
+      if (new_domain != NULL)
+	memcpy (new_domain, domainname, len);
 #endif
+
+      if (new_domain != NULL)
+	_nl_current_default_domain = new_domain;
    }

-  if (old != _nl_default_default_domain)
-    free (old);
+  /* We use this possibility to signal a change of the loaded catalogs
+     since this is most likely the case and there is no other easy we
+     to do it.  Do it only when the call was successful.  */
+  if (new_domain != NULL)
+    {
+      ++_nl_msg_cat_cntr;

-  return (char *) _nl_current_default_domain;
+      if (old_domain != new_domain && old_domain != _nl_default_default_domain)
+	free (old_domain);
+    }
+
+  __libc_rwlock_unlock (_nl_state_lock);
+
+  return new_domain;
 }

 #ifdef _LIBC
--- a/intl/xopen-msg.sed
+++ b/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
--- a/m4/.cvsignore
+++ b/m4/.cvsignore
@@ -0,0 +1,2 @@
+Makefile.in
+Makefile
--- a/m4/Makefile.am
+++ b/m4/Makefile.am
@@ -0,0 +1,2 @@
+EXTRA_DIST =	codeset.m4 glibc21.m4 progtest.m4 gettext.m4 iconv.m4 \
+		lcmessage.m4
--- a/m4/aclocal_inc.m4
+++ b/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
+])
--- a/m4/codeset.m4
+++ b/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
+])
--- a/m4/gettext.m4
+++ b/m4/gettext.m4
@@ -2,15 +2,45 @@
 # 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 Public License
-# but which still want to provide support for the GNU gettext functionality.
-# Please note that the actual code is *not* freely available.
+# 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 108
+# serial 10

-AC_PREREQ(2.13)               dnl Minimum Autoconf version required.
-
-AC_DEFUN(NANO_AM_WITH_NLS,
+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,
@@ -19,23 +49,15 @@ AC_DEFUN(NANO_AM_WITH_NLS,
    AC_MSG_RESULT($USE_NLS)
    AC_SUBST(USE_NLS)

+    BUILD_INCLUDED_LIBINTL=no
    USE_INCLUDED_LIBINTL=no
-
-    AC_ARG_WITH(locale-dir,
-      [  --with-locale-dir=DIR   specify locale directory],
-      LOCALE_DIR=$withval)
-    test -z "$LOCALE_DIR" && LOCALE_DIR='$(datadir)/locale'
-    AC_SUBST(LOCALE_DIR)
-
-    AC_ARG_WITH(gnu-locale-dir,
-      [  --with-gnu-locale-dir=DIR specify GNU locale directory],
-      GNU_LOCALE_DIR=$withval)
-    test -z "$GNU_LOCALE_DIR" && GNU_LOCALE_DIR='$(prefix)/share/locale'
-    AC_SUBST(GNU_LOCALE_DIR)
+    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 NLS is requested.])
+      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],
@@ -46,83 +68,74 @@ AC_DEFUN(NANO_AM_WITH_NLS,
      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 gettext or catgets are available (in this order) we
-        dnl use this.  Else we have to fall back to GNU NLS library.
-	dnl catgets is only used if permitted by option --with-catgets.
-	nls_cv_header_intl=
-	nls_cv_header_libgt=
+        dnl to use.  If GNU gettext is available we use this.  Else we have
+        dnl to fall back to GNU NLS library.
 	CATOBJEXT=NONE

-	AC_CHECK_HEADER(libintl.h,
-	  [AC_CACHE_CHECK([for gettext in libc], gt_cv_func_gettext_libc,
-	    [AC_TRY_LINK([#include <libintl.h>], [return (int) gettext ("")],
-	       gt_cv_func_gettext_libc=yes, gt_cv_func_gettext_libc=no)])
+        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])

-	   if test "$gt_cv_func_gettext_libc" != "yes"; then
-	     AC_CHECK_LIB(intl, bindtextdomain,
-	       [AC_CHECK_LIB(intl, gettext)])
+	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

-	   if test "$gt_cv_func_gettext_libc" = "yes" \
-	      || test "$ac_cv_lib_intl_gettext" = "yes"; then
-	      AC_DEFINE(HAVE_GETTEXT, 1,
-	  [Define to 1 if you have gettext and don't want to use GNU gettext.])
-	      NANO_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_CHECK_FUNCS(dcgettext)
-		AC_PATH_PROG(GMSGFMT, gmsgfmt, $MSGFMT)
-		NANO_AM_PATH_PROG_WITH_TEST(XGETTEXT, xgettext,
-		  [test -z "`$ac_dir/$ac_word -h 2>&1 | grep '(HELP)'`"], :)
-		AC_TRY_LINK(, [extern int _nl_msg_cat_cntr;
-			       return _nl_msg_cat_cntr],
-		  [CATOBJEXT=.gmo
-		   DATADIRNAME=share],
-		  [CATOBJEXT=.mo
-		   DATADIRNAME=lib])
-		INSTOBJEXT=.mo
-	      fi
-	    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
-	  AC_MSG_CHECKING([whether catgets can be used])
-	  AC_ARG_WITH(catgets,
-	    [  --with-catgets          use catgets functions if available],
-	    nls_cv_use_catgets=$withval, nls_cv_use_catgets=no)
-	  AC_MSG_RESULT($nls_cv_use_catgets)
-
-	  if test "$nls_cv_use_catgets" = "yes"; then
-	    dnl No gettext in C library.  Try catgets next.
-	    AC_CHECK_LIB(i, main)
-	    AC_CHECK_FUNC(catgets,
-	      [AC_DEFINE(HAVE_CATGETS, 1,
-			 [Define as 1 if you have catgets and don't want to use GNU gettext.])
-	       INTLOBJS="\$(CATOBJS)"
-	       AC_PATH_PROG(GENCAT, gencat, no)dnl
-	       if test "$GENCAT" != "no"; then
-		 AC_PATH_PROG(GMSGFMT, gmsgfmt, no)
-		 if test "$GMSGFMT" = "no"; then
-		   NANO_AM_PATH_PROG_WITH_TEST(GMSGFMT, msgfmt,
-		    [test -z "`$ac_dir/$ac_word -h 2>&1 | grep 'dv '`"], no)
-		 fi
-		 NANO_AM_PATH_PROG_WITH_TEST(XGETTEXT, xgettext,
-		   [test -z "`$ac_dir/$ac_word -h 2>&1 | grep '(HELP)'`"], :)
-		 USE_INCLUDED_LIBINTL=yes
-		 CATOBJEXT=.cat
-		 INSTOBJEXT=.cat
-		 DATADIRNAME=lib
-		 INTLDEPS='$(top_builddir)/intl/libintl.a'
-		 INTLLIBS=$INTLDEPS
-		 LIBS=`echo $LIBS | sed -e 's/-lintl//'`
-		 nls_cv_header_intl=intl/libintl.h
-		 nls_cv_header_libgt=intl/libgettext.h
-	       fi])
-	  fi
-        fi
-
-        if test "$CATOBJEXT" = "NONE"; then
-	  dnl Neither gettext nor catgets in included in the C library.
+	  dnl GNU gettext is not found in the C library.
 	  dnl Fall back on GNU gettext library.
 	  nls_cv_use_gnu_gettext=yes
        fi
@@ -132,27 +145,38 @@ AC_DEFUN(NANO_AM_WITH_NLS,
        dnl Mark actions used to generate GNU NLS library.
        INTLOBJS="\$(GETTOBJS)"
        NANO_AM_PATH_PROG_WITH_TEST(MSGFMT, msgfmt,
-	  [test -z "`$ac_dir/$ac_word -h 2>&1 | grep 'dv '`"], 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,
-	  [test -z "`$ac_dir/$ac_word -h 2>&1 | grep '(HELP)'`"], :)
+	  [$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
-        INSTOBJEXT=.mo
-        DATADIRNAME=share
-	INTLDEPS='$(top_builddir)/intl/libintl.a'
-	INTLLIBS=$INTLDEPS
-	LIBS=`echo $LIBS | sed -e 's/-lintl//'`
-        nls_cv_header_intl=intl/libintl.h
-        nls_cv_header_libgt=intl/libgettext.h
+	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 2> /dev/null; then
+	if $XGETTEXT --omit-header /dev/null >/dev/null 2>&1; then
 	  : ;
 	else
 	  AC_MSG_RESULT(
@@ -161,29 +185,76 @@ AC_DEFUN(NANO_AM_WITH_NLS,
 	fi
      fi

-      # We need to process the po/ directory.
+      dnl We need to process the po/ directory.
      POSUB=po
-    else
-      DATADIRNAME=share
-      nls_cv_header_intl=intl/libintl.h
-      nls_cv_header_libgt=intl/libgettext.h
    fi
-    if test -z "$nls_cv_header_intl"; then
-      # Clean out junk possibly left behind by a previous configuration.
-      rm -f intl/libintl.h
-    fi
-    AC_LINK_FILES($nls_cv_header_libgt, $nls_cv_header_intl)
    AC_OUTPUT_COMMANDS(
-     [case "$CONFIG_FILES" in *po/Makefile.in*)
-        sed -e "/POTFILES =/r po/POTFILES" po/Makefile.in > po/Makefile
-      esac])
+     [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])


-    # If this is used in GNU gettext we have to set USE_NLS to `yes'
-    # because some of the sources are only built for this goal.
+    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
-      USE_NLS=yes
-      USE_INCLUDED_LIBINTL=yes
+      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
@@ -195,22 +266,38 @@ AC_DEFUN(NANO_AM_WITH_NLS,
    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(DATADIRNAME)
    AC_SUBST(GMOFILES)
-    AC_SUBST(INSTOBJEXT)
-    AC_SUBST(INTLDEPS)
    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)
  ])

-AC_DEFUN(NANO_AM_GNU_GETTEXT,
+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
@@ -220,21 +307,18 @@ AC_DEFUN(NANO_AM_GNU_GETTEXT,
   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 string.h \
-unistd.h sys/param.h])
-   AC_CHECK_FUNCS([getcwd munmap putenv setenv setlocale strchr strcasecmp \
-strdup __argz_count __argz_stringify __argz_next])
-
-   if test "${ac_cv_func_stpcpy+set}" != "set"; then
-     AC_CHECK_FUNCS(stpcpy)
-   fi
-   if test "${ac_cv_func_stpcpy}" = "yes"; then
-     AC_DEFINE(HAVE_STPCPY, 1, [Define to 1 if you have the stpcpy function.])
-   fi
+   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
+   NANO_AM_WITH_NLS([$1],[$2],[$3])

   if test "x$CATOBJEXT" != "x"; then
     if test "x$ALL_LINGUAS" = "x"; then
@@ -242,10 +326,21 @@ strdup __argz_count __argz_stringify __argz_next])
     else
       AC_MSG_CHECKING(for catalogs to be installed)
       NEW_LINGUAS=
-       for lang in ${LINGUAS=$ALL_LINGUAS}; do
-         case "$ALL_LINGUAS" in
-          *$lang*) NEW_LINGUAS="$NEW_LINGUAS $lang" ;;
-         esac
+       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)
@@ -257,47 +352,8 @@ strdup __argz_count __argz_stringify __argz_next])
     fi
   fi

-   dnl The reference to <locale.h> in the installed <libintl.h> file
-   dnl must be resolved because we cannot expect the users of this
-   dnl to define HAVE_LOCALE_H.
-   if test $ac_cv_header_locale_h = yes; then
-     INCLUDE_LOCALE_H="#include <locale.h>"
-   else
-     INCLUDE_LOCALE_H="\
-/* The system does not provide the header <locale.h>.  Take care yourself.  */"
-   fi
-   AC_SUBST(INCLUDE_LOCALE_H)
-
-   dnl Determine which catalog format we have (if any is needed)
-   dnl For now we know about two different formats:
-   dnl   Linux libc-5 and the normal X/Open format
-   test -d intl || mkdir intl
-   if test "$CATOBJEXT" = ".cat"; then
-     AC_CHECK_HEADER(linux/version.h, msgformat=linux, msgformat=xopen)
-
-     dnl Transform the SED scripts while copying because some dumb SEDs
-     dnl cannot handle comments.
-     sed -e '/^#/d' $srcdir/intl/$msgformat-msg.sed > intl/po2msg.sed
-   fi
-   dnl po2tbl.sed is always needed.
-   sed -e '/^#.*[^\\]$/d' -e '/^#$/d' \
-     $srcdir/intl/po2tbl.sed.in > intl/po2tbl.sed
-
-   dnl In the intl/Makefile.in we have a special dependency which makes
-   dnl only sense for gettext.  We comment this out for non-gettext
-   dnl packages.
-   if test "$PACKAGE" = "gettext"; then
-     GT_NO="#NO#"
-     GT_YES=
-   else
-     GT_NO=
-     GT_YES="#YES#"
-   fi
-   AC_SUBST(GT_NO)
-   AC_SUBST(GT_YES)
-
   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 find the mkinstalldirs script in another subdir but $(top_srcdir).
   dnl Try to locate is.
   MKINSTALLDIRS=
   if test -n "$ac_aux_dir"; then
@@ -308,22 +364,7 @@ strdup __argz_count __argz_stringify __argz_next])
   fi
   AC_SUBST(MKINSTALLDIRS)

-   dnl *** For now the libtool support in intl/Makefile is not for real.
-   l=
-   AC_SUBST(l)
-
-   dnl Generate list of files to be processed by xgettext which will
-   dnl be included in po/Makefile.
-   test -d po || mkdir po
-   case "$srcdir" in
-   .)
-     posrcprefix="../" ;;
-   /* | [[A-Za-z]]:*)
-     posrcprefix="$srcdir/" ;;
-   *)
-     posrcprefix="../$srcdir/" ;;
-   esac
-   rm -f po/POTFILES
-   sed -e "/^#/d" -e "/^\$/d" -e "s,.*,	$posrcprefix& \\\\," -e "\$s/\(.*\) \\\\/\1/" \
-	< $srcdir/po/POTFILES.in > po/POTFILES
+   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)
  ])
--- a/m4/glibc21.m4
+++ b/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"
+  ]
+)
--- a/m4/iconv.m4
+++ b/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)
+])
--- a/m4/largefile.m4
+++ b/m4/largefile.m4
@@ -1,92 +0,0 @@
-#serial 19
-
-dnl By default, many hosts won't let programs access large files;
-dnl one must use special compiler options to get large-file access to work.
-dnl For more details about this brain damage please see:
-dnl http://www.sas.com/standards/large.file/x_open.20Mar96.html
-
-dnl Written by Paul Eggert <eggert@twinsun.com>.
-
-dnl Internal subroutine of AC_SYS_LARGEFILE.
-dnl AC_SYS_LARGEFILE_TEST_INCLUDES
-AC_DEFUN(AC_SYS_LARGEFILE_TEST_INCLUDES,
-  [[#include <sys/types.h>
-    /* Check that off_t can represent 2**63 - 1 correctly.
-       We can't simply "#define LARGE_OFF_T 9223372036854775807",
-       since some C++ compilers masquerading as C compilers
-       incorrectly reject 9223372036854775807.  */
-#   define LARGE_OFF_T (((off_t) 1 << 62) - 1 + ((off_t) 1 << 62))
-    int off_t_is_large[(LARGE_OFF_T % 2147483629 == 721
-			&& LARGE_OFF_T % 2147483647 == 1)
-		       ? 1 : -1];
-  ]])
-
-dnl Internal subroutine of AC_SYS_LARGEFILE.
-dnl AC_SYS_LARGEFILE_MACRO_VALUE(C-MACRO, VALUE, CACHE-VAR, COMMENT, INCLUDES, FUNCTION-BODY)
-AC_DEFUN(AC_SYS_LARGEFILE_MACRO_VALUE,
-  [AC_CACHE_CHECK([for $1 value needed for large files], $3,
-     [$3=no
-      AC_TRY_COMPILE([$5],
-	[$6], 
-	,
-	[AC_TRY_COMPILE([#define $1 $2]
-[$5]
-	   ,
-	   [$6],
-	   [$3=$2])])])
-   if test "[$]$3" != no; then
-     AC_DEFINE_UNQUOTED([$1], [$]$3, [$4])
-   fi])
-
-AC_DEFUN(NANO_AC_SYS_LARGEFILE,
-  [AC_REQUIRE([AC_PROG_CC])
-   AC_ARG_ENABLE(largefile,
-     [  --disable-largefile     omit support for large files])
-   if test "$enable_largefile" != no; then
-
-     AC_CACHE_CHECK([for special C compiler options needed for large files],
-       ac_cv_sys_largefile_CC,
-       [ac_cv_sys_largefile_CC=no
-        if test "$GCC" != yes; then
-	  # IRIX 6.2 and later do not support large files by default,
-	  # so use the C compiler's -n32 option if that helps.
-	  AC_TRY_COMPILE(AC_SYS_LARGEFILE_TEST_INCLUDES, , ,
-	    [ac_save_CC="$CC"
-	     CC="$CC -n32"
-	     AC_TRY_COMPILE(AC_SYS_LARGEFILE_TEST_INCLUDES, ,
-	       ac_cv_sys_largefile_CC=' -n32')
-	     CC="$ac_save_CC"])
-        fi])
-     if test "$ac_cv_sys_largefile_CC" != no; then
-       CC="$CC$ac_cv_sys_largefile_CC"
-     fi
-
-     AC_SYS_LARGEFILE_MACRO_VALUE(_FILE_OFFSET_BITS, 64,
-       ac_cv_sys_file_offset_bits,
-       [Number of bits in a file offset, on hosts where this is settable.],
-       AC_SYS_LARGEFILE_TEST_INCLUDES)
-     AC_SYS_LARGEFILE_MACRO_VALUE(_LARGE_FILES, 1,
-       ac_cv_sys_large_files,
-       [Define for large files, on AIX-style hosts.],
-       AC_SYS_LARGEFILE_TEST_INCLUDES)
-   fi
-  ])
-
-AC_DEFUN(AC_FUNC_FSEEKO,
-  [AC_SYS_LARGEFILE_MACRO_VALUE(_LARGEFILE_SOURCE, 1,
-     ac_cv_sys_largefile_source,
-     [Define to make fseeko visible on some hosts (e.g. glibc 2.2).],
-     [#include <stdio.h>], [return !fseeko;])
-   # We used to try defining _XOPEN_SOURCE=500 too, to work around a bug
-   # in glibc 2.1.3, but that breaks too many other things.
-   # If you want fseeko and ftello with glibc, upgrade to a fixed glibc.
-
-   AC_CACHE_CHECK([for fseeko], ac_cv_func_fseeko,
-     [ac_cv_func_fseeko=no
-      AC_TRY_LINK([#include <stdio.h>],
-        [return fseeko && fseeko (stdin, 0, 0);],
-	[ac_cv_func_fseeko=yes])])
-   if test $ac_cv_func_fseeko != no; then
-     AC_DEFINE(HAVE_FSEEKO, 1,
-       [Define if fseeko (and presumably ftello) exists and is declared.])
-   fi])
--- a/m4/lcmessage.m4
+++ b/m4/lcmessage.m4
@@ -2,21 +2,23 @@
 # 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 Public License
-# but which still want to provide support for the GNU gettext functionality.
-# Please note that the actual code is *not* freely available.
+# 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_PREREQ(2.13)               dnl Minimum Autoconf version required.
-
-AC_DEFUN(NANO_AM_LC_MESSAGES,
+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 contains LC_MESSAGES.])
+        [Define if your <locale.h> file defines LC_MESSAGES.])
    fi
  fi])
--- a/m4/progtest.m4
+++ b/m4/progtest.m4
@@ -2,15 +2,19 @@
 # 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 Public License
-# but which still want to provide support for the GNU gettext functionality.
-# Please note that the actual code is *not* freely available.
+# 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 1
+# serial 2

-dnl AM_PATH_PROG_WITH_TEST(VARIABLE, PROG-TO-CHECK-FOR,
+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,
+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])
@@ -38,7 +42,7 @@ ifelse([$4], , , [  test -z "[$]ac_cv_path_$1" && ac_cv_path_$1="$4"
  ;;
 esac])dnl
 $1="$ac_cv_path_$1"
-if test -n "[$]$1"; then
+if test ifelse([$4], , [-n "[$]$1"], ["[$]$1" != "$4"]); then
  AC_MSG_RESULT([$]$1)
 else
  AC_MSG_RESULT(no)
--- a/190
+++ b/190
@@ -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
--- a/40
+++ b/40
@@ -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
--- a/nano.1
+++ b/nano.1
@@ -45,6 +45,12 @@ under nano.
 .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.
@@ -131,8 +137,8 @@ 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
--- a/nano.1.html
+++ b/nano.1.html
@@ -62,6 +62,14 @@ under nano.

 <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>
@@ -179,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>
@@ -213,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: 04:02:51 GMT, January 05, 2002
+Time: 12:14:20 GMT, March 04, 2002
 </BODY>
 </HTML>
--- a/nano.c
+++ b/nano.c
@@ -64,8 +64,8 @@

 #ifndef DISABLE_WRAPJUSTIFY
 /* Former globals, now static */
-int fill = 0;			/* Fill - where to wrap lines, basically */
-int wrap_at = 0;		/* Right justified fill value, allows resize */
+int fill = 0;/* Fill - where to wrap lines, basically */
+int wrap_at = 0;/* Right justified fill value, allows resize */
 #endif

 struct termios oldterm;		/* The user's original term settings */
@@ -100,6 +100,8 @@ RETSIGTYPE finish(int sigage)
    /* Restore the old term settings */
    tcsetattr(0, TCSANOW, &oldterm);

+    thanks_for_all_the_fish();
+
    exit(sigage);
 }

@@ -158,27 +160,34 @@ void die(char *msg, ...)

 void die_save_file(char *die_filename)
 {
-    char *name;
-    int i;
+    char *name, *ret;
+    int i = -1;

    /* if we can't save we have REAL bad problems,
     * but we might as well TRY. */
    if (die_filename[0] == '\0') {
 	name = "nano.save";
-	i = write_file(name, 1, 0, 0);
-    } else {
-
+	ret = get_next_filename(name);
+	if (strcmp(ret, ""))
+	    i = write_file(ret, 1, 0, 0);
+	name = ret;
+    }
+    else {
 	char *buf = charalloc(strlen(die_filename) + 6);
 	strcpy(buf, die_filename);
 	strcat(buf, ".save");
-	i = write_file(buf, 1, 0, 0);
-	name = buf;
+	ret = get_next_filename(buf);
+	if (strcmp(ret, ""))
+	    i = write_file(ret, 1, 0, 0);
+	name = ret;
    }

    if (i != -1)
 	fprintf(stderr, _("\nBuffer written to %s\n"), name);
    else
-	fprintf(stderr, _("\nNo %s written (file exists?)\n"), name);
+	fprintf(stderr, _("\nNo %s written (too many backup files?)\n"), name);
+
+    free(ret);
 }

 /* Die with an error message that the screen was too small if, well, the
@@ -425,10 +434,14 @@ void usage(void)
    printf
 	(_
 	 (" -M 		--mac			Write file in Mac format\n"));
+    printf
+	(_
+	 (" -N 		--noconvert		Don't convert files from DOS/Mac format\n"));
 #endif
-#ifdef HAVE_REGEX_H
-    printf(_
-	   (" -R		--regexp		Use regular expressions for search\n"));
+#ifndef DISABLE_JUSTIFY
+    printf
+	(_
+	 (" -Q [str]	--quotestr [str]	Quoting string, default \"> \"\n"));
 #endif
 #ifndef NANO_SMALL
    printf(_
@@ -495,9 +508,12 @@ void usage(void)
 #ifdef ENABLE_MULTIBUFFER
    printf(_(" -F 		Enable multiple file buffers\n"));
 #endif
-    printf(_(" -K		Use alternate keypad routines\n\n"));
+    printf(_(" -K		Use alternate keypad routines\n"));
 #ifndef NANO_SMALL
    printf(_(" -M 		Write file in Mac format\n"));
+#endif
+#ifndef DISABLE_JUSTIFY
+    printf(_(" -Q [str] 	Quoting string, default \"> \"\n"));
 #endif
    printf(_(" -R		Use regular expressions for search\n"));
 #ifndef NANO_SMALL
@@ -552,12 +568,10 @@ void version(void)

 #ifdef NANO_EXTRA
    printf(" --enable-extra");
-#else
+#endif
 #ifdef ENABLE_MULTIBUFFER
    printf(" --enable-multibuffer");
-#endif /* ENABLE_MULTIBUFFER */
-#endif /* NANO_EXTRA */
-
+#endif
 #ifdef ENABLE_NANORC
    printf(" --enable-nanorc");
 #endif
@@ -687,6 +701,10 @@ void do_char(char ch)
    current->data[current_x] = ch;
    do_right();

+#ifdef ENABLE_COLOR
+    edit_refresh();
+#endif
+
 #ifndef DISABLE_WRAPPING
    if (!ISSET(NO_WRAP) && (ch != '\t'))
 	check_wrap(current, ch);
@@ -1031,7 +1049,6 @@ void do_wrap(filestruct * inptr, char input_char)
 		while ((inptr->next->data[i] == ' '
 			|| inptr->next->data[i] == '\t')) {
 		    i++;
-		    right++;
 		}
 	    }
 #endif
@@ -1102,7 +1119,6 @@ void do_wrap(filestruct * inptr, char input_char)
 		while ((inptr->next->data[i] == ' '
 			|| inptr->next->data[i] == '\t')) {
 		    i++;
-		    right++;
 		}
 	    }
 #endif
@@ -1223,6 +1239,7 @@ void do_wrap(filestruct * inptr, char input_char)
 		    extra++;
 		    spc++;
 		    totsize++;
+		    right++;
 		}
 		t = charalloc(strlen(temp->data) + extra + 1);
 		strncpy(t, inptr->data, extra);
@@ -1447,12 +1464,16 @@ int do_int_spell_fix(char *word)
 {
    char *prevanswer = NULL, *save_search = NULL, *save_replace = NULL;
    filestruct *begin;
-    int i = 0, j = 0, beginx, beginx_top;
+    int i = 0, j = 0, beginx, beginx_top, reverse_search_set;

    /* save where we are */
    begin = current;
    beginx = current_x + 1;

+    /* Make sure Spell Check goes forward only */
+    reverse_search_set = ISSET(REVERSE_SEARCH);
+    UNSET(REVERSE_SEARCH);
+
    /* save the current search/replace strings */
    search_init_globals();
    save_search = mallocstrcpy(save_search, last_search);
@@ -1471,26 +1492,35 @@ int do_int_spell_fix(char *word)

    edit_update(fileage, TOP);

-    /* make sure word is still mis-spelt (i.e. when multi-errors) */
-    if (findnextstr(TRUE, FALSE, fileage, beginx_top, prevanswer) != NULL) {
-	do_replace_highlight(TRUE, prevanswer);
+    while (1) {

-	/* allow replace word to be corrected */
-	i = statusq(0, spell_list, SPELL_LIST_LEN, last_replace,
-		    _("Edit a replacement"));
+	/* make sure word is still mis-spelt (i.e. when multi-errors) */
+	if (findnextstr(TRUE, FALSE, fileage, beginx_top, prevanswer) != NULL) {

-	do_replace_highlight(FALSE, prevanswer);
+	    /* find wholewords only */
+	    if (!is_whole_word(current_x, current, prevanswer))
+		continue;

-	/* start from the start of this line again */
-	current = fileage;
-	current_x = beginx_top;
+	    do_replace_highlight(TRUE, prevanswer);

-	search_last_line = FALSE;
+	    /* allow replace word to be corrected */
+	    i = statusq(0, spell_list, last_replace, _("Edit a replacement"));

-	if (strcmp(prevanswer,answer) != 0) {
-	   j = i;
-	   do_replace_loop(prevanswer, fileage, &beginx_top, TRUE, &j);
+	    do_replace_highlight(FALSE, prevanswer);
+
+	    /* start from the start of this line again */
+	    current = fileage;
+	    current_x = beginx_top;
+
+	    search_last_line = FALSE;
+
+	    if (strcmp(prevanswer,answer) != 0) {
+		j = i;
+		do_replace_loop(prevanswer, fileage, &beginx_top, TRUE, &j);
+	    }
 	}
+
+	break;
    }

    /* restore the search/replace strings */
@@ -1501,6 +1531,10 @@ int do_int_spell_fix(char *word)
    current = begin;
    current_x = beginx - 1;

+    /* restore Search/Replace direction */
+    if (reverse_search_set)
+	SET(REVERSE_SEARCH);
+
    edit_update(current, CENTER);

    if (i == -1)
@@ -1713,7 +1747,7 @@ int do_spell(void)
    char *temp;
    int spell_res;

-    if ((temp = tempnam(0, "nano.")) == NULL) {
+    if ((temp = safe_tempnam(0, "nano.")) == NULL) {
 	statusbar(_("Could not create a temporary filename: %s"),
 		  strerror(errno));
 	return 0;
@@ -1727,9 +1761,8 @@ int do_spell(void)
 #ifdef ENABLE_MULTIBUFFER
    /* update the current open_files entry before spell-checking, in case
       any problems occur; the case of there being no open_files entries
-       is handled elsewhere (before we reach this point); no duplicate
-       checking is needed here */
-    add_open_file(1, 0);
+       is handled elsewhere (before we reach this point) */
+    add_open_file(1);
 #endif

    if (alt_speller)
@@ -1815,6 +1848,8 @@ void do_mouse(void)
 {
    MEVENT mevent;
    int foo = 0, tab_found = 0;
+    int currslen;
+    shortcut *s = currshortcut;

    if (getmouse(&mevent) == ERR)
 	return;
@@ -1884,7 +1919,12 @@ void do_mouse(void)
 	edit_refresh();
    } else if (wenclose(bottomwin, mevent.y, mevent.x) && !ISSET(NO_HELP)) {

-	int k, val = 0;
+	int i, k;
+
+	if (currshortcut == main_list)
+	    currslen = MAIN_VISIBLE;
+	else
+	    currslen = length_of_list(currshortcut);

 	if (currslen < 2)
 	    k = COLS / 6;
@@ -1901,14 +1941,15 @@ void do_mouse(void)
 	if (mevent.x / k >= currslen)	
 	    return;

-	val = currshortcut[(mevent.x / k) * 2 + mevent.y].val;
+	for (i = 0; i < (mevent.x / k) * 2 + mevent.y; i++)
+	    s = s->next;

 	/* And ungetch that value */
-	ungetch(val);
+	ungetch(s->val);

 	/* And if it's an alt-key sequence, we should probably send alt
 	   too ;-) */
-	if (val >= 'a' && val <= 'z')
+	if (s->val >= 'a' && s->val <= 'z')
 	   ungetch(27);
    }
 }
@@ -1928,6 +1969,9 @@ RETSIGTYPE do_suspend(int signal)
    printf("\n\n\n\n\nUse \"fg\" to return to nano\n");
    fflush(stdout);

+    /* Restore the terminal settings for the disabled keys */
+    tcsetattr(0, TCSANOW, &oldterm);
+
    /* We used to re-enable the default SIG_DFL and raise SIGTSTP, but 
 	then we could be (and were) interrupted in the middle of the call.
 	So we do it the mutt way instead */
@@ -2157,8 +2201,8 @@ void justify_format(char *data)
    int i = 0;
    int len = strlen(data);

-    /* Skip first character regardless and leading whitespace. */
-    for (i = 1; i < len; i++) {
+    /* Skip leading whitespace. */
+    for (i = 0; i < len; i++) {
 	if (!isspace((int) data[i]))
 	    break;
    }
@@ -2168,12 +2212,21 @@ void justify_format(char *data)
    /* No double spaces allowed unless following a period.  Tabs -> space.  No double tabs. */
    for (; i < len; i++) {
 	if (isspace((int) data[i]) && isspace((int) data[i - 1])
-	    && (data[i - 2] != '.')) {
+	    && (data[i - 2] != '.')
+            && (data[i-2]!='!') && (data[i-2]!='?')) {
 	    memmove(data + i, data + i + 1, len - i);
 	    len--;
 	    i--;
 	}
    }
+   /* Skip trailing whitespace.
+    * i<=len iff there was a non-space in the line.  In that case, we
+    * strip spaces from the end of the line.  Note that "line" means the
+    * whole paragraph. */
+  if (i<=len) {
+    for(i=len-1; i>0 && isspace((int) data[i]); i--);
+    data[i+1] = '\0';
+  }
 }
 #endif

@@ -2186,8 +2239,14 @@ int do_justify(void)
    int slen = 0;		/* length of combined lines on one line. */
    int initial_y, kbinput = 0, totbak;
    filestruct *initial = NULL, *tmpjust = NULL, *cutbak, *tmptop, *tmpbot;
+    filestruct *samecheck = current;
+    int qdepth = 0;

-    if (empty_line(current->data)) {
+    /* Compute quote depth level */
+    while (!strncmp(&current->data[qdepth], quotestr, strlen(quotestr)))
+	qdepth += strlen(quotestr);
+
+    if (empty_line(&current->data[qdepth])) {
 	/* Justify starting at first non-empty line. */
 	do {
 	    if (!current->next)
@@ -2196,14 +2255,23 @@ int do_justify(void)
 	    current = current->next;
 	    current_y++;
 	}
-	while (empty_line(current->data));
+	while (strlen(current->data) >= qdepth 
+		&& !strncmp(current->data, samecheck->data, qdepth) 
+		&& empty_line(&current->data[qdepth]));
+
    } else {
 	/* Search back for the beginning of the paragraph, where
 	 *   Paragraph is  1)  A line with leading whitespace
 	 *             or  2)  A line following an empty line.
 	 */
 	while (current->prev != NULL) {
-	    if (isspace((int) current->data[0]) || !current->data[0])
+	    if (strncmp(current->data, samecheck->data, qdepth)
+
+		/* Don't keep going back if the previous line is more 
+			intented quotestr-wise than samecheck */
+		|| !strncmp(&current->data[qdepth], quotestr, strlen(quotestr))
+		|| isspace((int) current->data[qdepth]) 
+		|| empty_line(&current->data[qdepth]))
 		break;

 	    current = current->prev;
@@ -2211,7 +2279,9 @@ int do_justify(void)
 	}

 	/* First line with leading whitespace may be empty. */
-	if (empty_line(current->data)) {
+	if (strncmp(current->data, samecheck->data, qdepth)
+		|| !strncmp(&current->data[qdepth], quotestr, strlen(quotestr))
+		|| empty_line(&current->data[qdepth])) {
 	    if (current->next) {
 		current = current->next;
 		current_y++;
@@ -2229,16 +2299,21 @@ int do_justify(void)

    tmptop = current;
    tmpjust = copy_node(current);
+    samecheck = tmpjust;

    /* This is annoying because it mucks with totsize */
    add_to_cutbuffer(tmpjust);

    /* Put the whole paragraph into one big line. */
    while (current->next && !isspace((int) current->next->data[0])
-	   && current->next->data[0]) {
+	   && !strncmp(current->next->data, samecheck->data, qdepth)
+
+	   /* Don't continue if current->next is indented more! */
+	   && strncmp(&current->next->data[qdepth], quotestr, strlen(quotestr))
+	   && !empty_line(&current->next->data[qdepth])) {
 	filestruct *tmpnode = current->next;
 	int len = strlen(current->data);
-	int len2 = strlen(current->next->data);
+	int len2 = strlen(current->next->data) - qdepth;

 	tmpjust = NULL;
 	tmpjust = copy_node(current->next);
@@ -2252,7 +2327,7 @@ int do_justify(void)
 	current->data[len++] = ' ';
 	current->data[len] = '\0';

-	strncat(current->data, current->next->data, len2);
+	strncat(current->data, &current->next->data[qdepth], len2);

 	unlink_node(tmpnode);
 	delete_node(tmpnode);
@@ -2266,36 +2341,49 @@ int do_justify(void)
    if ((strlenpt(current->data) > (fill))
 	&& !no_spaces(current->data)) {
 	do {
-	    int i = 0;
+	    int i = 0, j = 0;
 	    int len2 = 0;
 	    filestruct *tmpline = nmalloc(sizeof(filestruct));

-	    /* Start at fill , unless line isn't that long (but it 
-	     * appears at least fill long with tabs.
-	     */
-	    if (slen > fill)
-		i = fill;
-	    else
-		i = slen;

-	    for (; i > 0; i--) {
-		if (isspace((int) current->data[i]) &&
-		    ((strlenpt(current->data) - strlen(current->data + i))
-		     <= fill))
-		    break;
-	    }
+/* The following code maybe could be better.  In particular, can we 
+ * merely increment instead of calling strnlenpt for each new character?  
+ * In fact, can we assume the only tabs are at the beginning of the line?
+ */
+/* Note that we CAN break before the first word, since that is how 
+ * pico does it. */
+            int last_space = -1;  /* index of the last breakpoint */
+            int allowed_width;

-	    if (!i)
-		break;
+            i = qdepth * strlen(quotestr);  /* the line starts with 
+                      indentation, so we must skip it! */
+            allowed_width = fill - i;   /* how wide can our lines be? */
+
+            for(; i<slen; i++) {
+              if (isspace((int) current->data[i])) last_space = i;
+              if (last_space!=-1 &&
+                  strnlenpt(current->data,i) >= allowed_width) {
+                i = last_space;
+                break;
+              }
+            }
+/* Now data[i] is a space.  We want to break at the LAST space in this
+ * group.  Probably, the only possibility is two in a row, but let's be 
+ * generic.  Note that we actually replace this final space with \0.  Is
+ * this okay?  It seems to work fine. */
+            for(; i<slen-1 && isspace((int) current->data[i+1]); i++) ;

 	    current->data[i] = '\0';

 	    len2 = strlen(current->data + i + 1);
-	    tmpline->data = charalloc(len2 + 1);
+	    tmpline->data = charalloc(len2 + 1 + qdepth);
+
+	    for (j = 0; j < qdepth; j += strlen(quotestr))
+		strcpy(&tmpline->data[j], quotestr);

 	    /* Skip the white space in current. */
-	    memcpy(tmpline->data, current->data + i + 1, len2);
-	    tmpline->data[len2] = '\0';
+	    memcpy(&tmpline->data[j], current->data + i + 1, len2);
+	    tmpline->data[len2 + qdepth] = '\0';

 	    current->data = nrealloc(current->data, i + 1);

@@ -2388,14 +2476,13 @@ int do_justify(void)
 #ifndef DISABLE_HELP
 void help_init(void)
 {
-    int i, sofar = 0, helplen;
+    int i, sofar = 0, meta_shortcut = 0, helplen;
    long allocsize = 1;		/* How much space we're gonna need for the help text */
    char buf[BUFSIZ] = "", *ptr = NULL;
+    toggle *t;
+    shortcut *s;

-    if (currslen == MAIN_VISIBLE)
-	helplen = MAIN_LIST_LEN;
-    else 
-	helplen = currslen;
+    helplen = length_of_list(currshortcut);

    /* First set up the initial help text for the current function */
    if (currshortcut == whereis_list || currshortcut == replace_list
@@ -2429,7 +2516,10 @@ void help_init(void)
 		"or --multibuffer command line flags, the Meta-F toggle or "
 		"using a nanorc file, inserting a file will cause it to be "
 		"loaded into a separate buffer (use Meta-< and > to switch "
-		"between file buffers).\n\n The following function keys are "
+		"between file buffers).\n\n If you need another blank "
+		"buffer, just press Enter at the prompt without typing in a "
+		"filename, or type in a nonexistent filename at the prompt "
+		"and press Enter.\n\n The following function keys are "
 		"available in Insert File mode:\n\n");
    else if (currshortcut == writefile_list)
 	ptr = _("Write File Help Text\n\n "
@@ -2476,21 +2566,22 @@ void help_init(void)

    /* Compute the space needed for the shortcut lists - we add 15 to
       have room for the shortcut abbrev and its possible alternate keys */
-    for (i = 0; i <= helplen - 1; i++)
-	if (currshortcut[i].help != NULL)
-	    allocsize += strlen(currshortcut[i].help) + 15;
+    s = currshortcut;
+    for (i = 0; i <= helplen - 1; i++) {
+	if (s->help != NULL)
+	    allocsize += strlen(s->help) + 15;
+	s = s->next;
+    }

    /* If we're on the main list, we also allocate space for toggle help text. */
    if (currshortcut == main_list) {
-	for (i = 0; i <= TOGGLE_LEN - 1; i++)
-	    if (toggles[i].desc != NULL)
-		allocsize += strlen(toggles[i].desc) + 30;
-
+	for (t = toggles; t != NULL; t = t->next)
+	    if (t->desc != NULL)
+		allocsize += strlen(t->desc) + 30;
    }

    allocsize += strlen(ptr);

-
    if (help_text != NULL)
 	free(help_text);

@@ -2501,59 +2592,71 @@ void help_init(void)
    strcpy(help_text, ptr);

    /* Now add our shortcut info */
+    s = currshortcut;
    for (i = 0; i <= helplen - 1; i++) {
-	if (currshortcut[i].val > 0 && currshortcut[i].val < 'a')
-	   sofar = snprintf(buf, BUFSIZ, "^%c	", currshortcut[i].val + 64);
-	else
-	   sofar = snprintf(buf, BUFSIZ, "	");
+	if (s->val > 0 && s->val < 'a')
+	    sofar = snprintf(buf, BUFSIZ, "^%c	", s->val + 64);
+	else {
+	    if (s->altval > 0) {
+		sofar = 0;
+		meta_shortcut = 1;
+	    }
+	    else
+		sofar = snprintf(buf, BUFSIZ, "	");
+	}

-	if (currshortcut[i].misc1 > KEY_F0 && currshortcut[i].misc1 <= KEY_F(64))
-	    sofar += snprintf(&buf[sofar], BUFSIZ - sofar, "(F%d)	",
-			      currshortcut[i].misc1 - KEY_F0);
-	else
-	    sofar += snprintf(&buf[sofar], BUFSIZ - sofar, "	");
+	if (!meta_shortcut) {
+	    if (s->misc1 > KEY_F0 && s->misc1 <= KEY_F(64))
+		sofar += snprintf(&buf[sofar], BUFSIZ - sofar, "(F%d)	",
+				  s->misc1 - KEY_F0);
+	    else
+		sofar += snprintf(&buf[sofar], BUFSIZ - sofar, "	");
+	}

-	if (currshortcut[i].altval > 0 && currshortcut[i].altval < 91)
-	    sofar += snprintf(&buf[sofar], BUFSIZ - sofar, "(M-%c)	",
-			      currshortcut[i].altval - 32);
-	else if (currshortcut[i].altval > 0)
-	    sofar += snprintf(&buf[sofar], BUFSIZ - sofar, "(M-%c)	",
-			      currshortcut[i].altval);
+	if (s->altval > 0 && s->altval < 91 
+		&& (s->altval - 32) > 32)
+	    sofar += snprintf(&buf[sofar], BUFSIZ - sofar,
+	    (meta_shortcut ? "M-%c	" : "(M-%c)	"),
+	    s->altval - 32);
+	else if (s->altval > 0)
+	    sofar += snprintf(&buf[sofar], BUFSIZ - sofar,
+	    (meta_shortcut ? "M-%c	" : "(M-%c)	"),
+	    s->altval);
 	/* Hack */
-	else if (currshortcut[i].val >= 'a')
-	    sofar += snprintf(&buf[sofar], BUFSIZ - sofar, "(M-%c)	",
-			      currshortcut[i].val - 32);
+	else if (s->val >= 'a')
+	    sofar += snprintf(&buf[sofar], BUFSIZ - sofar,
+	    (meta_shortcut ? "(M-%c)	" : "M-%c	"),
+	    s->val - 32);
 	else
 	    sofar += snprintf(&buf[sofar], BUFSIZ - sofar, "	");

+	if (meta_shortcut) {
+	    if (s->misc1 > KEY_F0 && s->misc1 <= KEY_F(64))
+		sofar += snprintf(&buf[sofar], BUFSIZ - sofar,
+			"(F%d)		", s->misc1 - KEY_F0);
+	    else
+		sofar += snprintf(&buf[sofar], BUFSIZ - sofar,
+			"		");
+	}

-	if (currshortcut[i].help != NULL)
-	    snprintf(&buf[sofar], BUFSIZ - sofar, "%s", currshortcut[i].help);
-
+	if (s->help != NULL)
+	    snprintf(&buf[sofar], BUFSIZ - sofar, "%s", s->help);

 	strcat(help_text, buf);
 	strcat(help_text, "\n");
+
+	s = s->next;
    }

    /* And the toggles... */
    if (currshortcut == main_list)
-	for (i = 0; i <= TOGGLE_LEN - 1; i++) {
-	    if (toggles[i].override_ch != 0)
+	for (t = toggles; t != NULL; t = t->next) {
 		sofar = snprintf(buf, BUFSIZ,
-			     "M-%c			", toggles[i].override_ch);
-	    else
-		sofar = snprintf(buf, BUFSIZ,
-			     "M-%c			", toggles[i].val - 32);
-
-	    if (toggles[i].desc != NULL) {
-		if (toggles[i].flag != 0)
+			     "M-%c			", t->val - 32);
+	    if (t->desc != NULL) {
 		    snprintf(&buf[sofar], BUFSIZ - sofar, _("%s enable/disable"),
-			 toggles[i].desc);
-		else
-		    snprintf(&buf[sofar], BUFSIZ - sofar, "%s",
-			 toggles[i].desc);
+			 t->desc);
 	}
-
 	strcat(help_text, buf);
 	strcat(help_text, "\n");
    }
@@ -2561,7 +2664,7 @@ void help_init(void)
 }
 #endif

-void do_toggle(int which)
+void do_toggle(toggle *which)
 {
 #ifdef NANO_SMALL
    nano_disabled_msg();
@@ -2569,7 +2672,7 @@ void do_toggle(int which)
    char *enabled = _("enabled");
    char *disabled = _("disabled");

-    switch (toggles[which].val) {
+    switch (which->val) {
    case TOGGLE_BACKWARDS_KEY:
    case TOGGLE_CASE_KEY:
    case TOGGLE_REGEXP_KEY:
@@ -2577,9 +2680,9 @@ void do_toggle(int which)
    }

    /* Even easier! */
-    TOGGLE(toggles[which].flag);
+    TOGGLE(which->flag);

-    switch (toggles[which].val) {
+    switch (which->val) {
    case TOGGLE_PICOMODE_KEY:
 	shortcut_init(0);
 	SET(CLEAR_BACKUPSTRING);
@@ -2607,18 +2710,18 @@ void do_toggle(int which)
 	break;
    }

-    if (!ISSET(toggles[which].flag)) {
-	if (toggles[which].val == TOGGLE_NOHELP_KEY ||
-	    toggles[which].val == TOGGLE_WRAP_KEY)
-	    statusbar("%s %s", toggles[which].desc, enabled);
+    if (!ISSET(which->flag)) {
+	if (which->val == TOGGLE_NOHELP_KEY ||
+	    which->val == TOGGLE_WRAP_KEY)
+	    statusbar("%s %s", which->desc, enabled);
 	else
-	    statusbar("%s %s", toggles[which].desc, disabled);
+	    statusbar("%s %s", which->desc, disabled);
    } else {
-	if (toggles[which].val == TOGGLE_NOHELP_KEY ||
-	    toggles[which].val == TOGGLE_WRAP_KEY)
-	    statusbar("%s %s", toggles[which].desc, disabled);
+	if (which->val == TOGGLE_NOHELP_KEY ||
+	    which->val == TOGGLE_WRAP_KEY)
+	    statusbar("%s %s", which->desc, disabled);
 	else
-	    statusbar("%s %s", toggles[which].desc, enabled);
+	    statusbar("%s %s", which->desc, enabled);
    }

 #endif
@@ -2665,8 +2768,10 @@ int main(int argc, char *argv[])
    int kbinput;		/* Input from keyboard */
    long startline = 0;		/* Line to try and start at */
    int keyhandled;		/* Have we handled the keystroke yet? */
-    int i, modify_control_seq;
+    int modify_control_seq;
    char *argv0;
+    shortcut *s;
+    toggle *t;

 #ifdef _POSIX_VDISABLE
    struct termios term;
@@ -2689,6 +2794,7 @@ int main(int argc, char *argv[])
 	{"cut", 0, 0, 'k'},
 	{"dos", 0, 0, 'D'},
 	{"mac", 0, 0, 'M'},
+	{"noconvert", 0, 0, 'N'},
 	{"autoindent", 0, 0, 'i'},
 #endif
 	{"tempfile", 0, 0, 't'},
@@ -2714,7 +2820,6 @@ int main(int argc, char *argv[])
 	{"smooth", 0, 0, 'S'},
 #endif
 	{"keypad", 0, 0, 'K'},
-
 	{0, 0, 0, 0}
    };
 #endif
@@ -2735,11 +2840,11 @@ int main(int argc, char *argv[])
 #endif /* ENABLE_NANORC */

 #ifdef HAVE_GETOPT_LONG
-    while ((optchr = getopt_long(argc, argv, "h?DFKMRST:Vabcefgijklmo:pr:s:tvwxz",
+    while ((optchr = getopt_long(argc, argv, "h?DFKMNQ:RST:Vabcefgijklmo:pr:s:tvwxz",
 				 long_options, &option_index)) != EOF) {
 #else
    while ((optchr =
-	    getopt(argc, argv, "h?DFKMRST:Vabcefgijklmo:pr:s:tvwxz")) != EOF) {
+	    getopt(argc, argv, "h?DFKMNQ:RST:Vabcefgijklmo:pr:s:tvwxz")) != EOF) {
 #endif

 	switch (optchr) {
@@ -2761,14 +2866,18 @@ int main(int argc, char *argv[])
 	case 'M':
 	    SET(MAC_FILE);
 	    break;
-#endif
-	case 'T':
-	    tabsize = atoi(optarg);
-	    if (tabsize <= 0) {
-		usage();	/* To stop bogus data for tab width */
-		finish(1);
-	    }
+	case 'N':
+	    SET(NO_CONVERT);
 	    break;
+#endif
+	case 'Q':
+#ifndef DISABLE_JUSTIFY
+	    quotestr = optarg;
+	    break;
+#else
+	    usage();	/* To stop bogus data for tab width */
+	    finish(1);
+#endif
 #ifdef HAVE_REGEX_H
 	case 'R':
 	    SET(USE_REGEXP);
@@ -2779,6 +2888,13 @@ int main(int argc, char *argv[])
 	    SET(SMOOTHSCROLL);
 	    break;
 #endif
+	case 'T':
+	    tabsize = atoi(optarg);
+	    if (tabsize <= 0) {
+		usage();	/* To stop bogus data for tab width */
+		finish(1);
+	    }
+	    break;
 	case 'V':
 	    version();
 	    exit(0);
@@ -2983,7 +3099,6 @@ int main(int argc, char *argv[])

 #ifndef DISABLE_MOUSE
 	currshortcut = main_list;
-	currslen = MAIN_VISIBLE;
 #endif

 #ifndef _POSIX_VDISABLE
@@ -3149,6 +3264,7 @@ int main(int argc, char *argv[])
 		    break;
 		}
 		break;
+
 #ifdef ENABLE_MULTIBUFFER
 	    case NANO_OPENPREV_KEY:
 	    case NANO_OPENPREV_ALTKEY:
@@ -3161,20 +3277,29 @@ int main(int argc, char *argv[])
 		keyhandled = 1;
 		break;
 #endif
+
+#if !defined (NANO_SMALL) && defined (HAVE_REGEX_H)
+	    case NANO_BRACKET_KEY:
+		do_find_bracket();
+		keyhandled = 1;
+		break;
+#endif
+
 	    default:
 		/* Check for the altkey defs.... */
-		for (i = 0; i <= MAIN_LIST_LEN - 1; i++)
-		    if (kbinput == main_list[i].altval ||
-			kbinput == main_list[i].altval - 32) {
-			kbinput = main_list[i].val;
+		for (s = main_list; s != NULL; s = s->next)
+		    if (kbinput == s->altval ||
+			kbinput == s->altval - 32) {
+			kbinput = s->val;
 			break;
 		    }
 #ifndef NANO_SMALL
 		/* And for toggle switches */
-		for (i = 0; i <= TOGGLE_LEN - 1 && !keyhandled; i++)
-		    if (kbinput == toggles[i].val ||
-			kbinput == toggles[i].val - 32) {
-			do_toggle(i);
+		for (t = toggles; t != NULL && !keyhandled; t = t->next)
+		    if (kbinput == t->val ||
+			(t->val > 'a' && 
+				kbinput == t->val - 32)) {
+			do_toggle(t);
 			keyhandled = 1;
 			break;
 		    }
@@ -3200,14 +3325,19 @@ int main(int argc, char *argv[])

 	/* Look through the main shortcut list to see if we've hit a
 	   shortcut key */
-	for (i = 0; i < MAIN_LIST_LEN && !keyhandled; i++) {
-	    if (kbinput == main_list[i].val ||
-		(main_list[i].misc1 && kbinput == main_list[i].misc1) ||
-		(main_list[i].misc2 && kbinput == main_list[i].misc2)) {
-		if (ISSET(VIEW_MODE) && !main_list[i].viewok)
+        
+#if !defined(DISABLE_BROWSER) || !defined(DISABLE_MOUSE) || !defined (DISABLE_HELP)
+	for (s = currshortcut; s != NULL && !keyhandled; s = s->next) {
+#else
+	for (s = main_list; s != NULL && !keyhandled; s = s->next) {
+#endif
+	    if (kbinput == s->val ||
+		(s->misc1 && kbinput == s->misc1) ||
+		(s->misc2 && kbinput == s->misc2)) {
+		if (ISSET(VIEW_MODE) && !s->viewok)
 		    print_view_warning();
 		else
-		    main_list[i].func();
+		    s->func();
 		keyhandled = 1;
 	    }
 	}
@@ -3216,8 +3346,9 @@ int main(int argc, char *argv[])
 	if (kbinput == 17 || kbinput == 19)
 	    keyhandled = 1;

-	/* Catch ^Z by hand when triggered also */
-	if (kbinput == 26) {
+	/* Catch ^Z by hand when triggered also 
+	   407 == ^Z in Linux console when keypad() is used? */
+	if (kbinput == 26 || kbinput == 407) {
 	    if (ISSET(SUSPEND))
 		do_suspend(0);
 	    keyhandled = 1;
--- a/nano.h
+++ b/nano.h
@@ -79,7 +79,6 @@ 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 */
    long file_totsize;		/* Current file's total size */
@@ -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
@@ -121,17 +120,13 @@ typedef struct rcoption {

 #define COLORSTRNUM 16

-typedef struct colorstr {
-    char *val;
-    struct colorstr *next;
-} colorstr;
-
 typedef struct colortype {
-    int fg;
-    int bg;
-    int bright;
-    int pairnum;
-    colorstr *str;
+    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;

@@ -165,7 +160,8 @@ typedef struct colortype {
 #define MAC_FILE		(1<<22)
 #define SMOOTHSCROLL		(1<<23)
 #define DISABLE_CURPOS		(1<<24)	/* Damn, we still need it */
-#define ALT_KEYPAD		(1<<25)	/* 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 */

@@ -277,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
@@ -308,57 +305,9 @@ know what you're doing */
 #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 */
-
-#ifndef HAVE_REGEX_H
-#define NO_REGEX 1
-#define SMALL_TOO 0
-#else 
-#define NO_REGEX 0
-#ifdef NANO_SMALL
-#define SMALL_TOO 1
-#else
-#define SMALL_TOO 0
-#endif /* NANO_SMALL */
-#endif /* HAVE_REGEX_H */
-
-#ifdef DISABLE_BROWSER
-#define NO_BROWSER 1
-#else
-#define NO_BROWSER 0
-#endif
-
-#ifdef NANO_SMALL
-#ifdef HAVE_REGEX_H
-#define NO_TOGGLES 3
-#else
-#define NO_TOGGLES 2
-#endif /* HAVE_REGEX_H */
-#else
-#define NO_TOGGLES 0
-#endif /* NANO_SMALL */
-
-#ifdef ENABLE_MULTIBUFFER
-#define MULTI_TOGGLES 3
-#else
-#define MULTI_TOGGLES 0
-#endif
-
-#define WHEREIS_LIST_LEN (9 - NO_REGEX - NO_TOGGLES)
-#define REPLACE_LIST_LEN (9 - NO_REGEX - NO_TOGGLES)
-#define TOGGLE_LEN (14 - NO_REGEX + MULTI_TOGGLES)
-#define WRITEFILE_LIST_LEN (4 - NO_BROWSER)
-#define INSERTFILE_LIST_LEN (3 - NO_BROWSER)
-#define BROWSER_LIST_LEN 5
-#define MAIN_LIST_LEN (27 - NO_REGEX - SMALL_TOO)
 #define MAIN_VISIBLE 12
-#define REPLACE_LIST_2_LEN 4
-#define GOTO_LIST_LEN 4
-#define GOTODIR_LIST_LEN 2
-#define HELP_LIST_LEN 3
-#define SPELL_LIST_LEN 2
-

 #define VIEW 1
 #define NOVIEW 0
--- a/nano.texi
+++ b/nano.texi
@@ -8,7 +8,7 @@
@c Run `makeinfo' rather than `texinfo-format-buffer'.
@smallbook
@set EDITION 0.1
-@set VERSION 1.1.5
+@set VERSION 1.1.7
@set UPDATED 4 Jan 2002

@dircategory Editors
@@ -23,7 +23,7 @@
@titlepage
@title GNU @code{nano}
@subtitle a small and friendly text editor.
-@subtitle version 1.1.5
+@subtitle version 1.1.7

@author Chris Allegretta
@page
@@ -122,6 +122,12 @@ 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.

--- a/nanorc.sample
+++ b/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

@@ -27,7 +32,7 @@
 # set fill -8

 # Use this tab size instead of the default
-# set tabsize 8
+# set tabsize 4

 # Use this spelling checker instead of the default one
 # set speller aspell
@@ -50,31 +55,43 @@
 # 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...]
+# 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,\} static
-#color brightred [\ ]struct ^struct if\  while[\ \n\(] do[\ \n\(] else[\ \n] case\ switch\ break;
-#color brightcyan #define #include #ifn*def #endif #elif #else
+#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, because
-# syntax highlighting rules will be applied in the order they are read in
+#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 /\*.**/
-# multi-line comment hack
-#color brightblue /\*.* [^\/][^\*]*\*\/ ^.*\*+*\**$ ^\ *\*\{1,\}\/$  \/\/.*
+#color brightyellow "<.*[^=\ ]*>" "\".*\""
+#color brightblue "//.*"
+#color brightblue start="/\*.*" end="\*/"
--- a/po/ChangeLog
+++ b/po/ChangeLog
@@ -1 +1,112 @@
+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 Sergei 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$
--- a/po/ca.po
+++ b/po/ca.po
--- a/po/cs.po
+++ b/po/cs.po
--- a/po/da.po
+++ b/po/da.po
--- a/po/de.po
+++ b/po/de.po
--- a/po/es.po
+++ b/po/es.po
--- a/po/fi.po
+++ b/po/fi.po
--- a/po/fr.po
+++ b/po/fr.po
--- a/po/gl.po
+++ b/po/gl.po
--- a/po/hu.po
+++ b/po/hu.po
--- a/po/id.po
+++ b/po/id.po
--- a/po/it.po
+++ b/po/it.po
--- a/po/nb.po
+++ b/po/nb.po
--- a/po/nl.po
+++ b/po/nl.po
--- a/po/nn.po
+++ b/po/nn.po
--- a/po/pl.po
+++ b/po/pl.po
--- a/po/ru.po
+++ b/po/ru.po
--- a/po/sv.po
+++ b/po/sv.po
--- a/po/uk.po
+++ b/po/uk.po
--- a/proto.h
+++ b/proto.h
@@ -39,6 +39,10 @@ extern int fill, wrap_at, flags,tabsize;
 extern int search_last_line;
 extern int currslen;

+#ifndef DISABLE_JUSTIFY
+char *quotestr;
+#endif
+
 extern WINDOW *edit, *topwin, *bottomwin;
 extern char *filename;
 extern char *answer;
@@ -47,6 +51,7 @@ 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;
@@ -64,13 +69,13 @@ 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;
+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;

@@ -80,13 +85,13 @@ extern regex_t search_regexp;
 extern regmatch_t regmatches[10];  
 #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);
@@ -94,8 +99,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);
@@ -103,9 +109,11 @@ 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);

 #ifdef ENABLE_MULTIBUFFER
-int add_open_file(int update, int dup_fix);
+int add_open_file(int update);
 #endif

 #ifndef DISABLE_OPERATINGDIR
@@ -114,6 +122,7 @@ int check_operating_dir(char *currpath, int allow_tabcomp);

 int do_writeout(char *path, int exiting, int append);
 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);
@@ -154,7 +163,7 @@ 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 *mallocstrcpy(char *dest, char *src);
@@ -184,6 +193,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);
@@ -193,7 +204,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);

@@ -211,14 +221,20 @@ 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);

-#if defined (ENABLE_MULTIBUFFER) || !defined (ENABLE_OPERATINGDIR)
-char *get_full_path(char *origpath);
+#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
@@ -243,12 +259,6 @@ filestruct *make_new_node(filestruct * prevnode);
 filestruct *findnextstr(int quiet, int bracket_mode, filestruct * begin,
 			int beginx, char *needle);

-#ifdef ENABLE_MULTIBUFFER
-filestruct *open_file_dup_search(int update);
-#endif
-
 #ifndef DISABLE_HELP
 void help_init(void);
 #endif
-
-
--- a/rcfile.c
+++ b/rcfile.c
@@ -20,6 +20,7 @@
 **************************************************************************/

 #include <stdlib.h>
+#include <stdarg.h>
 #include <string.h>
 #include <stdio.h>
 #include <errno.h>
@@ -39,38 +40,35 @@
 #define _(string) (string)
 #endif

-#ifndef DISABLE_WRAPJUSTIFY
-    #define NUM_RCOPTS 19
-#else
-    #define NUM_RCOPTS 18
-#endif
-
 /* Static stuff for the nanorc file */
-rcoption rcopts[NUM_RCOPTS] = 
-{
-{"regexp", USE_REGEXP},
-{"const", CONSTUPDATE},
-{"autoindent", AUTOINDENT},
-{"cut", CUT_TO_END},
-{"nofollow", FOLLOW_SYMLINKS},
-{"mouse", USE_MOUSE},
-{"operatingdir", 0},
-{"pico", PICO_MODE},
-{"tabsize", 0},
+rcoption rcopts[] = {
+    {"regexp", USE_REGEXP},
+    {"const", CONSTUPDATE},
+    {"autoindent", AUTOINDENT},
+    {"cut", CUT_TO_END},
+    {"nofollow", FOLLOW_SYMLINKS},
+    {"mouse", USE_MOUSE},
+    {"operatingdir", 0},
+    {"pico", PICO_MODE},
+    {"tabsize", 0},
+    {"fill", 0},
+    {"speller", 0},
+    {"tempfile", TEMP_OPT},
+    {"view", VIEW_MODE},
+    {"nowrap", NO_WRAP},
+    {"nohelp", NO_HELP},
+    {"suspend", SUSPEND},
+    {"multibuffer", MULTIBUFFER},
+    {"smooth", SMOOTHSCROLL},
+    {"keypad", ALT_KEYPAD},
+    {"noconvert", NO_CONVERT},
+    {"quotestr", 0},
+    {"", 0}
+};

-#ifndef DISABLE_WRAPJUSTIFY
-{"fill", 0},
-#endif
-
-{"speller", 0},
-{"tempfile", TEMP_OPT},
-{"view", VIEW_MODE},
-{"nowrap", NO_WRAP}, 
-{"nohelp", NO_HELP}, 
-{"suspend", SUSPEND},
-{"multibuffer", MULTIBUFFER},
-{"smooth", SMOOTHSCROLL},
-{"keypad", ALT_KEYPAD}};
+static int errors = 0;
+static int lineno = 0;
+static char *nanorc;

 /* We have an error in some part of the rcfile; put it on stderr and
  make the user hit return to continue starting up nano */
@@ -79,23 +77,23 @@ void rcfile_error(char *msg, ...)
    va_list ap;

    fprintf(stderr, "\n");
+    fprintf(stderr, _("Error in %s on line %d: "), nanorc, lineno);
    va_start(ap, msg);
    vfprintf(stderr, msg, ap);
    va_end(ap);
    fprintf(stderr, _("\nPress return to continue starting nano\n"));

-    while (getchar() != '\n')
-	;
+    while (getchar() != '\n');

 }

 /* Just print the error (one of many, perhaps) but don't abort, yet */
-void rcfile_msg(int *errors, char *msg, ...)
+void rcfile_msg(char *msg, ...)
 {
    va_list ap;

-    if (!*errors) {
-	*errors = 1;
+    if (!errors) {
+	errors = 1;
 	fprintf(stderr, "\n");
    }
    va_start(ap, msg);
@@ -113,7 +111,7 @@ char *parse_next_word(char *ptr)

    if (*ptr == '\0')
 	return NULL;
-	
+
    /* Null terminate and advance ptr */
    *ptr++ = 0;

@@ -123,18 +121,37 @@ char *parse_next_word(char *ptr)
    return ptr;
 }

-int colortoint(char *colorname, int *bright, char *filename, int *lineno) 
+char *parse_next_regex(char *ptr)
+{
+    while ((*ptr != '"' || (*(ptr+1) != ' ' && *(ptr+1) != '\n')) 
+	   && *ptr != '\n' && *ptr != '\0')
+	ptr++;
+
+    if (*ptr == '\0')
+	return NULL;
+
+    /* Null terminate and advance ptr */
+    *ptr++ = 0;
+
+    while ((*ptr == ' ' || *ptr == '\t') && *ptr != '\0')
+	ptr++;
+
+    return ptr;
+
+}
+
+int colortoint(char *colorname, int *bright)
 {
    int mcolor = 0;

    if (colorname == NULL)
 	return -1;

-    if (strcasestr(colorname, "bright")) {
+    if (stristr(colorname, "bright")) {
 	*bright = 1;
 	colorname += 6;
    }
-    
+
    if (!strcasecmp(colorname, "green"))
 	mcolor += COLOR_GREEN;
    else if (!strcasecmp(colorname, "red"))
@@ -152,11 +169,10 @@ int colortoint(char *colorname, int *bright, char *filename, int *lineno)
    else if (!strcasecmp(colorname, "black"))
 	mcolor += COLOR_BLACK;
    else {
-	printf("Error in %s on line %d: color %s not understood.\n",
-		filename, *lineno, colorname);
-	printf("Valid colors are \"green\", \"red\", \"blue\", "
-	       "\"white\", \"yellow\", \"cyan\", \"magenta\" and "
-	       "\"black\", with the optional prefix \"bright\".\n");
+	rcfile_error(_("color %s not understood.\n"
+		       "Valid colors are \"green\", \"red\", \"blue\", \n"
+		       "\"white\", \"yellow\", \"cyan\", \"magenta\" and \n"
+		       "\"black\", with the optional prefix \"bright\".\n"));
 	exit(1);
    }

@@ -166,10 +182,10 @@ int colortoint(char *colorname, int *bright, char *filename, int *lineno)

 #ifdef ENABLE_COLOR
 /* Parse the color stuff into the colorstrings array */
-void parse_colors(FILE *rcstream, char *filename, int *lineno, char *buf, char *ptr)
+void parse_colors(FILE * rcstream, char *buf, char *ptr)
 {
-    int i = 0, fg, bg, bright = 0;
-    char prev = '\\';
+    int fg, bg, bright = 0;
+    int expectend = 0;		/* Do we expect an end= line? */
    char *tmp = NULL, *beginning, *fgstr, *bgstr;
    colortype *tmpcolor = NULL;

@@ -177,8 +193,7 @@ void parse_colors(FILE *rcstream, char *filename, int *lineno, char *buf, char *
    ptr = parse_next_word(ptr);

    if (ptr == NULL) {
-	printf("Error in %s on line %d: Missing color name.\n",
-		filename, *lineno);
+	rcfile_error(_("Missing color name"));
 	exit(1);
    }

@@ -188,90 +203,115 @@ void parse_colors(FILE *rcstream, char *filename, int *lineno, char *buf, char *
    } else
 	bgstr = NULL;

-    fg = colortoint(fgstr, &bright, filename, lineno);
-    bg = colortoint(bgstr, &bright, filename, lineno);
+    fg = colortoint(fgstr, &bright);
+    bg = colortoint(bgstr, &bright);

    /* Now the fun part, start adding regexps to individual strings
-	in the colorstrings array, woo! */
+       in the colorstrings array, woo! */

-    i = 0;
-    beginning = ptr;
    while (*ptr != '\0') {
-	switch (*ptr) {
-	case '\n':
-	    *ptr = ' ';
-/*	    i++; */
-	case ' ':
-	    if (prev != '\\') {
-		/* This is the end of the regex, uh I guess.
-		   Add it to the colorstrings array for this color */	
-		
- 		tmp = NULL;
-		tmp = charalloc(i + 1);
-		strncpy(tmp, beginning, i);
-		tmp[i] = '\0';

-		ptr = parse_next_word(ptr);
-		if (ptr == NULL)
-		    return;
+	while (*ptr == ' ')
+	    ptr++;

-		if (colorstrings == NULL) {
-		    colorstrings = nmalloc(sizeof(colortype));
-		    colorstrings->fg = fg;
-		    colorstrings->bg = bg;
-		    colorstrings->bright = bright;
-		    colorstrings->str = NULL;
-		    colorstrings->str = nmalloc(sizeof(colorstr));
-		    colorstrings->str->val = tmp;
-		    colorstrings->str->next = NULL;
-		    colorstrings->next = NULL;
-		} else {
-		    for (tmpcolor = colorstrings; tmpcolor->next != NULL;
-			  tmpcolor = tmpcolor->next)
-			;
+	if (*ptr == '\n' || *ptr == '\0')
+	    break;
+
+	if (!strncasecmp(ptr, "start=", 6)) {
+	    ptr += 6;
+	    expectend = 1;
+	}
+
+	if (*ptr != '"') {
+	    rcfile_error(_("regex strings must begin and end with a \" character\n"));
+	    continue;
+	}
+	ptr++;
+
+	beginning = ptr;
+	ptr = parse_next_regex(ptr);
+
+	tmp = NULL;
+	tmp = mallocstrcpy(tmp, beginning);
+
+	if (colorstrings == NULL) {
+	    colorstrings = nmalloc(sizeof(colortype));
+	    colorstrings->fg = fg;
+	    colorstrings->bg = bg;
+	    colorstrings->bright = bright;
+	    colorstrings->start = tmp;
+	    colorstrings->next = NULL;
+	    tmpcolor = colorstrings;
 #ifdef DEBUG
-		    fprintf(stderr, "Adding new entry for fg %d bg %d\n", fg, bg);
+	    fprintf(stderr,
+		    "Starting a new colorstring for fg %d bg %d\n",
+		    fg, bg);
+	    fprintf(stderr, "string val=%s\n", tmp);
 #endif

-		    tmpcolor->next = nmalloc(sizeof(colortype));
-		    tmpcolor->next->fg = fg;
-		    tmpcolor->next->bg = bg;
-		    tmpcolor->next->bright = bright;
-		    tmpcolor->next->str = nmalloc(sizeof(colorstr));
-		    tmpcolor->next->str->val = tmp;
-		    tmpcolor->next->str->next = NULL;
-		    tmpcolor->next->next = NULL;
-		}
+	} else {
+	    for (tmpcolor = colorstrings;
+		 tmpcolor->next != NULL; tmpcolor = tmpcolor->next);
+#ifdef DEBUG
+	    fprintf(stderr, "Adding new entry for fg %d bg %d\n", fg, bg);
+	    fprintf(stderr, "string val=%s\n", tmp);
+#endif

-		i = 0;
-		beginning = ptr;
-		break;
-	    }
-	    /* Else drop through to the default case */		
-	default:
-	    i++;
-	    prev = *ptr;
-	    ptr++;
-	    break;
+	    tmpcolor->next = nmalloc(sizeof(colortype));
+	    tmpcolor->next->fg = fg;
+	    tmpcolor->next->bg = bg;
+	    tmpcolor->next->bright = bright;
+	    tmpcolor->next->start = tmp;
+	    tmpcolor->next->next = NULL;
+	    tmpcolor = tmpcolor->next;
 	}
-    }

+	if (expectend) {
+	    if (ptr == NULL || strncasecmp(ptr, "end=", 4)) {
+		rcfile_error(_
+			     ("\n\t\"start=\" requires a corresponding \"end=\""));
+		return;
+	    }
+
+	    ptr += 4;
+
+	    if (*ptr != '"') {
+		rcfile_error(_
+			     ("regex strings must begin and end with a \" character\n"));
+		continue;
+	    }
+	    ptr++;
+
+
+	    beginning = ptr;
+	    ptr = parse_next_regex(ptr);
+#ifdef DEBUG
+	    fprintf(stderr, "For end part, beginning = \"%s\"\n",
+		    beginning);
+#endif
+	    tmp = NULL;
+	    tmp = mallocstrcpy(tmp, beginning);
+	    tmpcolor->end = tmp;
+
+	} else
+	    tmpcolor->end = NULL;
+
+    }
 }
-#endif /* ENABLE_COLOR */
+#endif				/* ENABLE_COLOR */

 /* Parse the RC file, once it has been opened successfully */
-void parse_rcfile(FILE *rcstream, char *filename)
+void parse_rcfile(FILE * rcstream)
 {
    char *buf, *ptr, *keyword, *option;
-    int set = 0, lineno = 0, i;
-    int errors = 0;
+    int set = 0, i;

    buf = charalloc(1024);
    while (fgets(buf, 1023, rcstream) > 0) {
 	lineno++;
 	ptr = buf;
-	while ((*ptr == ' ' || *ptr == '\t') && 
-		(*ptr != '\n' && *ptr != '\0'))
+	while ((*ptr == ' ' || *ptr == '\t') &&
+	       (*ptr != '\n' && *ptr != '\0'))
 	    ptr++;

 	if (*ptr == '\n' || *ptr == '\0')
@@ -281,7 +321,7 @@ void parse_rcfile(FILE *rcstream, char *filename)
 #ifdef DEBUG
 	    fprintf(stderr, _("parse_rcfile: Read a comment\n"));
 #endif
-	    continue;	/* Skip past commented lines */
+	    continue;		/* Skip past commented lines */
 	}

 	/* Else skip to the next space */
@@ -297,11 +337,10 @@ void parse_rcfile(FILE *rcstream, char *filename)
 	    set = -1;
 #ifdef ENABLE_COLOR
 	else if (!strcasecmp(keyword, "color"))
-	    parse_colors(rcstream, filename, &lineno, buf, ptr);
-#endif /* ENABLE_COLOR */
+	    parse_colors(rcstream, buf, ptr);
+#endif				/* ENABLE_COLOR */
 	else {
-	    rcfile_msg(&errors, _("Error in %s on line %d: command %s not understood"),
-		filename, lineno, keyword);
+	    rcfile_msg(_("command %s not understood"), keyword);
 	    continue;
 	}

@@ -310,29 +349,32 @@ void parse_rcfile(FILE *rcstream, char *filename)
 	/* We don't care if ptr == NULL, as it should if using proper syntax */

 	if (set != 0) {
-	    for (i = 0; i <= NUM_RCOPTS - 1; i++) {
-	        if (!strcasecmp(option, rcopts[i].name)) {
+	    for (i = 0; rcopts[i].name != ""; i++) {
+		if (!strcasecmp(option, rcopts[i].name)) {
 #ifdef DEBUG
-		    fprintf(stderr, _("parse_rcfile: Parsing option %s\n"), 
-				rcopts[i].name);
+		    fprintf(stderr, _("parse_rcfile: Parsing option %s\n"),
+			    rcopts[i].name);
 #endif
 		    if (set == 1 || rcopts[i].flag == FOLLOW_SYMLINKS) {
-			if (
-			    !strcasecmp(rcopts[i].name, "operatingdir") ||
+			if (!strcasecmp(rcopts[i].name, "operatingdir") ||
 			    !strcasecmp(rcopts[i].name, "tabsize") ||
 #ifndef DISABLE_WRAPJUSTIFY
-			    !strcasecmp(rcopts[i].name, "fill") || 
+			    !strcasecmp(rcopts[i].name, "fill") ||
+#endif
+#ifndef DISABLE_JUSTIFY
+			    !strcasecmp(rcopts[i].name, "quotestr") ||
 #endif
 #ifndef DISABLE_SPELLER
 			    !strcasecmp(rcopts[i].name, "speller")
 #else
-				0
+			    0
 #endif
-			   ) {
+			    ) {

 			    if (*ptr == '\n' || *ptr == '\0') {
-	    			rcfile_msg(&errors, _("Error in %s on line %d: option %s requires an argument"),
-						filename, lineno, rcopts[i].name);
+				rcfile_error(_
+					     ("option %s requires an argument"),
+					     rcopts[i].name);
 				continue;
 			    }
 			    option = ptr;
@@ -341,38 +383,51 @@ void parse_rcfile(FILE *rcstream, char *filename)
 #ifndef DISABLE_WRAPJUSTIFY

 				if ((i = atoi(option)) < MIN_FILL_LENGTH) {
-	    		 	    rcfile_msg(&errors, 
-		_("Error in %s on line %d: requested fill size %d too small"),
-						filename, lineno, i);
-				}
-				else
-				     fill = i;
+				    rcfile_error(_
+						 ("requested fill size %d too small"),
+						 i);
+				} else
+				    fill = i;
+#endif
+			    } else
+				if (!strcasecmp(rcopts[i].name, "tabsize"))
+			    {
+				if ((i = atoi(option)) <= 0) {
+				    rcfile_error(_
+						 ("requested tab size %d too small"),
+						 i);
+				} else {
+				    tabsize = i;
+				}
+#ifndef DISABLE_JUSTIFY
+			    } else
+				if (!strcasecmp(rcopts[i].name, "quotestr"))
+			    {
+				quotestr = NULL;
+				quotestr =
+				    charalloc(strlen(option) + 1);
+				strcpy(quotestr, option);
 #endif
-			    } else if (!strcasecmp(rcopts[i].name, "tabsize")) {
-			    	if ((i = atoi(option)) <= 0) {
-			    		rcfile_msg(&errors,
-			    			_("Error in %s on line %d: requested tab size %d too small"),
-			    				filename, lineno, i);
-			    	} else {
-			    		tabsize = i;
-			    	}
 			    } else {
 #ifndef DISABLE_SPELLER
-				alt_speller = charalloc(strlen(option) + 1);
-            			strcpy(alt_speller, option);
+				alt_speller =
+				    charalloc(strlen(option) + 1);
+				strcpy(alt_speller, option);
 #endif
 			    }
-			} else 
+			} else
 			    SET(rcopts[i].flag);
 #ifdef DEBUG
-			fprintf(stderr, _("set flag %d!\n"), rcopts[i].flag);
+			fprintf(stderr, _("set flag %d!\n"),
+				rcopts[i].flag);
 #endif
 		    } else {
 			UNSET(rcopts[i].flag);
 #ifdef DEBUG
-			fprintf(stderr, _("unset flag %d!\n"), rcopts[i].flag);
+			fprintf(stderr, _("unset flag %d!\n"),
+				rcopts[i].flag);
 #endif
-		   }			
+		    }
 		}
 	    }
 	}
@@ -387,15 +442,25 @@ void parse_rcfile(FILE *rcstream, char *filename)
 /* The main rc file function, tries to open the rc file */
 void do_rcfile(void)
 {
-    char *nanorc;
    char *unable = _("Unable to open ~/.nanorc file, %s");
    struct stat fileinfo;
    FILE *rcstream;

-
    if (getenv("HOME") == NULL)
 	return;

+    nanorc = charalloc(strlen(SYSCONFDIR) + 10);
+    sprintf(nanorc, "%s/nanorc", SYSCONFDIR);
+
+    /* Try to open system nanorc */
+    if (stat(nanorc, &fileinfo) != -1)
+	if ((rcstream = fopen(nanorc, "r")) != NULL) {
+
+	   /* Parse it! */
+	    parse_rcfile(rcstream);
+	    fclose(rcstream);
+	}
+
    nanorc = charalloc(strlen(getenv("HOME")) + 10);
    sprintf(nanorc, "%s/.nanorc", getenv("HOME"));

@@ -406,18 +471,17 @@ void do_rcfile(void)
 	if (errno != ENOENT)
 	    rcfile_error(unable, errno);
 	return;
-   }
+    }

    if ((rcstream = fopen(nanorc, "r")) == NULL) {
 	rcfile_error(unable, strerror(errno));
 	return;
    }

-    parse_rcfile(rcstream, nanorc);
+    parse_rcfile(rcstream);
    fclose(rcstream);

 }


-#endif /* ENABLE_NANORC */
-
+#endif				/* ENABLE_NANORC */
--- a/search.c
+++ b/search.c
@@ -76,7 +76,7 @@ int search_init(int replacing)
    char *buf;
    static char *backupstring = NULL;
 #ifndef NANO_SMALL
-    int j;
+    toggle *t;
 #endif

    search_init_globals();
@@ -126,8 +126,7 @@ int search_init(int replacing)
 	strcpy(buf, "");

    /* This is now one simple call.  It just does a lot */
-    i = statusq(0, replacing ? replace_list : whereis_list,
-	replacing ? REPLACE_LIST_LEN : WHEREIS_LIST_LEN, backupstring,
+    i = statusq(0, replacing ? replace_list : whereis_list, backupstring,
 	"%s%s%s%s%s%s", 
 	_("Search"),

@@ -187,9 +186,9 @@ int search_init(int replacing)
 	backupstring = mallocstrcpy(backupstring, answer);

 #ifndef NANO_SMALL
-	for (j = 0; j <= TOGGLE_LEN - 1; j++)
-	    if (i == toggles[j].val)
-		TOGGLE(toggles[j].flag);
+	for (t = toggles; t != NULL; t = t->next)
+	    if (i == t->val)
+		TOGGLE(t->flag);
 #endif

 	return 1;
@@ -226,7 +225,21 @@ void not_found_msg(char *str)
    }
 }

-int past_editbuff;	/* search is now looking through lines not displayed */
+int is_whole_word(int curr_pos, filestruct *fileptr, char *searchword)
+{
+    /* start of line or previous character not a letter */
+    if ((curr_pos < 1) || (!isalpha((int) fileptr->data[curr_pos-1])))
+
+	/* end of line or next character not a letter */
+	if (((curr_pos + strlen(searchword)) == strlen(fileptr->data))
+	    || (!isalpha((int) fileptr->data[curr_pos + strlen(searchword)])))
+
+	    return TRUE;
+
+    return FALSE;
+}
+
+int past_editbuff;	/* findnextstr() is now searching lines not displayed */

 filestruct *findnextstr(int quiet, int bracket_mode, filestruct * begin, int beginx,
 			char *needle)
@@ -234,7 +247,6 @@ filestruct *findnextstr(int quiet, int bracket_mode, filestruct * begin, int beg
    filestruct *fileptr;
    char *searchstr, *rev_start = NULL, *found = NULL;
    int current_x_find = 0;
-
    fileptr = current;

    past_editbuff = 0;
@@ -291,7 +303,7 @@ filestruct *findnextstr(int quiet, int bracket_mode, filestruct * begin, int beg
 	current_x_find = found - fileptr->data;
 #if 1
 	/* Ensure we haven't wrapped around again! */
-	if ((search_last_line) && (current_x_find >= beginx)) {
+	if ((search_last_line) && (current_x_find > beginx)) {
 	    if (!quiet)
 		not_found_msg(needle);
 	    return NULL;
@@ -302,13 +314,13 @@ filestruct *findnextstr(int quiet, int bracket_mode, filestruct * begin, int beg
    else {	/* reverse search */

 	current_x_find = current_x - 1;
-
+#if 0
 	/* Are we now back to the place where the search started) */
 	if ((fileptr == begin) && (current_x_find > beginx))
 	    search_last_line = 1;
-
+#endif
 	/* Make sure we haven't passed the begining of the string */
-#if 1	/* Is this required here ? */
+#if 0	/* Is this required here ? */
 	if (!(&fileptr->data[current_x_find] - fileptr->data))      
 	    current_x_find++;
 #endif
@@ -398,7 +410,8 @@ void search_abort(void)
 int do_search(void)
 {
    int i;
-    filestruct *fileptr = current;
+    filestruct *fileptr = current, *didfind;
+    int fileptr_x = current_x;

    wrap_reset();
    i = search_init(0);
@@ -435,8 +448,14 @@ int do_search(void)
 	last_search = mallocstrcpy(last_search, answer);

    search_last_line = 0;
-    findnextstr(FALSE, FALSE, current, current_x, answer);
+    didfind = findnextstr(FALSE, FALSE, current, current_x, answer);
+
+    if ((fileptr == current) && (fileptr_x == current_x) &&
+	didfind != NULL)
+	statusbar(_("This is the only occurrence"));
+
    search_abort();
+
    return 1;
 }

@@ -576,7 +595,8 @@ int do_replace_loop(char *prevanswer, filestruct *begin, int *beginx,
 			int wholewords, int *i)
 {
    int replaceall = 0, numreplaced = 0;
-    filestruct *fileptr;
+
+    filestruct *fileptr = NULL;
    char *copy;

    switch (*i) {
@@ -604,28 +624,22 @@ int do_replace_loop(char *prevanswer, filestruct *begin, int *beginx,
    while (1) {

 	/* Sweet optimization by Rocco here */
+#if 0
 	fileptr = findnextstr(replaceall, FALSE, begin, *beginx, prevanswer);
+#else
+	if (fileptr != 0)
+	    fileptr = findnextstr(1, FALSE, begin, *beginx, prevanswer);
+	else
+	    fileptr = findnextstr(replaceall || (search_last_line ? 1 : 0), FALSE, begin, *beginx, prevanswer);
+#endif

 	/* No more matches.  Done! */
 	if (!fileptr)
 	    break;

 	/* Make sure only whole words are found */
-	if (wholewords)
-	{
-	    /* start of line or previous character not a letter */
-	    if ((current_x == 0) || (!isalpha((int) fileptr->data[current_x-1])))
-	    {
-		/* end of line or next character not a letter */
-		if (((current_x + strlen(prevanswer)) == strlen(fileptr->data))
-			|| (!isalpha((int) fileptr->data[current_x + strlen(prevanswer)])))
-		    ;
-		else
-		    continue;
-	    }
-	    else
-		continue;
-	}
+	if ((wholewords) && (!is_whole_word(current_x, fileptr, prevanswer)))
+	    continue;

 	/* If we're here, we've found the search string */
 	if (!replaceall) {
@@ -656,17 +670,29 @@ int do_replace_loop(char *prevanswer, filestruct *begin, int *beginx,
 	    current->data = copy;
 	    totsize += strlen(current->data);

-	    /* Stop bug where we replace a substring of the replacement text */
-	    current_x += strlen(last_replace) - 1;
+	    if (!ISSET(REVERSE_SEARCH)) {
+		/* Stop bug where we replace a substring of the replacement text */
+		current_x += strlen(last_replace) - 1;

-	    /* Adjust the original cursor position - COULD BE IMPROVED */
-	    if (search_last_line) {
-		*beginx += strlen(last_replace) - strlen(last_search);
+		/* Adjust the original cursor position - COULD BE IMPROVED */
+		if (search_last_line) {
+		    *beginx += strlen(last_replace) - strlen(last_search);

-		/* For strings that cross the search start/end boundary */
-		/* Don't go outside of allocated memory */
-		if (*beginx < 1)
-		    *beginx = 1;
+		    /* For strings that cross the search start/end boundary */
+		    /* Don't go outside of allocated memory */
+		    if (*beginx < 1)
+			*beginx = 1;
+		}
+	    } else {
+		if (current_x > 1)
+		    current_x--;
+
+		if (search_last_line) {
+		    *beginx += strlen(last_replace) - strlen(last_search);
+
+		    if (*beginx > strlen(current->data))
+			*beginx = strlen(current->data);
+		}
 	    }

 	    edit_refresh();
@@ -735,28 +761,36 @@ int do_replace(void)
 	    } else
 		sprintf(buf, "%s", last_replace);

-	    i = statusq(0, replace_list_2, REPLACE_LIST_2_LEN, "",
+	    i = statusq(0, replace_list_2, "",
 			_("Replace with [%s]"), buf);
 	}
 	else
-	    i = statusq(0, replace_list_2, REPLACE_LIST_2_LEN, "",
+	    i = statusq(0, replace_list_2, "",
 			_("Replace with"));
    }
    else
-	i = statusq(0, replace_list_2, REPLACE_LIST_2_LEN, last_replace, 
+	i = statusq(0, replace_list_2, last_replace, 
 			_("Replace with"));

    /* save where we are */
    begin = current;
+#if 0
+    /* why + 1  ? isn't this taken care of in findnextstr() ? */
    beginx = current_x + 1;
-
+#else
+    beginx = current_x;
+#endif
    search_last_line = 0;

    numreplaced = do_replace_loop(prevanswer, begin, &beginx, FALSE, &i);

    /* restore where we were */
    current = begin;
+#if 0
    current_x = beginx - 1;
+#else
+    current_x = beginx;
+#endif
    renumber_all();
    edit_update(current, CENTER);
    print_replaced(numreplaced);
@@ -778,7 +812,7 @@ int do_gotoline(int line, int save_pos)

 	int j = 0;

-	j = statusq(0, goto_list, GOTO_LIST_LEN, "", _("Enter line number"));
+	j = statusq(0, goto_list, "", _("Enter line number"));
 	if (j != 0) {
 	    statusbar(_("Aborted"));
 	    goto_abort();
--- a/stamp-h.in
+++ b/stamp-h.in
@@ -1 +0,0 @@
-timestamp
--- a/utils.c
+++ b/utils.c
@@ -36,6 +36,21 @@
 #define _(string) (string)
 #endif

+int num_of_digits(int n)
+{
+    int i = 1;
+
+    if (n < 0)
+	n = 0 - n;
+
+    while (n > 10) {
+	n /= 10;
+	i++;
+    }
+
+    return i;
+}
+
 /* Lower case a string - must be null terminated */
 void lowercase(char *src)
 {
@@ -62,7 +77,7 @@ char *revstrstr(char *haystack, char *needle, char *rev_start)
    return 0;
 }

-char *revstrcasestr(char *haystack, char *needle, char *rev_start)
+char *revstristr(char *haystack, char *needle, char *rev_start)
 {
    char *p, *q, *r;

@@ -77,7 +92,7 @@ char *revstrcasestr(char *haystack, char *needle, char *rev_start)

 /* This is now mutt's version (called mutt_stristr) because it doesn't
   use memory allocation to do a simple search (yuck). */
-char *strcasestr(char *haystack, char *needle)
+char *stristr(char *haystack, char *needle)
 {
    const char *p, *q;

@@ -101,32 +116,29 @@ char *strstrwrapper(char *haystack, char *needle, char *rev_start)
 {

 #ifdef HAVE_REGEX_H
-
    int  result;
-    char *i, *j;

    if (ISSET(USE_REGEXP)) {
-#ifndef NANO_SMALL
 	if (!ISSET(REVERSE_SEARCH)) {
 	    result = regexec(&search_regexp, haystack, 10, regmatches, 0);
 	    if (!result)
 		return haystack + regmatches[0].rm_so;
+#ifndef NANO_SMALL
 	} else {
-#endif
-	    /* do quick check first */
+	    char *i, *j;
+
+	    /* do a quick search forward first */
 	    if (!(regexec(&search_regexp, haystack, 10, regmatches, 0))) {
-		/* there is a match */
+		/* there's a match somewhere in the line - now search for it backwards, much slower */
 		for(i = rev_start ; i >= haystack ; --i)
 		    if (!(result = regexec(&search_regexp, i, 10, regmatches, 0))) {
 			j = i + regmatches[0].rm_so;
 			if (j <= rev_start)
 			    return j;
 		    }
-
 	    }
-#ifndef NANO_SMALL
-	}
 #endif
+	}
 	return 0;
    }
 #endif
@@ -139,10 +151,10 @@ char *strstrwrapper(char *haystack, char *needle, char *rev_start)

    } else {
 	if (ISSET(REVERSE_SEARCH))
-	    return revstrcasestr(haystack, needle, rev_start);
+	    return revstristr(haystack, needle, rev_start);
 	else
 #endif
-	    return strcasestr(haystack, needle);
+	    return stristr(haystack, needle);
 #ifndef NANO_SMALL
    }
 #endif
--- a/winio.c
+++ b/winio.c