po: update translations and regenerate POT file and PO files

bump version numbers and add a news item for the 2.9.5 release
syntax: sh: color options distinctively, and color also long options
2018-03-29 10:17:00 +02:00 · 2018-03-29 09:59:13 +02:00 · 2018-03-29 09:51:39 +02:00 · 2018-03-28 19:34:26 +02:00 · 2018-03-28 16:37:47 +02:00 · 2018-03-28 14:04:00 +02:00
143 changed files with 57304 additions and 52426 deletions
--- a/.gitignore
+++ b/.gitignore
@@ -16,6 +16,7 @@ core
 /ABOUT-NLS
 /INSTALL
 /aclocal.m4
+/ar-lib
 /autom4te.cache
 /compile
 /config.cache
@@ -34,6 +35,47 @@ core
 /mkinstalldirs
 /stamp-h1

+# gettext m4 files.
+/m4/codeset.m4
+/m4/extern-inline.m4
+/m4/fcntl-o.m4
+/m4/gettext.m4
+/m4/glibc2.m4
+/m4/glibc21.m4
+/m4/iconv.m4
+/m4/intdiv0.m4
+/m4/intl.m4
+/m4/intldir.m4
+/m4/intlmacosx.m4
+/m4/intmax.m4
+/m4/inttypes-pri.m4
+/m4/inttypes_h.m4
+/m4/lcmessage.m4
+/m4/lib-ld.m4
+/m4/lib-link.m4
+/m4/lib-prefix.m4
+/m4/lock.m4
+/m4/longlong.m4
+/m4/nls.m4
+/m4/po.m4
+/m4/printf-posix.m4
+/m4/progtest.m4
+/m4/size_max.m4
+/m4/stdint_h.m4
+/m4/threadlib.m4
+/m4/uintmax_t.m4
+/m4/visibility.m4
+/m4/wchar_t.m4
+/m4/wint_t.m4
+/m4/xsize.m4
+
+# gnulib entries
+/gnulib/
+/lib/
+/m4/.gitignore
+/m4/gnulib-cache.m4
+/snippet/
+
 /nano.spec
 /src/nano
 /src/revision.h
--- a/10
+++ b/10
@@ -8,8 +8,8 @@ Chris Allegretta <chrisa@asty.org>
 David Lawrence Ramsey <pooka109@gmail.com>
 	* Former stable series maintainer.  Multiple buffer support,
 	  operating dir (-o) option, bug fixes for display routines,
-	  wrapping code, spelling fixes, const mode, parts of the
-	  UTF-8 support, and various other fixes.
+	  wrapping code, spelling fixes, constantshow mode, parts of
+	  UTF-8 support, softwrap overhaul, and various other fixes.

 Jordi Mallach <jordi@gnu.org>
 	* Debian package maintainer, fellow bug squasher.
@@ -39,7 +39,8 @@ Mike Frysinger <vapier@gentoo.org>
 	* Gentoo package maintainer.  Whitespace display mode,
 	  --enable-utf8/--disable-utf8 configure options for ncurses,
 	  many new color regexes and improvements to existing color
-	  regexes in syntax/*.nanorc, and miscellaneous bug fixes.
+	  regexes in syntax/*.nanorc, the move from svn to git, the
+	  conversion to gnulib, and miscellaneous bug fixes.

 Mark Majeres <mark@engine12.com>
 	* A functional undo/redo system, and coloring nano's interface.
@@ -56,6 +57,9 @@ Faissal Bensefia <faissaloo@gmail.com>
 Sumedh Pendurkar <sumedh.pendurkar@gmail.com>
 	* The word-completion feature.

+Rishabh Dave <rishabhddave@gmail.com>
+	* Searchable help.
+
 Benno Schulenberg <bensberg@justemail.net>
 	* An array of small bug fixes, the cut-word and block-jump
 	  routines, text selection by holding Shift, and some extra
--- a/1042
+++ b/1042
--- a/ChangeLog.1999-2006
+++ b/ChangeLog.1999-2006
@@ -5975,7 +5975,7 @@ GNU nano 1.1.8 - 2002.03.30
  do_insertfile()
 	- Handle cancel from ExtCmd properly. (David Benbennick)
  read_file()
-	- Abort if we read a file of 0 lines (num_lines == 0), fixes BUG #70.
+	- Abort if we read a file of 0 lines (num_lines == 0).  Fixes bug #70.
 	- Reverse tests to stop segfault on editing a new file of 0 lines.
 	  (David Benbennick)
 	- Change input var to one char instead of array. (David Benbennick)
@@ -6108,8 +6108,8 @@ GNU nano 1.1.7 - 2002.03.05
 	- 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)
+	- 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.
@@ -6139,8 +6139,8 @@ GNU nano 1.1.7 - 2002.03.05
 	- 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.
+	- 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:
@@ -6208,7 +6208,7 @@ nano-1.1.6 - 2002.01.25
 	- 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).
+	  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.
@@ -6368,10 +6368,10 @@ nano-1.1.4 - 2001.12.11
 - nano.c:
  main()
 	- Add Esc-[-[IGL] keys for FreeBSD Console (PgUp,PgDn,Insert).
-        - Added better Hurd support for function keys (Alt-V,U,9,@,F).
+	- Added better Hurd support for function keys (Alt-V,U,9,@,F).
  signal_init()
-        - do SIG_IGN for the SIGTSTP sigaction regardless of whether
-          we have _POSIX_VDISABLE or not (more Hurd fixes)
+	- do SIG_IGN for the SIGTSTP sigaction regardless of whether
+	  we have _POSIX_VDISABLE or not (more Hurd fixes)
  help_init()
 	- Typo fixes and additions to the new help texts.
  do_curpos()
@@ -6487,10 +6487,10 @@ nano-1.1.2 - 2001.10.03
 	- Take control-space out of -tiny build, unneeded.
 - cut.c:
  cut_marked_segment()
-	- Add magic line when cutting a selection including filebot
-	  (discovered by DLR, fixed by DLR & Chris, fixes BUG #66).
+	- Add magic line when cutting a selection including filebot.
+	  Fixes bug #66. (discovered by DLR, fixed by DLR & Chris)
  do_cut_text()
-	- Don't recenter the line when cutting one line (DLR) (Bug #65).
+	- Don't recenter the line when cutting one line.  Fixes bug #65. (DLR)
 - faq.html:
 	- Notes about the Free Translation Project.
 	- Debian additions.
@@ -6681,14 +6681,14 @@ nano-1.1.0 - 2001.07.15
  add_to_cutbuffer()
 	- Remove useless statements. (Rocco)
  cut_marked_segment()
-	- Add bizarre copy of bot node, else *BSD goes ballistic (fixes
-          BUG #60).
+	- Add bizarre copy of bot node, else *BSD goes ballistic.  Fixes
+	  bug #60.
 	- Added 'destructive' argument.  Allows the selected text to be
 	  added to the cutbuffer without changing the contents of the
 	  file.  This allows writing selection to separate files.
  do_cut_text()
 	- If the line is empty when using -k and wasn't already added,
-	  create a dummy line and add it to the cutbuffer (fixes bug #61)
+	  create a dummy line and add it to the cutbuffer.  Fixes bug #61.
 	- Reset marked_cut if we blow away the cutbuffer.
 	- Moved the case of current == mark_beginbuf into cut_marked
 	  segment, so do_writeout could call it when writing selection to
@@ -6719,7 +6719,7 @@ nano-1.1.0 - 2001.07.15
 - move.c:
  page_up()
 	- Rewritten with a loop to make screen updates work when
-	  mark is set (fixes bug #59).
+	  mark is set.  Fixes bug #59.
  do_home(), do_end()
 	- Don't keep cutbuffer.
 - nano.1:
@@ -6756,7 +6756,7 @@ nano-1.1.0 - 2001.07.15
 	- Optimizations, remove "$" goes-to-last-line, less messages. (Rocco)
  do_replace()
 	- If we manage to make it in somehow with VIEW_MODE on, abort
-	  nicely (fixes BUG #59).
+	  nicely.  Fixes bug #59.
 - utils.c
  strcasestr()
 	- Replaced by mutt's mutt_stristr function, because the thought
@@ -6844,13 +6844,13 @@ nano-1.0.0 - 2001.03.22
 - move.c:
  page_down()
 	- Check for totlines < editwinrows in check for superfluous
-	  edit update (fixed BUG #57).
+	  edit update.  Fixes bug #57.
 - search.c:
  print_replaced()
 	- s/occurence/occurrence typos. (Jordi)
  search_init()
 	- If using Pico mode and regex and same answer is entered, use
-	  last_search string instead of answer (fixes BUG #56).
+	  last_search string instead of answer.  Fixes bug #56.
 - nano.texi:
 	- Meta-Z correction and grammar in --enable-tiny desc. (Neil Parks)

@@ -6868,7 +6868,7 @@ nano-0.9.99pre3 - 2001.02.19
 	- ALL_LINGUAS: added hu and ca.
 - cut.c:
  do_cut_text()
-	- marked text cut fixes (Rocco) (Fixes bug #54).
+	- Marked text cut fixes.  Fixes bug #54. (Rocco)
 - nano.c:
  do_delete()
 	- Added check for current->next == fileptr, as we have a magic
@@ -7016,7 +7016,7 @@ General -
 	  for now.
 	- Moved keypad() calls for PDCurses from main() to window_init()
 	  so the keypad continues to work after a Meta-X, for example.
-	  Fixed bug #51.
+	  Fixes bug #51.
 - faq.html:
 	- Fix typos and small mistakes. (Jordi)
 - files.c:
@@ -7038,7 +7038,7 @@ General -
 - move.c:
  page_down()
 	- Don't do an edit_update when there is only one page of text
-	  (fileage == edittop && filebot == editbot).  Fixes Bug #50.
+	  (fileage == edittop && filebot == editbot).  Fixes bug #50.
 - nano.c:
  main()
 	- Reorder the getopt options to be more or less alphabetical
@@ -7080,7 +7080,7 @@ General
 	  uncutting marked text at filebot. (Ryan Krebs)
 - files.c:
  read_file()
-	- If we encounter an error and insert is not set, run new_file().
+	- If we encounter an error and insert is not set, run new_file()
 	  (bug discovered by Ben Roberts).
  write_file()
 	- Change open call flags, basically copy joe's way of doing it so
@@ -7097,8 +7097,8 @@ General
 	  modify_control_key.  Removed #ifdef _POSIX_VDISABLE check
 	  around Control-S,Q,Z handlers because we need it now for
 	  the Alt-Alt-x code.
-	- Added --view option to getopt_long() call.  Bug discovered
-	  by Rocco Corsi.
+	- Added --view option to getopt_long() call (bug discovered by
+	  Rocco Corsi).
  help_init()
 	- Fix off by one error that was making ^G help in normal mode and
 	  ^_ in Pico mode not be displayed in the help (bug discovered by
@@ -7292,7 +7292,7 @@ nano 0.9.20 - 2000.11.18
 - nano.c:
  keypad_on()
 	- New function, toggles turning the keypad on and off in edit and
-	  bottomwin().  Added call to this in finish(), fixes bug #45.
+	  bottomwin().  Added call to this in finish().  Fixes bug #45.
 - search.c
  findnextstr()
 	- New arg for begin_x variable, basically a rewrite that
@@ -7359,7 +7359,7 @@ nano 0.9.18 - 2000.09.18
 - cut.c:
  do_cut_text()
 	- Don't immediately abort if we're on filebot and the marker is
-	  set (fixes bug #42).
+	  set.  Fixes bug #42.
 - files.c:
  open_file()
 	- Fix for bug #44. (Rocco Corsi)
@@ -7372,9 +7372,9 @@ nano 0.9.18 - 2000.09.18
 	  available, allows nano to work with cygwin.
 	- Added gettext calls to enable/disable strings. (Jordi)
 	- Revamped a great deal of the F-key and keypad key handling,
-	  because we not longer use keypad() (see below).
+	  because we no longer use keypad() (see below).
 	- Removed keypad() call because nano was not working with the
-	  keypad in many terms, which is very bad.
+	  keypad on many terminals, which is very bad.
 	- Made insert key call do_insertfile().
  do_toggle()
 	- Rewrote function to allow NOHELP toggle to work on systems
@@ -7450,7 +7450,7 @@ nano-0.9.17 - 2000.09.04
  findnextstr():
 	- Added reset for placewewant. (Ben Roberts)
 	- Fixed check for string that only occurs on the same line failing
-	  (discovered by Ken Tyler).
+	  (bug discovered by Ken Tyler).

 nano-0.9.16 - 2000.08.09
 - cut.c:
@@ -7481,7 +7481,7 @@ nano-0.9.15 - 2000.08.03
 	  with --with-slang or --without-slang
 - nano.c:
  splice_node()
-	- New function, abstracts linking in nodes.   Fixes bug #36.
+	- New function, abstracts linking in nodes.  Fixes bug #36.
  null_at()
 	- New function, nulls a string at a given index and realigns it.
  delete_buffer()
@@ -7555,7 +7555,7 @@ nano-0.9.13 - 2000.07.23
 	- More intelligent emergency-save filename selection. (Rob)
  do_spell():
 	- Changed exit semantics a bit so that aspell wouldn't get
-	  all screwy (bug discovered by Joshua Jensen.
+	  all screwy (bug discovered by Joshua Jensen).
 - files.c:
  read_file():
 	- Added init of buf variable, hopefully this will stop the
@@ -7606,8 +7606,8 @@ nano-0.9.12 - 2000.07.07
 	- Magic Line code in read_file (Rob)
 - nano.c:
 	- Removed dual alt_speller variables, oops! (Rocco Corsi)
-	- Removed unnecessary do_oldspell function. (Rocco Corsi).  Added
-	  SMALL_NANO #ifdef around actual spell function.
+	- Removed unnecessary do_oldspell function. (Rocco Corsi)
+	- Added SMALL_NANO #ifdef around actual spell function.
 	- Moved page_up() to move.c where is belongs.
 	- Corrected FIXME in do_enter with explanation. (Rob)
 	- Fixed FIXME in do_justify, resulted in creation of
--- a/21
+++ b/21
@@ -1,6 +1,27 @@
 Improvements in GNU nano
 ========================

+Since 2.9.0:
+  - Addition of the color name "normal", meaning the default color.
+  - A key can be bound to a string -- any mix of text and commands.
+  - Error messages are shown by default in bright white on red.
+  - <Tab> and <Shift+Tab> can be used to indent/unindent a marked region.
+  - Can snip trailing whitespace while typing, with 'set trimblanks'.
+  - The ability to record and replay a series of keystrokes (a macro).
+  - Assigned functions to ^S (save file) and ^Q (start backward search).
+  - Indenting and unindenting have been integrated into the undo system.
+  - Support for $XDG_CONFIG_HOME for the nanorc file, and $XDG_DATA_HOME
+    for the history files (of search strings and cursor positions).
+
+Since 2.8.0:
+  - Meta-Up/Meta-Down will search the previous/next occurrence.
+  - ^U pastes the first line of the cutbuffer at a prompt.
+  - Softwrapping can be done at whitespace (with --soft --atblanks).
+  - The ^G help texts have become searchable (with ^W and M-W).
+  - Ctrl+Home and Ctrl+End jump to start and end of file.
+  - In softwrap mode the cursor now moves per visual row instead of
+    per logical line, and the screen will scroll per row.
+
 Since 2.7.0:
  - The keystroke ^] to complete a fragment to an existing full word.
  - The ability to display line numbers in front of the text (M-#).
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,6 +1,6 @@
 AUTOMAKE_OPTIONS = gnu no-dependencies

-SUBDIRS = doc m4 po src
+SUBDIRS = doc lib m4 po src

 if USE_COLOR
 SUBDIRS += syntax
--- a/2801
+++ b/2801
--- a/91
+++ b/91
@@ -1,69 +1,76 @@

-		GNU nano -- an enhanced clone of the Pico text editor
+          GNU nano -- an enhanced clone of the Pico text editor

 Overview

-	The nano project was started because of a few "problems" with the
-	wonderfully easy-to-use and friendly Pico text editor.
+    The nano project was started because of a few "problems" with the
+    wonderfully easy-to-use and friendly Pico text editor.

-	First and foremost was its license: the Pine suite does not use
-	the GPL or a GPL-friendly license, and has unclear restrictions on
-	redistribution.  Because of this, Pine and Pico are not included
-	with many GNU/Linux distributions.  Also, other features (like
-	go-to-line-number or search-and-replace) were unavailable until
-	recently or require a command-line flag.  Yuck.
+    First and foremost was its license: the Pine suite does not use
+    the GPL or a GPL-friendly license, and has unclear restrictions on
+    redistribution.  Because of this, Pine and Pico are not included
+    with many GNU/Linux distributions.  Also, other features (like
+    go-to-line-number or search-and-replace) were unavailable until
+    recently or require a command-line flag.  Yuck.

-	nano aims to solve these problems by emulating the functionality of
-	Pico as closely as possible while addressing the problems above and
-	providing other extra functionality.
+    nano aims to solve these problems by emulating the functionality of
+    Pico as closely as possible while addressing the problems above and
+    providing other extra functionality.

-	The nano editor is an official GNU package.  For more information on
-	GNU and the Free Software Foundation, please see http://www.gnu.org/.
+    The nano editor is an official GNU package.  For more information on
+    GNU and the Free Software Foundation, please see http://www.gnu.org/.

 How to compile and install nano

-	Download the nano source code, then:
+    Download the nano source code, then:

-	tar xvzf nano-x.y.z.tar.gz
-	cd nano-x.y.z
-	./configure
-	make
-	make install
+        tar xvzf nano-x.y.z.tar.gz
+        cd nano-x.y.z
+        ./configure
+        make
+        make install

-	It's that simple.  Use --prefix with configure to override the
-	default installation directory of /usr/local.
+    It's that simple.  Use --prefix with configure to override the
+    default installation directory of /usr/local.

-	If you haven't configured with the --disable-nanorc option, after
-	installation you may want to copy the doc/sample.nanorc file to
-	your home directory, rename it to ".nanorc", and then edit it
-	according to your taste.
+    If you haven't configured with the --disable-nanorc option, after
+    installation you may want to copy the doc/sample.nanorc file to
+    your home directory, rename it to ".nanorc", and then edit it
+    according to your taste.

 Web Page

-	https://nano-editor.org/
+    https://nano-editor.org/

 Mailing Lists

-	There are three nano-related mailing-lists.
+    There are three nano-related mailing-lists.

-	+ info-nano@gnu.org is a very low traffic list used to announce
-	  new nano versions or other important info about the project.
-	+ help-nano@gnu.org is for those seeking to get help without
-	  wanting to hear about the technical details of its development.
-	+ nano-devel@gnu.org is the list used by the people that make nano
-	  and a general development discussion list, with moderate traffic.
+    + info-nano@gnu.org is a very low traffic list used to announce
+      new nano versions or other important info about the project.
+    + help-nano@gnu.org is for those seeking to get help without
+      wanting to hear about the technical details of its development.
+    + nano-devel@gnu.org is the list used by the people that make nano
+      and a general development discussion list, with moderate traffic.

-	To subscribe, send email to <name>-request@gnu.org with a subject
-	of "subscribe", where <name> is the list you want to subscribe to.
+    To subscribe, send email to <name>-request@gnu.org with a subject
+    of "subscribe", where <name> is the list you want to subscribe to.

 Bug Reports

-	To report a bug, please file a description of the problem on nano's
-	bug tracker (https://savannah.gnu.org/bugs/?group=nano -- hover on
-	"Bugs", then click "Submit new").  The issue may have already been
-	reported, so please look first.
+    To report a bug, please file a description of the problem on nano's
+    bug tracker (https://savannah.gnu.org/bugs/?group=nano -- hover on
+    "Bugs", then click "Submit new").  The issue may have already been
+    reported, so please look first.

 Current Status

-	GNU nano has reached its seventh milestone, 2.6.x.  Since 2.5.0, it
-	is a "rolling" release: bug fixing and development go hand in hand.
+    Since version 2.5.0, GNU nano has abandoned the distinction between
+    a stable and a development branch: it is now on a "rolling" release
+    -- fixing bugs and adding new features go hand in hand.
+
+Copyright Years
+
+    When in any file of this package a copyright notice mentions a
+    year range (such as 1999-2011), it is a shorthand for a list of
+    all the years in that interval.
--- a/README.GIT
+++ b/README.GIT
@@ -11,10 +11,10 @@ Prerequisites
 To successfully compile GNU nano from git, you'll need the following
 packages:

- autoconf    (version >= 2.61)
- automake    (version >= 1.7)
- autopoint   (version >= 0.11.5)
- gettext     (version >= 0.11.5)
+- autoconf    (version >= 2.69)
+- automake    (version >= 1.14)
+- autopoint   (version >= 0.18.3)
+- gettext     (version >= 0.18.3)
 - git         (version >= 2.7.4)
 - groff       (version >= 1.12)
 - pkg-config  (version >= 0.22)
@@ -24,8 +24,6 @@ packages:

 If you want UTF-8 support, you will also need libncursesw5-dev installed
 (version >= 5.7), or libslang2-dev (version >= 2.0) if you use --with-slang.
-If your system doesn't have 'snprintf' or 'vsnprintf' (which the configure
-script will check for), you will also need glib-2.x installed.

 These should all be available in your distro's package manager or software
 center, or otherwise on any GNU mirror.
@@ -95,14 +93,24 @@ first create a branch off of master:

    $ git checkout -b somename

-Then change the code so it does what you want, and commit it, with in the
-commit message (after the one-line summary) a rationale for the change:
+Then change the code so it does what you want, and commit it together
+with your Sign-off:

    $ git commit -as

-Then create a patch (or patches):
+In the commit message (after the one-line summary) give a rationale
+for the change.  With your Signed-off-by you declare that the code is
+yours, or that you are free to reuse it, and that you submit it under
+the license that covers nano.  Then create a patch (or patches):

    $ git format-patch master

 Send that patch (or patches) to <nano-devel@gnu.org>, as an attachment
 or with git send-email.
+
+To keep most lines of nano's source code within a width of 80 characters,
+a tab size of four should be used.  So in your nanorc file you may want
+to include 'set tabsize 4', or you could use -T4 on the command line.
+To make git display things as intended, you can do:
+
+    $ git config --local core.pager "less -x1,5"
--- a/168
+++ b/168
@@ -4,90 +4,94 @@ If we missed you here, let us know!

 Translations:
 ============
-Sharuzzaman Ahmat Raslan <sharuzzaman@excite.com>	Malay
-Josef Andersson <josef.andersson@fripost.org>		Swedish
-Laurentiu Buzdugan <buzdugan@voyager.net>		Romanian
-Mario Blättermann <mario.blaettermann@gmail.com>	German
-Ricardo Cárdenes Medina <ricardo@conisys.com>		Spanish
-Antonio Ceballos <aceballos@gmail.com>			Spanish
-Wei-Lun CHAO <chaoweilun@pcmail.com.tw>			Chinese (traditional)
-Yuri Chornoivan <yurchor@ukr.net>			Ukrainian
-Marco Colombo <magicdice@inwind.it>			Italian
-Mihai Cristescu <mihai.cristescu@archlinux.info>	Romanian
-Yavor Doganov <yavor@doganov.org>			Bulgarian
-Karl Eichwalder <keichwa@gmx.net>			German
-A. Murat EREN <meren@comu.edu.tr>			Turkish
-Rafael Ferreira <rafael.f.f1@gmail.com>			Brazilian Portuguese
-Doruk Fisek <dfisek@fisek.com.tr>			Turkish
-Pavel Fric <pavelfric@seznam.cz>			Czech
-Jorge González <aloriel@gmail.com>			Spanish
+Sharuzzaman Ahmat Raslan <sharuzzaman@excite.com>     Malay
+Josef Andersson <josef.andersson@fripost.org>         Swedish
+Laurentiu Buzdugan <buzdugan@voyager.net>             Romanian
+Mario Blättermann <mario.blaettermann@gmail.com>      German
+Ricardo Cárdenes Medina <ricardo@conisys.com>         Spanish
+Antonio Ceballos <aceballos@gmail.com>                Spanish
+Wei-Lun CHAO <chaoweilun@pcmail.com.tw>               Chinese (traditional)
+Yuri Chornoivan <yurchor@ukr.net>                     Ukrainian
+Marco Colombo <magicdice@inwind.it>                   Italian
+Mihai Cristescu <mihai.cristescu@archlinux.info>      Romanian
+Yavor Doganov <yavor@doganov.org>                     Bulgarian
+Karl Eichwalder <keichwa@gmx.net>                     German
+A. Murat EREN <meren@comu.edu.tr>                     Turkish
+Doruk Fisek <dfisek@fisek.com.tr>                     Turkish
+Rafael Fontenelle <rffontenelle@gmail.com>            Brazilian Portuguese
+Pavel Fric <pavelfric@seznam.cz>                      Czech
+Jorge González <aloriel@gmail.com>                    Spanish
 Jean-Philippe Guérard <jean-philippe.guerard@laposte.net>  French
-Geir Helland <pjallabais@users.sourceforge.net>		Norwegian Bokmål
-Tedi Heriyanto <tedi_h@gmx.net>				Indonesian
-Václav Haisman <V.Haisman@sh.cvut.cz>			Czech
-Kjetil Torgrim Homme <kjetilho@linpro.no>		Norwegian Nynorsk
-Szabolcs Horvath <horvaths@janus.gimsz.sulinet.hu>	Hungarian
-Jorma Karvonen <karvonen.jorma@gmail.com>		Finnish
-Gabor Kelemen <kelemeng@gnome.hu>			Hungarian
-Kalle Kivimaa <kalle.kivimaa@iki.fi>			Finnish
-Eivind Kjørstad <ekj@vestdata.no>			Norwegian Nynorsk
-Florian König <floki@bigfoot.com>			German
-Klemen Košir <klemen913@gmail.com>			Slovenian
-Wojciech Kotwica <wkotwica@post.pl>			Polish
-Ask Hjorth Larsen <asklarsen@gmail.com>			Danish
-Clement Laforet <clem_laf@wanadoo.fr>			French
-LI Daobing <lidaobing@gmail.com>			Chinese (simplified)
-Jordi Mallach <jordi@gnu.org>				Catalan
-João Victor Duarte Martins <jvdm@sdf.lonestar.org>	Brazilian Portuguese
-Pavel Maryanov <acid@jack.kiev.ua>			Russian
-Daniele Medri <madrid@linux.it>				Italian
-Gergely Nagy <algernon@debian.org>			Hungarian
-Kalle Olavi Niemitalo <kon@iki.fi>			Finnish
-Мирослав Николић <miroslavnikolic@rocketmail.com>	Serbian
-Claudio Neves <cneves@nextis.com>			Brazilian Portuguese
-Daniel Nylander <po@danielnylander.se>			Swedish
-Mikel Olasagasti <hey_neken@mundurat.net>		Basque
-Michael Piefel <piefel@informatik.hu-berlin.de>		German
-Sergey Poznyakoff <gray@gnu.org>			Polish
-Božidar Putanec <bozidarp@yahoo.com>			Croatian
-Trần Ngọc Quân <vnwildman@gmail.com>			Vietnamese
-Sergey A. Ribalchenko <fisher@obu.ck.ua>		Ukrainian and Russian
-Michel Robitaille <robitail@IRO.UMontreal.CA>		French
-Christian Rose <menthos@menthos.com>			Swedish
-Dimitriy Ryazantcev <DJm00n@mail.ru>			Russian
-Stig E Sandø <stig@ii.uib.no>				Norwegian Bokmål
-Kevin Patrick Scannell <kscanne@gmail.com>		Irish
-Benno Schulenberg <benno@vertaalt.nl>			Dutch and Esperanto
-Danilo Segan <dsegan@gmx.net>				Serbian
-Clytie Siddall <clytie@riverland.net.au>		Vietnamese
-Keld Simonsen <keld@dkuug.dk>				Danish
-Guus Sliepen <guus@nl.linux.org>			Dutch
-Cezary Sliwa <sliwa@cft.edu.pl>				Polish
-Johnny A. Solbu <johnny@solbu.net>			Norwegian Bokmål
-Pierre Tane <tanep@bigfoot.com>				French
-Yasuaki Taniguchi <yasuakit@gmail.com>			Japanese
-Jacobo Tarrío <jtarrio@trasno.net>			Galician
-Francisco Javier Tsao Santín <tsao@members.fsf.org>	Galician
-Miquel Vidal <miquel@sindominio.net>			Catalan
-Phan Vinh Thinh <teppi82@gmail.com>			Vietnamese
-Pauli Virtanen <pauli.virtanen@saunalahti.fi>		Finnish
-Aron Xu <happyaron.xu@gmail.com>			Chinese (simplified)
-Peio Ziarsolo <peio@sindominio.net>			Basque
-Anton Zinoviev <zinoviev@debian.org>			Bulgarian
+Geir Helland <pjallabais@users.sourceforge.net>       Norwegian Bokmål
+Tedi Heriyanto <tedi_h@gmx.net>                       Indonesian
+Václav Haisman <V.Haisman@sh.cvut.cz>                 Czech
+Takeshi Hamasaki <hmatrjp@users.sourceforge.jp>       Japanese
+Kjetil Torgrim Homme <kjetilho@linpro.no>             Norwegian Nynorsk
+Szabolcs Horvath <horvaths@janus.gimsz.sulinet.hu>    Hungarian
+Jorma Karvonen <karvonen.jorma@gmail.com>             Finnish
+Mehmet Kececi  <mkececi@mehmetkececi.com>             Turkish
+Gabor Kelemen <kelemeng@gnome.hu>                     Hungarian
+Kalle Kivimaa <kalle.kivimaa@iki.fi>                  Finnish
+Eivind Kjørstad <ekj@vestdata.no>                     Norwegian Nynorsk
+Florian König <floki@bigfoot.com>                     German
+Klemen Košir <klemen913@gmail.com>                    Slovenian
+Wojciech Kotwica <wkotwica@post.pl>                   Polish
+Ask Hjorth Larsen <asklarsen@gmail.com>               Danish
+Clement Laforet <clem_laf@wanadoo.fr>                 French
+LI Daobing <lidaobing@gmail.com>                      Chinese (simplified)
+Jordi Mallach <jordi@gnu.org>                         Catalan
+João Victor Duarte Martins <jvdm@sdf.lonestar.org>    Brazilian Portuguese
+Pavel Maryanov <acid@jack.kiev.ua>                    Russian
+Daniele Medri <madrid@linux.it>                       Italian
+Gergely Nagy <algernon@debian.org>                    Hungarian
+Kalle Olavi Niemitalo <kon@iki.fi>                    Finnish
+Мирослав Николић <miroslavnikolic@rocketmail.com>     Serbian
+Claudio Neves <cneves@nextis.com>                     Brazilian Portuguese
+Lauri Nurmi <lanurmi@iki.fi>                          Finnish
+Daniel Nylander <po@danielnylander.se>                Swedish
+Mikel Olasagasti <hey_neken@mundurat.net>             Basque
+Michael Piefel <piefel@informatik.hu-berlin.de>       German
+Sergey Poznyakoff <gray@gnu.org>                      Polish
+Božidar Putanec <bozidarp@yahoo.com>                  Croatian
+Trần Ngọc Quân <vnwildman@gmail.com>                  Vietnamese
+Sergey A. Ribalchenko <fisher@obu.ck.ua>              Ukrainian and Russian
+Michel Robitaille <robitail@IRO.UMontreal.CA>         French
+Christian Rose <menthos@menthos.com>                  Swedish
+Dimitriy Ryazantcev <DJm00n@mail.ru>                  Russian
+Stig E Sandø <stig@ii.uib.no>                         Norwegian Bokmål
+Kevin Patrick Scannell <kscanne@gmail.com>            Irish
+Benno Schulenberg <benno@vertaalt.nl>                 Dutch and Esperanto
+Danilo Segan <dsegan@gmx.net>                         Serbian
+Clytie Siddall <clytie@riverland.net.au>              Vietnamese
+Keld Simonsen <keld@dkuug.dk>                         Danish
+Guus Sliepen <guus@nl.linux.org>                      Dutch
+Cezary Sliwa <sliwa@cft.edu.pl>                       Polish
+Johnny A. Solbu <johnny@solbu.net>                    Norwegian Bokmål
+Pierre Tane <tanep@bigfoot.com>                       French
+Yasuaki Taniguchi <yasuakit@gmail.com>                Japanese
+Jacobo Tarrío <jtarrio@trasno.net>                    Galician
+Francisco Javier Tsao Santín <tsao@members.fsf.org>   Galician
+Balázs Úr <urbalazs@gmail.com>                        Hungarian
+Miquel Vidal <miquel@sindominio.net>                  Catalan
+Phan Vinh Thinh <teppi82@gmail.com>                   Vietnamese
+Pauli Virtanen <pauli.virtanen@saunalahti.fi>         Finnish
+Aron Xu <happyaron.xu@gmail.com>                      Chinese (simplified)
+Peio Ziarsolo <peio@sindominio.net>                   Basque
+Anton Zinoviev <zinoviev@debian.org>                  Bulgarian


 Other stuff:
 ===========
-Ben Armstrong <synrg@sanctuary.nslug.ns.ca>	Negative -r value idea, code
-Thomas Dickey <dickey@herndon4.his.com>		Curses help and advice
-Sven Guckes <guckes@math.fu-berlin.de>		Advice and advocacy
-Thijs Kinkhorst <thijs@kinkhorst.com>		rnano.1 manpage
-Jim Knoble <jmknoble@pobox.com>			Pico compat for browser
-Ryan Krebs <fluffy@highwire.stanford.edu>	Many bug fixes and testing
-Roy Lanek <lanek@ranahminang.net>		Advice and advocacy
-Chuck Mead <csm@MoonGroup.com>			Feedback and RPM stuff
-Mike Melanson <melanson@pcisys.net>		Bugs
-Neil Parks <nparks@acsmail.com>			Bug reports and fixes
-Jeremy Robichaud <robicj@yahoo.com>		Beta tester
-Bill Soudan <wes0472@rit.edu>			Regex code, etc
-Ken Tyler <kent@werple.net.au>			Search fixes and more
+Ben Armstrong <synrg@sanctuary.nslug.ns.ca>    Negative -r value idea, code
+Thomas Dickey <dickey@herndon4.his.com>        Curses help and advice
+Sven Guckes <guckes@math.fu-berlin.de>         Advice and advocacy
+Thijs Kinkhorst <thijs@kinkhorst.com>          rnano.1 manpage
+Jim Knoble <jmknoble@pobox.com>                Pico compat for browser
+Ryan Krebs <fluffy@highwire.stanford.edu>      Many bug fixes and testing
+Roy Lanek <lanek@ranahminang.net>              Advice and advocacy
+Chuck Mead <csm@MoonGroup.com>                 Feedback and RPM stuff
+Mike Melanson <melanson@pcisys.net>            Bug reports
+Neil Parks <nparks@acsmail.com>                Bug reports and fixes
+Jeremy Robichaud <robicj@yahoo.com>            Beta tester
+Bill Soudan <wes0472@rit.edu>                  Regex code, etc
+Ken Tyler <kent@werple.net.au>                 Search fixes and more
--- a/49
+++ b/49
@@ -1,29 +1,8 @@
 A list of desired features
 --------------------------

-Vague musings:
- FriBidi support?
- Make matching bracket searches sophisticated enough to skip over
-  brackets inside comments?
- Allow indentation of marked text by spaces as well as tabs?
- Allow indentation to add just enough columns to reach the nearest
-  multiple of tabsize, rather than always adding tabsize columns?
- Allow conversion between different character sets.  Maybe use glib's
-  iconv() if the system's iconv() is inadequate, since we already use
-  glib's vsnprintf() if the system lacks vsnprintf()?
- Allow setting marks (saved positions, not to be confused with the mark
-  set via Ctrl-^) at various lines and/or columns in the buffer, and
-  allow movement between them with a single keystroke?
- Allow searching for and replacing newlines?
-  See also https://savannah.gnu.org/bugs/?47053.
- New regression framework built on expect?
- Add the ability to move to different lines of the screen with a single
-  keystroke, e.g. M-` (M-~) to go to the top line, M-& (M-7) to go to
-  the center line, and M-' (M-") to go to the last line?
-
 Somewhat urgent:
- Allow text searches in the help viewer.
-  See https://savannah.gnu.org/bugs/?28994.
+- Make undo/redo work also for justifying.
 - Detect when text is being pasted, so that we can handle it faster.
  See https://savannah.gnu.org/bugs/?40060.
 - Allow color syntaxes to apply to more than just color, so that we can
@@ -33,6 +12,21 @@ Somewhat urgent:
  the command's output -- that is: generalize the spell-check flow.
  See also https://savannah.gnu.org/bugs/?28993.

+Vague musings:
+- Add support for right-to-left text (RTL), through FriBidi?
+- Allow setting marks (saved positions, not to be confused with the
+  mark set via Ctrl-^) at various lines and/or columns in the buffer,
+  and allow movement between them with a single keystroke?
+- Make matching bracket searches sophisticated enough to skip over
+  brackets inside comments?
+
+For version 2.9:
+- Make undo/redo work also for indenting. [DONE]
+- Allow to record and replay a macro: a stored series of keystrokes. [DONE]
+
+For version 2.8:
+- Allow text searches in the help viewer. [DONE]
+
 For version 2.4:
 - Handle window resizes better.  After we've resized, we should stay
  wherever we were before we resized, as Pico does. [DONE]
@@ -46,8 +40,7 @@ For version 2.2:
 - Undo/Redo keys (M-U and M-E)? [DONE]
 - Fix problems with color syntaxes highlighting lines too aggressively. [DONE]
 - Allow nano to work like a pager (reading from stdin). [DONE]
- Allow color syntaxes to be selected based on more than just filename
-  extension. [DONE]
+- Select a color syntax based on more than just the filename extension. [DONE]
 - Allow soft wrapping as well as hard wrapping? [DONE]

 For version 2.0:
@@ -65,14 +58,13 @@ For version 2.0:

 For version 1.2:
 - Single-line scroll up/down? [DONE]
- Color syntax highlighting? (Certainly seems like there's a demand for
-  it.) [DONE]
- .nanorc [DONE]
+- Color syntax highlighting? (There seems to be a demand for it.) [DONE]
+- Support for a .nanorc file. [DONE]
 - Backup making (filename~)? [DONE]
 - Search/replace string history. [DONE]
 - Implement Pico's -j and -g flags, as they are pretty easy to do. [DONE]
 - Make mouse support work with clicking on the shortcuts (-m). [DONE]
- Implement -o (chroot of sorts). [DONE]
+- Implement -o (--operatingdir, a chroot of sorts). [DONE]
 - Allow -r to take a negative argument, meaning right margin instead of
  left (allows resizing that way), formerly -W arg. [DONE]

@@ -83,7 +75,6 @@ For version 1.0:
 - Allow nano to be resized in X. [DONE]
 - On PageUp/Down, put the cursor on the first line (like Pico), not the
  center line. [DONE]
- Rewrite edit_refresh, if at all possible. [DONE]
 - Implement justify function. [DONE]
 - Cut to end of line. [DONE]
 - Built-in speller command. [DONE]
--- a/autogen.sh
+++ b/autogen.sh
@@ -1,4 +1,48 @@
 #!/bin/sh
 # Generate configure & friends for GIT users.

+gnulib_url="git://git.sv.gnu.org/gnulib.git"
+gnulib_hash="59e59d99bc1ca635d178778b9b4ee544330775c4"
+
+modules="
+	futimens
+	getdelim
+	getline
+	getopt-gnu
+	glob
+	isblank
+	iswblank
+	lstat
+	nl_langinfo
+	regex
+	sigaction
+	snprintf-posix
+	stdarg
+	strcase
+	strcasestr-simple
+	strnlen
+	sys_wait
+	vsnprintf-posix
+	wchar
+	wctype-h
+	wcwidth
+"
+
+# Make sure the local gnulib git repo is up-to-date.
+if [ ! -d "gnulib" ]; then
+	git clone --depth=123 ${gnulib_url}
+fi
+cd gnulib >/dev/null || exit 1
+curr_hash=$(git log -1 --format=%H)
+if [ "${gnulib_hash}" != "${curr_hash}" ]; then
+	git pull
+	git checkout -f ${gnulib_hash}
+fi
+cd .. >/dev/null || exit 1
+
+rm -rf lib
+./gnulib/gnulib-tool \
+	--import \
+	${modules}
+
 autoreconf -f -i -s
--- a/configure.ac
+++ b/configure.ac
--- a/doc/.gitignore
+++ b/doc/.gitignore
@@ -4,4 +4,5 @@ nanorc.5.html
 texinfo.tex
 nano.info
 nano.html
+nano.pdf
 sample.nanorc
--- a/doc/Makefile.am
+++ b/doc/Makefile.am
@@ -28,6 +28,6 @@ info_TEXINFOS = nano.texi
 BUILT_SOURCES += nano.html
 dist_html_DATA += nano.html

-AM_MAKEINFOHTMLFLAGS = --no-split
+AM_MAKEINFOHTMLFLAGS = --no-split -c HEADERS=0

 EXTRA_DIST = $(BUILT_SOURCES) $(info_TEXINFOS)
--- a/doc/faq.html
+++ b/doc/faq.html
@@ -7,22 +7,25 @@
 <body text="#330000" bgcolor="#ffffff" link="#0000ef" vlink="#51188e" alink="#ff0000">

 <h1>The GNU nano editor FAQ</h1>
-<h2>Table of Contents</h2>
-<h2><a href="#1">1. General</a></h2>
-<blockquote><p><a href="#1.1">1.1 About this FAQ</a><br>
-  <a href="#1.2">1.2. How do I contribute to it?</a><br>
-  <a href="#1.3">1.3. What is GNU nano?</a><br>
-  <a href="#1.4">1.4. What is the history behind nano?</a><br>
-  <a href="#1.5">1.5. Why the name change from TIP?</a><br>
-  <a href="#1.6">1.6. What is the current version of nano?</a><br>
-  <a href="#1.7">1.7. I want to read the manpage without having to download the program!</a></p></blockquote>
-<h2><a href="#2">2. Where to get GNU nano.</a></h2>
-<blockquote><p><a href="#2.1">2.1. FTP and WWW sites that carry nano.</a><br>
+<h3>Table of Contents</h3>
+<h3><a href="#1">1. General</a></h3>
+<blockquote><p>
+  <a href="#1.1">1.1. What is GNU nano?</a><br>
+  <a href="#1.2">1.2. What is the history behind nano?</a><br>
+  <a href="#1.3">1.3. Why the name change from TIP?</a><br>
+  <a href="#1.4">1.4. What is the current version of nano?</a><br>
+  <a href="#1.5">1.5. I want to read the manpage without having to download the program!</a>
+</p></blockquote>
+<h3><a href="#2">2. Where to get GNU nano.</a></h3>
+<blockquote><p>
+  <a href="#2.1">2.1. FTP and WWW sites that carry nano.</a><br>
  <a href="#2.2">2.2. RedHat and derivatives (.rpm) packages.</a><br>
  <a href="#2.3">2.3. Debian (.deb) packages.</a><br>
-  <a href="#2.4">2.4. By GIT (for the brave).</a></p></blockquote>
-<h2><a href="#3">3. Installation and Configuration</a></h2>
-<blockquote><p><a href="#3.1">3.1. How do I install the RPM or DEB package?</a><br>
+  <a href="#2.4">2.4. By GIT (for the brave).</a>
+</p></blockquote>
+<h3><a href="#3">3. Installation and Configuration</a></h3>
+<blockquote><p>
+  <a href="#3.1">3.1. How do I install the RPM or DEB package?</a><br>
  <a href="#3.2">3.2. Compiling from source: WHAT THE HECK DO I DO NOW?</a><br>
  <a href="#3.3">3.3. Why does everything go into /usr/local?</a><br>
  <a href="#3.5">3.5. nano should automatically run strip on the binary when installing it!</a><br>
@@ -30,46 +33,52 @@
  <a href="#3.7">3.7. Tell me more about this multibuffer stuff!</a><br>
  <a href="#3.8">3.8. Tell me more about this verbatim input stuff!</a><br>
  <a href="#3.9a">3.9a. How do I make a .nanorc file that nano will read when I start it?</a><br>
-  <a href="#3.9b">3.9b. How about in Win32?</a></p></blockquote>
-<h2><a href="#4">4. Running</a></h2>
-<blockquote><p><a href="#4.1">4.1. How do I open a file with a name beginning with '+' from the command line?</a><br>
+  <a href="#3.9b">3.9b. How about in Win32?</a>
+</p></blockquote>
+<h3><a href="#4">4. Running</a></h3>
+<blockquote><p>
+  <a href="#4.1">4.1. How do I open a file with a name beginning with '+' from the command line?</a><br>
  <a href="#4.2">4.2. Ack! My Backspace/Delete/Enter/Meta/double bucky key doesn't seem to work! What can I do?</a><br>
  <a href="#4.3">4.3. Ack! My numeric keypad's keys don't work properly when NumLock is off! What can I do?</a><br>
  <a href="#4.4">4.4. Ack! When I hold down a Meta key combination for a while, the character of the held key gets inserted now and then. What gives?</a><br>
-  <a href="#4.5">4.5. How do I type the F13-F16 keys shown in the help browser? My keyboard only has F1-F12!</a><br>
-  <a href="#4.6">4.6. nano crashes when I type &lt;insert keystroke here&gt;!</a><br>
+  <a href="#4.5">4.5. How do I type the F13-F16 keys listed in the help viewer? My keyboard only has F1-F12!</a><br>
+  <a href="#4.6">4.6. nano crashes when I type &lt;insert keystrokes here&gt;!</a><br>
  <a href="#4.7">4.7. nano crashes when I resize my window. How can I fix that?</a><br>
-  <a href="#4.8">4.8. When I paste text into a document, each line gets indented further than the last. Why does nano do this, and how can I avoid it?</a><br>
+  <a href="#4.8a">4.8a. With what keystroke can I paste text from the clipboard into nano?</a><br>
+  <a href="#4.8b">4.8b. When I paste text into a document, each line gets indented further than the last. Why? And how can I stop this?</a><br>
+  <a href="#4.8c">4.8c. When I paste from Windows into a remote nano, nano rewraps the lines. What gives?<a><br>
  <a href="#4.9">4.9. I've compiled nano with color support, but I don't see any color when I run it!</a><br>
  <a href="#4.10">4.10. How do I make nano my default editor (in Pine, mutt, etc.)?</a><br>
  <a href="#4.11">4.11. How do I select text for or paste text from the clipboard in an X terminal when I'm running nano in one and nano's mouse support is turned on?</a><br>
-  <a href="#4.12">4.12. On startup I get a message that says "Detected a legacy nano history file".  Now older nano versions can't find my search history!</a></p></blockquote>
-<h2><a href="#5">5. Internationalization</a></h2>
-<blockquote><p><a href="#5.1">5.1. There's no translation for my language!</a><br>
+  <a href="#4.12">4.12. On startup I get a message that says "Detected a legacy nano history file".  Now older nano versions can't find my search history!</a>
+</p></blockquote>
+<h3><a href="#5">5. Internationalization</a></h3>
+<blockquote><p>
+  <a href="#5.1">5.1. There's no translation for my language!</a><br>
  <a href="#5.2">5.2. I don't like the translation for &lt;x&gt; in my language. How can I fix it?</a><br>
-  <a href="#5.3">5.3. What is the status of Unicode support?</a></p></blockquote>
-<h2><a href="#6">6. Advocacy and Licensing</a></h2>
-<blockquote><p><a href="#6.1">6.1. Why should I use nano instead of Pico?</a><br>
+  <a href="#5.3">5.3. What is the status of Unicode support?</a>
+</p></blockquote>
+<h3><a href="#6">6. Advocacy and Licensing</a></h3>
+<blockquote><p>
+  <a href="#6.1">6.1. Why should I use nano instead of Pico?</a><br>
  <a href="#6.2">6.2. Why should I use Pico instead of nano?</a><br>
  <a href="#6.3">6.3. What is so bad about the older Pine license?</a><br>
-  <a href="#6.4">6.4. Okay, well, what mail program should I use then?</a></p></blockquote>
-<h2><a href="#7">7. Miscellaneous</a></h2>
-<blockquote><p><a href="#7.1">7.1. nano-related mailing lists.</a><br>
-  <a href="#7.2">7.2. I want to send the development team a big load of cash (or just a thank you).</a><br>
-  <a href="#7.3">7.3. How do I submit a bug report or patch?</a><br>
+  <a href="#6.4">6.4. Okay, well, what mail program should I use then?</a>
+</p></blockquote>
+<h3><a href="#7">7. Miscellaneous</a></h3>
+<blockquote><p>
+  <a href="#7.1">7.1. Where can I ask questions or send suggestions?</a><br>
+  <a href="#7.2">7.2. How do I submit a bug report or patch?</a><br>
+  <a href="#7.3">7.3. I want to send the development team a big load of cash (or just a thank you).</a><br>
  <a href="#7.4">7.4. How do I join the development team?</a><br>
-  <a href="#7.5">7.5. Can I have write access to the GIT tree?</a></p></blockquote>
-<h2><a href="#8">8. ChangeLog</a></h2>
+  <a href="#7.5">7.5. Can I have write access to the GIT tree?</a>
+</p></blockquote>
 <hr width="100%">

 <h1><a name="1"></a>1. General</h1>
-<h2><a name="1.1"></a>1.1 About this FAQ</h2>
-<blockquote><p>This FAQ was originally written and maintained by Chris Allegretta &lt;<a href="mailto:chrisa@asty.org">chrisa@asty.org</a>&gt;, who also happens to be the creator of nano. It was then maintained by David Lawrence Ramsey &lt;<a href="mailto:pooka109@gmail.com">pooka109@gmail.com</a>&gt;. Maybe someone else will volunteer to maintain this FAQ someday, who knows...</p></blockquote>
-<h2><a name="1.2"></a>1.2. How do I contribute to it?</h2>
-<blockquote><p>Your best bet is to send it to the nano email address, <a href="mailto:nano@nano-editor.org">nano@nano-editor.org</a> and if it is useful enough it will be included in future versions.</p></blockquote>
-<h2><a name="1.3"></a>1.3. What is GNU nano?</h2>
+<h3><a name="1.1"></a>1.1. What is GNU nano?</h3>
 <blockquote><p>GNU nano is designed to be a free replacement for the Pico text editor, part of the Pine email suite from <a href="http://www.washington.edu/pine/">The University of Washington</a>. It aims to &quot;emulate Pico as closely as possible and then include extra functionality&quot;.</p></blockquote>
-<h2><a name="1.4"></a>1.4. What is the history behind nano?</h2>
+<h3><a name="1.2"></a>1.2. What is the history behind nano?</h3>
 <blockquote><p>Funny you should ask!</p>
  <p><b>In the beginning...</b></p>
  <p>For years Pine was THE program used to read email on a Unix system. The Pico text editor is the portion of the program one would use to compose his or her mail messages. Many beginners to Unix flocked to Pico and Pine because of their well organized, easy to use interfaces. With the proliferation of GNU/Linux in the mid to late 90's, many University students became intimately familiar with the strengths (and weaknesses) of Pine and Pico.</p>
@@ -79,30 +88,30 @@
  <p>It was in late 1999 when Chris Allegretta (our hero) was yet again complaining to himself about the less-than-perfect license Pico was distributed under, the 1000 makefiles that came with it and how just a few small improvements could make it the Best Editor in the World (TM). Having been a convert from Slackware to Debian, he missed having a simple binary package that included Pine and Pico, and had grown tired of downloading them himself.</p>
  <p>Finally something snapped inside and Chris coded and hacked like a madman for many hours straight one weekend to make a (barely usable) Pico clone, at the time called TIP (Tip Isn't Pico). The program could not be invoked without a filename, could not save files, had no help text display, spell checker, and so forth. But over time it improved, and with the help of a few great coders it matured to the (hopefully) stable state it is in today.</p>
  <p>In February 2001, nano was declared an official GNU program by Richard Stallman. nano also reached its first production release on March 22, 2001.</p></blockquote>
-<h2><a name="1.5"></a>1.5. Why the name change from TIP?</h2>
+<h3><a name="1.3"></a>1.3. Why the name change from TIP?</h3>
 <blockquote><p>On January 10, 2000, TIP was officially renamed to nano because of a namespace conflict with another program called 'tip'. The original 'tip' program &quot;establishes a full duplex terminal connection to a remote host&quot;, and was included with many older Unix systems (and newer ones like Solaris). The conflict was not noticed at first because there is no 'tip' utility included with most GNU/Linux distributions (where nano was developed).</p></blockquote>
-<h2><a name="1.6"></a>1.6. What is the current version of nano?</h2>
-<blockquote><p>The current version of nano <i>should</i> be <b>2.7.5</b>.  Of course, you should always check the <a href="https://nano-editor.org/">nano homepage</a> to see what the latest and greatest version is.</p></blockquote>
-<h2><a name="1.7"></a>1.7. I want to read the man page without having to download the program!</h2>
+<h3><a name="1.4"></a>1.4. What is the current version of nano?</h3>
+<blockquote><p>The current version of nano <i>should</i> be <b>2.9.5</b>.  Of course, you should always check the <a href="https://nano-editor.org/">nano homepage</a> to see what the latest and greatest version is.</p></blockquote>
+<h3><a name="1.5"></a>1.5. I want to read the man page without having to download the program!</h3>
 <blockquote><p>Jeez, demanding, aren't we? Okay, look <a href="https://nano-editor.org/dist/latest/nano.1.html">here</a>.</p></blockquote>
 <hr width="100%">

 <h1><a name="2"></a>2. Where to get GNU nano.</h1>
-<h2><a name="2.1"></a>2.1. Web sites that carry nano.</h2>
+<h3><a name="2.1"></a>2.1. Web sites that carry nano.</h3>
 <blockquote><p>The nano source tarballs can be downloaded from the following web sites:</p>
  <ul>
    <li><a href="https://nano-editor.org/dist/">https://nano-editor.org/dist/</a></li>
    <li><a href="https://ftp.gnu.org/gnu/nano/">https://ftp.gnu.org/gnu/nano/</a></li>
  </ul>
 </blockquote>
-<h2><a name="2.2"></a>2.2. RPM packages (RedHat, OpenSuse, and derivatives).</h2>
+<h3><a name="2.2"></a>2.2. RPM packages (RedHat, OpenSuse, and derivatives).</h3>
 <blockquote>
  <ul>
    <li><a href="https://kojipkgs.fedoraproject.org//packages/nano/">https://kojipkgs.fedoraproject.org//packages/nano/</a></li>
    <li><a href="https://software.opensuse.org/package/nano">https://software.opensuse.org/package/nano</a></li>
  </ul>
 </blockquote>
-<h2><a name="2.3"></a>2.3. Deb packages (Debian and derivatives):</h2>
+<h3><a name="2.3"></a>2.3. Deb packages (Debian and derivatives):</h3>
 <blockquote><p>Debian users can check out the current nano packages for:</p>
  <ul>
    <li><a href="http://packages.debian.org/stable/editors/nano">stable</a></li>
@@ -111,14 +120,14 @@
  </ul>
  <p>You can also have a look at the <a href="ftp://ftp.debian.org/debian/pool/main/n/nano/">Package Pool</a> to see all the available binary and source packages.</p>
 </blockquote>
-<h2><a name="2.4"></a>2.4. By GIT (for the brave).</h2>
+<h3><a name="2.4"></a>2.4. By GIT (for the brave).</h3>
 <blockquote><p>For the 'bleeding edge' current version of nano, you can use GIT to download the current source code. <b>Note:</b> believe it or not, by downloading code that has not yet stabilized into an official release, there could quite possibly be bugs, in fact the code may not even compile! Anyway, see <a href="http://git.savannah.gnu.org/cgit/nano.git/tree/README.GIT">the nano GIT document</a> for info on anonymous GIT access to the nano source.</p></blockquote>
 <hr width="100%">

 <h1><a name="3"></a>3. Installation and Configuration</h1>
-<h2><a name="3.1"></a>3.1. How do I install the RPM or DEB package?</h2>
+<h3><a name="3.1"></a>3.1. How do I install the RPM or DEB package?</h3>
 <blockquote><p>It's simple really! As root, type <b>rpm -Uvh nano-x.y.z-1.i386.rpm</b> if you have a RedHat-ish system or <b>dpkg -i nano_x.y.z-1.deb</b> if you have a Debian-ish system, where <b>x.y.z</b> is the release of nano. There are other programs to install packages, and if you wish to use those, knock yourself out.</p></blockquote>
-<h2><a name="3.2"></a>3.2. Compiling from source: WHAT THE HECK DO I DO NOW?</h2>
+<h3><a name="3.2"></a>3.2. Compiling from source: WHAT THE HECK DO I DO NOW?</h3>
 <blockquote><p>Okay, take a deep breath, this really isn't hard. Unpack the nano source with a command like:</p>
  <p><b>tar -xvf nano-x.y.z.tar.gz</b></p>
  <p>Then you need to run <b>configure</b> with any options you might want (if any).</p>
@@ -127,74 +136,80 @@
  <b>./configure</b><br>
  <b>make</b><br>
  <b>make install</b> (as root, of course)</p></blockquote>
-<h2><a name="3.3"></a>3.3. Why does everything go into /usr/local?</h2>
+<h3><a name="3.3"></a>3.3. Why does everything go into /usr/local?</h3>
 <blockquote><p>Well, that's what the <b>configure</b> script defaults to. If you wish to change this, simply do this:</p>
  <p><b>./configure --prefix=/usr</b></p>
  <p>to put nano into /usr/bin when you run <b>make install</b>.</p></blockquote>
-<h2><a name="3.5"></a>3.5. nano should automatically run strip on the binary when installing it!</h2>
+<h3><a name="3.5"></a>3.5. nano should automatically run strip on the binary when installing it!</h3>
 <blockquote><p>Actually, it does, but you have to use <b>make install-strip</b>. The default make install does not, and will not, run strip automatically.</p></blockquote>
-<h2><a name="3.6"></a>3.6. How can I make the executable smaller? This is too bloated!</h2>
+<h3><a name="3.6"></a>3.6. How can I make the executable smaller? This is too bloated!</h3>
 <blockquote><p>Actually, there are several parts of the editor that can be disabled. You can pass arguments to the <b>configure</b> script that disable certain features. Here's a brief list:</p>
  <pre>
  <b>--disable-browser</b>       Disable the built-in file browser
  <b>--disable-color</b>         Disable color and syntax highlighting
-  <b>--disable-extra</b>         Disable extra features (currently only an easter egg)
-  <b>--disable-help</b>          Disable help functions
+  <b>--disable-comment</b>       Disable the comment/uncomment function
+  <b>--disable-extra</b>         Disable the easter egg
+  <b>--disable-help</b>          Disable the built-in help texts
  <b>--disable-histories</b>     Disable the saving of search strings and cursor positions
-  <b>--disable-justify</b>       Disable justify/unjustify functions
+  <b>--disable-justify</b>       Disable the justify/unjustify functions
  <b>--disable-libmagic</b>      Disable the use of libmagic for determining a file's syntax
+  <b>--disable-linenumbers</b>   Disable line numbering
  <b>--disable-mouse</b>         Disable mouse support
-  <b>--disable-multibuffer</b>   Disable having multiple file buffers open
+  <b>--disable-multibuffer</b>   Disable the opening of multiple file buffers
  <b>--disable-nanorc</b>        Disable the use of .nanorc files
  <b>--disable-operatingdir</b>  Disable the setting of an operating directory
-  <b>--disable-speller</b>       Disable spell checker functions
-  <b>--disable-tabcomp</b>       Disable tab completion functions
-  <b>--disable-wordcomp</b>      Disable the word completion function
+  <b>--disable-speller</b>       Disable the spell-checker functions
+  <b>--disable-tabcomp</b>       Disable the tab-completion functions
+  <b>--disable-wordcomp</b>      Disable the word-completion function
  <b>--disable-wrapping</b>      Disable all hard-wrapping of text</pre>
  <p>There's also the <b>--enable-tiny</b> option which disables everything above, as well as some larger chunks of the program (like the marker code that you use with Control-^ to select text). Also, if you know you aren't going to be using other languages, you can use <b>--disable-nls</b> to disable internationalization and save a few K to a few dozen K depending on whether you have locale support on your system. And finally, there's always good old <b>strip</b> to strip all debugging code and code that exists in libraries on your system.</p>
  <p>With <b>--disable-wrapping-as-root</b> you can disable any hard-wrapping by default when the user is root, useful to prevent accidentally changing long lines in system configuration files.</p>
 </blockquote>
-<h2><a name="3.7"></a>3.7. Tell me more about this multibuffer stuff!</h2>
-<blockquote><p>To use multiple file buffers, you must not have configured nano with <b>--disable-multibuffer</b> nor with <b>--enable-tiny</b> (use <b>nano -V</b> to check the compilation options). Then when you want to insert a file into its own buffer instead of into the current file, just hit <b>Meta-F</b>, then insert the file as normal with <b>^R</b>. If you always want files to be loaded into their own buffers, use the <b>--multibuffer</b> or <b>-F</b> flag when you invoke nano.</p>
-  <p>You can move between the buffers you have open with the <b>Meta-&lt;</b> and <b>Meta-&gt;</b> keys, or more easily without holding Shift: <b>Meta-,</b> and <b>Meta-.</b> (clear as mud, right? =-). When you have more than one file buffer open, the ^X shortcut will say &quot;Close&quot;, instead of the normal &quot;Exit&quot; when only one buffer is open.</p></blockquote>
-<h2><a name="3.8"></a>3.8. Tell me more about this verbatim input stuff!</h2>
-<blockquote><p>When you want to insert a literal character into the file you're editing, such as a control character that nano usually treats as a command, first press <b>Meta-V</b> (if you're not at a prompt, you'll get the message &quot;Verbatim Input&quot; on the statusbar), then press the key(s) that generate the character you want.</p>
-  <p>Alternatively, if you've enabled Unicode support (see section <a href="#5.3">5.3</a>), you can press <b>Meta-V</b> and then type a six-digit hexadecimal code (from 000000 to 10FFFF, case-insensitive), and the character with the corresponding value will be inserted. The statubar will change to &quot;Unicode Input: ......&quot; when you do this.</p></blockquote>
-<h2><a name="3.9a"></a>3.9a. How do I make a .nanorc file that will be read when I start nano?</h2>
+<h3><a name="3.7"></a>3.7. Tell me more about this multibuffer stuff!</h3>
+<blockquote><p>To use multiple file buffers, you must not have configured nano with <b>--disable-multibuffer</b> nor with <b>--enable-tiny</b> (use <b>nano -V</b> to check the compilation options). Then when you want to insert a file into its own buffer instead of into the current file, just hit <b>Meta-F</b> after typing <b>^R</b>. If you always want files to be loaded into their own buffers, use the <b>-F</b> or <b>--multibuffer</b> flag when you invoke nano, or add <b>set multibuffer</b> to your .nanorc file.</p>
+  <p>You can move between the buffers you have open with the <b>Meta-&lt;</b> and <b>Meta-&gt;</b> keys, or more easily without holding Shift: <b>Meta-,</b> and <b>Meta-.</b> (clear as mud, right? =-). When you have more than one buffer open, the ^X shortcut will say &quot;Close&quot;, instead of &quot;Exit&quot;.</p></blockquote>
+<h3><a name="3.8"></a>3.8. Tell me more about this verbatim input stuff!</h3>
+<blockquote><p>When you want to insert a literal character into the file you're editing, such as a control character that nano usually treats as a command, first press <b>Meta-V</b> (if you're not at a prompt, you'll get the message &quot;Verbatim Input&quot; on the status bar), then press the key(s) that generate the character you want.</p>
+  <p>Alternatively, if Unicode support is enabled (see section <a href="#5.3">5.3</a>), you can press <b>Meta-V</b> and then type a six-digit hexadecimal code (from 000000 to 10FFFF, case-insensitive), and the character with the corresponding value will be inserted. The status bar will change to &quot;Unicode Input: ......&quot; when you do this.</p></blockquote>
+<h3><a name="3.9a"></a>3.9a. How do I make a .nanorc file that will be read when I start nano?</h3>
 <blockquote><p>It's not hard at all! But, your nano must <b>not</b> have been compiled with <b>--disable-nanorc</b>. Then simply copy the <b>sample.nanorc</b> that came with the nano source or your nano package (most likely in /usr/doc/nano) to .nanorc in your home directory. If you didn't get one, the syntax of the file is simple. Flags are turned on and off by using the words <b>set</b> and <b>unset</b> plus the long option name for the feature. For example, &quot;set nowrap&quot; or &quot;set smarthome&quot;.</p></blockquote>
-<h2><a name="3.9b"></a>3.9b. How about in Win32?</h2>
+<h3><a name="3.9b"></a>3.9b. How about in Win32?</h3>
 <blockquote><p>If you're using the official nano .zip file and have extracted all the files, you should take the file nano.rc and place it somewhere on your Win32 system (for example, if you have write permission to do so, at the top of C:\).  Then you must create an Environment variable called HOME which points to the directory where you put nano.rc.  In Windows XP, you can get to Environment variables by right-clicking "My Computer" either on the desktop or in the Start Menu, and selecting Properties.  This should bring up the System Properties panel.  Then click the Advanced Tab, and there should be a button called Environment Variables.  Click that to bring up the Environment Variables section. Now, under User Variables you should be able to click the New button, and make a new Variables Name called HOME, with the Variable Value of whatever path you copied nano.rc into (just the directory name; don't add nano.rc onto the end).</p>
  <p>We're still working on documentation for enabling syntax highlighting on Win32; please bear with us.</p>
  <p>Note that the nano.rc file must remain Unix-formatted in order for nano to understand it.  In other words, you should probably use only nano to edit its config file.  Other programs like Wordpad and Notepad will convert the file to DOS format when saving, and the latter does not even properly read Unix-formatted files to begin with.</p></blockquote>
 <hr width="100%">

 <h1><a name="4"></a>4. Running</h1>
-<h2><a name="4.1"></a>4.1. How do I open a file with a name beginning with '+' from the command line?</h2>
+<h3><a name="4.1"></a>4.1. How do I open a file with a name beginning with '+' from the command line?</h3>
 <blockquote><p>If a command-line option that begins with '+' is followed by another option, the former is always treated as a starting line and column number, and the latter is always treated as a filename. If a command-line option that begins with '+' isn't followed by another option, it's always treated as a filename. Examples:</p>
  <p>To open '+filename.txt' starting on line 1: <b>nano +filename.txt</b><br>
  To open '+filename.txt' starting on line 10: <b>nano +10 +filename.txt</b><br>
  To open '+filename.txt' starting on line 1, column 20: <b>nano +,20 +filename.txt</b><br>
  To open '+filename.txt' starting on line 10, column 20: <b>nano +10,20 +filename.txt</b><br>
  To open '+filename.txt' starting on line 1 and 'filename.txt' starting on line 40 (if nano has been compiled with multibuffer support): <b>nano +1 +filename.txt +40 filename.txt</b></p></blockquote>
-<h2><a name="4.2"></a>4.2. Ack! My Backspace/Delete/Enter/Meta/double bucky key doesn't seem to work! What can I do?</h2>
+<h3><a name="4.2"></a>4.2. Ack! My Backspace/Delete/Enter/Meta/double bucky key doesn't seem to work! What can I do?</h3>
 <blockquote><p>Try setting your $TERM variable to 'vt100'. nano doesn't yet support every term entry under the sun.</p>
  <p>Bourne shell users (bash and sh): <b>export TERM=vt100</b><br>
  C Shell users (tcsh and csh): <b>setenv TERM vt100</b></p></blockquote>
-<h2><a name="4.3"></a>4.3. Ack! My numeric keypad's keys don't work properly when NumLock is off! What can I do?</h2>
+<h3><a name="4.3"></a>4.3. Ack! My numeric keypad's keys don't work properly when NumLock is off! What can I do?</h3>
 <blockquote><p>You can use the <b>-K</b> or <b>--rebindkeypad</b> option on the command line, or add the line <b>set rebindkeypad</b> to your .nanorc. However, nano's mouse support won't work properly if you do any of these things.</p></blockquote>
-<h2><a name="4.4"></a>4.4. Ack! When I hold down a Meta key combination for a while, the character of the held key gets inserted now and then. What gives?</h2>
-<blockquote><p>This is a bug in the terminal, not in nano. When a key is repeating faster than nano can process it, the keyboard buffer becomes full and starts dropping incoming keystrokes. Unfortunately, it doesn't just drop whole keystrokes; it can also drop parts of multibyte key combinations, resulting in nano's receiving a wrong key.</p></blockquote>
-<h2><a name="4.5"></a>4.5. How do I type the F13-F16 keys shown in the help browser? My keyboard only has F1-F12!</h2>
+<h3><a name="4.4"></a>4.4. Ack! When I hold down a Meta key combination for a while, the character of the held key gets inserted now and then. What gives?</h3>
+<blockquote><p>This was a bug in how nano handled consecutive escape sequences. It should be fixed since version 2.6.0.</p></blockquote>
+<h3><a name="4.5"></a>4.5. How do I type the F13-F16 keys listed in the help viewer? My keyboard only has F1-F12!</h3>
 <blockquote><p>It depends on the terminal type you're using. On some terminals, such as the FreeBSD console, xterm, konsole, and gnome-terminal, Shift-F1 to Shift-F4 will generate F13 to F16. On other terminals, such as the Linux console, rxvt, and Eterm, Shift-F3 to Shift-F6 will generate F13 to F16.</p></blockquote>
-<h2><a name="4.6"></a>4.6. nano crashes when I type &lt;insert keystroke here&gt;!</h2>
+<h3><a name="4.6"></a>4.6. nano crashes when I type &lt;insert keystrokes here&gt;!</h3>
 <blockquote><p>If you aren't trying some bizarre keystroke combination with some bizarre $TERM entry, chances are you have found a bug. You are welcome to submit it to the <a href="mailto:nano-devel@gnu.org">nano-devel</a> list or in the <a href="https://savannah.gnu.org/bugs/?group=nano">bug tracker</a> on Savannah.</p></blockquote>
-<h2><a name="4.7"></a>4.7. nano crashes when I resize my window. How can I fix that?</h2>
+<h3><a name="4.7"></a>4.7. nano crashes when I resize my window. How can I fix that?</h3>
 <blockquote><p>Older versions of nano had this problem.  Please upgrade to version 2.7.0 or newer.</p></blockquote>
-<h2><a name="4.8"></a>4.8. When I paste text into a document, each line gets indented further than the last. Why does nano do this, and how can I avoid it?</h2>
-<blockquote><p>You have the autoindent feature turned on. Hit Meta-I to turn it off, paste your text, and then hit Meta-I again to turn it back on.</p></blockquote>
-<h2><a name="4.9"></a>4.9. I've compiled nano with color support, but I don't see any color when I run it!</h2>
-<blockquote><p>If you want nano to actually use color, you have to specify the color configurations you want it to use in your .nanorc. Several example configurations are in the <b>doc/syntax</b> subdirectory of the nano source, which are normally installed to <b>/usr/local/share/nano</b>. To enable all of them, uncomment the line <b># include "/usr/local/share/nano/*.nanorc"</b> in your nanorc. See also section <a href="#3.9a">3.9a</a>.</p></blockquote>
-<h2><a name="4.10"></a>4.10. How do I make nano my default editor (in Pine, mutt, etc.)?</h2>
+<h3><a name="4.8a"></a>4.8a. With what keystroke can I paste text from the clipboard into nano?</h3>
+<blockquote><p>In most desktop environments <b>Shift+Insert</b> will paste the contents of the clipboard.</p></blockquote>
+<h3><a name="4.8b"></a>4.8b. When I paste text into a document, each line gets indented further than the last. Why? And how can I stop this?</h3>
+<blockquote><p>You have the <i>autoindent</i> feature turned on. Hit <b>Meta-I</b> to turn it off, paste your text, and then hit <b>Meta-I</b> again to turn it back on.</p></blockquote>
+<h3><a name="4.8c"></a>4.8c. When I paste from Windows into a remote nano, nano rewraps the lines. What gives?</h3>
+<blockquote><p>When pasting from Windows, in some situations linefeeds are sent instead of carriage returns (Enters). And linefeeds are <b>^J</b>s, which make nano justify (rewrap) the current paragraph. To prevent these linefeeds from causing these unwanted justifications, add this line to your .nanorc on the remote Linux box: <b>unbind ^J main</b> or <b>bind ^J enter main</b>, depending on whether the paste contains CR + LF or only LF.</p></blockquote>
+<h3><a name="4.9"></a>4.9. I've compiled nano with color support, but I don't see any color when I run it!</h3>
+<blockquote><p>If you want nano to actually use color, you have to specify the color configurations you want it to use in your .nanorc. Several example configurations are in the <b>syntax/</b> subdirectory of the nano source, which are normally installed to <b>/usr/local/share/nano/</b>. To enable all of them, uncomment the line <b># include "/usr/local/share/nano/*.nanorc"</b> in your nanorc. See also section <a href="#3.9a">3.9a</a>.</p></blockquote>
+<h3><a name="4.10"></a>4.10. How do I make nano my default editor (in Pine, mutt, etc.)?</h3>
 <blockquote><p>You need to make nano your $EDITOR. If you want this to be saved, you should put a line like this in your <b>.bashrc</b> if you use bash (or <b>.zshrc</b> if you believe in zsh):</p>
  <p><b>export EDITOR=/usr/local/bin/nano</b></p>
  <p>or, if you use tcsh, put this in your <b>.cshrc</b> file:</p>
@@ -207,125 +222,55 @@
  <p>If you're a mutt user, you should see an effect immediately the next time you log in. No further configuration is needed. However, if you want to let people know you use nano to compose your email messages, you can put a line like this in your <b>.muttrc</b>:</p>
  <p><b>my_hdr X-Composer: nano x.y.z</b></p>
  <p>Again, replace x.y.z with the version of nano you use.</p></blockquote>
-<h2><a name="4.11"></a>4.11. How do I select text for or paste text from the clipboard in an X terminal when I'm running nano in one and nano's mouse support is turned on?</h2>
+<h3><a name="4.11"></a>4.11. How do I select text for or paste text from the clipboard in an X terminal when I'm running nano in one and nano's mouse support is turned on?</h3>
 <blockquote><p>Try holding down the Shift key and selecting or pasting the text as you normally would.</p></blockquote>
-<h2><a name="4.12"></a>4.12. On startup I get a message that says "Detected a legacy nano history file".  Now older nano versions can't find my search history!</h2>
+<h3><a name="4.12"></a>4.12. On startup I get a message that says "Detected a legacy nano history file".  Now older nano versions can't find my search history!</h3>
 <blockquote><p>In nano 2.3.0, cursor-position history was introduced, and both history files now reside in a .nano subdirectory in your home directory.  A newer nano will move an existing search-history file to this new location so it can continue to be used.  This means that if you then try and use an earlier version of nano, it will be unable to see your current search history.  To fix this, run the following command:</p>
  <p><b>ln -sf ~/.nano/search_history ~/.nano_history</b></p>
-  <p>The "migration service" (moving the search-history file to its new location) will be deleted from nano in early 2018.</p></blockquote>
+  <p>The "migration service" (moving the search-history file to its new location) has been deleted from nano in late 2017, since version 2.9.0.  The search-history and position-history files will now be looked for first in ~/.nano/ and, when not found there, then in ~/.local/share/nano/.</p></blockquote>
 <hr width="100%">

 <h1><a name="5"></a>5. Internationalization</h1>
-<h2><a name="5.1"></a>5.1. There's no translation for my language!</h2>
+<h3><a name="5.1"></a>5.1. There's no translation for my language!</h3>
 <blockquote><p>In June 2001, GNU nano entered the <a href="http://translationproject.org/html/welcome.html">Translation Project</a> and since then, translations should be managed from there.</p>
  <p>If there isn't a translation for your language, you could ask <a href="http://translationproject.org/team/">your language team</a> to translate nano, or better still, join that team and do it yourself. Joining a team is easy. You just need to ask the team leader to add you, and then send a <a href="http://translationproject.org/disclaim.txt">translation disclaimer to the FSF</a> (this is necessary as nano is an official GNU package, but it does <b>not</b> mean that you transfer the rights of your work to the FSF, it's just so the FSF can legally manage them).</p>
-  <p>In any case, translating nano is very easy. Just grab the latest <b>nano.pot</b> file listed on <a href="http://translationproject.org/domain/nano.html">nano's page</a> at the TP, and translate each <b>msgid</b> line into your native language on the <b>msgstr</b> line. When you're done, you should send it to the TP's central po repository.</p></blockquote>
-<h2><a name="5.2"></a>5.2. I don't like the translation for &lt;x&gt; in my language. How can I fix it?</h2>
-<blockquote><p>The best way would probably be to send an e-mail to the team's mailing listed mentione in the <code>Language-Team:</code> field in the <b>&lt;your_language&gt;.po</b> file with your suggested corrections, and then they can make the changes reach the nano-devel list.</p></blockquote>
-<h2><a name="5.3"></a>5.3. What is the status of Unicode support?</h2>
-<blockquote><p>Since versions 1.3.12, Unicode should be usable. With your terminal, locale (LC_ALL and similar environment variables), and encoding configured to properly support UTF-8, you should be able to enter and save Unicode text.</p></blockquote>
+  <p>In any case, translating nano is easy. Just grab the latest <b>nano.pot</b> file listed on <a href="http://translationproject.org/domain/nano.html">nano's page</a> at the TP, and translate each <b>msgid</b> line into your native language on the <b>msgstr</b> line. When you're done, you should send it to the TP's central PO-file repository.</p></blockquote>
+<h3><a name="5.2"></a>5.2. I don't like the translation for &lt;x&gt; in my language. How can I fix it?</h3>
+<blockquote><p>The best way is to send an e-mail with your suggested corrections to the team's mailing list. The address is mentioned in the <code>Language-Team:</code> field in the relevant PO file. The team leader or the assigned translator can then make the changes reach the nano-devel list.</p></blockquote>
+<h3><a name="5.3"></a>5.3. What is the status of Unicode support?</h3>
+<blockquote><p>Unicode should be fully usable nowadays. When the encoding of your terminal is set to UTF-8, and your locale (mainly the LANG environment variable) is UTF-8 too, then you should be able to read, enter and save Unicode text.</p></blockquote>
 <hr width="100%">

 <h1><a name="6"></a>6. Advocacy and Licensing</h1>
-<h2><a name="6.1"></a>6.1. Why should I use nano instead of Pico?</h2>
+<h3><a name="6.1"></a>6.1. Why should I use nano instead of Pico?</h3>
 <blockquote><p>There are many reasons to use nano instead of Pico. A more complete list can be found at the <a href="https://nano-editor.org/">nano homepage</a>.</p></blockquote>
-<h2><a name="6.2"></a>6.2. Why should I use Pico instead of nano?</h2>
-<blockquote><p>Again, check out the <a href="https://nano-editor.org/">nano homepage</a> for a good summary of reasons. It really is a matter of personal preference as to which editor you should use. If you're the type of person who likes using the original version of a program, then Pico is the editor for you. If you don't mind sacrificing mailer integration with Pine, and are looking for a few more features, as well as a 'better' license in terms of adding your own changes, nano is the way to go.</p><p>Note that the last of these no longer applies to the new version of Pine, <a href="http://www.washington.edu/alpine/">Alpine</a>, which is under the Apache License, version 2.0.</p></blockquote>
-<h2><a name="6.3"></a>6.3. What is so bad about the older Pine license?</h2>
+<h3><a name="6.2"></a>6.2. Why should I use Pico instead of nano?</h3>
+<blockquote><p>Again, check out the <a href="https://nano-editor.org/">nano homepage</a> for a good summary of reasons. It really is a matter of personal preference as to which editor you should use. If you're the type of person who likes using the original version of a program, then Pico is the editor for you. If you don't mind sacrificing mailer integration with Pine, and are looking for a few more features, as well as a 'better' license in terms of adding your own changes, nano is the way to go.</p>
+<p>Note that the last of these no longer applies to the new version of Pine, <a href="http://www.washington.edu/alpine/">Alpine</a>, which is under the Apache License, version 2.0.</p></blockquote>
+<h3><a name="6.3"></a>6.3. What is so bad about the older Pine license?</h3>
 <blockquote><p>The U of W license for older versions of Pine and Pico is not considered truly Free Software according to both the Free Software Foundation and the <a href="http://www.debian.org/social_contract#guidelines">Debian Free Software Guidelines</a>. The main problem regards the limitations on distributing derived works: according to UW, you can distribute their software, and you can modify it, but you can not do both, i.e. distribute modified binaries.</p></blockquote>
-<h2><a name="6.4"></a>6.4. Okay, well, what mail program should I use then?</h2>
-<blockquote><p>If you are looking to use a Free Software program similar to Pine, and Emacs is not your thing, you should definitely take a look at <a href="http://www.mutt.org/">mutt</a>. It is a full-screen, console based mail program that actually has a lot more flexibility than Pine, but has a keymap included in the distribution that allows you to use the same keystrokes as Pine would to send and receive mail. It's also under the GNU General Public License, version 2.0.<P>
-Of course, due to the license change you can now use the <A HREF="http://www.washington.edu/alpine/">Alpine distribution</A> of PINE as it is now considered Free Software, but you would be sacrificing many of nano's features to do so.</p></blockquote>
+<h3><a name="6.4"></a>6.4. Okay, well, what mail program should I use then?</h3>
+<blockquote><p>If you are looking to use a Free Software program similar to Pine, and Emacs is not your thing, you should definitely take a look at <a href="http://www.mutt.org/">mutt</a>. It is a full-screen, console based mail program that actually has a lot more flexibility than Pine, but has a keymap included in the distribution that allows you to use the same keystrokes as Pine would to send and receive mail. It's also under the GNU General Public License, version 2.0.</p>
+<p>Of course, due to the license change you can now use the <a href="http://www.washington.edu/alpine/">Alpine distribution</a> of PINE as it is now considered Free Software, but you would be sacrificing many of nano's features to do so.</p></blockquote>
 <hr width="100%">

 <h1><a name="7"></a>7. Miscellaneous</h1>
-<h2><a name="7.1"></a>7.1. nano-related mailing lists.</h2>
+<h3><a name="7.1"></a>7.1. Where can I ask questions or send suggestions?</h3>
 <blockquote><p>There are three mailing lists for nano hosted at <a href="http://savannah.gnu.org/">Savannah</a>: info-nano, help-nano and nano-devel. info-nano is a very low traffic list where new versions of nano are announced (surprise!). help-nano is for getting help with the editor without needing to hear all of the development issues surrounding it. nano-devel is a normally low, sometimes high traffic list for discussing the present and future development of nano. Here are links to where you can sign up for a given list:</p>
  <p>info-nano - <a href="http://mail.gnu.org/mailman/listinfo/info-nano/">http://mail.gnu.org/mailman/listinfo/info-nano/</a><br>
  help-nano - <a href="http://mail.gnu.org/mailman/listinfo/help-nano/">http://mail.gnu.org/mailman/listinfo/help-nano/</a><br>
  nano-devel - <a href="http://mail.gnu.org/mailman/listinfo/nano-devel/">http://mail.gnu.org/mailman/listinfo/nano-devel/</a></p></blockquote>
-<h2><a name="7.2"></a>7.2. I want to send the development team a big load of cash (or just a thank you).</h2>
-<blockquote><p>That's fine. Send it <a href="mailto:nano-devel@gnu.org">our way</a>! Better yet, fix a <a href="https://savannah.gnu.org/bugs/?group=nano">bug</a> in the program or implement a <a href="https://nano-editor.org/dist/latest/TODO">cool feature</a> and send us that instead (though cash is fine too).</p></blockquote>
-<h2><a name="7.3"></a>7.3. How do I submit a bug report or patch?</h2>
+<h3><a name="7.2"></a>7.3. How do I submit a bug report or patch?</h3>
 <blockquote>
-  <p>The best place to submit bugs is to the <a href="https://savannah.gnu.org/bugs/?group=nano">Savannah bug tracker</a> as you can check whether the bug you are submitting has already been submitted.
-  <p>Please submit patches for nano via the <a href="https://savannah.gnu.org/patch/?group=nano">Savannah project's patch manager</a> for the nano project.</p></blockquote>
-<h2><a name="7.4"></a>7.4. How do I join the development team?</h2>
+  <p>The best way to submit bugs is through the <a href="https://savannah.gnu.org/bugs/?group=nano">Savannah bug tracker</a>, as you can check whether the bug you are reporting has already been submitted, and it makes it easier for the maintainers to keep track of them.
+  <p>You can submit patches for nano via <a href="https://savannah.gnu.org/patch/?group=nano">Savannah's patch manager</a>.</p></blockquote>
+<h3><a name="7.3"></a>7.3. I want to send the development team a big load of cash (or just a thank you).</h3>
+<blockquote><p>That's fine. Send it <a href="mailto:nano-devel@gnu.org">our way</a>! Better yet, fix a <a href="https://savannah.gnu.org/bugs/?group=nano">bug</a> in the program or implement a <a href="https://nano-editor.org/dist/latest/TODO">cool feature</a> and send us that instead (though cash is fine too).</p></blockquote>
+<h3><a name="7.4"></a>7.4. How do I join the development team?</h3>
 <blockquote><p>The easiest way is to consistently send in good patches that add some needed functionality, fix a bug or two, and/or make the program more optimized/efficient. Then ask nicely and you will probably be added to the Savannah development list and be given write access after a while. There is a lot of responsibility that goes along with being a team member, so don't think it's just something to add to your resume.</p></blockquote>
-<h2><a name="7.5"></a>7.5. Can I have write access to the git tree?</h2>
+<h3><a name="7.5"></a>7.5. Can I have write access to the git tree?</h3>
 <blockquote><p>Re-read section <a href="#7.4">7.4</a> and you should know the answer.</p></blockquote>
 <hr width="100%">

-<h1><a name="8"></a>8. ChangeLog</h1>
-<blockquote><p>
-2017.01.09 - Delete some obsolete items and update a few others. (Benno)<br>
-2016.04.17 - Update docs to refer to GIT instead of subversion. (Mike)<br>
-2015.07.18 - More small fixes and updates. (Benno)<br>
-2014.04.24 - A bunch of small fixes and updates. (Benno)<br>
-2009.11.30 - Update various bits for nano 2.2.x. (DLR)<br>
-2009.11.18 - Typo fix. (j.mader@gmail.com)<br>
-2008.03.16 - Update docs to refer to subversion instead of CVS, add more words about Alpine, and refer to Savannah for bugs and patches. (Chris)<br>
-2007.12.21 - Update maintainer information. (DLR)<br>
-2007.12.09 - Add minor punctuation and wording fixes, and update various sections to account for Alpine. (DLR)<br>
-2007.08.26 - Update links to the Free Translation Project. (DLR)<br>
-2007.07.29 - Update RPM links for nano 2.0.x. (DLR)<br>
-2007.04.18 - Add a new section 4.14 to explain how autoindent affects pasted text. (John M. Gabriele, minor tweaks by DLR)<br>
-2007.04.04 - Update email address. (DLR)<br>
-2007.01.01 - Update section 4.1 to describe how to open files with names beginning with '+' at specified columns as well as lines. (DLR)<br>
-2006.11.25 - Add miscellaneous wording and capitalization fixes. (DLR)<br>
-2006.10.28 - Update various links for the 2.0 branch of nano. (DLR)<br>
-2006.10.06 - Update the question in section 4.13 to match the version of it in the answer section. (DLR)<br>
-2006.07.25 - Update section 5.3 again to not state &quot;the latest development version&quot; before 1.3.12, as it's no longer accurate. Also add some minor spacing fixes. (DLR)<br>
-2006.06.12 - Update section 5.3, due to the display fix for two-column Unicode characters. (DLR)<br>
-2006.06.05 - Add a new section 4.8, and move all section 4 entries after it down one number, to explain how to deal with glibc 2.2.3's crashes involving extended regular expressions. (DLR)<br>
-2006.06.04 - Add minor punctuation, wording, and typo fixes. (DLR)<br>
-2006.05.27 - Update section 3.8 to mention the new "Unicode Input" prompt, and how Unicode input only works when Unicode support is enabled. (DLR)<br>
-2006.05.12 - Remove section 4.4, and move all section 4 entries after it up one number, since it no longer applies. Meta-] and Meta-[ are no longer used to indent and unindent marked text, since they require that the bracket matching key change to Ctrl-], which is used as the telnet escape key (found by Chris). Also, make the link to the nano CVS page a bit more readable. (DLR)<br>
-2006.05.08 - Add a new section 4.5, and move all section 4 entries after it down one number, to explain a problem that can occur when holding down keys to generate Meta sequences. Also add a few more capitalization and wording fixes. (Benno Schulenberg, minor tweaks by DLR)<br>
-2006.05.01 - Add a new section 4.4, and move all section 4 entries after it down one number, to explain how to deal with problems typing Meta-[. Also add a few capitalization and wording fixes. (DLR)<br>
-2006.04.14 - Clarify section 1.4: help menu -> help text display. (DLR, suggested by Benno Schulenberg)<br>
-2006.03.16 - Update the Free Translation Project's address, change the character set to UTF-8, and remove broken links to contributed RedHat nano packages. (DLR)<br>
-2005.11.21 - Clarify section 5.3 to better explain how to enable Unicode support, and remove the mention of quirks, since they turned out to not be a nano problem. (Mike Frysinger and DLR)<br>
-2005.11.19 - Add a new section 5.3 to explain the status of nano's Unicode support. (Mike Frysinger, minor tweaks by DLR)<br>
-2005.08.27 - Update email address. (DLR)<br>
-2005.08.10 - Add a new section 4.3, and move all section 4 entries after it down one number, to explain how to deal with numeric keypad problems. (DLR)<br>
-2005.08.08 - Update section 3.8 to mention that verbatim input mode now takes a six-digit hexadecimal number. (DLR)<br>
-2005.07.04 - Update section 4.10 to mention that pasting from the X clipboard via the middle mouse button also works when the Shift key is used. (DLR)<br>
-2005.06.15 - Update description of --enable-extra, and add missing line breaks. (DLR)<br>
-2005.06.13 - Minor capitalization and wording fixes. (DLR)<br>
-2005.06.08 - Updated section 1.1 to mention the current maintainer. (DLR)<br>
-2005.03.09 - Added question about opening files with names beginning with '+'s, and added a few more miscellaneous cosmetic fixes. (DLR)<br>
-2005.01.03 - Removed now-inaccurate note about verbatim input's not working at prompts, and update its description to mention that it handles hexadecimal values now. (DLR)<br>
-2004.11.21 - Listed sh as an example of a Bourne shell. (DLR)<br>
-2004.11.05 - Fixed inaccuracy: Pico compatibility mode was made the default in nano 1.1.99pre1, not 1.2.2. Also added question about how to type F13-F16 on terminals lacking keys past F12 (suggested by Chris), question about how to select text for the clipboard in X terminals with nano's mouse support turned on (answer found by Joseph Birthisel), and misc. fixes and link updates. (DLR)<br>
-2004.04.07 - Removed NumLock glitch question, as it's no longer needed. (DLR)<br>
-2004.01.30 - Fixed inaccuracy: multibuffer mode was first in nano 1.1.0, not 1.1.12. (DLR)<br>
-2003.12.31 - Added question about the new verbatim input function, and a few minor fixes. Removed reference to &quot;set pico&quot; (DLR).<br>
-2003.07.02 - Added question about nano's not showing color when it's compiled with color support (DLR; suggested by Jordi).<br>
-2003.02.23 - Updated RPM links for nano 1.2.x (DLR).<br>
-2003.01.16 - Split section 4.5 into 4.5a and 4.5b for search string behavior. Added --enable-all docs.<br>
-2002.12.28 - More misc. fixes (David Benbennick, DLR).<br>
-2002.10.25 - Misc. fixes and link updates (DLR).<br>
-2002.09.10 - Another typo fix (DLR).<br>
-2002.05.15 - Typo fix (DLR).<br>
-2001.12.26 - Misc. fixes (Aaron S. Hawley, DLR).<br>
-2001.10.02 - Update for Free Translation Project.<br>
-2001.10.02 - Assorted fixes, Debian additions.<br>
-2001.06.30 - Silly typo fix.<br>
-2001.05.05 - Spelling fixes by David Lawrence Ramsey.<br>
-2001.05.02 - Misc fixes.<br>
-2001.03.26 - Typo fix in an URL.<br>
-2001.02.17 - Advocacy updates.<br>
-2001.02.15 - Added GNU notes for 0.9.99pre3.<br>
-2001.02.06 - Typo fixes.<br>
-2001.01.14 - Added note about NumLock glitch.<br>
-2001.01.10 - Linux -&gt; GNU/Linux.<br>
-2001.01.09 - Added &quot;making exe smaller&quot; section.<br>
-2000.12.19 - Typo and assorted error fixes.<br>
-2000.11.28 - Added blurb about make install-strip.<br>
-2000.11.19 - Changed Debian frozen to stable.<br>
-2000.11.18 - Previous string display (4.5).<br>
-2000.09.27 - Moved addresses to nano-editor.org.<br>
-2000.06.31 - Initial framework.</p></blockquote>
 </body>
 </html>
--- a/doc/nano.1
+++ b/doc/nano.1
@@ -1,5 +1,4 @@
-.\" Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007,
-.\" 2009, 2010, 2013, 2014 Free Software Foundation, Inc.
+.\" Copyright (C) 1999-2011, 2013-2017 Free Software Foundation, Inc.
 .\"
 .\" This document is dual-licensed.  You may distribute and/or modify it
 .\" under the terms of either of the following licenses:
@@ -17,8 +16,7 @@
 .\"   Documentation License along with this program.  If not, see
 .\"   <http://www.gnu.org/licenses/>.
 .\"
-.TH NANO 1 "version 2.7.5" "February 2017"
-.\" Please adjust this date whenever revising the manpage.
+.TH NANO 1 "version 2.9.5" "March 2018"

 .SH NAME
 nano \- Nano's ANOther editor, an enhanced free Pico clone
@@ -28,18 +26,17 @@ nano \- Nano's ANOther editor, an enhanced free Pico clone
 .RI [ options "] [[+" line [, column "]]\ " file "]..."

 .SH DESCRIPTION
-\fBnano\fP is a small, free and friendly editor which aims to replace
-Pico, the default editor included in the non-free Pine package.  On
-top of copying Pico's look and feel, \fBnano\fP also implements some
-missing (or disabled by default) features in Pico, such as "search and
-replace" and "go to line and column number".
+\fBnano\fP is a small and friendly editor.  It copies the look and feel
+of Pico, but is free software, and implements several features that Pico
+lacks, such as: opening multiple files, scrolling per line, undo/redo,
+syntax coloring, line numbering, and soft-wrapping overlong lines.

-When opening a file, the cursor can be put on a specific line by adding
-the line number with a plus sign (\fB+\fR) before the filename, and even
-in a specific column by adding it with a comma.
+When giving a filename on the command line, the cursor can be put on a
+specific line by adding the line number with a plus sign (\fB+\fR) before
+the filename, and even in a specific column by adding it with a comma.

-If the first file specified is a dash (\fB\-\fR), \fBnano\fR will read
-data from standard input.
+As a special case: if instead of a filename a dash (\fB\-\fR) is given,
+\fBnano\fR will read data from standard input.

 .SH EDITING
 Entering text and moving around in a file is straightforward: typing the
@@ -57,13 +54,13 @@ highlighted), and then use \fB^K\fR to cut it, or \fBM\-6\fR to copy it to the
 cutbuffer.  One can also save the marked text to a file with \fB^O\fR, or
 spell check it with \fB^T\fR.
 .PP
-Since nano-2.7.0, text can also be selected by holding Shift and moving the
-cursor with the arrow keys.  Holding down the Alt key too will increase the
-stride.
+On some terminals, text can be selected also by holding down Shift while
+using the arrow keys.  Holding down the Alt key too will increase the stride.
+Any cursor movement without Shift being held will cancel such a selection.
 .PP
-The two lines at the bottom of the screen show the most important commands;
+The two lines at the bottom of the screen show some important commands;
 the built-in help (\fB^G\fR) lists all the available ones.
-The default key bindings can be changed via the .nanorc file -- see
+The default key bindings can be changed via a \fInanorc\fR file -- see
 .BR nanorc (5).

 .SH OPTIONS
@@ -79,9 +76,9 @@ line.
 When saving a file, back up the previous version of it, using the current
 filename suffixed with a tilde (\fB~\fP).
 .TP
-.BR \-C\ \fIdirectory\fR ", " \-\-backupdir= \fIdirectory
+.BR \-C\ \fIdirectory ", " \-\-backupdir= \fIdirectory
 Make and keep not just one backup file, but make and keep a uniquely
-numbered one every time a file is saved -- when backups are enabled.
+numbered one every time a file is saved -- when backups are enabled (\fB\-B\fR).
 The uniquely numbered files are stored in the specified \fIdirectory\fR.
 .TP
 .BR \-D ", " \-\-boldtext
@@ -91,17 +88,17 @@ Use bold text instead of reverse video text.
 Convert typed tabs to spaces.
 .TP
 .BR \-F ", " \-\-multibuffer
-Enable multiple file buffers (if support for them has been compiled in).
+Read a file into a new buffer by default.
 .TP
 .BR \-G ", " \-\-locking
-Enable vim-style file locking when editing files.
+Use vim-style file locking when editing files.
 .TP
 .BR \-H ", " \-\-historylog
-Log search and replace strings to \fI~/.nano/search_history\fP, so they can be
-retrieved in later sessions.
+Save the last hundred search strings and replacement strings and
+executed commands, so they can be easily reused in later sessions.
 .TP
 .BR \-I ", " \-\-ignorercfiles
-Don't look at the system's \fBnanorc\fP nor at \fB~/.nanorc\fP.
+Don't look at the system's \fInanorc\fR nor at the user's \fInanorc\fR.
 .TP
 .BR \-K ", " \-\-rebindkeypad
 Interpret the numeric keypad keys so that they all work properly.  You
@@ -111,18 +108,21 @@ won't work properly with this option enabled.
 .BR \-L ", " \-\-nonewlines
 Don't add newlines to the ends of files.
 .TP
+.BR \-M ", " \-\-trimblanks
+Snip trailing whitespace from the wrapped line when automatic
+hard-wrapping occurs or when text is justified.
+.TP
 .BR \-N ", " \-\-noconvert
 Disable automatic conversion of files from DOS/Mac format.
 .TP
 .BR \-O ", " \-\-morespace
-Use the blank line below the titlebar as extra editing space.
+Use the blank line below the title bar as extra editing space.
 .TP
 .BR \-P ", " \-\-positionlog
 For the 200 most recent files, log the last position of the cursor,
 and place it at that position again upon reopening such a file.
-(The old form of this option, \fB\-\-poslog\fR, is deprecated.)
 .TP
-.BR "\-Q ""\fIcharacters\fB""" ", " "\-\-quotestr=""" \fIcharacters\fR """
+.BR "\-Q ""\fIcharacters\fB""" ", " "\-\-quotestr=""" \fIcharacters """
 Set the quoting string for justifying.  The default is
 \fB"^([\ \\t]*[#:>\\|}])+"\fP if extended regular expression support is
 available, or \fB">\ "\fP otherwise.  Note that \fB\\t\fP stands for a
@@ -138,16 +138,17 @@ This restricted mode is also accessible by invoking \fBnano\fP
 with any name beginning with 'r' (e.g. "rnano").
 .TP
 .BR \-S ", " \-\-smooth
-Enable smooth scrolling.  Text will scroll line-by-line, instead of the
+Use smooth scrolling: text will scroll line-by-line, instead of the
 usual chunk-by-chunk behavior.
 .TP
-.BR \-T\ \fInumber\fR ", " \-\-tabsize= \fInumber
+.BR \-T\ \fInumber ", " \-\-tabsize= \fInumber
 Set the size (width) of a tab to \fInumber\fP columns.  The value of
 \fInumber\fP must be greater than 0.  The default value is 8.
 .TP
 .BR \-U ", " \-\-quickblank
-Do quick statusbar blanking.  Statusbar messages will disappear after 1
-keystroke instead of 25.  Note that \fB\-c\fP overrides this.
+Do quick status-bar blanking: status-bar messages will disappear after 1
+keystroke instead of 25.  Note that option \fB\-c\fR (\fB\-\-constantshow\fR)
+overrides this.
 .TP
 .BR \-V ", " \-\-version
 Show the current version number and exit.
@@ -161,12 +162,17 @@ Specify which other characters (besides the normal alphanumeric ones)
 should be considered as part of a word.  This overrides option
 \fB\-W\fR (\fB\-\-wordbounds\fR).
 .TP
-.BR \-Y\ \fIname\fR ", " \-\-syntax= \fIname
+.BR \-Y\ \fIname ", " \-\-syntax= \fIname
 Specify the name of the syntax highlighting to use from among the ones
 defined in the \fInanorc\fP files.
 .TP
+.BR \-a ", " \-\-atblanks
+When doing soft line wrapping, wrap lines at whitespace
+instead of always at the edge of the screen.
+.TP
 .BR \-c ", " \-\-constantshow
-Constantly show the cursor position.  Note that this overrides \fB\-U\fP.
+Constantly show the cursor position on the status bar.
+Note that this overrides option \fB\-U\fR (\fB\-\-quickblank\fR).
 .TP
 .BR \-d ", " \-\-rebinddelete
 Interpret the Delete key differently so that both Backspace and Delete
@@ -184,7 +190,7 @@ Show a summary of the available command-line options and exit.
 Indent new lines to the previous line's indentation.  Useful when
 editing source code.
 .TP
-.BR \-k ", " \-\-cut
+.BR \-k ", " \-\-cutfromcursor
 Make the 'Cut Text' command (normally \fB^K\fR) cut from the current cursor
 position to the end of the line, instead of cutting the entire line.
 .TP
@@ -205,7 +211,7 @@ and will write to the pipe when the user saves the "file".  This way
 \fBnano\fR can be used as an editor in combination with for instance
 \fBgpg\fR without having to write sensitive data to disk first.
 .TP
-.BR \-o\ \fIdirectory\fR ", " \-\-operatingdir= \fIdirectory
+.BR \-o\ \fIdirectory ", " \-\-operatingdir= \fIdirectory
 Set the operating directory.  This makes \fBnano\fP set up something
 similar to a chroot.
 .TP
@@ -214,17 +220,16 @@ Preserve the XON and XOFF sequences (^Q and ^S) so they will be caught
 by the terminal.
 .TP
 .BR \-q ", " \-\-quiet
-Do not report errors in the \fInanorc\fP files nor ask them to be
-acknowledged by pressing Enter at startup.
+Obsolete option.  Recognized but ignored.
 .TP
-.BR \-r\ \fInumber\fR ", " \-\-fill= \fInumber
+.BR \-r\ \fInumber ", " \-\-fill= \fInumber
 Hard-wrap lines at column \fInumber\fP.  If this value is 0 or less, wrapping
 will occur at the width of the screen less \fInumber\fP columns, allowing
 the wrap point to vary along with the width of the screen if the screen
 is resized.  The default value is \-8.  This option conflicts with
-\fB\-w\fR -- the last one given takes effect.
+\fB\-w\fR (\fB\-\-nowrap\fR) -- the last one given takes effect.
 .TP
-.BR \-s\ \fIprogram\fR ", " \-\-speller= \fIprogram
+.BR \-s\ \fIprogram ", " \-\-speller= \fIprogram
 Use this alternative spell checker command.
 .TP
 .BR \-t ", " \-\-tempfile
@@ -240,7 +245,7 @@ Just view the file and disallow editing: read-only mode.
 .TP
 .BR \-w ", " \-\-nowrap
 Disable the hard-wrapping of long lines.  This option conflicts with
-\fB\-r\fR -- the last one given takes effect.
+\fB\-r\fR (\fB\-\-fill\fR) -- the last one given takes effect.
 .TP
 .BR \-x ", " \-\-nohelp
 Don't show the two help lines at the bottom of the screen.
@@ -256,7 +261,7 @@ continuing it over multiple screen lines.  Since
 this option last when using other options (e.g.\& 'nano \-wS$') or pass it
 separately (e.g.\& 'nano \-wS \-$').
 .TP
-.BR \-a ", " \-b ", " \-e ", " \-f ", " \-j
+.BR \-b ", " \-e ", " \-f ", " \-j
 Ignored, for compatibility with Pico.

 .SH TOGGLES
@@ -268,9 +273,10 @@ hard-wrapping of long lines, \fBM\-$\fR toggles soft-wrapping,
 See at the end of the \fB^G\fR help text for a complete list.

 .SH INITIALIZATION FILE
-\fBnano\fP will read initialization files in the following order:
-the system's \fBnanorc\fP (if it exists), and then the user's
-\fB~/.nanorc\fP (if it exists).  Please see
+\fBnano\fR will read two configuration files: first the system's
+\fInanorc\fR (if it exists), and then the user's \fInanorc\fR (if it
+exists), either \fB~/.nanorc\fR or \fI$XDG_CONFIG_HOME\fB/nano/nanorc\fR
+or \fB~/.config/nano/nanorc\fR, whichever is encountered first.  See
 .BR nanorc (5)
 for more information on the possible contents of those files.

@@ -290,18 +296,22 @@ it unique.  In multibuffer mode, \fBnano\fP will write all the open
 buffers to their respective emergency files.

 .SH BUGS
-Justifications (\fB^J\fR) and reindentations (\fBM\-{\fR and \fBM\-}\fR)
+Justifications (\fB^J\fR)
 are not yet covered by the general undo system.  So after a justification
-that is not immediately undone, or after any reindentation, earlier edits
+that is not immediately undone, earlier edits
 cannot be undone any more.  The workaround is, of course, to exit without
 saving.
 .sp
+The recording and playback of keyboard macros works correctly only on a
+terminal emulator, not on a Linux console (VT), because the latter does
+not by default distinguish modified from unmodified arrow keys.
+.sp
 Please report any other bugs that you encounter via:
 .br
 \fIhttps://savannah.gnu.org/bugs/?group=nano\fR.

 .SH HOMEPAGE
-https://nano-editor.org/
+\fIhttps://nano-editor.org/\fR

 .SH SEE ALSO
 .BR nanorc (5)
--- a/doc/nano.texi
+++ b/doc/nano.texi
--- a/doc/nanorc.5
+++ b/doc/nanorc.5
@@ -1,5 +1,4 @@
-.\" Copyright (C) 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011,
-.\" 2013, 2014, 2015 Free Software Foundation, Inc.
+.\" Copyright (C) 2003-2011, 2013-2017 Free Software Foundation, Inc.
 .\"
 .\" This document is dual-licensed.  You may distribute and/or modify it
 .\" under the terms of either of the following licenses:
@@ -17,8 +16,7 @@
 .\"   Documentation License along with this program.  If not, see
 .\"   <http://www.gnu.org/licenses/>.
 .\"
-.TH NANORC 5 "version 2.7.5" "February 2017"
-.\" Please adjust this date whenever revising the manpage.
+.TH NANORC 5 "version 2.9.5" "March 2018"

 .SH NAME
 nanorc \- GNU nano's configuration file
@@ -28,7 +26,9 @@ The \fInanorc\fP file contains the default settings for \fBnano\fP, a
 small and friendly editor.  The file should be in Unix format, not in
 DOS or Mac format.  During startup, \fBnano\fP will first read the
 system-wide settings, from \fB/etc/nanorc\fP (the exact path might be
-different), and then the user-specific settings, from \fB~/.nanorc\fP.
+different on your system), and then the user-specific settings, either
+from \fB~/.nanorc\fR or from \fI$XDG_CONFIG_HOME\fB/nano/nanorc\fR
+or from \fB~/.config/nano/nanorc\fR, whichever is encountered first.

 .SH OPTIONS
 The configuration file accepts a series of \fBset\fP and \fBunset\fP
@@ -41,7 +41,7 @@ Options in \fInanorc\fP files take precedence over nano's defaults, and
 command-line options override \fInanorc\fP settings.  Also, options that
 do not take an argument are unset by default.  So using the \fBunset\fR
 command is only needed when wanting to override a setting of the system's
-\fInanorc\fR file in your own \fB~/.nanorc\fR.  Options that take an
+\fInanorc\fR file in your own \fInanorc\fR.  Options that take an
 argument cannot be unset.
 .PP
 Below, the \fIstring\fR parameters need to be enclosed in double quotes.
@@ -58,6 +58,10 @@ When backing up files, allow the backup to succeed even if its permissions
 can't be (re)set due to special OS considerations.  You should
 NOT enable this option unless you are sure you need it.
 .TP
+.B set atblanks
+When soft line wrapping is enabled, make it wrap lines at blank characters
+(tabs and spaces) instead of always at the edge of the screen.
+.TP
 .B set autoindent
 Use auto-indentation.
 .TP
@@ -67,17 +71,19 @@ the file's name.
 .TP
 .B set backupdir "\fIdirectory\fP"
 Make and keep not just one backup file, but make and keep a uniquely
-numbered one every time a file is saved --- when backups are enabled
+numbered one every time a file is saved -- when backups are enabled
 with \fBset backup\fR or \fB\-\-backup\fR or \fB\-B\fR.
 The uniquely numbered files are stored in the specified \fIdirectory\fR.
 .TP
 .B set backwards
-Do backwards searches by default.
+Obsolete option.  Recognized but ignored.  \fB^Q\fR is available to
+start a backward search.
 .TP
 .B set boldtext
-Use bold instead of reverse video for the titlebar, statusbar, key combos,
-and selected text.  This can be overridden for the first three by setting
-the options \fBtitlecolor\fP, \fBstatuscolor\fP, and \fBkeycolor\fP.
+Use bold instead of reverse video for the title bar, status bar, key combos,
+function tags, line numbers, and selected text.  This can be overridden by
+setting the options \fBtitlecolor\fP, \fBstatuscolor\fP, \fBkeycolor\fP,
+\fBfunctioncolor\fP, \fBnumbercolor\fP, and \fBselectedcolor\fP.
 .TP
 .B set brackets "\fIstring\fP"
 Set the characters treated as closing brackets when justifying
@@ -90,15 +96,21 @@ Do case-sensitive searches by default.
 .TP
 .B set constantshow
 Constantly display the cursor position in the status bar.
-(The old form of this option, '\fBset const\fR', is deprecated.)
+This overrides the option \fBquickblank\fR.
 .TP
-.B set cut
-Use cut-to-end-of-line by default, instead of cutting the whole line.
+.B set cutfromcursor
+Use cut-from-cursor-to-end-of-line by default, instead of cutting the whole line.
+(The old form of this option, '\fBset cut\fR', is deprecated.)
+.TP
+.B set errorcolor \fIfgcolor\fR,\fIbgcolor\fR
+Use this color combination for the status bar when an error message is displayed.
+See \fBset titlecolor\fR for valid color names.
 .TP
 .B set fill \fInumber\fR
 Hard-wrap lines at column number \fInumber\fR.  If \fInumber\fR is 0 or less,
 the maximum line length will be the screen width less \fInumber\fP columns.
-The default value is \fB\-8\fR.
+The default value is \fB\-8\fR.  This option conflicts with
+\fBnowrap\fR -- the last one given takes effect.
 .TP
 .B set functioncolor \fIfgcolor\fR,\fIbgcolor\fR
 Specify the color combination to use for the function descriptions
@@ -106,11 +118,8 @@ in the two help lines at the bottom of the screen.
 See \fBset titlecolor\fR for more details.
 .TP
 .B set historylog
-Enable the use of \fB~/.nano/search_history\fP for saving and reading
-search/replace strings.
-.TP
-.B set justifytrim
-When justifying text, trailing whitespace will automatically be removed.
+Save the last hundred search strings and replacement strings and
+executed commands, so they can be easily reused in later sessions.
 .TP
 .B set keycolor \fIfgcolor\fR,\fIbgcolor\fR
 Specify the color combination to use for the shortcut key combos
@@ -130,7 +139,7 @@ come before the closing set, and the two sets must be in the same order.
 The default value is "\fB(<[{)>]}\fP".
 .TP
 .B set morespace
-Use the blank line below the titlebar as extra editing space.
+Use the blank line below the title bar as extra editing space.
 .TP
 .B set mouse
 Enable mouse support, if available for your system.  When enabled, mouse
@@ -151,8 +160,13 @@ Don't display the two help lines at the bottom of the screen.
 .B set nonewlines
 Don't automatically add a newline to the ends of files.
 .TP
+.B set nopauses
+Don't pause between warnings at startup.  This means that only
+the last one will be visible (when there are multiple ones).
+.TP
 .B set nowrap
-Don't hard-wrap text at all.
+Don't hard-wrap text at all.  This option conflicts with
+\fBfill\fR -- the last one given takes effect.
 .TP
 .B set numbercolor \fIfgcolor\fR,\fIbgcolor\fR
 Specify the color combination to use for line numbers.
@@ -167,7 +181,6 @@ directory feature is turned off.
 .B set positionlog
 Save the cursor position of files between editing sessions.
 The cursor position is remembered for the 200 most-recently edited files.
-(The old form of this option, '\fBset poslog\fR', is deprecated.)
 .TP
 .B set preserve
 Preserve the XON and XOFF keys (^Q and ^S).
@@ -179,13 +192,11 @@ specfified closing punctuation, optionally followed by closing brackets
 (see \fBbrackets\fP), can end sentences.  The default value is "\fB!.?\fP".
 .TP
 .B set quickblank
-Do quick statusbar blanking.  Statusbar messages will disappear after 1
-keystroke instead of 25.
+Do quick status-bar blanking: status-bar messages will disappear after 1
+keystroke instead of 25.  The option \fBconstantshow\fR overrides this.
 .TP
 .B set quiet
-\fBnano\fP will not report errors in the \fInanorc\fP file nor ask them
-to be acknowledged by pressing Enter at startup.  If this is used, it
-should be placed at the top of the file to be fully effective.
+Obsolete option.  Recognized but ignored.
 .TP
 .B set quotestr "\fIstring\fP"
 The email-quote string, used to justify email-quoted paragraphs.  This
@@ -208,6 +219,10 @@ won't work properly with this option enabled.
 .B set regexp
 Do extended regular expression searches by default.
 .TP
+.B set selectedcolor \fIfgcolor\fR,\fIbgcolor\fR
+Specify the color combination to use for selected text.
+See \fBset titlecolor\fR for more details.
+.TP
 .B set showcursor
 Put the cursor on the highlighted item in the file browser, to aid
 braille users.
@@ -230,7 +245,7 @@ Use spelling checker \fIspellprog\fP instead of the built-in one, which
 calls \fIspell\fP.
 .TP
 .B set statuscolor \fIfgcolor\fR,\fIbgcolor\fR
-Specify the color combination to use for the statusbar.
+Specify the color combination to use for the status bar.
 See \fBset titlecolor\fR for more details.
 .TP
 .B set suspend
@@ -247,12 +262,18 @@ Convert typed tabs to spaces.
 Save automatically on exit, don't prompt.
 .TP
 .B set titlecolor \fIfgcolor\fR,\fIbgcolor\fR
-Specify the color combination to use for the titlebar.
+Specify the color combination to use for the title bar.
 Valid names for the foreground and background colors are:
-.BR white ", " black ", " blue ", " green ", " red ", " cyan ", " yellow ",  and " magenta .
+.BR white ", " black ", " blue ", " green ", " red ", "
+.BR cyan ", " yellow ", " magenta ", and " normal
+-- where \fBnormal\fR means the default foreground or background color.
 The name of the foreground color may be prefixed with \fBbright\fR.
 And either "\fIfgcolor\fR" or ",\fIbgcolor\fR" may be left out.
 .TP
+.B set trimblanks
+Remove trailing whitespace from wrapped lines when automatic
+hard-wrapping occurs or when text is justified.
+.TP
 .B set unix
 Save a file by default in Unix format.  This overrides nano's
 default behavior of saving a file in the format that it had.
@@ -263,7 +284,8 @@ Disallow file modification.
 .TP
 .B set whitespace "\fIstring\fP"
 Set the two characters used to indicate the presence of tabs and
-spaces.  They must be single-column characters.
+spaces.  They must be single-column characters.  The default pair
+for a UTF-8 locale is "\fB\[Fc]\[md]\fR", and for other locales "\fB>.\fR".
 .TP
 .B set wordbounds
 Detect word boundaries differently by treating punctuation
@@ -282,53 +304,58 @@ powerful enough to fully parse a file.  Nevertheless, regular
 expressions can do a lot and are easy to make, so they are a
 good fit for a small editor like \fBnano\fR.
 .sp
-A separate syntax can be defined for each kind of file
+For each kind of file a separate syntax can be defined
 via the following commands:
 .TP
-.BR syntax " ""\fIstr\fR"" [""\fIfileregex\fR"" ...]"
-Defines a syntax named \fIstr\fP which can be activated via the
-.BR \-Y / \-\-syntax
-command-line option, or will be automatically activated if
-the current filename matches the extended regular expression
-\fIfileregex\fP.  All subsequent \fBcolor\fR, \fBicolor\fR,
-\fBheader\fR and other such statements will apply to this
-\fIstr\fP syntax until a new \fBsyntax\fR command is encountered.
+.BR syntax " ""\fIname\fR"" [""\fIfileregex\fR"" ...]"
+Start the definition of a syntax with this \fIname\fR.
+All subsequent \fBcolor\fR and other such commands
+will be added to this syntax, until a new \fBsyntax\fR
+command is encountered.

-The \fBnone\fP syntax is reserved; specifying it on the command line is
-the same as not having a syntax at all.  The \fBdefault\fP syntax is
-special: it takes no \fIfileregex\fP, and applies to files that don't
-match any syntax's \fIfileregex\fP.
+When \fBnano\fR is run, this syntax will be automatically
+activated if the current filename matches the extended regular
+expression \fIfileregex\fR.  Or the syntax can be explicitly
+activated by using the \fB-Y\fR or \fB\-\-syntax\fR
+command-line option followed by the \fIname\fR.
+
+The syntax "\fBdefault\fP" is special: it takes no \fIfileregex\fR,
+and applies to files that don't match any syntax's regexes.
+The syntax "\fBnone\fP" is reserved; specifying it on the command line
+is the same as not having a syntax at all.
+.TP
+.BR header " ""\fIregex\fR"" " ...
+If from all defined syntaxes no \fIfileregex\fR matched, then compare
+this \fIregex\fR (or regexes) against the first line of the current file,
+to determine whether this syntax should be used for it.
+.TP
+.BR magic " ""\fIregex\fR"" " ...
+If no \fIfileregex\fR matched and no \fBheader\fR regex matched
+either, then compare this \fIregex\fR (or regexes) against the
+result of querying the \fBmagic\fP database about the current
+file, to determine whether this syntax should be used for it.
+(This functionality only works when \fBlibmagic\fP is installed on the
+system and will be silently ignored otherwise.)
 .TP
 .BI linter " program " \fR[ "arg " \fR...]
-Use the given \fIprogram\fR to run a syntax check on the current file
-(this overrides the speller function when defined).
+Use the given \fIprogram\fR to run a syntax check on the current file.
+(This overrides the speller function.)
 .TP
 .BI formatter " program " \fR[ "arg " \fR...]
-Use the given \fIprogram\fR to automatically reformat text.
-Useful in certain programming languages (e.g. Go).
+Use the given \fIprogram\fR to automatically reformat text --
+useful in a programming language like Go.
+(This overrides the speller and linter functions.)
 .TP
-.BR header " \fIregex\fR " ...
-Add one or more regexes which will
-be compared against the very first line of the file to be edited,
-to determine whether this syntax should be used for that file.
-.TP
-.BR magic " \fIregex\fR " ...
-Add one or more regexes which
-will be compared against the result of querying the \fBmagic\fP
-database about the file to be edited, to determine whether this
-syntax should be used for that file.  This
-functionality only works when \fBlibmagic\fP is installed on the
-system and will be silently ignored otherwise.
-.TP
-.BI comment " string"
-Use the given string for commenting and uncommenting lines.  A vertical bar or
-pipe character (|) designates bracket-style comments; for example, "/*|*/" for
+.BR comment " ""\fIstring\fR"""
+Use the given string for commenting and uncommenting lines.
+If the string contains a vertical bar or pipe character (\fB|\fR),
+this designates bracket-style comments; for example, "\fB/*|*/\fR" for
 CSS files.  The characters before the pipe are prepended to the line and the
 characters after the pipe are appended at the end of the line.  If no pipe
-character is present, the entire string is prepended; for example, "#" for
-Python files.  If empty double quotes are specified, the comment/uncomment
-function is disabled; for example, "" for JSON.  Double quotes or backslashes
-may be escaped with a backslash; for example, ".\\"" for man page source.
+character is present, the full string is prepended; for example, "\fB#\fR"
+for Python files.  If empty double quotes are specified, the comment/uncomment
+function is disabled; for example, "" for JSON.
+The default value is "\fB#\fP".
 .TP
 .B color \fIfgcolor\fR,\fIbgcolor\fR """\fIregex\fR""" ...
 Display all pieces of text that match
@@ -342,43 +369,54 @@ foreground.  If your terminal supports transparency, not specifying a
 background.
 .TP
 .B icolor \fIfgcolor\fR,\fIbgcolor\fR """\fIregex\fR""" ...
-Same as above, except that the text matching is case insensitive.
+Same as above, except that the matching is case insensitive.
 .TP
-.BR color " \fIfgcolor\fR,\fIbgcolor\fR " start= """\fIsr\fR"" " end= """\fIer\fR""
+.BR color " \fIfgcolor\fR,\fIbgcolor\fR " start= """\fIfromrx\fR"" " end= """\fItorx\fR""
 Display all pieces of text whose start matches extended regular expression
-\fIsr\fP and whose end matches extended regular expression \fIer\fP with
+\fIfromrx\fP and whose end matches extended regular expression \fItorx\fP with
 foreground color \fIfgcolor\fP and background color \fIbgcolor\fP,
 at least one of which must be specified.  This means that, after an
-initial instance of \fIsr\fP, all text will be highlighted until the
-first instance of \fIer\fP.  This allows syntax highlighting to span
+initial instance of \fIfromrx\fP, all text until the first instance of
+\fItorx\fP will be colored.  This allows syntax highlighting to span
 multiple lines.
 .TP
-.BR icolor " \fIfgcolor\fR,\fIbgcolor\fR " start= """\fIsr\fR"" " end= """\fIer\fR""
-Same as above, except that the text matching is case insensitive.
+.BR icolor " \fIfgcolor\fR,\fIbgcolor\fR " start= """\fIfromrx\fR"" " end= """\fItorx\fR""
+Same as above, except that the matching is case insensitive.
 .TP
 .BR include " ""\fIsyntaxfile\fR"""
 Read in self-contained color syntaxes from \fIsyntaxfile\fP.  Note that
 \fIsyntaxfile\fP may contain only the above commands, from \fBsyntax\fP
 to \fBicolor\fP.
 .TP
-.BI extendsyntax " str directive " \fR[ "arg " \fR...]
-Extend the syntax previously defined as \fIstr\fP to include
-new information.  This allows you to add a new \fBcolor\fP, \fBicolor\fP,
-\fBheader\fP, \fBmagic\fP, \fBcomment\fP, \fBlinter\fP, or \fBformatter\fP directive
-to an already defined syntax -- useful when you want to
+.BI extendsyntax " name command " \fR[ "arg " \fR...]
+Extend the syntax previously defined as \fIname\fR with another
+\fIcommand\fR.  This allows adding a new \fBcolor\fP, \fBicolor\fP,
+\fBheader\fP, \fBmagic\fP, \fBcomment\fP, \fBlinter\fP, or \fBformatter\fP
+command to an already defined syntax -- useful when you want to
 slightly improve a syntax defined in one of the system-installed
-files (which are normally not writable)
+files (which normally are not writable).
+
 .SH REBINDING KEYS
-Key bindings can be changed via the following two commands:
+Key bindings can be changed via the following three commands:
+.RS 3
 .TP
 .BI bind " key function menu"
 Rebinds the key \fIkey\fP to a new function named \fIfunction\fP in the
 context of menu \fImenu\fP (or in all menus where the function exists
 by using \fBall\fP).
+.TP
+.BI bind " key " """" string """" " menu"
+Makes the given \fIkey\fR produce the given \fIstring\fR in the given
+\fImenu\fR (or in all menus where the key exists when \fBall\fR is used).
+The \fIstring\fR can consist of text or commands or a mix of them.
+(To enter a command into the \fIstring\fR, precede its keystroke
+with \fBM-V\fR.)
+
 .TP
 .BI unbind " key menu"
 Unbinds the key \fIkey\fP from the menu named \fImenu\fP (or from all
 menus where it exists by using \fBall\fP).
+.RE

 .TP
 The format of \fIkey\fP should be one of:
@@ -414,19 +452,21 @@ Exits from the program (or from the help viewer or the file browser).
 Writes the current buffer to disk, asking for a name.
 .TP
 .B savefile
-Writes the current file to disk without prompting or warning.
+Writes the current file to disk without prompting.
 .TP
 .B insert
 Inserts a file into the current buffer (at the current cursor position),
 or into a new buffer when option \fBmultibuffer\fR is set.
 .TP
 .B whereis
-Searches for text in the current buffer -- or for filenames matching
-a string in the current list in the file browser.
+Starts a forward search for text in the current buffer -- or for filenames
+matching a string in the current list in the file browser.
+.TP
+.B wherewas
+Starts a backward search for text in the current buffer.
 .TP
 .B searchagain
 Repeats the last search command without prompting.
-(The form 'research' is deprecated.)
 .TP
 .B findprevious
 As \fBsearchagain\fR, but always in the backward direction.
@@ -461,7 +501,6 @@ Cuts all text from the cursor position till the end of the buffer.
 .TP
 .B curpos
 Shows the current cursor position: the line, column, and character positions.
-(The form 'cursorpos' is deprecated.)
 .TP
 .B wordcount
 Counts the number of words, lines and characters in the current buffer.
@@ -506,10 +545,12 @@ Goes one line up (in the editor or browser).
 Goes one line down (in the editor or browser).
 .TP
 .B scrollup
-Scrolls up one line of text from the current position.
+Scrolls the viewport up one row (meaning that the text slides down)
+while keeping the cursor in the same text position, if possible.
 .TP
 .B scrolldown
-Scrolls down one line of text from the current position.
+Scrolls the viewport down one row (meaning that the text slides up)
+while keeping the cursor in the same text position, if possible.
 .TP
 .B prevword
 Moves the cursor to the beginning of the previous word.
@@ -536,10 +577,10 @@ Moves the cursor to the beginning of the current or preceding block of text.
 .B nextblock
 Moves the cursor to the beginning of the next block of text.
 .TP
-.B prevpage
+.B pageup
 Goes up one screenful.
 .TP
-.B nextpage
+.B pagedown
 Goes down one screenful.
 .TP
 .B firstline
@@ -552,9 +593,6 @@ Goes to the last line of the file.
 Goes to a specific line (and column if specified).  Negative numbers count
 from the end of the file (and end of the line).
 .TP
-.B gototext
-Switches from targeting a line number to searching for text.
-.TP
 .B findbracket
 Moves the cursor to the bracket (brace, parenthesis, etc.) that matches
 (pairs) with the one under the cursor.
@@ -580,6 +618,13 @@ Deletes the character under the cursor.
 .B backspace
 Deletes the character before the cursor.
 .TP
+.B recordmacro
+Starts the recording of keystrokes -- the keystrokes are stored
+as a macro.  When already recording, the recording is stopped.
+.TP
+.B runmacro
+Replays the keystrokes of the last recorded macro.
+.TP
 .B undo
 Undoes the last performed text action (add text, delete text, etc).
 .TP
@@ -598,7 +643,6 @@ Toggles case sensitivity in searching (search/replace menus only).
 .TP
 .B regexp
 Toggles whether searching/replacing is based on literal strings or regular expressions.
-(The form 'regex' is deprecated.)
 .TP
 .B backwards
 Toggles whether searching/replacing goes forward or backward.
@@ -611,7 +655,10 @@ Shows the next history entry in the prompt menus (e.g. search).
 .TP
 .B flipreplace
 Toggles between searching for something and replacing something.
-(The form 'dontreplace' is deprecated.)
+.TP
+.B flipgoto
+Toggles between searching for text and targeting a line number.
+(The form 'gototext' is deprecated.)
 .TP
 .B flipexecute
 Toggles between inserting a file and executing a command.
@@ -619,7 +666,6 @@ Toggles between inserting a file and executing a command.
 .B flipnewbuffer
 Toggles between inserting into the current buffer and into a new
 empty buffer.
-(The form 'newbuffer' is deprecated.)
 .TP
 .B dosformat
 When writing a file, switches to writing a DOS format (CR/LF).
@@ -641,7 +687,7 @@ When about to write a file, discard the current buffer without saving.
 (This function is bound by default only when option \fB\-\-tempfile\fR
 is in effect.)
 .TP
-.B tofiles
+.B browser
 Starts the file browser, allowing to select a file from a list.
 .TP
 .B gotodir
@@ -661,7 +707,7 @@ Toggles the presence of the two-line list of key bindings at the bottom of the s
 Toggles the constant display of the current line, column, and character positions.
 .TP
 .B morespace
-Toggles the presence of the blank line which 'separates' the titlebar from the file text.
+Toggles the presence of the blank line that 'separates' the title bar from the file text.
 .TP
 .B smoothscroll
 Toggles smooth scrolling (when moving around with the arrow keys).
@@ -723,7 +769,6 @@ The 'search to replace' menu.
 .TP
 .B replacewith
 The 'replace with' menu, which comes up after 'search to replace'.
-(The form 'replace2' is deprecated.)
 .TP
 .B gotoline
 The 'goto line (and column)' menu.
@@ -766,7 +811,7 @@ for \fBunbind\fR it means all menus where the specified \fIkey\fR exists.
 .B /etc/nanorc
 System-wide configuration file.
 .TP
-.B ~/.nanorc
+.BR ~/.nanorc " or " \fI$XDG_CONFIG_HOME\fB/nano/nanorc " or " ~/.config/nano/nanorc
 Per-user configuration file.

 .SH SEE ALSO
--- a/doc/rnano.1
+++ b/doc/rnano.1
@@ -16,8 +16,7 @@
 .\"   Documentation License along with this program.  If not, see
 .\"   <http://www.gnu.org/licenses/>.
 .\"
-.TH RNANO 1 "version 2.7.5" "February 2017"
-.\" Please adjust this date whenever revising the manpage.
+.TH RNANO 1 "version 2.9.5" "March 2018"

 .SH NAME
 rnano \- a restricted nano
--- a/doc/sample.nanorc.in
+++ b/doc/sample.nanorc.in
@@ -15,10 +15,9 @@
 ## its end.  For example, for the "brackets" option, ""')>]}" will match
 ## ", ', ), >, ], and }.

-## Silently ignore problems with unknown directives in the nanorc file.
-## Useful when your nanorc file might be read on systems with multiple
-## versions of nano installed (e.g. your home directory is on NFS).
-# set quiet
+## When soft line wrapping is enabled, make it wrap lines at blanks
+## (tabs and spaces) instead of always at the edge of the screen.
+# set atblanks

 ## Use auto-indentation.
 # set autoindent
@@ -29,9 +28,6 @@
 ## The directory to put unique backup files in.
 # set backupdir ""

-## Do backwards searches by default.
-# set backwards
-
 ## Use bold text instead of reverse video text.
 # set boldtext

@@ -44,13 +40,14 @@
 ## Do case-sensitive searches by default.
 # set casesensitive

-## Constantly display the cursor position in the statusbar.  Note that
+## Constantly display the cursor position in the status bar.  Note that
 ## this overrides "quickblank".
 # set constantshow
 ## (The old form, 'const', is deprecated.)

-## Use cut-to-end-of-line by default.
-# set cut
+## Use cut-from-cursor-to-end-of-line by default.
+# set cutfromcursor
+## (The old form, 'cut', is deprecated.)

 ## Set the line length for wrapping text and justifying paragraphs.
 ## If the value is 0 or less, the wrapping point will be the screen
@@ -60,14 +57,11 @@
 ## Remember the used search/replace strings for the next session.
 # set historylog

-## Make the justify command kill whitespace at the end of lines.
-# set justifytrim
-
 ## Display line numbers to the left of the text.
 # set linenumbers

 ## Enable vim-style lock-files.  This is just to let a vim user know you
-## are editing a file [s]he is trying to edit and vice versa. There are
+## are editing a file [s]he is trying to edit and vice versa.  There are
 ## no plans to implement vim-style undo state in these files.
 # set locking

@@ -76,7 +70,7 @@
 ## come before the latter set, and both must be in the same order.
 # set matchbrackets "(<[{)>]}"

-## Use the blank line below the titlebar as extra editing space.
+## Use the blank line below the title bar as extra editing space.
 # set morespace

 ## Enable mouse support, if available for your system.  When enabled,
@@ -95,6 +89,10 @@
 ## Don't display the helpful shortcut lists at the bottom of the screen.
 # set nohelp

+## Don't pause between warnings at startup.  Which means that only the
+## last one will be readable (when there are multiple ones).
+# set nopauses
+
 ## Don't add newlines to the ends of files.
 # set nonewlines

@@ -120,8 +118,8 @@
 ## sentences.
 # set punct "!.?"

-## Do quick statusbar blanking.  Statusbar messages will disappear after
-## 1 keystroke instead of 26.  Note that "const" overrides this.
+## Do quick status-bar blanking.  Status-bar messages will disappear after
+## 1 keystroke instead of 26.  Note that "constantshow" overrides this.
 # set quickblank

 ## The email-quote string, used to justify email-quoted paragraphs.
@@ -159,7 +157,7 @@
 # set softwrap

 ## Use this spelling checker instead of the internal one.  This option
-## does not properly have a default value.
+## does not have a default value.
 # set speller "aspell -x -c"

 ## Allow nano to be suspended.
@@ -174,6 +172,9 @@
 ## Save automatically on exit; don't prompt.
 # set tempfile

+## Snip whitespace at the end of lines when justifying or hard-wrapping.
+# set trimblanks
+
 ## Disallow file modification.  Why would you want this in an rcfile? ;)
 # set view

@@ -195,13 +196,23 @@
 # set wordchars "<_>."


-## Paint the interface elements of nano.
-## These are examples; by default there are no colors.
+## Paint the interface elements of nano.  These are examples;
+## by default there are no colors, except for errorcolor.
 # set titlecolor brightwhite,blue
-# set numbercolor cyan
 # set statuscolor brightwhite,green
-# set keycolor green
-# set functioncolor yellow
+# set errorcolor brightwhite,red
+# set selectedcolor brightwhite,magenta
+# set numbercolor cyan
+# set keycolor cyan
+# set functioncolor green
+## In root's .nanorc you might want to use:
+# set titlecolor brightwhite,magenta
+# set statuscolor brightwhite,magenta
+# set errorcolor brightwhite,red
+# set selectedcolor brightwhite,cyan
+# set numbercolor magenta
+# set keycolor brightmagenta
+# set functioncolor magenta


 ## Setup of syntax coloring.
@@ -252,11 +263,8 @@
 ## Key bindings.
 ## See nanorc(5) (section REBINDING KEYS) for more details on this.
 ##
-## The following five functions are not bound to any key by default.
-## You may wish to choose different keys than the ones suggested here.
-# bind ^S savefile main
-# bind M-Q findprevious main
-# bind M-W findnext main
+## The following two functions are not bound to any key by default.
+## You may wish to choose other keys than the ones suggested here.
 # bind M-B cutwordleft main
 # bind M-N cutwordright main

--- a/m4/Makefile.am
+++ b/m4/Makefile.am
@@ -1,5 +1,36 @@
-EXTRA_DIST = ac_define_dir.m4 codeset.m4 gettext.m4 glib-2.0.m4 \
-		glibc21.m4 iconv.m4 intdiv0.m4 inttypes_h.m4 \
-		inttypes.m4 inttypes-pri.m4 isc-posix.m4 lcmessage.m4 \
-		lib-ld.m4 lib-link.m4 lib-prefix.m4 progtest.m4 \
-		stdint_h.m4 uintmax_t.m4 ulonglong.m4
+EXTRA_DIST = \
+	ac_define_dir.m4 \
+	ax_check_compile_flag.m4 \
+	codeset.m4 \
+	extern-inline.m4 \
+	fcntl-o.m4 \
+	gettext.m4 \
+	glibc21.m4 \
+	glibc2.m4 \
+	gnulib-cache.m4 \
+	iconv.m4 \
+	intdiv0.m4 \
+	intldir.m4 \
+	intl.m4 \
+	intlmacosx.m4 \
+	intmax.m4 \
+	inttypes_h.m4 \
+	inttypes-pri.m4 \
+	lcmessage.m4 \
+	lib-ld.m4 \
+	lib-link.m4 \
+	lib-prefix.m4 \
+	lock.m4 \
+	longlong.m4 \
+	nls.m4 \
+	po.m4 \
+	printf-posix.m4 \
+	progtest.m4 \
+	size_max.m4 \
+	stdint_h.m4 \
+	threadlib.m4 \
+	uintmax_t.m4 \
+	visibility.m4 \
+	wchar_t.m4 \
+	wint_t.m4 \
+	xsize.m4
--- a/m4/codeset.m4
+++ b/m4/codeset.m4
@@ -1,23 +0,0 @@
-# codeset.m4 serial AM1 (gettext-0.10.40)
-dnl Copyright (C) 2000-2002 Free Software Foundation, Inc.
-dnl This file is free software, distributed under the terms of the GNU
-dnl General Public License.  As a special exception to the GNU General
-dnl Public License, this file may be distributed as part of a program
-dnl that contains a configuration script generated by Autoconf, under
-dnl the same distribution terms as the rest of that program.
-
-dnl From Bruno Haible.
-
-AC_DEFUN([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
@@ -1,587 +0,0 @@
-# gettext.m4 serial 17 (gettext-0.11.5)
-dnl Copyright (C) 1995-2002 Free Software Foundation, Inc.
-dnl This file is free software, distributed under the terms of the GNU
-dnl General Public License.  As a special exception to the GNU General
-dnl Public License, this file may be distributed as part of a program
-dnl that contains a configuration script generated by Autoconf, under
-dnl the same distribution terms as the rest of that program.
-dnl
-dnl This file can can be used in projects which are not available under
-dnl the GNU General Public License or the GNU Library General Public
-dnl License but which still want to provide support for the GNU gettext
-dnl functionality.
-dnl Please note that the actual code of the GNU gettext library is covered
-dnl by the GNU Library General Public License, and the rest of the GNU
-dnl gettext package package is covered by the GNU General Public License.
-dnl They are *not* in the public domain.
-
-dnl Authors:
-dnl   Ulrich Drepper <drepper@cygnus.com>, 1995-2000.
-dnl   Bruno Haible <haible@clisp.cons.org>, 2000-2002.
-
-dnl Macro to add for using GNU gettext.
-
-dnl Usage: AM_GNU_GETTEXT([INTLSYMBOL], [NEEDSYMBOL], [INTLDIR]).
-dnl INTLSYMBOL can be one of 'external', 'no-libtool', 'use-libtool'. The
-dnl    default (if it is not specified or empty) is 'no-libtool'.
-dnl    INTLSYMBOL should be 'external' for packages with no intl directory,
-dnl    and 'no-libtool' or 'use-libtool' for packages with an intl directory.
-dnl    If INTLSYMBOL 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). If INTLSYMBOL is 'no-libtool', a static library
-dnl    $(top_builddir)/intl/libintl.a will be created.
-dnl If NEEDSYMBOL is specified and is 'need-ngettext', then GNU gettext
-dnl    implementations (in libc or libintl) without the ngettext() function
-dnl    will be ignored.  If NEEDSYMBOL is specified and is
-dnl    'need-formatstring-macros', then GNU gettext implementations that don't
-dnl    support the ISO C 99 <inttypes.h> formatstring macros will be ignored.
-dnl INTLDIR is used to find the intl libraries.  If empty,
-dnl    the value `$(top_builddir)/intl/' is used.
-dnl
-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 If INTLSYMBOL is 'external', only cases 2 and 3 can occur.
-dnl The use of .gmo is historical (it was needed to avoid overwriting the
-dnl GNU format catalogs when building on a platform with an X/Open gettext),
-dnl but we keep it in order not to force irrelevant filename changes on the
-dnl maintainers.
-dnl
-AC_DEFUN([AM_GNU_GETTEXT],
-[
-  dnl Argument checking.
-  ifelse([$1], [], , [ifelse([$1], [external], , [ifelse([$1], [no-libtool], , [ifelse([$1], [use-libtool], ,
-    [errprint([ERROR: invalid first argument to AM_GNU_GETTEXT
-])])])])])
-  ifelse([$2], [], , [ifelse([$2], [need-ngettext], , [ifelse([$2], [need-formatstring-macros], ,
-    [errprint([ERROR: invalid second argument to AM_GNU_GETTEXT
-])])])])
-  define(gt_included_intl, ifelse([$1], [external], [no], [yes]))
-  define(gt_libtool_suffix_prefix, ifelse([$1], [use-libtool], [l], []))
-
-  AC_REQUIRE([AM_PO_SUBDIRS])dnl
-  ifelse(gt_included_intl, yes, [
-    AC_REQUIRE([AM_INTL_SUBDIR])dnl
-  ])
-
-  dnl Prerequisites of AC_LIB_LINKFLAGS_BODY.
-  AC_REQUIRE([AC_LIB_PREPARE_PREFIX])
-  AC_REQUIRE([AC_LIB_RPATH])
-
-  dnl Sometimes libintl requires libiconv, so first search for libiconv.
-  dnl Ideally we would do this search only after the
-  dnl      if test "$USE_NLS" = "yes"; then
-  dnl        if test "$gt_cv_func_gnugettext_libc" != "yes"; then
-  dnl tests. But if configure.in invokes AM_ICONV after AM_GNU_GETTEXT
-  dnl the configure script would need to contain the same shell code
-  dnl again, outside any 'if'. There are two solutions:
-  dnl - Invoke AM_ICONV_LINKFLAGS_BODY here, outside any 'if'.
-  dnl - Control the expansions in more detail using AC_PROVIDE_IFELSE.
-  dnl Since AC_PROVIDE_IFELSE is only in autoconf >= 2.52 and not
-  dnl documented, we avoid it.
-  ifelse(gt_included_intl, yes, , [
-    AC_REQUIRE([AM_ICONV_LINKFLAGS_BODY])
-  ])
-
-  AC_MSG_CHECKING([whether NLS is requested])
-  dnl Default is enabled NLS
-  AC_ARG_ENABLE(nls,
-    [  --disable-nls           do not use Native Language Support],
-    USE_NLS=$enableval, USE_NLS=yes)
-  AC_MSG_RESULT($USE_NLS)
-  AC_SUBST(USE_NLS)
-
-  ifelse(gt_included_intl, yes, [
-    BUILD_INCLUDED_LIBINTL=no
-    USE_INCLUDED_LIBINTL=no
-  ])
-  LIBINTL=
-  LTLIBINTL=
-  POSUB=
-
-  dnl If we use NLS figure out what method
-  if test "$USE_NLS" = "yes"; then
-    gt_use_preinstalled_gnugettext=no
-    ifelse(gt_included_intl, yes, [
-      AC_MSG_CHECKING([whether included gettext is requested])
-      AC_ARG_WITH(included-gettext,
-        [  --with-included-gettext use the GNU gettext library included here],
-        nls_cv_force_use_gnu_gettext=$withval,
-        nls_cv_force_use_gnu_gettext=no)
-      AC_MSG_RESULT($nls_cv_force_use_gnu_gettext)
-
-      nls_cv_use_gnu_gettext="$nls_cv_force_use_gnu_gettext"
-      if test "$nls_cv_force_use_gnu_gettext" != "yes"; then
-    ])
-        dnl User does not insist on using GNU NLS library.  Figure out what
-        dnl to use.  If GNU gettext is available we use this.  Else we have
-        dnl to fall back to GNU NLS library.
-
-        dnl Add a version number to the cache macros.
-        define([gt_api_version], ifelse([$2], [need-formatstring-macros], 3, ifelse([$2], [need-ngettext], 2, 1)))
-        define([gt_cv_func_gnugettext_libc], [gt_cv_func_gnugettext]gt_api_version[_libc])
-        define([gt_cv_func_gnugettext_libintl], [gt_cv_func_gnugettext]gt_api_version[_libintl])
-
-        AC_CACHE_CHECK([for GNU gettext in libc], gt_cv_func_gnugettext_libc,
-         [AC_TRY_LINK([#include <libintl.h>
-]ifelse([$2], [need-formatstring-macros],
-[#ifndef __GNU_GETTEXT_SUPPORTED_REVISION
-#define __GNU_GETTEXT_SUPPORTED_REVISION(major) ((major) == 0 ? 0 : -1)
-#endif
-changequote(,)dnl
-typedef int array [2 * (__GNU_GETTEXT_SUPPORTED_REVISION(0) >= 1) - 1];
-changequote([,])dnl
-], [])[extern int _nl_msg_cat_cntr;
-extern int *_nl_domain_bindings;],
-            [bindtextdomain ("", "");
-return (int) gettext ("")]ifelse([$2], [need-ngettext], [ + (int) ngettext ("", "", 0)], [])[ + _nl_msg_cat_cntr + *_nl_domain_bindings],
-            gt_cv_func_gnugettext_libc=yes,
-            gt_cv_func_gnugettext_libc=no)])
-
-        if test "$gt_cv_func_gnugettext_libc" != "yes"; then
-          dnl Sometimes libintl requires libiconv, so first search for libiconv.
-          ifelse(gt_included_intl, yes, , [
-            AM_ICONV_LINK
-          ])
-          dnl Search for libintl and define LIBINTL, LTLIBINTL and INCINTL
-          dnl accordingly. Don't use AC_LIB_LINKFLAGS_BODY([intl],[iconv])
-          dnl because that would add "-liconv" to LIBINTL and LTLIBINTL
-          dnl even if libiconv doesn't exist.
-          AC_LIB_LINKFLAGS_BODY([intl])
-          AC_CACHE_CHECK([for GNU gettext in libintl],
-            gt_cv_func_gnugettext_libintl,
-           [gt_save_CPPFLAGS="$CPPFLAGS"
-            CPPFLAGS="$CPPFLAGS $INCINTL"
-            gt_save_LIBS="$LIBS"
-            LIBS="$LIBS $LIBINTL"
-            dnl Now see whether libintl exists and does not depend on libiconv.
-            AC_TRY_LINK([#include <libintl.h>
-]ifelse([$2], [need-formatstring-macros],
-[#ifndef __GNU_GETTEXT_SUPPORTED_REVISION
-#define __GNU_GETTEXT_SUPPORTED_REVISION(major) ((major) == 0 ? 0 : -1)
-#endif
-changequote(,)dnl
-typedef int array [2 * (__GNU_GETTEXT_SUPPORTED_REVISION(0) >= 1) - 1];
-changequote([,])dnl
-], [])[extern int _nl_msg_cat_cntr;
-extern
-#ifdef __cplusplus
-"C"
-#endif
-const char *_nl_expand_alias ();],
-              [bindtextdomain ("", "");
-return (int) gettext ("")]ifelse([$2], [need-ngettext], [ + (int) ngettext ("", "", 0)], [])[ + _nl_msg_cat_cntr + *_nl_expand_alias (0)],
-              gt_cv_func_gnugettext_libintl=yes,
-              gt_cv_func_gnugettext_libintl=no)
-            dnl Now see whether libintl exists and depends on libiconv.
-            if test "$gt_cv_func_gnugettext_libintl" != yes && test -n "$LIBICONV"; then
-              LIBS="$LIBS $LIBICONV"
-              AC_TRY_LINK([#include <libintl.h>
-]ifelse([$2], [need-formatstring-macros],
-[#ifndef __GNU_GETTEXT_SUPPORTED_REVISION
-#define __GNU_GETTEXT_SUPPORTED_REVISION(major) ((major) == 0 ? 0 : -1)
-#endif
-changequote(,)dnl
-typedef int array [2 * (__GNU_GETTEXT_SUPPORTED_REVISION(0) >= 1) - 1];
-changequote([,])dnl
-], [])[extern int _nl_msg_cat_cntr;
-extern
-#ifdef __cplusplus
-"C"
-#endif
-const char *_nl_expand_alias ();],
-                [bindtextdomain ("", "");
-return (int) gettext ("")]ifelse([$2], [need-ngettext], [ + (int) ngettext ("", "", 0)], [])[ + _nl_msg_cat_cntr + *_nl_expand_alias (0)],
-               [LIBINTL="$LIBINTL $LIBICONV"
-                LTLIBINTL="$LTLIBINTL $LTLIBICONV"
-                gt_cv_func_gnugettext_libintl=yes
-               ])
-            fi
-            CPPFLAGS="$gt_save_CPPFLAGS"
-            LIBS="$gt_save_LIBS"])
-        fi
-
-        dnl If an already present or preinstalled GNU gettext() is found,
-        dnl use it.  But if this macro is used in GNU gettext, and GNU
-        dnl gettext is already preinstalled in libintl, we update this
-        dnl libintl.  (Cf. the install rule in intl/Makefile.in.)
-        if test "$gt_cv_func_gnugettext_libc" = "yes" \
-           || { test "$gt_cv_func_gnugettext_libintl" = "yes" \
-                && test "$PACKAGE" != gettext; }; then
-          gt_use_preinstalled_gnugettext=yes
-        else
-          dnl Reset the values set by searching for libintl.
-          LIBINTL=
-          LTLIBINTL=
-          INCINTL=
-        fi
-
-    ifelse(gt_included_intl, yes, [
-        if test "$gt_use_preinstalled_gnugettext" != "yes"; then
-          dnl GNU gettext is not found in the C library.
-          dnl Fall back on included GNU gettext library.
-          nls_cv_use_gnu_gettext=yes
-        fi
-      fi
-
-      if test "$nls_cv_use_gnu_gettext" = "yes"; then
-        dnl Mark actions used to generate GNU NLS library.
-        INTLOBJS="\$(GETTOBJS)"
-        BUILD_INCLUDED_LIBINTL=yes
-        USE_INCLUDED_LIBINTL=yes
-        LIBINTL="ifelse([$3],[],\${top_builddir}/intl,[$3])/libintl.[]gt_libtool_suffix_prefix[]a $LIBICONV"
-        LTLIBINTL="ifelse([$3],[],\${top_builddir}/intl,[$3])/libintl.[]gt_libtool_suffix_prefix[]a $LTLIBICONV"
-        LIBS=`echo " $LIBS " | sed -e 's/ -lintl / /' -e 's/^ //' -e 's/ $//'`
-      fi
-
-      if test "$gt_use_preinstalled_gnugettext" = "yes" \
-         || test "$nls_cv_use_gnu_gettext" = "yes"; then
-        dnl Mark actions to use GNU gettext tools.
-        CATOBJEXT=.gmo
-      fi
-    ])
-
-    if test "$gt_use_preinstalled_gnugettext" = "yes" \
-       || test "$nls_cv_use_gnu_gettext" = "yes"; then
-      AC_DEFINE(ENABLE_NLS, 1,
-        [Define to 1 if translation of program messages to the user's native language
-   is requested.])
-    else
-      USE_NLS=no
-    fi
-  fi
-
-  if test "$USE_NLS" = "yes"; then
-
-    if test "$gt_use_preinstalled_gnugettext" = "yes"; then
-      if test "$gt_cv_func_gnugettext_libintl" = "yes"; then
-        AC_MSG_CHECKING([how to link with libintl])
-        AC_MSG_RESULT([$LIBINTL])
-        AC_LIB_APPENDTOVAR([CPPFLAGS], [$INCINTL])
-      fi
-
-      dnl For backward compatibility. Some packages may be using this.
-      AC_DEFINE(HAVE_GETTEXT, 1,
-       [Define if the GNU gettext() function is already present or preinstalled.])
-      AC_DEFINE(HAVE_DCGETTEXT, 1,
-       [Define if the GNU dcgettext() function is already present or preinstalled.])
-    fi
-
-    dnl We need to process the po/ directory.
-    POSUB=po
-  fi
-
-  ifelse(gt_included_intl, yes, [
-    dnl If this is used in GNU gettext we have to set BUILD_INCLUDED_LIBINTL
-    dnl to 'yes' because some of the testsuite requires it.
-    if test "$PACKAGE" = gettext; then
-      BUILD_INCLUDED_LIBINTL=yes
-    fi
-
-    dnl Make all variables we use known to autoconf.
-    AC_SUBST(BUILD_INCLUDED_LIBINTL)
-    AC_SUBST(USE_INCLUDED_LIBINTL)
-    AC_SUBST(CATOBJEXT)
-    AC_SUBST(INTLOBJS)
-
-    dnl For backward compatibility. Some configure.ins may be using this.
-    nls_cv_header_intl=
-    nls_cv_header_libgt=
-
-    dnl For backward compatibility. Some Makefiles may be using this.
-    DATADIRNAME=share
-    AC_SUBST(DATADIRNAME)
-
-    dnl For backward compatibility. Some Makefiles may be using this.
-    INSTOBJEXT=.mo
-    AC_SUBST(INSTOBJEXT)
-
-    dnl For backward compatibility. Some Makefiles may be using this.
-    GENCAT=gencat
-    AC_SUBST(GENCAT)
-
-    dnl Enable libtool support if the surrounding package wishes it.
-    INTL_LIBTOOL_SUFFIX_PREFIX=gt_libtool_suffix_prefix
-    AC_SUBST(INTL_LIBTOOL_SUFFIX_PREFIX)
-  ])
-
-  dnl For backward compatibility. Some Makefiles may be using this.
-  INTLLIBS="$LIBINTL"
-  AC_SUBST(INTLLIBS)
-
-  dnl Make all documented variables known to autoconf.
-  AC_SUBST(LIBINTL)
-  AC_SUBST(LTLIBINTL)
-  AC_SUBST(POSUB)
-])
-
-
-dnl Checks for all prerequisites of the po subdirectory,
-dnl except for USE_NLS.
-AC_DEFUN([AM_PO_SUBDIRS],
-[
-  AC_REQUIRE([AC_PROG_MAKE_SET])dnl
-  AC_REQUIRE([AC_PROG_INSTALL])dnl
-  AC_REQUIRE([AM_MKINSTALLDIRS])dnl
-
-  dnl Perform the following tests also if --disable-nls has been given,
-  dnl because they are needed for "make dist" to work.
-
-  dnl Search for GNU msgfmt in the PATH.
-  dnl The first test excludes Solaris msgfmt and early GNU msgfmt versions.
-  dnl The second test excludes FreeBSD msgfmt.
-  AM_PATH_PROG_WITH_TEST(MSGFMT, msgfmt,
-    [$ac_dir/$ac_word --statistics /dev/null >/dev/null 2>&1 &&
-     (if $ac_dir/$ac_word --statistics /dev/null 2>&1 >/dev/null | grep usage >/dev/null; then exit 1; else exit 0; fi)],
-    :)
-  AC_PATH_PROG(GMSGFMT, gmsgfmt, $MSGFMT)
-
-  dnl Search for GNU xgettext 0.11 or newer in the PATH.
-  dnl The first test excludes Solaris xgettext and early GNU xgettext versions.
-  dnl The second test excludes FreeBSD xgettext.
-  AM_PATH_PROG_WITH_TEST(XGETTEXT, xgettext,
-    [$ac_dir/$ac_word --omit-header --copyright-holder= /dev/null >/dev/null 2>&1 &&
-     (if $ac_dir/$ac_word --omit-header --copyright-holder= /dev/null 2>&1 >/dev/null | grep usage >/dev/null; then exit 1; else exit 0; fi)],
-    :)
-  dnl Remove leftover from FreeBSD xgettext call.
-  rm -f messages.po
-
-  dnl Search for GNU msgmerge 0.11 or newer in the PATH.
-  AM_PATH_PROG_WITH_TEST(MSGMERGE, msgmerge,
-    [$ac_dir/$ac_word --update -q /dev/null /dev/null >/dev/null 2>&1], :)
-
-  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 &&
-       (if $GMSGFMT --statistics /dev/null 2>&1 >/dev/null | grep usage >/dev/null; then exit 1; else exit 0; fi); then
-      : ;
-    else
-      GMSGFMT=`echo "$GMSGFMT" | sed -e 's,^.*/,,'`
-      AC_MSG_RESULT(
-        [found $GMSGFMT 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 --copyright-holder= /dev/null >/dev/null 2>&1 &&
-       (if $XGETTEXT --omit-header --copyright-holder= /dev/null 2>&1 >/dev/null | grep usage >/dev/null; then exit 1; else exit 0; fi); then
-      : ;
-    else
-      AC_MSG_RESULT(
-        [found xgettext program is not GNU xgettext; ignore it])
-      XGETTEXT=":"
-    fi
-    dnl Remove leftover from FreeBSD xgettext call.
-    rm -f messages.po
-  fi
-
-  AC_OUTPUT_COMMANDS([
-    for ac_file in $CONFIG_FILES; do
-      # Support "outfile[:infile[:infile...]]"
-      case "$ac_file" in
-        *:*) ac_file=`echo "$ac_file"|sed 's%:.*%%'` ;;
-      esac
-      # PO directories have a Makefile.in generated from Makefile.in.in.
-      case "$ac_file" in */Makefile.in)
-        # Adjust a relative srcdir.
-        ac_dir=`echo "$ac_file"|sed 's%/[^/][^/]*$%%'`
-        ac_dir_suffix="/`echo "$ac_dir"|sed 's%^\./%%'`"
-        ac_dots=`echo "$ac_dir_suffix"|sed 's%/[^/]*%../%g'`
-        # In autoconf-2.13 it is called $ac_given_srcdir.
-        # In autoconf-2.50 it is called $srcdir.
-        test -n "$ac_given_srcdir" || ac_given_srcdir="$srcdir"
-        case "$ac_given_srcdir" in
-          .)  top_srcdir=`echo $ac_dots|sed 's%/$%%'` ;;
-          /*) top_srcdir="$ac_given_srcdir" ;;
-          *)  top_srcdir="$ac_dots$ac_given_srcdir" ;;
-        esac
-        if test -f "$ac_given_srcdir/$ac_dir/POTFILES.in"; then
-          rm -f "$ac_dir/POTFILES"
-          test -n "$as_me" && echo "$as_me: creating $ac_dir/POTFILES" || echo "creating $ac_dir/POTFILES"
-          cat "$ac_given_srcdir/$ac_dir/POTFILES.in" | sed -e "/^#/d" -e "/^[ 	]*\$/d" -e "s,.*,     $top_srcdir/& \\\\," | sed -e "\$s/\(.*\) \\\\/\1/" > "$ac_dir/POTFILES"
-          # ALL_LINGUAS, POFILES, GMOFILES, UPDATEPOFILES, DUMMYPOFILES depend
-          # on $ac_dir but don't depend on user-specified configuration
-          # parameters.
-          if test -f "$ac_given_srcdir/$ac_dir/LINGUAS"; then
-            # The LINGUAS file contains the set of available languages.
-            if test -n "$ALL_LINGUAS"; then
-              test -n "$as_me" && echo "$as_me: setting ALL_LINGUAS in configure.in is obsolete" || echo "setting ALL_LINGUAS in configure.in is obsolete"
-            fi
-            ALL_LINGUAS_=`sed -e "/^#/d" "$ac_given_srcdir/$ac_dir/LINGUAS"`
-            # Hide the ALL_LINGUAS assigment from automake.
-            eval 'ALL_LINGUAS''=$ALL_LINGUAS_'
-          fi
-          case "$ac_given_srcdir" in
-            .) srcdirpre= ;;
-            *) srcdirpre='$(srcdir)/' ;;
-          esac
-          POFILES=
-          GMOFILES=
-          UPDATEPOFILES=
-          DUMMYPOFILES=
-          for lang in $ALL_LINGUAS; do
-            POFILES="$POFILES $srcdirpre$lang.po"
-            GMOFILES="$GMOFILES $srcdirpre$lang.gmo"
-            UPDATEPOFILES="$UPDATEPOFILES $lang.po-update"
-            DUMMYPOFILES="$DUMMYPOFILES $lang.nop"
-          done
-          # CATALOGS depends on both $ac_dir and the user's LINGUAS
-          # environment variable.
-          INST_LINGUAS=
-          if test -n "$ALL_LINGUAS"; then
-            for presentlang in $ALL_LINGUAS; do
-              useit=no
-              if test "%UNSET%" != "$LINGUAS"; then
-                desiredlanguages="$LINGUAS"
-              else
-                desiredlanguages="$ALL_LINGUAS"
-              fi
-              for desiredlang in $desiredlanguages; 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
-                INST_LINGUAS="$INST_LINGUAS $presentlang"
-              fi
-            done
-          fi
-          CATALOGS=
-          if test -n "$INST_LINGUAS"; then
-            for lang in $INST_LINGUAS; do
-              CATALOGS="$CATALOGS $lang.gmo"
-            done
-          fi
-          test -n "$as_me" && echo "$as_me: creating $ac_dir/Makefile" || echo "creating $ac_dir/Makefile"
-          sed -e "/^POTFILES =/r $ac_dir/POTFILES" -e "/^# Makevars/r $ac_given_srcdir/$ac_dir/Makevars" -e "s|@POFILES@|$POFILES|g" -e "s|@GMOFILES@|$GMOFILES|g" -e "s|@UPDATEPOFILES@|$UPDATEPOFILES|g" -e "s|@DUMMYPOFILES@|$DUMMYPOFILES|g" -e "s|@CATALOGS@|$CATALOGS|g" "$ac_dir/Makefile.in" > "$ac_dir/Makefile"
-          for f in "$ac_given_srcdir/$ac_dir"/Rules-*; do
-            if test -f "$f"; then
-              case "$f" in
-                *.orig | *.bak | *~) ;;
-                *) cat "$f" >> "$ac_dir/Makefile" ;;
-              esac
-            fi
-          done
-        fi
-        ;;
-      esac
-    done],
-   [# Capture the value of obsolete ALL_LINGUAS because we need it to compute
-    # POFILES, GMOFILES, UPDATEPOFILES, DUMMYPOFILES, CATALOGS. But hide it
-    # from automake.
-    eval 'ALL_LINGUAS''="$ALL_LINGUAS"'
-    # Capture the value of LINGUAS because we need it to compute CATALOGS.
-    LINGUAS="${LINGUAS-%UNSET%}"
-   ])
-])
-
-
-dnl Checks for all prerequisites of the intl subdirectory,
-dnl except for INTL_LIBTOOL_SUFFIX_PREFIX (and possibly LIBTOOL), INTLOBJS,
-dnl            USE_INCLUDED_LIBINTL, BUILD_INCLUDED_LIBINTL.
-AC_DEFUN([AM_INTL_SUBDIR],
-[
-  AC_REQUIRE([AC_PROG_INSTALL])dnl
-  AC_REQUIRE([AM_MKINSTALLDIRS])dnl
-  AC_REQUIRE([AC_PROG_CC])dnl
-  AC_REQUIRE([AC_CANONICAL_HOST])dnl
-  AC_REQUIRE([AC_PROG_RANLIB])dnl
-  AC_REQUIRE([AC_ISC_POSIX])dnl
-  AC_REQUIRE([AC_HEADER_STDC])dnl
-  AC_REQUIRE([AC_C_CONST])dnl
-  AC_REQUIRE([AC_C_INLINE])dnl
-  AC_REQUIRE([AC_TYPE_OFF_T])dnl
-  AC_REQUIRE([AC_TYPE_SIZE_T])dnl
-  AC_REQUIRE([AC_FUNC_ALLOCA])dnl
-  AC_REQUIRE([AC_FUNC_MMAP])dnl
-  AC_REQUIRE([jm_GLIBC21])dnl
-  AC_REQUIRE([gt_INTDIV0])dnl
-  AC_REQUIRE([jm_AC_TYPE_UINTMAX_T])dnl
-  AC_REQUIRE([gt_HEADER_INTTYPES_H])dnl
-  AC_REQUIRE([gt_INTTYPES_PRI])dnl
-
-  AC_CHECK_HEADERS([argz.h limits.h locale.h nl_types.h malloc.h stddef.h \
-stdlib.h string.h unistd.h sys/param.h])
-  AC_CHECK_FUNCS([feof_unlocked fgets_unlocked getc_unlocked getcwd getegid \
-geteuid getgid getuid mempcpy munmap putenv setenv setlocale stpcpy \
-strcasecmp strdup strtoul tsearch __argz_count __argz_stringify __argz_next])
-
-  AM_ICONV
-  AM_LANGINFO_CODESET
-  if test $ac_cv_header_locale_h = yes; then
-    AM_LC_MESSAGES
-  fi
-
-  dnl intl/plural.c is generated from intl/plural.y. It requires bison,
-  dnl because plural.y uses bison specific features. It requires at least
-  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
-])
-
-
-AC_DEFUN([AM_MKINSTALLDIRS],
-[
-  dnl If the AC_CONFIG_AUX_DIR macro for autoconf is used we possibly
-  dnl find the mkinstalldirs script in another subdir but $(top_srcdir).
-  dnl Try to locate is.
-  MKINSTALLDIRS=
-  if test -n "$ac_aux_dir"; then
-    MKINSTALLDIRS="$ac_aux_dir/mkinstalldirs"
-  fi
-  if test -z "$MKINSTALLDIRS"; then
-    MKINSTALLDIRS="\$(top_srcdir)/mkinstalldirs"
-  fi
-  AC_SUBST(MKINSTALLDIRS)
-])
-
-
-dnl Usage: AM_GNU_GETTEXT_VERSION([gettext-version])
-AC_DEFUN([AM_GNU_GETTEXT_VERSION], [])
--- a/m4/glib-2.0.m4
+++ b/m4/glib-2.0.m4
@@ -1,215 +0,0 @@
-# Configure paths for GLIB
-# Owen Taylor     1997-2001
-
-dnl AM_PATH_GLIB_2_0([MINIMUM-VERSION, [ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND [, MODULES]]]])
-dnl Test for GLIB, and define GLIB_CFLAGS and GLIB_LIBS, if gmodule, gobject or 
-dnl gthread is specified in MODULES, pass to pkg-config
-dnl
-AC_DEFUN([AM_PATH_GLIB_2_0],
-[dnl 
-dnl Get the cflags and libraries from pkg-config
-dnl
-AC_ARG_ENABLE(glibtest, [  --disable-glibtest      do not try to compile and run a test GLIB program],
-		    , enable_glibtest=yes)
-
-  pkg_config_args=glib-2.0
-  for module in . $4
-  do
-      case "$module" in
-         gmodule) 
-             pkg_config_args="$pkg_config_args gmodule-2.0"
-         ;;
-         gmodule-no-export) 
-             pkg_config_args="$pkg_config_args gmodule-no-export-2.0"
-         ;;
-         gobject) 
-             pkg_config_args="$pkg_config_args gobject-2.0"
-         ;;
-         gthread) 
-             pkg_config_args="$pkg_config_args gthread-2.0"
-         ;;
-      esac
-  done
-
-  AC_PATH_PROG(PKG_CONFIG, pkg-config, no)
-
-  no_glib=""
-
-  if test x$PKG_CONFIG != xno ; then
-    if $PKG_CONFIG --atleast-pkgconfig-version 0.7 ; then
-      :
-    else
-      echo *** pkg-config too old; version 0.7 or better required.
-      no_glib=yes
-      PKG_CONFIG=no
-    fi
-  else
-    no_glib=yes
-  fi
-
-  min_glib_version=ifelse([$1], ,2.0.0,$1)
-  AC_MSG_CHECKING(for GLIB - version >= $min_glib_version)
-
-  if test x$PKG_CONFIG != xno ; then
-    ## don't try to run the test against uninstalled libtool libs
-    if $PKG_CONFIG --uninstalled $pkg_config_args; then
-	  echo "Will use uninstalled version of GLib found in PKG_CONFIG_PATH"
-	  enable_glibtest=no
-    fi
-
-    if $PKG_CONFIG --atleast-version $min_glib_version $pkg_config_args; then
-	  :
-    else
-	  no_glib=yes
-    fi
-  fi
-
-  if test x"$no_glib" = x ; then
-    GLIB_GENMARSHAL=`$PKG_CONFIG --variable=glib_genmarshal glib-2.0`
-    GOBJECT_QUERY=`$PKG_CONFIG --variable=gobject_query glib-2.0`
-    GLIB_MKENUMS=`$PKG_CONFIG --variable=glib_mkenums glib-2.0`
-
-    GLIB_CFLAGS=`$PKG_CONFIG --cflags $pkg_config_args`
-    GLIB_LIBS=`$PKG_CONFIG --libs $pkg_config_args`
-    glib_config_major_version=`$PKG_CONFIG --modversion glib-2.0 | \
-           sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\1/'`
-    glib_config_minor_version=`$PKG_CONFIG --modversion glib-2.0 | \
-           sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\2/'`
-    glib_config_micro_version=`$PKG_CONFIG --modversion glib-2.0 | \
-           sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\3/'`
-    if test "x$enable_glibtest" = "xyes" ; then
-      ac_save_CFLAGS="$CFLAGS"
-      ac_save_LIBS="$LIBS"
-      CFLAGS="$CFLAGS $GLIB_CFLAGS"
-      LIBS="$GLIB_LIBS $LIBS"
-dnl
-dnl Now check if the installed GLIB is sufficiently new. (Also sanity
-dnl checks the results of pkg-config to some extent)
-dnl
-      rm -f conf.glibtest
-      AC_TRY_RUN([
-#include <glib.h>
-#include <stdio.h>
-#include <stdlib.h>
-
-int 
-main ()
-{
-  int major, minor, micro;
-  char *tmp_version;
-
-  system ("touch conf.glibtest");
-
-  /* HP/UX 9 (%@#!) writes to sscanf strings */
-  tmp_version = g_strdup("$min_glib_version");
-  if (sscanf(tmp_version, "%d.%d.%d", &major, &minor, &micro) != 3) {
-     printf("%s, bad version string\n", "$min_glib_version");
-     exit(1);
-   }
-
-  if ((glib_major_version != $glib_config_major_version) ||
-      (glib_minor_version != $glib_config_minor_version) ||
-      (glib_micro_version != $glib_config_micro_version))
-    {
-      printf("\n*** 'pkg-config --modversion glib-2.0' returned %d.%d.%d, but GLIB (%d.%d.%d)\n", 
-             $glib_config_major_version, $glib_config_minor_version, $glib_config_micro_version,
-             glib_major_version, glib_minor_version, glib_micro_version);
-      printf ("*** was found! If pkg-config was correct, then it is best\n");
-      printf ("*** to remove the old version of GLib. You may also be able to fix the error\n");
-      printf("*** by modifying your LD_LIBRARY_PATH enviroment variable, or by editing\n");
-      printf("*** /etc/ld.so.conf. Make sure you have run ldconfig if that is\n");
-      printf("*** required on your system.\n");
-      printf("*** If pkg-config was wrong, set the environment variable PKG_CONFIG_PATH\n");
-      printf("*** to point to the correct configuration files\n");
-    } 
-  else if ((glib_major_version != GLIB_MAJOR_VERSION) ||
-	   (glib_minor_version != GLIB_MINOR_VERSION) ||
-           (glib_micro_version != GLIB_MICRO_VERSION))
-    {
-      printf("*** GLIB header files (version %d.%d.%d) do not match\n",
-	     GLIB_MAJOR_VERSION, GLIB_MINOR_VERSION, GLIB_MICRO_VERSION);
-      printf("*** library (version %d.%d.%d)\n",
-	     glib_major_version, glib_minor_version, glib_micro_version);
-    }
-  else
-    {
-      if ((glib_major_version > major) ||
-        ((glib_major_version == major) && (glib_minor_version > minor)) ||
-        ((glib_major_version == major) && (glib_minor_version == minor) && (glib_micro_version >= micro)))
-      {
-        return 0;
-       }
-     else
-      {
-        printf("\n*** An old version of GLIB (%d.%d.%d) was found.\n",
-               glib_major_version, glib_minor_version, glib_micro_version);
-        printf("*** You need a version of GLIB newer than %d.%d.%d. The latest version of\n",
-	       major, minor, micro);
-        printf("*** GLIB is always available from ftp://ftp.gtk.org.\n");
-        printf("***\n");
-        printf("*** If you have already installed a sufficiently new version, this error\n");
-        printf("*** probably means that the wrong copy of the pkg-config shell script is\n");
-        printf("*** being found. The easiest way to fix this is to remove the old version\n");
-        printf("*** of GLIB, but you can also set the PKG_CONFIG environment to point to the\n");
-        printf("*** correct copy of pkg-config. (In this case, you will have to\n");
-        printf("*** modify your LD_LIBRARY_PATH enviroment variable, or edit /etc/ld.so.conf\n");
-        printf("*** so that the correct libraries are found at run-time))\n");
-      }
-    }
-  return 1;
-}
-],, no_glib=yes,[echo $ac_n "cross compiling; assumed OK... $ac_c"])
-       CFLAGS="$ac_save_CFLAGS"
-       LIBS="$ac_save_LIBS"
-     fi
-  fi
-  if test "x$no_glib" = x ; then
-     AC_MSG_RESULT(yes (version $glib_config_major_version.$glib_config_minor_version.$glib_config_micro_version))
-     ifelse([$2], , :, [$2])     
-  else
-     AC_MSG_RESULT(no)
-     if test "$PKG_CONFIG" = "no" ; then
-       echo "*** A new enough version of pkg-config was not found."
-       echo "*** See http://www.freedesktop.org/software/pkgconfig/"
-     else
-       if test -f conf.glibtest ; then
-        :
-       else
-          echo "*** Could not run GLIB test program, checking why..."
-          ac_save_CFLAGS="$CFLAGS"
-          ac_save_LIBS="$LIBS"
-          CFLAGS="$CFLAGS $GLIB_CFLAGS"
-          LIBS="$LIBS $GLIB_LIBS"
-          AC_TRY_LINK([
-#include <glib.h>
-#include <stdio.h>
-],      [ return ((glib_major_version) || (glib_minor_version) || (glib_micro_version)); ],
-        [ echo "*** The test program compiled, but did not run. This usually means"
-          echo "*** that the run-time linker is not finding GLIB or finding the wrong"
-          echo "*** version of GLIB. If it is not finding GLIB, you'll need to set your"
-          echo "*** LD_LIBRARY_PATH environment variable, or edit /etc/ld.so.conf to point"
-          echo "*** to the installed location  Also, make sure you have run ldconfig if that"
-          echo "*** is required on your system"
-	  echo "***"
-          echo "*** If you have an old version installed, it is best to remove it, although"
-          echo "*** you may also be able to get things to work by modifying LD_LIBRARY_PATH" ],
-        [ echo "*** The test program failed to compile or link. See the file config.log for the"
-          echo "*** exact error that occured. This usually means GLIB is incorrectly installed."])
-          CFLAGS="$ac_save_CFLAGS"
-          LIBS="$ac_save_LIBS"
-       fi
-     fi
-     GLIB_CFLAGS=""
-     GLIB_LIBS=""
-     GLIB_GENMARSHAL=""
-     GOBJECT_QUERY=""
-     GLIB_MKENUMS=""
-     ifelse([$3], , :, [$3])
-  fi
-  AC_SUBST(GLIB_CFLAGS)
-  AC_SUBST(GLIB_LIBS)
-  AC_SUBST(GLIB_GENMARSHAL)
-  AC_SUBST(GOBJECT_QUERY)
-  AC_SUBST(GLIB_MKENUMS)
-  rm -f conf.glibtest
-])
--- a/m4/glibc21.m4
+++ b/m4/glibc21.m4
@@ -1,32 +0,0 @@
-# glibc21.m4 serial 2 (fileutils-4.1.3, gettext-0.10.40)
-dnl Copyright (C) 2000-2002 Free Software Foundation, Inc.
-dnl This file is free software, distributed under the terms of the GNU
-dnl General Public License.  As a special exception to the GNU General
-dnl Public License, this file may be distributed as part of a program
-dnl that contains a configuration script generated by Autoconf, under
-dnl the same distribution terms as the rest of that program.
-
-# Test for the GNU C Library, version 2.1 or newer.
-# From Bruno Haible.
-
-AC_DEFUN([jm_GLIBC21],
-  [
-    AC_CACHE_CHECK(whether we are using the GNU C Library 2.1 or newer,
-      ac_cv_gnu_library_2_1,
-      [AC_EGREP_CPP([Lucky GNU user],
-	[
-#include <features.h>
-#ifdef __GNU_LIBRARY__
- #if (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 1) || (__GLIBC__ > 2)
-  Lucky GNU user
- #endif
-#endif
-	],
-	ac_cv_gnu_library_2_1=yes,
-	ac_cv_gnu_library_2_1=no)
-      ]
-    )
-    AC_SUBST(GLIBC21)
-    GLIBC21="$ac_cv_gnu_library_2_1"
-  ]
-)
--- a/m4/iconv.m4
+++ b/m4/iconv.m4
@@ -1,103 +0,0 @@
-# iconv.m4 serial AM4 (gettext-0.11.3)
-dnl Copyright (C) 2000-2002 Free Software Foundation, Inc.
-dnl This file is free software, distributed under the terms of the GNU
-dnl General Public License.  As a special exception to the GNU General
-dnl Public License, this file may be distributed as part of a program
-dnl that contains a configuration script generated by Autoconf, under
-dnl the same distribution terms as the rest of that program.
-
-dnl From Bruno Haible.
-
-AC_DEFUN([AM_ICONV_LINKFLAGS_BODY],
-[
-  dnl Prerequisites of AC_LIB_LINKFLAGS_BODY.
-  AC_REQUIRE([AC_LIB_PREPARE_PREFIX])
-  AC_REQUIRE([AC_LIB_RPATH])
-
-  dnl Search for libiconv and define LIBICONV, LTLIBICONV and INCICONV
-  dnl accordingly.
-  AC_LIB_LINKFLAGS_BODY([iconv])
-])
-
-AC_DEFUN([AM_ICONV_LINK],
-[
-  dnl Some systems have iconv in libc, some have it in libiconv (OSF/1 and
-  dnl those with the standalone portable GNU libiconv installed).
-
-  dnl Search for libiconv and define LIBICONV, LTLIBICONV and INCICONV
-  dnl accordingly.
-  AC_REQUIRE([AM_ICONV_LINKFLAGS_BODY])
-
-  dnl Add $INCICONV to CPPFLAGS before performing the following checks,
-  dnl because if the user has installed libiconv and not disabled its use
-  dnl via --without-libiconv-prefix, he wants to use it. The first
-  dnl AC_TRY_LINK will then fail, the second AC_TRY_LINK will succeed.
-  am_save_CPPFLAGS="$CPPFLAGS"
-  AC_LIB_APPENDTOVAR([CPPFLAGS], [$INCICONV])
-
-  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 $LIBICONV"
-      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.])
-  fi
-  if test "$am_cv_lib_iconv" = yes; then
-    AC_MSG_CHECKING([how to link with libiconv])
-    AC_MSG_RESULT([$LIBICONV])
-  else
-    dnl If $LIBICONV didn't lead to a usable library, we don't need $INCICONV
-    dnl either.
-    CPPFLAGS="$am_save_CPPFLAGS"
-    LIBICONV=
-    LTLIBICONV=
-  fi
-  AC_SUBST(LIBICONV)
-  AC_SUBST(LTLIBICONV)
-])
-
-AC_DEFUN([AM_ICONV],
-[
-  AM_ICONV_LINK
-  if test "$am_cv_func_iconv" = yes; then
-    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
-])
--- a/m4/intdiv0.m4
+++ b/m4/intdiv0.m4
@@ -1,72 +0,0 @@
-# intdiv0.m4 serial 1 (gettext-0.11.3)
-dnl Copyright (C) 2002 Free Software Foundation, Inc.
-dnl This file is free software, distributed under the terms of the GNU
-dnl General Public License.  As a special exception to the GNU General
-dnl Public License, this file may be distributed as part of a program
-dnl that contains a configuration script generated by Autoconf, under
-dnl the same distribution terms as the rest of that program.
-
-dnl From Bruno Haible.
-
-AC_DEFUN([gt_INTDIV0],
-[
-  AC_REQUIRE([AC_PROG_CC])dnl
-  AC_REQUIRE([AC_CANONICAL_HOST])dnl
-
-  AC_CACHE_CHECK([whether integer division by zero raises SIGFPE],
-    gt_cv_int_divbyzero_sigfpe,
-    [
-      AC_TRY_RUN([
-#include <stdlib.h>
-#include <signal.h>
-
-static void
-#ifdef __cplusplus
-sigfpe_handler (int sig)
-#else
-sigfpe_handler (sig) int sig;
-#endif
-{
-  /* Exit with code 0 if SIGFPE, with code 1 if any other signal.  */
-  exit (sig != SIGFPE);
-}
-
-int x = 1;
-int y = 0;
-int z;
-int nan;
-
-int main ()
-{
-  signal (SIGFPE, sigfpe_handler);
-/* IRIX and AIX (when "xlc -qcheck" is used) yield signal SIGTRAP.  */
-#if (defined (__sgi) || defined (_AIX)) && defined (SIGTRAP)
-  signal (SIGTRAP, sigfpe_handler);
-#endif
-/* Linux/SPARC yields signal SIGILL.  */
-#if defined (__sparc__) && defined (__linux__)
-  signal (SIGILL, sigfpe_handler);
-#endif
-
-  z = x / y;
-  nan = y / y;
-  exit (1);
-}
-], gt_cv_int_divbyzero_sigfpe=yes, gt_cv_int_divbyzero_sigfpe=no,
-        [
-          # Guess based on the CPU.
-          case "$host_cpu" in
-            alpha* | i[34567]86 | m68k | s390*)
-              gt_cv_int_divbyzero_sigfpe="guessing yes";;
-            *)
-              gt_cv_int_divbyzero_sigfpe="guessing no";;
-          esac
-        ])
-    ])
-  case "$gt_cv_int_divbyzero_sigfpe" in
-    *yes) value=1;;
-    *) value=0;;
-  esac
-  AC_DEFINE_UNQUOTED(INTDIV0_RAISES_SIGFPE, $value,
-    [Define if integer division by zero raises signal SIGFPE.])
-])
--- a/m4/inttypes-pri.m4
+++ b/m4/inttypes-pri.m4
@@ -1,32 +0,0 @@
-# inttypes-pri.m4 serial 1 (gettext-0.11.4)
-dnl Copyright (C) 1997-2002 Free Software Foundation, Inc.
-dnl This file is free software, distributed under the terms of the GNU
-dnl General Public License.  As a special exception to the GNU General
-dnl Public License, this file may be distributed as part of a program
-dnl that contains a configuration script generated by Autoconf, under
-dnl the same distribution terms as the rest of that program.
-
-dnl From Bruno Haible.
-
-# Define PRI_MACROS_BROKEN if <inttypes.h> exists and defines the PRI*
-# macros to non-string values.  This is the case on AIX 4.3.3.
-
-AC_DEFUN([gt_INTTYPES_PRI],
-[
-  AC_REQUIRE([gt_HEADER_INTTYPES_H])
-  if test $gt_cv_header_inttypes_h = yes; then
-    AC_CACHE_CHECK([whether the inttypes.h PRIxNN macros are broken],
-      gt_cv_inttypes_pri_broken,
-      [
-        AC_TRY_COMPILE([#include <inttypes.h>
-#ifdef PRId32
-char *p = PRId32;
-#endif
-], [], gt_cv_inttypes_pri_broken=no, gt_cv_inttypes_pri_broken=yes)
-      ])
-  fi
-  if test "$gt_cv_inttypes_pri_broken" = yes; then
-    AC_DEFINE_UNQUOTED(PRI_MACROS_BROKEN, 1,
-      [Define if <inttypes.h> exists and defines unusable PRI* macros.])
-  fi
-])
--- a/m4/inttypes.m4
+++ b/m4/inttypes.m4
@@ -1,27 +0,0 @@
-# inttypes.m4 serial 1 (gettext-0.11.4)
-dnl Copyright (C) 1997-2002 Free Software Foundation, Inc.
-dnl This file is free software, distributed under the terms of the GNU
-dnl General Public License.  As a special exception to the GNU General
-dnl Public License, this file may be distributed as part of a program
-dnl that contains a configuration script generated by Autoconf, under
-dnl the same distribution terms as the rest of that program.
-
-dnl From Paul Eggert.
-
-# Define HAVE_INTTYPES_H if <inttypes.h> exists and doesn't clash with
-# <sys/types.h>.
-
-AC_DEFUN([gt_HEADER_INTTYPES_H],
-[
-  AC_CACHE_CHECK([for inttypes.h], gt_cv_header_inttypes_h,
-  [
-    AC_TRY_COMPILE(
-      [#include <sys/types.h>
-#include <inttypes.h>],
-      [], gt_cv_header_inttypes_h=yes, gt_cv_header_inttypes_h=no)
-  ])
-  if test $gt_cv_header_inttypes_h = yes; then
-    AC_DEFINE_UNQUOTED(HAVE_INTTYPES_H, 1,
-      [Define if <inttypes.h> exists and doesn't clash with <sys/types.h>.])
-  fi
-])
--- a/m4/inttypes_h.m4
+++ b/m4/inttypes_h.m4
@@ -1,28 +0,0 @@
-# inttypes_h.m4 serial 4 (gettext-0.11.4)
-dnl Copyright (C) 1997-2002 Free Software Foundation, Inc.
-dnl This file is free software, distributed under the terms of the GNU
-dnl General Public License.  As a special exception to the GNU General
-dnl Public License, this file may be distributed as part of a program
-dnl that contains a configuration script generated by Autoconf, under
-dnl the same distribution terms as the rest of that program.
-
-dnl From Paul Eggert.
-
-# Define HAVE_INTTYPES_H_WITH_UINTMAX if <inttypes.h> exists,
-# doesn't clash with <sys/types.h>, and declares uintmax_t.
-
-AC_DEFUN([jm_AC_HEADER_INTTYPES_H],
-[
-  AC_CACHE_CHECK([for inttypes.h], jm_ac_cv_header_inttypes_h,
-  [AC_TRY_COMPILE(
-    [#include <sys/types.h>
-#include <inttypes.h>],
-    [uintmax_t i = (uintmax_t) -1;],
-    jm_ac_cv_header_inttypes_h=yes,
-    jm_ac_cv_header_inttypes_h=no)])
-  if test $jm_ac_cv_header_inttypes_h = yes; then
-    AC_DEFINE_UNQUOTED(HAVE_INTTYPES_H_WITH_UINTMAX, 1,
-[Define if <inttypes.h> exists, doesn't clash with <sys/types.h>,
-   and declares uintmax_t. ])
-  fi
-])
--- a/m4/isc-posix.m4
+++ b/m4/isc-posix.m4
@@ -1,26 +0,0 @@
-# isc-posix.m4 serial 2 (gettext-0.11.2)
-dnl Copyright (C) 1995-2002 Free Software Foundation, Inc.
-dnl This file is free software, distributed under the terms of the GNU
-dnl General Public License.  As a special exception to the GNU General
-dnl Public License, this file may be distributed as part of a program
-dnl that contains a configuration script generated by Autoconf, under
-dnl the same distribution terms as the rest of that program.
-
-# This file is not needed with autoconf-2.53 and newer.  Remove it in 2005.
-
-# This test replaces the one in autoconf.
-# Currently this macro should have the same name as the autoconf macro
-# because gettext's gettext.m4 (distributed in the automake package)
-# still uses it.  Otherwise, the use in gettext.m4 makes autoheader
-# give these diagnostics:
-#   configure.in:556: AC_TRY_COMPILE was called before AC_ISC_POSIX
-#   configure.in:556: AC_TRY_RUN was called before AC_ISC_POSIX
-
-undefine([AC_ISC_POSIX])
-
-AC_DEFUN([AC_ISC_POSIX],
-  [
-    dnl This test replaces the obsolescent AC_ISC_POSIX kludge.
-    AC_CHECK_LIB(cposix, strerror, [LIBS="$LIBS -lcposix"])
-  ]
-)
--- a/m4/lcmessage.m4
+++ b/m4/lcmessage.m4
@@ -1,32 +0,0 @@
-# lcmessage.m4 serial 3 (gettext-0.11.3)
-dnl Copyright (C) 1995-2002 Free Software Foundation, Inc.
-dnl This file is free software, distributed under the terms of the GNU
-dnl General Public License.  As a special exception to the GNU General
-dnl Public License, this file may be distributed as part of a program
-dnl that contains a configuration script generated by Autoconf, under
-dnl the same distribution terms as the rest of that program.
-dnl
-dnl This file can can be used in projects which are not available under
-dnl the GNU General Public License or the GNU Library General Public
-dnl License but which still want to provide support for the GNU gettext
-dnl functionality.
-dnl Please note that the actual code of the GNU gettext library is covered
-dnl by the GNU Library General Public License, and the rest of the GNU
-dnl gettext package package is covered by the GNU General Public License.
-dnl They are *not* in the public domain.
-
-dnl Authors:
-dnl   Ulrich Drepper <drepper@cygnus.com>, 1995.
-
-# Check whether LC_MESSAGES is available in <locale.h>.
-
-AC_DEFUN([AM_LC_MESSAGES],
-[
-  AC_CACHE_CHECK([for LC_MESSAGES], am_cv_val_LC_MESSAGES,
-    [AC_TRY_LINK([#include <locale.h>], [return LC_MESSAGES],
-       am_cv_val_LC_MESSAGES=yes, am_cv_val_LC_MESSAGES=no)])
-  if test $am_cv_val_LC_MESSAGES = yes; then
-    AC_DEFINE(HAVE_LC_MESSAGES, 1,
-      [Define if your <locale.h> file defines LC_MESSAGES.])
-  fi
-])
--- a/m4/lib-ld.m4
+++ b/m4/lib-ld.m4
@@ -1,97 +0,0 @@
-# lib-ld.m4 serial 1 (gettext-0.11)
-dnl Copyright (C) 1996-2002 Free Software Foundation, Inc.
-dnl This file is free software, distributed under the terms of the GNU
-dnl General Public License.  As a special exception to the GNU General
-dnl Public License, this file may be distributed as part of a program
-dnl that contains a configuration script generated by Autoconf, under
-dnl the same distribution terms as the rest of that program.
-
-dnl Subroutines of libtool.m4,
-dnl with replacements s/AC_/AC_LIB/ and s/lt_cv/acl_cv/ to avoid collision
-dnl with libtool.m4.
-
-dnl From libtool-1.4. Sets the variable with_gnu_ld to yes or no.
-AC_DEFUN([AC_LIB_PROG_LD_GNU],
-[AC_CACHE_CHECK([if the linker ($LD) is GNU ld], acl_cv_prog_gnu_ld,
-[# I'd rather use --version here, but apparently some GNU ld's only accept -v.
-if $LD -v 2>&1 </dev/null | egrep '(GNU|with BFD)' 1>&5; then
-  acl_cv_prog_gnu_ld=yes
-else
-  acl_cv_prog_gnu_ld=no
-fi])
-with_gnu_ld=$acl_cv_prog_gnu_ld
-])
-
-dnl From libtool-1.4. Sets the variable LD.
-AC_DEFUN([AC_LIB_PROG_LD],
-[AC_ARG_WITH(gnu-ld,
-[  --with-gnu-ld           assume the C compiler uses GNU ld [default=no]],
-test "$withval" = no || with_gnu_ld=yes, with_gnu_ld=no)
-AC_REQUIRE([AC_PROG_CC])dnl
-AC_REQUIRE([AC_CANONICAL_HOST])dnl
-ac_prog=ld
-if test "$GCC" = yes; then
-  # Check if gcc -print-prog-name=ld gives a path.
-  AC_MSG_CHECKING([for ld used by GCC])
-  case $host in
-  *-*-mingw*)
-    # gcc leaves a trailing carriage return which upsets mingw
-    ac_prog=`($CC -print-prog-name=ld) 2>&5 | tr -d '\015'` ;;
-  *)
-    ac_prog=`($CC -print-prog-name=ld) 2>&5` ;;
-  esac
-  case $ac_prog in
-    # Accept absolute paths.
-    [[\\/]* | [A-Za-z]:[\\/]*)]
-      [re_direlt='/[^/][^/]*/\.\./']
-      # Canonicalize the path of ld
-      ac_prog=`echo $ac_prog| sed 's%\\\\%/%g'`
-      while echo $ac_prog | grep "$re_direlt" > /dev/null 2>&1; do
-	ac_prog=`echo $ac_prog| sed "s%$re_direlt%/%"`
-      done
-      test -z "$LD" && LD="$ac_prog"
-      ;;
-  "")
-    # If it fails, then pretend we aren't using GCC.
-    ac_prog=ld
-    ;;
-  *)
-    # If it is relative, then search for the first ld in PATH.
-    with_gnu_ld=unknown
-    ;;
-  esac
-elif test "$with_gnu_ld" = yes; then
-  AC_MSG_CHECKING([for GNU ld])
-else
-  AC_MSG_CHECKING([for non-GNU ld])
-fi
-AC_CACHE_VAL(acl_cv_path_LD,
-[if test -z "$LD"; then
-  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS="${IFS}${PATH_SEPARATOR-:}"
-  for ac_dir in $PATH; do
-    test -z "$ac_dir" && ac_dir=.
-    if test -f "$ac_dir/$ac_prog" || test -f "$ac_dir/$ac_prog$ac_exeext"; then
-      acl_cv_path_LD="$ac_dir/$ac_prog"
-      # Check to see if the program is GNU ld.  I'd rather use --version,
-      # but apparently some GNU ld's only accept -v.
-      # Break only if it was the GNU/non-GNU ld that we prefer.
-      if "$acl_cv_path_LD" -v 2>&1 < /dev/null | egrep '(GNU|with BFD)' > /dev/null; then
-	test "$with_gnu_ld" != no && break
-      else
-	test "$with_gnu_ld" != yes && break
-      fi
-    fi
-  done
-  IFS="$ac_save_ifs"
-else
-  acl_cv_path_LD="$LD" # Let the user override the test with a path.
-fi])
-LD="$acl_cv_path_LD"
-if test -n "$LD"; then
-  AC_MSG_RESULT($LD)
-else
-  AC_MSG_RESULT(no)
-fi
-test -z "$LD" && AC_MSG_ERROR([no acceptable ld found in \$PATH])
-AC_LIB_PROG_LD_GNU
-])
--- a/m4/lib-link.m4
+++ b/m4/lib-link.m4
@@ -1,554 +0,0 @@
-# lib-link.m4 serial 3 (gettext-0.11.3)
-dnl Copyright (C) 2001-2002 Free Software Foundation, Inc.
-dnl This file is free software, distributed under the terms of the GNU
-dnl General Public License.  As a special exception to the GNU General
-dnl Public License, this file may be distributed as part of a program
-dnl that contains a configuration script generated by Autoconf, under
-dnl the same distribution terms as the rest of that program.
-
-dnl From Bruno Haible.
-
-dnl AC_LIB_LINKFLAGS(name [, dependencies]) searches for libname and
-dnl the libraries corresponding to explicit and implicit dependencies.
-dnl Sets and AC_SUBSTs the LIB${NAME} and LTLIB${NAME} variables and
-dnl augments the CPPFLAGS variable.
-AC_DEFUN([AC_LIB_LINKFLAGS],
-[
-  AC_REQUIRE([AC_LIB_PREPARE_PREFIX])
-  AC_REQUIRE([AC_LIB_RPATH])
-  define([Name],[translit([$1],[./-], [___])])
-  define([NAME],[translit([$1],[abcdefghijklmnopqrstuvwxyz./-],
-                               [ABCDEFGHIJKLMNOPQRSTUVWXYZ___])])
-  AC_CACHE_CHECK([how to link with lib[]$1], [ac_cv_lib[]Name[]_libs], [
-    AC_LIB_LINKFLAGS_BODY([$1], [$2])
-    ac_cv_lib[]Name[]_libs="$LIB[]NAME"
-    ac_cv_lib[]Name[]_ltlibs="$LTLIB[]NAME"
-    ac_cv_lib[]Name[]_cppflags="$INC[]NAME"
-  ])
-  LIB[]NAME="$ac_cv_lib[]Name[]_libs"
-  LTLIB[]NAME="$ac_cv_lib[]Name[]_ltlibs"
-  INC[]NAME="$ac_cv_lib[]Name[]_cppflags"
-  AC_LIB_APPENDTOVAR([CPPFLAGS], [$INC]NAME)
-  AC_SUBST([LIB]NAME)
-  AC_SUBST([LTLIB]NAME)
-  dnl Also set HAVE_LIB[]NAME so that AC_LIB_HAVE_LINKFLAGS can reuse the
-  dnl results of this search when this library appears as a dependency.
-  HAVE_LIB[]NAME=yes
-  undefine([Name])
-  undefine([NAME])
-])
-
-dnl AC_LIB_HAVE_LINKFLAGS(name, dependencies, includes, testcode)
-dnl searches for libname and the libraries corresponding to explicit and
-dnl implicit dependencies, together with the specified include files and
-dnl the ability to compile and link the specified testcode. If found, it
-dnl sets and AC_SUBSTs HAVE_LIB${NAME}=yes and the LIB${NAME} and
-dnl LTLIB${NAME} variables and augments the CPPFLAGS variable, and
-dnl #defines HAVE_LIB${NAME} to 1. Otherwise, it sets and AC_SUBSTs
-dnl HAVE_LIB${NAME}=no and LIB${NAME} and LTLIB${NAME} to empty.
-AC_DEFUN([AC_LIB_HAVE_LINKFLAGS],
-[
-  AC_REQUIRE([AC_LIB_PREPARE_PREFIX])
-  AC_REQUIRE([AC_LIB_RPATH])
-  define([Name],[translit([$1],[./-], [___])])
-  define([NAME],[translit([$1],[abcdefghijklmnopqrstuvwxyz./-],
-                               [ABCDEFGHIJKLMNOPQRSTUVWXYZ___])])
-
-  dnl Search for lib[]Name and define LIB[]NAME, LTLIB[]NAME and INC[]NAME
-  dnl accordingly.
-  AC_LIB_LINKFLAGS_BODY([$1], [$2])
-
-  dnl Add $INC[]NAME to CPPFLAGS before performing the following checks,
-  dnl because if the user has installed lib[]Name and not disabled its use
-  dnl via --without-lib[]Name-prefix, he wants to use it.
-  ac_save_CPPFLAGS="$CPPFLAGS"
-  AC_LIB_APPENDTOVAR([CPPFLAGS], [$INC]NAME)
-
-  AC_CACHE_CHECK([for lib[]$1], [ac_cv_lib[]Name], [
-    ac_save_LIBS="$LIBS"
-    LIBS="$LIBS $LIB[]NAME"
-    AC_TRY_LINK([$3], [$4], [ac_cv_lib[]Name=yes], [ac_cv_lib[]Name=no])
-    LIBS="$ac_save_LIBS"
-  ])
-  if test "$ac_cv_lib[]Name" = yes; then
-    HAVE_LIB[]NAME=yes
-    AC_DEFINE([HAVE_LIB]NAME, 1, [Define if you have the $1 library.])
-    AC_MSG_CHECKING([how to link with lib[]$1])
-    AC_MSG_RESULT([$LIB[]NAME])
-  else
-    HAVE_LIB[]NAME=no
-    dnl If $LIB[]NAME didn't lead to a usable library, we don't need
-    dnl $INC[]NAME either.
-    CPPFLAGS="$ac_save_CPPFLAGS"
-    LIB[]NAME=
-    LTLIB[]NAME=
-  fi
-  AC_SUBST([HAVE_LIB]NAME)
-  AC_SUBST([LIB]NAME)
-  AC_SUBST([LTLIB]NAME)
-  undefine([Name])
-  undefine([NAME])
-])
-
-dnl Determine the platform dependent parameters needed to use rpath:
-dnl libext, shlibext, hardcode_libdir_flag_spec, hardcode_libdir_separator,
-dnl hardcode_direct, hardcode_minus_L,
-dnl sys_lib_search_path_spec, sys_lib_dlsearch_path_spec.
-AC_DEFUN([AC_LIB_RPATH],
-[
-  AC_REQUIRE([AC_PROG_CC])                dnl we use $CC, $GCC, $LDFLAGS
-  AC_REQUIRE([AC_LIB_PROG_LD])            dnl we use $LD, $with_gnu_ld
-  AC_REQUIRE([AC_CANONICAL_HOST])         dnl we use $host
-  AC_REQUIRE([AC_CONFIG_AUX_DIR_DEFAULT]) dnl we use $ac_aux_dir
-  AC_CACHE_CHECK([for shared library run path origin], acl_cv_rpath, [
-    CC="$CC" GCC="$GCC" LDFLAGS="$LDFLAGS" LD="$LD" with_gnu_ld="$with_gnu_ld" \
-    ${CONFIG_SHELL-/bin/sh} "$ac_aux_dir/config.rpath" "$host" > conftest.sh
-    . ./conftest.sh
-    rm -f ./conftest.sh
-    acl_cv_rpath=done
-  ])
-  wl="$acl_cv_wl"
-  libext="$acl_cv_libext"
-  shlibext="$acl_cv_shlibext"
-  hardcode_libdir_flag_spec="$acl_cv_hardcode_libdir_flag_spec"
-  hardcode_libdir_separator="$acl_cv_hardcode_libdir_separator"
-  hardcode_direct="$acl_cv_hardcode_direct"
-  hardcode_minus_L="$acl_cv_hardcode_minus_L"
-  sys_lib_search_path_spec="$acl_cv_sys_lib_search_path_spec"
-  sys_lib_dlsearch_path_spec="$acl_cv_sys_lib_dlsearch_path_spec"
-  dnl Determine whether the user wants rpath handling at all.
-  AC_ARG_ENABLE(rpath,
-    [  --disable-rpath         do not hardcode runtime library paths],
-    :, enable_rpath=yes)
-])
-
-dnl AC_LIB_LINKFLAGS_BODY(name [, dependencies]) searches for libname and
-dnl the libraries corresponding to explicit and implicit dependencies.
-dnl Sets the LIB${NAME}, LTLIB${NAME} and INC${NAME} variables.
-AC_DEFUN([AC_LIB_LINKFLAGS_BODY],
-[
-  define([NAME],[translit([$1],[abcdefghijklmnopqrstuvwxyz./-],
-                               [ABCDEFGHIJKLMNOPQRSTUVWXYZ___])])
-  dnl By default, look in $includedir and $libdir.
-  use_additional=yes
-  AC_LIB_WITH_FINAL_PREFIX([
-    eval additional_includedir=\"$includedir\"
-    eval additional_libdir=\"$libdir\"
-  ])
-  AC_ARG_WITH([lib$1-prefix],
-[  --with-lib$1-prefix[=DIR]  search for lib$1 in DIR/include and DIR/lib
-  --without-lib$1-prefix     don't search for lib$1 in includedir and libdir],
-[
-    if test "X$withval" = "Xno"; then
-      use_additional=no
-    else
-      if test "X$withval" = "X"; then
-        AC_LIB_WITH_FINAL_PREFIX([
-          eval additional_includedir=\"$includedir\"
-          eval additional_libdir=\"$libdir\"
-        ])
-      else
-        additional_includedir="$withval/include"
-        additional_libdir="$withval/lib"
-      fi
-    fi
-])
-  dnl Search the library and its dependencies in $additional_libdir and
-  dnl $LDFLAGS. Using breadth-first-seach.
-  LIB[]NAME=
-  LTLIB[]NAME=
-  INC[]NAME=
-  rpathdirs=
-  ltrpathdirs=
-  names_already_handled=
-  names_next_round='$1 $2'
-  while test -n "$names_next_round"; do
-    names_this_round="$names_next_round"
-    names_next_round=
-    for name in $names_this_round; do
-      already_handled=
-      for n in $names_already_handled; do
-        if test "$n" = "$name"; then
-          already_handled=yes
-          break
-        fi
-      done
-      if test -z "$already_handled"; then
-        names_already_handled="$names_already_handled $name"
-        dnl See if it was already located by an earlier AC_LIB_LINKFLAGS
-        dnl or AC_LIB_HAVE_LINKFLAGS call.
-        uppername=`echo "$name" | sed -e 'y|abcdefghijklmnopqrstuvwxyz./-|ABCDEFGHIJKLMNOPQRSTUVWXYZ___|'`
-        eval value=\"\$HAVE_LIB$uppername\"
-        if test -n "$value"; then
-          if test "$value" = yes; then
-            eval value=\"\$LIB$uppername\"
-            test -z "$value" || LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }$value"
-            eval value=\"\$LTLIB$uppername\"
-            test -z "$value" || LTLIB[]NAME="${LTLIB[]NAME}${LTLIB[]NAME:+ }$value"
-          else
-            dnl An earlier call to AC_LIB_HAVE_LINKFLAGS has determined
-            dnl that this library doesn't exist. So just drop it.
-            :
-          fi
-        else
-          dnl Search the library lib$name in $additional_libdir and $LDFLAGS
-          dnl and the already constructed $LIBNAME/$LTLIBNAME.
-          found_dir=
-          found_la=
-          found_so=
-          found_a=
-          if test $use_additional = yes; then
-            if test -n "$shlibext" && test -f "$additional_libdir/lib$name.$shlibext"; then
-              found_dir="$additional_libdir"
-              found_so="$additional_libdir/lib$name.$shlibext"
-              if test -f "$additional_libdir/lib$name.la"; then
-                found_la="$additional_libdir/lib$name.la"
-              fi
-            else
-              if test -f "$additional_libdir/lib$name.$libext"; then
-                found_dir="$additional_libdir"
-                found_a="$additional_libdir/lib$name.$libext"
-                if test -f "$additional_libdir/lib$name.la"; then
-                  found_la="$additional_libdir/lib$name.la"
-                fi
-              fi
-            fi
-          fi
-          if test "X$found_dir" = "X"; then
-            for x in $LDFLAGS $LTLIB[]NAME; do
-              AC_LIB_WITH_FINAL_PREFIX([eval x=\"$x\"])
-              case "$x" in
-                -L*)
-                  dir=`echo "X$x" | sed -e 's/^X-L//'`
-                  if test -n "$shlibext" && test -f "$dir/lib$name.$shlibext"; then
-                    found_dir="$dir"
-                    found_so="$dir/lib$name.$shlibext"
-                    if test -f "$dir/lib$name.la"; then
-                      found_la="$dir/lib$name.la"
-                    fi
-                  else
-                    if test -f "$dir/lib$name.$libext"; then
-                      found_dir="$dir"
-                      found_a="$dir/lib$name.$libext"
-                      if test -f "$dir/lib$name.la"; then
-                        found_la="$dir/lib$name.la"
-                      fi
-                    fi
-                  fi
-                  ;;
-              esac
-              if test "X$found_dir" != "X"; then
-                break
-              fi
-            done
-          fi
-          if test "X$found_dir" != "X"; then
-            dnl Found the library.
-            LTLIB[]NAME="${LTLIB[]NAME}${LTLIB[]NAME:+ }-L$found_dir -l$name"
-            if test "X$found_so" != "X"; then
-              dnl Linking with a shared library. We attempt to hardcode its
-              dnl directory into the executable's runpath, unless it's the
-              dnl standard /usr/lib.
-              if test "$enable_rpath" = no || test "X$found_dir" = "X/usr/lib"; then
-                dnl No hardcoding is needed.
-                LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }$found_so"
-              else
-                dnl Use an explicit option to hardcode DIR into the resulting
-                dnl binary.
-                dnl Potentially add DIR to ltrpathdirs.
-                dnl The ltrpathdirs will be appended to $LTLIBNAME at the end.
-                haveit=
-                for x in $ltrpathdirs; do
-                  if test "X$x" = "X$found_dir"; then
-                    haveit=yes
-                    break
-                  fi
-                done
-                if test -z "$haveit"; then
-                  ltrpathdirs="$ltrpathdirs $found_dir"
-                fi
-                dnl The hardcoding into $LIBNAME is system dependent.
-                if test "$hardcode_direct" = yes; then
-                  dnl Using DIR/libNAME.so during linking hardcodes DIR into the
-                  dnl resulting binary.
-                  LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }$found_so"
-                else
-                  if test -n "$hardcode_libdir_flag_spec" && test "$hardcode_minus_L" = no; then
-                    dnl Use an explicit option to hardcode DIR into the resulting
-                    dnl binary.
-                    LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }$found_so"
-                    dnl Potentially add DIR to rpathdirs.
-                    dnl The rpathdirs will be appended to $LIBNAME at the end.
-                    haveit=
-                    for x in $rpathdirs; do
-                      if test "X$x" = "X$found_dir"; then
-                        haveit=yes
-                        break
-                      fi
-                    done
-                    if test -z "$haveit"; then
-                      rpathdirs="$rpathdirs $found_dir"
-                    fi
-                  else
-                    dnl Rely on "-L$found_dir".
-                    dnl But don't add it if it's already contained in the LDFLAGS
-                    dnl or the already constructed $LIBNAME
-                    haveit=
-                    for x in $LDFLAGS $LIB[]NAME; do
-                      AC_LIB_WITH_FINAL_PREFIX([eval x=\"$x\"])
-                      if test "X$x" = "X-L$found_dir"; then
-                        haveit=yes
-                        break
-                      fi
-                    done
-                    if test -z "$haveit"; then
-                      LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }-L$found_dir"
-                    fi
-                    if test "$hardcode_minus_L" != no; then
-                      dnl FIXME: Not sure whether we should use
-                      dnl "-L$found_dir -l$name" or "-L$found_dir $found_so"
-                      dnl here.
-                      LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }$found_so"
-                    else
-                      dnl We cannot use $hardcode_runpath_var and LD_RUN_PATH
-                      dnl here, because this doesn't fit in flags passed to the
-                      dnl compiler. So give up. No hardcoding. This affects only
-                      dnl very old systems.
-                      dnl FIXME: Not sure whether we should use
-                      dnl "-L$found_dir -l$name" or "-L$found_dir $found_so"
-                      dnl here.
-                      LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }-l$name"
-                    fi
-                  fi
-                fi
-              fi
-            else
-              if test "X$found_a" != "X"; then
-                dnl Linking with a static library.
-                LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }$found_a"
-              else
-                dnl We shouldn't come here, but anyway it's good to have a
-                dnl fallback.
-                LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }-L$found_dir -l$name"
-              fi
-            fi
-            dnl Assume the include files are nearby.
-            additional_includedir=
-            case "$found_dir" in
-              */lib | */lib/)
-                basedir=`echo "X$found_dir" | sed -e 's,^X,,' -e 's,/lib/*$,,'`
-                additional_includedir="$basedir/include"
-                ;;
-            esac
-            if test "X$additional_includedir" != "X"; then
-              dnl Potentially add $additional_includedir to $INCNAME.
-              dnl But don't add it
-              dnl   1. if it's the standard /usr/include,
-              dnl   2. if it's /usr/local/include and we are using GCC on Linux,
-              dnl   3. if it's already present in $CPPFLAGS or the already
-              dnl      constructed $INCNAME,
-              dnl   4. if it doesn't exist as a directory.
-              if test "X$additional_includedir" != "X/usr/include"; then
-                haveit=
-                if test "X$additional_includedir" = "X/usr/local/include"; then
-                  if test -n "$GCC"; then
-                    case $host_os in
-                      linux*) haveit=yes;;
-                    esac
-                  fi
-                fi
-                if test -z "$haveit"; then
-                  for x in $CPPFLAGS $INC[]NAME; do
-                    AC_LIB_WITH_FINAL_PREFIX([eval x=\"$x\"])
-                    if test "X$x" = "X-I$additional_includedir"; then
-                      haveit=yes
-                      break
-                    fi
-                  done
-                  if test -z "$haveit"; then
-                    if test -d "$additional_includedir"; then
-                      dnl Really add $additional_includedir to $INCNAME.
-                      INC[]NAME="${INC[]NAME}${INC[]NAME:+ }-I$additional_includedir"
-                    fi
-                  fi
-                fi
-              fi
-            fi
-            dnl Look for dependencies.
-            if test -n "$found_la"; then
-              dnl Read the .la file. It defines the variables
-              dnl dlname, library_names, old_library, dependency_libs, current,
-              dnl age, revision, installed, dlopen, dlpreopen, libdir.
-              save_libdir="$libdir"
-              case "$found_la" in
-                */* | *\\*) . "$found_la" ;;
-                *) . "./$found_la" ;;
-              esac
-              libdir="$save_libdir"
-              dnl We use only dependency_libs.
-              for dep in $dependency_libs; do
-                case "$dep" in
-                  -L*)
-                    additional_libdir=`echo "X$dep" | sed -e 's/^X-L//'`
-                    dnl Potentially add $additional_libdir to $LIBNAME and $LTLIBNAME.
-                    dnl But don't add it
-                    dnl   1. if it's the standard /usr/lib,
-                    dnl   2. if it's /usr/local/lib and we are using GCC on Linux,
-                    dnl   3. if it's already present in $LDFLAGS or the already
-                    dnl      constructed $LIBNAME,
-                    dnl   4. if it doesn't exist as a directory.
-                    if test "X$additional_libdir" != "X/usr/lib"; then
-                      haveit=
-                      if test "X$additional_libdir" = "X/usr/local/lib"; then
-                        if test -n "$GCC"; then
-                          case $host_os in
-                            linux*) haveit=yes;;
-                          esac
-                        fi
-                      fi
-                      if test -z "$haveit"; then
-                        haveit=
-                        for x in $LDFLAGS $LIB[]NAME; do
-                          AC_LIB_WITH_FINAL_PREFIX([eval x=\"$x\"])
-                          if test "X$x" = "X-L$additional_libdir"; then
-                            haveit=yes
-                            break
-                          fi
-                        done
-                        if test -z "$haveit"; then
-                          if test -d "$additional_libdir"; then
-                            dnl Really add $additional_libdir to $LIBNAME.
-                            LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }-L$additional_libdir"
-                          fi
-                        fi
-                        haveit=
-                        for x in $LDFLAGS $LTLIB[]NAME; do
-                          AC_LIB_WITH_FINAL_PREFIX([eval x=\"$x\"])
-                          if test "X$x" = "X-L$additional_libdir"; then
-                            haveit=yes
-                            break
-                          fi
-                        done
-                        if test -z "$haveit"; then
-                          if test -d "$additional_libdir"; then
-                            dnl Really add $additional_libdir to $LTLIBNAME.
-                            LTLIB[]NAME="${LTLIB[]NAME}${LTLIB[]NAME:+ }-L$additional_libdir"
-                          fi
-                        fi
-                      fi
-                    fi
-                    ;;
-                  -R*)
-                    dir=`echo "X$dep" | sed -e 's/^X-R//'`
-                    if test "$enable_rpath" != no; then
-                      dnl Potentially add DIR to rpathdirs.
-                      dnl The rpathdirs will be appended to $LIBNAME at the end.
-                      haveit=
-                      for x in $rpathdirs; do
-                        if test "X$x" = "X$dir"; then
-                          haveit=yes
-                          break
-                        fi
-                      done
-                      if test -z "$haveit"; then
-                        rpathdirs="$rpathdirs $dir"
-                      fi
-                      dnl Potentially add DIR to ltrpathdirs.
-                      dnl The ltrpathdirs will be appended to $LTLIBNAME at the end.
-                      haveit=
-                      for x in $ltrpathdirs; do
-                        if test "X$x" = "X$dir"; then
-                          haveit=yes
-                          break
-                        fi
-                      done
-                      if test -z "$haveit"; then
-                        ltrpathdirs="$ltrpathdirs $dir"
-                      fi
-                    fi
-                    ;;
-                  -l*)
-                    dnl Handle this in the next round.
-                    names_next_round="$names_next_round "`echo "X$dep" | sed -e 's/^X-l//'`
-                    ;;
-                  *.la)
-                    dnl Handle this in the next round. Throw away the .la's
-                    dnl directory; it is already contained in a preceding -L
-                    dnl option.
-                    names_next_round="$names_next_round "`echo "X$dep" | sed -e 's,^X.*/,,' -e 's,^lib,,' -e 's,\.la$,,'`
-                    ;;
-                  *)
-                    dnl Most likely an immediate library name.
-                    LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }$dep"
-                    LTLIB[]NAME="${LTLIB[]NAME}${LTLIB[]NAME:+ }$dep"
-                    ;;
-                esac
-              done
-            fi
-          else
-            dnl Didn't find the library; assume it is in the system directories
-            dnl known to the linker and runtime loader. (All the system
-            dnl directories known to the linker should also be known to the
-            dnl runtime loader, otherwise the system is severely misconfigured.)
-            LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }-l$name"
-            LTLIB[]NAME="${LTLIB[]NAME}${LTLIB[]NAME:+ }-l$name"
-          fi
-        fi
-      fi
-    done
-  done
-  if test "X$rpathdirs" != "X"; then
-    if test -n "$hardcode_libdir_separator"; then
-      dnl Weird platform: only the last -rpath option counts, the user must
-      dnl pass all path elements in one option. We can arrange that for a
-      dnl single library, but not when more than one $LIBNAMEs are used.
-      alldirs=
-      for found_dir in $rpathdirs; do
-        alldirs="${alldirs}${alldirs:+$hardcode_libdir_separator}$found_dir"
-      done
-      dnl Note: hardcode_libdir_flag_spec uses $libdir and $wl.
-      acl_save_libdir="$libdir"
-      libdir="$alldirs"
-      eval flag=\"$hardcode_libdir_flag_spec\"
-      libdir="$acl_save_libdir"
-      LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }$flag"
-    else
-      dnl The -rpath options are cumulative.
-      for found_dir in $rpathdirs; do
-        acl_save_libdir="$libdir"
-        libdir="$found_dir"
-        eval flag=\"$hardcode_libdir_flag_spec\"
-        libdir="$acl_save_libdir"
-        LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }$flag"
-      done
-    fi
-  fi
-  if test "X$ltrpathdirs" != "X"; then
-    dnl When using libtool, the option that works for both libraries and
-    dnl executables is -R. The -R options are cumulative.
-    for found_dir in $ltrpathdirs; do
-      LTLIB[]NAME="${LTLIB[]NAME}${LTLIB[]NAME:+ }-R$found_dir"
-    done
-  fi
-])
-
-dnl AC_LIB_APPENDTOVAR(VAR, CONTENTS) appends the elements of CONTENTS to VAR,
-dnl unless already present in VAR.
-dnl Works only for CPPFLAGS, not for LIB* variables because that sometimes
-dnl contains two or three consecutive elements that belong together.
-AC_DEFUN([AC_LIB_APPENDTOVAR],
-[
-  for element in [$2]; do
-    haveit=
-    for x in $[$1]; do
-      AC_LIB_WITH_FINAL_PREFIX([eval x=\"$x\"])
-      if test "X$x" = "X$element"; then
-        haveit=yes
-        break
-      fi
-    done
-    if test -z "$haveit"; then
-      [$1]="${[$1]}${[$1]:+ }$element"
-    fi
-  done
-])
--- a/m4/lib-prefix.m4
+++ b/m4/lib-prefix.m4
@@ -1,148 +0,0 @@
-# lib-prefix.m4 serial 1 (gettext-0.11)
-dnl Copyright (C) 2001-2002 Free Software Foundation, Inc.
-dnl This file is free software, distributed under the terms of the GNU
-dnl General Public License.  As a special exception to the GNU General
-dnl Public License, this file may be distributed as part of a program
-dnl that contains a configuration script generated by Autoconf, under
-dnl the same distribution terms as the rest of that program.
-
-dnl From Bruno Haible.
-
-dnl AC_LIB_PREFIX adds to the CPPFLAGS and LDFLAGS the flags that are needed
-dnl to access previously installed libraries. The basic assumption is that
-dnl a user will want packages to use other packages he previously installed
-dnl with the same --prefix option.
-dnl This macro is not needed if only AC_LIB_LINKFLAGS is used to locate
-dnl libraries, but is otherwise very convenient.
-AC_DEFUN([AC_LIB_PREFIX],
-[
-  AC_BEFORE([$0], [AC_LIB_LINKFLAGS])
-  AC_REQUIRE([AC_PROG_CC])
-  AC_REQUIRE([AC_CANONICAL_HOST])
-  AC_REQUIRE([AC_LIB_PREPARE_PREFIX])
-  dnl By default, look in $includedir and $libdir.
-  use_additional=yes
-  AC_LIB_WITH_FINAL_PREFIX([
-    eval additional_includedir=\"$includedir\"
-    eval additional_libdir=\"$libdir\"
-  ])
-  AC_ARG_WITH([lib-prefix],
-[  --with-lib-prefix[=DIR] search for libraries in DIR/include and DIR/lib
-  --without-lib-prefix    don't search for libraries in includedir and libdir],
-[
-    if test "X$withval" = "Xno"; then
-      use_additional=no
-    else
-      if test "X$withval" = "X"; then
-        AC_LIB_WITH_FINAL_PREFIX([
-          eval additional_includedir=\"$includedir\"
-          eval additional_libdir=\"$libdir\"
-        ])
-      else
-        additional_includedir="$withval/include"
-        additional_libdir="$withval/lib"
-      fi
-    fi
-])
-  if test $use_additional = yes; then
-    dnl Potentially add $additional_includedir to $CPPFLAGS.
-    dnl But don't add it
-    dnl   1. if it's the standard /usr/include,
-    dnl   2. if it's already present in $CPPFLAGS,
-    dnl   3. if it's /usr/local/include and we are using GCC on Linux,
-    dnl   4. if it doesn't exist as a directory.
-    if test "X$additional_includedir" != "X/usr/include"; then
-      haveit=
-      for x in $CPPFLAGS; do
-        AC_LIB_WITH_FINAL_PREFIX([eval x=\"$x\"])
-        if test "X$x" = "X-I$additional_includedir"; then
-          haveit=yes
-          break
-        fi
-      done
-      if test -z "$haveit"; then
-        if test "X$additional_includedir" = "X/usr/local/include"; then
-          if test -n "$GCC"; then
-            case $host_os in
-              linux*) haveit=yes;;
-            esac
-          fi
-        fi
-        if test -z "$haveit"; then
-          if test -d "$additional_includedir"; then
-            dnl Really add $additional_includedir to $CPPFLAGS.
-            CPPFLAGS="${CPPFLAGS}${CPPFLAGS:+ }-I$additional_includedir"
-          fi
-        fi
-      fi
-    fi
-    dnl Potentially add $additional_libdir to $LDFLAGS.
-    dnl But don't add it
-    dnl   1. if it's the standard /usr/lib,
-    dnl   2. if it's already present in $LDFLAGS,
-    dnl   3. if it's /usr/local/lib and we are using GCC on Linux,
-    dnl   4. if it doesn't exist as a directory.
-    if test "X$additional_libdir" != "X/usr/lib"; then
-      haveit=
-      for x in $LDFLAGS; do
-        AC_LIB_WITH_FINAL_PREFIX([eval x=\"$x\"])
-        if test "X$x" = "X-L$additional_libdir"; then
-          haveit=yes
-          break
-        fi
-      done
-      if test -z "$haveit"; then
-        if test "X$additional_libdir" = "X/usr/local/lib"; then
-          if test -n "$GCC"; then
-            case $host_os in
-              linux*) haveit=yes;;
-            esac
-          fi
-        fi
-        if test -z "$haveit"; then
-          if test -d "$additional_libdir"; then
-            dnl Really add $additional_libdir to $LDFLAGS.
-            LDFLAGS="${LDFLAGS}${LDFLAGS:+ }-L$additional_libdir"
-          fi
-        fi
-      fi
-    fi
-  fi
-])
-
-dnl AC_LIB_PREPARE_PREFIX creates variables acl_final_prefix,
-dnl acl_final_exec_prefix, containing the values to which $prefix and
-dnl $exec_prefix will expand at the end of the configure script.
-AC_DEFUN([AC_LIB_PREPARE_PREFIX],
-[
-  dnl Unfortunately, prefix and exec_prefix get only finally determined
-  dnl at the end of configure.
-  if test "X$prefix" = "XNONE"; then
-    acl_final_prefix="$ac_default_prefix"
-  else
-    acl_final_prefix="$prefix"
-  fi
-  if test "X$exec_prefix" = "XNONE"; then
-    acl_final_exec_prefix='${prefix}'
-  else
-    acl_final_exec_prefix="$exec_prefix"
-  fi
-  acl_save_prefix="$prefix"
-  prefix="$acl_final_prefix"
-  eval acl_final_exec_prefix=\"$acl_final_exec_prefix\"
-  prefix="$acl_save_prefix"
-])
-
-dnl AC_LIB_WITH_FINAL_PREFIX([statement]) evaluates statement, with the
-dnl variables prefix and exec_prefix bound to the values they will have
-dnl at the end of the configure script.
-AC_DEFUN([AC_LIB_WITH_FINAL_PREFIX],
-[
-  acl_save_prefix="$prefix"
-  prefix="$acl_final_prefix"
-  acl_save_exec_prefix="$exec_prefix"
-  exec_prefix="$acl_final_exec_prefix"
-  $1
-  exec_prefix="$acl_save_exec_prefix"
-  prefix="$acl_save_prefix"
-])
--- a/m4/progtest.m4
+++ b/m4/progtest.m4
@@ -1,59 +0,0 @@
-# progtest.m4 serial 2 (gettext-0.10.40)
-dnl Copyright (C) 1996-2002 Free Software Foundation, Inc.
-dnl This file is free software, distributed under the terms of the GNU
-dnl General Public License.  As a special exception to the GNU General
-dnl Public License, this file may be distributed as part of a program
-dnl that contains a configuration script generated by Autoconf, under
-dnl the same distribution terms as the rest of that program.
-dnl
-dnl This file can can be used in projects which are not available under
-dnl the GNU General Public License or the GNU Library General Public
-dnl License but which still want to provide support for the GNU gettext
-dnl functionality.
-dnl Please note that the actual code of the GNU gettext library is covered
-dnl by the GNU Library General Public License, and the rest of the GNU
-dnl gettext package package is covered by the GNU General Public License.
-dnl They are *not* in the public domain.
-
-dnl Authors:
-dnl   Ulrich Drepper <drepper@cygnus.com>, 1996.
-
-# Search path for a program which passes the given test.
-
-dnl AM_PATH_PROG_WITH_TEST(VARIABLE, PROG-TO-CHECK-FOR,
-dnl   TEST-PERFORMED-ON-FOUND_PROGRAM [, VALUE-IF-NOT-FOUND [, PATH]])
-AC_DEFUN([AM_PATH_PROG_WITH_TEST],
-[# Extract the first word of "$2", so it can be a program name with args.
-set dummy $2; ac_word=[$]2
-AC_MSG_CHECKING([for $ac_word])
-AC_CACHE_VAL(ac_cv_path_$1,
-[case "[$]$1" in
-  /*)
-  ac_cv_path_$1="[$]$1" # Let the user override the test with a path.
-  ;;
-  *)
-  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS="${IFS}:"
-  for ac_dir in ifelse([$5], , $PATH, [$5]); do
-    test -z "$ac_dir" && ac_dir=.
-    if test -f $ac_dir/$ac_word; then
-      if [$3]; then
-	ac_cv_path_$1="$ac_dir/$ac_word"
-	break
-      fi
-    fi
-  done
-  IFS="$ac_save_ifs"
-dnl If no 4th arg is given, leave the cache variable unset,
-dnl so AC_PATH_PROGS will keep looking.
-ifelse([$4], , , [  test -z "[$]ac_cv_path_$1" && ac_cv_path_$1="$4"
-])dnl
-  ;;
-esac])dnl
-$1="$ac_cv_path_$1"
-if test ifelse([$4], , [-n "[$]$1"], ["[$]$1" != "$4"]); then
-  AC_MSG_RESULT([$]$1)
-else
-  AC_MSG_RESULT(no)
-fi
-AC_SUBST($1)dnl
-])
--- a/m4/stdint_h.m4
+++ b/m4/stdint_h.m4
@@ -1,28 +0,0 @@
-# stdint_h.m4 serial 2 (gettext-0.11.4)
-dnl Copyright (C) 1997-2002 Free Software Foundation, Inc.
-dnl This file is free software, distributed under the terms of the GNU
-dnl General Public License.  As a special exception to the GNU General
-dnl Public License, this file may be distributed as part of a program
-dnl that contains a configuration script generated by Autoconf, under
-dnl the same distribution terms as the rest of that program.
-
-dnl From Paul Eggert.
-
-# Define HAVE_STDINT_H_WITH_UINTMAX if <stdint.h> exists,
-# doesn't clash with <sys/types.h>, and declares uintmax_t.
-
-AC_DEFUN([jm_AC_HEADER_STDINT_H],
-[
-  AC_CACHE_CHECK([for stdint.h], jm_ac_cv_header_stdint_h,
-  [AC_TRY_COMPILE(
-    [#include <sys/types.h>
-#include <stdint.h>],
-    [uintmax_t i = (uintmax_t) -1;],
-    jm_ac_cv_header_stdint_h=yes,
-    jm_ac_cv_header_stdint_h=no)])
-  if test $jm_ac_cv_header_stdint_h = yes; then
-    AC_DEFINE_UNQUOTED(HAVE_STDINT_H_WITH_UINTMAX, 1,
-[Define if <stdint.h> exists, doesn't clash with <sys/types.h>,
-   and declares uintmax_t. ])
-  fi
-])
--- a/m4/uintmax_t.m4
+++ b/m4/uintmax_t.m4
@@ -1,29 +0,0 @@
-# uintmax_t.m4 serial 6 (gettext-0.11)
-dnl Copyright (C) 1997-2002 Free Software Foundation, Inc.
-dnl This file is free software, distributed under the terms of the GNU
-dnl General Public License.  As a special exception to the GNU General
-dnl Public License, this file may be distributed as part of a program
-dnl that contains a configuration script generated by Autoconf, under
-dnl the same distribution terms as the rest of that program.
-
-dnl From Paul Eggert.
-
-AC_PREREQ(2.13)
-
-# Define uintmax_t to `unsigned long' or `unsigned long long'
-# if <inttypes.h> does not exist.
-
-AC_DEFUN([jm_AC_TYPE_UINTMAX_T],
-[
-  AC_REQUIRE([jm_AC_HEADER_INTTYPES_H])
-  AC_REQUIRE([jm_AC_HEADER_STDINT_H])
-  if test $jm_ac_cv_header_inttypes_h = no && test $jm_ac_cv_header_stdint_h = no; then
-    AC_REQUIRE([jm_AC_TYPE_UNSIGNED_LONG_LONG])
-    test $ac_cv_type_unsigned_long_long = yes \
-      && ac_type='unsigned long long' \
-      || ac_type='unsigned long'
-    AC_DEFINE_UNQUOTED(uintmax_t, $ac_type,
-  [Define to unsigned long or unsigned long long
-   if <inttypes.h> and <stdint.h> don't define.])
-  fi
-])
--- a/m4/ulonglong.m4
+++ b/m4/ulonglong.m4
@@ -1,23 +0,0 @@
-# ulonglong.m4 serial 2 (fileutils-4.0.32, gettext-0.10.40)
-dnl Copyright (C) 1999-2002 Free Software Foundation, Inc.
-dnl This file is free software, distributed under the terms of the GNU
-dnl General Public License.  As a special exception to the GNU General
-dnl Public License, this file may be distributed as part of a program
-dnl that contains a configuration script generated by Autoconf, under
-dnl the same distribution terms as the rest of that program.
-
-dnl From Paul Eggert.
-
-AC_DEFUN([jm_AC_TYPE_UNSIGNED_LONG_LONG],
-[
-  AC_CACHE_CHECK([for unsigned long long], ac_cv_type_unsigned_long_long,
-  [AC_TRY_LINK([unsigned long long ull = 1; int i = 63;],
-    [unsigned long long ullmax = (unsigned long long) -1;
-     return ull << i | ull >> i | ullmax / ull | ullmax % ull;],
-    ac_cv_type_unsigned_long_long=yes,
-    ac_cv_type_unsigned_long_long=no)])
-  if test $ac_cv_type_unsigned_long_long = yes; then
-    AC_DEFINE(HAVE_UNSIGNED_LONG_LONG, 1,
-      [Define if you have the unsigned long long type.])
-  fi
-])
--- a/nano.spec.in
+++ b/nano.spec.in
@@ -10,7 +10,7 @@ Summary		: a user-friendly editor, a Pico clone with enhancements
 License		: GPLv3+
 Group		: Applications/Editors
 URL		: https://nano-editor.org/
-Source		: https://nano-editor.org/dist/v2.6/%{name}-%{version}.tar.gz
+Source		: https://nano-editor.org/dist/latest/%{name}-%{version}.tar.gz

 BuildRoot	: %{_tmppath}/%{name}-%{version}-root
 BuildRequires	: autoconf, automake, gettext-devel, ncurses-devel, texinfo
--- a/po/.gitignore
+++ b/po/.gitignore
@@ -1,6 +1,7 @@
 /*.gmo

 /Makefile.in.in
+/Makevars.template
 /Rules-quot
 /boldquot.sed
 /en@boldquot.header
@@ -8,4 +9,6 @@
 /insert-header.sin
 /POTFILES
 /quot.sed
+/remove-potcdate.sed
 /remove-potcdate.sin
+/stamp-po
--- a/po/LINGUAS
+++ b/po/LINGUAS
@@ -1,2 +1,2 @@
 # List of available languages.
-bg ca cs da de eo es eu fi fr ga gl hr hu id it ja ms nb nl nn pl pt_BR ro ru sl sr sv tr uk vi zh_CN zh_TW
+bg ca cs da de eo es eu fi fr ga gl hr hu id it ja ms nb nl nn pl pt pt_BR ro ru sl sr sv tr uk vi zh_CN zh_TW
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -5,6 +5,7 @@ src/color.c
 src/files.c
 src/global.c
 src/help.c
+src/history.c
 src/nano.c
 src/prompt.c
 src/rcfile.c
--- a/po/bg.po
+++ b/po/bg.po
--- 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/eo.po
+++ b/po/eo.po
--- a/po/es.po
+++ b/po/es.po
--- a/po/eu.po
+++ b/po/eu.po
--- a/po/fi.po
+++ b/po/fi.po
--- a/po/fr.po
+++ b/po/fr.po
--- a/po/ga.po
+++ b/po/ga.po
--- a/po/gl.po
+++ b/po/gl.po
--- a/po/hr.po
+++ b/po/hr.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/ja.po
+++ b/po/ja.po
--- a/po/ms.po
+++ b/po/ms.po
--- a/po/nano.pot
+++ b/po/nano.pot
--- 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/pt.po
+++ b/po/pt.po
--- a/po/pt_BR.po
+++ b/po/pt_BR.po
--- a/po/ro.po
+++ b/po/ro.po
--- a/po/ru.po
+++ b/po/ru.po
--- a/po/sl.po
+++ b/po/sl.po
--- a/po/sr.po
+++ b/po/sr.po
--- a/po/sv.po
+++ b/po/sv.po
--- a/po/tr.po
+++ b/po/tr.po
--- a/po/uk.po
+++ b/po/uk.po
--- a/po/vi.po
+++ b/po/vi.po
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
--- a/po/zh_TW.po
+++ b/po/zh_TW.po
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -1,9 +1,10 @@
-AM_CPPFLAGS = -DLOCALEDIR=\"$(localedir)\" -DSYSCONFDIR=\"$(sysconfdir)\"
+AM_CPPFLAGS = -DLOCALEDIR=\"$(localedir)\" -DSYSCONFDIR=\"$(sysconfdir)\" \
+	-I$(top_builddir)/lib -I$(top_srcdir)/lib

 CLEANFILES = revision.h

 if BUILDING_FROM_GIT
-SOMETHING = "REVISION \"$(shell git describe --tags 2>/dev/null)\""
+SOMETHING = "REVISION \"`git describe --tags 2>/dev/null`\""
 else
 SOMETHING = "NOTHING \"from tarball\""
 endif
@@ -11,12 +12,13 @@ endif
 nano.o: revision.h
 winio.o: revision.h

-revision.h: update_revision
+# Always run the commands in this rule.  But update the target
+# only when the revision actually changed.
+revision.h: FORCE
 	@[ -f $@ ] || touch $@
 	@echo "#define $(SOMETHING)" | cmp -s $@ - || \
-	echo "#define $(SOMETHING)" > $@
-
-.PHONY: update_revision
+			echo "#define $(SOMETHING)" > $@
+FORCE:

 bin_PROGRAMS = 	nano
 nano_SOURCES =	browser.c \
@@ -26,6 +28,7 @@ nano_SOURCES =	browser.c \
 		files.c \
 		global.c \
 		help.c \
+		history.c \
 		move.c \
 		nano.c \
 		nano.h \
@@ -35,9 +38,10 @@ nano_SOURCES =	browser.c \
 		search.c \
 		text.c \
 		utils.c \
-		winio.c 
+		winio.c

-nano_LDADD = @GLIB_LIBS@ @LIBINTL@
+nano_LDADD = @LIBINTL@ $(top_builddir)/lib/libgnu.a \
+		$(LIB_CLOCK_GETTIME) $(LIBTHREAD)

 install-exec-hook:
 	cd $(DESTDIR)$(bindir) && rm -f rnano && $(LN_S) nano rnano
--- a/src/browser.c
+++ b/src/browser.c
--- a/src/chars.c
+++ b/src/chars.c
--- a/src/color.c
+++ b/src/color.c
@@ -1,9 +1,8 @@
 /**************************************************************************
 *   color.c  --  This file is part of GNU nano.                          *
 *                                                                        *
- *   Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009,  *
- *   2010, 2011, 2013, 2014, 2015 Free Software Foundation, Inc.          *
- *   Copyright (C) 2014, 2015, 2016, 2017 Benno Schulenberg               *
+ *   Copyright (C) 2001-2011, 2013-2018 Free Software Foundation, Inc.    *
+ *   Copyright (C) 2014-2017 Benno Schulenberg                            *
 *                                                                        *
 *   GNU nano is free software: you can redistribute it and/or modify     *
 *   it under the terms of the GNU General Public License as published    *
@@ -22,419 +21,416 @@

 #include "proto.h"

-#include <stdio.h>
-#include <string.h>
 #include <errno.h>
-#include <time.h>
-#include <unistd.h>
-
 #ifdef HAVE_MAGIC_H
 #include <magic.h>
 #endif
+#include <string.h>
+#include <unistd.h>

-#ifndef DISABLE_COLOR
+#ifdef ENABLE_COLOR
+
+/* For early versions of ncurses-6.0, use an additional A_PROTECT attribute
+ * for all colors, in order to work around an ncurses miscoloring bug. */
+#if defined(NCURSES_VERSION_MAJOR) && (NCURSES_VERSION_MAJOR == 6) && \
+		(NCURSES_VERSION_MINOR == 0) && (NCURSES_VERSION_PATCH < 20151017)
+#define A_BANDAID  A_PROTECT
+#else
+#define A_BANDAID  A_NORMAL
+#endif

 /* Initialize the colors for nano's interface, and assign pair numbers
 * for the colors in each syntax. */
 void set_colorpairs(void)
 {
-    const syntaxtype *sint;
-    bool using_defaults = FALSE;
-    short foreground, background;
-    size_t i;
+	const syntaxtype *sint;
+	bool using_defaults = FALSE;
+	size_t i;

-    /* Tell ncurses to enable colors. */
-    start_color();
+	/* Tell ncurses to enable colors. */
+	start_color();

 #ifdef HAVE_USE_DEFAULT_COLORS
-    /* Allow using the default colors, if available. */
-    using_defaults = (use_default_colors() != ERR);
+	/* Allow using the default colors, if available. */
+	using_defaults = (use_default_colors() != ERR);
 #endif

-    /* Initialize the color pairs for nano's interface elements. */
-    for (i = 0; i < NUMBER_OF_ELEMENTS; i++) {
-	bool bright = FALSE;
+	/* Initialize the color pairs for nano's interface elements. */
+	for (i = 0; i < NUMBER_OF_ELEMENTS; i++) {
+		colortype *combo = color_combo[i];

-	if (parse_color_names(specified_color_combo[i],
-			&foreground, &background, &bright)) {
-	    if (foreground == -1 && !using_defaults)
-		foreground = COLOR_WHITE;
-	    if (background == -1 && !using_defaults)
-		background = COLOR_BLACK;
-	    init_pair(i + 1, foreground, background);
-	    interface_color_pair[i] =
-			COLOR_PAIR(i + 1) | (bright ? A_BOLD : A_NORMAL);
-	}
-	else {
-	    if (i != FUNCTION_TAG)
-		interface_color_pair[i] = hilite_attribute;
-	    else
-		interface_color_pair[i] = A_NORMAL;
+		if (combo != NULL) {
+			if (combo->fg == -1 && !using_defaults)
+				combo->fg = COLOR_WHITE;
+			if (combo->bg == -1 && !using_defaults)
+				combo->bg = COLOR_BLACK;
+			init_pair(i + 1, combo->fg, combo->bg);
+			interface_color_pair[i] = COLOR_PAIR(i + 1) | A_BANDAID |
+										(combo->bright ? A_BOLD : A_NORMAL);
+		} else {
+			if (i == FUNCTION_TAG)
+				interface_color_pair[i] = A_NORMAL;
+			else if (i == ERROR_MESSAGE) {
+				init_pair(i + 1, COLOR_WHITE, COLOR_RED);
+				interface_color_pair[i] = COLOR_PAIR(i + 1) | A_BOLD | A_BANDAID;
+			} else
+				interface_color_pair[i] = hilite_attribute;
+		}
+
+		free(color_combo[i]);
 	}

-	free(specified_color_combo[i]);
-	specified_color_combo[i] = NULL;
-    }
+	/* For each syntax, go through its list of colors and assign each
+	 * its pair number, giving identical color pairs the same number. */
+	for (sint = syntaxes; sint != NULL; sint = sint->next) {
+		colortype *ink;
+		int new_number = NUMBER_OF_ELEMENTS + 1;

-    /* For each syntax, go through its list of colors and assign each
-     * its pair number, giving identical color pairs the same number. */
-    for (sint = syntaxes; sint != NULL; sint = sint->next) {
-	colortype *ink;
-	int new_number = NUMBER_OF_ELEMENTS + 1;
+		for (ink = sint->color; ink != NULL; ink = ink->next) {
+			const colortype *beforenow = sint->color;

-	for (ink = sint->color; ink != NULL; ink = ink->next) {
-	    const colortype *beforenow = sint->color;
+			while (beforenow != ink && (beforenow->fg != ink->fg ||
+										beforenow->bg != ink->bg))
+				beforenow = beforenow->next;

-	    while (beforenow != ink && (beforenow->fg != ink->fg ||
-					beforenow->bg != ink->bg ||
-					beforenow->bright != ink->bright))
-		beforenow = beforenow->next;
+			if (beforenow != ink)
+				ink->pairnum = beforenow->pairnum;
+			else
+				ink->pairnum = new_number++;

-	    if (beforenow != ink)
-		ink->pairnum = beforenow->pairnum;
-	    else
-		ink->pairnum = new_number++;
-
-	    ink->attributes = COLOR_PAIR(ink->pairnum) |
-				(ink->bright ? A_BOLD : A_NORMAL);
+			ink->attributes = COLOR_PAIR(ink->pairnum) | A_BANDAID |
+								(ink->bright ? A_BOLD : A_NORMAL);
+		}
 	}
-    }
 }

 /* Initialize the color information. */
 void color_init(void)
 {
-    const colortype *ink;
-    bool using_defaults = FALSE;
-    short foreground, background;
+	const colortype *ink;
+	bool using_defaults = FALSE;
+	short foreground, background;

-    /* If the terminal is not capable of colors, forget it. */
-    if (!has_colors())
-	return;
+	/* If the terminal is not capable of colors, forget it. */
+	if (!has_colors())
+		return;

 #ifdef HAVE_USE_DEFAULT_COLORS
-    /* Allow using the default colors, if available. */
-    using_defaults = (use_default_colors() != ERR);
+	/* Allow using the default colors, if available. */
+	using_defaults = (use_default_colors() != ERR);
 #endif

-    /* For each coloring expression, initialize the color pair. */
-    for (ink = openfile->colorstrings; ink != NULL; ink = ink->next) {
-	foreground = ink->fg;
-	background = ink->bg;
+	/* For each coloring expression, initialize the color pair. */
+	for (ink = openfile->colorstrings; ink != NULL; ink = ink->next) {
+		foreground = ink->fg;
+		background = ink->bg;

-	if (foreground == -1 && !using_defaults)
-	    foreground = COLOR_WHITE;
+		if (foreground == -1 && !using_defaults)
+			foreground = COLOR_WHITE;

-	if (background == -1 && !using_defaults)
-	    background = COLOR_BLACK;
+		if (background == -1 && !using_defaults)
+			background = COLOR_BLACK;

-	init_pair(ink->pairnum, foreground, background);
-#ifdef DEBUG
-	fprintf(stderr, "init_pair(): fg = %hd, bg = %hd\n", foreground, background);
-#endif
-    }
+		init_pair(ink->pairnum, foreground, background);
+	}
+
+	have_palette = TRUE;
 }

 /* Try to match the given shibboleth string with one of the regexes in
 * the list starting at head.  Return TRUE upon success. */
 bool found_in_list(regexlisttype *head, const char *shibboleth)
 {
-    regexlisttype *item;
-    regex_t rgx;
+	regexlisttype *item;
+	regex_t rgx;

-    for (item = head; item != NULL; item = item->next) {
-	regcomp(&rgx, fixbounds(item->full_regex), NANO_REG_EXTENDED);
+	for (item = head; item != NULL; item = item->next) {
+		regcomp(&rgx, fixbounds(item->full_regex), NANO_REG_EXTENDED);

-	if (regexec(&rgx, shibboleth, 0, NULL, 0) == 0) {
-	    regfree(&rgx);
-	    return TRUE;
+		if (regexec(&rgx, shibboleth, 0, NULL, 0) == 0) {
+			regfree(&rgx);
+			return TRUE;
+		}
+
+		regfree(&rgx);
 	}

-	regfree(&rgx);
-    }
-
-    return FALSE;
+	return FALSE;
 }

 /* Update the color information based on the current filename and content. */
 void color_update(void)
 {
-    syntaxtype *sint = NULL;
-    colortype *ink;
+	syntaxtype *sint = NULL;
+	colortype *ink;

-    /* If the rcfiles were not read, or contained no syntaxes, get out. */
-    if (syntaxes == NULL)
-	return;
+	/* If the rcfiles were not read, or contained no syntaxes, get out. */
+	if (syntaxes == NULL)
+		return;

-    /* If we specified a syntax-override string, use it. */
-    if (syntaxstr != NULL) {
-	/* An override of "none" is like having no syntax at all. */
-	if (strcmp(syntaxstr, "none") == 0)
-	    return;
+	/* If we specified a syntax-override string, use it. */
+	if (syntaxstr != NULL) {
+		/* An override of "none" is like having no syntax at all. */
+		if (strcmp(syntaxstr, "none") == 0)
+			return;

-	for (sint = syntaxes; sint != NULL; sint = sint->next) {
-	    if (strcmp(sint->name, syntaxstr) == 0)
-		break;
+		for (sint = syntaxes; sint != NULL; sint = sint->next) {
+			if (strcmp(sint->name, syntaxstr) == 0)
+				break;
+		}
+
+		if (sint == NULL && !inhelp)
+			statusline(ALERT, _("Unknown syntax name: %s"), syntaxstr);
 	}

-	if (sint == NULL)
-	    statusline(ALERT, _("Unknown syntax name: %s"), syntaxstr);
-    }
+	/* If no syntax-override string was specified, or it didn't match,
+	 * try finding a syntax based on the filename (extension). */
+	if (sint == NULL && !inhelp) {
+		char *reserved = charalloc(PATH_MAX + 1);
+		char *currentdir = getcwd(reserved, PATH_MAX + 1);
+		char *joinednames = charalloc(PATH_MAX + 1);
+		char *fullname = NULL;

-    /* If no syntax-override string was specified, or it didn't match,
-     * try finding a syntax based on the filename (extension). */
-    if (sint == NULL) {
-	char *reserved = charalloc(PATH_MAX + 1);
-	char *currentdir = getcwd(reserved, PATH_MAX + 1);
-	char *joinednames = charalloc(PATH_MAX + 1);
-	char *fullname = NULL;
+		if (currentdir == NULL)
+			free(reserved);
+		else {
+			/* Concatenate the current working directory with the
+			 * specified filename, and canonicalize the result. */
+			sprintf(joinednames, "%s/%s", currentdir, openfile->filename);
+			fullname = get_full_path(joinednames);
+			free(currentdir);
+		}

-	if (currentdir == NULL)
-	    free(reserved);
-	else {
-	    /* Concatenate the current working directory with the
-	     * specified filename, and canonicalize the result. */
-	    sprintf(joinednames, "%s/%s", currentdir, openfile->filename);
-	    fullname = get_full_path(joinednames);
-	    free(currentdir);
+		if (fullname == NULL)
+			fullname = mallocstrcpy(fullname, openfile->filename);
+
+		for (sint = syntaxes; sint != NULL; sint = sint->next) {
+			if (found_in_list(sint->extensions, fullname))
+				break;
+		}
+
+		free(joinednames);
+		free(fullname);
 	}

-	if (fullname == NULL)
-	    fullname = mallocstrcpy(fullname, openfile->filename);
-
-	for (sint = syntaxes; sint != NULL; sint = sint->next) {
-	    if (found_in_list(sint->extensions, fullname))
-		break;
+	/* If the filename didn't match anything, try the first line. */
+	if (sint == NULL && !inhelp) {
+		for (sint = syntaxes; sint != NULL; sint = sint->next) {
+			if (found_in_list(sint->headers, openfile->fileage->data))
+				break;
+		}
 	}

-	free(joinednames);
-	free(fullname);
-    }
-
-    /* If the filename didn't match anything, try the first line. */
-    if (sint == NULL) {
-#ifdef DEBUG
-	fprintf(stderr, "No result from file extension, trying headerline...\n");
-#endif
-	for (sint = syntaxes; sint != NULL; sint = sint->next) {
-	    if (found_in_list(sint->headers, openfile->fileage->data))
-		break;
-	}
-    }
-
 #ifdef HAVE_LIBMAGIC
-    /* If we still don't have an answer, try using magic. */
-    if (sint == NULL) {
-	struct stat fileinfo;
-	magic_t cookie = NULL;
-	const char *magicstring = NULL;
-#ifdef DEBUG
-	fprintf(stderr, "No result from headerline either, trying libmagic...\n");
-#endif
-	if (stat(openfile->filename, &fileinfo) == 0) {
-	    /* Open the magic database and get a diagnosis of the file. */
-	    cookie = magic_open(MAGIC_SYMLINK |
-#ifdef DEBUG
-				    MAGIC_DEBUG | MAGIC_CHECK |
-#endif
-				    MAGIC_ERROR);
-	    if (cookie == NULL || magic_load(cookie, NULL) < 0)
-		statusline(ALERT, _("magic_load() failed: %s"), strerror(errno));
-	    else {
-		magicstring = magic_file(cookie, openfile->filename);
-		if (magicstring == NULL)
-		    statusline(ALERT, _("magic_file(%s) failed: %s"),
-				openfile->filename, magic_error(cookie));
-#ifdef DEBUG
-		fprintf(stderr, "Returned magic string is: %s\n", magicstring);
-#endif
-	    }
-	}
+	/* If we still don't have an answer, try using magic. */
+	if (sint == NULL && !inhelp) {
+		struct stat fileinfo;
+		magic_t cookie = NULL;
+		const char *magicstring = NULL;

-	/* Now try and find a syntax that matches the magic string. */
-	if (magicstring != NULL) {
-	    for (sint = syntaxes; sint != NULL; sint = sint->next) {
-		if (found_in_list(sint->magics, magicstring))
-		    break;
-	    }
-	}
+		if (stat(openfile->filename, &fileinfo) == 0) {
+			/* Open the magic database and get a diagnosis of the file. */
+			cookie = magic_open(MAGIC_SYMLINK |
+#ifdef DEBUG
+									MAGIC_DEBUG | MAGIC_CHECK |
+#endif
+									MAGIC_ERROR);
+			if (cookie == NULL || magic_load(cookie, NULL) < 0)
+				statusline(ALERT, _("magic_load() failed: %s"), strerror(errno));
+			else {
+				magicstring = magic_file(cookie, openfile->filename);
+				if (magicstring == NULL)
+					statusline(ALERT, _("magic_file(%s) failed: %s"),
+								openfile->filename, magic_error(cookie));
+			}
+		}

-	if (stat(openfile->filename, &fileinfo) == 0)
-	    magic_close(cookie);
-    }
+		/* Now try and find a syntax that matches the magic string. */
+		if (magicstring != NULL) {
+			for (sint = syntaxes; sint != NULL; sint = sint->next) {
+				if (found_in_list(sint->magics, magicstring))
+					break;
+			}
+		}
+
+		if (stat(openfile->filename, &fileinfo) == 0)
+			magic_close(cookie);
+	}
 #endif /* HAVE_LIBMAGIC */

-    /* If nothing at all matched, see if there is a default syntax. */
-    if (sint == NULL) {
-	for (sint = syntaxes; sint != NULL; sint = sint->next) {
-	    if (strcmp(sint->name, "default") == 0)
-		break;
-	}
-    }
-
-    openfile->syntax = sint;
-    openfile->colorstrings = (sint == NULL ? NULL : sint->color);
-
-    /* If a syntax was found, compile its specified regexes (which have
-     * already been checked for validity when they were read in). */
-    for (ink = openfile->colorstrings; ink != NULL; ink = ink->next) {
-	if (ink->start == NULL) {
-	    ink->start = (regex_t *)nmalloc(sizeof(regex_t));
-	    regcomp(ink->start, fixbounds(ink->start_regex), ink->rex_flags);
+	/* If nothing at all matched, see if there is a default syntax. */
+	if (sint == NULL && !inhelp) {
+		for (sint = syntaxes; sint != NULL; sint = sint->next) {
+			if (strcmp(sint->name, "default") == 0)
+				break;
+		}
 	}

-	if (ink->end_regex != NULL && ink->end == NULL) {
-	    ink->end = (regex_t *)nmalloc(sizeof(regex_t));
-	    regcomp(ink->end, fixbounds(ink->end_regex), ink->rex_flags);
+	openfile->syntax = sint;
+	openfile->colorstrings = (sint == NULL ? NULL : sint->color);
+
+	/* If a syntax was found, compile its specified regexes (which have
+	 * already been checked for validity when they were read in). */
+	for (ink = openfile->colorstrings; ink != NULL; ink = ink->next) {
+		if (ink->start == NULL) {
+			ink->start = (regex_t *)nmalloc(sizeof(regex_t));
+			regcomp(ink->start, fixbounds(ink->start_regex), ink->rex_flags);
+		}
+
+		if (ink->end_regex != NULL && ink->end == NULL) {
+			ink->end = (regex_t *)nmalloc(sizeof(regex_t));
+			regcomp(ink->end, fixbounds(ink->end_regex), ink->rex_flags);
+		}
 	}
-    }
 }

 /* Determine whether the matches of multiline regexes are still the same,
 * and if not, schedule a screen refresh, so things will be repainted. */
 void check_the_multis(filestruct *line)
 {
-    const colortype *ink;
-    bool astart, anend;
-    regmatch_t startmatch, endmatch;
+	const colortype *ink;
+	bool astart, anend;
+	regmatch_t startmatch, endmatch;
+	char *afterstart;

-    /* If there is no syntax or no multiline regex, there is nothing to do. */
-    if (openfile->syntax == NULL || openfile->syntax->nmultis == 0)
-	return;
+	/* If there is no syntax or no multiline regex, there is nothing to do. */
+	if (openfile->syntax == NULL || openfile->syntax->nmultis == 0)
+		return;

-    for (ink = openfile->colorstrings; ink != NULL; ink = ink->next) {
-	/* If it's not a multiline regex, skip. */
-	if (ink->end == NULL)
-	    continue;
+	for (ink = openfile->colorstrings; ink != NULL; ink = ink->next) {
+		/* If it's not a multiline regex, skip. */
+		if (ink->end == NULL)
+			continue;

-	alloc_multidata_if_needed(line);
+		alloc_multidata_if_needed(line);

-	astart = (regexec(ink->start, line->data, 1, &startmatch, 0) == 0);
-	anend = (regexec(ink->end, line->data, 1, &endmatch, 0) == 0);
+		astart = (regexec(ink->start, line->data, 1, &startmatch, 0) == 0);
+		afterstart = line->data + (astart ? startmatch.rm_eo : 0);
+		anend = (regexec(ink->end, afterstart, 1, &endmatch, 0) == 0);

-	/* Check whether the multidata still matches the current situation. */
-	if (line->multidata[ink->id] == CNONE ||
-			line->multidata[ink->id] == CWHOLELINE) {
-	    if (!astart && !anend)
-		continue;
-	} else if (line->multidata[ink->id] == CSTARTENDHERE) {
-	    if (astart && anend && startmatch.rm_so < endmatch.rm_so)
-		continue;
-	} else if (line->multidata[ink->id] == CBEGINBEFORE) {
-	    if (!astart && anend)
-		continue;
-	} else if (line->multidata[ink->id] == CENDAFTER) {
-	    if (astart && !anend)
-		continue;
+		/* Check whether the multidata still matches the current situation. */
+		if (line->multidata[ink->id] == CNONE ||
+						line->multidata[ink->id] == CWHOLELINE) {
+			if (!astart && !anend)
+				continue;
+		} else if (line->multidata[ink->id] == CSTARTENDHERE) {
+			if (astart && anend && startmatch.rm_so < endmatch.rm_so)
+				continue;
+		} else if (line->multidata[ink->id] == CBEGINBEFORE) {
+			if (!astart && anend)
+				continue;
+		} else if (line->multidata[ink->id] == CENDAFTER) {
+			if (astart && !anend)
+				continue;
+		}
+
+		/* There is a mismatch, so something changed: repaint. */
+		refresh_needed = TRUE;
+		return;
 	}
-
-	/* There is a mismatch, so something changed: repaint. */
-	refresh_needed = TRUE;
-	return;
-    }
 }

 /* Allocate (for one line) the cache space for multiline color regexes. */
 void alloc_multidata_if_needed(filestruct *fileptr)
 {
-    int i;
+	int i;

-    if (fileptr->multidata == NULL) {
-	fileptr->multidata = (short *)nmalloc(openfile->syntax->nmultis * sizeof(short));
+	if (fileptr->multidata == NULL) {
+		fileptr->multidata = (short *)nmalloc(openfile->syntax->nmultis * sizeof(short));

-	for (i = 0; i < openfile->syntax->nmultis; i++)
-	    fileptr->multidata[i] = -1;
-    }
+		for (i = 0; i < openfile->syntax->nmultis; i++)
+			fileptr->multidata[i] = -1;
+	}
 }

 /* Precalculate the multi-line start and end regex info so we can
 * speed up rendering (with any hope at all...). */
 void precalc_multicolorinfo(void)
 {
-    const colortype *ink;
-    regmatch_t startmatch, endmatch;
-    filestruct *line, *tailline;
+	const colortype *ink;
+	regmatch_t startmatch, endmatch;
+	filestruct *line, *tailline;

-    if (openfile->colorstrings == NULL || ISSET(NO_COLOR_SYNTAX))
-	return;
+	if (openfile->colorstrings == NULL || ISSET(NO_COLOR_SYNTAX))
+		return;

 #ifdef DEBUG
-    fprintf(stderr, "Precalculating the multiline color info...\n");
+	fprintf(stderr, "Precalculating the multiline color info...\n");
 #endif

-    for (ink = openfile->colorstrings; ink != NULL; ink = ink->next) {
-	/* If this is not a multi-line regex, skip it. */
-	if (ink->end == NULL)
-	    continue;
+	for (ink = openfile->colorstrings; ink != NULL; ink = ink->next) {
+		/* If this is not a multi-line regex, skip it. */
+		if (ink->end == NULL)
+			continue;

-	for (line = openfile->fileage; line != NULL; line = line->next) {
-	    int index = 0;
+		for (line = openfile->fileage; line != NULL; line = line->next) {
+			int index = 0;

-	    alloc_multidata_if_needed(line);
-	    /* Assume nothing applies until proven otherwise below. */
-	    line->multidata[ink->id] = CNONE;
+			alloc_multidata_if_needed(line);
+			/* Assume nothing applies until proven otherwise below. */
+			line->multidata[ink->id] = CNONE;

-	    /* For an unpaired start match, mark all remaining lines. */
-	    if (line->prev && line->prev->multidata[ink->id] == CWOULDBE) {
-		line->multidata[ink->id] = CWOULDBE;
-		continue;
-	    }
+			/* For an unpaired start match, mark all remaining lines. */
+			if (line->prev && line->prev->multidata[ink->id] == CWOULDBE) {
+				line->multidata[ink->id] = CWOULDBE;
+				continue;
+			}

-	    /* When the line contains a start match, look for an end, and if
-	     * found, mark all the lines that are affected. */
-	    while (regexec(ink->start, line->data + index, 1,
-			&startmatch, (index == 0) ? 0 : REG_NOTBOL) == 0) {
-		/* Begin looking for an end match after the start match. */
-		index += startmatch.rm_eo;
+			/* When the line contains a start match, look for an end, and if
+			 * found, mark all the lines that are affected. */
+			while (regexec(ink->start, line->data + index, 1,
+						&startmatch, (index == 0) ? 0 : REG_NOTBOL) == 0) {
+				/* Begin looking for an end match after the start match. */
+				index += startmatch.rm_eo;

-		/* If there is an end match on this line, mark the line, but
-		 * continue looking for other starts after it. */
-		if (regexec(ink->end, line->data + index, 1,
-			&endmatch, (index == 0) ? 0 : REG_NOTBOL) == 0) {
-		    line->multidata[ink->id] = CSTARTENDHERE;
-		    index += endmatch.rm_eo;
-		    /* If both start and end are mere anchors, step ahead. */
-		    if (startmatch.rm_so == startmatch.rm_eo &&
-				endmatch.rm_so == endmatch.rm_eo) {
-			/* When at end-of-line, we're done. */
-			if (line->data[index] == '\0')
-			    break;
-			index = move_mbright(line->data, index);
-		    }
-		    continue;
+				/* If there is an end match on this line, mark the line, but
+				 * continue looking for other starts after it. */
+				if (regexec(ink->end, line->data + index, 1,
+						&endmatch, (index == 0) ? 0 : REG_NOTBOL) == 0) {
+					line->multidata[ink->id] = CSTARTENDHERE;
+					index += endmatch.rm_eo;
+					/* If both start and end are mere anchors, step ahead. */
+					if (startmatch.rm_so == startmatch.rm_eo &&
+								endmatch.rm_so == endmatch.rm_eo) {
+						/* When at end-of-line, we're done. */
+						if (line->data[index] == '\0')
+							break;
+						index = move_mbright(line->data, index);
+					}
+					continue;
+				}
+
+				/* Look for an end match on later lines. */
+				tailline = line->next;
+
+				while (tailline != NULL) {
+					if (regexec(ink->end, tailline->data, 1, &endmatch, 0) == 0)
+						break;
+					tailline = tailline->next;
+				}
+
+				if (tailline == NULL) {
+					line->multidata[ink->id] = CWOULDBE;
+					break;
+				}
+
+				/* We found it, we found it, la la la la la.  Mark all
+				 * the lines in between and the end properly. */
+				line->multidata[ink->id] = CENDAFTER;
+
+				for (line = line->next; line != tailline; line = line->next) {
+					alloc_multidata_if_needed(line);
+					line->multidata[ink->id] = CWHOLELINE;
+				}
+
+				alloc_multidata_if_needed(tailline);
+				tailline->multidata[ink->id] = CBEGINBEFORE;
+
+				/* Begin looking for a new start after the end match. */
+				index = endmatch.rm_eo;
+			}
 		}
-
-		/* Look for an end match on later lines. */
-		tailline = line->next;
-
-		while (tailline != NULL) {
-		    if (regexec(ink->end, tailline->data, 1, &endmatch, 0) == 0)
-			break;
-		    tailline = tailline->next;
-		}
-
-		if (tailline == NULL) {
-		    line->multidata[ink->id] = CWOULDBE;
-		    break;
-		}
-
-		/* We found it, we found it, la la la la la.  Mark all
-		 * the lines in between and the end properly. */
-		line->multidata[ink->id] = CENDAFTER;
-
-		for (line = line->next; line != tailline; line = line->next) {
-		    alloc_multidata_if_needed(line);
-		    line->multidata[ink->id] = CWHOLELINE;
-		}
-
-		alloc_multidata_if_needed(tailline);
-		tailline->multidata[ink->id] = CBEGINBEFORE;
-
-		/* Begin looking for a new start after the end match. */
-		index = endmatch.rm_eo;
-	    }
 	}
-    }
 }

-#endif /* !DISABLE_COLOR */
+#endif /* ENABLE_COLOR */
--- a/src/cut.c
+++ b/src/cut.c
@@ -1,8 +1,7 @@
 /**************************************************************************
 *   cut.c  --  This file is part of GNU nano.                            *
 *                                                                        *
- *   Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007,  *
- *   2008, 2009, 2010, 2011, 2013, 2014 Free Software Foundation, Inc.    *
+ *   Copyright (C) 1999-2011, 2013-2018 Free Software Foundation, Inc.    *
 *   Copyright (C) 2014 Mark Majeres                                      *
 *   Copyright (C) 2016 Benno Schulenberg                                 *
 *                                                                        *
@@ -24,21 +23,20 @@
 #include "proto.h"

 #include <string.h>
-#include <stdio.h>

 static bool keep_cutbuffer = FALSE;
-	/* Should we keep the contents of the cutbuffer? */
+		/* Should we keep the contents of the cutbuffer? */

 /* Indicate that we should no longer keep the contents of the cutbuffer. */
 void cutbuffer_reset(void)
 {
-    keep_cutbuffer = FALSE;
+	keep_cutbuffer = FALSE;
 }

 /* Return the status of cutbuffer preservation. */
 inline bool keeping_cutbuffer(void)
 {
-    return keep_cutbuffer;
+	return keep_cutbuffer;
 }

 /* If we aren't on the last line of the file, move all the text of the
@@ -48,13 +46,13 @@ inline bool keeping_cutbuffer(void)
 * current line. */
 void cut_line(void)
 {
-    if (openfile->current != openfile->filebot)
-	extract_buffer(&cutbuffer, &cutbottom, openfile->current, 0,
-		openfile->current->next, 0);
-    else
-	extract_buffer(&cutbuffer, &cutbottom, openfile->current, 0,
-		openfile->current, strlen(openfile->current->data));
-    openfile->placewewant = 0;
+	if (openfile->current != openfile->filebot)
+		extract_buffer(&cutbuffer, &cutbottom, openfile->current, 0,
+				openfile->current->next, 0);
+	else
+		extract_buffer(&cutbuffer, &cutbottom, openfile->current, 0,
+				openfile->current, strlen(openfile->current->data));
+	openfile->placewewant = 0;
 }

 #ifndef NANO_TINY
@@ -62,14 +60,14 @@ void cut_line(void)
 * current place we want to where the text used to start. */
 void cut_marked(bool *right_side_up)
 {
-    filestruct *top, *bot;
-    size_t top_x, bot_x;
+	filestruct *top, *bot;
+	size_t top_x, bot_x;

-    mark_order((const filestruct **)&top, &top_x,
-		(const filestruct **)&bot, &bot_x, right_side_up);
+	mark_order((const filestruct **)&top, &top_x,
+				(const filestruct **)&bot, &bot_x, right_side_up);

-    extract_buffer(&cutbuffer, &cutbottom, top, top_x, bot, bot_x);
-    openfile->placewewant = xplustabs();
+	extract_buffer(&cutbuffer, &cutbottom, top, top_x, bot, bot_x);
+	openfile->placewewant = xplustabs();
 }

 /* If we aren't at the end of the current line, move all the text from
@@ -80,221 +78,208 @@ void cut_marked(bool *right_side_up)
 * newline used to be. */
 void cut_to_eol(void)
 {
-    size_t data_len = strlen(openfile->current->data);
+	size_t data_len = strlen(openfile->current->data);

-    if (openfile->current_x < data_len)
-	/* If we're not at the end of the line, move all the text from
-	 * the current position up to it, not counting the newline at
-	 * the end, into the cutbuffer. */
-	extract_buffer(&cutbuffer, &cutbottom, openfile->current,
-		openfile->current_x, openfile->current, data_len);
-    else if (openfile->current != openfile->filebot) {
-	/* If we're at the end of the line, and it isn't the last line
-	 * of the file, move all the text from the current position up
-	 * to the beginning of the next line, i.e. the newline at the
-	 * end, into the cutbuffer. */
-	extract_buffer(&cutbuffer, &cutbottom, openfile->current,
-		openfile->current_x, openfile->current->next, 0);
-	openfile->placewewant = xplustabs();
-    }
+	if (openfile->current_x < data_len)
+		/* If we're not at the end of the line, move all the text from
+		 * the current position up to it, not counting the newline at
+		 * the end, into the cutbuffer. */
+		extract_buffer(&cutbuffer, &cutbottom, openfile->current,
+				openfile->current_x, openfile->current, data_len);
+	else if (openfile->current != openfile->filebot) {
+		/* If we're at the end of the line, and it isn't the last line
+		 * of the file, move all the text from the current position up
+		 * to the beginning of the next line, i.e. the newline at the
+		 * end, into the cutbuffer. */
+		extract_buffer(&cutbuffer, &cutbottom, openfile->current,
+				openfile->current_x, openfile->current->next, 0);
+		openfile->placewewant = xplustabs();
+	}
 }

 /* Move all the text from the current cursor position to the end of the
 * file into the cutbuffer. */
 void cut_to_eof(void)
 {
-    extract_buffer(&cutbuffer, &cutbottom,
-		openfile->current, openfile->current_x,
-		openfile->filebot, strlen(openfile->filebot->data));
+	extract_buffer(&cutbuffer, &cutbottom,
+				openfile->current, openfile->current_x,
+				openfile->filebot, strlen(openfile->filebot->data));
 }
 #endif /* !NANO_TINY */

-/* Move text from the current filestruct into the cutbuffer.  If
- * copy_text is TRUE, copy the text back into the filestruct afterward.
+/* Move text from the current buffer into the cutbuffer.  If
+ * copy_text is TRUE, copy the text back into the buffer afterward.
 * If cut_till_eof is TRUE, move all text from the current cursor
 * position to the end of the file into the cutbuffer. */
 void do_cut_text(bool copy_text, bool cut_till_eof)
 {
 #ifndef NANO_TINY
-    filestruct *cb_save = NULL;
-	/* The current end of the cutbuffer, before we add text to it. */
-    size_t cb_save_len = 0;
-	/* The length of the string at the current end of the cutbuffer,
-	 * before we add text to it. */
-    bool old_no_newlines = ISSET(NO_NEWLINES);
-    bool right_side_up = TRUE;
-	/* There *is* no region, *or* it is marked forward. */
+	filestruct *cb_save = NULL;
+		/* The current end of the cutbuffer, before we add text to it. */
+	size_t cb_save_len = 0;
+		/* The length of the string at the current end of the cutbuffer,
+		 * before we add text to it. */
+	bool old_no_newlines = ISSET(NO_NEWLINES);
+	bool right_side_up = TRUE;
+		/* There *is* no region, *or* it is marked forward. */
 #endif
-    size_t was_totsize = openfile->totsize;
+	size_t was_totsize = openfile->totsize;

-    /* If a chain of cuts was broken, empty the cutbuffer. */
-    if (!keep_cutbuffer) {
-	free_filestruct(cutbuffer);
-	cutbuffer = NULL;
-#ifdef DEBUG
-	fprintf(stderr, "Blew away cutbuffer =)\n");
-#endif
-	/* Indicate that future cuts should add to the cutbuffer. */
-	keep_cutbuffer = TRUE;
-    }
+	/* If a chain of cuts was broken, empty the cutbuffer. */
+	if (!keep_cutbuffer) {
+		free_filestruct(cutbuffer);
+		cutbuffer = NULL;
+		/* Indicate that future cuts should add to the cutbuffer. */
+		keep_cutbuffer = TRUE;
+	}

 #ifndef NANO_TINY
-    if (copy_text) {
-	/* If the cutbuffer isn't empty, remember where it currently ends. */
-	if (cutbuffer != NULL) {
-	    cb_save = cutbottom;
-	    cb_save_len = strlen(cutbottom->data);
+	if (copy_text) {
+		/* If the cutbuffer isn't empty, remember where it currently ends. */
+		if (cutbuffer != NULL) {
+			cb_save = cutbottom;
+			cb_save_len = strlen(cutbottom->data);
+		}
+		/* Don't add a magicline when moving text to the cutbuffer. */
+		SET(NO_NEWLINES);
 	}
-	/* Don't add a magicline when moving text to the cutbuffer. */
-	SET(NO_NEWLINES);
-    }

-    if (cut_till_eof) {
-	/* Move all text up to the end of the file into the cutbuffer. */
-	cut_to_eof();
-    } else if (openfile->mark_set) {
-	/* Move the marked text to the cutbuffer, and turn the mark off. */
-	cut_marked(&right_side_up);
-	openfile->mark_set = FALSE;
-    } else if (ISSET(CUT_TO_END))
-	/* Move all text up to the end of the line into the cutbuffer. */
-	cut_to_eol();
-    else
+	if (cut_till_eof) {
+		/* Move all text up to the end of the file into the cutbuffer. */
+		cut_to_eof();
+	} else if (openfile->mark) {
+		/* Move the marked text to the cutbuffer, and turn the mark off. */
+		cut_marked(&right_side_up);
+		openfile->mark = NULL;
+	} else if (ISSET(CUT_FROM_CURSOR))
+		/* Move all text up to the end of the line into the cutbuffer. */
+		cut_to_eol();
+	else
 #endif
-	/* Move the entire line into the cutbuffer. */
-	cut_line();
+		/* Move the entire line into the cutbuffer. */
+		cut_line();

 #ifndef NANO_TINY
-    if (copy_text) {
-	/* Copy the text that is in the cutbuffer (starting at its saved end,
-	 * if there is one) back into the current buffer.  This effectively
-	 * uncuts the text we just cut. */
-	if (cutbuffer != NULL) {
-	    if (cb_save != NULL) {
-		cb_save->data += cb_save_len;
-		copy_from_buffer(cb_save);
-		cb_save->data -= cb_save_len;
-	    } else
-		copy_from_buffer(cutbuffer);
+	if (copy_text) {
+		/* Copy the text that is in the cutbuffer (starting at its saved end,
+		 * if there is one) back into the current buffer.  This effectively
+		 * uncuts the text we just cut. */
+		if (cutbuffer != NULL) {
+			if (cb_save != NULL) {
+				cb_save->data += cb_save_len;
+				copy_from_buffer(cb_save);
+				cb_save->data -= cb_save_len;
+			} else
+				copy_from_buffer(cutbuffer);

-	    /* If the copied region was marked forward, put the new desired
-	     * x position at its end; otherwise, leave it at its beginning. */
-	    if (right_side_up)
-		openfile->placewewant = xplustabs();
-	}
-	/* Restore the magicline behavior now that we're done fiddling. */
-	if (!old_no_newlines)
-	    UNSET(NO_NEWLINES);
-    } else
+			/* If the copied region was marked forward, put the new desired
+			 * x position at its end; otherwise, leave it at its beginning. */
+			if (right_side_up)
+				openfile->placewewant = xplustabs();
+		}
+		/* Restore the magicline behavior now that we're done fiddling. */
+		if (!old_no_newlines)
+			UNSET(NO_NEWLINES);
+	} else
 #endif /* !NANO_TINY */
-    /* Only set the modification flag if actually something was cut. */
-    if (openfile->totsize != was_totsize)
-	set_modified();
+	/* Only set the modification flag if actually something was cut. */
+	if (openfile->totsize != was_totsize)
+		set_modified();

-    refresh_needed = TRUE;
-
-#ifndef DISABLE_COLOR
-    check_the_multis(openfile->current);
-#endif
+	refresh_needed = TRUE;

 #ifdef DEBUG
-    dump_filestruct(cutbuffer);
+	dump_filestruct(cutbuffer);
 #endif
 }

-/* Move text from the current filestruct into the cutbuffer. */
+/* Move text from the current buffer into the cutbuffer. */
 void do_cut_text_void(void)
 {
 #ifndef NANO_TINY
-    add_undo(CUT);
+	add_undo(CUT);
 #endif
-    do_cut_text(FALSE, FALSE);
+	do_cut_text(FALSE, FALSE);
 #ifndef NANO_TINY
-    update_undo(CUT);
+	update_undo(CUT);
 #endif
 }

 #ifndef NANO_TINY
-/* Move text from the current filestruct into the cutbuffer, and copy it
- * back into the filestruct afterward.  If the mark is set or the cursor
+/* Move text from the current buffer into the cutbuffer, and copy it
+ * back into the buffer afterward.  If the mark is set or the cursor
 * was moved, blow away previous contents of the cutbuffer. */
 void do_copy_text(void)
 {
-    static struct filestruct *next_contiguous_line = NULL;
-    bool mark_set = openfile->mark_set;
+	static struct filestruct *next_contiguous_line = NULL;
+	bool mark_is_set = (openfile->mark != NULL);

-    /* Remember the current viewport and cursor position. */
-    ssize_t is_edittop_lineno = openfile->edittop->lineno;
-    ssize_t is_current_lineno = openfile->current->lineno;
-    size_t is_current_x = openfile->current_x;
+	/* Remember the current viewport and cursor position. */
+	ssize_t is_edittop_lineno = openfile->edittop->lineno;
+	size_t is_firstcolumn = openfile->firstcolumn;
+	ssize_t is_current_lineno = openfile->current->lineno;
+	size_t is_current_x = openfile->current_x;

-    if (mark_set || openfile->current != next_contiguous_line)
-	cutbuffer_reset();
+	if (mark_is_set || openfile->current != next_contiguous_line)
+		cutbuffer_reset();

-    do_cut_text(TRUE, FALSE);
+	do_cut_text(TRUE, FALSE);

-    /* If the mark was set, blow away the cutbuffer on the next copy. */
-    next_contiguous_line = (mark_set ? NULL : openfile->current);
+	/* If the mark was set, blow away the cutbuffer on the next copy. */
+	next_contiguous_line = (mark_is_set ? NULL : openfile->current);

-    if (mark_set) {
-	/* Restore the viewport and cursor position. */
-	openfile->edittop = fsfromline(is_edittop_lineno);
-	openfile->current = fsfromline(is_current_lineno);
-	openfile->current_x = is_current_x;
-    }
+	/* If the mark was set, restore the viewport and cursor position. */
+	if (mark_is_set) {
+		openfile->edittop = fsfromline(is_edittop_lineno);
+		openfile->firstcolumn = is_firstcolumn;
+		openfile->current = fsfromline(is_current_lineno);
+		openfile->current_x = is_current_x;
+	}
 }

 /* Cut from the current cursor position to the end of the file. */
 void do_cut_till_eof(void)
 {
-    add_undo(CUT_EOF);
-    do_cut_text(FALSE, TRUE);
-    update_undo(CUT_EOF);
+	add_undo(CUT_TO_EOF);
+	do_cut_text(FALSE, TRUE);
+	update_undo(CUT_TO_EOF);
 }
 #endif /* !NANO_TINY */

-/* Copy text from the cutbuffer into the current filestruct. */
+/* Copy text from the cutbuffer into the current buffer. */
 void do_uncut_text(void)
 {
-    ssize_t was_lineno = openfile->current->lineno;
+	ssize_t was_lineno = openfile->current->lineno;
+		/* The line number where we started the paste. */
+	size_t was_leftedge = 0;
+		/* The leftedge where we started the paste. */

-    /* If the cutbuffer is empty, there is nothing to do. */
-    if (cutbuffer == NULL)
-	return;
+	/* If the cutbuffer is empty, there is nothing to do. */
+	if (cutbuffer == NULL)
+		return;

 #ifndef NANO_TINY
-    add_undo(PASTE);
+	add_undo(PASTE);
+
+	if (ISSET(SOFTWRAP))
+		was_leftedge = leftedge_for(xplustabs(), openfile->current);
 #endif

-    /* Add a copy of the text in the cutbuffer to the current filestruct
-     * at the current cursor position. */
-    copy_from_buffer(cutbuffer);
+	/* Add a copy of the text in the cutbuffer to the current buffer
+	 * at the current cursor position. */
+	copy_from_buffer(cutbuffer);

 #ifndef NANO_TINY
-    update_undo(PASTE);
+	update_undo(PASTE);
 #endif

-    if (openfile->current->lineno - was_lineno < editwinrows)
-	focusing = FALSE;
+	/* If we pasted less than a screenful, don't center the cursor. */
+	if (less_than_a_screenful(was_lineno, was_leftedge))
+		focusing = FALSE;

-    /* Set the desired x position to where the pasted text ends. */
-    openfile->placewewant = xplustabs();
+	/* Set the desired x position to where the pasted text ends. */
+	openfile->placewewant = xplustabs();

-    /* Mark the file as modified. */
-    set_modified();
-
-    /* Update the cursor position to account for the inserted lines. */
-    reset_cursor();
-
-    ensure_line_is_visible();
-
-    refresh_needed = TRUE;
-
-#ifndef DISABLE_COLOR
-    check_the_multis(openfile->current);
-#endif
-
-#ifdef DEBUG
-    dump_filestruct_reverse();
-#endif
+	set_modified();
+	refresh_needed = TRUE;
 }
--- a/src/files.c
+++ b/src/files.c
--- a/src/global.c
+++ b/src/global.c
--- a/src/help.c
+++ b/src/help.c
--- a/src/history.c
+++ b/src/history.c
@@ -0,0 +1,616 @@
+/**************************************************************************
+ *   history.c  --  This file is part of GNU nano.                        *
+ *                                                                        *
+ *   Copyright (C) 2003-2011, 2013-2018 Free Software Foundation, Inc.    *
+ *   Copyright (C) 2016-2017 Benno Schulenberg                            *
+ *                                                                        *
+ *   GNU nano is free software: you can redistribute it and/or modify     *
+ *   it under the terms of the GNU General Public License as published    *
+ *   by the Free Software Foundation, either version 3 of the License,    *
+ *   or (at your option) any later version.                               *
+ *                                                                        *
+ *   GNU nano is distributed in the hope that it will be useful,          *
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty          *
+ *   of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.              *
+ *   See the GNU General Public License for more details.                 *
+ *                                                                        *
+ *   You should have received a copy of the GNU General Public License    *
+ *   along with this program.  If not, see http://www.gnu.org/licenses/.  *
+ *                                                                        *
+ **************************************************************************/
+
+#include "proto.h"
+
+#include <errno.h>
+#include <string.h>
+
+#ifdef ENABLE_HISTORIES
+
+#ifndef SEARCH_HISTORY
+#define SEARCH_HISTORY "search_history"
+#endif
+
+#ifndef POSITION_HISTORY
+#define POSITION_HISTORY "filepos_history"
+#endif
+
+static bool history_changed = FALSE;
+		/* Whether any of the history lists has changed. */
+static struct stat stat_of_positions_file;
+		/* The last-obtained stat information of the positions file. */
+static char *poshistname = NULL;
+		/* The name of the positions-history file. */
+
+/* Initialize the lists of historical search and replace strings
+ * and the list of historical executed commands. */
+void history_init(void)
+{
+	search_history = make_new_node(NULL);
+	search_history->data = mallocstrcpy(NULL, "");
+	searchtop = search_history;
+	searchbot = search_history;
+
+	replace_history = make_new_node(NULL);
+	replace_history->data = mallocstrcpy(NULL, "");
+	replacetop = replace_history;
+	replacebot = replace_history;
+
+	execute_history = make_new_node(NULL);
+	execute_history->data = mallocstrcpy(NULL, "");
+	executetop = execute_history;
+	executebot = execute_history;
+}
+
+/* Set the current position in the given history list to the bottom. */
+void history_reset(const filestruct *list)
+{
+	if (list == search_history)
+		search_history = searchbot;
+	else if (list == replace_history)
+		replace_history = replacebot;
+	else if (list == execute_history)
+		execute_history = executebot;
+}
+
+/* Return from the history list that starts at start and ends at end
+ * the first node that contains the first len characters of the given
+ * text, or NULL if there is no such node. */
+filestruct *find_history(const filestruct *start, const filestruct *end,
+		const char *text, size_t len)
+{
+	const filestruct *item;
+
+	for (item = start; item != end->prev && item != NULL; item = item->prev) {
+		if (strncmp(item->data, text, len) == 0)
+			return (filestruct *)item;
+	}
+
+	return NULL;
+}
+
+/* Update a history list (the one in which item is the current position)
+ * with a fresh string text.  That is: add text, or move it to the end. */
+void update_history(filestruct **item, const char *text)
+{
+	filestruct **htop = NULL, **hbot = NULL, *thesame;
+
+	if (*item == search_history) {
+		htop = &searchtop;
+		hbot = &searchbot;
+	} else if (*item == replace_history) {
+		htop = &replacetop;
+		hbot = &replacebot;
+	} else if (*item == execute_history) {
+		htop = &executetop;
+		hbot = &executebot;
+	}
+
+	/* See if the string is already in the history. */
+	thesame = find_history(*hbot, *htop, text, HIGHEST_POSITIVE);
+
+	/* If an identical string was found, delete that item. */
+	if (thesame != NULL) {
+		filestruct *after = thesame->next;
+
+		/* If the string is at the head of the list, move the head. */
+		if (thesame == *htop)
+			*htop = after;
+
+		unlink_node(thesame);
+		renumber(after);
+	}
+
+	/* If the history is full, delete the oldest item (the one at the
+	 * head of the list), to make room for a new item at the end. */
+	if ((*hbot)->lineno == MAX_SEARCH_HISTORY + 1) {
+		filestruct *oldest = *htop;
+
+		*htop = (*htop)->next;
+		unlink_node(oldest);
+		renumber(*htop);
+	}
+
+	/* Store the fresh string in the last item, then create a new item. */
+	(*hbot)->data = mallocstrcpy((*hbot)->data, text);
+	splice_node(*hbot, make_new_node(*hbot));
+	*hbot = (*hbot)->next;
+	(*hbot)->data = mallocstrcpy(NULL, "");
+
+	/* Indicate that the history needs to be saved on exit. */
+	history_changed = TRUE;
+
+	/* Set the current position in the list to the bottom. */
+	*item = *hbot;
+}
+
+/* Move h to the string in the history list just before it, and return
+ * that string.  If there isn't one, don't move h and return NULL. */
+char *get_history_older(filestruct **h)
+{
+	if ((*h)->prev == NULL)
+		return NULL;
+
+	*h = (*h)->prev;
+
+	return (*h)->data;
+}
+
+/* Move h to the string in the history list just after it, and return
+ * that string.  If there isn't one, don't move h and return NULL. */
+char *get_history_newer(filestruct **h)
+{
+	if ((*h)->next == NULL)
+		return NULL;
+
+	*h = (*h)->next;
+
+	return (*h)->data;
+}
+
+/* More placeholders. */
+void get_history_newer_void(void)
+{
+	;
+}
+void get_history_older_void(void)
+{
+	;
+}
+
+#ifdef ENABLE_TABCOMP
+/* Move h to the next string that's a tab completion of the string s,
+ * looking at only the first len characters of s, and return that
+ * string.  If there isn't one, or if len is 0, don't move h and return
+ * s. */
+char *get_history_completion(filestruct **h, char *s, size_t len)
+{
+	if (len > 0) {
+		filestruct *htop = NULL, *hbot = NULL, *p;
+
+		if (*h == search_history) {
+			htop = searchtop;
+			hbot = searchbot;
+		} else if (*h == replace_history) {
+			htop = replacetop;
+			hbot = replacebot;
+		} else if (*h == execute_history) {
+			htop = executetop;
+			hbot = executebot;
+		}
+
+		/* Search the history list from the current position to the top
+		 * for a match of len characters.  Skip over an exact match. */
+		p = find_history((*h)->prev, htop, s, len);
+
+		while (p != NULL && strcmp(p->data, s) == 0)
+			p = find_history(p->prev, htop, s, len);
+
+		if (p != NULL) {
+			*h = p;
+			return mallocstrcpy(s, (*h)->data);
+		}
+
+		/* Search the history list from the bottom to the current position
+		 * for a match of len characters.  Skip over an exact match. */
+		p = find_history(hbot, *h, s, len);
+
+		while (p != NULL && strcmp(p->data, s) == 0)
+			p = find_history(p->prev, *h, s, len);
+
+		if (p != NULL) {
+			*h = p;
+			return mallocstrcpy(s, (*h)->data);
+		}
+	}
+
+	/* If we're here, we didn't find a match, we didn't find an inexact
+	 * match, or len is 0.  Return s. */
+	return (char *)s;
+}
+#endif /* ENSABLE_TABCOMP */
+
+void history_error(const char *msg, ...)
+{
+	va_list ap;
+
+	va_start(ap, msg);
+	vfprintf(stderr, _(msg), ap);
+	va_end(ap);
+
+	fprintf(stderr, _("\nPress Enter to continue\n"));
+	while (getchar() != '\n')
+		;
+}
+
+/* Check whether we have or could make a directory for history files. */
+bool have_statedir(void)
+{
+	struct stat dirstat;
+	const char *xdgdatadir;
+
+	get_homedir();
+
+	if (homedir != NULL) {
+		statedir = concatenate(homedir, "/.nano/");
+
+		if (stat(statedir, &dirstat) == 0 && S_ISDIR(dirstat.st_mode)) {
+			poshistname = concatenate(statedir, POSITION_HISTORY);
+			return TRUE;
+		}
+	}
+
+	free(statedir);
+	xdgdatadir = getenv("XDG_DATA_HOME");
+
+	if (homedir == NULL && xdgdatadir == NULL)
+		return FALSE;
+
+	if (xdgdatadir != NULL)
+		statedir = concatenate(xdgdatadir, "/nano/");
+	else
+		statedir = concatenate(homedir, "/.local/share/nano/");
+
+	if (stat(statedir, &dirstat) == -1) {
+		if (xdgdatadir == NULL) {
+			char *statepath = concatenate(homedir, "/.local");
+			mkdir(statepath, S_IRWXU | S_IRWXG | S_IRWXO);
+			free(statepath);
+			statepath = concatenate(homedir, "/.local/share");
+			mkdir(statepath, S_IRWXU);
+			free(statepath);
+		}
+		if (mkdir(statedir, S_IRWXU) == -1) {
+			history_error(N_("Unable to create directory %s: %s\n"
+								"It is required for saving/loading "
+								"search history or cursor positions.\n"),
+								statedir, strerror(errno));
+			return FALSE;
+		}
+	} else if (!S_ISDIR(dirstat.st_mode)) {
+		history_error(N_("Path %s is not a directory and needs to be.\n"
+								"Nano will be unable to load or save "
+								"search history or cursor positions.\n"),
+								statedir);
+		return FALSE;
+	}
+
+	poshistname = concatenate(statedir, POSITION_HISTORY);
+	return TRUE;
+}
+
+/* Load the histories for Search and Replace and Execute Command. */
+void load_history(void)
+{
+	char *histname = concatenate(statedir, SEARCH_HISTORY);
+	FILE *hisfile = fopen(histname, "rb");
+
+	if (hisfile == NULL) {
+		if (errno != ENOENT) {
+			/* When reading failed, don't save history when we quit. */
+			UNSET(HISTORYLOG);
+			history_error(N_("Error reading %s: %s"), histname,
+						strerror(errno));
+		}
+	} else {
+		/* Load the three history lists -- first search, then replace,
+		 * then execute -- from oldest entry to newest.  Between two
+		 * lists there is an empty line. */
+		filestruct **history = &search_history;
+		char *line = NULL;
+		size_t buf_len = 0;
+		ssize_t read;
+
+		while ((read = getline(&line, &buf_len, hisfile)) > 0) {
+			line[--read] = '\0';
+			if (read > 0) {
+				/* Encode any embedded NUL as 0x0A. */
+				unsunder(line, read);
+				update_history(history, line);
+			} else if (history == &search_history)
+				history = &replace_history;
+			else
+				history = &execute_history;
+		}
+
+		fclose(hisfile);
+		free(line);
+	}
+
+	/* After reading them in, set the status of the lists to "unchanged". */
+	history_changed = FALSE;
+
+	free(histname);
+}
+
+/* Write the lines of a history list, starting at head, from oldest to newest,
+ * to the given file.  Return TRUE if writing succeeded, and FALSE otherwise. */
+bool write_list(const filestruct *head, FILE *hisfile)
+{
+	const filestruct *item;
+
+	for (item = head; item != NULL; item = item->next) {
+		size_t length = strlen(item->data);
+
+		/* Decode 0x0A bytes as embedded NULs. */
+		sunder(item->data);
+
+		if (fwrite(item->data, sizeof(char), length, hisfile) < length)
+			return FALSE;
+		if (putc('\n', hisfile) == EOF)
+			return FALSE;
+	}
+
+	return TRUE;
+}
+
+/* Save the histories for Search and Replace and Execute Command. */
+void save_history(void)
+{
+	char *histname;
+	FILE *hisfile;
+
+	/* If the histories are unchanged, don't bother saving them. */
+	if (!history_changed)
+		return;
+
+	histname = concatenate(statedir, SEARCH_HISTORY);
+	hisfile = fopen(histname, "wb");
+
+	if (hisfile == NULL)
+		fprintf(stderr, _("Error writing %s: %s\n"), histname,
+						strerror(errno));
+	else {
+		/* Don't allow others to read or write the history file. */
+		chmod(histname, S_IRUSR | S_IWUSR);
+
+		if (!write_list(searchtop, hisfile) ||
+						!write_list(replacetop, hisfile) ||
+						!write_list(executetop, hisfile))
+			fprintf(stderr, _("Error writing %s: %s\n"), histname,
+						strerror(errno));
+
+		fclose(hisfile);
+	}
+
+	free(histname);
+}
+
+/* Load the recorded cursor positions for files that were edited. */
+void load_poshistory(void)
+{
+	FILE *hisfile = fopen(poshistname, "rb");
+
+	if (hisfile == NULL) {
+		if (errno != ENOENT) {
+			/* When reading failed, don't save history when we quit. */
+			UNSET(POS_HISTORY);
+			history_error(N_("Error reading %s: %s"), poshistname, strerror(errno));
+		}
+	} else {
+		char *line = NULL, *lineptr, *xptr;
+		size_t buf_len = 0;
+		ssize_t read, count = 0;
+		poshiststruct *record_ptr = NULL, *newrecord;
+
+		/* Read and parse each line, and store the extracted data. */
+		while ((read = getline(&line, &buf_len, hisfile)) > 5) {
+			/* Decode nulls as embedded newlines. */
+			unsunder(line, read);
+
+			/* Find where the x index and line number are in the line. */
+			xptr = revstrstr(line, " ", line + read - 3);
+			if (xptr == NULL)
+				continue;
+			lineptr = revstrstr(line, " ", xptr - 2);
+			if (lineptr == NULL)
+				continue;
+
+			/* Now separate the three elements of the line. */
+			*(xptr++) = '\0';
+			*(lineptr++) = '\0';
+
+			/* Create a new position record. */
+			newrecord = (poshiststruct *)nmalloc(sizeof(poshiststruct));
+			newrecord->filename = mallocstrcpy(NULL, line);
+			newrecord->lineno = atoi(lineptr);
+			newrecord->xno = atoi(xptr);
+			newrecord->next = NULL;
+
+			/* Add the record to the list. */
+			if (position_history == NULL)
+				position_history = newrecord;
+			else
+				record_ptr->next = newrecord;
+
+			record_ptr = newrecord;
+
+			/* Impose a limit, so the file will not grow indefinitely. */
+			if (++count > 200) {
+				poshiststruct *drop_record = position_history;
+
+				position_history = position_history->next;
+
+				free(drop_record->filename);
+				free(drop_record);
+			}
+		}
+		fclose(hisfile);
+		free(line);
+
+		stat(poshistname, &stat_of_positions_file);
+	}
+}
+
+/* Save the recorded cursor positions for files that were edited. */
+void save_poshistory(void)
+{
+	poshiststruct *posptr;
+	FILE *hisfile = fopen(poshistname, "wb");
+
+	if (hisfile == NULL)
+		fprintf(stderr, _("Error writing %s: %s\n"), poshistname, strerror(errno));
+	else {
+		/* Don't allow others to read or write the history file. */
+		chmod(poshistname, S_IRUSR | S_IWUSR);
+
+		for (posptr = position_history; posptr != NULL; posptr = posptr->next) {
+			char *path_and_place;
+			size_t length;
+
+			/* Assume 20 decimal positions each for line and column number,
+			 * plus two spaces, plus the line feed, plus the null byte. */
+			path_and_place = charalloc(strlen(posptr->filename) + 44);
+			sprintf(path_and_place, "%s %zd %zd\n",
+						posptr->filename, posptr->lineno, posptr->xno);
+			length = strlen(path_and_place);
+
+			/* Encode newlines in filenames as nulls. */
+			sunder(path_and_place);
+			/* Restore the terminating newline. */
+			path_and_place[length - 1] = '\n';
+
+			if (fwrite(path_and_place, sizeof(char), length, hisfile) < length)
+				fprintf(stderr, _("Error writing %s: %s\n"),
+										poshistname, strerror(errno));
+			free(path_and_place);
+		}
+		fclose(hisfile);
+
+		stat(poshistname, &stat_of_positions_file);
+	}
+}
+
+/* Reload the position history file if it has been modified since last load. */
+void reload_positions_if_needed(void)
+{
+	struct stat newstat;
+
+	stat(poshistname, &newstat);
+
+	if (newstat.st_mtime != stat_of_positions_file.st_mtime) {
+		poshiststruct *ptr, *nextone;
+
+		for (ptr = position_history; ptr != NULL; ptr = nextone) {
+			nextone = ptr->next;
+			free(ptr->filename);
+			free(ptr);
+		}
+		position_history = NULL;
+
+		load_poshistory();
+	}
+}
+
+/* Update the recorded last file positions, given a filename, a line
+ * and a column.  If no entry is found, add a new one at the end. */
+void update_poshistory(char *filename, ssize_t lineno, ssize_t xpos)
+{
+	poshiststruct *posptr, *theone, *posprev = NULL;
+	char *fullpath = get_full_path(filename);
+
+	if (fullpath == NULL || fullpath[strlen(fullpath) - 1] == '/' || inhelp) {
+		free(fullpath);
+		return;
+	}
+
+	reload_positions_if_needed();
+
+	/* Look for a matching filename in the list. */
+	for (posptr = position_history; posptr != NULL; posptr = posptr->next) {
+		if (!strcmp(posptr->filename, fullpath))
+			break;
+		posprev = posptr;
+	}
+
+	/* Don't record files that have the default cursor position. */
+	if (lineno == 1 && xpos == 1) {
+		if (posptr != NULL) {
+			if (posprev == NULL)
+				position_history = posptr->next;
+			else
+				posprev->next = posptr->next;
+			free(posptr->filename);
+			free(posptr);
+			save_poshistory();
+		}
+		free(fullpath);
+		return;
+	}
+
+	theone = posptr;
+
+	/* If we didn't find it, make a new node; otherwise, if we're
+	 * not at the end, move the matching one to the end. */
+	if (theone == NULL) {
+		theone = (poshiststruct *)nmalloc(sizeof(poshiststruct));
+		theone->filename = mallocstrcpy(NULL, fullpath);
+		if (position_history == NULL)
+			position_history = theone;
+		else
+			posprev->next = theone;
+	} else if (posptr->next != NULL) {
+		if (posprev == NULL)
+			position_history = posptr->next;
+		else
+			posprev->next = posptr->next;
+		while (posptr->next != NULL)
+			posptr = posptr->next;
+		posptr->next = theone;
+	}
+
+	/* Store the last cursor position. */
+	theone->lineno = lineno;
+	theone->xno = xpos;
+	theone->next = NULL;
+
+	free(fullpath);
+
+	save_poshistory();
+}
+
+/* Check whether the given file matches an existing entry in the recorded
+ * last file positions.  If not, return FALSE.  If yes, return TRUE and
+ * set line and column to the retrieved values. */
+bool has_old_position(const char *file, ssize_t *line, ssize_t *column)
+{
+	poshiststruct *posptr = position_history;
+	char *fullpath = get_full_path(file);
+
+	if (fullpath == NULL)
+		return FALSE;
+
+	reload_positions_if_needed();
+
+	while (posptr != NULL && strcmp(posptr->filename, fullpath) != 0)
+		posptr = posptr->next;
+
+	free(fullpath);
+
+	if (posptr == NULL)
+		return FALSE;
+
+	*line = posptr->lineno;
+	*column = posptr->xno;
+	return TRUE;
+}
+#endif /* ENABLE_HISTORIES */
--- a/src/move.c
+++ b/src/move.c
--- a/src/nano.c
+++ b/src/nano.c
--- a/src/nano.h
+++ b/src/nano.h
@@ -1,9 +1,8 @@
 /**************************************************************************
 *   nano.h  --  This file is part of GNU nano.                           *
 *                                                                        *
- *   Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007,  *
- *   2008, 2009, 2010, 2011, 2013, 2014 Free Software Foundation, Inc.    *
- *   Copyright (C) 2014, 2015, 2016 Benno Schulenberg                     *
+ *   Copyright (C) 1999-2011, 2013-2018 Free Software Foundation, Inc.    *
+ *   Copyright (C) 2014-2017 Benno Schulenberg                            *
 *                                                                        *
 *   GNU nano is free software: you can redistribute it and/or modify     *
 *   it under the terms of the GNU General Public License as published    *
@@ -49,10 +48,6 @@
 #include <sys/param.h>
 #endif

-#ifdef HAVE_STDARG_H
-#include <stdarg.h>
-#endif
-
 /* Suppress warnings for __attribute__((warn_unused_result)). */
 #define IGNORE_CALL_RESULT(call) do { if (call) {} } while(0)

@@ -70,6 +65,13 @@
 #define charmove(dest, src, n) memmove(dest, src, (n) * sizeof(char))
 #define charset(dest, src, n) memset(dest, src, (n) * sizeof(char))

+/* In UTF-8 a character is at most six bytes long. */
+#ifdef ENABLE_UTF8
+#define MAXCHARLEN 6
+#else
+#define MAXCHARLEN 1
+#endif
+
 /* Set a default value for PATH_MAX if there isn't one. */
 #ifndef PATH_MAX
 #define PATH_MAX 4096
@@ -109,466 +111,461 @@
 #endif
 #define gettext_noop(string) (string)
 #define N_(string) gettext_noop(string)
-	/* Mark a string that will be sent to gettext() later. */
+		/* Mark a string that will be sent to gettext() later. */

 #include <stddef.h>
 #include <stdlib.h>
 #include <sys/types.h>
 #include <sys/stat.h>
 #include <dirent.h>
-#ifdef HAVE_REGEX_H
 #include <regex.h>
-#endif
 #include <signal.h>
 #include <assert.h>

-/* If no vsnprintf(), use the version from glib 2.x. */
-#ifndef HAVE_VSNPRINTF
-#include <glib.h>
-#define vsnprintf g_vsnprintf
-#endif
-
-/* If no isblank(), iswblank(), strcasecmp(), strncasecmp(),
- * strcasestr(), strnlen(), getdelim(), or getline(), use the versions
- * we have. */
-#ifndef HAVE_ISBLANK
-#define isblank nisblank
-#endif
-#ifndef HAVE_ISWBLANK
-#define iswblank niswblank
-#endif
-#ifndef HAVE_STRCASECMP
-#define strcasecmp nstrcasecmp
-#endif
-#ifndef HAVE_STRNCASECMP
-#define strncasecmp nstrncasecmp
-#endif
-#ifndef HAVE_STRCASESTR
-#define strcasestr nstrcasestr
-#endif
-#ifndef HAVE_STRNLEN
-#define strnlen nstrnlen
-#endif
-#ifndef HAVE_GETDELIM
-#define getdelim ngetdelim
-#endif
-#ifndef HAVE_GETLINE
-#define getline ngetline
-#endif
-
-/* If we aren't using ncurses with mouse support, turn the mouse support
- * off, as it's useless then. */
+/* If we aren't using an ncurses with mouse support, exclude any
+ * mouse routines, as they are useless then. */
 #ifndef NCURSES_MOUSE_VERSION
-#define DISABLE_MOUSE 1
+#undef ENABLE_MOUSE
 #endif

-#if defined(DISABLE_WRAPPING) && defined(DISABLE_JUSTIFY)
-#define DISABLE_WRAPJUSTIFY 1
+#if defined(ENABLE_WRAPPING) || defined(ENABLE_JUSTIFY)
+#define ENABLED_WRAPORJUSTIFY 1
 #endif

+#define BACKWARD FALSE
+#define FORWARD TRUE
+
+#define BLIND FALSE
+#define VISIBLE TRUE
+
+#define JUSTFIND  0
+#define REPLACING 1
+#define INREGION  2
+
 /* Enumeration types. */
 typedef enum {
-    NIX_FILE, DOS_FILE, MAC_FILE
+	NIX_FILE, DOS_FILE, MAC_FILE
 } file_format;

 typedef enum {
-    HUSH, MILD, ALERT
+	HUSH, MILD, ALERT
 } message_type;

 typedef enum {
-    OVERWRITE, APPEND, PREPEND
+	OVERWRITE, APPEND, PREPEND
 } kind_of_writing_type;

 typedef enum {
-    SOFTMARK, HARDMARK
+	SOFTMARK, HARDMARK
 } mark_type;

 typedef enum {
-    UPWARD, DOWNWARD
-} scroll_dir;
-
-typedef enum {
-    CENTERING, FLOWING, STATIONARY
+	CENTERING, FLOWING, STATIONARY
 } update_type;

+/* The kinds of undo actions.  ADD...REPLACE must come first. */
 typedef enum {
-    ADD, DEL, BACK, CUT, CUT_EOF, REPLACE,
-#ifndef DISABLE_WRAPPING
-    SPLIT_BEGIN, SPLIT_END,
+	ADD, ENTER, BACK, DEL, JOIN, REPLACE,
+#ifdef ENABLE_WRAPPING
+	SPLIT_BEGIN, SPLIT_END,
 #endif
-#ifndef DISABLE_COMMENT
-    COMMENT, UNCOMMENT, PREFLIGHT,
+	INDENT, UNINDENT,
+#ifdef ENABLE_COMMENT
+	COMMENT, UNCOMMENT, PREFLIGHT,
 #endif
-    JOIN, PASTE, INSERT, ENTER, OTHER
+	CUT, CUT_TO_EOF, PASTE, INSERT, OTHER
 } undo_type;

 /* Structure types. */
-#ifndef DISABLE_COLOR
+#ifdef ENABLE_COLOR
 typedef struct colortype {
-    short fg;
-	/* This syntax's foreground color. */
-    short bg;
-	/* This syntax's background color. */
-    bool bright;
-	/* Is this color A_BOLD? */
-    int pairnum;
-	/* The color pair number used for this foreground color and
-	 * background color. */
-    int attributes;
-	/* Pair number and brightness composed into ready-to-use attributes. */
-    int rex_flags;
-	/* The regex compilation flags (with or without REG_ICASE). */
-    char *start_regex;
-	/* The start (or all) of the regex string. */
-    regex_t *start;
-	/* The compiled start (or all) of the regex string. */
-    char *end_regex;
-	/* The end (if any) of the regex string. */
-    regex_t *end;
-	/* The compiled end (if any) of the regex string. */
-    struct colortype *next;
-	/* Next set of colors. */
-    int id;
-	/* Basic id for assigning to lines later. */
+	short fg;
+		/* This syntax's foreground color. */
+	short bg;
+		/* This syntax's background color. */
+	bool bright;
+		/* Is this color A_BOLD? */
+	int pairnum;
+		/* The color pair number used for this foreground color and
+		 * background color. */
+	int attributes;
+		/* Pair number and brightness composed into ready-to-use attributes. */
+	int rex_flags;
+		/* The regex compilation flags (with or without REG_ICASE). */
+	char *start_regex;
+		/* The start (or all) of the regex string. */
+	regex_t *start;
+		/* The compiled start (or all) of the regex string. */
+	char *end_regex;
+		/* The end (if any) of the regex string. */
+	regex_t *end;
+		/* The compiled end (if any) of the regex string. */
+	struct colortype *next;
+		/* Next set of colors. */
+	int id;
+		/* Basic id for assigning to lines later. */
 } colortype;

 typedef struct regexlisttype {
-    char *full_regex;
-	/* A regex string to match things that imply a certain syntax. */
-    struct regexlisttype *next;
-	/* The next regex. */
+	char *full_regex;
+		/* A regex string to match things that imply a certain syntax. */
+	struct regexlisttype *next;
+		/* The next regex. */
 } regexlisttype;

 typedef struct syntaxtype {
-    char *name;
-	/* The name of this syntax. */
-    regexlisttype *extensions;
-	/* The list of extensions that this syntax applies to. */
-    regexlisttype *headers;
-	/* The list of headerlines that this syntax applies to. */
-    regexlisttype *magics;
-	/* The list of libmagic results that this syntax applies to. */
-    char *linter;
-	/* The command with which to lint this type of file. */
-    char *formatter;
-        /* The formatting command (for programming languages mainly). */
-    char *comment;
-	/* The line comment prefix (and postfix) for this type of file. */
-    colortype *color;
-	/* The colors and their regexes used in this syntax. */
-    int nmultis;
-	/* How many multiline regex strings this syntax has. */
-    struct syntaxtype *next;
-	/* Next syntax. */
+	char *name;
+		/* The name of this syntax. */
+	regexlisttype *extensions;
+		/* The list of extensions that this syntax applies to. */
+	regexlisttype *headers;
+		/* The list of headerlines that this syntax applies to. */
+	regexlisttype *magics;
+		/* The list of libmagic results that this syntax applies to. */
+	char *linter;
+		/* The command with which to lint this type of file. */
+	char *formatter;
+		/* The formatting command (for programming languages mainly). */
+#ifdef ENABLE_COMMENT
+	char *comment;
+		/* The line comment prefix (and postfix) for this type of file. */
+#endif
+	colortype *color;
+		/* The colors and their regexes used in this syntax. */
+	int nmultis;
+		/* How many multiline regex strings this syntax has. */
+	struct syntaxtype *next;
+		/* Next syntax. */
 } syntaxtype;

 typedef struct lintstruct {
-    ssize_t lineno;
-	/* Line number of the error. */
-    ssize_t colno;
-	/* Column # of the error. */
-    char *msg;
-	/* Error message text. */
-    char *filename;
-	/* Filename. */
-    struct lintstruct *next;
-	/* Next error. */
-    struct lintstruct *prev;
-	/* Previous error. */
+	ssize_t lineno;
+		/* Line number of the error. */
+	ssize_t colno;
+		/* Column # of the error. */
+	char *msg;
+		/* Error message text. */
+	char *filename;
+		/* Filename. */
+	struct lintstruct *next;
+		/* Next error. */
+	struct lintstruct *prev;
+		/* Previous error. */
 } lintstruct;

 /* Flags that indicate how a multiline regex applies to a line. */
-#define CNONE		(1<<1)
-	/* Yay, regex doesn't apply to this line at all! */
-#define CBEGINBEFORE	(1<<2)
-	/* Regex starts on an earlier line, ends on this one. */
-#define CENDAFTER	(1<<3)
-	/* Regex starts on this line and ends on a later one. */
-#define CWHOLELINE	(1<<4)
-	/* Whole line engulfed by the regex, start < me, end > me. */
-#define CSTARTENDHERE	(1<<5)
-	/* Regex starts and ends within this line. */
-#define CWOULDBE	(1<<6)
-	/* An unpaired start match on or before this line. */
-#endif /* !DISABLE_COLOR */
+#define CNONE           (1<<1)
+		/* Yay, regex doesn't apply to this line at all! */
+#define CBEGINBEFORE    (1<<2)
+		/* Regex starts on an earlier line, ends on this one. */
+#define CENDAFTER       (1<<3)
+		/* Regex starts on this line and ends on a later one. */
+#define CWHOLELINE      (1<<4)
+		/* Whole line engulfed by the regex, start < me, end > me. */
+#define CSTARTENDHERE   (1<<5)
+		/* Regex starts and ends within this line. */
+#define CWOULDBE        (1<<6)
+		/* An unpaired start match on or before this line. */
+#endif /* ENABLE_COLOR */

 /* More structure types. */
 typedef struct filestruct {
-    char *data;
-	/* The text of this line. */
-    ssize_t lineno;
-	/* The number of this line. */
-    struct filestruct *next;
-	/* Next node. */
-    struct filestruct *prev;
-	/* Previous node. */
-#ifndef DISABLE_COLOR
-    short *multidata;
-	/* Array of which multi-line regexes apply to this line. */
+	char *data;
+		/* The text of this line. */
+	ssize_t lineno;
+		/* The number of this line. */
+	struct filestruct *next;
+		/* Next node. */
+	struct filestruct *prev;
+		/* Previous node. */
+#ifdef ENABLE_COLOR
+	short *multidata;
+		/* Array of which multi-line regexes apply to this line. */
 #endif
 } filestruct;

 typedef struct partition {
-    filestruct *fileage;
-	/* The top line of this portion of the file. */
-    filestruct *top_prev;
-	/* The line before the top line of this portion of the file. */
-    char *top_data;
-	/* The text before the beginning of the top line of this portion
-	 * of the file. */
-    filestruct *filebot;
-	/* The bottom line of this portion of the file. */
-    filestruct *bot_next;
-	/* The line after the bottom line of this portion of the
-	 * file. */
-    char *bot_data;
-	/* The text after the end of the bottom line of this portion of
-	 * the file. */
+	filestruct *fileage;
+		/* The top line of this portion of the file. */
+	filestruct *top_prev;
+		/* The line before the top line of this portion of the file. */
+	char *top_data;
+		/* The text before the beginning of the top line of this portion
+		 * of the file. */
+	filestruct *filebot;
+		/* The bottom line of this portion of the file. */
+	filestruct *bot_next;
+		/* The line after the bottom line of this portion of the
+		 * file. */
+	char *bot_data;
+		/* The text after the end of the bottom line of this portion of
+		 * the file. */
 } partition;

 #ifndef NANO_TINY
 typedef struct undo_group {
-    ssize_t top_line;
-	/* First line of group. */
-    ssize_t bottom_line;
-	/* Last line of group. */
-    struct undo_group *next;
+	ssize_t top_line;
+		/* First line of group. */
+	ssize_t bottom_line;
+		/* Last line of group. */
+	char **indentations;
+		/* String data used to restore the affected lines; one per line. */
+	struct undo_group *next;
 } undo_group;

 typedef struct undo {
-    ssize_t lineno;
-    undo_type type;
-	/* What type of undo this was. */
-    size_t begin;
-	/* Where did this action begin or end. */
-    char *strdata;
-	/* String type data we will use for copying the affected line back. */
-    size_t wassize;
-	/* The file size before the action. */
-    size_t newsize;
-	/* The file size after the action. */
-    int xflags;
-	/* Some flag data we need. */
-    undo_group *grouping;
-	/* Undo info specific to groups of lines. */
+	ssize_t lineno;
+	undo_type type;
+		/* What type of undo this was. */
+	size_t begin;
+		/* Where did this action begin or end. */
+	char *strdata;
+		/* String type data we will use for copying the affected line back. */
+	size_t wassize;
+		/* The file size before the action. */
+	size_t newsize;
+		/* The file size after the action. */
+	int xflags;
+		/* Some flag data we need. */
+	undo_group *grouping;
+		/* Undo info specific to groups of lines. */

-    /* Cut-specific stuff we need. */
-    filestruct *cutbuffer;
-	/* Copy of the cutbuffer. */
-    filestruct *cutbottom;
-	/* Copy of cutbottom. */
-    ssize_t mark_begin_lineno;
-	/* Mostly the line number of the current line; sometimes something else. */
-    size_t mark_begin_x;
-	/* The x position corresponding to the above line number. */
-    struct undo *next;
-	/* A pointer to the undo item of the preceding action. */
+	/* Cut-specific stuff we need. */
+	filestruct *cutbuffer;
+		/* Copy of the cutbuffer. */
+	filestruct *cutbottom;
+		/* Copy of cutbottom. */
+	ssize_t mark_begin_lineno;
+		/* Mostly the line number of the current line; sometimes something else. */
+	size_t mark_begin_x;
+		/* The x position corresponding to the above line number. */
+	struct undo *next;
+		/* A pointer to the undo item of the preceding action. */
 } undo;
 #endif /* !NANO_TINY */

-#ifndef DISABLE_HISTORIES
+#ifdef ENABLE_HISTORIES
 typedef struct poshiststruct {
-    char *filename;
-	/* The file. */
-    ssize_t lineno;
-	/* Line number we left off on. */
-    ssize_t xno;
-	/* x position in the file we left off on. */
-    struct poshiststruct *next;
+	char *filename;
+		/* The file. */
+	ssize_t lineno;
+		/* Line number we left off on. */
+	ssize_t xno;
+		/* x position in the file we left off on. */
+	struct poshiststruct *next;
 } poshiststruct;
 #endif

 typedef struct openfilestruct {
-    char *filename;
-	/* The file's name. */
-    filestruct *fileage;
-	/* The file's first line. */
-    filestruct *filebot;
-	/* The file's last line. */
-    filestruct *edittop;
-	/* The current top of the edit window for this file. */
-    filestruct *current;
-	/* The current line for this file. */
-    size_t totsize;
-	/* The file's total number of characters. */
-    size_t current_x;
-	/* The file's x-coordinate position. */
-    size_t placewewant;
-	/* The file's x position we would like. */
-    ssize_t current_y;
-	/* The file's y-coordinate position. */
-    bool modified;
-	/* Whether the file has been modified. */
-    struct stat *current_stat;
-	/* The file's current stat information. */
+	char *filename;
+		/* The file's name. */
+	filestruct *fileage;
+		/* The file's first line. */
+	filestruct *filebot;
+		/* The file's last line. */
+	filestruct *edittop;
+		/* The current top of the edit window for this file. */
+	filestruct *current;
+		/* The current line for this file. */
+	size_t totsize;
+		/* The file's total number of characters. */
+	size_t firstcolumn;
+		/* The starting column of the top line of the edit window.
+		 * When not in softwrap mode, it's always zero. */
+	size_t current_x;
+		/* The file's x-coordinate position. */
+	size_t placewewant;
+		/* The file's x position we would like. */
+	ssize_t current_y;
+		/* The file's y-coordinate position. */
+	bool modified;
+		/* Whether the file has been modified. */
+	struct stat *current_stat;
+		/* The file's current stat information. */
 #ifndef NANO_TINY
-    bool mark_set;
-	/* Whether the mark is on in this file. */
-    filestruct *mark_begin;
-	/* The file's line where the mark is, if any. */
-    size_t mark_begin_x;
-	/* The file's mark's x-coordinate position, if any. */
-    mark_type kind_of_mark;
-	/* Whether this is a soft or a hard mark. */
-    file_format fmt;
-	/* The file's format. */
-    undo *undotop;
-	/* The top of the undo list. */
-    undo *current_undo;
-	/* The current (i.e. next) level of undo. */
-    undo_type last_action;
-	/* The type of the last action the user performed. */
-    char *lock_filename;
-	/* The path of the lockfile, if we created one. */
+	filestruct *mark;
+		/* The line in the file where the mark is set; NULL if not set. */
+	size_t mark_x;
+		/* The mark's x position in the above line. */
+	mark_type kind_of_mark;
+		/* Whether it is a soft (with Shift) or a hard mark. */
+	file_format fmt;
+		/* The file's format -- Unix or DOS or Mac or mixed. */
+	undo *undotop;
+		/* The top of the undo list. */
+	undo *current_undo;
+		/* The current (i.e. next) level of undo. */
+	undo *last_saved;
+		/* The undo item at which the file was last saved. */
+	undo_type last_action;
+		/* The type of the last action the user performed. */
+	char *lock_filename;
+		/* The path of the lockfile, if we created one. */
 #endif
-#ifndef DISABLE_COLOR
-    syntaxtype *syntax;
-	/* The  syntax struct for this file, if any. */
-    colortype *colorstrings;
-	/* The file's associated colors. */
+#ifdef ENABLE_COLOR
+	syntaxtype *syntax;
+		/* The  syntax struct for this file, if any. */
+	colortype *colorstrings;
+		/* The file's associated colors. */
+#endif
+#ifdef ENABLE_MULTIBUFFER
+	struct openfilestruct *next;
+		/* The next open file, if any. */
+	struct openfilestruct *prev;
+		/* The preceding open file, if any. */
 #endif
-    struct openfilestruct *next;
-	/* The next open file, if any. */
-    struct openfilestruct *prev;
-	/* The preceding open file, if any. */
 } openfilestruct;

-#ifndef DISABLE_NANORC
+#ifdef ENABLE_NANORC
 typedef struct rcoption {
-    const char *name;
-	/* The name of the rcfile option. */
-    long flag;
-	/* The flag associated with it, if any. */
+	const char *name;
+		/* The name of the rcfile option. */
+	long flag;
+		/* The flag associated with it, if any. */
 } rcoption;
 #endif

 typedef struct sc {
-    const char *keystr;
-	/* The string that describes a keystroke, like "^C" or "M-R". */
-    bool meta;
-	/* Whether this is a Meta keystroke. */
-    int keycode;
-	/* The integer that, together with meta, identifies the keystroke. */
-    int menus;
-	/* Which menus this applies to. */
-    void (*scfunc)(void);
-	/* The function we're going to run. */
+	const char *keystr;
+		/* The string that describes a keystroke, like "^C" or "M-R". */
+	bool meta;
+		/* Whether this is a Meta keystroke. */
+	int keycode;
+		/* The integer that, together with meta, identifies the keystroke. */
+	int menus;
+		/* Which menus this applies to. */
+	void (*func)(void);
+		/* The function we're going to run. */
 #ifndef NANO_TINY
-    int toggle;
-	/* If a toggle, what we're toggling. */
-    int ordinal;
-	/* The how-manieth toggle this is, in order to be able to
-	 * keep them in sequence. */
+	int toggle;
+		/* If a toggle, what we're toggling. */
+	int ordinal;
+		/* The how-manieth toggle this is, in order to be able to
+		 * keep them in sequence. */
 #endif
-    struct sc *next;
-	/* Next in the list. */
+#ifdef ENABLE_NANORC
+	char *expansion;
+		/* The string of keycodes to which this shortcut is expanded. */
+#endif
+	struct sc *next;
+		/* Next in the list. */
 } sc;

 typedef struct subnfunc {
-    void (*scfunc)(void);
-	/* The actual function to call. */
-    int menus;
-	/* In what menus this function applies. */
-    const char *desc;
-	/* The function's short description, for example "Where Is". */
-#ifndef DISABLE_HELP
-    const char *help;
-	/* The help-screen text for this function. */
-    bool blank_after;
-	/* Whether there should be a blank line after the help text
-	 * for this function. */
+	void (*func)(void);
+		/* The actual function to call. */
+	int menus;
+		/* In what menus this function applies. */
+	const char *desc;
+		/* The function's short description, for example "Where Is". */
+#ifdef ENABLE_HELP
+	const char *help;
+		/* The help-screen text for this function. */
+	bool blank_after;
+		/* Whether there should be a blank line after the help text
+		 * for this function. */
 #endif
-    bool viewok;
-	/* Is this function allowed when in view mode? */
-    long toggle;
-	/* If this is a toggle, which toggle to affect. */
-    struct subnfunc *next;
-	/* Next item in the list. */
+	bool viewok;
+		/* Is this function allowed when in view mode? */
+	long toggle;
+		/* If this is a toggle, which toggle to affect. */
+	struct subnfunc *next;
+		/* Next item in the list. */
 } subnfunc;

 #ifdef ENABLE_WORDCOMPLETION
 typedef struct completion_word {
-    char *word;
-    struct completion_word *next;
+	char *word;
+	struct completion_word *next;
 } completion_word;
 #endif

 /* The elements of the interface that can be colored differently. */
 enum
 {
-    TITLE_BAR = 0,
-    LINE_NUMBER,
-    STATUS_BAR,
-    KEY_COMBO,
-    FUNCTION_TAG,
-    NUMBER_OF_ELEMENTS
+	TITLE_BAR = 0,
+	LINE_NUMBER,
+	SELECTED_TEXT,
+	STATUS_BAR,
+	ERROR_MESSAGE,
+	KEY_COMBO,
+	FUNCTION_TAG,
+	NUMBER_OF_ELEMENTS
 };

 /* Enumeration used in the flags array.  See the definition of FLAGMASK. */
 enum
 {
-    DONTUSE,
-    CASE_SENSITIVE,
-    CONST_UPDATE,
-    NO_HELP,
-    SUSPEND,
-    NO_WRAP,
-    AUTOINDENT,
-    VIEW_MODE,
-    USE_MOUSE,
-    USE_REGEXP,
-    TEMP_FILE,
-    CUT_TO_END,
-    BACKWARDS_SEARCH,
-    MULTIBUFFER,
-    SMOOTH_SCROLL,
-    REBIND_DELETE,
-    REBIND_KEYPAD,
-    NO_CONVERT,
-    BACKUP_FILE,
-    INSECURE_BACKUP,
-    NO_COLOR_SYNTAX,
-    PRESERVE,
-    HISTORYLOG,
-    RESTRICTED,
-    SMART_HOME,
-    WHITESPACE_DISPLAY,
-    MORE_SPACE,
-    TABS_TO_SPACES,
-    QUICK_BLANK,
-    WORD_BOUNDS,
-    NO_NEWLINES,
-    BOLD_TEXT,
-    QUIET,
-    SOFTWRAP,
-    POS_HISTORY,
-    LOCKING,
-    NOREAD_MODE,
-    MAKE_IT_UNIX,
-    JUSTIFY_TRIM,
-    SHOW_CURSOR,
-    LINE_NUMBERS
+	DONTUSE,
+	CASE_SENSITIVE,
+	CONSTANT_SHOW,
+	NO_HELP,
+	SUSPEND,
+	NO_WRAP,
+	AUTOINDENT,
+	VIEW_MODE,
+	USE_MOUSE,
+	USE_REGEXP,
+	TEMP_FILE,
+	CUT_FROM_CURSOR,
+	BACKWARDS_SEARCH,
+	MULTIBUFFER,
+	SMOOTH_SCROLL,
+	REBIND_DELETE,
+	REBIND_KEYPAD,
+	NO_CONVERT,
+	BACKUP_FILE,
+	INSECURE_BACKUP,
+	NO_COLOR_SYNTAX,
+	PRESERVE,
+	HISTORYLOG,
+	RESTRICTED,
+	SMART_HOME,
+	WHITESPACE_DISPLAY,
+	MORE_SPACE,
+	TABS_TO_SPACES,
+	QUICK_BLANK,
+	WORD_BOUNDS,
+	NO_NEWLINES,
+	BOLD_TEXT,
+	QUIET,
+	SOFTWRAP,
+	POS_HISTORY,
+	LOCKING,
+	NOREAD_MODE,
+	MAKE_IT_UNIX,
+	TRIM_BLANKS,
+	SHOW_CURSOR,
+	LINE_NUMBERS,
+	NO_PAUSES,
+	AT_BLANKS
 };

 /* Flags for the menus in which a given function should be present. */
-#define MMAIN			(1<<0)
-#define MWHEREIS		(1<<1)
-#define MREPLACE		(1<<2)
-#define MREPLACEWITH		(1<<3)
-#define MGOTOLINE		(1<<4)
-#define MWRITEFILE		(1<<5)
-#define MINSERTFILE		(1<<6)
-#define MEXTCMD			(1<<7)
-#define MHELP			(1<<8)
-#define MSPELL			(1<<9)
-#define MBROWSER		(1<<10)
-#define MWHEREISFILE		(1<<11)
-#define MGOTODIR		(1<<12)
-#define MYESNO			(1<<13)
-#define MLINTER			(1<<14)
+#define MMAIN           (1<<0)
+#define MWHEREIS        (1<<1)
+#define MREPLACE        (1<<2)
+#define MREPLACEWITH    (1<<3)
+#define MGOTOLINE       (1<<4)
+#define MWRITEFILE      (1<<5)
+#define MINSERTFILE     (1<<6)
+#define MEXTCMD         (1<<7)
+#define MHELP           (1<<8)
+#define MSPELL          (1<<9)
+#define MBROWSER        (1<<10)
+#define MWHEREISFILE    (1<<11)
+#define MGOTODIR        (1<<12)
+#define MYESNO          (1<<13)
+#define MLINTER         (1<<14)
+#define MFINDINHELP     (1<<15)
 /* This is an abbreviation for all menus except Help and YesNo. */
 #define MMOST  (MMAIN|MWHEREIS|MREPLACE|MREPLACEWITH|MGOTOLINE|MWRITEFILE|MINSERTFILE|\
-		MEXTCMD|MBROWSER|MWHEREISFILE|MGOTODIR|MSPELL|MLINTER)
+                MEXTCMD|MBROWSER|MWHEREISFILE|MGOTODIR|MFINDINHELP|MSPELL|MLINTER)
+#ifndef NANO_TINY
+#define MSOME  MMOST
+#else
+#define MSOME  MMAIN|MBROWSER
+#endif

 /* Basic control codes. */
 #define TAB_CODE  0x09
@@ -580,29 +577,48 @@ enum
 #define CONTROL_RIGHT 0x402
 #define CONTROL_UP 0x403
 #define CONTROL_DOWN 0x404
-#define SHIFT_CONTROL_LEFT 0x405
-#define SHIFT_CONTROL_RIGHT 0x406
-#define SHIFT_CONTROL_UP 0x407
-#define SHIFT_CONTROL_DOWN 0x408
-#define SHIFT_ALT_LEFT 0x409
-#define SHIFT_ALT_RIGHT 0x40a
-#define SHIFT_ALT_UP 0x40b
-#define SHIFT_ALT_DOWN 0x40c
-#define SHIFT_PAGEUP 0x40d
-#define SHIFT_PAGEDOWN 0x40e
-#define SHIFT_HOME 0x40f
-#define SHIFT_END 0x410
+#define CONTROL_HOME 0x405
+#define CONTROL_END 0x406
+#define SHIFT_CONTROL_LEFT 0x411
+#define SHIFT_CONTROL_RIGHT 0x412
+#define SHIFT_CONTROL_UP 0x413
+#define SHIFT_CONTROL_DOWN 0x414
+#define SHIFT_CONTROL_HOME 0x415
+#define SHIFT_CONTROL_END 0x416
+#define ALT_LEFT 0x421
+#define ALT_RIGHT 0x422
+#define ALT_UP 0x423
+#define ALT_DOWN 0x424
+#define SHIFT_ALT_LEFT 0x431
+#define SHIFT_ALT_RIGHT 0x432
+#define SHIFT_ALT_UP 0x433
+#define SHIFT_ALT_DOWN 0x434
+#define SHIFT_HOME 0x455
+#define SHIFT_END 0x456
+#define SHIFT_PAGEUP 0x457
+#define SHIFT_PAGEDOWN 0x458
+#define SHIFT_TAB 0x45F
+
+#ifdef USE_SLANG
+#ifdef ENABLE_UTF8
+#define KEY_BAD 0xFF  /* Clipped error code. */
+#endif
+#define KEY_FLUSH 0x91  /* User-definable control code. */
+#else
+#define KEY_FLUSH KEY_F0  /* Nonexistent function key. */
+#endif

 #ifndef NANO_TINY
 /* An imaginary key for when we get a SIGWINCH (window resize). */
 #define KEY_WINCH -2

 /* Some extra flags for the undo function. */
-#define WAS_FINAL_BACKSPACE	(1<<1)
-#define WAS_WHOLE_LINE		(1<<2)
+#define WAS_FINAL_BACKSPACE   (1<<1)
+#define WAS_WHOLE_LINE        (1<<2)
+#define WAS_FINAL_LINE        (1<<3)
 /* The flags for the mark need to be the highest. */
-#define MARK_WAS_SET		(1<<3)
-#define WAS_MARKED_FORWARD	(1<<4)
+#define MARK_WAS_SET          (1<<4)
+#define WAS_MARKED_FORWARD    (1<<5)
 #endif /* !NANO_TINY */

 /* The maximum number of entries displayed in the main shortcut list. */
@@ -615,6 +631,9 @@ enum
 /* The default width of a tab in spaces. */
 #define WIDTH_OF_TAB 8

+/* The default comment character when a syntax does not specify any. */
+#define GENERAL_COMMENT_CHARACTER "#"
+
 /* The maximum number of search/replace history strings saved, not
 * counting the blank lines at their ends. */
 #define MAX_SEARCH_HISTORY 100
--- a/src/prompt.c
+++ b/src/prompt.c
--- a/src/proto.h
+++ b/src/proto.h
@@ -1,8 +1,7 @@
 /**************************************************************************
 *   proto.h  --  This file is part of GNU nano.                          *
 *                                                                        *
- *   Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007,  *
- *   2008, 2009, 2010, 2011, 2013, 2014 Free Software Foundation, Inc.    *
+ *   Copyright (C) 1999-2011, 2013-2018 Free Software Foundation, Inc.    *
 *                                                                        *
 *   GNU nano is free software: you can redistribute it and/or modify     *
 *   it under the terms of the GNU General Public License as published    *
@@ -25,12 +24,13 @@
 #include "nano.h"

 /* All external variables.  See global.c for their descriptions. */
+
 #ifndef NANO_TINY
 extern volatile sig_atomic_t the_window_resized;
 #endif

 #ifdef __linux__
-extern bool console;
+extern bool on_a_vt;
 #endif

 extern bool meta_key;
@@ -43,26 +43,45 @@ extern bool as_an_at;
 extern int margin;
 extern int editwincols;

+extern bool suppress_cursorpos;
+
 extern message_type lastmessage;

 extern filestruct *pletion_line;

+extern bool inhelp;
+extern char *title;
+
+extern bool more_than_one;
+
+extern bool also_the_last;
+
+extern int didfind;
+
 extern int controlleft;
 extern int controlright;
 extern int controlup;
 extern int controldown;
+extern int controlhome;
+extern int controlend;
 #ifndef NANO_TINY
 extern int shiftcontrolleft;
 extern int shiftcontrolright;
 extern int shiftcontrolup;
 extern int shiftcontroldown;
+extern int shiftcontrolhome;
+extern int shiftcontrolend;
+extern int altleft;
+extern int altright;
+extern int altup;
+extern int altdown;
 extern int shiftaltleft;
 extern int shiftaltright;
 extern int shiftaltup;
 extern int shiftaltdown;
 #endif

-#ifndef DISABLE_WRAPJUSTIFY
+#ifdef ENABLED_WRAPORJUSTIFY
 extern ssize_t fill;
 extern ssize_t wrap_at;
 #endif
@@ -76,18 +95,15 @@ extern WINDOW *topwin;
 extern WINDOW *edit;
 extern WINDOW *bottomwin;
 extern int editwinrows;
-extern int maxlines;

 extern filestruct *cutbuffer;
 extern filestruct *cutbottom;
 extern partition *filepart;
 extern openfilestruct *openfile;
+extern openfilestruct *firstfile;

 #ifndef NANO_TINY
 extern char *matchbrackets;
-#endif
-
-#ifndef NANO_TINY
 extern char *whitespace;
 extern int whitespace_len[2];
 #endif
@@ -95,24 +111,18 @@ extern int whitespace_len[2];
 extern const char *exit_tag;
 extern const char *close_tag;
 extern const char *uncut_tag;
-#ifndef DISABLE_JUSTIFY
+#ifdef ENABLE_JUSTIFY
 extern const char *unjust_tag;
 extern char *punct;
 extern char *brackets;
 extern char *quotestr;
-#ifdef HAVE_REGEX_H
 extern regex_t quotereg;
 extern int quoterc;
 extern char *quoteerr;
-#else
-extern size_t quotelen;
 #endif
-#endif /* !DISABLE_JUSTIFY */

 extern char *word_chars;

-extern bool nodelay_mode;
-
 extern char *answer;

 extern ssize_t tabsize;
@@ -122,18 +132,18 @@ extern char *backup_dir;
 extern const char *locking_prefix;
 extern const char *locking_suffix;
 #endif
-#ifndef DISABLE_OPERATINGDIR
+#ifdef ENABLE_OPERATINGDIR
 extern char *operating_dir;
-extern char *full_operating_dir;
 #endif

-#ifndef DISABLE_SPELLER
+#ifdef ENABLE_SPELLER
 extern char *alt_speller;
 #endif

-#ifndef DISABLE_COLOR
+#ifdef ENABLE_COLOR
 extern syntaxtype *syntaxes;
 extern char *syntaxstr;
+extern bool have_palette;
 #endif

 extern bool refresh_needed;
@@ -144,47 +154,46 @@ extern subnfunc *allfuncs;
 extern subnfunc *exitfunc;
 extern subnfunc *uncutfunc;

-#ifndef DISABLE_HISTORIES
 extern filestruct *search_history;
-extern filestruct *searchage;
-extern filestruct *searchbot;
 extern filestruct *replace_history;
-extern filestruct *replaceage;
+extern filestruct *execute_history;
+#ifdef ENABLE_HISTORIES
+extern filestruct *searchtop;
+extern filestruct *searchbot;
+extern filestruct *replacetop;
 extern filestruct *replacebot;
+extern filestruct *executetop;
+extern filestruct *executebot;
 extern poshiststruct *position_history;
 #endif

-#ifdef HAVE_REGEX_H
 extern regex_t search_regexp;
 extern regmatch_t regmatches[10];
-#endif

 extern int hilite_attribute;
-#ifndef DISABLE_COLOR
-extern char* specified_color_combo[NUMBER_OF_ELEMENTS];
+#ifdef ENABLE_COLOR
+extern colortype *color_combo[NUMBER_OF_ELEMENTS];
 #endif
 extern int interface_color_pair[NUMBER_OF_ELEMENTS];

 extern char *homedir;
+extern char *statedir;
+extern char *rcfile_with_errors;

 typedef void (*functionptrtype)(void);

-/* All functions in browser.c. */
-#ifndef DISABLE_BROWSER
-char *do_browser(char *path);
+/* Most functions in browser.c. */
+#ifdef ENABLE_BROWSER
 char *do_browse_from(const char *inpath);
 void read_the_list(const char *path, DIR *dir);
 functionptrtype parse_browser_input(int *kbinput);
 void browser_refresh(void);
 void browser_select_dirname(const char *needle);
-int filesearch_init(void);
-void findnextfile(const char *needle);
-void filesearch_abort(void);
 void do_filesearch(void);
-void do_fileresearch(void);
-void do_first_file(void);
-void do_last_file(void);
-char *striponedir(const char *path);
+void do_fileresearch(bool forwards);
+void to_first_file(void);
+void to_last_file(void);
+char *strip_last_component(const char *path);
 #endif

 /* Most functions in chars.c. */
@@ -193,76 +202,46 @@ void utf8_init(void);
 bool using_utf8(void);
 #endif
 char *addstrings(char* str1, size_t len1, char* str2, size_t len2);
-#ifndef HAVE_ISBLANK
-bool nisblank(int c);
-#endif
-#if !defined(HAVE_ISWBLANK) && defined(ENABLE_UTF8)
-bool niswblank(wchar_t wc);
-#endif
 bool is_byte(int c);
 bool is_alpha_mbchar(const char *c);
-bool is_alnum_mbchar(const char *c);
 bool is_blank_mbchar(const char *c);
 bool is_ascii_cntrl_char(int c);
-bool is_cntrl_char(int c);
 bool is_cntrl_mbchar(const char *c);
-bool is_punct_mbchar(const char *c);
 bool is_word_mbchar(const char *c, bool allow_punct);
-char control_rep(const signed char c);
 char control_mbrep(const char *c, bool isdata);
 int length_of_char(const char *c, int *width);
 int mbwidth(const char *c);
-int mb_cur_max(void);
 char *make_mbchar(long chr, int *chr_mb_len);
 int parse_mbchar(const char *buf, char *chr, size_t *col);
 size_t move_mbleft(const char *buf, size_t pos);
 size_t move_mbright(const char *buf, size_t pos);
-#ifndef HAVE_STRCASECMP
-int nstrcasecmp(const char *s1, const char *s2);
-#endif
 int mbstrcasecmp(const char *s1, const char *s2);
-#ifndef HAVE_STRNCASECMP
-int nstrncasecmp(const char *s1, const char *s2, size_t n);
-#endif
 int mbstrncasecmp(const char *s1, const char *s2, size_t n);
-#ifndef HAVE_STRCASESTR
-char *nstrcasestr(const char *haystack, const char *needle);
-#endif
 char *mbstrcasestr(const char *haystack, const char *needle);
-char *revstrstr(const char *haystack, const char *needle,
-	const char *pointer);
-char *revstrcasestr(const char *haystack, const char *needle, const char
-	*rev_start);
-char *mbrevstrcasestr(const char *haystack, const char *needle, const
-	char *rev_start);
+char *revstrstr(const char *haystack, const char *needle, const char *index);
+char *mbrevstrcasestr(const char *haystack, const char *needle, const char *index);
 size_t mbstrlen(const char *s);
-#ifndef HAVE_STRNLEN
-size_t nstrnlen(const char *s, size_t maxlen);
-#endif
 size_t mbstrnlen(const char *s, size_t maxlen);
-#if !defined(NANO_TINY) || !defined(DISABLE_JUSTIFY)
+#if !defined(NANO_TINY) || defined(ENABLE_JUSTIFY)
 char *mbstrchr(const char *s, const char *c);
 #endif
 #ifndef NANO_TINY
 char *mbstrpbrk(const char *s, const char *accept);
-char *revstrpbrk(const char *s, const char *accept, const char
-	*rev_start);
-char *mbrevstrpbrk(const char *s, const char *accept, const char
-	*rev_start);
+char *revstrpbrk(const char *head, const char *accept, const char *index);
+char *mbrevstrpbrk(const char *head, const char *accept, const char *index);
 #endif
-#if !defined(DISABLE_NANORC) && (!defined(NANO_TINY) || !defined(DISABLE_JUSTIFY))
-bool has_blank_chars(const char *s);
+#if defined(ENABLE_NANORC) && (!defined(NANO_TINY) || defined(ENABLE_JUSTIFY))
 bool has_blank_mbchars(const char *s);
 #endif
 #ifdef ENABLE_UTF8
 bool is_valid_unicode(wchar_t wc);
 #endif
-#ifndef DISABLE_NANORC
+#ifdef ENABLE_NANORC
 bool is_valid_mbstring(const char *s);
 #endif

 /* Most functions in color.c. */
-#ifndef DISABLE_COLOR
+#ifdef ENABLE_COLOR
 void set_colorpairs(void);
 void color_init(void);
 void color_update(void);
@@ -271,14 +250,11 @@ void alloc_multidata_if_needed(filestruct *fileptr);
 void precalc_multicolorinfo(void);
 #endif

-/* All functions in cut.c. */
+/* Most functions in cut.c. */
 void cutbuffer_reset(void);
 bool keeping_cutbuffer(void);
-void cut_line(void);
 #ifndef NANO_TINY
 void cut_marked(bool *right_side_up);
-void cut_to_eol(void);
-void cut_to_eof(void);
 #endif
 void do_cut_text(bool copy_text, bool cut_till_eof);
 void do_cut_text_void(void);
@@ -289,73 +265,54 @@ void do_cut_till_eof(void);
 void do_uncut_text(void);

 /* Most functions in files.c. */
-void make_new_buffer(void);
 void initialize_buffer_text(void);
-bool open_buffer(const char *filename, bool undoable);
-#ifndef DISABLE_SPELLER
+void set_modified(void);
+bool open_buffer(const char *filename, bool new_buffer);
+#ifdef ENABLE_SPELLER
 void replace_buffer(const char *filename);
+#ifndef NANO_TINY
+void replace_marked_buffer(const char *filename, filestruct *top, size_t top_x,
+		filestruct *bot, size_t bot_x);
 #endif
-void display_buffer(void);
-#ifndef DISABLE_MULTIBUFFER
-void switch_to_prev_buffer_void(void);
-void switch_to_next_buffer_void(void);
+#endif
+void prepare_for_display(void);
+#ifdef ENABLE_MULTIBUFFER
+void switch_to_prev_buffer(void);
+void switch_to_next_buffer(void);
 bool close_buffer(void);
 #endif
-filestruct *read_line(char *buf, size_t buf_len, filestruct *prevnode);
-void read_file(FILE *f, int fd, const char *filename, bool undoable,
-		bool checkwritable);
+void read_file(FILE *f, int fd, const char *filename, bool undoable);
 int open_file(const char *filename, bool newfie, bool quiet, FILE **f);
 char *get_next_filename(const char *name, const char *suffix);
 void do_insertfile_void(void);
 char *get_full_path(const char *origpath);
-char *check_writable_directory(const char *path);
 char *safe_tempfile(FILE **f);
-#ifndef DISABLE_OPERATINGDIR
+#ifdef ENABLE_OPERATINGDIR
 void init_operating_dir(void);
-bool check_operating_dir(const char *currpath, bool allow_tabcomp);
+bool outside_of_confinement(const char *currpath, bool allow_tabcomp);
 #endif
 #ifndef NANO_TINY
 void init_backup_dir(void);
 int delete_lockfile(const char *lockfilename);
 int write_lockfile(const char *lockfilename, const char *origfilename, bool modified);
 #endif
-int copy_file(FILE *inn, FILE *out);
+int copy_file(FILE *inn, FILE *out, bool close_out);
 bool write_file(const char *name, FILE *f_open, bool tmp,
-	kind_of_writing_type method, bool nonamechange);
+		kind_of_writing_type method, bool fullbuffer);
 #ifndef NANO_TINY
 bool write_marked_file(const char *name, FILE *f_open, bool tmp,
-	kind_of_writing_type method);
+		kind_of_writing_type method);
 #endif
-int do_writeout(bool exiting);
+int do_writeout(bool exiting, bool withprompt);
 void do_writeout_void(void);
-#ifndef NANO_TINY
 void do_savefile(void);
-#endif
 char *real_dir_from_tilde(const char *buf);
-#if !defined(DISABLE_TABCOMP) || !defined(DISABLE_BROWSER)
+#if defined(ENABLE_TABCOMP) || defined(ENABLE_BROWSER)
 int diralphasort(const void *va, const void *vb);
-void free_chararray(char **array, size_t len);
 #endif
-#ifndef DISABLE_TABCOMP
-bool is_dir(const char *buf);
-char **username_tab_completion(const char *buf, size_t *num_matches,
-	size_t buf_len);
-char **cwd_tab_completion(const char *buf, bool allow_files, size_t
-	*num_matches, size_t buf_len);
+#ifdef ENABLE_TABCOMP
 char *input_tab(char *buf, bool allow_files, size_t *place,
-	bool *lastwastab, void (*refresh_func)(void), bool *listed);
-#endif
-const char *tail(const char *path);
-#ifndef DISABLE_HISTORIES
-char *histfilename(void);
-void load_history(void);
-bool writehist(FILE *hist, const filestruct *head);
-void save_history(void);
-int check_dotnano(void);
-void load_poshistory(void);
-void save_poshistory(void);
-void update_poshistory(char *filename, ssize_t lineno, ssize_t xpos);
-bool has_old_position(const char *file, ssize_t *line, ssize_t *column);
+		bool *lastwastab, void (*refresh_func)(void), bool *listed);
 #endif

 /* Some functions in global.c. */
@@ -363,10 +320,11 @@ size_t length_of_list(int menu);
 const sc *first_sc_for(int menu, void (*func)(void));
 int the_code_for(void (*func)(void), int defaultval);
 functionptrtype func_from_key(int *kbinput);
+int keycode_from_string(const char *keystring);
 void assign_keyinfo(sc *s, const char *keystring, const int keycode);
 void print_sclist(void);
 void shortcut_init(void);
-#ifndef DISABLE_COLOR
+#ifdef ENABLE_COLOR
 void set_lint_or_format_shortcuts(void);
 void set_spell_shortcuts(void);
 #endif
@@ -379,7 +337,8 @@ void thanks_for_all_the_fish(void);
 #endif

 /* All functions in help.c. */
-#ifndef DISABLE_HELP
+#ifdef ENABLE_HELP
+void wrap_the_help_text(bool redisplaying);
 void do_help(void);
 void help_init(void);
 functionptrtype parse_help_input(int *kbinput);
@@ -387,80 +346,85 @@ size_t help_line_len(const char *ptr);
 #endif
 void do_help_void(void);

-/* All functions in move.c. */
-void do_first_line(void);
-void do_last_line(void);
+/* Most functions in history.c. */
+#ifdef ENABLE_HISTORIES
+void history_init(void);
+void history_reset(const filestruct *h);
+void update_history(filestruct **h, const char *s);
+char *get_history_older(filestruct **h);
+char *get_history_newer(filestruct **h);
+void get_history_older_void(void);
+void get_history_newer_void(void);
+#ifdef ENABLE_TABCOMP
+char *get_history_completion(filestruct **h, char *s, size_t len);
+#endif
+bool have_statedir(void);
+void load_history(void);
+void save_history(void);
+void load_poshistory(void);
+void update_poshistory(char *filename, ssize_t lineno, ssize_t xpos);
+bool has_old_position(const char *file, ssize_t *line, ssize_t *column);
+#endif
+
+/* Most functions in move.c. */
+void to_first_line(void);
+void to_last_line(void);
 void do_page_up(void);
 void do_page_down(void);
-#ifndef DISABLE_JUSTIFY
-void do_para_begin(bool allow_update);
+#ifdef ENABLE_JUSTIFY
+void do_para_begin(bool update_screen);
+void do_para_end(bool update_screen);
 void do_para_begin_void(void);
-void do_para_end(bool allow_update);
 void do_para_end_void(void);
 #endif
 void do_prev_block(void);
 void do_next_block(void);
-void do_prev_word(bool allow_punct, bool allow_update);
+void do_prev_word(bool allow_punct, bool update_screen);
+bool do_next_word(bool allow_punct, bool update_screen);
 void do_prev_word_void(void);
-bool do_next_word(bool allow_punct, bool allow_update);
 void do_next_word_void(void);
-void ensure_line_is_visible(void);
 void do_home(void);
 void do_end(void);
-void do_up(bool scroll_only);
-void do_up_void(void);
-void do_down(bool scroll_only);
-void do_down_void(void);
-#ifndef NANO_TINY
+void do_up(void);
+void do_down(void);
+#ifdef ENABLE_HELP
 void do_scroll_up(void);
 void do_scroll_down(void);
 #endif
 void do_left(void);
 void do_right(void);

-/* All functions in nano.c. */
+/* Most functions in nano.c. */
 filestruct *make_new_node(filestruct *prevnode);
-filestruct *copy_node(const filestruct *src);
 void splice_node(filestruct *afterthis, filestruct *newnode);
 void unlink_node(filestruct *fileptr);
 void delete_node(filestruct *fileptr);
 filestruct *copy_filestruct(const filestruct *src);
 void free_filestruct(filestruct *src);
-void renumber(filestruct *fileptr);
+void renumber(filestruct *line);
 partition *partition_filestruct(filestruct *top, size_t top_x,
-	filestruct *bot, size_t bot_x);
+		filestruct *bot, size_t bot_x);
 void unpartition_filestruct(partition **p);
 void extract_buffer(filestruct **file_top, filestruct **file_bot,
-	filestruct *top, size_t top_x, filestruct *bot, size_t bot_x);
+		filestruct *top, size_t top_x, filestruct *bot, size_t bot_x);
 void ingraft_buffer(filestruct *somebuffer);
 void copy_from_buffer(filestruct *somebuffer);
 openfilestruct *make_new_opennode(void);
+#ifdef ENABLE_MULTIBUFFER
 void unlink_opennode(openfilestruct *fileptr);
 void delete_opennode(openfilestruct *fileptr);
+#endif
 void print_view_warning(void);
 void show_restricted_warning(void);
-#ifdef DISABLE_HELP
+#ifndef ENABLE_HELP
 void say_there_is_no_help(void);
 #endif
 void finish(void);
 void die(const char *msg, ...);
-void die_save_file(const char *die_filename, struct stat *die_stat);
+void emergency_save(const char *die_filename, struct stat *die_stat);
 void window_init(void);
-#ifndef DISABLE_MOUSE
-void disable_mouse_support(void);
-void enable_mouse_support(void);
-void mouse_init(void);
-#endif
-void print_opt_full(const char *shortflag
-#ifdef HAVE_GETOPT_LONG
-	, const char *longflag
-#endif
-	, const char *desc);
-void usage(void);
-void version(void);
 void do_exit(void);
 void close_and_go(void);
-void signal_init(void);
 RETSIGTYPE handle_hupterm(int signal);
 RETSIGTYPE do_suspend(int signal);
 RETSIGTYPE do_continue(int signal);
@@ -476,18 +440,12 @@ void disable_flow_control(void);
 void enable_flow_control(void);
 void terminal_init(void);
 void unbound_key(int code);
+bool okay_for_view(const sc *shortcut);
 int do_input(bool allow_funcs);
-#ifndef DISABLE_MOUSE
-int do_mouse(void);
-#endif
 void do_output(char *output, size_t output_len, bool allow_cntrls);

 /* Most functions in prompt.c. */
-#ifndef DISABLE_MOUSE
-int do_statusbar_mouse(void);
-#endif
-void do_statusbar_output(int *the_input, size_t input_len,
-	bool filtering);
+void do_statusbar_output(int *the_input, size_t input_len, bool filtering);
 void do_statusbar_home(void);
 void do_statusbar_end(void);
 void do_statusbar_left(void);
@@ -495,6 +453,7 @@ void do_statusbar_right(void);
 void do_statusbar_backspace(void);
 void do_statusbar_delete(void);
 void do_statusbar_cut_text(void);
+void do_statusbar_uncut_text(void);
 #ifndef NANO_TINY
 void do_statusbar_prev_word(void);
 void do_statusbar_next_word(void);
@@ -503,78 +462,49 @@ void do_statusbar_verbatim_input(void);
 size_t statusbar_xplustabs(void);
 size_t get_statusbar_page_start(size_t start_col, size_t column);
 void reinit_statusbar_x(void);
-void reset_statusbar_cursor(void);
 void update_the_statusbar(void);
 int do_prompt(bool allow_tabs, bool allow_files,
-	int menu, const char *curranswer,
-#ifndef DISABLE_HISTORIES
-	filestruct **history_list,
-#endif
-	void (*refresh_func)(void), const char *msg, ...);
+		int menu, const char *curranswer, filestruct **history_list,
+		void (*refresh_func)(void), const char *msg, ...);
 int do_yesno_prompt(bool all, const char *msg);

 /* Most functions in rcfile.c. */
-#if !defined(DISABLE_NANORC) || !defined(DISABLE_HISTORIES)
-char *parse_next_word(char *ptr);
-#endif
-#ifndef DISABLE_NANORC
-#ifndef DISABLE_COLOR
+#ifdef ENABLE_NANORC
+#ifdef ENABLE_COLOR
 bool parse_color_names(char *combostr, short *fg, short *bg, bool *bright);
 void grab_and_store(const char *kind, char *ptr, regexlisttype **storage);
 #endif
 void parse_rcfile(FILE *rcstream, bool syntax_only);
 void do_rcfiles(void);
-#endif /* !DISABLE_NANORC */
+#endif /* ENABLE_NANORC */

-/* All functions in search.c. */
-#ifdef HAVE_REGEX_H
-bool regexp_init(const char *regexp);
-void regexp_cleanup(void);
-#endif
+/* Most functions in search.c. */
 void not_found_msg(const char *str);
 void search_replace_abort(void);
-int search_init(bool replacing, bool use_answer);
-int findnextstr(const char *needle, bool whole_word_only, bool have_region,
-	size_t *match_len, bool skipone, const filestruct *begin, size_t begin_x);
+int findnextstr(const char *needle, bool whole_word_only, int modus,
+		size_t *match_len, bool skipone, const filestruct *begin, size_t begin_x);
 void do_search(void);
+void do_search_forward(void);
+void do_search_backward(void);
 #ifndef NANO_TINY
 void do_findprevious(void);
 void do_findnext(void);
 #endif
 void do_research(void);
 void go_looking(void);
-#ifdef HAVE_REGEX_H
-int replace_regexp(char *string, bool create);
-#endif
-char *replace_line(const char *needle);
 ssize_t do_replace_loop(const char *needle, bool whole_word_only,
-	const filestruct *real_current, size_t *real_current_x);
+		const filestruct *real_current, size_t *real_current_x);
 void do_replace(void);
+void ask_for_replacement(void);
 void goto_line_posx(ssize_t line, size_t pos_x);
 void do_gotolinecolumn(ssize_t line, ssize_t column, bool use_answer,
-	bool interactive);
+		bool interactive);
 void do_gotolinecolumn_void(void);
 #ifndef NANO_TINY
-bool find_bracket_match(bool reverse, const char *bracket_set);
 void do_find_bracket(void);
-#ifndef DISABLE_TABCOMP
-char *get_history_completion(filestruct **h, char *s, size_t len);
-#endif
-#endif
-#ifndef DISABLE_HISTORIES
-bool history_has_changed(void);
-void history_init(void);
-void history_reset(const filestruct *h);
-filestruct *find_history(const filestruct *h_start, const filestruct
-	*h_end, const char *s, size_t len);
-void update_history(filestruct **h, const char *s);
-char *get_history_older(filestruct **h);
-char *get_history_newer(filestruct **h);
-void get_history_older_void(void);
-void get_history_newer_void(void);
 #endif

-/* All functions in text.c. */
+/* Most functions in text.c. */
 #ifndef NANO_TINY
 void do_mark(void);
 #endif
@@ -586,8 +516,7 @@ void do_cut_next_word(void);
 #endif
 void do_tab(void);
 #ifndef NANO_TINY
-void do_indent(ssize_t cols);
-void do_indent_void(void);
+void do_indent(void);
 void do_unindent(void);
 #endif
 bool white_string(const char *s);
@@ -601,49 +530,33 @@ void do_enter(void);
 #ifndef NANO_TINY
 RETSIGTYPE cancel_command(int signal);
 bool execute_command(const char *command);
-void discard_until(const undo *thisitem, openfilestruct *thefile);
+void discard_until(const undo *thisitem, openfilestruct *thefile, bool keep);
 void add_undo(undo_type action);
-#ifndef DISABLE_COMMENT
-void update_comment_undo(ssize_t lineno);
-#endif
+void update_multiline_undo(ssize_t lineno, char *indentation);
 void update_undo(undo_type action);
 #endif /* !NANO_TINY */
-#ifndef DISABLE_WRAPPING
+#ifdef ENABLE_WRAPPING
 void wrap_reset(void);
 bool do_wrap(filestruct *line);
 #endif
-#if !defined(DISABLE_HELP) || !defined(DISABLE_WRAPJUSTIFY)
-ssize_t break_line(const char *line, ssize_t goal
-#ifndef DISABLE_HELP
-	, bool newln
+#if defined(ENABLE_HELP) || defined(ENABLED_WRAPORJUSTIFY)
+ssize_t break_line(const char *line, ssize_t goal, bool snap_at_nl);
 #endif
-	);
-#endif
-#if !defined(NANO_TINY) || !defined(DISABLE_JUSTIFY)
+#if !defined(NANO_TINY) || defined(ENABLE_JUSTIFY)
 size_t indent_length(const char *line);
 #endif
-#ifndef DISABLE_JUSTIFY
+#ifdef ENABLE_JUSTIFY
 void justify_format(filestruct *paragraph, size_t skip);
-size_t quote_length(const char *line);
-bool quotes_match(const char *a_line, size_t a_quote, const char
-	*b_line);
-bool indents_match(const char *a_line, size_t a_indent, const char
-	*b_line, size_t b_indent);
 bool begpar(const filestruct *const foo);
 bool inpar(const filestruct *const foo);
-void backup_lines(filestruct *first_line, size_t par_len);
-bool find_paragraph(size_t *const quote, size_t *const par);
 void do_justify(bool full_justify);
 void do_justify_void(void);
 void do_full_justify(void);
 #endif
-#ifndef DISABLE_SPELLER
-bool do_int_spell_fix(const char *word);
-const char *do_int_speller(const char *tempfile_name);
-const char *do_alt_speller(char *tempfile_name);
+#ifdef ENABLE_SPELLER
 void do_spell(void);
 #endif
-#ifndef DISABLE_COLOR
+#ifdef ENABLE_COLOR
 void do_linter(void);
 void do_formatter(void);
 #endif
@@ -655,6 +568,8 @@ void complete_a_word(void);

 /* All functions in utils.c. */
 void get_homedir(void);
+const char *tail(const char *path);
+char *concatenate(const char *path, const char *name);
 #ifdef ENABLE_LINENUMBERS
 int digits(ssize_t n);
 #endif
@@ -664,22 +579,15 @@ void snuggly_fit(char **str);
 void null_at(char **data, size_t index);
 void unsunder(char *str, size_t true_len);
 void sunder(char *str);
-#if !defined(NANO_TINY) && !defined(DISABLE_NANORC)
-#ifndef HAVE_GETLINE
-ssize_t ngetline(char **lineptr, size_t *n, FILE *stream);
+#if !defined(ENABLE_TINY) || defined(ENABLE_TABCOMP) || defined(ENABLE_BROWSER)
+void free_chararray(char **array, size_t len);
 #endif
-#ifndef HAVE_GETDELIM
-ssize_t ngetdelim(char **lineptr, size_t *n, int delim, FILE *stream);
-#endif
-#endif
-#ifdef HAVE_REGEX_H
 const char *fixbounds(const char *r);
-#endif
-#ifndef DISABLE_SPELLER
+#ifdef ENABLE_SPELLER
 bool is_separate_word(size_t position, size_t length, const char *buf);
 #endif
 const char *strstrwrapper(const char *haystack, const char *needle,
-	const char *start);
+		const char *start);
 void nperror(const char *s);
 void *nmalloc(size_t howmuch);
 void *nrealloc(void *ptr, size_t howmuch);
@@ -688,14 +596,17 @@ char *mallocstrcpy(char *dest, const char *src);
 char *free_and_assign(char *dest, char *src);
 size_t get_page_start(size_t column);
 size_t xplustabs(void);
-size_t actual_x(const char *s, size_t column);
-size_t strnlenpt(const char *s, size_t maxlen);
-size_t strlenpt(const char *s);
+size_t actual_x(const char *text, size_t column);
+size_t strnlenpt(const char *text, size_t maxlen);
+size_t strlenpt(const char *text);
 void new_magicline(void);
-#ifndef NANO_TINY
+#if !defined(NANO_TINY) || defined(ENABLE_HELP)
 void remove_magicline(void);
-void mark_order(const filestruct **top, size_t *top_x, const filestruct
-	**bot, size_t *bot_x, bool *right_side_up);
+#endif
+#ifndef NANO_TINY
+void mark_order(const filestruct **top, size_t *top_x,
+		const filestruct **bot, size_t *bot_x, bool *right_side_up);
+void get_range(const filestruct **top, const filestruct **bot);
 #endif
 size_t get_totsize(const filestruct *begin, const filestruct *end);
 #ifndef NANO_TINY
@@ -703,87 +614,105 @@ filestruct *fsfromline(ssize_t lineno);
 #endif
 #ifdef DEBUG
 void dump_filestruct(const filestruct *inptr);
-void dump_filestruct_reverse(void);
 #endif

 /* Most functions in winio.c. */
-void get_key_buffer(WINDOW *win);
+void record_macro(void);
+void run_macro(void);
 size_t get_key_buffer_len(void);
-void unget_input(int *input, size_t input_len);
+void put_back(int keycode);
 void unget_kbinput(int kbinput, bool metakey);
-int *get_input(WINDOW *win, size_t input_len);
-int get_kbinput(WINDOW *win);
+#ifdef ENABLE_NANORC
+void implant(const char *string);
+#endif
+int get_kbinput(WINDOW *win, bool showcursor);
 int parse_kbinput(WINDOW *win);
 int arrow_from_abcd(int kbinput);
 int parse_escape_sequence(WINDOW *win, int kbinput);
 int get_byte_kbinput(int kbinput);
-#ifdef ENABLE_UTF8
-long add_unicode_digit(int kbinput, long factor, long *uni);
-long get_unicode_kbinput(WINDOW *win, int kbinput);
-#endif
 int get_control_kbinput(int kbinput);
-void unparse_kbinput(char *output, size_t output_len);
 int *get_verbatim_kbinput(WINDOW *win, size_t *kbinput_len);
 int *parse_verbatim_kbinput(WINDOW *win, size_t *count);
-#ifndef DISABLE_MOUSE
-int get_mouseinput(int *mouse_x, int *mouse_y, bool allow_shortcuts);
+#ifdef ENABLE_MOUSE
+int get_mouseinput(int *mouse_row, int *mouse_col, bool allow_shortcuts);
 #endif
 const sc *get_shortcut(int *kbinput);
 void blank_row(WINDOW *win, int y, int x, int n);
-void blank_titlebar(void);
 void blank_edit(void);
 void blank_statusbar(void);
+void wipe_statusbar(void);
 void blank_bottombars(void);
 void check_statusblank(void);
-char *display_string(const char *buf, size_t start_col, size_t span,
-	bool dollars);
+char *display_string(const char *buf, size_t column, size_t span, bool isdata);
 void titlebar(const char *path);
-extern void set_modified(void);
 void statusbar(const char *msg);
 void warn_and_shortly_pause(const char *msg);
 void statusline(message_type importance, const char *msg, ...);
 void bottombars(int menu);
-void onekey(const char *keystroke, const char *desc, int length);
-void reset_cursor(void);
+void post_one_key(const char *keystroke, const char *tag, int width);
+void place_the_cursor(void);
 void edit_draw(filestruct *fileptr, const char *converted,
-	int line, size_t from_col);
+		int line, size_t from_col);
 int update_line(filestruct *fileptr, size_t index);
-bool need_horizontal_scroll(const size_t old_column, const size_t new_column);
-void edit_scroll(scroll_dir direction, int nrows);
-void edit_redraw(filestruct *old_current);
+#ifndef NANO_TINY
+int update_softwrapped_line(filestruct *fileptr);
+#endif
+bool line_needs_update(const size_t old_column, const size_t new_column);
+int go_back_chunks(int nrows, filestruct **line, size_t *leftedge);
+int go_forward_chunks(int nrows, filestruct **line, size_t *leftedge);
+bool less_than_a_screenful(size_t was_lineno, size_t was_leftedge);
+void edit_scroll(bool direction);
+#ifndef NANO_TINY
+size_t get_softwrap_breakpoint(const char *text, size_t leftedge,
+								bool *end_of_line);
+size_t get_chunk_and_edge(size_t column, filestruct *line, size_t *leftedge);
+size_t chunk_for(size_t column, filestruct *line);
+size_t leftedge_for(size_t column, filestruct *line);
+size_t number_of_chunks_in(filestruct *line);
+void ensure_firstcolumn_is_aligned(void);
+#endif
+size_t actual_last_column(size_t leftedge, size_t column);
+void edit_redraw(filestruct *old_current, update_type manner);
 void edit_refresh(void);
 void adjust_viewport(update_type location);
 void total_redraw(void);
 void total_refresh(void);
 void display_main_list(void);
-void do_cursorpos(bool constant);
+void do_cursorpos(bool force);
 void do_cursorpos_void(void);
-void spotlight(bool active, const char *word);
-void xon_complaint(void);
-void xoff_complaint(void);
+void spotlight(bool active, size_t from_col, size_t to_col);
+#ifndef NANO_TINY
+void spotlight_softwrapped(bool active, size_t from_col, size_t to_col);
+#endif
 void do_suspend_void(void);
-void enable_nodelay(void);
-void disable_nodelay(void);
-#ifndef DISABLE_EXTRA
+void disable_waiting(void);
+void enable_waiting(void);
+#ifdef ENABLE_EXTRA
 void do_credits(void);
 #endif

-/* May as well throw these here, since they are just placeholders. */
+/* These are just name definitions. */
 void do_cancel(void);
 void case_sens_void(void);
 void regexp_void(void);
-void gototext_void(void);
+void backwards_void(void);
+void flip_replace(void);
+void flip_goto(void);
+#ifdef ENABLE_BROWSER
 void to_files_void(void);
+void goto_dir_void(void);
+#endif
+#ifndef NANO_TINY
 void dos_format_void(void);
 void mac_format_void(void);
 void append_void(void);
 void prepend_void(void);
 void backup_file_void(void);
+void flip_execute(void);
+#endif
+#ifdef ENABLE_MULTIBUFFER
+void flip_newbuffer(void);
+#endif
 void discard_buffer(void);
-void new_buffer_void(void);
-void backwards_void(void);
-void goto_dir_void(void);
-void flip_replace_void(void);
-void flip_execute_void(void);

 #endif /* !PROTO_H */
--- a/src/rcfile.c
+++ b/src/rcfile.c
--- a/src/search.c
+++ b/src/search.c
--- a/src/text.c
+++ b/src/text.c
--- a/src/utils.c
+++ b/src/utils.c
--- a/src/winio.c
+++ b/src/winio.c
--- a/syntax/Makefile.am
+++ b/syntax/Makefile.am
@@ -22,6 +22,7 @@ pkgdata_DATA =	asm.nanorc \
 		man.nanorc \
 		mgp.nanorc \
 		mutt.nanorc \
+		nanohelp.nanorc \
 		nanorc.nanorc \
 		nftables.nanorc \
 		objc.nanorc \
--- a/syntax/asm.nanorc
+++ b/syntax/asm.nanorc
@@ -1,7 +1,7 @@
 ## Here is an example for assembler.

-syntax "asm" "\.(S|s|asm)$"
-magic "[Aa]ssembl(y|er)"
+syntax asm "\.(S|s|asm)$"
+magic "assembler source"
 comment "//"

 color red "\<[A-Z_]{2,}\>"
--- a/Show More
+++ b/Show More