po: update translations and regenerate POT file and PO files

This fixes https://savannah.gnu.org/bugs/?56504.
Reported-by: Liu Hao <lh_mouse@126.com>

Bug existed since commit 7e422402 from two weeks ago.

AUTHORS

@@ -5,11 +5,18 @@ nano editor.  Please see the ChangeLog for specific changes by author.
 Chris Allegretta <chrisa@asty.org>
 	* Original program author and long-time maintainer.
 
+Benno Schulenberg <bensberg@telfort.nl>
+	* An array of small bug fixes, the cut-word and block-jump
+	  routines, text selection by holding Shift, macro recording
+	  and replay, plus some key bindings.  Current maintainer.
+
 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, constantshow mode, parts of
-	  UTF-8 support, softwrap overhaul, and various other fixes.
+	  UTF-8 support, softwrap overhaul, undoable (un)indentations,
+	  undoable justifications, justifiable regions, and numerous
+	  other fixes.
 
 Jordi Mallach <jordi@gnu.org>
 	* Debian package maintainer, fellow bug squasher.
@@ -60,7 +67,8 @@ Sumedh Pendurkar <sumedh.pendurkar@gmail.com>
 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
-	  key bindings.  Current maintainer.
+Marco Diego Aurélio Mesquita <marcodiegomesquita@gmail.com>
+	* Filtering text through an external command.
+
+Brand Huntsman <alpha@qzx.com>
+	* The delayed parsing of syntax files.

ChangeLog.1999-2006

@@ -8278,7 +8278,7 @@ nano 0.7.6 - 2000.01.15
 	having a newline at the end doesn't get read, bugfix in do_replace
 	with replace all, more/better comments. (Robert Siemborski)
 0.7.2	Our first patch accepted into the source! configure fixes
-	and optimizations (Erik Anderson).  Added missing stdarg.h to winio.c.
+	and optimizations (Erik Andersen).  Added missing stdarg.h to winio.c.
 	Bug fix in update_line for editing long lines. Fixed arguments
 	being put into the filename when none is specified. Preliminary
 	+line command argument function.

ChangeLog.2007-2015

@@ -3555,10 +3555,10 @@ GNU nano 2.1.4 - 2008.08.09
 	* text.c (add_undo): Fix check for multi-line cut check skips adding other new legit events.
 
 2008-07-23 Chris Allegretta <chrisa@asty.org>
-	* text.c: Reset openfile-> to OTHER after an undo or redo so we don't
-	  mistakenly think this is an update when it's really an add.  Also
-	  fix an extra ; after an if statement which makes nano try to free
-	  a struct which may be NULL.
+	* text.c: Reset openfile->last_action to OTHER after an undo or redo
+	  so we don't mistakenly think this is an update when it's really an
+	  add.  Also fix a mistaken ; after an if statement which made nano
+	  try to free a struct which might be NULL.
 
 GNU nano 2.1.3 - 2008.08.04
 

IMPROVEMENTS

@@ -1,11 +1,43 @@
 Improvements in GNU nano
 ========================
 
+Since 4.0:
+  - The ability to both read from and write to a FIFO.
+  - Automatic hard-wrapping is no longer the default.
+  - Addition of --guidestripe to draw a helpful vertical bar.
+  - Meta-Up and Meta-Down scroll the screen linewise.
+  - Continuation is shown with a highlighted ">" instead of a plain "$".
+  - A marked region gets justified into a single, separate paragraph.
+  - Any number of justifications can be undone.
+
+Since 3.0:
+  - Addition of --zap to make <Del> and <Bsp> obliterate marked text.
+  - <Ctrl+Delete> wipes next word and <Shift+Ctrl+Delete> preceding word.
+  - An external spell check can be undone.
+
+Since 2.9.0:
+  - The ability to filter text through an external command.
+  - Better detection of paragraphs, allowing a less indented beginning.
+  - Option 'set afterends' for making Ctrl+Right stop at word ends.
+  - A crash handler that saves changed buffers in case of a crash.
+  - 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:
+  - ^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.
+  - 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.
@@ -19,28 +51,29 @@ Since 2.6.0:
   - The option 'wordchars' for specifying extra word characters.
   - Hi-bit control characters are shown in a more readable manner.
   - The ability to use negative numbers at the Go To Line prompt.
-
-Noteworthy changes since 2.2
-----------------------------
   - The ability to comment/uncomment lines with a single keystroke (M-3).
   - The ability to refresh the file list in the browser (^L).
   - The ability to abort re-searches (^C after an M-W).
   - Better feedback at startup when opening large or multiple files.
+
+Since 2.5.0:
   - The option 'justifytrim' for snipping whitespace from justified lines.
   - The ability to discard a buffer (^O ^Q) when --tempfile is used.
-  - Replacing things in a marked region now takes place in situ, in context,
-    instead of changing the view to only the marked text.
-  - On some terminals Ctrl+Left / Ctrl+Right now work for PrevWord/NextWord.
+  - On most terminals Ctrl+Left / Ctrl+Right now work for PrevWord/NextWord.
   - When in the middle of a word, PrevWord now jumps to the start of this
     word (like Pico does) instead of to the start of the preceding word.
-  - Invalid byte sequences are properly displayed and not mistakenly found.
-  - Resizing the window does not exit from help viewer nor file browser.
-  - Improved arrangement of the shortcuts in the two help lines.
-  - Several small bug fixes in the syntax highlighting.
-  - System syntaxes can be improved upon with the 'extendsyntax' command.
   - The ability to delete whole words with 'cutwordleft' and 'cutwordright'.
   - The ability to save a file without prompting for its name ('savefile').
   - The ability to search backward without having to toggle the direction.
+
+Since 2.4.0:
+  - Replacing things in a marked region now takes place in situ, in context,
+    instead of changing the view to only the marked text.
+  - Invalid byte sequences are properly displayed and not mistakenly found.
+  - Resizing the window does not exit from help viewer nor file browser.
+
+Since 2.3.0:
+  - System syntaxes can be improved upon with the 'extendsyntax' command.
   - Whitespace display (M-P) does not require configuration to be useful.
   - Undo/redo is enabled by default (M-U/M-E) and works nearly everywhere
     -- just not yet for justifying and indenting/unindenting.

README

@@ -1,76 +1,79 @@
 
-		GNU nano -- an enhanced clone of the Pico text editor
+          GNU nano -- a simple editor, inspired by Pico
 
 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, and (before using the Apache License) it had unclear
+    restrictions on redistribution.  Because of this, Pine and Pico
+    were not included in many GNU/Linux distributions.  Furthermore,
+    some features (like go-to-line-number or search-and-replace) were
+    unavailable for a long time 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 aimed to solve these problems by: 1) being truly free software
+    by using the GPL, 2) emulating the functionality of Pico as closely
+    as is reasonable, and 3) including extra functionality by default.
 
-	The nano editor is an official GNU package.  For more information on
-	GNU and the Free Software Foundation, please see http://www.gnu.org/.
+    Nowadays, nano wants to be a generally useful editor with sensible
+    defaults (linewise scrolling, no automatic line breaking).
+
+    The nano editor is an official GNU package.  For more information on
+    GNU and the Free Software Foundation, please see https://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
 
-	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.
+    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.
+    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.

README.GIT

@@ -93,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"

THANKS

@@ -4,90 +4,99 @@ 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
+Pedro Albuquerque <palbuquerque73@gmail.com>          Portuguese
+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)
+Seong-ho Cho <darkcircle.0426@gmail.com>              Korean
+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
+Václav Haisman <V.Haisman@sh.cvut.cz>                 Czech
+Takeshi Hamasaki <hmatrjp@users.sourceforge.jp>       Japanese
+Geir Helland <pjallabais@users.sourceforge.net>       Norwegian Bokmål
+Tedi Heriyanto <tedi_h@gmx.net>                       Indonesian
+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
+Clement Laforet <clem_laf@wanadoo.fr>                 French
+Ask Hjorth Larsen <asklarsen@gmail.com>               Danish
+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
+Claudio Neves <cneves@nextis.com>                     Brazilian Portuguese
+Kalle Olavi Niemitalo <kon@iki.fi>                    Finnish
+Мирослав Николић <miroslavnikolic@rocketmail.com>     Serbian
+Lauri Nurmi <lanurmi@iki.fi>                          Finnish
+Daniel Nylander <po@danielnylander.se>                Swedish
+Mikel Olasagasti <hey_neken@mundurat.net>             Basque
+Yi-Jyun Pan <pan93412@gmail.com>                      Chinese (traditional)
+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
+Sharuzzaman Ahmat Raslan <sharuzzaman@excite.com>     Malay
+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)
+Boyuan Yang <073plan@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
+Kamil Dudka <kdudka@redhat.com>                Several small bug fixes
+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

TODO

@@ -2,28 +2,26 @@ A list of desired features
 --------------------------
 
 Somewhat urgent:
-- Make undo/redo work also for justifying and indenting.
+- 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 to define and execute a macro: a stored sequence of keystrokes.
-  See https://savannah.gnu.org/bugs/?50314.
 - Allow color syntaxes to apply to more than just color, so that we can
   e.g. specify a different alternate spell checker depending on which
   file type we have open.
-- Allow piping marked text to an external command and replacing it with
-  the command's output -- that is: generalize the spell-check flow.
-  See also https://savannah.gnu.org/bugs/?28993.
 
 Vague musings:
-- FriBidi support?
+- 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?
-- 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?
+
+For version 2.9:
+- Allow piping (marked) text to an external command and replacing it with
+  the command's output.  That is: implement filtering. [DONE]
+- Allow to record and replay a macro: a stored series of keystrokes. [DONE]
+- Make undo/redo work also for indenting. [DONE]
 
 For version 2.8:
 - Allow text searches in the help viewer. [DONE]
@@ -41,8 +39,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:

autogen.sh

@@ -2,7 +2,7 @@
 # Generate configure & friends for GIT users.
 
 gnulib_url="git://git.sv.gnu.org/gnulib.git"
-gnulib_hash="3eee3a1e3c5b8883e0d4934bfc1326ee605cb7c1"
+gnulib_hash="a1beabcb14cde661c36f7a3c7c17b5871704003e"
 
 modules="
 	futimens

doc/.gitignore

@@ -4,4 +4,5 @@ nanorc.5.html
 texinfo.tex
 nano.info
 nano.html
+nano.pdf
 sample.nanorc

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)

doc/faq.html

@@ -7,21 +7,23 @@
 <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>
+<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>
-<h2><a href="#2">2. Where to get GNU nano.</a></h2>
+  <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>
+  <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>
@@ -30,96 +32,96 @@
   <a href="#3.6">3.6. How can I make the executable smaller? This is too bloated!</a><br>
   <a href="#3.7">3.7. Tell me more about this multibuffer stuff!</a><br>
   <a href="#3.8">3.8. Tell me more about this verbatim input stuff!</a><br>
-  <a href="#3.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>
+  <a href="#3.9">3.9. How do I make a .nanorc file that nano will read when I start it?</a><br>
+</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 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 keystroke here&gt;!</a><br>
-  <a href="#4.7">4.7. nano crashes when I resize my window. How can I fix that?</a><br>
-  <a href="#4.8a">4.8a. 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.8b">4.8b. 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>
+  <a href="#4.4">4.4. With what keystroke can I paste text from the clipboard into nano?</a><br>
+  <a href="#4.5">4.5. How do I select text for or paste text from the clipboard when nano's mouse support is turned on?</a><br>
+  <a href="#4.6">4.6. 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.7">4.7. When I paste from Windows into a remote nano, nano rewraps the lines. What gives?<a><br>
+  <a href="#4.8">4.8. I've compiled nano with color support, but I don't see any color when I run it!</a><br>
+  <a href="#4.9">4.9. How do I make nano my default editor (in Pine, mutt, etc.)?</a><br>
+</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>
+  <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>
+  <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>
+  <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. What is GNU nano?</h2>
-<blockquote><p>GNU nano is designed to be a free replacement for the Pico text editor, part of the Pine email suite from <a href="http://www.washington.edu/pine/">The University of Washington</a>. It aims to &quot;emulate Pico as closely as possible and then include extra functionality&quot;.</p></blockquote>
-<h2><a name="1.2"></a>1.2. What is the history behind nano?</h2>
+<h3><a name="1.1"></a>1.1. What is GNU nano?</h3>
+<blockquote><p>GNU nano was 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 aimed to &quot;emulate Pico as closely as is reasonable and then include extra functionality&quot;.</p></blockquote>
+<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>
   <p><b>Then came Debian...</b></p>
-  <p>The <a href="http://www.debian.org/">Debian GNU/Linux</a> distribution, known for its strict standards in distributing truly &quot;free&quot; software (i.e. software with no restrictions on redistribution), would not include a binary package for Pine or Pico. Many people had a serious dilemma: they loved these programs, but the versions available at the time were not truly free software in the <a href="http://www.gnu.org/philosophy/free-sw.html">GNU</a> sense of the word.</p>
+  <p>The <a href="https://www.debian.org/">Debian GNU/Linux</a> distribution, known for its strict standards in distributing truly &quot;free&quot; software (i.e. software with no restrictions on redistribution), would not include a binary package for Pine or Pico. Many people had a serious dilemma: they loved these programs, but the versions available at the time were not truly free software in the <a href="https://www.gnu.org/philosophy/free-sw.html">GNU</a> sense of the word.</p>
   <p><b>The event...</b></p>
   <p>It was in late 1999 when Chris Allegretta (our hero) was yet again complaining to himself about the less-than-perfect license Pico was distributed under, the 1000 makefiles that came with it and how just a few small improvements could make it the Best Editor in the World (TM). Having been a convert from Slackware to Debian, he missed having a simple binary package that included Pine and Pico, and had grown tired of downloading them himself.</p>
   <p>Finally something snapped inside and Chris coded and hacked like a madman for many hours straight one weekend to make a (barely usable) Pico clone, at the time called TIP (Tip Isn't Pico). The program could not be invoked without a filename, could not save files, had no help 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.3"></a>1.3. 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.4"></a>1.4. What is the current version of nano?</h2>
-<blockquote><p>The current version of nano <i>should</i> be <b>2.8.3</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.5"></a>1.5. 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>4.3</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>
-    <li><a href="http://packages.debian.org/testing/editors/nano">testing</a></li>
-    <li><a href="http://packages.debian.org/unstable/editors/nano">unstable</a></li>
+    <li><a href="https://packages.debian.org/stable/editors/nano">stable</a></li>
+    <li><a href="https://packages.debian.org/testing/editors/nano">testing</a></li>
+    <li><a href="https://packages.debian.org/unstable/editors/nano">unstable</a></li>
   </ul>
   <p>You can also have a look at the <a href="ftp://ftp.debian.org/debian/pool/main/n/nano/">Package Pool</a> to see all the available binary and source packages.</p>
 </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>
@@ -128,13 +130,13 @@
   <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
@@ -155,51 +157,42 @@
   <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> after typing <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.9"></a>3.9. 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>
-<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>
-<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 was a bug in how nano handled consecutive escape sequences. It should be fixed since version 2.6.0.</p></blockquote>
-<h2><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!</h2>
-<blockquote><p>It depends on the terminal type you're using. On some terminals, such as the FreeBSD console, xterm, konsole, and gnome-terminal, Shift-F1 to Shift-F4 will generate F13 to F16. On other terminals, such as the Linux console, rxvt, and Eterm, Shift-F3 to Shift-F6 will generate F13 to F16.</p></blockquote>
-<h2><a name="4.6"></a>4.6. nano crashes when I type &lt;insert keystroke here&gt;!</h2>
-<blockquote><p>If you aren't trying some bizarre keystroke combination with some bizarre $TERM entry, chances are you have found a bug. You are welcome to submit it to the <a href="mailto:nano-devel@gnu.org">nano-devel</a> list or in the <a href="https://savannah.gnu.org/bugs/?group=nano">bug tracker</a> on Savannah.</p></blockquote>
-<h2><a name="4.7"></a>4.7. nano crashes when I resize my window. How can I fix that?</h2>
-<blockquote><p>Older versions of nano had this problem.  Please upgrade to version 2.7.0 or newer.</p></blockquote>
-<h2><a name="4.8a"></a>4.8a. 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.8b"></a>4.8b. When I paste from Windows into a remote nano, nano rewraps the lines. What gives?</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>--rawsequences</b> option on the command line, or add the line <b>set rawsequences</b> to your .nanorc. However, nano's mouse support will be disabled if you do any of these things.</p></blockquote>
+<h3><a name="4.4"></a>4.4. 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.5"></a>4.5. How do I select text for or paste text from the clipboard when 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>
+<h3><a name="4.6"></a>4.6. 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.7"></a>4.7. 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>
-<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>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.8"></a>4.8. 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.9">3.9</a>.</p></blockquote>
+<h3><a name="4.9"></a>4.9. 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>
@@ -212,53 +205,46 @@
   <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>
-<blockquote><p>Try holding down the Shift key and selecting or pasting the text as you normally would.</p></blockquote>
-<h2><a name="4.12"></a>4.12. On startup I get a message that says "Detected a legacy nano history file".  Now older nano versions can't find my search history!</h2>
-<blockquote><p>In nano 2.3.0, cursor-position history was introduced, and both history files now reside in a .nano subdirectory in your home directory.  A newer nano will move an existing search-history file to this new location so it can continue to be used.  This means that if you then try and use an earlier version of nano, it will be unable to see your current search history.  To fix this, run the following command:</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>
 <hr width="100%">
 
 <h1><a name="5"></a>5. Internationalization</h1>
-<h2><a name="5.1"></a>5.1. There's no translation for my language!</h2>
-<blockquote><p>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>
+<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="https://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="https://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="https://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 easy. Just grab the latest <b>nano.pot</b> file listed on <a href="https://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>
-<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>
-<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>
+<h3><a name="6.1"></a>6.1. Why should I use nano instead of Pico?</h3>
+<blockquote><p>If you want features like undo/redo, syntax highlighting, line numbers, soft-wrapping, opening multiple files at once, an interface localized to your language, or search and replace with support for regular expressions, then you want nano.</p></blockquote>
+<h3><a name="6.2"></a>6.2. Why should I use Pico instead of nano?</h3>
+<blockquote><p>If you use your editor only to write emails or other texts and have no need for the above-mentioned features, then Pico will do fine for you.</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="https://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>
+<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. Where can I ask questions or send suggestions?</h2>
-<blockquote><p>There are three mailing lists for nano hosted at <a href="http://savannah.gnu.org/">Savannah</a>: info-nano, help-nano and nano-devel. info-nano is a very low traffic list where new versions of nano are announced (surprise!). help-nano is for getting help with the editor without needing to hear all of the development issues surrounding it. nano-devel is a normally low, sometimes high traffic list for discussing the present and future development of nano. Here are links to where you can sign up for a given list:</p>
-  <p>info-nano - <a href="http://mail.gnu.org/mailman/listinfo/info-nano/">http://mail.gnu.org/mailman/listinfo/info-nano/</a><br>
-  help-nano - <a href="http://mail.gnu.org/mailman/listinfo/help-nano/">http://mail.gnu.org/mailman/listinfo/help-nano/</a><br>
-  nano-devel - <a href="http://mail.gnu.org/mailman/listinfo/nano-devel/">http://mail.gnu.org/mailman/listinfo/nano-devel/</a></p></blockquote>
-<h2><a name="7.2"></a>7.3. How do I submit a bug report or patch?</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="https://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="https://lists.gnu.org/mailman/listinfo/info-nano/">https://lists.gnu.org/mailman/listinfo/info-nano/</a><br>
+  help-nano - <a href="https://lists.gnu.org/mailman/listinfo/help-nano/">https://lists.gnu.org/mailman/listinfo/help-nano/</a><br>
+  nano-devel - <a href="https://lists.gnu.org/mailman/listinfo/nano-devel/">https://lists.gnu.org/mailman/listinfo/nano-devel/</a></p></blockquote>
+<h3><a name="7.2"></a>7.3. How do I submit a bug report or patch?</h3>
 <blockquote>
   <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>
-<h2><a name="7.3"></a>7.3. I want to send the development team a big load of cash (or just a thank you).</h2>
+<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>
-<h2><a name="7.4"></a>7.4. How do I join the development team?</h2>
+<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%">
 

doc/nano.1

@@ -1,4 +1,4 @@
-.\" Copyright (C) 1999-2011, 2013-2017 Free Software Foundation, Inc.
+.\" Copyright (C) 1999-2011, 2013-2019 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:
@@ -7,25 +7,32 @@
 .\"   Foundation, version 3 or (at your option) any later version.  You
 .\"   should have received a copy of the GNU General Public License
 .\"   along with this program.  If not, see
-.\"   <http://www.gnu.org/licenses/>.
+.\"   <https://www.gnu.org/licenses/>.
 .\"
 .\" * The GNU Free Documentation License, as published by the Free
 .\"   Software Foundation, version 1.2 or (at your option) any later
 .\"   version, with no Invariant Sections, no Front-Cover Texts, and no
 .\"   Back-Cover Texts.  You should have received a copy of the GNU Free
 .\"   Documentation License along with this program.  If not, see
-.\"   <http://www.gnu.org/licenses/>.
+.\"   <https://www.gnu.org/licenses/>.
 .\"
-.TH NANO 1 "version 2.8.3" "May 2017"
-.\" Please adjust this date whenever revising the manpage.
+.TH NANO 1 "version 4.3" "June 2019"
 
 .SH NAME
-nano \- Nano's ANOther editor, an enhanced free Pico clone
+nano \- Nano's ANOther editor, inspired by Pico
 
 .SH SYNOPSIS
 .B nano
 .RI [ options "] [[+" line [, column "]]\ " file "]..."
 
+.SH NOTICE
+Starting with version 4.0, \fBnano\fR no longer hard-wraps an overlong
+line by default.  It further uses smooth scrolling by default, and by
+default includes the line below the title bar into the editing area.
+.sp
+If you want the old, Pico behavior back, you can use \fB\-\-breaklonglines\fR,
+\fB\-\-jumpyscrolling\fR, and \fB\-\-emptyline\fR (or \fB\-bje\fR for short).
+
 .SH DESCRIPTION
 \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
@@ -36,8 +43,8 @@ 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
@@ -48,20 +55,21 @@ Consecutive \fB^K\fRs will put all deleted lines together in the cutbuffer.
 Any cursor movement or executing any other command will cause the next
 \fB^K\fR to overwrite the cutbuffer.  A \fB^U\fR will paste the current
 contents of the cutbuffer at the current cursor position.
-.PP
+.sp
 When a more precise piece of text needs to be cut or copied, one can mark
 its start with \fB^6\fR, move the cursor to its end (the marked text will be
 highlighted), and then use \fB^K\fR to cut it, or \fBM\-6\fR to copy it to the
 cutbuffer.  One can also save the marked text to a file with \fB^O\fR, or
 spell check it with \fB^T\fR.
-.PP
-Since nano-2.7.0, text can also be selected by holding Shift and moving the
-cursor with the arrow keys.  Holding down the Alt key too will increase the
-stride.
-.PP
+.sp
+On some terminals, text can be selected also by holding down Shift while
+using the arrow keys.  Holding down the Ctrl or Alt key too will increase
+the stride.
+Any cursor movement without Shift being held will cancel such a selection.
+.sp
 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
@@ -77,7 +85,7 @@ 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 (\fB\-B\fR).
 The uniquely numbered files are stored in the specified \fIdirectory\fR.
@@ -95,57 +103,72 @@ Read a file into a new buffer by default.
 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
-should only need to use this option if they don't, as mouse support
-won't work properly with this option enabled.
+.BR \-J\ \fInumber ", " \-\-guidestripe= \fInumber
+Draw a vertical stripe at the given column, to help judge the width of the
+text.  (The color of the stripe can be changed with \fBset stripecolor\fR
+in your \fInanorc\fR file.)
+.TP
+.BR \-K ", " \-\-rawsequences
+Interpret escape sequences directly (instead of asking \fBncurses\fR to
+translate them).  If you need this option to get your keyboard to work
+properly, please report a bug.  Using this option disables \fBnano\fR's
+mouse support.
 .TP
 .BR \-L ", " \-\-nonewlines
-Don't add newlines to the ends of files.
+Don't automatically add a newline when a text does not end with one.
+(This can cause you to save non-POSIX text 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.
+Obsolete and ignored option, since the line below the title bar is included
+into the editing space by default.  If you prefer to keep this line blank,
+use \fB\-e\fR or \fB\-\-emptyline\fR.
 .TP
 .BR \-P ", " \-\-positionlog
 For the 200 most recent files, log the last position of the cursor,
 and place it at that position again upon reopening such a file.
-(The old form of this option, \fB\-\-poslog\fR, is deprecated.)
 .TP
-.BR "\-Q ""\fIcharacters\fB""" ", " "\-\-quotestr=""" \fIcharacters\fR """
-Set the quoting string for justifying.  The default is
-\fB"^([\ \\t]*[#:>\\|}])+"\fP if extended regular expression support is
-available, or \fB">\ "\fP otherwise.  Note that \fB\\t\fP stands for a
-Tab.
+.BR "\-Q ""\fIregex\fB""" ", " "\-\-quotestr=""" \fIregex """
+Set the regular expression for matching the quoting part of a line.
+The default value is \fB"^([\ \\t]*([!#%:;>|}]|//))+"\fP.
+(Note that \fB\\t\fP stands for an actual Tab.)
+This makes it possible to rejustify blocks of quoted text when composing
+email, and to rewrap blocks of line comments when writing source code.
 .TP
 .BR \-R ", " \-\-restricted
 Restricted mode: don't read or write to any file not specified on the
-command line; don't read any \fInanorc\fP files nor history files;
-don't allow suspending nor spell checking;
+command line.  This means: don't read or write history files;
+don't allow suspending; don't allow spell checking;
 don't allow a file to be appended to, prepended to, or saved under a
-different name if it already has one; and don't use backup files.
-This restricted mode is also accessible by invoking \fBnano\fP
+different name if it already has one; and don't make backup files.
+Restricted mode can also be activated by invoking \fBnano\fP
 with any name beginning with 'r' (e.g. "rnano").
 .TP
 .BR \-S ", " \-\-smooth
-Use smooth scrolling: text will scroll line-by-line, instead of the
-usual chunk-by-chunk behavior.
+Obsolete and ignored option, since smooth scrolling has become the default.
+If you prefer the chunk-by-chunk scrolling behavior,
+use \fB\-j\fR or \fB\-\-jumpyscrolling\fR.
 .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.
@@ -159,31 +182,52 @@ 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 \-Z ", " \-\-zap
+Let an unmodified Backspace or Delete erase the marked region
+(instead of a single character, and without affecting the cutbuffer).
+.TP
+.BR \-a ", " \-\-atblanks
+When doing soft line wrapping, wrap lines at whitespace
+instead of always at the edge of the screen.
+.TP
+.BR \-b ", " \-\-breaklonglines
+Automatically hard-wrap the current line when it becomes overlong.
+(This option is the opposite of \fB\-w\fR (\fB\-\-nowrap\fR) --
+the last one given takes effect.)
+.TP
 .BR \-c ", " \-\-constantshow
-Constantly show the cursor position on the statusbar.
-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
-work properly.  You should only need to use this option if Backspace
-acts like Delete on your system.
+Interpret the Delete and Backspace keys differently so that both Backspace
+and Delete work properly.  You should only use this option when on your
+system either Backspace acts like Delete or Delete acts like Backspace.
+.TP
+.BR \-e ", " \-\-emptyline
+Do not use the line below the title bar, leaving it entirely blank.
 .TP
 .BR \-g ", " \-\-showcursor
-Make the cursor visible in the file browser, putting it on the
-highlighted item.  Useful for braille users.
+Make the cursor visible in the file browser (putting it on the
+highlighted item) and in the help viewer.  Useful for braille users
+and people with poor vision.
 .TP
 .BR \-h ", " \-\-help
 Show a summary of the available command-line options and exit.
 .TP
 .BR \-i ", " \-\-autoindent
-Indent new lines to the previous line's indentation.  Useful when
-editing source code.
+Automatically indent a newly created line to the same number of tabs
+and/or spaces as the previous line (or as the next line if the previous
+line is the beginning of a paragraph).
 .TP
-.BR \-k ", " \-\-cut
+.BR \-j ", " \-\-jumpyscrolling
+Scroll the buffer contents per half-screen instead of per line.
+.TP
+.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
@@ -204,7 +248,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
@@ -212,18 +256,14 @@ similar to a chroot.
 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.
+.BR \-r\ \fInumber ", " \-\-fill= \fInumber
+Set the target width for justifying and automatic hard-wrapping at this
+\fInumber\fR of columns.  If the value is 0 or less, wrapping will occur
+at the width of the screen minus \fInumber\fR columns, allowing the wrap
+point to vary along with the width of the screen if the screen is resized.
+The default value is \-8.
 .TP
-.BR \-r\ \fInumber\fR ", " \-\-fill= \fInumber
-Hard-wrap lines at column \fInumber\fP.  If this value is 0 or less, wrapping
-will occur at the width of the screen less \fInumber\fP columns, allowing
-the wrap point to vary along with the width of the screen if the screen
-is resized.  The default value is \-8.  This option conflicts with
-\fB\-w\fR -- the last one given takes effect.
-.TP
-.BR \-s\ \fIprogram\fR ", " \-\-speller= \fIprogram
+.BR \-s\ \fIprogram ", " \-\-speller= \fIprogram
 Use this alternative spell checker command.
 .TP
 .BR \-t ", " \-\-tempfile
@@ -236,14 +276,21 @@ default behavior of saving a file in the format that it had.
 .TP
 .BR \-v ", " \-\-view
 Just view the file and disallow editing: read-only mode.
+This mode allows the user to open also other files for viewing,
+unless \fB\-\-restricted\fR is given too.
 .TP
 .BR \-w ", " \-\-nowrap
-Disable the hard-wrapping of long lines.  This option conflicts with
-\fB\-r\fR -- the last one given takes effect.
+Do not automatically hard-wrap the current line when it becomes overlong.
+This is the default.  (This option is the opposite of \fB\-b\fR
+(\fB\-\-breaklonglines\fR) -- the last one given takes effect.)
+
 .TP
 .BR \-x ", " \-\-nohelp
 Don't show the two help lines at the bottom of the screen.
 .TP
+.BR \-y ", " \-\-afterends
+Make Ctrl+Right stop at word ends instead of beginnings.
+.TP
 .BR \-z ", " \-\-suspend
 Enable the suspend ability.
 .TP
@@ -254,22 +301,20 @@ continuing it over multiple screen lines.  Since
 \&'$' normally refers to a variable in the Unix shell, you should specify
 this option last when using other options (e.g.\& 'nano \-wS$') or pass it
 separately (e.g.\& 'nano \-wS \-$').
-.TP
-.BR \-a ", " \-b ", " \-e ", " \-f ", " \-j
-Ignored, for compatibility with Pico.
 
 .SH TOGGLES
 Several of the above options can be switched on and off also while
 \fBnano\fR is running.  For example, \fBM\-L\fR toggles the
-hard-wrapping of long lines, \fBM\-$\fR toggles soft-wrapping,
-\fBM\-#\fR toggles line numbers, \fBM\-M\fR toggles the mouse,
+hard-wrapping of long lines, \fBM\-S\fR toggles soft-wrapping,
+\fBM\-N\fR toggles line numbers, \fBM\-M\fR toggles the mouse,
 \fBM\-I\fR auto-indentation, and \fBM\-X\fR the help lines.
 See at the end of the \fB^G\fR help text for a complete list.
 
-.SH INITIALIZATION FILE
-\fBnano\fP will read initialization files in the following order:
-the system's \fBnanorc\fP (if it exists), and then the user's
-\fB~/.nanorc\fP (if it exists).  Please see
+.SH FILES
+\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 \fI~/.nanorc\fR or \fI$XDG_CONFIG_HOME/nano/nanorc\fR
+or \fI~/.config/nano/nanorc\fR, whichever is encountered first.  See
 .BR nanorc (5)
 for more information on the possible contents of those files.
 
@@ -289,25 +334,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)
-are not yet covered by the general undo system.  So after a justification
-that is not immediately undone, or after any reindentation, earlier edits
-cannot be undone any more.  The workaround is, of course, to exit without
-saving.
+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.
+.IR https://savannah.gnu.org/bugs/?group=nano .
+.sp
+When nano crashes, it will save any modified buffers to emergency .save files.
+If you are able to reproduce the crash and you want to get a backtrace, define
+the environment variable \fBNANO_NOCATCH\fR.
 
 .SH HOMEPAGE
-\fIhttps://nano-editor.org/\fR
+.I https://nano\-editor.org/
 
 .SH SEE ALSO
 .BR nanorc (5)
-.PP
+.sp
 \fI/usr/share/doc/nano/\fP (or equivalent on your system)
-
-.SH AUTHOR
-Chris Allegretta and others (see the files \fIAUTHORS\fR and
-\fITHANKS\fP for details).  This manual page was originally written by
-Jordi Mallach for the Debian system (but may be used by others).

doc/nanorc.5

@@ -1,4 +1,4 @@
-.\" Copyright (C) 2003-2011, 2013-2017 Free Software Foundation, Inc.
+.\" Copyright (C) 2003-2011, 2013-2019 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:
@@ -7,27 +7,36 @@
 .\"   Foundation, version 3 or (at your option) any later version.  You
 .\"   should have received a copy of the GNU General Public License
 .\"   along with this program.  If not, see
-.\"   <http://www.gnu.org/licenses/>.
+.\"   <https://www.gnu.org/licenses/>.
 .\"
 .\" * The GNU Free Documentation License, as published by the Free
 .\"   Software Foundation, version 1.2 or (at your option) any later
 .\"   version, with no Invariant Sections, no Front-Cover Texts, and no
 .\"   Back-Cover Texts.  You should have received a copy of the GNU Free
 .\"   Documentation License along with this program.  If not, see
-.\"   <http://www.gnu.org/licenses/>.
+.\"   <https://www.gnu.org/licenses/>.
 .\"
-.TH NANORC 5 "version 2.8.3" "May 2017"
-.\" Please adjust this date whenever revising the manpage.
+.TH NANORC 5 "version 4.3" "June 2019"
 
 .SH NAME
 nanorc \- GNU nano's configuration file
 
+.SH NOTICE
+Starting with version 4.0, \fBnano\fR no longer hard-wraps an overlong
+line by default.  It further uses smooth scrolling by default, and by
+default includes the line below the title bar into the editing area.
+.sp
+If you want the old, Pico behavior back, you can use \fBset breaklonglines\fR,
+\fBset jumpyscrolling\fR, and \fBset emptyline\fR.
+
 .SH DESCRIPTION
 The \fInanorc\fP file contains the default settings for \fBnano\fP, a
 small and friendly editor.  The file should be in Unix format, not in
 DOS or Mac format.  During startup, \fBnano\fP will first read the
-system-wide settings, from \fB/etc/nanorc\fP (the exact path might be
-different), and then the user-specific settings, from \fB~/.nanorc\fP.
+system-wide settings, from \fI/etc/nanorc\fP (the exact path might be
+different on your system), and then the user-specific settings, either
+from \fI~/.nanorc\fR or from \fI$XDG_CONFIG_HOME/nano/nanorc\fR
+or from \fI~/.config/nano/nanorc\fR, whichever is encountered first.
 
 .SH OPTIONS
 The configuration file accepts a series of \fBset\fP and \fBunset\fP
@@ -35,30 +44,36 @@ commands, which can be used to configure nano on startup without using
 command-line options.  Additionally, there are some commands to define
 syntax highlighting and to rebind keys -- see the two separate sections
 on those.  \fBnano\fP reads one command per line.
-.PP
+.sp
 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.
-Quotes inside these string parameters don't have to be escaped with
-backslashes.  The last double quote in the string will be treated as its
-end.  For example, for the \fBbrackets\fP option, "\fB"')>]}\fP" will
-match \fB"\fP, \fB'\fP, \fB)\fP, \fB>\fP, \fB]\fP, and \fB}\fP.
-.PP
+.sp
+Quotes inside the \fIcharacters\fR  parameters below should not be escaped.
+The last double quote on the line will be seen as the closing quote.
+.sp
 The supported commands and arguments are:
 
 .TP 3
+.B set afterends
+Make Ctrl+Right stop at word ends instead of beginnings.
+.TP
 .B set allow_insecure_backup
 When backing up files, allow the backup to succeed even if its permissions
 can't be (re)set due to special OS considerations.  You should
 NOT enable this option unless you are sure you need it.
 .TP
+.B set 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.
+Automatically indent a newly created line to the same number of tabs
+and/or spaces as the previous line (or as the next line if the previous
+line is the beginning of a paragraph).
 .TP
 .B set backup
 When saving a file, create a backup file by adding a tilde (\fB~\fP) to
@@ -66,38 +81,48 @@ 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.
-.TP
 .B set boldtext
-Use bold instead of reverse video for the titlebar, statusbar, key combos,
-line numbers, and selected text.  This can be overridden for the first four
-by setting the options \fBtitlecolor\fP, \fBstatuscolor\fP, \fBkeycolor\fP,
-and \fBnumbercolor\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"
+.BI "set brackets """ characters """
 Set the characters treated as closing brackets when justifying
 paragraphs.  This may not include blank characters.  Only closing
-punctuation (see \fBpunct\fP), optionally followed by the specified
+punctuation (see \fBset punct\fP), optionally followed by the specified
 closing brackets, can end sentences.  The default value is "\fB"')>]}\fP".
 .TP
+.B set breaklonglines
+Automatically hard-wrap the current line when it becomes overlong.
+.TP
 .B set casesensitive
 Do case-sensitive searches by default.
 .TP
 .B set constantshow
 Constantly display the cursor position in the status bar.
-(The old form of this option, '\fBset const\fR', is deprecated.)
+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.
+.TP
+.B set emptyline
+Do not use the line below the title bar, leaving it entirely blank.
+.TP
+.B set errorcolor \fIfgcolor\fR,\fIbgcolor\fR
+Use this color combination for the status bar when an error message is displayed.
+The default value is \fBbrightwhite,red\fR.
+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.
+Set the target width for justifying and automatic hard-wrapping at this
+\fInumber\fR of columns.  If the value is 0 or less, wrapping will occur
+at the width of the screen minus \fInumber\fR columns, allowing the wrap
+point to vary along with the width of the screen if the screen is resized.
 The default value is \fB\-8\fR.
 .TP
 .B set functioncolor \fIfgcolor\fR,\fIbgcolor\fR
@@ -105,12 +130,16 @@ Specify the color combination to use for the function descriptions
 in the two help lines at the bottom of the screen.
 See \fBset titlecolor\fR for more details.
 .TP
-.B set historylog
-Enable the use of \fB~/.nano/search_history\fP for saving and reading
-search/replace strings.
+.B set guidestripe \fInumber
+Draw a vertical stripe at the given column, to help judge the width of the
+text.  (The color of the stripe can be changed with \fBset stripecolor\fR.)
 .TP
-.B set justifytrim
-When justifying text, trailing whitespace will automatically be removed.
+.B set historylog
+Save the last hundred search strings and replacement strings and
+executed commands, so they can be easily reused in later sessions.
+.TP
+.B set jumpyscrolling
+Scroll the buffer contents per half-screen instead of per line.
 .TP
 .B set keycolor \fIfgcolor\fR,\fIbgcolor\fR
 Specify the color combination to use for the shortcut key combos
@@ -123,14 +152,15 @@ Display line numbers to the left of the text area.
 .B set locking
 Enable vim-style lock-files for when editing files.
 .TP
-.B set matchbrackets "\fIstring\fP"
+.BI "set matchbrackets """ characters """
 Set the opening and closing brackets that can be found by bracket
 searches.  This may not include blank characters.  The opening set must
 come before the closing set, and the two sets must be in the same order.
 The default value is "\fB(<[{)>]}\fP".
 .TP
 .B set morespace
-Use the blank line below the titlebar as extra editing space.
+Deprecated option since it has become the default setting.
+When needed, use \fBunset emptyline\fR instead.
 .TP
 .B set mouse
 Enable mouse support, if available for your system.  When enabled, mouse
@@ -149,14 +179,16 @@ Don't convert files from DOS/Mac format.
 Don't display the two help lines at the bottom of the screen.
 .TP
 .B set nonewlines
-Don't automatically add a newline to the ends of files.
+Don't automatically add a newline when a text does not end with one.
+(This can cause you to save non-POSIX text 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.
+Deprecated option since it has become the default setting.
+When needed, use \fBunset breaklonglines\fR instead.
 .TP
 .B set numbercolor \fIfgcolor\fR,\fIbgcolor\fR
 Specify the color combination to use for line numbers.
@@ -171,46 +203,45 @@ 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).
 .TP
-.B set punct "\fIstring\fP"
+.BI "set punct """ characters """
 Set the characters treated as closing punctuation when justifying
 paragraphs.  This may not include blank characters.  Only the
 specfified closing punctuation, optionally followed by closing brackets
 (see \fBbrackets\fP), can end sentences.  The default value is "\fB!.?\fP".
 .TP
 .B set quickblank
-Do quick statusbar blanking.  Statusbar messages will disappear after 1
-keystroke instead of 25.
+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.
+.BI "set quotestr """ regex """
+Set the regular expression for matching the quoting part of a line.
+The default value is "\fB^([\ \\t]*([!#%:;>|}]|//))+\fP".
+(Note that \fB\\t\fR stands for an actual Tab character.)
+This makes it possible to rejustify blocks of quoted text when composing
+email, and to rewrap blocks of line comments when writing source code.
 .TP
-.B set quotestr "\fIstring\fP"
-The email-quote string, used to justify email-quoted paragraphs.  This
-is an extended regular expression if your system supports them,
-otherwise a literal string.  The default value is
-"\fB^([\ \\t]*[#:>\\|}])+\fP" if you have extended regular expression
-support, and "\fB>\ \fP" otherwise.  Note that '\\t' stands for a literal
-Tab character.
+.B set rawsequences
+Interpret escape sequences directly (instead of asking \fBncurses\fR to
+translate them).  If you need this option to get your keyboard to work
+properly, please report a bug.  Using this option disables \fBnano\fR's
+mouse support.
 .TP
 .B set rebinddelete
-Interpret the Delete key differently so that both Backspace and Delete
-work properly.  You should only need to use this option if Backspace
-acts like Delete on your system.
-.TP
-.B set rebindkeypad
-Interpret the numeric keypad keys so that they all work properly.  You
-should only need to use this option if they don't, as mouse support
-won't work properly with this option enabled.
+Interpret the Delete and Backspace keys differently so that both Backspace
+and Delete work properly.  You should only use this option when on your
+system either Backspace acts like Delete or Delete acts like Backspace.
 .TP
 .B set regexp
-Do extended regular expression searches by default.
+Do regular-expression searches by default.
+Regular expressions in \fBnano\fR are of the extended type (ERE).
+.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
@@ -224,17 +255,22 @@ already at that position, it will jump to the true beginning of the
 line.
 .TP
 .B set smooth
-Use smooth scrolling by default.
+Deprecated option since it has become the default setting.
+When needed, use \fBunset jumpyscrolling\fR instead.
 .TP
 .B set softwrap
 Enable soft line wrapping for easier viewing of very long lines.
 .TP
-.B set speller "\fIspellprog\fP"
-Use spelling checker \fIspellprog\fP instead of the built-in one, which
-calls \fIspell\fP.
+.B set speller "\fIprogram\fP"
+Use the given \fIprogram\fR to do spell checking and correcting,
+instead of the built-in corrector that calls \fBspell\fR.
 .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 stripecolor \fIfgcolor\fR,\fIbgcolor\fR
+Specify the color combination to use for the vertical guiding stripe.
 See \fBset titlecolor\fR for more details.
 .TP
 .B set suspend
@@ -251,32 +287,45 @@ 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.
 (This option has no effect when you also use \fBset noconvert\fR.)
 .TP
 .B set view
-Disallow file modification.
+Disallow file modification: read-only mode.
+This mode allows the user to open also other files for viewing,
+unless \fB\-\-restricted\fR is given on the command line.
 .TP
-.B set whitespace "\fIstring\fP"
+.BI "set whitespace """ characters """
 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
 characters as parts of words.
 .TP
-.B set wordchars \fIstring\fP
+.BI "set wordchars """ characters """
 Specify which other characters (besides the normal alphanumeric ones)
 should be considered as parts of words.  This overrides the option
 \fBwordbounds\fR.
+.TP
+.B set zap
+Let an unmodified Backspace or Delete erase the marked region
+(instead of a single character, and without affecting the cutbuffer).
 
 .SH SYNTAX HIGHLIGHTING
 Coloring the different syntactic elements of a file
@@ -286,69 +335,84 @@ 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
+All regular expressions in \fBnano\fR are extended regular expressions (ERE).
+This means that \fB.\fR, \fB?\fR, \fB*\fR, \fB+\fR, \fB^\fR, \fB$\fR, and
+several other characters are special.
+The period \fB.\fR matches any single character,
+\fB?\fR means the preceding item is optional,
+\fB*\fR means the preceding item may be matched zero or more times,
+\fB+\fR means the preceding item must be matched one or more times,
+\fB^\fR matches the beginning of a line, and \fB$\fR the end,
+\fB\\<\fR matches the start of a word, and \fB\\>\fR the end,
+and \fB\\s\fR matches a blank.
+It also means that lookahead and lookbehind are not possible.
+A complete explanation can be found in the manual page of GNU grep:
+\fBman grep\fR.
+.sp
+For each kind of file a separate syntax can be defined
 via the following commands:
 .TP
-.BR syntax " ""\fIname\fR"" [""\fIfileregex\fR"" ...]"
-Defines a syntax named \fIname\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
-\fIname\fP syntax until a new \fBsyntax\fR command is encountered.
+.BI syntax " name \fR[" """" fileregex """ " \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
+.BI "header """ regex """ \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
+.BI "magic """ regex """ \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 buffer.
 .TP
-.BI formatter " program " \fR[ "arg " \fR...]
-Use the given \fIprogram\fR to automatically reformat text.
-Useful in certain programming languages (e.g. Go).
-.TP
-.BR header " \fIregex\fR " ...
-Add one or more regexes which will
-be compared against the very first line of the file to be edited,
-to determine whether this syntax should be used for that file.
-.TP
-.BR magic " \fIregex\fR " ...
-Add one or more regexes which
-will be compared against the result of querying the \fBmagic\fP
-database about the file to be edited, to determine whether this
-syntax should be used for that file.  This
-functionality only works when \fBlibmagic\fP is installed on the
-system and will be silently ignored otherwise.
-.TP
-.BI comment " string"
-Use the given string for commenting and uncommenting lines.  A vertical bar or
-pipe character (|) designates bracket-style comments; for example, "/*|*/" for
+.BI "comment """ string """
+Use the given \fIstring\fR 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""" ...
+.BI "color " fgcolor , bgcolor " """ regex """ " \fR...
 Display all pieces of text that match
 the extended regular expression \fIregex\fP with foreground color
 \fIfgcolor\fP and background color \fIbgcolor\fP, at least one of which
-must be specified.  Valid colors for foreground and background
-are: white, black, red, blue, green, yellow, magenta, and cyan.  You may
-use the prefix "bright" to get a stronger color highlight for the
+must be specified.  Valid names for foreground and background colors are:
+.BR white ", " black ", " blue ", " green ", " red ", "
+.BR cyan ", " yellow ", " magenta ", and " normal
+-- where \fBnormal\fR means the default foreground or background color.
+You may use the prefix \fBbright\fR to get a stronger color highlight for the
 foreground.  If your terminal supports transparency, not specifying a
 \fIbgcolor\fP tells \fBnano\fP to attempt to use a transparent
 background.
 .TP
-.B icolor \fIfgcolor\fR,\fIbgcolor\fR """\fIregex\fR""" ...
+.BI "icolor " fgcolor , bgcolor " """ regex """ " \fR...
 Same as above, except that the matching is case insensitive.
 .TP
-.BR color " \fIfgcolor\fR,\fIbgcolor\fR " start= """\fIfromrx\fR"" " end= """\fItorx\fR""
+.BI "color " fgcolor , bgcolor " start=""" fromrx """ end=""" torx """
 Display all pieces of text whose start matches extended regular expression
 \fIfromrx\fP and whose end matches extended regular expression \fItorx\fP with
 foreground color \fIfgcolor\fP and background color \fIbgcolor\fP,
@@ -357,49 +421,79 @@ 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= """\fIfromrx\fR"" " end= """\fItorx\fR""
+.BI "icolor " fgcolor , bgcolor " start=""" fromrx """ end=""" torx """
 Same as above, except that the matching is case insensitive.
 .TP
-.BR include " ""\fIsyntaxfile\fR"""
+.BI "include """ syntaxfile """
 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 " name directive " \fR[ "arg " \fR...]
-Extend the syntax previously defined as \fIname\fP to include
-new information.  This allows adding 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, or \fBlinter\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).
+
+.P
+Note: the \fBformatter\fR command has been removed.  It was superseded by
+a more general mechanism: the filtering of buffer or marked text through
+an external command.  Such filtering is done by typing \fB^R^X\fR and then
+preceding your formatter command with the pipe symbol (\fB|\fR).  It has
+the added advantage that the operation can be undone.
+.sp
+If you use such a formatting command regularly, you could assign the relevant
+series of keystrokes to a single key in your nanorc:
+.sp
+.RS
+.B "bind  M\-F  \(dq^R^X|yourformatcommand^M\(dq  main"
+.RE
+.sp
+(Note that the \fB^R\fR, \fB^X\fR, and \fB^M\fR are each a single, literal
+control character.  You can enter them by preceding each with \fBM\-V\fR.)
 
 .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:
 .RS 3
 .TP 3
 .B ^
-followed by an alpha character or the word "Space".
-Example: ^C
+followed by a Latin letter, by one of several ASCII characters
+(@, ], \\, ^, or _), or by the word "Space".
+Example: ^C.
 .TP
-.B M-
-followed by a printable character or the word "Space".
-Example: M-C
+.B M\-
+followed by any ASCII character except [, or by the word "Space".
+Example: M\-C.
 .TP
 .B F
 followed by a numeric value from 1 to 16.
-Example: F10
+Example: F10.
+.TP
+the word "Ins" or the word "Del".
 .RE
 
 .TP
@@ -419,25 +513,25 @@ 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 searchagain
-Repeats the last search command without prompting.
-(The form 'research' is deprecated.)
+.B wherewas
+Starts a backward search for text in the current buffer -- or for filenames
+matching a string in the current list in the file browser.
 .TP
 .B findprevious
-As \fBsearchagain\fR, but always in the backward direction.
+Searches the next occurrence in the backward direction.
 .TP
 .B findnext
-As \fBsearchagain\fR, but always in the forward direction.
+Searches the next occurrence in the forward direction.
 .TP
 .B replace
 Interactively replaces text within the current buffer.
@@ -445,41 +539,52 @@ Interactively replaces text within the current buffer.
 .B cut
 Cuts and stores the current line (or the marked region).
 .TP
-.B copytext
+.B copy
 Copies the current line (or the marked region) without deleting it.
 .TP
-.B uncut
-Copies the currently stored text into the current buffer at the
+.B paste
+Pastes the currently stored text into the current buffer at the
 current cursor position.
 .TP
-.B mark
-Sets the mark at the current position, to start selecting text.
+.B zap
+Throws away the current line (or the marked region).
+(This function is bound by default to <Meta+Delete>.)
 .TP
-.B cutwordleft
-Cuts from the cursor position to the beginning of the preceding word.
+.B chopwordleft
+Deletes from the cursor position to the beginning of the preceding word.
+(This function is bound by default to <Shift+Ctrl+Delete>.  If your terminal
+produces \fB^H\fR for <Ctrl+Backspace>, you can make <Ctrl+Backspace> delete
+the word to the left of the cursor by rebinding ^H to this function.)
 .TP
-.B cutwordright
-Cuts from the cursor position to the beginning of the next word.
+.B chopwordright
+Deletes from the cursor position to the beginning of the next word.
+(This function is bound by default to <Ctrl+Delete>.)
 .TP
 .B cutrestoffile
 Cuts all text from the cursor position till the end of the buffer.
 .TP
+.B mark
+Sets the mark at the current position, to start selecting text.
+Or, when it is set, unsets the mark.
+.TP
 .B curpos
 Shows the current cursor position: the line, column, and character positions.
-(The form 'cursorpos' is deprecated.)
 .TP
 .B wordcount
 Counts the number of words, lines and characters in the current buffer.
 .TP
 .B speller
-Invokes a spell-checking program (or a linting program, if the current
-syntax highlighting defines one).
+Invokes a spell-checking program, either the default one, or the one
+defined by \fB\-\-speller\fR or \fBset speller\fR.
 .TP
 .B linter
-A synonym of \fBspeller\fR (for when the speller has not been configured).
+Invokes a syntax-checking program (if the active syntax defines one).
 .TP
 .B justify
-Justifies the current paragraph.
+Justifies the current paragraph.  A paragraph is a group of contiguous lines
+that, apart from possibly the first line, all have the same indentation.  The
+beginning of a paragraph is detected by either this lone line with a differing
+indentation or by a preceding blank line.
 .TP
 .B fulljustify
 Justifies the entire current buffer.
@@ -511,10 +616,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.
@@ -541,10 +648,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
@@ -557,9 +664,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.
@@ -585,6 +689,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
@@ -599,32 +710,41 @@ Suspends the editor (if the suspending function is enabled, see the
 "suspendenable" entry below).
 .TP
 .B casesens
-Toggles case sensitivity in searching (search/replace menus only).
+Toggles whether searching/replacing ignores or respects the case of
+the given characters.
 .TP
 .B regexp
-Toggles whether searching/replacing is based on literal strings or regular expressions.
-(The form 'regex' is deprecated.)
+Toggles whether searching/replacing uses literal strings or regular expressions.
 .TP
 .B backwards
 Toggles whether searching/replacing goes forward or backward.
 .TP
-.B prevhistory
-Shows the previous history entry in the prompt menus (e.g. search).
+.B older
+Retrieves the previous (earlier) entry at a prompt.
 .TP
-.B nexthistory
-Shows the next history entry in the prompt menus (e.g. search).
+.B newer
+Retrieves the next (later) entry at a prompt.
 .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.
 .TP
 .B flipexecute
 Toggles between inserting a file and executing a command.
 .TP
+.B flippipe
+When executing a command, toggles whether the current buffer (or marked
+region) is piped to the command.
+.TP
 .B flipnewbuffer
 Toggles between inserting into the current buffer and into a new
 empty buffer.
-(The form 'newbuffer' is deprecated.)
+.TP
+.B flipconvert
+When reading in a file, toggles between converting and not converting
+it from DOS/Mac format.  Converting is the default.
 .TP
 .B dosformat
 When writing a file, switches to writing a DOS format (CR/LF).
@@ -646,7 +766,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
@@ -662,18 +782,15 @@ Goes to the last file when using the file browser (reading or writing files).
 .B nohelp
 Toggles the presence of the two-line list of key bindings at the bottom of the screen.
 .TP
-.B constupdate
+.B constantshow
 Toggles the constant display of the current line, column, and character positions.
 .TP
-.B morespace
-Toggles the presence of the blank line which 'separates' the titlebar from the file text.
-.TP
-.B smoothscroll
-Toggles smooth scrolling (when moving around with the arrow keys).
-.TP
 .B softwrap
 Toggles the displaying of overlong lines on multiple screen lines.
 .TP
+.B linenumbers
+Toggles the display of line numbers in front of the text.
+.TP
 .B whitespacedisplay
 Toggles the showing of whitespace.
 .TP
@@ -684,9 +801,11 @@ Toggles syntax highlighting.
 Toggles the smartness of the Home key.
 .TP
 .B autoindent
-Toggles whether new lines will contain the same amount of whitespace as the preceding line.
+Toggles whether a newly created line will contain the same amount of leading
+whitespace as the preceding line -- or as the next line if the preceding line
+is the beginning of a paragraph.
 .TP
-.B cuttoend
+.B cutfromcursor
 Toggles whether cutting text will cut the whole line or just from the current cursor
 position to the end of the line.
 .TP
@@ -696,19 +815,9 @@ Toggles whether long lines will be hard-wrapped to the next line.
 .B tabstospaces
 Toggles whether typed tabs will be converted to spaces.
 .TP
-.B backupfile
-Toggles whether a backup will be made of the file being edited.
-.TP
-.B multibuffer
-Toggles whether a file is inserted into the current buffer
-or read into a new buffer.
-.TP
 .B mouse
 Toggles mouse support.
 .TP
-.B noconvert
-Toggles automatic conversion of files from DOS/Mac format.
-.TP
 .B suspendenable
 Toggles whether the suspend sequence (normally ^Z) will suspend the editor window.
 .RE
@@ -728,7 +837,9 @@ 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 yesno
+The 'yesno' menu, where the Yes/No/All/Cancel question is asked.
 .TP
 .B gotoline
 The 'goto line (and column)' menu.
@@ -768,16 +879,11 @@ for \fBunbind\fR it means all menus where the specified \fIkey\fR exists.
 
 .SH FILES
 .TP
-.B /etc/nanorc
+.I /etc/nanorc
 System-wide configuration file.
 .TP
-.B ~/.nanorc
+.IR ~/.nanorc " or " $XDG_CONFIG_HOME/nano/nanorc " or " ~/.config/nano/nanorc
 Per-user configuration file.
 
 .SH SEE ALSO
 .BR nano (1)
-
-.SH AUTHOR
-Chris Allegretta and others (see the files \fIAUTHORS\fP and
-\fITHANKS\fP for details).  This manual page was originally written by
-Jordi Mallach for the Debian system (but may be used by others).

doc/rnano.1

@@ -1,4 +1,4 @@
-.\" Copyright (C) 2002, 2005, 2006, 2007, 2014 Free Software Foundation, Inc.
+.\" Copyright (C) 2002-2007, 2014-2019 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:
@@ -7,17 +7,16 @@
 .\"   Foundation, version 3 or (at your option) any later version.  You
 .\"   should have received a copy of the GNU General Public License
 .\"   along with this program.  If not, see
-.\"   <http://www.gnu.org/licenses/>.
+.\"   <https://www.gnu.org/licenses/>.
 .\"
 .\" * The GNU Free Documentation License, as published by the Free
 .\"   Software Foundation, version 1.2 or (at your option) any later
 .\"   version, with no Invariant Sections, no Front-Cover Texts, and no
 .\"   Back-Cover Texts.  You should have received a copy of the GNU Free
 .\"   Documentation License along with this program.  If not, see
-.\"   <http://www.gnu.org/licenses/>.
+.\"   <https://www.gnu.org/licenses/>.
 .\"
-.TH RNANO 1 "version 2.8.3" "May 2017"
-.\" Please adjust this date whenever revising the manpage.
+.TH RNANO 1 "version 4.3" "June 2019"
 
 .SH NAME
 rnano \- a restricted nano
@@ -30,16 +29,14 @@ rnano \- a restricted nano
 \fBrnano\fR runs the \fBnano\fR editor in restricted mode.  This allows
 editing only the specified file or files, and doesn't allow the user
 access to the filesystem nor to a command shell.
-.PP
+.sp
 In restricted mode, \fBnano\fR will:
 .IP \[bu] 2
-not read any nanorc files;
-.IP \[bu]
 not allow suspending;
 .IP \[bu]
-not read nor write any file not specified on the command line;
+not allow saving the current buffer under a different name;
 .IP \[bu]
-not allow saving a file under a different name;
+not allow inserting another file or opening a new buffer;
 .IP \[bu]
 not allow appending or prepending to any file;
 .IP \[bu]
@@ -48,20 +45,16 @@ not make backup files nor do spell checking.
 .SH OPTIONS
 .TP
 .BR \-h ", " \-\-help
-Show a summary of command-line options and exit.
-.PP
-See the \fBnano\fP(1) manpage for all available options.
+Show the available command-line options and exit.
+.P
+For all existing options, see the \fBnano\fR(1) man page.
 
 .SH BUGS
-Please report bugs via \fIhttps://savannah.gnu.org/bugs/?group=nano\fR.
+Please report bugs via
+.IR https://savannah.gnu.org/bugs/?group=nano .
 
 .SH HOMEPAGE
-https://nano-editor.org/
+.I https://nano-editor.org/
 
 .SH SEE ALSO
 .BR nano (1)
-
-.SH AUTHOR
-Chris Allegretta and others (see the files \fIAUTHORS\fR and \fITHANKS\fR
-for details).  This manual page was originally written by Thijs Kinkhorst
-for the Debian system (but may be used by others).

doc/sample.nanorc.in

@@ -1,26 +1,27 @@
 ## Sample initialization file for GNU nano.
 ##
-## Please note that you must have configured nano with --enable-nanorc
-## for this file to be read!  Also note that this file should not be in
-## DOS or Mac format, and that characters specially interpreted by the
-## shell should not be escaped here.
+## This file should not be in DOS or Mac format, and characters
+## specially interpreted by the shell should not be escaped here.
 ##
 ## To make sure an option is disabled, use "unset <option>".
 ##
 ## For the options that take parameters, the default value is given.
 ## Other options are unset by default.
 ##
-## Quotes inside string parameters don't have to be escaped with
-## backslashes.  The last double quote in the string will be treated as
-## its end.  For example, for the "brackets" option, ""')>]}" will match
-## ", ', ), >, ], and }.
+## Inside string parameters, quotes should not be escaped.  The last
+## double quote on the line will be seen as the closing quote.
 
-## 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
+## Make the 'nextword' function (Ctrl+Right) stop at word ends
+## instead of at beginnings.
+# set afterends
 
-## Use auto-indentation.
+## 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
+
+## Automatically indent a newly created line to the same number of
+## tabs and/or spaces as the preceding line -- or as the next line
+## if the preceding line is the beginning of a paragraph.
 # set autoindent
 
 ## Back up files to the current filename plus a tilde.
@@ -29,45 +30,46 @@
 ## The directory to put unique backup files in.
 # set backupdir ""
 
-## Do backwards searches by default.
-# set backwards
-
 ## Use bold text instead of reverse video text.
 # set boldtext
 
-## The characters treated as closing brackets when justifying
-## paragraphs.  They cannot contain blank characters.  Only closing
-## punctuation, optionally followed by closing brackets, can end
-## sentences.
+## The characters treated as closing brackets when justifying paragraphs.
+## This may not include any blank characters.  Only closing punctuation,
+## optionally followed by these closing brackets, can end sentences.
 # set brackets ""')>]}"
 
+## Automatically hard-wrap the current line when it becomes overlong.
+# set breaklonglines
+
 ## 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
 
-## Set the line length for wrapping text and justifying paragraphs.
-## If the value is 0 or less, the wrapping point will be the screen
-## width less this number.
+## Do not use the line below the title bar, leaving it entirely blank.
+# set emptyline
+
+## Enable hard-wrapping and set the target width, both for automatic
+## line wrapping and for justifying paragraphs.  If the value is 0 or
+## less, the wrapping point will be the screen width minus this number.
 # set fill -8
 
 ## Remember the used search/replace strings for the next session.
 # set historylog
 
-## Make the justify command kill whitespace at the end of lines.
-# set justifytrim
+## Scroll the buffer contents per half-screen instead of per line.
+# set jumpyscrolling
 
 ## 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,9 +78,6 @@
 ## come before the latter set, and both must be in the same order.
 # set matchbrackets "(<[{)>]}"
 
-## Use the blank line below the titlebar as extra editing space.
-# set morespace
-
 ## Enable mouse support, if available for your system.  When enabled,
 ## mouse clicks can be used to place the cursor, set the mark (with a
 ## double click), and execute shortcuts.  The mouse will work in the X
@@ -95,16 +94,13 @@
 ## Don't display the helpful shortcut lists at the bottom of the screen.
 # set nohelp
 
+## Don't automatically add a newline when a file does not end with one.
+# set nonewlines
+
 ## 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
-
-## Don't wrap text at all.
-# set nowrap
-
 ## Set operating directory.  nano will not read or write files outside
 ## this directory and its subdirectories.  Also, the current directory
 ## is changed to here, so any files are inserted from this dir.  A blank
@@ -113,7 +109,6 @@
 
 ## Remember the cursor position in each file for the next editing session.
 # set positionlog
-## (The old form, 'poslog', is deprecated.)
 
 ## Preserve the XON and XOFF keys (^Q and ^S).
 # set preserve
@@ -124,29 +119,27 @@
 ## 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.
-## This is an extended regular expression if your system supports them,
-## otherwise a literal string.
-## If you have extended regular expression support, the default is:
-# set quotestr "^([ 	]*[#:>\|}])+"
-## Otherwise:
-# set quotestr "> "
+## The regular expression that matches quoting characters in email
+## or line-comment introducers in source code.  The default is:
+# set quotestr "^([ 	]*([!#%:;>|}]|//))+"
+
+## Try to work around a mismatching terminfo terminal description.
+# set rawsequences
 
 ## Fix Backspace/Delete confusion problem.
 # set rebinddelete
 
-## Fix numeric keypad key confusion problem.
-# set rebindkeypad
-
-## Do extended regular expression searches by default.
+## Do regular-expression searches by default.
+## Regular expressions are of the extended type (ERE).
 # set regexp
 
-## Put the cursor on the highlighted item in the file browser;
-## useful for people who use a braille display.
+## Put the cursor on the highlighted item in the file browser, and show
+## the cursor in the help viewer; useful for people who use a braille
+## display and people with poor vision.
 # set showcursor
 
 ## Make the Home key smarter.  When Home is pressed anywhere but at the
@@ -156,14 +149,11 @@
 ## beginning of the line.
 # set smarthome
 
-## Use smooth scrolling as the default.
-# set smooth
-
 ## Enable soft line wrapping (AKA full-line display).
 # set softwrap
 
 ## Use this spelling checker instead of the internal one.  This option
-## does not properly have a default value.
+## does not have a default value.
 # set speller "aspell -x -c"
 
 ## Allow nano to be suspended.
@@ -178,6 +168,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
 
@@ -198,17 +191,26 @@
 ## set, it overrides option 'set wordbounds'.
 # set wordchars "<_>."
 
+## Let an unmodified Backspace or Delete erase the marked region (instead
+## of a single character, and without affecting the cutbuffer).
+# set zap
 
-## 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 statuscolor brightwhite,green
+# set errorcolor brightwhite,red
+# set selectedcolor brightwhite,magenta
+# set stripecolor ,yellow
 # set numbercolor cyan
 # set keycolor cyan
 # set functioncolor green
 ## In root's .nanorc you might want to use:
-# set titlecolor brightwhite,red
-# set statuscolor brightwhite,red
+# set titlecolor brightwhite,magenta
+# set statuscolor brightwhite,magenta
+# set errorcolor brightwhite,red
+# set selectedcolor brightwhite,cyan
+# set stripecolor ,yellow
 # set numbercolor magenta
 # set keycolor brightmagenta
 # set functioncolor magenta
@@ -232,9 +234,11 @@
 ## "color" will do case-sensitive matches, while "icolor" will do
 ## case-insensitive matches.
 ##
-## Valid colors: white, black, red, blue, green, yellow, magenta, cyan.
-## For foreground colors, you may use the prefix "bright" to get a
-## stronger highlight.
+## Valid color names ares: white, black, normal, red, blue, green,
+## yellow, magenta, cyan.  For foreground colors, you may use the
+## prefix "bright" to get a stronger highlight.
+##
+## All regexes (regular expressions) are of the extended type (ERE).
 ##
 ## To use multi-line regexes, use the start="regex" end="regex"
 ## [start="regex" end="regex"...] format.
@@ -243,8 +247,6 @@
 ## color will use a transparent color.  If you don't want this, be sure
 ## to set the background color to black or white.
 ##
-## All regexes should be extended regular expressions.
-##
 ## If you wish, you may put your syntax definitions in separate files.
 ## You can make use of such files as follows:
 ##
@@ -254,21 +256,51 @@
 ## ".nanorc" extension) should be the same as the "short description"
 ## name inside that file.  These names are kept fairly short to make
 ## them easier to remember and faster to type using nano's -Y option.
-##
+
 ## To include all existing syntax definitions, you can do:
 # include "@PKGDATADIR@/*.nanorc"
 
 
 ## Key bindings.
 ## See nanorc(5) (section REBINDING KEYS) for more details on this.
-##
-## The following five functions are not bound to any key by default.
-## You may wish to choose different keys than the ones suggested here.
-# bind ^S savefile main
-# bind M-Q findprevious main
-# bind M-W findnext main
-# bind M-B cutwordleft main
-# bind M-N cutwordright main
 
-## Set this if your Backspace key sends Del most of the time.
-# bind Del backspace all
+## The <Ctrl+Delete> keystroke deletes the word to the right of the cursor.
+## On some terminals the <Ctrl+Backspace> keystroke produces ^H, which is
+## the ASCII character for backspace, so it is bound by default to the
+## backspace function.  The <Backspace> key itself produces a different
+## keycode, which is hard-bound to the backspace function.  So, if you
+## normally use <Backspace> for backspacing and not ^H, you can make
+## <Ctrl+Backspace> delete the word to the left of the cursor with:
+# bind ^H chopwordleft main
+
+## If you would like nano to have keybindings that are more "usual",
+## such as ^O for Open, ^F for Find, ^H for Help, and ^Q for Quit,
+## then uncomment these:
+#bind ^Q exit all
+#bind ^H help all
+#bind ^H exit help
+#bind ^F whereis all
+#bind ^G findnext all
+#bind ^B wherewas all
+#bind ^D findprevious all
+#bind ^R replace main
+#bind ^W writeout main
+#bind ^O insert main
+#unbind ^V all
+#unbind ^Y all
+#bind M-X flipnewbuffer all
+#bind ^X cut all
+#bind ^C copy all
+#bind ^V paste all
+#bind ^P curpos main
+#bind ^T gotoline main
+#bind ^T gotodir browser
+#bind ^Y speller main
+#unbind ^K all
+#unbind ^U all
+#bind M-R redo main
+#bind ^U undo main
+#bind ^E redo main
+#unbind M-J main
+#unbind M-T main
+#set multibuffer

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

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 ko ms nb nl nn pl pt pt_BR ro ru sl sr sv tr uk vi zh_CN zh_TW

po/Makevars

@@ -11,15 +11,12 @@ top_builddir = ..
 XGETTEXT_OPTIONS = --keyword=_ --keyword=N_ --keyword=P_:1,2
 
 # This is the copyright holder that gets inserted into the header of the
-# $(DOMAIN).pot file.  Set this to the copyright holder of the surrounding
-# package.  (Note that the msgstr strings, extracted from the package's
-# sources, belong to the copyright holder of the package.)  Translators are
-# expected to transfer the copyright for their translations to this person
-# or entity, or to disclaim their copyright.  The empty string stands for
-# the public domain; in this case the translators are expected to disclaim
-# their copyright.
+# $(DOMAIN).pot file.  Translators are expected to disclaim their copyright.
 COPYRIGHT_HOLDER = Free Software Foundation, Inc.
 
 # This is the list of locale categories, beyond LC_MESSAGES, for which the
 # message catalogs shall be used.  It is usually empty.
 EXTRA_LOCALE_CATEGORIES =
+
+# Don't do fuzzy matching when merging the PO files against the POT file.
+MSGMERGE_OPTIONS = --no-fuzzy-matching

po/POTFILES.in

@@ -2,9 +2,11 @@
 
 src/browser.c
 src/color.c
+src/cut.c
 src/files.c
 src/global.c
 src/help.c
+src/history.c
 src/nano.c
 src/prompt.c
 src/rcfile.c
@@ -12,3 +14,6 @@ src/search.c
 src/text.c
 src/utils.c
 src/winio.c
+
+lib/getopt.c
+lib/regcomp.c

po/update_linguas.sh

@@ -1,10 +1,13 @@
 #!/bin/sh
 
 # Let this be executed in the po/ subdir.
-cd "$(dirname "$0")" || exit
+cd "$(dirname "$0")"  ||  exit 1
 
 echo "Updating translations via TP"
-rsync -Lrtvz  translationproject.org::tp/latest/nano/ .
+# First remove existing PO files, as wget will not overwrite them.
+rm *.po
+wget --recursive --level=1 --accept=po --no-directories --no-verbose \
+       https://translationproject.org/latest/nano/  ||  exit 2
 
 # Are there now PO files that are not in git yet?
 NEWSTUFF=$(git status --porcelain *.po | grep "^??")
@@ -18,8 +21,11 @@ fi
 echo "Regenerating POT file and remerging and recompiling PO files..."
 make update-po
 
-# Ensure that the PO files are newer than the POT.
-touch *.po
+echo "Removing the dead weight of obsolete and fuzzy translations..."
+for pofile in *.po; do
+	msgattrib --no-obsolete --no-fuzzy $pofile >trimmed.po || exit 4
+	mv trimmed.po $pofile || exit 4
+done
 
 # If needed, fix a problem in the Makefile template.
 grep -q '^datarootdir' Makefile.in.in || \

roll-a-release.sh

@@ -0,0 +1,29 @@
+#!/bin/bash
+
+VERSION="4.3"
+
+./configure -C --enable-tiny &&  make &&  ./configure -C &&
+
+echo "Running autogen..." &&  ./autogen.sh &&
+rm -v -f m4/*.m4~ *.asc *.sig *.gz *.xz &&
+
+echo "Rebuilding..." &&  make &&
+po/update_linguas.sh &&
+
+make distcheck &&  make dist-xz &&
+
+git add po/*.po po/nano.pot &&
+git commit -m "$(git log -1 --grep 'po: up' | grep o: | sed 's/^    //')" &&
+
+gpg -a -b nano-$VERSION.tar.gz &&
+gpg -a -b nano-$VERSION.tar.xz &&
+gpg --verify nano-$VERSION.tar.gz.asc &&
+gpg --verify nano-$VERSION.tar.xz.asc &&
+
+git tag -u A0ACE884 -a v$VERSION -m "the nano $VERSION release" &&
+
+for file in nano-$VERSION.tar.*z*; do scp $file bens@wh0rd.org:$file; done &&
+
+gnupload --to ftp.gnu.org:nano  nano-$VERSION.tar.*z &&
+
+echo "Tarballs have been rolled and uploaded."

src/Makefile.am

@@ -28,6 +28,7 @@ nano_SOURCES =	browser.c \
 		files.c \
 		global.c \
 		help.c \
+		history.c \
 		move.c \
 		nano.c \
 		nano.h \
@@ -37,9 +38,10 @@ nano_SOURCES =	browser.c \
 		search.c \
 		text.c \
 		utils.c \
-		winio.c 
+		winio.c
 
-nano_LDADD = @LIBINTL@ $(top_builddir)/lib/libgnu.a $(LIB_CLOCK_GETTIME)
+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

src/color.c

@@ -1,8 +1,8 @@
 /**************************************************************************
  *   color.c  --  This file is part of GNU nano.                          *
  *                                                                        *
- *   Copyright (C) 2001-2011, 2013-2017 Free Software Foundation, Inc.    *
- *   Copyright (C) 2014, 2015, 2016, 2017 Benno Schulenberg               *
+ *   Copyright (C) 2001-2011, 2013-2019 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    *
@@ -21,421 +21,408 @@
 
 #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
 
-/* 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;
-
-    /* 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);
+/* 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 color pairs for nano's interface elements. */
-    for (i = 0; i < NUMBER_OF_ELEMENTS; i++) {
-	bool bright = FALSE;
-
-	if (parse_color_names(specified_color_combo[i],
-			&foreground, &background, &bright)) {
-	    if (foreground == -1 && !using_defaults)
-		foreground = COLOR_WHITE;
-	    if (background == -1 && !using_defaults)
-		background = COLOR_BLACK;
-	    init_pair(i + 1, foreground, background);
-	    interface_color_pair[i] =
-			COLOR_PAIR(i + 1) | (bright ? A_BOLD : A_NORMAL);
-	}
-	else {
-	    if (i != FUNCTION_TAG)
-		interface_color_pair[i] = hilite_attribute;
-	    else
-		interface_color_pair[i] = A_NORMAL;
-	}
-
-	free(specified_color_combo[i]);
-	specified_color_combo[i] = NULL;
-    }
-
-    /* For each syntax, go through its list of colors and assign each
-     * its pair number, giving identical color pairs the same number. */
-    for (sint = syntaxes; sint != NULL; sint = sint->next) {
-	colortype *ink;
+/* Assign pair numbers for the colors in the given syntax, giving identical
+ * color pairs the same number. */
+void set_syntax_colorpairs(syntaxtype *sint)
+{
 	int new_number = NUMBER_OF_ELEMENTS + 1;
+	colortype *ink;
 
 	for (ink = sint->color; ink != NULL; ink = ink->next) {
-	    const colortype *beforenow = sint->color;
+		const colortype *beforenow = sint->color;
 
-	    while (beforenow != ink && (beforenow->fg != ink->fg ||
-					beforenow->bg != ink->bg ||
-					beforenow->bright != ink->bright))
-		beforenow = beforenow->next;
+		while (beforenow != ink && (beforenow->fg != ink->fg ||
+									beforenow->bg != ink->bg))
+			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;
 	}
-    }
+}
+
+/* Initialize the colors for nano's interface, and assign pair numbers
+ * for the colors in each loaded syntax. */
+void set_colorpairs(void)
+{
+	syntaxtype *sint;
+	bool using_defaults = FALSE;
+	size_t i;
+
+	/* 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);
+#endif
+
+	/* Initialize the color pairs for nano's interface elements. */
+	for (i = 0; i < NUMBER_OF_ELEMENTS; i++) {
+		colortype *combo = color_combo[i];
+
+		if (combo != NULL) {
+			if (combo->fg == USE_THE_DEFAULT && !using_defaults)
+				combo->fg = COLOR_WHITE;
+			if (combo->bg == USE_THE_DEFAULT && !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->attributes;
+		} else {
+			if (i == FUNCTION_TAG)
+				interface_color_pair[i] = A_NORMAL;
+			else if (i == GUIDE_STRIPE)
+				interface_color_pair[i] = A_REVERSE;
+			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]);
+	}
+
+	/* For each loaded syntax, assign pair numbers to color combinations. */
+	for (sint = syntaxes; sint != NULL; sint = sint->next)
+		if (sint->filename == NULL)
+			set_syntax_colorpairs(sint);
 }
 
 /* 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 == USE_THE_DEFAULT && !using_defaults)
+			foreground = COLOR_WHITE;
 
-	if (background == -1 && !using_defaults)
-	    background = COLOR_BLACK;
+		if (background == USE_THE_DEFAULT && !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;
+	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, 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;
 
-    /* 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->filetop->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);
+	/* When the syntax isn't loaded yet, parse it and initialize its colors. */
+	if (sint != NULL && sint->filename != NULL) {
+		parse_one_include(sint->filename, sint);
+		set_syntax_colorpairs(sint);
 	}
-    }
+
+	openfile->syntax = sint;
+	openfile->colorstrings = (sint == NULL ? NULL : sint->color);
 }
 
 /* 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)
+void check_the_multis(linestruct *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)
+void alloc_multidata_if_needed(linestruct *fileptr)
 {
-    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 (int 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;
+	linestruct *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");
-#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->filetop; 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 = step_right(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 */

src/cut.c

@@ -1,9 +1,9 @@
 /**************************************************************************
  *   cut.c  --  This file is part of GNU nano.                            *
  *                                                                        *
- *   Copyright (C) 1999-2011, 2013-2017 Free Software Foundation, Inc.    *
+ *   Copyright (C) 1999-2011, 2013-2019 Free Software Foundation, Inc.    *
  *   Copyright (C) 2014 Mark Majeres                                      *
- *   Copyright (C) 2016 Benno Schulenberg                                 *
+ *   Copyright (C) 2016, 2018, 2019 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    *
@@ -23,193 +23,372 @@
 #include "proto.h"
 
 #include <string.h>
-#include <stdio.h>
 
-static bool keep_cutbuffer = FALSE;
-	/* Should we keep the contents of the cutbuffer? */
-
-/* Indicate that we should no longer keep the contents of the cutbuffer. */
-void cutbuffer_reset(void)
+/* Delete the character under the cursor. */
+void do_deletion(undo_type action)
 {
-    keep_cutbuffer = FALSE;
+#ifndef NANO_TINY
+	size_t old_amount = 0;
+#endif
+
+	openfile->placewewant = xplustabs();
+
+	/* When in the middle of a line, delete the current character. */
+	if (openfile->current->data[openfile->current_x] != '\0') {
+		int charlen = char_length(openfile->current->data + openfile->current_x);
+		size_t line_len = strlen(openfile->current->data + openfile->current_x);
+#ifndef NANO_TINY
+		/* If the type of action changed or the cursor moved to a different
+		 * line, create a new undo item, otherwise update the existing item. */
+		if (action != openfile->last_action ||
+					openfile->current->lineno != openfile->current_undo->lineno)
+			add_undo(action);
+		else
+			update_undo(action);
+
+		if (ISSET(SOFTWRAP))
+			old_amount = number_of_chunks_in(openfile->current);
+#endif
+		/* Move the remainder of the line "in", over the current character. */
+		charmove(&openfile->current->data[openfile->current_x],
+					&openfile->current->data[openfile->current_x + charlen],
+					line_len - charlen + 1);
+#ifndef NANO_TINY
+		/* Adjust the mark if it is after the cursor on the current line. */
+		if (openfile->mark == openfile->current &&
+								openfile->mark_x > openfile->current_x)
+			openfile->mark_x -= charlen;
+#endif
+	/* Otherwise, when not at end of buffer, join this line with the next. */
+	} else if (openfile->current != openfile->filebot) {
+		linestruct *joining = openfile->current->next;
+
+		/* If there is a magic line, and we're before it: don't eat it. */
+		if (joining == openfile->filebot && openfile->current_x != 0 &&
+				!ISSET(NO_NEWLINES)) {
+#ifndef NANO_TINY
+			if (action == BACK)
+				add_undo(BACK);
+#endif
+			return;
+		}
+
+#ifndef NANO_TINY
+		add_undo(action);
+#endif
+		/* Add the contents of the next line to those of the current one. */
+		openfile->current->data = charealloc(openfile->current->data,
+				strlen(openfile->current->data) + strlen(joining->data) + 1);
+		strcat(openfile->current->data, joining->data);
+
+#ifndef NANO_TINY
+		/* Adjust the mark if it was on the line that was "eaten". */
+		if (openfile->mark == joining) {
+			openfile->mark = openfile->current;
+			openfile->mark_x += openfile->current_x;
+		}
+#endif
+		unlink_node(joining);
+		renumber_from(openfile->current);
+
+		/* Two lines were joined, so we need to refresh the screen. */
+		refresh_needed = TRUE;
+	} else
+		/* We're at the end-of-file: nothing to do. */
+		return;
+
+	/* Adjust the file size, and remember it for a possible redo. */
+	openfile->totsize--;
+#ifndef NANO_TINY
+	openfile->current_undo->newsize = openfile->totsize;
+
+	/* If the number of screen rows that a softwrapped line occupies
+	 * has changed, we need a full refresh. */
+	if (ISSET(SOFTWRAP) && refresh_needed == FALSE &&
+				number_of_chunks_in(openfile->current) != old_amount)
+		refresh_needed = TRUE;
+#endif
+
+	set_modified();
 }
 
-/* Return the status of cutbuffer preservation. */
-inline bool keeping_cutbuffer(void)
+/* Delete the character under the cursor. */
+void do_delete(void)
 {
-    return keep_cutbuffer;
+#ifndef NANO_TINY
+	if (openfile->mark && ISSET(LET_THEM_ZAP))
+		zap_text();
+	else
+#endif
+	do_deletion(DEL);
 }
 
-/* If we aren't on the last line of the file, move all the text of the
- * current line, plus the newline at the end, into the cutbuffer.  If we
- * are, move all of the text of the current line into the cutbuffer.  In
- * both cases, set the current place we want to the beginning of the
- * current line. */
-void cut_line(void)
+/* Backspace over one character.  That is, move the cursor left one
+ * character, and then delete the character under the cursor. */
+void do_backspace(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;
+#ifndef NANO_TINY
+	if (openfile->mark && ISSET(LET_THEM_ZAP))
+		zap_text();
+	else
+#endif
+	if (openfile->current != openfile->filetop || openfile->current_x > 0) {
+		do_left();
+		do_deletion(BACK);
+	}
 }
 
 #ifndef NANO_TINY
-/* Move all currently marked text into the cutbuffer, and set the
- * current place we want to where the text used to start. */
-void cut_marked(bool *right_side_up)
+/* Delete text from the cursor until the first start of a word to
+ * the left, or to the right when forward is TRUE. */
+void chop_word(bool forward)
 {
-    filestruct *top, *bot;
-    size_t top_x, bot_x;
+	/* Remember the current cursor position. */
+	linestruct *is_current = openfile->current;
+	size_t is_current_x = openfile->current_x;
+	/* Remember where the cutbuffer is, then make it seem blank. */
+	linestruct *is_cutbuffer = cutbuffer;
 
-    mark_order((const filestruct **)&top, &top_x,
-		(const filestruct **)&bot, &bot_x, right_side_up);
+	cutbuffer = NULL;
 
-    extract_buffer(&cutbuffer, &cutbottom, top, top_x, bot, bot_x);
-    openfile->placewewant = xplustabs();
+	/* Move the cursor to a word start, to the left or to the right.
+	 * If that word is on another line and the cursor was not already
+	 * on the edge of the original line, then put the cursor on that
+	 * edge instead, so that lines will not be joined unexpectedly. */
+	if (!forward) {
+		do_prev_word(ISSET(WORD_BOUNDS));
+		if (openfile->current != is_current) {
+			if (is_current_x > 0) {
+				openfile->current = is_current;
+				openfile->current_x = 0;
+			} else
+				openfile->current_x = strlen(openfile->current->data);
+		}
+	} else {
+		do_next_word(FALSE, ISSET(WORD_BOUNDS));
+		if (openfile->current != is_current &&
+							is_current->data[is_current_x] != '\0') {
+			openfile->current = is_current;
+			openfile->current_x = strlen(is_current->data);
+		}
+	}
+
+	/* Set the mark at the start of that word. */
+	openfile->mark = openfile->current;
+	openfile->mark_x = openfile->current_x;
+
+	/* Put the cursor back where it was, so an undo will put it there too. */
+	openfile->current = is_current;
+	openfile->current_x = is_current_x;
+
+	/* Now kill the marked region and a word is gone. */
+	cut_text();
+
+	/* Discard the cut word and restore the cutbuffer. */
+	free_lines(cutbuffer);
+	cutbuffer = is_cutbuffer;
 }
 
-/* If we aren't at the end of the current line, move all the text from
- * the current cursor position to the end of the current line, not
- * counting the newline at the end, into the cutbuffer.  If we are, and
- * we're not on the last line of the file, move the newline at the end
- * into the cutbuffer, and set the current place we want to where the
- * newline used to be. */
+/* Delete a word leftward. */
+void chop_previous_word(void)
+{
+	chop_word(BACKWARD);
+}
+
+/* Delete a word rightward. */
+void chop_next_word(void)
+{
+	openfile->mark = NULL;
+
+	if (is_cuttable(openfile->current_x > 0))
+		chop_word(FORWARD);
+}
+#endif /* !NANO_TINY */
+
+/* Move the whole current line from the current buffer to the cutbuffer. */
+void cut_line(void)
+{
+	/* When not on the last line of the buffer, move the text from the
+	 * head of this line to the head of the next line into the cutbuffer;
+	 * otherwise, move all of the text of this line into the cutbuffer. */
+	if (openfile->current != openfile->filebot)
+		extract(openfile->current, 0, openfile->current->next, 0);
+	else
+		extract(openfile->current, 0,
+				openfile->current, strlen(openfile->current->data));
+
+	openfile->placewewant = 0;
+}
+
+#ifndef NANO_TINY
+/* Move all text from the cursor position until the end of this line into
+ * the cutbuffer.  But when already at the end of a line, then move this
+ * "newline" to the cutbuffer. */
 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();
-    }
+	/* When not at the end of a line, move the rest of this line into
+	 * the cutbuffer.  Otherwise, when not at the end of the buffer,
+	 * move the line separation into the cutbuffer. */
+	if (openfile->current_x < data_len)
+		extract(openfile->current, openfile->current_x,
+				openfile->current, data_len);
+	else if (openfile->current != openfile->filebot) {
+		extract(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. */
+/* Move all marked text from the current buffer into the cutbuffer. */
+void cut_marked(bool *right_side_up)
+{
+	linestruct *top, *bot;
+	size_t top_x, bot_x;
+
+	get_region((const linestruct **)&top, &top_x,
+				(const linestruct **)&bot, &bot_x, right_side_up);
+
+	extract(top, top_x, bot, bot_x);
+
+	openfile->placewewant = xplustabs();
+}
+
+/* Move all text from the cursor position to end-of-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(openfile->current, openfile->current_x,
+				openfile->filebot, strlen(openfile->filebot->data));
 }
 #endif /* !NANO_TINY */
 
 /* 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)
+ * copying is TRUE, copy the text back into the buffer afterward.
+ * If until_eof is TRUE, move all text from the current cursor
+ * position to the end of the file into the cutbuffer.  If append
+ * is TRUE (when zapping), always append the cut to the cutbuffer. */
+void do_cut_text(bool copying, bool marked, bool until_eof, bool append)
 {
 #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. */
+	linestruct *was_bottom = NULL;
+		/* The current end of the cutbuffer, before we add text to it. */
+	size_t botlen = 0;
+		/* The length of the string at the current end of the cutbuffer,
+		 * before we add text to it. */
+	bool using_magicline = !ISSET(NO_NEWLINES);
+		/* Whether an automatic newline should be added at end-of-buffer. */
+	bool right_side_up = TRUE;
+		/* There *is* no region, *or* it is marked forward. */
 #endif
-    size_t was_totsize = openfile->totsize;
+	static bool precedent = FALSE;
+		/* Whether the previous operation was a copying operation. */
 
-    /* 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 cuts were not continuous, or when cutting a region, clear the slate. */
+	if ((!keep_cutbuffer || marked || until_eof || copying != precedent) &&
+				!append) {
+		free_lines(cutbuffer);
+		cutbuffer = NULL;
+	}
+
+	/* After a line operation, future ones should add to the cutbuffer. */
+	keep_cutbuffer = !marked && !until_eof;
+	precedent = copying;
 
 #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 (copying) {
+		/* If the cutbuffer isn't empty, remember where it currently ends. */
+		if (cutbuffer != NULL) {
+			was_bottom = cutbottom;
+			botlen = strlen(cutbottom->data);
+		}
+		/* Don't add a magic line 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
+	/* Now move the relevant piece of text into the cutbuffer. */
+	if (until_eof)
+		cut_to_eof();
+	else if (openfile->mark) {
+		cut_marked(&right_side_up);
+		openfile->mark = NULL;
+	} else if (ISSET(CUT_FROM_CURSOR))
+		cut_to_eol();
+	else
 #endif
-	/* Move the entire line into the cutbuffer. */
-	cut_line();
+		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 (copying) {
+		/* Copy the text that was put into the cutbuffer back into the current
+		 * file buffer, so that in the end nothing has been deleted. */
+		if (cutbuffer != NULL) {
+			if (was_bottom != NULL) {
+				was_bottom->data += botlen;
+				copy_from_buffer(was_bottom);
+				was_bottom->data -= botlen;
+			} 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
-#endif /* !NANO_TINY */
-    /* Only set the modification flag if actually something was cut. */
-    if (openfile->totsize != was_totsize)
-	set_modified();
-
-    refresh_needed = TRUE;
-
-#ifndef DISABLE_COLOR
-    check_the_multis(openfile->current);
+			/* 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 magic-line behavior now that we're done fiddling. */
+		if (using_magicline)
+			UNSET(NO_NEWLINES);
+	} else
 #endif
+		set_modified();
 
-#ifdef DEBUG
-    dump_filestruct(cutbuffer);
+	refresh_needed = TRUE;
+}
+
+/* Return FALSE when a cut command would not actually cut anything: when
+ * on an empty line at EOF, or when the mark covers zero characters, or
+ * (when test_cliff is TRUE) when the magic line would be cut. */
+bool is_cuttable(bool test_cliff)
+{
+	if ((openfile->current->next == NULL && openfile->current->data[0] == '\0'
+#ifndef NANO_TINY
+					&& openfile->mark == NULL) ||
+					(openfile->mark == openfile->current &&
+					openfile->mark_x == openfile->current_x) ||
+					(test_cliff && openfile->current->data[openfile->current_x] == '\0' &&
+					((ISSET(NO_NEWLINES) && openfile->current == openfile->filebot) ||
+					(!ISSET(NO_NEWLINES) && openfile->current == openfile->filebot->prev))
 #endif
+					)) {
+#ifndef NANO_TINY
+		openfile->mark = NULL;
+#endif
+		statusbar(_("Nothing was cut"));
+		return FALSE;
+	} else
+		return TRUE;
 }
 
 /* Move text from the current buffer into the cutbuffer. */
-void do_cut_text_void(void)
+void cut_text(void)
 {
 #ifndef NANO_TINY
-    add_undo(CUT);
-#endif
-    do_cut_text(FALSE, FALSE);
-#ifndef NANO_TINY
-    update_undo(CUT);
+	if (!is_cuttable(ISSET(CUT_FROM_CURSOR) && openfile->mark == NULL))
+		return;
+
+	/* Only add a new undo item when the current item is not a CUT or when
+	 * the current cut is not contiguous with the previous cutting. */
+	if (openfile->last_action != CUT || !keep_cutbuffer) {
+		keep_cutbuffer = FALSE;
+		add_undo(CUT);
+	}
+
+	do_cut_text(FALSE, openfile->mark != NULL, FALSE, FALSE);
+
+	update_undo(CUT);
+#else
+	if (is_cuttable(FALSE))
+		do_cut_text(FALSE, FALSE, FALSE, FALSE);
 #endif
 }
 
@@ -217,90 +396,109 @@ void do_cut_text_void(void)
 /* 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)
+void copy_text(void)
 {
-    static struct filestruct *next_contiguous_line = NULL;
-    bool mark_set = openfile->mark_set;
+	bool mark_is_set = (openfile->mark != NULL);
 
-    /* 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;
+	/* 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 there is nothing to copy, don't even try. */
+	if (openfile->current->next == NULL && openfile->current->data[0] == '\0')
+		return;
 
-    do_cut_text(TRUE, FALSE);
+	do_cut_text(TRUE, mark_is_set, FALSE, 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, restore the viewport and cursor position. */
+	if (mark_is_set) {
+		openfile->edittop = line_from_number(is_edittop_lineno);
+		openfile->firstcolumn = is_firstcolumn;
+		openfile->current = line_from_number(is_current_lineno);
+		openfile->current_x = is_current_x;
+	} else
+		focusing = FALSE;
 
-    if (mark_set) {
-	/* Restore the viewport and cursor position. */
-	openfile->edittop = fsfromline(is_edittop_lineno);
-	openfile->firstcolumn = is_firstcolumn;
-	openfile->current = fsfromline(is_current_lineno);
-	openfile->current_x = is_current_x;
-    }
+	openfile->last_action = OTHER;
 }
 
 /* Cut from the current cursor position to the end of the file. */
-void do_cut_till_eof(void)
+void cut_till_eof(void)
 {
-    add_undo(CUT_EOF);
-    do_cut_text(FALSE, TRUE);
-    update_undo(CUT_EOF);
+	if ((openfile->current == openfile->filebot && openfile->current->data[0] == '\0') ||
+				(!ISSET(NO_NEWLINES) && openfile->current->next == openfile->filebot &&
+				openfile->current->data[openfile->current_x] == '\0')) {
+		statusbar(_("Nothing was cut"));
+		return;
+	}
+
+	add_undo(CUT_TO_EOF);
+	do_cut_text(FALSE, FALSE, TRUE, FALSE);
+	update_undo(CUT_TO_EOF);
+}
+
+/* Erase text (current line or marked region), sending it into oblivion. */
+void zap_text(void)
+{
+	/* Remember the current cutbuffer so it can be restored after the zap. */
+	linestruct *was_cutbuffer = cutbuffer;
+
+	if (!is_cuttable(ISSET(CUT_FROM_CURSOR) && openfile->mark == NULL))
+		return;
+
+	/* Add a new undo item only when the current item is not a ZAP or when
+	 * the current zap is not contiguous with the previous zapping. */
+	if (openfile->last_action != ZAP || !keep_cutbuffer)
+		add_undo(ZAP);
+
+	/* Use the cutbuffer from the ZAP undo item, so the cut can be undone. */
+	cutbuffer = openfile->current_undo->cutbuffer;
+
+	do_cut_text(FALSE, openfile->mark != NULL, FALSE, TRUE);
+
+	update_undo(ZAP);
+
+	cutbuffer = was_cutbuffer;
 }
 #endif /* !NANO_TINY */
 
 /* Copy text from the cutbuffer into the current buffer. */
-void do_uncut_text(void)
+void paste_text(void)
 {
-    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. */
+	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 (cutbuffer == NULL) {
+		statusbar(_("Cutbuffer is empty"));
+		return;
+	}
 
 #ifndef NANO_TINY
-    add_undo(PASTE);
+	add_undo(PASTE);
 
-    if (ISSET(SOFTWRAP))
-	was_leftedge = (xplustabs() / editwincols) * editwincols;
+	if (ISSET(SOFTWRAP))
+		was_leftedge = leftedge_for(xplustabs(), openfile->current);
 #endif
 
-    /* Add a copy of the text in the cutbuffer to the current buffer
-     * 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 we pasted less than a screenful, don't center the cursor. */
-    if (less_than_a_screenful(was_lineno, was_leftedge))
-	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 current_y to account for the inserted lines. */
-    place_the_cursor(TRUE);
-
-    refresh_needed = TRUE;
-
-#ifndef DISABLE_COLOR
-    check_the_multis(openfile->current);
-#endif
-
-#ifdef DEBUG
-    dump_filestruct_reverse();
-#endif
+	set_modified();
+	refresh_needed = TRUE;
 }

src/history.c

@@ -0,0 +1,617 @@
+/**************************************************************************
+ *   history.c  --  This file is part of GNU nano.                        *
+ *                                                                        *
+ *   Copyright (C) 2003-2011, 2013-2019 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. */
+static poshiststruct *position_history = NULL;
+		/* The list of filenames with their last cursor positions. */
+
+/* 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 linestruct *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. */
+linestruct *find_history(const linestruct *start, const linestruct *end,
+		const char *text, size_t len)
+{
+	const linestruct *item;
+
+	for (item = start; item != end->prev && item != NULL; item = item->prev) {
+		if (strncmp(item->data, text, len) == 0)
+			return (linestruct *)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(linestruct **item, const char *text)
+{
+	linestruct **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) {
+		linestruct *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_from(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) {
+		linestruct *oldest = *htop;
+
+		*htop = (*htop)->next;
+		unlink_node(oldest);
+		renumber_from(*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(linestruct **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(linestruct **h)
+{
+	if ((*h)->next == NULL)
+		return NULL;
+
+	*h = (*h)->next;
+
+	return (*h)->data;
+}
+
+/* Two empty placeholder functions. */
+void get_history_older_void(void)
+{
+}
+void get_history_newer_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(linestruct **h, char *s, size_t len)
+{
+	if (len > 0) {
+		linestruct *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 /* ENABLE_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. */
+		linestruct **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 linestruct *head, FILE *hisfile)
+{
+	const linestruct *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(POSITIONLOG);
+			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] == '/') {
+		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;
+	char *fullpath = get_full_path(file);
+
+	if (fullpath == NULL)
+		return FALSE;
+
+	reload_positions_if_needed();
+
+	posptr = position_history;
+	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 */

src/nano.h

@@ -1,8 +1,8 @@
 /**************************************************************************
  *   nano.h  --  This file is part of GNU nano.                           *
  *                                                                        *
- *   Copyright (C) 1999-2011, 2013-2017 Free Software Foundation, Inc.    *
- *   Copyright (C) 2014, 2015, 2016 Benno Schulenberg                     *
+ *   Copyright (C) 1999-2011, 2013-2019 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    *
@@ -48,8 +48,6 @@
 #include <sys/param.h>
 #endif
 
-#include <stdarg.h>
-
 /* Suppress warnings for __attribute__((warn_unused_result)). */
 #define IGNORE_CALL_RESULT(call) do { if (call) {} } while(0)
 
@@ -113,16 +111,13 @@
 #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>
 #include <regex.h>
 #include <signal.h>
-#include <assert.h>
+#include <stdlib.h>
+#include <sys/stat.h>
 
 /* If we aren't using an ncurses with mouse support, exclude any
  * mouse routines, as they are useless then. */
@@ -130,420 +125,447 @@
 #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
+
+#ifdef ENABLE_COLOR
+#define USE_THE_DEFAULT -1
+#define BAD_COLOR -2
+#endif
+
+#define STANDARD_INPUT  0
+
 /* Enumeration types. */
 typedef enum {
-    NIX_FILE, DOS_FILE, MAC_FILE
+	NIX_FILE, DOS_FILE, MAC_FILE
 } file_format;
 
 typedef enum {
-    HUSH, MILD, ALERT
+	HUSH, NOTICE, 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
+	ZAP, CUT, CUT_TO_EOF, PASTE, INSERT, COUPLE_BEGIN, COUPLE_END, 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. */
+	short pairnum;
+		/* The pair number for this foreground/background color combination. */
+	int attributes;
+		/* Pair number and brightness composed into ready-to-use attributes. */
+	regex_t *start;
+		/* The compiled regular expression for 'start=', or the only one. */
+	regex_t *end;
+		/* The compiled regular expression for 'end=', if any. */
+	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 augmentstruct {
+	char *filename;
+		/* The file where the syntax is extended. */
+	ssize_t lineno;
+		/* The number of the line of the extendsyntax command. */
+	char *data;
+		/* The text of the line. */
+	struct augmentstruct *next;
+		/* Next node. */
+} augmentstruct;
+
 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. */
+	char *filename;
+		/* File where the syntax is defined, or NULL if not an included file. */
+	size_t lineno;
+		/* The line number where the 'syntax' command was found. */
+	struct augmentstruct *augmentations;
+		/* List of extendsyntax commands to apply when loaded. */
+	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. */
+#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. */
+typedef struct linestruct {
+	char *data;
+		/* The text of this line. */
+	ssize_t lineno;
+		/* The number of this line. */
+	struct linestruct *next;
+		/* Next node. */
+	struct linestruct *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. */
-} partition;
+} linestruct;
 
 #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. */
-
-    /* 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. */
+	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. */
+	linestruct *cutbuffer;
+		/* Copy of the cutbuffer. */
+	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 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. */
+	char *filename;
+		/* The file's name. */
+	linestruct *filetop;
+		/* The file's first line. */
+	linestruct *filebot;
+		/* The file's last line. */
+	linestruct *edittop;
+		/* The current top of the edit window for this file. */
+	linestruct *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. */
+#ifdef ENABLE_WRAPPING
+	linestruct *spillage_line;
+		/* The line for prepending stuff to during automatic hard-wrapping. */
+#endif
 #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. */
+	linestruct *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;
 
 #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. */
+typedef struct keystruct {
+	const char *keystr;
+		/* The string that describes the 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;
+		/* The menus in which this keystroke is bound. */
+	void (*func)(void);
+		/* The function to which this keystroke is bound. */
 #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. */
-} sc;
+#ifdef ENABLE_NANORC
+	char *expansion;
+		/* The string of keycodes to which this shortcut is expanded. */
+#endif
+	struct keystruct *next;
+		/* Next in the list. */
+} keystruct;
 
-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". */
+typedef struct funcstruct {
+	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. */
+	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. */
-} subnfunc;
+	bool viewok;
+		/* Is this function allowed when in view mode? */
+	long toggle;
+		/* If this is a toggle, which toggle to affect. */
+	struct funcstruct *next;
+		/* Next item in the list. */
+} funcstruct;
 
 #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,
+	GUIDE_STRIPE,
+	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,
-    CONSTANT_SHOW,
-    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,
-    NO_PAUSES
+	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,
+	RAW_SEQUENCES,
+	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,
+	SOFTWRAP,
+	POSITIONLOG,
+	LOCKING,
+	NOREAD_MODE,
+	MAKE_IT_UNIX,
+	TRIM_BLANKS,
+	SHOW_CURSOR,
+	LINE_NUMBERS,
+	NO_PAUSES,
+	AT_BLANKS,
+	AFTER_ENDS,
+	LET_THEM_ZAP,
+	BREAK_LONG_LINES,
+	JUMPY_SCROLLING,
+	EMPTY_LINE
 };
 
 /* 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 MFINDINHELP		(1<<15)
-/* This is an abbreviation for all menus except Help and YesNo. */
+#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 Browser and YesNo. */
 #define MMOST  (MMAIN|MWHEREIS|MREPLACE|MREPLACEWITH|MGOTOLINE|MWRITEFILE|MINSERTFILE|\
-		MEXTCMD|MBROWSER|MWHEREISFILE|MGOTODIR|MFINDINHELP|MSPELL|MLINTER)
+                MEXTCMD|MWHEREISFILE|MGOTODIR|MFINDINHELP|MSPELL|MLINTER)
+#ifndef NANO_TINY
+#define MSOME  MMOST|MBROWSER
+#else
+#define MSOME  MMAIN|MBROWSER
+#endif
 
 /* Basic control codes. */
+#define BS_CODE   0x08
 #define TAB_CODE  0x09
 #define ESC_CODE  0x1B
 #define DEL_CODE  0x7F
@@ -553,45 +575,69 @@ enum
 #define CONTROL_RIGHT 0x402
 #define CONTROL_UP 0x403
 #define CONTROL_DOWN 0x404
-#define CONTROL_HOME 0x411
-#define CONTROL_END 0x412
-#define SHIFT_CONTROL_LEFT 0x405
-#define SHIFT_CONTROL_RIGHT 0x406
-#define SHIFT_CONTROL_UP 0x407
-#define SHIFT_CONTROL_DOWN 0x408
-#define SHIFT_CONTROL_HOME 0x413
-#define SHIFT_CONTROL_END 0x414
-#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 CONTROL_DELETE 0x40D
+#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 CONTROL_SHIFT_DELETE 0x41D
+#define ALT_LEFT 0x421
+#define ALT_RIGHT 0x422
+#define ALT_UP 0x423
+#define ALT_DOWN 0x424
+#define ALT_DELETE 0x42D
+#define SHIFT_ALT_LEFT 0x431
+#define SHIFT_ALT_RIGHT 0x432
+#define SHIFT_ALT_UP 0x433
+#define SHIFT_ALT_DOWN 0x434
+//#define SHIFT_LEFT 0x451
+//#define SHIFT_RIGHT 0x452
+#define SHIFT_UP 0x453
+#define SHIFT_DOWN 0x454
+#define SHIFT_HOME 0x455
+#define SHIFT_END 0x456
+#define SHIFT_PAGEUP 0x457
+#define SHIFT_PAGEDOWN 0x458
+#define SHIFT_DELETE 0x45D
+#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)
-/* The flags for the mark need to be the highest. */
-#define MARK_WAS_SET		(1<<3)
-#define WAS_MARKED_FORWARD	(1<<4)
+#define WAS_FINAL_BACKSPACE   (1<<1)
+#define WAS_WHOLE_LINE        (1<<2)
+#define WAS_FINAL_LINE        (1<<3)
+#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. */
 #define MAIN_VISIBLE (((COLS + 40) / 20) * 2)
 
-/* The default number of characters from the end of the line where
- * wrapping occurs. */
-#define CHARS_FROM_EOL 8
+/* The default number of columns from end of line where wrapping occurs. */
+#define COLUMNS_FROM_EOL 8
 
 /* 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

src/proto.h

@@ -1,7 +1,7 @@
 /**************************************************************************
  *   proto.h  --  This file is part of GNU nano.                          *
  *                                                                        *
- *   Copyright (C) 1999-2011, 2013-2017 Free Software Foundation, Inc.    *
+ *   Copyright (C) 1999-2011, 2013-2019 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    *
@@ -29,9 +29,7 @@
 extern volatile sig_atomic_t the_window_resized;
 #endif
 
-#ifdef __linux__
-extern bool console;
-#endif
+extern bool on_a_vt;
 
 extern bool meta_key;
 extern bool shift_held;
@@ -40,44 +38,44 @@ extern bool focusing;
 
 extern bool as_an_at;
 
-extern int margin;
-extern int editwincols;
+extern bool control_C_was_pressed;
 
-#ifndef DISABLE_COLOR
-extern bool have_palette;
-#endif
+extern bool suppress_cursorpos;
+
+extern bool started_curses;
 
 extern message_type lastmessage;
 
-extern filestruct *pletion_line;
+extern linestruct *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;
+extern int controlleft, controlright;
+extern int controlup, controldown;
+extern int controlhome, controlend;
 #ifndef NANO_TINY
-extern int shiftcontrolleft;
-extern int shiftcontrolright;
-extern int shiftcontrolup;
-extern int shiftcontroldown;
-extern int shiftcontrolhome;
-extern int shiftcontrolend;
-extern int shiftaltleft;
-extern int shiftaltright;
-extern int shiftaltup;
-extern int shiftaltdown;
+extern int controldelete, controlshiftdelete;
+extern int shiftleft, shiftright;
+extern int shiftup, shiftdown;
+extern int shiftcontrolleft, shiftcontrolright;
+extern int shiftcontrolup, shiftcontroldown;
+extern int shiftcontrolhome, shiftcontrolend;
+extern int altleft, altright;
+extern int altup, altdown;
+extern int altdelete;
+extern int shiftaltleft, shiftaltright;
+extern int shiftaltup, shiftaltdown;
 #endif
 
-#ifndef DISABLE_WRAPJUSTIFY
-extern ssize_t fill;
-extern ssize_t wrap_at;
+#ifdef ENABLED_WRAPORJUSTIFY
+extern ssize_t fill, wrap_at;
 #endif
 
 extern char *last_search;
@@ -85,42 +83,43 @@ extern char *last_search;
 extern char *present_path;
 
 extern unsigned flags[4];
+
 extern WINDOW *topwin;
 extern WINDOW *edit;
 extern WINDOW *bottomwin;
 extern int editwinrows;
-
-extern filestruct *cutbuffer;
-extern filestruct *cutbottom;
-extern partition *filepart;
-extern openfilestruct *openfile;
-
+extern int editwincols;
+extern int margin;
 #ifndef NANO_TINY
-extern char *matchbrackets;
+extern ssize_t stripe_column;
+#endif
+
+extern linestruct *cutbuffer;
+extern linestruct *cutbottom;
+extern bool keep_cutbuffer;
+
+extern openfilestruct *openfile;
+#ifdef ENABLE_MULTIBUFFER
+extern openfilestruct *startfile;
 #endif
 
 #ifndef NANO_TINY
+extern char *matchbrackets;
 extern char *whitespace;
-extern int whitespace_len[2];
+extern int whitelen[2];
 #endif
 
 extern const char *exit_tag;
 extern const char *close_tag;
-extern const char *uncut_tag;
-#ifndef DISABLE_JUSTIFY
-extern const char *unjust_tag;
+#ifdef ENABLE_JUSTIFY
 extern char *punct;
 extern char *brackets;
 extern char *quotestr;
 extern regex_t quotereg;
-extern int quoterc;
-extern char *quoteerr;
-#endif /* !DISABLE_JUSTIFY */
+#endif
 
 extern char *word_chars;
 
-extern bool nodelay_mode;
-
 extern char *answer;
 
 extern ssize_t tabsize;
@@ -130,48 +129,57 @@ 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;
 
 extern int currmenu;
-extern sc *sclist;
-extern subnfunc *allfuncs;
-extern subnfunc *exitfunc;
-extern subnfunc *uncutfunc;
+extern keystruct *sclist;
+extern funcstruct *allfuncs;
+extern funcstruct *exitfunc;
 
-#ifndef DISABLE_HISTORIES
-extern filestruct *search_history;
-extern filestruct *searchage;
-extern filestruct *searchbot;
-extern filestruct *replace_history;
-extern filestruct *replaceage;
-extern filestruct *replacebot;
-extern poshiststruct *position_history;
+extern linestruct *search_history;
+extern linestruct *replace_history;
+extern linestruct *execute_history;
+#ifdef ENABLE_HISTORIES
+extern linestruct *searchtop;
+extern linestruct *searchbot;
+extern linestruct *replacetop;
+extern linestruct *replacebot;
+extern linestruct *executetop;
+extern linestruct *executebot;
 #endif
 
 extern regex_t search_regexp;
 extern regmatch_t regmatches[10];
 
 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;
+#ifdef ENABLE_NANORC
+extern char *rcfile_with_errors;
+#endif
+
+extern bool spotlighted;
+extern size_t light_from_col;
+extern size_t light_to_col;
 
 typedef void (*functionptrtype)(void);
 
@@ -182,10 +190,10 @@ 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);
-void do_filesearch(void);
-void do_fileresearch(void);
-void do_first_file(void);
-void do_last_file(void);
+void do_filesearch(bool forwards);
+void do_fileresearch(bool forwards);
+void to_first_file(void);
+void to_last_file(void);
 char *strip_last_component(const char *path);
 #endif
 
@@ -202,22 +210,19 @@ bool is_ascii_cntrl_char(int c);
 bool is_cntrl_mbchar(const char *c);
 bool is_word_mbchar(const char *c, bool allow_punct);
 char control_mbrep(const char *c, bool isdata);
-int length_of_char(const char *c, int *width);
 int mbwidth(const char *c);
 char *make_mbchar(long chr, int *chr_mb_len);
+int char_length(const char *pointer);
 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);
+size_t step_left(const char *buf, size_t pos);
+size_t step_right(const char *buf, size_t pos);
 int mbstrcasecmp(const char *s1, const char *s2);
 int mbstrncasecmp(const char *s1, const char *s2, size_t n);
 char *mbstrcasestr(const char *haystack, const char *needle);
-char *revstrstr(const char *haystack, const char *needle,
-	const char *index);
-char *mbrevstrcasestr(const char *haystack, const char *needle,
-	const char *index);
+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);
-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
@@ -225,66 +230,64 @@ char *mbstrpbrk(const char *s, const char *accept);
 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(ENABLE_NANORC) && (!defined(NANO_TINY) || !defined(DISABLE_JUSTIFY))
-bool has_blank_mbchars(const char *s);
+#if defined(ENABLE_NANORC) && (!defined(NANO_TINY) || defined(ENABLE_JUSTIFY))
+bool has_blank_char(const char *s);
 #endif
 #ifdef ENABLE_UTF8
 bool is_valid_unicode(wchar_t wc);
 #endif
-#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);
-void check_the_multis(filestruct *line);
-void alloc_multidata_if_needed(filestruct *fileptr);
+void check_the_multis(linestruct *line);
+void alloc_multidata_if_needed(linestruct *fileptr);
 void precalc_multicolorinfo(void);
 #endif
 
 /* Most functions in cut.c. */
-void cutbuffer_reset(void);
-bool keeping_cutbuffer(void);
+void do_delete(void);
+void do_backspace(void);
 #ifndef NANO_TINY
+void chop_previous_word(void);
+void chop_next_word(void);
 void cut_marked(bool *right_side_up);
 #endif
-void do_cut_text(bool copy_text, bool cut_till_eof);
-void do_cut_text_void(void);
+void do_cut_text(bool copying, bool marked, bool until_eof, bool append);
+bool is_cuttable(bool test_cliff);
+void cut_text(void);
 #ifndef NANO_TINY
-void do_copy_text(void);
-void do_cut_till_eof(void);
+void copy_text(void);
+void cut_till_eof(void);
+void zap_text(void);
 #endif
-void do_uncut_text(void);
+void paste_text(void);
 
 /* Most functions in files.c. */
-void initialize_buffer_text(void);
-bool open_buffer(const char *filename, bool undoable);
-#ifndef DISABLE_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 make_new_buffer(void);
+void set_modified(void);
+bool open_buffer(const char *filename, bool new_buffer);
+#ifdef ENABLE_SPELLER
+bool replace_buffer(const char *filename, undo_type action, bool marked);
 #endif
 void prepare_for_display(void);
 #ifdef ENABLE_MULTIBUFFER
-void switch_to_prev_buffer_void(void);
-void switch_to_next_buffer_void(void);
-bool close_buffer(void);
+void mention_name_and_linecount(void);
+void switch_to_prev_buffer(void);
+void switch_to_next_buffer(void);
+void close_buffer(void);
 #endif
-void read_file(FILE *f, int fd, const char *filename, bool undoable,
-		bool checkwritable);
-int open_file(const char *filename, bool newfie, bool quiet, FILE **f);
+void read_file(FILE *f, int fd, const char *filename, bool undoable);
+int open_file(const char *filename, bool newfie, 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 *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);
@@ -293,59 +296,41 @@ int write_lockfile(const char *lockfilename, const char *origfilename, bool modi
 #endif
 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(ENABLE_TABCOMP) || defined(ENABLE_BROWSER)
 int diralphasort(const void *va, const void *vb);
-void free_chararray(char **array, size_t len);
 #endif
 #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
-void load_history(void);
-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. */
 size_t length_of_list(int menu);
-const sc *first_sc_for(int menu, void (*func)(void));
+const keystruct *first_sc_for(int menu, void (*func)(void));
 int the_code_for(void (*func)(void), int defaultval);
 functionptrtype func_from_key(int *kbinput);
-void assign_keyinfo(sc *s, const char *keystring, const int keycode);
-void print_sclist(void);
+int keycode_from_string(const char *keystring);
+void assign_keyinfo(keystruct *s, const char *keystring, const int keycode);
 void shortcut_init(void);
-#ifndef DISABLE_COLOR
-void set_lint_or_format_shortcuts(void);
-void set_spell_shortcuts(void);
-#endif
-const subnfunc *sctofunc(const sc *s);
 const char *flagtostr(int flag);
-sc *strtosc(const char *input);
-int strtomenu(const char *input);
-#ifdef DEBUG
-void thanks_for_all_the_fish(void);
+#ifdef ENABLE_NANORC
+keystruct *strtosc(const char *input);
+int name_to_menu(const char *name);
+char *menu_to_name(int menu);
 #endif
 
 /* All functions in help.c. */
 #ifdef ENABLE_HELP
-void wrap_the_help_text(bool redisplaying);
+void wrap_help_text_into_buffer();
 void do_help(void);
 void help_init(void);
 functionptrtype parse_help_input(int *kbinput);
@@ -353,32 +338,48 @@ 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 linestruct *h);
+void update_history(linestruct **h, const char *s);
+char *get_history_older(linestruct **h);
+char *get_history_newer(linestruct **h);
+void get_history_older_void(void);
+void get_history_newer_void(void);
+#ifdef ENABLE_TABCOMP
+char *get_history_completion(linestruct **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 update_screen);
+#ifdef ENABLE_JUSTIFY
+void do_para_begin(linestruct **line);
+void do_para_end(linestruct **line);
 void do_para_begin_void(void);
-void do_para_end(bool update_screen);
 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 update_screen);
+void do_prev_word(bool allow_punct);
+bool do_next_word(bool after_ends, bool allow_punct);
 void do_prev_word_void(void);
-bool do_next_word(bool allow_punct, bool update_screen);
 void do_next_word_void(void);
-void do_home(bool be_clever);
-void do_home_void(void);
-void do_end(bool be_clever);
-void do_end_void(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_home(void);
+void do_end(void);
+void do_up(void);
+void do_down(void);
+#if !defined(NANO_TINY) || defined(ENABLE_HELP)
 void do_scroll_up(void);
 void do_scroll_down(void);
 #endif
@@ -386,23 +387,19 @@ void do_left(void);
 void do_right(void);
 
 /* Most functions in nano.c. */
-filestruct *make_new_node(filestruct *prevnode);
-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);
-partition *partition_filestruct(filestruct *top, size_t top_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);
-void ingraft_buffer(filestruct *somebuffer);
-void copy_from_buffer(filestruct *somebuffer);
-openfilestruct *make_new_opennode(void);
-void unlink_opennode(openfilestruct *fileptr);
-void delete_opennode(openfilestruct *fileptr);
+linestruct *make_new_node(linestruct *prevnode);
+void splice_node(linestruct *afterthis, linestruct *newnode);
+void unlink_node(linestruct *fileptr);
+void delete_node(linestruct *fileptr);
+linestruct *copy_buffer(const linestruct *src);
+void free_lines(linestruct *src);
+void renumber_from(linestruct *line);
+void partition_buffer(linestruct *top, size_t top_x,
+		linestruct *bot, size_t bot_x);
+void unpartition_buffer();
+void extract(linestruct *top, size_t top_x, linestruct *bot, size_t bot_x);
+void ingraft_buffer(linestruct *somebuffer);
+void copy_from_buffer(linestruct *somebuffer);
 void print_view_warning(void);
 void show_restricted_warning(void);
 #ifndef ENABLE_HELP
@@ -410,37 +407,41 @@ 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);
 void do_exit(void);
 void close_and_go(void);
+void install_handler_for_Ctrl_C(void);
+void restore_handler_for_Ctrl_C(void);
+void reconnect_and_store_state(void);
 RETSIGTYPE handle_hupterm(int signal);
+#ifndef DEBUG
+RETSIGTYPE handle_crash(int signal);
+#endif
 RETSIGTYPE do_suspend(int signal);
 RETSIGTYPE do_continue(int signal);
+#if !defined(NANO_TINY) || defined(ENABLE_SPELLER)
+void block_sigwinch(bool blockit);
+#endif
 #ifndef NANO_TINY
 RETSIGTYPE handle_sigwinch(int signal);
 void regenerate_screen(void);
-void allow_sigwinch(bool allow);
 void do_toggle(int flag);
-void do_toggle_void(void);
-void enable_signals(void);
 #endif
+void disable_kb_interrupt(void);
+void enable_kb_interrupt(void);
 void disable_flow_control(void);
 void enable_flow_control(void);
 void terminal_init(void);
-void unbound_key(int code);
-int do_input(bool allow_funcs);
-#ifdef ENABLE_MOUSE
-int do_mouse(void);
+#ifdef ENABLE_LINENUMBERS
+void confirm_margin(void);
 #endif
+void unbound_key(int code);
+bool okay_for_view(const keystruct *shortcut);
 void do_output(char *output, size_t output_len, bool allow_cntrls);
 
 /* Most functions in prompt.c. */
-#ifdef ENABLE_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);
@@ -448,89 +449,66 @@ 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);
 #endif
 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 update_the_statusbar(void);
+void put_cursor_at_end_of_answer(void);
+void add_or_remove_pipe_symbol_from_answer(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, linestruct **history_list,
+		void (*refresh_func)(void), const char *msg, ...);
 int do_yesno_prompt(bool all, const char *msg);
 
 /* Most functions in rcfile.c. */
 #ifdef ENABLE_NANORC
-#ifndef DISABLE_COLOR
-bool parse_color_names(char *combostr, short *fg, short *bg, bool *bright);
+void display_rcfile_errors();
+#ifdef ENABLE_COLOR
+void parse_one_include(char *file, syntaxtype *syntax);
 void grab_and_store(const char *kind, char *ptr, regexlisttype **storage);
+bool parse_syntax_commands(char *keyword, char *ptr);
 #endif
-void parse_rcfile(FILE *rcstream, bool syntax_only);
+void parse_rcfile(FILE *rcstream, bool just_syntax, bool intros_only);
 void do_rcfiles(void);
 #endif /* ENABLE_NANORC */
 
 /* Most functions in search.c. */
-void not_found_msg(const char *str);
-void search_replace_abort(void);
-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 linestruct *begin, size_t begin_x);
 void do_search(void);
-#ifndef NANO_TINY
+void do_search_forward(void);
+void do_search_backward(void);
 void do_findprevious(void);
 void do_findnext(void);
-#endif
-void do_research(void);
+void not_found_msg(const char *str);
 void go_looking(void);
 ssize_t do_replace_loop(const char *needle, bool whole_word_only,
-	const filestruct *real_current, size_t *real_current_x);
+		const linestruct *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
 void do_find_bracket(void);
-#ifdef ENABLE_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);
-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
 
 /* Most functions in text.c. */
 #ifndef NANO_TINY
 void do_mark(void);
 #endif
-void do_delete(void);
-void do_backspace(void);
-#ifndef NANO_TINY
-void do_cut_prev_word(void);
-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);
 #ifdef ENABLE_COMMENT
 void do_comment(void);
-bool comment_line(undo_type action, filestruct *f, const char *comment_seq);
 #endif
 void do_undo(void);
 void do_redo(void);
@@ -538,37 +516,32 @@ 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
-void wrap_reset(void);
-bool do_wrap(filestruct *line);
+#ifdef ENABLE_WRAPPING
+bool do_wrap(void);
 #endif
-#if defined(ENABLE_HELP) || !defined(DISABLE_WRAPJUSTIFY)
+#if defined(ENABLE_HELP) || defined(ENABLED_WRAPORJUSTIFY)
 ssize_t break_line(const char *line, ssize_t goal, bool snap_at_nl);
 #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
-void justify_format(filestruct *paragraph, size_t skip);
-bool begpar(const filestruct *const foo);
-bool inpar(const filestruct *const foo);
+#ifdef ENABLE_JUSTIFY
+bool begpar(const linestruct *const foo, int depth);
+bool inpar(const linestruct *const foo);
 void do_justify(bool full_justify);
 void do_justify_void(void);
 void do_full_justify(void);
 #endif
-#ifndef DISABLE_SPELLER
+#ifdef ENABLE_SPELLER
 void do_spell(void);
 #endif
-#ifndef DISABLE_COLOR
+#ifdef ENABLE_COLOR
 void do_linter(void);
-void do_formatter(void);
 #endif
 #ifndef NANO_TINY
 void do_wordlinechar_count(void);
@@ -578,22 +551,23 @@ 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
 bool parse_num(const char *str, ssize_t *val);
 bool parse_line_column(const char *str, ssize_t *line, ssize_t *column);
-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);
-const char *fixbounds(const char *r);
-#ifndef DISABLE_SPELLER
+#if !defined(ENABLE_TINY) || defined(ENABLE_TABCOMP) || defined(ENABLE_BROWSER)
+void free_chararray(char **array, size_t len);
+#endif
+#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);
-void nperror(const char *s);
+		const char *start);
 void *nmalloc(size_t howmuch);
 void *nrealloc(void *ptr, size_t howmuch);
 char *mallocstrncpy(char *dest, const char *src, size_t n);
@@ -601,31 +575,33 @@ 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 wideness(const char *text, size_t maxlen);
+size_t breadth(const char *text);
 void new_magicline(void);
 #if !defined(NANO_TINY) || defined(ENABLE_HELP)
 void remove_magicline(void);
 #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_region(const linestruct **top, size_t *top_x,
+		const linestruct **bot, size_t *bot_x, bool *right_side_up);
+void get_range(const linestruct **top, const linestruct **bot);
 #endif
-size_t get_totsize(const filestruct *begin, const filestruct *end);
+size_t get_totsize(const linestruct *begin, const linestruct *end);
 #ifndef NANO_TINY
-filestruct *fsfromline(ssize_t lineno);
-#endif
-#ifdef DEBUG
-void dump_filestruct(const filestruct *inptr);
-void dump_filestruct_reverse(void);
+linestruct *line_from_number(ssize_t lineno);
 #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 put_back(int keycode);
 void unget_kbinput(int kbinput, bool metakey);
-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);
@@ -634,77 +610,88 @@ int get_control_kbinput(int kbinput);
 int *get_verbatim_kbinput(WINDOW *win, size_t *kbinput_len);
 int *parse_verbatim_kbinput(WINDOW *win, size_t *count);
 #ifdef ENABLE_MOUSE
-int get_mouseinput(int *mouse_x, int *mouse_y, bool allow_shortcuts);
+int get_mouseinput(int *mouse_row, int *mouse_col, bool allow_shortcuts);
 #endif
-const sc *get_shortcut(int *kbinput);
+const keystruct *get_shortcut(int *kbinput);
 void blank_row(WINDOW *win, int y, int x, int n);
 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 column, size_t span, bool isdata);
+char *display_string(const char *buf, size_t column, size_t span,
+						bool isdata, bool isprompt);
 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 place_the_cursor(bool forreal);
-void edit_draw(filestruct *fileptr, const char *converted,
-	int line, size_t from_col);
-int update_line(filestruct *fileptr, size_t index);
+void post_one_key(const char *keystroke, const char *tag, int width);
+void place_the_cursor(void);
+void edit_draw(linestruct *fileptr, const char *converted,
+		int line, size_t from_col);
+int update_line(linestruct *fileptr, size_t index);
 #ifndef NANO_TINY
-int update_softwrapped_line(filestruct *fileptr);
+int update_softwrapped_line(linestruct *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);
+int go_back_chunks(int nrows, linestruct **line, size_t *leftedge);
+int go_forward_chunks(int nrows, linestruct **line, size_t *leftedge);
 bool less_than_a_screenful(size_t was_lineno, size_t was_leftedge);
-void edit_scroll(scroll_dir direction, int nrows);
+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, linestruct *line, size_t *leftedge);
+size_t chunk_for(size_t column, linestruct *line);
+size_t leftedge_for(size_t column, linestruct *line);
+size_t number_of_chunks_in(linestruct *line);
 void ensure_firstcolumn_is_aligned(void);
 #endif
-void edit_redraw(filestruct *old_current);
+size_t actual_last_column(size_t leftedge, size_t column);
+void edit_redraw(linestruct *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 force);
 void do_cursorpos_void(void);
-void spotlight(bool active, const char *word);
-void xon_complaint(void);
-void xoff_complaint(void);
+void spotlight(size_t from_col, size_t to_col);
+#ifndef NANO_TINY
+void spotlight_softwrapped(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
 
 /* These are just name definitions. */
-void do_cancel(void);
 void case_sens_void(void);
 void regexp_void(void);
 void backwards_void(void);
 void flip_replace(void);
-void gototext_void(void);
+void flip_goto(void);
 #ifdef ENABLE_BROWSER
 void to_files_void(void);
 void goto_dir_void(void);
 #endif
 #ifndef NANO_TINY
+void do_toggle_void(void);
 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);
+void flip_pipe(void);
+void flip_convert(void);
 #endif
 #ifdef ENABLE_MULTIBUFFER
 void flip_newbuffer(void);
 #endif
 void discard_buffer(void);
+void do_cancel(void);
 
 #endif /* !PROTO_H */

src/utils.c

@@ -1,8 +1,8 @@
 /**************************************************************************
  *   utils.c  --  This file is part of GNU nano.                          *
  *                                                                        *
- *   Copyright (C) 1999-2011, 2013-2017 Free Software Foundation, Inc.    *
- *   Copyright (C) 2016 Benno Schulenberg                                 *
+ *   Copyright (C) 1999-2011, 2013-2019 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    *
@@ -21,69 +21,90 @@
 
 #include "proto.h"
 
-#include <string.h>
-#include <stdio.h>
-#include <unistd.h>
+#include <errno.h>
 #ifdef HAVE_PWD_H
 #include <pwd.h>
 #endif
-#include <ctype.h>
-#include <errno.h>
+#include <string.h>
+#include <unistd.h>
 
 /* Return the user's home directory.  We use $HOME, and if that fails,
  * we fall back on the home directory of the effective user ID. */
 void get_homedir(void)
 {
-    if (homedir == NULL) {
-	const char *homenv = getenv("HOME");
+	if (homedir == NULL) {
+		const char *homenv = getenv("HOME");
 
 #ifdef HAVE_PWD_H
-	/* When HOME isn't set, or when we're root, get the home directory
-	 * from the password file instead. */
-	if (homenv == NULL || geteuid() == 0) {
-	    const struct passwd *userage = getpwuid(geteuid());
+		/* When HOME isn't set, or when we're root, get the home directory
+		 * from the password file instead. */
+		if (homenv == NULL || geteuid() == 0) {
+			const struct passwd *userage = getpwuid(geteuid());
 
-	    if (userage != NULL)
-		homenv = userage->pw_dir;
-	}
+			if (userage != NULL)
+				homenv = userage->pw_dir;
+		}
 #endif
 
-	/* Only set homedir if some home directory could be determined,
-	 * otherwise keep homedir NULL. */
-	if (homenv != NULL && strcmp(homenv, "") != 0)
-	    homedir = mallocstrcpy(NULL, homenv);
-    }
+		/* Only set homedir if some home directory could be determined,
+		 * otherwise keep homedir NULL. */
+		if (homenv != NULL && *homenv != '\0')
+			homedir = mallocstrcpy(NULL, homenv);
+	}
+}
+
+/* Return the filename part of the given path. */
+const char *tail(const char *path)
+{
+	const char *slash = strrchr(path, '/');
+
+	if (slash == NULL)
+		return path;
+	else
+		return ++slash;
+}
+
+/* Return a copy of the two given strings, welded together. */
+char *concatenate(const char *path, const char *name)
+{
+	size_t pathlen = strlen(path);
+	char *joined = charalloc(pathlen + strlen(name) + 1);
+
+	strcpy(joined, path);
+	strcpy(joined + pathlen, name);
+
+	return joined;
 }
 
 #ifdef ENABLE_LINENUMBERS
 /* Return the number of digits that the given integer n takes up. */
 int digits(ssize_t n)
 {
-    if (n < 100000) {
-	if (n < 1000) {
-	    if (n < 100)
-		return 2;
-	    else
-		return 3;
+	if (n < 100000) {
+		if (n < 1000) {
+			if (n < 100)
+				return 2;
+			else
+				return 3;
+		} else {
+			if (n < 10000)
+				return 4;
+			else
+				return 5;
+		}
 	} else {
-	    if (n < 10000)
-		return 4;
-	    else
-		return 5;
+		if (n < 10000000) {
+			if (n < 1000000)
+				return 6;
+			else
+				return 7;
+		} else {
+			if (n < 100000000)
+				return 8;
+			else
+				return 9;
+		}
 	}
-    } else {
-	if (n < 10000000) {
-	    if (n < 1000000)
-		return 6;
-	    else
-		return 7;
-	} else {
-	    if (n < 100000000)
-		return 8;
-	    else
-		return 9;
-	}
-    }
 }
 #endif
 
@@ -91,142 +112,106 @@ int digits(ssize_t n)
  * and return TRUE; otherwise, return FALSE. */
 bool parse_num(const char *str, ssize_t *result)
 {
-    char *first_error;
-    ssize_t value;
+	char *first_error;
+	ssize_t value;
 
-    /* The manual page for strtol() says this is required. */
-    errno = 0;
+	/* The manual page for strtol() says this is required. */
+	errno = 0;
 
-    value = (ssize_t)strtol(str, &first_error, 10);
+	value = (ssize_t)strtol(str, &first_error, 10);
 
-    if (errno == ERANGE || *str == '\0' || *first_error != '\0')
-	return FALSE;
+	if (errno == ERANGE || *str == '\0' || *first_error != '\0')
+		return FALSE;
 
-    *result = value;
+	*result = value;
 
-    return TRUE;
+	return TRUE;
 }
 
 /* Read two numbers, separated by a comma, from str, and store them in
  * *line and *column.  Return FALSE on error, and TRUE otherwise. */
 bool parse_line_column(const char *str, ssize_t *line, ssize_t *column)
 {
-    bool retval;
-    char *firstpart;
-    const char *comma;
+	bool retval;
+	char *firstpart;
+	const char *comma;
 
-    while (*str == ' ')
-	str++;
+	while (*str == ' ')
+		str++;
 
-    comma = strpbrk(str, "m,. /;");
+	comma = strpbrk(str, "m,. /;");
 
-    if (comma == NULL)
-	return parse_num(str, line);
+	if (comma == NULL)
+		return parse_num(str, line);
 
-    retval = parse_num(comma + 1, column);
+	retval = parse_num(comma + 1, column);
+
+	if (comma == str)
+		return retval;
+
+	firstpart = mallocstrcpy(NULL, str);
+	firstpart[comma - str] = '\0';
+
+	retval = parse_num(firstpart, line) && retval;
+
+	free(firstpart);
 
-    if (comma == str)
 	return retval;
-
-    firstpart = mallocstrcpy(NULL, str);
-    firstpart[comma - str] = '\0';
-
-    retval = parse_num(firstpart, line) && retval;
-
-    free(firstpart);
-
-    return retval;
-}
-
-/* Reduce the memory allocation of a string to what is needed. */
-void snuggly_fit(char **str)
-{
-    if (*str != NULL)
-	*str = charealloc(*str, strlen(*str) + 1);
-}
-
-/* Null a string at a certain index and align it. */
-void null_at(char **data, size_t index)
-{
-    *data = charealloc(*data, index + 1);
-    (*data)[index] = '\0';
 }
 
 /* For non-null-terminated lines.  A line, by definition, shouldn't
  * normally have newlines in it, so encode its nulls as newlines. */
 void unsunder(char *str, size_t true_len)
 {
-    for (; true_len > 0; true_len--, str++) {
-	if (*str == '\0')
-	    *str = '\n';
-    }
+	for (; true_len > 0; true_len--, str++) {
+		if (*str == '\0')
+			*str = '\n';
+	}
 }
 
 /* For non-null-terminated lines.  A line, by definition, shouldn't
  * normally have newlines in it, so decode its newlines as nulls. */
 void sunder(char *str)
 {
-    for (; *str != '\0'; str++) {
-	if (*str == '\n')
-	    *str = '\0';
-    }
+	for (; *str != '\0'; str++) {
+		if (*str == '\n')
+			*str = '\0';
+	}
 }
 
-/* Fix the regex if we're on platforms which require an adjustment
- * from GNU-style to BSD-style word boundaries. */
-const char *fixbounds(const char *r)
+#if !defined(ENABLE_TINY) || defined(ENABLE_TABCOMP) || defined(ENABLE_BROWSER)
+/* Free the memory of the given array, which should contain len elements. */
+void free_chararray(char **array, size_t len)
 {
-#ifndef GNU_WORDBOUNDS
-    int i, j = 0;
-    char *r2 = charalloc(strlen(r) * 5);
-    char *r3;
+	if (array == NULL)
+		return;
 
-#ifdef DEBUG
-    fprintf(stderr, "fixbounds(): Start string = \"%s\"\n", r);
-#endif
+	while (len > 0)
+		free(array[--len]);
 
-    for (i = 0; i < strlen(r); i++) {
-	if (r[i] != '\0' && r[i] == '\\' && (r[i + 1] == '>' || r[i + 1] == '<')) {
-	    strcpy(&r2[j], "[[:");
-	    r2[j + 3] = r[i + 1];
-	    strcpy(&r2[j + 4], ":]]");
-	    i++;
-	    j += 6;
-	} else
-	    r2[j] = r[i];
-	j++;
-    }
-    r2[j] = '\0';
-    r3 = mallocstrcpy(NULL, r2);
-    free(r2);
-#ifdef DEBUG
-    fprintf(stderr, "fixbounds(): Ending string = \"%s\"\n", r3);
-#endif
-    return (const char *) r3;
-#endif /* !GNU_WORDBOUNDS */
-
-    return r;
+	free(array);
 }
+#endif
 
-#ifndef DISABLE_SPELLER
+#ifdef ENABLE_SPELLER
 /* Is the word starting at the given position in buf and of the given length
  * a separate word?  That is: is it not part of a longer word?*/
 bool is_separate_word(size_t position, size_t length, const char *buf)
 {
-    char before[MAXCHARLEN], after[MAXCHARLEN];
-    size_t word_end = position + length;
+	char before[MAXCHARLEN], after[MAXCHARLEN];
+	size_t word_end = position + length;
 
-    /* Get the characters before and after the word, if any. */
-    parse_mbchar(buf + move_mbleft(buf, position), before, NULL);
-    parse_mbchar(buf + word_end, after, NULL);
+	/* Get the characters before and after the word, if any. */
+	parse_mbchar(buf + step_left(buf, position), before, NULL);
+	parse_mbchar(buf + word_end, after, NULL);
 
-    /* If the word starts at the beginning of the line OR the character before
-     * the word isn't a letter, and if the word ends at the end of the line OR
-     * the character after the word isn't a letter, we have a whole word. */
-    return ((position == 0 || !is_alpha_mbchar(before)) &&
-		(buf[word_end] == '\0' || !is_alpha_mbchar(after)));
+	/* If the word starts at the beginning of the line OR the character before
+	 * the word isn't a letter, and if the word ends at the end of the line OR
+	 * the character after the word isn't a letter, we have a whole word. */
+	return ((position == 0 || !is_alpha_mbchar(before)) &&
+				(buf[word_end] == '\0' || !is_alpha_mbchar(after)));
 }
-#endif /* !DISABLE_SPELLER */
+#endif /* ENABLE_SPELLER */
 
 /* Return the position of the needle in the haystack, or NULL if not found.
  * When searching backwards, we will find the last match that starts no later
@@ -234,142 +219,123 @@ bool is_separate_word(size_t position, size_t length, const char *buf)
  * than start.  If we are doing a regexp search, and we find a match, we fill
  * in the global variable regmatches with at most 9 subexpression matches. */
 const char *strstrwrapper(const char *haystack, const char *needle,
-	const char *start)
+		const char *start)
 {
-    if (*needle == '\0') {
-#ifndef NANO_TINY
-	statusline(ALERT, "Searching for nothing -- please report a bug");
-#endif
-	return (char *)start;
-    }
+	if (ISSET(USE_REGEXP)) {
+		if (ISSET(BACKWARDS_SEARCH)) {
+			size_t last_find, ceiling, far_end;
+			size_t floor = 0, next_rung = 0;
+				/* The start of the search range, and the next start. */
 
-    if (ISSET(USE_REGEXP)) {
-	if (ISSET(BACKWARDS_SEARCH)) {
-	    size_t last_find, ceiling, far_end;
-	    size_t floor = 0, next_rung = 0;
-		/* The start of the search range, and the next start. */
+			if (regexec(&search_regexp, haystack, 1, regmatches, 0) != 0)
+				return NULL;
 
-	    if (regexec(&search_regexp, haystack, 1, regmatches, 0) != 0)
-		return NULL;
+			far_end = strlen(haystack);
+			ceiling = start - haystack;
+			last_find = regmatches[0].rm_so;
 
-	    far_end = strlen(haystack);
-	    ceiling = start - haystack;
-	    last_find = regmatches[0].rm_so;
+			/* A result beyond the search range also means: no match. */
+			if (last_find > ceiling)
+				return NULL;
 
-	    /* A result beyond the search range also means: no match. */
-	    if (last_find > ceiling)
-		return NULL;
+			/* Move the start-of-range forward until there is no more match;
+			 * then the last match found is the first match backwards. */
+			while (regmatches[0].rm_so <= ceiling) {
+				floor = next_rung;
+				last_find = regmatches[0].rm_so;
+				/* If this is the last possible match, don't try to advance. */
+				if (last_find == ceiling)
+					break;
+				next_rung = step_right(haystack, last_find);
+				regmatches[0].rm_so = next_rung;
+				regmatches[0].rm_eo = far_end;
+				if (regexec(&search_regexp, haystack, 1, regmatches,
+										REG_STARTEND) != 0)
+					break;
+			}
 
-	    /* Move the start-of-range forward until there is no more match;
-	     * then the last match found is the first match backwards. */
-	    while (regmatches[0].rm_so <= ceiling) {
-		floor = next_rung;
-		last_find = regmatches[0].rm_so;
-		/* If this is the last possible match, don't try to advance. */
-		if (last_find == ceiling)
-		    break;
-		next_rung = move_mbright(haystack, last_find);
-		regmatches[0].rm_so = next_rung;
-		regmatches[0].rm_eo = far_end;
-		if (regexec(&search_regexp, haystack, 1, regmatches,
-					REG_STARTEND) != 0)
-		    break;
-	    }
+			/* Find the last match again, to get possible submatches. */
+			regmatches[0].rm_so = floor;
+			regmatches[0].rm_eo = far_end;
+			if (regexec(&search_regexp, haystack, 10, regmatches,
+										REG_STARTEND) != 0)
+				return NULL;
 
-	    /* Find the last match again, to get possible submatches. */
-	    regmatches[0].rm_so = floor;
-	    regmatches[0].rm_eo = far_end;
-	    if (regexec(&search_regexp, haystack, 10, regmatches,
-					REG_STARTEND) != 0)
-		return NULL;
+			return haystack + regmatches[0].rm_so;
+		}
 
-	    return haystack + regmatches[0].rm_so;
+		/* Do a forward regex search from the starting point. */
+		regmatches[0].rm_so = start - haystack;
+		regmatches[0].rm_eo = strlen(haystack);
+		if (regexec(&search_regexp, haystack, 10, regmatches,
+										REG_STARTEND) != 0)
+			return NULL;
+		else
+			return haystack + regmatches[0].rm_so;
+	}
+
+	if (ISSET(CASE_SENSITIVE)) {
+		if (ISSET(BACKWARDS_SEARCH))
+			return revstrstr(haystack, needle, start);
+		else
+			return strstr(start, needle);
 	}
 
-	/* Do a forward regex search from the starting point. */
-	regmatches[0].rm_so = start - haystack;
-	regmatches[0].rm_eo = strlen(haystack);
-	if (regexec(&search_regexp, haystack, 10, regmatches,
-					REG_STARTEND) != 0)
-	    return NULL;
-	else
-	    return haystack + regmatches[0].rm_so;
-    }
-    if (ISSET(CASE_SENSITIVE)) {
 	if (ISSET(BACKWARDS_SEARCH))
-	    return revstrstr(haystack, needle, start);
+		return mbrevstrcasestr(haystack, needle, start);
 	else
-	    return strstr(start, needle);
-    } else if (ISSET(BACKWARDS_SEARCH))
-	return mbrevstrcasestr(haystack, needle, start);
-
-    return mbstrcasestr(start, needle);
-}
-
-/* This is a wrapper for the perror() function.  The wrapper temporarily
- * leaves curses mode, calls perror() (which writes to stderr), and then
- * reenters curses mode, updating the screen in the process.  Note that
- * nperror() causes the window to flicker once. */
-void nperror(const char *s)
-{
-    endwin();
-    perror(s);
-    doupdate();
+		return mbstrcasestr(start, needle);
 }
 
 /* This is a wrapper for the malloc() function that properly handles
- * things when we run out of memory.  Thanks, BG, many people have been
- * asking for this... */
+ * things when we run out of memory. */
 void *nmalloc(size_t howmuch)
 {
-    void *r = malloc(howmuch);
+	void *r = malloc(howmuch);
 
-    if (r == NULL && howmuch != 0)
-	die(_("nano is out of memory!"));
+	if (r == NULL && howmuch != 0)
+		die(_("Nano is out of memory!\n"));
 
-    return r;
+	return r;
 }
 
 /* This is a wrapper for the realloc() function that properly handles
  * things when we run out of memory. */
 void *nrealloc(void *ptr, size_t howmuch)
 {
-    void *r = realloc(ptr, howmuch);
+	void *r = realloc(ptr, howmuch);
 
-    if (r == NULL && howmuch != 0)
-	die(_("nano is out of memory!"));
+	if (r == NULL && howmuch != 0)
+		die(_("Nano is out of memory!\n"));
 
-    return r;
+	return r;
 }
 
 /* Allocate and copy the first n characters of the given src string, after
  * freeing the destination.  Usage: "dest = mallocstrncpy(dest, src, n);". */
 char *mallocstrncpy(char *dest, const char *src, size_t n)
 {
-    if (src == NULL)
-	src = "";
+	if (src == NULL)
+		src = "";
 
-    if (src != dest)
-	free(dest);
+	dest = charealloc(dest, n);
+	strncpy(dest, src, n);
 
-    dest = charalloc(n);
-    strncpy(dest, src, n);
-
-    return dest;
+	return dest;
 }
 
 /* Free the dest string and return a malloc'ed copy of src.  Should be used as:
  * "dest = mallocstrcpy(dest, src);". */
 char *mallocstrcpy(char *dest, const char *src)
 {
-    return mallocstrncpy(dest, src, (src == NULL) ? 1 : strlen(src) + 1);
+	return mallocstrncpy(dest, src, (src == NULL) ? 1 : strlen(src) + 1);
 }
 
 /* Free the string at dest and return the string at src. */
 char *free_and_assign(char *dest, char *src)
 {
-    free(dest);
-    return src;
+	free(dest);
+	return src;
 }
 
 /* When not in softwrap mode, nano scrolls horizontally within a line in
@@ -379,195 +345,175 @@ char *free_and_assign(char *dest, char *src)
  * get_page_start(column) < COLS). */
 size_t get_page_start(size_t column)
 {
-    if (column < editwincols - 1 || ISSET(SOFTWRAP) || column == 0)
-	return 0;
-    else if (editwincols > 8)
-	return column - 7 - (column - 7) % (editwincols - 8);
-    else
-	return column - (editwincols - 2);
+	if (column + 2 < editwincols || ISSET(SOFTWRAP) || column == 0)
+		return 0;
+	else if (editwincols > 8)
+		return column - 6 - (column - 6) % (editwincols - 8);
+	else
+		return column - (editwincols - 2);
 }
 
 /* Return the placewewant associated with current_x, i.e. the zero-based
  * column position of the cursor. */
 size_t xplustabs(void)
 {
-    return strnlenpt(openfile->current->data, openfile->current_x);
+	return wideness(openfile->current->data, openfile->current_x);
 }
 
 /* Return the index in text of the character that (when displayed) will
  * not overshoot the given column. */
 size_t actual_x(const char *text, size_t column)
 {
-    const char *start = text;
-	/* From where we start walking through the text. */
-    size_t width = 0;
-	/* The current accumulated span, in columns. */
+	const char *start = text;
+		/* From where we start walking through the text. */
+	size_t width = 0;
+		/* The current accumulated span, in columns. */
 
-    while (*text != '\0') {
-	int charlen = parse_mbchar(text, NULL, &width);
+	while (*text != '\0') {
+		int charlen = parse_mbchar(text, NULL, &width);
 
-	if (width > column)
-	    break;
+		if (width > column)
+			break;
 
-	text += charlen;
-    }
+		text += charlen;
+	}
 
-    return (text - start);
+	return (text - start);
 }
 
 /* A strnlen() with tabs and multicolumn characters factored in:
  * how many columns wide are the first maxlen bytes of text? */
-size_t strnlenpt(const char *text, size_t maxlen)
+size_t wideness(const char *text, size_t maxlen)
 {
-    size_t width = 0;
-	/* The screen display width to text[maxlen]. */
+	size_t width = 0;
 
-    if (maxlen == 0)
-	return 0;
+	if (maxlen == 0)
+		return 0;
 
-    while (*text != '\0') {
-	int charlen = parse_mbchar(text, NULL, &width);
+	while (*text != '\0') {
+		size_t charlen = parse_mbchar(text, NULL, &width);
 
-	if (maxlen <= charlen)
-	    break;
+		if (maxlen <= charlen)
+			break;
 
-	maxlen -= charlen;
-	text += charlen;
-    }
+		maxlen -= charlen;
+		text += charlen;
+	}
 
-    return width;
+	return width;
 }
 
 /* Return the number of columns that the given text occupies. */
-size_t strlenpt(const char *text)
+size_t breadth(const char *text)
 {
-    size_t span = 0;
+	size_t span = 0;
 
-    while (*text != '\0')
-	text += parse_mbchar(text, NULL, &span);
+	while (*text != '\0')
+		text += parse_mbchar(text, NULL, &span);
 
-    return span;
+	return span;
 }
 
-/* Append a new magicline to filebot. */
+/* Append a new magic line to the end of the buffer. */
 void new_magicline(void)
 {
-    openfile->filebot->next = make_new_node(openfile->filebot);
-    openfile->filebot->next->data = mallocstrcpy(NULL, "");
-    openfile->filebot = openfile->filebot->next;
-    openfile->totsize++;
+	openfile->filebot->next = make_new_node(openfile->filebot);
+	openfile->filebot->next->data = mallocstrcpy(NULL, "");
+	openfile->filebot = openfile->filebot->next;
+	openfile->totsize++;
 }
 
 #if !defined(NANO_TINY) || defined(ENABLE_HELP)
-/* Remove the magicline from filebot, if there is one and it isn't the
- * only line in the file.  Assume that edittop and current are not at
- * filebot. */
+/* Remove the magic line from the end of the buffer, if there is one and
+ * it isn't the only line in the file. */
 void remove_magicline(void)
 {
-    if (openfile->filebot->data[0] == '\0' &&
-		openfile->filebot != openfile->fileage) {
-	openfile->filebot = openfile->filebot->prev;
-	free_filestruct(openfile->filebot->next);
-	openfile->filebot->next = NULL;
-	openfile->totsize--;
-    }
+	if (openfile->filebot->data[0] == '\0' &&
+				openfile->filebot != openfile->filetop) {
+		openfile->filebot = openfile->filebot->prev;
+		delete_node(openfile->filebot->next);
+		openfile->filebot->next = NULL;
+		openfile->totsize--;
+	}
 }
 #endif
 
 #ifndef NANO_TINY
-/* Set top_x and bot_x to the top and bottom x-coordinates of the mark,
- * respectively, based on the locations of top and bot.  If
- * right_side_up isn't NULL, set it to TRUE if the mark begins with
- * (mark_begin, mark_begin_x) and ends with (current, current_x), or
- * FALSE otherwise. */
-void mark_order(const filestruct **top, size_t *top_x, const filestruct
-	**bot, size_t *bot_x, bool *right_side_up)
+/* Return in (top, top_x) and (bot, bot_x) the start and end "coordinates"
+ * of the marked region.  If right_side_up isn't NULL, set it to TRUE when
+ * the mark is at the top of the marked region, and to FALSE otherwise. */
+void get_region(const linestruct **top, size_t *top_x,
+				const linestruct **bot, size_t *bot_x, bool *right_side_up)
 {
-    if ((openfile->current->lineno == openfile->mark_begin->lineno &&
-		openfile->current_x > openfile->mark_begin_x) ||
-		openfile->current->lineno > openfile->mark_begin->lineno) {
-	*top = openfile->mark_begin;
-	*top_x = openfile->mark_begin_x;
-	*bot = openfile->current;
-	*bot_x = openfile->current_x;
-	if (right_side_up != NULL)
-	    *right_side_up = TRUE;
-    } else {
-	*bot = openfile->mark_begin;
-	*bot_x = openfile->mark_begin_x;
-	*top = openfile->current;
-	*top_x = openfile->current_x;
-	if (right_side_up != NULL)
-	    *right_side_up = FALSE;
-    }
+	if (openfile->mark->lineno < openfile->current->lineno ||
+				(openfile->mark == openfile->current &&
+				openfile->mark_x < openfile->current_x)) {
+		*top = openfile->mark;
+		*top_x = openfile->mark_x;
+		*bot = openfile->current;
+		*bot_x = openfile->current_x;
+		if (right_side_up != NULL)
+			*right_side_up = TRUE;
+	} else {
+		*bot = openfile->mark;
+		*bot_x = openfile->mark_x;
+		*top = openfile->current;
+		*top_x = openfile->current_x;
+		if (right_side_up != NULL)
+			*right_side_up = FALSE;
+	}
 }
 
-/* Given a line number, return a pointer to the corresponding struct. */
-filestruct *fsfromline(ssize_t lineno)
+/* Get the set of lines to work on -- either just the current line, or the
+ * first to last lines of the marked region.  When the cursor (or mark) is
+ * at the start of the last line of the region, exclude that line. */
+void get_range(const linestruct **top, const linestruct **bot)
 {
-    filestruct *f = openfile->current;
+	if (!openfile->mark) {
+		*top = openfile->current;
+		*bot = openfile->current;
+	} else {
+		size_t top_x, bot_x;
 
-    if (lineno <= openfile->current->lineno)
-	while (f->lineno != lineno && f->prev != NULL)
-	    f = f->prev;
-    else
-	while (f->lineno != lineno && f->next != NULL)
-	    f = f->next;
+		get_region(top, &top_x, bot, &bot_x, NULL);
 
-    if (f->lineno != lineno) {
-	statusline(ALERT, _("Internal error: can't match line %ld.  "
-			"Please save your work."), (long)lineno);
-	return NULL;
-    }
+		if (bot_x == 0 && *bot != *top && !also_the_last)
+			*bot = (*bot)->prev;
+		else
+			also_the_last = TRUE;
+	}
+}
 
-    return f;
+/* Return a pointer to the line that has the given line number. */
+linestruct *line_from_number(ssize_t number)
+{
+	linestruct *line = openfile->current;
+
+	if (line->lineno > number)
+		while (line->lineno != number)
+			line = line->prev;
+	else
+		while (line->lineno != number)
+			line = line->next;
+
+	return line;
 }
 #endif /* !NANO_TINY */
 
 /* Count the number of characters from begin to end, and return it. */
-size_t get_totsize(const filestruct *begin, const filestruct *end)
+size_t get_totsize(const linestruct *begin, const linestruct *end)
 {
-    const filestruct *line;
-    size_t totsize = 0;
+	const linestruct *line;
+	size_t totsize = 0;
 
-    /* Sum the number of characters (plus a newline) in each line. */
-    for (line = begin; line != end->next; line = line->next)
-	totsize += mbstrlen(line->data) + 1;
+	/* Sum the number of characters (plus a newline) in each line. */
+	for (line = begin; line != end->next; line = line->next)
+		totsize += mbstrlen(line->data) + 1;
 
-    /* The last line of a file doesn't have a newline -- otherwise it
-     * wouldn't be the last line -- so subtract 1 when at EOF. */
-    if (line == NULL)
-	totsize--;
+	/* The last line of a file doesn't have a newline -- otherwise it
+	 * wouldn't be the last line -- so subtract 1 when at EOF. */
+	if (line == NULL)
+		totsize--;
 
-    return totsize;
+	return totsize;
 }
-
-#ifdef DEBUG
-/* Dump the given buffer to stderr. */
-void dump_filestruct(const filestruct *inptr)
-{
-    if (inptr == openfile->fileage)
-	fprintf(stderr, "Dumping file buffer to stderr...\n");
-    else if (inptr == cutbuffer)
-	fprintf(stderr, "Dumping cutbuffer to stderr...\n");
-    else
-	fprintf(stderr, "Dumping a buffer to stderr...\n");
-
-    while (inptr != NULL) {
-	fprintf(stderr, "(%ld) %s\n", (long)inptr->lineno, inptr->data);
-	inptr = inptr->next;
-    }
-}
-
-/* Dump the current buffer to stderr in reverse. */
-void dump_filestruct_reverse(void)
-{
-    const filestruct *fileptr = openfile->filebot;
-
-    while (fileptr != NULL) {
-	fprintf(stderr, "(%ld) %s\n", (long)fileptr->lineno,
-		fileptr->data);
-	fileptr = fileptr->prev;
-    }
-}
-#endif /* DEBUG */

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,}\>"

syntax/autoconf.nanorc

@@ -1,6 +1,6 @@
 ## Here is an example for Autoconf.
 
-syntax "autoconf" "\.(ac|m4)$"
+syntax autoconf "\.(ac|m4)$"
 comment "#"
 
 # Keywords:
@@ -20,7 +20,7 @@ color red "\"[^"]*\""  "\'[^']*\'"
 color green "`[^`]*`"
 
 # Error lines:
-color brightred "^\*\*\*.*"
+color brightred "^[[:space:]]*\*\*\*.*"
 
 # Brackets:
 color magenta "\[|\]|\(|\)"

syntax/awk.nanorc

@@ -1,7 +1,8 @@
 ## Here is an example for awk.
 
-syntax "awk" "\.awk$"
-magic "awk.*script text"
+syntax awk "\.awk$"
+header "^#!.*awk"
+magic "awk script"
 comment "#"
 
 # Records.
@@ -18,8 +19,7 @@ color green "(\{|\}|\(|\)|\;|\]|\[|\\|<|>|!|=|&|\+|-|\*|%|/|\?:|\^|\|)"
 color brightyellow "\<(for|if|while|do|else|in|delete|exit)\>"
 color brightyellow "\<(break|continue|return)\>"
 # I/O statements.
-color brightgreen "\<(close|getline|next|nextfile|print|printf)\>"
-color brightgreen "\<(system|fflush)\>"
+color brightgreen "\<(close|fflush|getline|next|nextfile|print|printf|system)\>"
 # Standard functions.
 color magenta "\<(atan2|cos|exp|int|log|rand|sin|sqrt|srand)\>"
 color magenta "\<(asort|asorti|gensub|gsub|index|length|match)\>"

syntax/c.nanorc

@@ -1,17 +1,20 @@
 ## Here is an example for C/C++.
 
-syntax "c" "\.(c(c|pp|xx|\+\+)?|C)$" "\.(h(h|pp|xx)?|H)$" "\.ii?$"
-magic "(ASCII|UTF-8 Unicode) C(\+\+)? program text"
+syntax c "\.([ch](pp|xx)?|C|cc|c\+\+|H|hh|ii?)$"
+magic "^(C|C\+\+) (source|program)"
 comment "//"
 
+# Constants.
 color brightred "\<[A-Z_][0-9A-Z_]+\>"
+# Labels.
+color brightmagenta "^[[:space:]]*[A-Z_a-z]+:[[:space:]]*$"
+
 color green "\<(float|double|bool|char|int|short|long|sizeof|enum|void|auto|static|const|struct|union|typedef|extern|(un)?signed|inline)\>"
-color green "\<((s?size)|((u_?)?int(8|16|32|64|ptr)))_t\>"
+color green "\<([[:lower:]]+|(u_?)?int(8|16|32|64|ptr))_t\>"
 color green "\<(class|namespace|template|public|protected|private|typename|this|friend|virtual|override|using|mutable|volatile|register|explicit)\>"
 color brightyellow "\<(for|if|while|do|else|case|default|switch)\>"
 color brightyellow "\<(try|throw|catch|operator|new|delete)\>"
 color magenta "\<(goto|continue|break|return)\>"
-color brightcyan "^[[:space:]]*#[[:space:]]*(define|include(_next)?|(un|ifn?)def|endif|el(if|se)|if|warning|error|pragma)"
 color brightmagenta "'([^'\]|(\\["'abfnrtv\\]))'" "'\\(([0-3]?[0-7]{1,2}))'" "'\\x[0-9A-Fa-f]{1,2}'"
 
 # GCC builtins.
@@ -19,17 +22,21 @@ color cyan "__attribute__[[:space:]]*\(\([^)]*\)\)" "__(aligned|asm|builtin|hidd
 
 # Strings.  In general you will want your strings and comments to come last,
 # because highlighting rules are applied in the order they are read in.
-color brightyellow ""([^"]|\\")*"" "<[^[:blank:]=]*>"
+color brightyellow ""([^"]|\\")*"" "#[[:space:]]*include[[:space:]]+<[^[:blank:]=]*>"
 # Multiline strings.  This regex is VERY resource intensive,
 # and sometimes colours things that shouldn't be coloured.
 ###color brightyellow start=""(\\.|[^"])*\\[[:space:]]*$" end="^(\\.|[^"])*""
 
+# Preprocessor directives.
+color brightcyan start="^[[:space:]]*#[[:space:]]*(if(n?def)?|elif|warning|error|pragma)\>" end="(\`|[^\\])$"
+color brightcyan "^[[:space:]]*#[[:space:]]*(define|else|endif|include(_next)?|undef)\>"
+
 # Comments.
 color brightblue "//.*"
 color brightblue start="/\*" end="\*/"
 
 # Reminders.
-color ,yellow "\<(FIXME|TODO|XXX)\>"
+color brightwhite,yellow "\<(FIXME|TODO|XXX)\>"
 
 # Trailing whitespace.
 color ,green "[[:space:]]+$"

syntax/changelog.nanorc

@@ -1,9 +1,9 @@
 ## Colouring for Changelogs.
 
-syntax "changelog" "Change[Ll]og.*"
+syntax changelog "Change[Ll]og[^/]*$"
 
 # Author lines.
-color green "^(19|20).*$"
+color green "^(19|20).*"
 # Dates.
 color red "^(19|20)[0-9-]{8}"
 # Email addresses.

syntax/cmake.nanorc

@@ -1,20 +1,19 @@
 ## Syntax highlighting for CMake files.
 
-syntax "cmake" "(CMakeLists\.txt|\.cmake)$"
+syntax cmake "(CMakeLists\.txt|\.cmake)$"
 comment "#"
 
 icolor green "^[[:space:]]*[A-Z0-9_]+"
 icolor brightyellow "^[[:space:]]*(include|include_directories|include_external_msproject)\>"
 
-icolor brightgreen "^[[:space:]]*\<((else|end)?if|else|(end)?while|(end)?foreach|break)\>"
-color brightgreen "\<(NOT|COMMAND|POLICY|TARGET|EXISTS|IS_(DIRECTORY|ABSOLUTE)|DEFINED)\>[[:space:]]"
-color brightgreen "[[:space:]]\<(OR|AND|IS_NEWER_THAN|MATCHES|(STR|VERSION_)?(LESS|GREATER|EQUAL))\>[[:space:]]"
+icolor brightgreen "^[[:space:]]*((else|end)?if|else|(end)?while|(end)?foreach|break)\>"
+color brightgreen "\<(NOT|COMMAND|POLICY|TARGET|EXISTS|IS_(DIRECTORY|ABSOLUTE)|DEFINED)[[:space:]]"
+color brightgreen "[[:space:]](OR|AND|IS_NEWER_THAN|MATCHES|(STR|VERSION_)?(LESS|GREATER|EQUAL))[[:space:]]"
 
-icolor brightred "^[[:space:]]*\<((end)?(function|macro)|return)"
+icolor brightred "^[[:space:]]*((end)?(function|macro)|return)"
 
 icolor cyan start="\$(\{|ENV\{)" end="\}"
 color magenta "\<(APPLE|UNIX|WIN32|CYGWIN|BORLAND|MINGW|MSVC(_IDE|60|71|80|90)?)\>"
 
-icolor brightblue "^([[:space:]]*)?#.*"
-icolor brightblue "[[:space:]]#.*"
+color brightblue "(^|[[:space:]])#.*"
 color ,green "[[:space:]]+$"

syntax/css.nanorc

@@ -1,6 +1,6 @@
 ## Here is an example for CSS files.
 
-syntax "css" "\.css$"
+syntax css "\.css$"
 comment "/*|*/"
 
 color brightred     "."

syntax/debian.nanorc

@@ -1,6 +1,6 @@
 ## Here is an example for apt's sources.list.
 
-syntax "sources.list" "sources\.list(~|\.old|\.save)?$" "sources\.list\.d/.*\.list(~|\.old|\.save)?$"
+syntax sources.list "sources\.list(\.d/.*\.list)?(~|\.old|\.save)?$"
 comment "#"
 
 # Coloring the deb lines, working from tail to head.  First the

syntax/default.nanorc

@@ -1,11 +1,17 @@
-## A default syntax, which is used
-## for files that do not match any other syntax.
+## An example of a default syntax.  The default syntax is used for
+## files that do not match any other syntax.
 
-syntax "default"
+syntax default
 comment "#"
 
+# Comments.
+color cyan "^[[:space:]]*#.*"
+
 # Spaces in front of tabs.
 color ,red " +	+"
 
 # Nano's name, including version.
-color brightred "(GNU )?nano [1-9]\.[0-9]\.[^[:space:][:punct:]]+"
+color brightred "(GNU )?[Nn]ano [1-4]\.[0-9][-.[:alnum:]]*\>"
+
+# Email addresses.
+color magenta "<[[:alnum:].%_+-]+@[[:alnum:].-]+\.[[:alpha:]]{2,}>"

syntax/elisp.nanorc

@@ -1,6 +1,7 @@
 ## Here is an example for Emacs Lisp.
 
-syntax "elisp" "\.el$"
+syntax elisp "\.el$"
+magic "Lisp/Scheme program"
 comment ";"
 
 # Basic functions/macros
@@ -29,4 +30,4 @@ color blue ":(\w|[?-])+"
 color yellow start="^[[:blank:]]+\"" end="[^\]\""
 color yellow ""(\\.|[^"])*""
 # Comments
-color cyan "(^|[[:space:]]);.*$"
+color cyan "(^|[[:space:]]);.*"

syntax/fortran.nanorc

@@ -1,6 +1,6 @@
 ## Here is an example for Fortran 90/95.
 
-syntax "fortran" "\.(f|f90|f95)$"
+syntax fortran "\.(f|f90|f95)$"
 comment "!"
 
 color red "\<[0-9]+\>"

syntax/gentoo.nanorc

@@ -1,19 +1,20 @@
-## Here is an example for Gentoo ebuilds/eclasses.
+## Here is an example for Gentoo ebuilds/eclasses,
+## and (further down) one for Portage control files.
 
-syntax "ebuild" "\.e(build|class|blit)$"
+syntax ebuild "\.e(build|class|blit)$"
 comment "#"
 
-## All the standard portage functions
+## All the standard portage functions:
 color brightgreen "(^|\<default_)src_(unpack|prepare|configure|compile|install|test)\>"
 color brightgreen "^pkg_(config|nofetch|info|pretend|setup|(pre|post)(inst|rm))\>"
 color brightgreen "\<default(_pkg_nofetch|_src_(unpack|prepare|configure|compile|test))?\>"
-## Highlight bash related syntax
+## Bash-related syntax:
 color green "\<(break|case|continue|do|done|elif|else|esac|exit|fi|for|function|if|in|read|return|select|shift|then|time|until|while)\>"
 color green "\<(declare|eval|exec|export|let|local)\>"
 color green "[{}():;|`$<>!=&\\]" "(\]|\[)"
 color green "-[defhnrsuwxzL]\>"
 color green "-(eq|ne|gt|lt|ge|le)\>"
-## Highlight variables ... official portage ones in red, all others in bright red
+## Variables... official portage ones in red, all others in bright red:
 color brightred "\$[-0-9@*#?$!]" "\$[[:alpha:]_][[:alnum:]_]*"
 color brightred "\$\{[#!]?([-@*#?$!]|[0-9]+|[[:alpha:]_][[:alnum:]_]*)(\[([[:digit:]]|@)+\])?(([#%/]|:?[-=?+])[^}]*\}|\[|\})"
 color red "\<(EAPI|ARCH|HOMEPAGE|DESCRIPTION|IUSE|SRC_URI|LICENSE|SLOT|KEYWORDS|[HPR]?DEPEND|PROVIDE|PROPERTIES|REQUIRED_USE|RESTRICT|USERLAND)\>"
@@ -22,8 +23,8 @@ color red "\<(AS|C(PP|XX)?|LD)FLAGS\>" "\<C(HOST|TARGET|BUILD)\>" "\<(MERGE_TYPE
 color red "\<EBUILD_PHASE(_FUNC)?\>"
 color red "\<QA_((TEXTRELS|EXECSTACK|WX_LOAD)(_[a-zA-Z_0-9]+)?|DT_HASH|PRESTRIPPED)\>"
 color red "\<(PATCHES|(HTML_)?DOCS)\>" "\<WANT_(AUTO(CONF|MAKE)|LIBTOOL)\>" "\<AT_M4DIR\>"
-## Highlight portage commands
-color magenta "\<(use(_(with|enable|if_iuse)|x)?|in_iuse)\> [!a-zA-Z0-9_+ -]*" "inherit.*"
+## Portage commands:
+color magenta "\<(use(_(with|enable|if_iuse)|x)?|in_iuse) [!a-zA-Z0-9_+ -]*" "inherit.*"
 color brightblue "\<e(begin|end|conf|install|make|qmake4|ant|(qa)?warn|infon?|error|log|patch(_user)?|new(group|user))\>"
 color brightblue "\<e(pause|beep|mktemp|(cvs|svn)_clean|punt_cxx)\>" "\<e(aclocal|auto(reconf|header|conf|make)|libtoolize)\>"
 color brightblue "\<e(stack|shopts|umask)_(push|pop)\>" "\<version_is_at_least\>"
@@ -35,22 +36,23 @@ color brightblue "\<prepall(docs|info|man|strip)?\>" "\<prep(info|lib|lib\.(so|a
 color brightblue "\<(doc|ins|exe)?into\>" "\<(f|games)(owners|perms)\>" "\<(exe|ins|dir)opts\>"
 color brightblue "\<tc-get(BUILD_)?(AR|AS|CC|CPP|CXX|LD|NM|OBJCOPY|PKG_CONFIG|RANLIB)\>"
 color brightblue "\<tc-(arch(-kernel)?|export|has-(tls|openmp))\>"
-## Highlight common commands used in ebuilds
+## Common commands used in ebuilds:
 color blue "\<(awk|cat|cd|chmod|chown|cp|echo|env|find|e?grep|ln|make|mkdir|mv|popd|printf|pushd|rm|rmdir|sed|set|tar|touch|unset|xargs)\>"
-## Highlight comments (doesnt work that well)
-color yellow "(^|[[:space:]])#.*$"
-## Highlight strings (doesnt work that well)
+## Comments (doesn't work that well):
+color yellow "(^|[[:space:]])#.*"
+## Strings (doesn't work that well):
 color brightyellow ""(\\.|[^\"])*"" "'(\\.|[^'])*'"
 ## Trailing space is bad!
 color ,green "[[:space:]]+$"
 ## Mixed whitespace is also bad.
 color ,green " 	"
 
-## Here is an example for Portage control files.
-##
-syntax "/etc/portage" "\.(accept_keywords|env|keywords|mask|unmask|use)(/.+)?$"
+
+syntax /etc/portage "\.(accept_keywords|env|keywords|mask|unmask|use)(/.+)?$"
+comment "#"
+
 ## Base text:
-color green "^.+$"
+color green ".+"
 ## Likely version and slot numbers:
 color magenta "-[[:digit:].]+(_(alpha|beta|pre|rc|p)[[:digit:]]*)*(-r[[:digit:]]+)?([:[:space:]]|$)"
 color magenta ":[^[:space:]]+([[:space:]]|$)"
@@ -65,7 +67,7 @@ color cyan "^[[:space:]]*[^/]*/"
 ## Masking regulators:
 color brightmagenta "^[[:space:]]*(=|~|<|<=|>|>=)"
 ## Comments:
-color yellow "#.*$"
+color yellow "#.*"
 ## Trailing space is bad!
 color ,green "[[:space:]]+$"
 ## Mixed whitespace is also bad.

syntax/go.nanorc

@@ -1,11 +1,8 @@
 ## Here is an example for Go.
 
-syntax "go" "\.go$"
+syntax go "\.go$"
 comment "//"
 
-# Set up a formatter since spelling is probably useless...
-formatter gofmt -w
-
 # Types.
 color green "\<(bool|u?int(8|16|32|64)?|float(32|64)|complex(64|128)|byte|rune|uintptr|string|error)\>"
 color green "\<((<-[[:space:]]*)chan|chan[[:space:]]*<-|const|func|interface|map|struct|type|var)\>"
@@ -24,13 +21,11 @@ color brightcyan "\<(package|import)\>"
 color brightcyan "//[[:space:]]*\+build[[:space:]]+(([a-zA-Z_0-9]+[[:space:]]*)+,[[:space:]]*)*[a-zA-Z_0-9]+"
 
 # Literals.
-color red "\<[0-9]+\.[0-9]*([Ee][+-][0-9]+)?i?\>"
-color red "\<[0-9]+[Ee][+-][0-9]+i?\>"
-color red "\<\.[0-9]+([Ee][+-][0-9]+)?i?\>"
+color red "\<([1-9][0-9]*|0[0-7]*|0[xX][0-9A-Fa-f]+)\>"
+color red "\<[0-9]+\.[0-9]*([eE][+-]?[0-9]+)?i?\>"
+color red "\<[0-9]+[eE][+-]?[0-9]+i?\>"
+color red "\B\.[0-9]+([eE][+-]?[0-9]+)?i?\>"
 color red "\<[0-9]+i\>"
-color red "\<[1-9][0-9]*\>"
-color red "\<0[0-7]*\>"
-icolor red "\<0x[0-9a-f]+\>"
 
 # Strings and characters; slightly fuzzy.
 color red "\<(true|false|nil|iota|_)\>"

syntax/groff.nanorc

@@ -1,6 +1,6 @@
 ## Here is an example for groff.
 
-syntax "groff" "\.m[ems]$" "\.rof" "\.tmac$" "^tmac."
+syntax groff "(/tmac\.[^/]+$|\.(m[ems]|rof|tmac)$)"
 comment ".\""
 
 # The argument of .ds or .nr
@@ -15,7 +15,7 @@ color cyan start="(\\|\\\\)n\[" end="]"
 # Requests
 color brightgreen "^\.[[:space:]]*[^[:space:]]*"
 # Comments
-color yellow "^\.\\".*$"
+color yellow "^\.\\".*"
 # Strings
 color green "(\\|\\\\)\*(.|\(..)"
 color green start="(\\|\\\\)\*\[" end="]"

syntax/guile.nanorc

@@ -1,8 +1,7 @@
 ## Here is an example for Guile Scheme.
 
-syntax "guile" "\.scm$"
+syntax guile "\.scm$"
 header "^#!.*guile"
-magic "guile"
 comment ";"
 
 # Basic scheme functions
@@ -22,4 +21,4 @@ color blue "#?:(\w|[?-])+"
 color yellow start="^[[:blank:]]+\"" end="[^\]\""
 color yellow ""(\\.|[^"])*""
 # Comments
-color cyan "(^|[[:space:]]);.*$"
+color cyan "(^|[[:space:]]);.*"

syntax/html.nanorc

@@ -1,11 +1,11 @@
 ## Here is an example for HTML.
 
-syntax "html" "\.html?$"
-magic "HTML document text"
+syntax html "\.html?$"
+magic "HTML document"
 comment "<!--|-->"
 
 # Tags:
-color cyan start="<[[:alpha:]/!?]" end=">"
+color cyan "<[[:alpha:]/!?][^>]*>"
 # Bold, italic, and underlined:
 color brightmagenta "</?[biu]>"
 

syntax/java.nanorc

@@ -1,6 +1,6 @@
 ## Here is an example for Java.
 
-syntax "java" "\.java$"
+syntax java "\.java$"
 magic "Java "
 comment "//"
 

syntax/javascript.nanorc

@@ -1,19 +1,23 @@
-## Here is an example for Javascript.
+## Syntax highlighting for Javascript.
 
-syntax "javascript" "\.js$"
+syntax javascript "\.js$"
 comment "//"
 
-color brightred "\<[A-Z_][0-9A-Z_]+\>"
-color green "\<(const|function|let|this|typeof|var|void)\>"
-color brightyellow "\<(for|if|while|with|do|else|case|default|switch)\>"
-color brightyellow "\<(export|try|throw|catch|new|delete)\>"
-color magenta "\<(continue|break|return|yield)\>"
-color brightmagenta "'([^'\]|(\\["'abfnrtv\\]))'" "'\\(([0-3]?[0-7]{1,2}))'" "'\\x[0-9A-Fa-f]{1,2}'"
+# Declarational stuff.
+color green "\<(async|class|const|extends|function|let|this|typeof|var|void)\>"
+# Flow control and special keywords.
+color brightyellow "\<(do|while|if|else|switch|case|default|for|each|in|of|with)\>"
+color brightyellow "\<(await|export|import|throw|try|catch|finally|new|delete)\>"
+# "Exit" points.
+color magenta "\<(break|continue|return|yield)\>"
+
+# Octal/decimal and hexadecimal numbers.
+color cyan "\<[0-9]+\>" "\<0x[0-9A-Fa-f]+\>"
 
 # Strings.
-color brightyellow "<[^= 	]*>" ""(\\.|[^"])*"" "'(\\.|[^'])*'"
+color brightmagenta ""(\\.|[^"])*"" "'(\\.|[^'])*'" "`(\\.|[^`])*`"
 # Comments.
-color brightblue "//.*"
+color brightblue "(^|[[:space:]])//.*"
 color brightblue start="/\*" end="\*/"
 
 # Trailing whitespace.

syntax/json.nanorc

@@ -4,7 +4,7 @@
 # Original author:  Aapo Rantalainen
 # License:  GPLv3 or newer
 
-syntax "json" "\.json$"
+syntax json "\.json$"
 # No comments are permitted in JSON.
 comment ""
 
@@ -28,7 +28,7 @@ color brightred "\{" "\}"
 color brightred "," ":"
 
 # Comments.
-color cyan "(^|[[:space:]]+)(//|#).*$"
+color cyan "(^|[[:space:]]+)(//|#).*"
 
 # Trailing whitespace.
 color ,green "[[:space:]]+$"