po: update translations and regenerate POT file and PO files

There is no need for normal users to build from git.  Do not give
the impression that that procedure is in any way recommended.

.gitignore

@@ -13,6 +13,9 @@ core
 .gdb_history
 .gdbinit
 
+/src/nano
+/src/revision.h
+
 /ABOUT-NLS
 /INSTALL
 /aclocal.m4
@@ -35,7 +38,7 @@ core
 /mkinstalldirs
 /stamp-h1
 
-# gettext m4 files.
+# Gettext m4 files:
 /m4/codeset.m4
 /m4/extern-inline.m4
 /m4/fcntl-o.m4
@@ -69,13 +72,9 @@ core
 /m4/wint_t.m4
 /m4/xsize.m4
 
-# gnulib entries
+# Gnulib stuff:
 /gnulib/
 /lib/
 /m4/.gitignore
 /m4/gnulib-cache.m4
 /snippet/
-
-/nano.spec
-/src/nano
-/src/revision.h

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,9 @@ 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.
+	* Placing anchors (bookmarks) and jumping to them.
+
+Brand Huntsman <alpha@qzx.com>
+	* The delayed parsing of syntax files.

ChangeLog.1999-2006

@@ -3007,7 +3007,7 @@ GNU nano 1.3.5 - 2004.11.22
 	- Don't change the file format when we insert another file into
 	  the current one. (DLR)
   do_insertfile()
-	- Simplify by reusing variables whereever possible, and add a
+	- Simplify by reusing variables wherever possible, and add a
 	  parameter execute to indicate whether or not to be in "Execute
 	  Command" mode. (DLR)
 	- Rework so that goto is no longer needed, using do_writeout()
@@ -5035,7 +5035,7 @@ GNU nano 1.1.99pre2 - 2003.02.03
 	- Fix the mouse code to work with lines longer than COLS and
 	  with the proper positioning, including special characters.
 	  (David Benbennick)
-  do_preserve_msg():
+  do_preserve_msg()
 	- Unsplit error message into a single fprintf call. (Jordi)
   main()
 	- Call load_file with arg 0 for insert, as we aren't really
@@ -5143,7 +5143,7 @@ GNU nano 1.1.99pre1 - 2003.01.17
 	- Added --enable-all option to compile in all the extra stuff
 	  we'd normally need extra flags for.
 - color.c:
-  update_color():
+  update_color()
 	- Remove an unneeded edit_refresh() call after do_colorinit().
 	  (David Benbennick)
 - cut.c:
@@ -5778,7 +5778,7 @@ GNU nano 1.1.10 - 2002.07.25
 	  Also, pass current_x_find to strstrwrapper() so we know whether
 	  we're at the beginning of a string or not (see changes to
 	  strstrwrapper() below), and reset it between lines. (DLR)
-  do_gotoline():
+  do_gotoline()
 	- Make sure placewewant is zero after we go to a line. (David
 	  Benbennick)
   do_gotopos()
@@ -6036,7 +6036,7 @@ GNU nano 1.1.8 - 2002.03.30
 	- Catalan and Spanish translation updates. (Jordi)
 	- Typo. (DLR)
 - po/fr.po:
-	- French translation updates (Jean-Philippe Guérard).
+	- French translation updates. (Jean-Philippe Guérard)
 - po/gl.po:
 	- Galician translation updates. (Jacobo Tarrio)
 - po/uk.po, po/ru.po:
@@ -6156,10 +6156,9 @@ GNU nano 1.1.7 - 2002.03.05
 - po/it.po:
 	- Italian translation updates. (Marco Colombo)
 - po/cs.po:
-	- Partial Czech translation updates. (Vaclav Haisman)
+	- Partial Czech translation updates. (Václav Haisman)
 - po/hu.po:
-	- Hungarian translation updates, or to be precise, rewrite.
-	  (Gergely Nagy)
+	- Hungarian translation updates, or to be precise, rewrite. (Gergely Nagy)
 - po/uk.po, po/ru.po:
 	- Russian and Ukrainian translation updates. (Sergey A. Ribalchenko)
 - po/da.po:
@@ -6268,7 +6267,7 @@ nano-1.1.6 - 2002.01.25
 - po/nn.po:
 	- Norwegian nynorsk translation updates. (Kjetil Torgrim Homme)
 - po/nb.po:
-	- New Norwegian bokmål translation. (Stig E Sandoe <stig@ii.uib.no>)
+	- New Norwegian bokmål translation, by Stig E Sandoe <stig@ii.uib.no>.
 - po/da.po:
 	- Danish translation update. (Keld Simonsen)
 
@@ -6380,8 +6379,10 @@ nano-1.1.4 - 2001.12.11
   do_wrap()
 	- Many fixes. (David Lawrence Ramsey)
   do_spell()
-	- Dont prompt for replace if we don't change the word in
+	- Don't prompt for replace if we don't change the word in
 	  question. (Rocco Corsi)
+- m4/gettext.m4:
+	- diff against mutt 1.2.5's gettext.m4.
 - po/de.po:
 	- German translation updates. (Karl Eichwalder)
 - po/ru.po:
@@ -6394,8 +6395,6 @@ nano-1.1.4 - 2001.12.11
 	- Spanish translation updates. (Jordi)
 - po/fr.po:
 	- French translation updates. (Michel Robitaille)
-- m4/gettext.m4:
-	- diff against mutt 1.2.5's gettext.m4.
 
 nano-1.1.3 - 2001.10.26
 - General
@@ -6770,7 +6769,7 @@ nano-1.1.0 - 2001.07.15
 - po/es.po, po/ca.po:
 	- Updated. (Jordi)
 - po/gl.po:
-	- Galician translation by Jacobo Tarrío.
+	- New Galician translation, by Jacobo Tarrío <jtarrio@trasno.net>.
 - po/uk.po, po/ru.po:
 	- New Ukrainian and Russian translations by Sergey A. Ribalchenko
 	  <fisher@obu.ck.ua>, thanks!
@@ -6779,9 +6778,9 @@ nano-1.1.0 - 2001.07.15
 - po/it.po
 	- Updated Italian translation by Marco Colombo.
 - po/no.po:
-	- New Norwegian translation by Eivind Kjørstad <ekj@vestdata.no>.
+	- New Norwegian translation, by Eivind Kjørstad <ekj@vestdata.no>.
 - po/sv.po:
-	- New Swedish translation by Christian Rose <menthos@menthos.com>.
+	- New Swedish translation, by Christian Rose <menthos@menthos.com>.
 
 nano 1.0.1 - 2001.04.06
 - General:
@@ -6825,15 +6824,15 @@ nano-1.0.0 - 2001.03.22
 	  the "new" C++ reserved word, even though there is likely no way
 	  nano will EVER be compilable with a C++ compiler. (suggested by
 	  Rocco Corsi).
-- ca.po, es.po:
-	- Final tweaks for Nano 1.0.
-- cs.po:
-	- Czech translation from Vaclav Haisman.
 - nano.info:
 	- Added dir entry. (Albert Chin)
 - winio.c:
   statusq()
 	- Added NANO_BACK_KEY and NANO_FORWARD_KEY cases for left and right.
+- ca.po, es.po:
+	- Final tweaks for Nano 1.0.
+- cs.po:
+	- New Czech translation, by Václav Haisman <V.Haisman@sh.cvut.cz>.
 
 1.0-test prerelease - 2001.03.17
 - nano.c:
@@ -6847,7 +6846,7 @@ nano-1.0.0 - 2001.03.22
 	  edit update.  Fixes bug #57.
 - search.c:
   print_replaced()
-	- s/occurence/occurrence typos. (Jordi)
+	- Fix typos in "occurrence". (Jordi)
   search_init()
 	- If using Pico mode and regex and same answer is entered, use
 	  last_search string instead of answer.  Fixes bug #56.
@@ -6888,13 +6887,13 @@ nano-0.9.99pre3 - 2001.02.19
 - fi.po:
 	- Translation updates by Pauli Virtanen.
 - hu.po:
-	- Hungarian translation by Horvath Szabolcs.
+	- New Hungarian translation, by Horvath Szabolcs <horvaths@penguinpowered.com>.
 - id.po:
 	- Translation updates by Tedi Heriyanto.
 - es.po:
 	- Translation updates and grammatical/typo fixes. (Jordi)
 - ca.po:
-	- Catalan translation by Jordi Mallach :)
+	- Catalan translation by Jordi Mallach. :)
 	- Miquel Vidal <miquel@sindominio.net> went over it and corrected
 	  many typos and completed bits that remained untranslated by error.
 
@@ -6998,7 +6997,6 @@ General
 	  repeated string defs and globals.
   do_justify()
 	- Small fix for totsize calculation. (Rob)
-
 - fi.po:
 	- Update by Pauli Virtanen.
 
@@ -7395,7 +7393,7 @@ nano 0.9.18 - 2000.09.18
 - es.po:
 	- Translated new strings and minor updates. (Jordi)
 - de.po
-	- Revised translations by <floki@bigfoot.com>.
+	- Revised translations by Florian König.
 
 nano-0.9.17 - 2000.09.04
 - General
@@ -7426,7 +7424,7 @@ nano-0.9.17 - 2000.09.04
   do_toggle()
 	- Added checks for no help and no wrap mode, and print opposite
 	  enable/disable message.
-  do_suspend(), do_cont():
+  do_suspend(), do_cont()
 	- New functions, handle suspend signal in a Pico-like manner and
 	  work with Meta-Z.
 - winio.c:
@@ -7447,7 +7445,7 @@ nano-0.9.17 - 2000.09.04
   search_abort()
 	- Now calls edit_refresh_clearok when MARK_ISSET to handle screen
 	  ugliness bug (reported by Ken Tyler).
-  findnextstr():
+  findnextstr()
 	- Added reset for placewewant. (Ben Roberts)
 	- Fixed check for string that only occurs on the same line failing
 	  (bug discovered by Ken Tyler).
@@ -7532,10 +7530,10 @@ nano-0.9.14 - 2000.07.27
 	- Changed check for filename to filename[0].  Added some code,
 	  overall fixes bug #30 =-)
 - nano.c:
-  do_justify() & do_wrap():
+  do_justify(), do_wrap()
 	- totsize-related fixes. (Rob)
 - de.po
-	- Revised translations by floki@bigfoot.com
+	- Revised translations by Florian König.
 
 nano-0.9.13 - 2000.07.23
 - Implemented Pico's -k mode.  New flag CUT_TO_END, option (-k, --cut),
@@ -7548,32 +7546,32 @@ nano-0.9.13 - 2000.07.23
 	- Don't edit_refresh() if the bottom of the file is in the edit
 	  buffer. (Adam)
 - nano.c:
-  main():
+  main()
 	- TABSIZE now set before first call to edit_refresh. (Bill Soudan)
 	- Different ^C kill code (patch by Christian Weisgerber).
-  die():
+  die()
 	- More intelligent emergency-save filename selection. (Rob)
-  do_spell():
+  do_spell()
 	- Changed exit semantics a bit so that aspell wouldn't get
 	  all screwy (bug discovered by Joshua Jensen).
 - files.c:
-  read_file():
+  read_file()
 	- Added init of buf variable, hopefully this will stop the
 	  "bleeding" of text seen with mutt and using i18n.
-  write_file():
+  write_file()
 	- Added code to check to see if using -l and the file is not
 	  in fact a link.  This should fix the behavior where a file
 	  that does not have write permission but could be removed and
 	  rewritten is saved without error.  Please test this feature
 	  and give feedback.
 - search.c:
-  search_init():
+  search_init()
 	- Added " (to replace)" statement to end of search string if
 	  we are doing a replace.  Manually converted all the translations
 	  from '%s' to '%s%s' to ensure they still work with the new code.
 	  Also put in the translation for " (replace)" in the .po's.  Hope
 	  I didn't step on your toes doing this Jordi. (Chris)
-  do_search(), do_replace():
+  do_search(), do_replace()
 	- Removed call to search_abort()/replace_abort() before call to
 	  the opposite function.
 	- Fixed bug #28.
@@ -7612,52 +7610,47 @@ nano-0.9.12 - 2000.07.07
 	- Corrected FIXME in do_enter with explanation. (Rob)
 	- Fixed FIXME in do_justify, resulted in creation of
 	  fix_editbot [also fixed in do_enter] (winio.c). (Rob)
-  help_init():
+  help_init()
 	- Moved newline out of if statement. (Rocco Corsi)
-  do_char():
+  do_char()
 	- Magic Line related code in do_char. (Rob)
-  do_backspace(), do_delete():
+  do_backspace(), do_delete()
 	- Added magic line code here too.
-
-- de.po:
-	- Revised translations by floki@bigfoot.com.
-- fi.po:
-	- Finnish translation by pauli.virtanen@saunalahti.fi.
 - utils.c:
 	- Added new_magicline()
 - winio.c:
 	- Added stdlib.h to includes, found by OpenBSD gcc.
 	- lots of new commenting around display functions
-  do_yesno(), nanogetstr():
+  do_yesno(), nanogetstr()
 	- Removed now unnecessary raw/cbreak combos.
 	- Removed gettext calls from "Y(es)", "N(o)", "A(ll)" and "^C", till
 	  we decide if those keybindings should be translated. (Jordi)
-  clear_bottomwin():
+  clear_bottomwin()
 	- Removed wrefresh(edit) call.
-  edit_update_top():
+  edit_update_top()
 	- Fixed a bug that caused nano to not update when
 	  current->next == NULL (e.g. paging down to the very bottom of
 	  ABOUT NLS wouldn't work).
-  fix_editbot:
+  fix_editbot()
 	- Added (should rebuild editbot from a valid edittop). (Rob)
-  edit_add:
+  edit_add()
 	- removal of redundant call to mvwaddnstr.
+- de.po:
+	- Revised translations by Florian König.
+- fi.po:
+	- New Finnish translation, by Pauli Virtanen <pauli.virtanen@saunalahti.fi>.
 
 nano-0.9.11 - 2000.06.20
 - New flag "-T" or "--tabsize" to specify how to display tab widths.
   Affects main() in nano.c, strlenpt(), xpt() and actual_x() (et al) in
   winio.c, and nano.h.  Many hardcoded "8"s have been changed to the
   TABSIZE int.  Added changes to nano.1 and nano.1.html.
-- id.po:
-	- Indonesian translation by Tedi Heriyanto.
-- es.po:
-	- Updated translation. (Jordi Mallach)
 - winio.c
 	- Rewrite of display functions to correct the display problems
 	  we had been seeing. Affects: add_marked_sameline, edit_add,
 	  and many others. (Rob Siemborski)
 	- totsize fixes. (Rob Siemborski)
-  total_refresh():
+  total_refresh()
 	- Cut display_main_list call, as this function is only supposed to
 	  refresh what's already on the screen, not go through the process
 	  of adding the text again.
@@ -7669,12 +7662,12 @@ nano-0.9.11 - 2000.06.20
 	  Changed all calls to editwinrows - 1 in nano.c and move.c.
 	- Removed all functions that were split into other files.
 	  Affects LOTS of funcs.
-  do_enter():
+  do_enter()
 	- Added reset of placewewant to end.
-  do_insertfile():
+  do_insertfile()
 	- Fix display problem when using Ctrl-R to load a file
 	  into the buffer. (Rob Siemborski)
-  handle_sigwinch():
+  handle_sigwinch()
 	- Added titlebar(), edit_refresh() and display_main_list() calls
 	  because a resize wasn't picking up on possible different width
 	  correctly.
@@ -7689,17 +7682,21 @@ nano-0.9.11 - 2000.06.20
 - search.c:
 	- Contains all our searching and related functions, (do_search(),
 	  findnextstr(), do_replace(), do_gotoline()).
+- id.po:
+	- New Indonesian translation, by Tedi Heriyanto <tedi_h@gmx.net>.
+- es.po:
+	- Updated translation. (Jordi Mallach)
 
 nano-0.9.10 - 2000.06.04
-- es.po:
-	- Translation updates. (Jordi)
 - AUTHORS, nano.1.html, TODO, README:
 	- Documentation and email address updates. (Jordi)
 - nano.c:
-  main():
+  main()
 	- Moved Adam's termio code down to after getopt() and before initscr()
 	  to stop people losing their SIGINT character when using args that
 	  exit nano before it runs (--version, --help, etc).
+- es.po:
+	- Translation updates. (Jordi)
 
 nano-0.9.9 - 2000.05.31
 - Makefile.am:
@@ -7708,8 +7705,6 @@ nano-0.9.9 - 2000.05.31
 	- Spelling fixes. (Jordi Mallach)
 	- Removed CFLAGS changes for gcc, reduces portability according to
 	  some, and it certainly doesn't seem to decrease exe size.
-- es.po:
-	- Spanish translation updates. (Jordi Mallach)
 - POTFILES.in:
 	- Added global.c file, was screwing up translations (i.e. they
 	  weren't getting done).
@@ -7747,6 +7742,8 @@ nano-0.9.9 - 2000.05.31
 - winio.c:
   total_refresh():
 	- Completely rewrote function, not quite so brain-damaged now.
+- es.po:
+	- Spanish translation updates. (Jordi Mallach)
 
 nano-0.9.8 - 2000.05.18
 - nano.c:
@@ -7768,7 +7765,7 @@ nano-0.9.8 - 2000.05.18
 	  should now only be called once, at the bottom of the main()
 	  loop.
 - global.c:
-   shortcut_init():
+  shortcut_init():
 	- Removed suspend sc_init call and suspend message because suspend
 	  is no longer needed in the shortcut list to work properly.
 
@@ -7787,7 +7784,6 @@ nano-0.9.7 - 2000.05.14
 	  display update (bug discovered by Ken Tyler).
 
 nano-0.9.6 - 2000.05.08
-- New Italian translation (it.po), by Daniele Medri.
 - nano.c:
   page_up(), page_down():
 	- Added reset of placewewant to 0, as it should be.
@@ -7806,6 +7802,12 @@ nano-0.9.6 - 2000.05.08
 	- Removed yucky code that didn't work, this function now just
 	  computes edittop and editbot and calls edit_refresh() to do the
 	  rest, which removes a lot of duplicate code...
+- it.po:
+	- New Italian translation, by Daniele Medri <madrid@linux.it>.
+- fr.po:
+	- New French translation, by Pierre Tane <tanep@bigfoot.com>.
+- de.po:
+	- New German translation, by Florian König <floki@bigfoot.com>.
 
 nano-0.9.5 - 2000.05.01
 - Removed bytes from file struct because it was computationally wasteful.
@@ -7831,25 +7833,23 @@ nano-0.9.5 - 2000.05.01
 	- Removed inefficient call to edit_refresh() after every keystroke.
 	  It is now up each function to leave the screen in a good state.
 - winio.c:
-  do_cursorpos()
+  do_cursorpos():
 	- Rewritten to not use bytes from filestruct by an incremental sum.
   update_line(), reset_cursor():
 	- Optimized calls to xplustabs() through a single variable.
 	- update_line() now takes a new arg, an index into the string
-	  for where to update the line from.  Needed for new update
-	  code.
+	  for where to update the line from.  Needed for new update code.
 - configure.in:
 	- Better checks for slang, allows argument to --with-slang.
 	  (Albert Chin-A-Young)
 	- Removed -Iintl from CFLAGS in gcc check.
 - Makefile.am:
-	- Addition of -Iintl for gettext (Albert Chin-A-Young)
+	- Addition of -Iintl for gettext. (Albert Chin-A-Young)
 
 nano-0.9.4 - 2000.04.25
- - Fixed calls to no_help and changed them to the more consistent
-   ISSET(NO_HELP).  Fixed return val of no_help to be what it should (2,
-   not 1.  Code to temporarily disable NO_HELP when in the
-   help system. (Adam Rogoyski)
+- Fixed calls to no_help and changed them to the more consistent ISSET(NO_HELP).
+  Fixed return val of no_help to be what it should (2, not 1).  Code to
+  temporarily disable NO_HELP when in the help system. (Adam Rogoyski)
 - cut.c:
   do_marked_cut(), do_cut(), do_uncut():
 	- Commented out unnecessary bits when NANO_SMALL is being used.
@@ -7985,23 +7985,26 @@ nano-0.8.8 - 2000.03.12
   support i18n.
 - nano.c:
   includes:	Added sys/param.h and limits.h. (Adam Rogoyski).
-  statics:	Changed some things that were not necessarily static
-		(Adam Rogoyski).
-  nrealloc():	New function, similar to nmalloc().  Changed calls from
+  statics:	Changed some things that were not necessarily static.
+		(Adam Rogoyski)
+  nrealloc():
+		New function, similar to nmalloc().  Changed calls from
 		realloc() to nrealloc. (Adam Rogoyski)
   empty_line(), no_spaces(), justify_format(), do_justify():
 		New functions for justify function. (Adam Rogoyski)
 - winio.c:
-  blank_edit():	Added wrefresh call to edit so that screen updates (like
-		on ^L) actually work.
-  xplustabs(), xpt(), strlenpt(): Fixed off-by-one buglets. (Adam Rogoyski)
+  blank_edit():
+		Added wrefresh call to edit so that screen updates (like on ^L)
+		actually work.
+  xplustabs(), xpt(), strlenpt():
+		Fixed off-by-one buglets. (Adam Rogoyski)
 
 nano-0.8.7 - 2000.03.01
 - main.c:
-  do_wrap():	Better fix for segfaults, and fix for lines being wrapped
-		to a single character on one line when no good place to
-		break the line exists, and for wrapping lines longer than
-		COLS.
+  do_wrap():
+		Better fix for segfaults, and fix for lines being wrapped
+		to a single character on one line when no good place to break
+		the line exists, and for wrapping lines longer than COLS.
 - nano.1.html:
 		Html version of man page, now included in dist.  For
 		the benefit of nano packages in Linux distributions.
@@ -8024,7 +8027,8 @@ nano-0.8.6 - 2000.02.24
 
 nano-0.8.5 - 2000.02.18
 - nano.c:
-  main():	Finally fixed tilde being input on page up/down keys in
+  main():
+		Finally fixed tilde being input on page up/down keys in
 		certain terminal types.  Fix was input 26->91->5[34] check
 		for 126, if so make the kbinput PAGE UP/DOWN, else unget
 		the keystroke and continue.  Added #include <ioctl.h> for
@@ -8038,7 +8042,7 @@ nano-0.8.5 - 2000.02.18
 		edit_refresh() is now unmanageably complex, and must be
 		revamped.
   check_statblank():
-		Added check for constupdate, makes things less choppy
+		Added check for constupdate, makes things less choppy.
 		(Adam Rogoyski)
 
 nano-0.8.4 - 2000.02.11
@@ -8049,7 +8053,8 @@ nano-0.8.4 - 2000.02.11
 		Removed redundant NANO_CONTROL_H from backspace shortcut,
 		added char 127 which should have been there.
 - nano.c:
-  main():	Fix for loops looping until MAIN_LEN, added -1 to stop
+  main():
+		Fix for loops looping until MAIN_LEN, added -1 to stop
 		segfaults. (Adam Rogoyski)
 - Makefile.am:	Added all source filenames. (Adam Rogoyski)
 - nano.1:	Fixed mail addressed and added mailing list address.
@@ -8057,13 +8062,15 @@ nano-0.8.4 - 2000.02.11
 
 nano-0.8.3 - 2000.02.08
 - New Pico mode (-p, --pico), toggles (more) compatibility with the
-  Pico messages displayed in the shortcut list.  Note that there are still
-  small differences in this mode.
-- nano.h:	New shortcut struct format, for the benefit of i18n and
+  Pico messages displayed in the shortcut list.  Note that there are
+  still small differences in this mode.
+- nano.h:
+		New shortcut struct format, for the benefit of i18n and
 		our help menu.  Removed shortcut message macros, they are
 		now all in shortcut_init in global.c.
 - nano.c:
-  do_wrap():	Removed resetting of current_x when we are in fact
+  do_wrap():
+		Removed resetting of current_x when we are in fact
 		wrapping to the next line, fixes a bug in -i mode.
   do_enter():
 		Rewrote the autoindent mode code to be a lot less pretty,
@@ -8116,7 +8123,8 @@ nano-0.8.1 - 2000.01.28
   global variable fill, affects check_wrap(), do_wrap(), main(), usage(),
   global.c and proto.h.
 - nano.c:
-write_file():		Added (incredibly) necessary check for EPERM when
+write_file():
+			Added (incredibly) necessary check for EPERM when
 			link() fails.  This allows us to actually save
 			files via rename() on filesystems that don't
 			support hard links (AIEEEEEE).
@@ -8136,7 +8144,7 @@ nano-0.8.0 - 2000.01.25
 - View flag (-v, --view) implemented.  Global variable view_mode, affects
   main loop of nano.c and new_file(). (Chris)
 - nano.c:
-			split checks for TERMIOS_H and TERMIO_H up so we
+			Split checks for TERMIOS_H and TERMIO_H up so we
 			can (theoretically) include them both, which is good.
 handle_sigwinch():
 			Added check for ncurses.h. (Andy Kahn)
@@ -8254,7 +8262,6 @@ nano 0.7.6 - 2000.01.15
 		than one huge buffer, and replaced the strcat at the end
 		with an index variable.  Added call to read_bytes().
   do_next_word(): New function, binding is Ctrl-Space (0). (Chris)
-
 - winio.c:
   bottombars():	Fixed non-expanding shortcut keys at bottom of screen.
 		(formula is extra space needed = COLS / 6 - 13).
@@ -8278,7 +8285,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

@@ -330,7 +330,7 @@ GNU nano 2.5.2 - 2016.02.12
 
 2016-02-09  Benno Schulenberg  <bensberg@justemail.net>
 	* src/files.c (stat_with_alloc, open_buffer, write_file): Check the
-	result of a stat() to avoid referencing unitialized data.  Original
+	result of a stat() to avoid referencing uninitialized data.  Original
 	patch was by Kamil Dudka.
 	* doc/man/{nano.1,rnano.1,nanorc.5}: Adjust version for release.
 
@@ -661,7 +661,7 @@ GNU nano 2.5.0 - 2015.12.05
 	This addresses Debian bug #805288.
 
 2015-12-01  Benno Schulenberg  <bensberg@justemail.net>
-	* src/files.c (do_insertfile): Mark the buffer as mofified only when
+	* src/files.c (do_insertfile): Mark the buffer as modified only when
 	actually something was inserted.  This fixes Savannah bug #45409.
 	* src/files.c (do_insertfile): Rename two variables for clarity.
 	* src/text.c (redo_cut): Delete two redundant assignments.
@@ -1305,7 +1305,7 @@ GNU nano 2.4.2 - 2015.07.05
 	* src/text.c (do_alt_speller, do_linter, do_formatter): Distinguish
 	a failure to launch the linter from receiving zero parsable lines;
 	add a new function to glue together the invocation-error string.
-	* src/global.c (shortcut_init): In the Help Viewer and File Browswer,
+	* src/global.c (shortcut_init): In the Help Viewer and File Browser,
 	bind the unbound Home and End keys to goto_top and goto_bottom, to
 	mimic the behaviour of these keys in file viewers and web browsers.
 	Also show ^Y and ^V in the WhereisFile menu instead of M-\ and M-/,
@@ -2005,7 +2005,7 @@ GNU nano 2.3.4 - 2014.06.02
 
 2014-06-02  Chris Allegretta  <chrisa@asty.org>
 	* doc/syntax/default.nanorc: Can't do trailing spaces in the
-	  default syntax or it will hilight the spaces as you type them
+	  default syntax or it will highlight the spaces as you type them
 	  into a new file, which for non-programming is infuriating.
 
 2014-05-29  Mark Majeres  <mark@engine12.com>
@@ -3448,14 +3448,14 @@ GNU nano 2.1.8 - 2009.02.07
 2009-01-25 Chris Allegretta <chrisa@asty.org>
 	* files.c (open_file), nanorc.c (parse_include): Don't get_full_path on included
 	  rc files, due to it potentially impacting the ability to read files in nano's
-	  cwd().  Fixes Savnanah bug #25297 reported by Mike Frysinger.
+	  cwd().  Fixes Savannah bug #25297 reported by Mike Frysinger.
 
 2009-01-24 Chris Allegretta <chrisa@asty.org>
-	* First pass at some caching of caching color info.  Right now it's only for
+	* First pass at some caching of color info.  Right now it's only for
 	  multi-line regexes but this may not be enough to increase performance.
 	* Add interruptability to search functions.  New functions enable_nodelay and
 	  disable_nodelay and changes to the routines to handle checking for pending
-	  searches.  Fixes Savnnah bug #24946: Need interrrupt for search.
+	  searches.  Fixes Savannah bug #24946: Need interrupt for search.
 
 2009-01-19 Chris Allegretta <chrisa@asty.org>
 	* Change function definitions to shorts instead of (void *)s.  New mapping function
@@ -3494,7 +3494,7 @@ GNU nano 2.1.6 - 2008.10.03
 	* ocaml.nanorc: Sample OCaml syntax highlighting file.
 
 2008-09-30 Dave Geering <dgeering@toshiba-tap.com>
-	* objc.nanorc: Sample Objective-C syntax hightlighting file.
+	* objc.nanorc: Sample Objective-C syntax highlighting file.
 
 2008-09-30 Chris Allegretta <chrisa@asty.org>
 	* configure.ac: Change extra, multibuffer, color and rcfile configure options
@@ -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
 
@@ -3648,7 +3648,7 @@ GNU nano 2.1.1 - 2008.04.01
 	* gentoo.nanorc: Gentoo syntax highlighting config.
 
 2008-03-17  Benno Schulenberg <bensberg@justemail.net>
-	* global.c: Fix incorrect first line jump messsage, fix
+	* global.c: Fix incorrect first line jump message, fix
 	  more comments to assist translators.
 	* winio.c: Fix shortcut labels not being translated.
 

IMPROVEMENTS

@@ -1,9 +1,42 @@
 Improvements in GNU nano
 ========================
 
+Since 5.0:
+  - M-Bsp deletes a word leftward.
+  - With --indicator a "scrollbar" is shown, indicating position+portion.
+  - M-Ins places an anchor, M-PgUp/M-PgDn jump to the nearest anchor.
+  - Toggling help lines (M-X) and Refresh (^L) work nearly everywhere.
+  - Colors can be modified with the attributes "bold," and/or "italic,".
+  - Nine new color names: from pink and purple to orange and latte.
+
+Since 4.0:
+  - Pasting from outside into nano suppresses auto-indentation.
+  - Such an external paste can be undone with a single M-U.
+  - Shift+Meta+letter key combos can be bound with 'bind Sh-M-letter ...'.
+  - A custom nanorc file may be specified with -f / --rcfile.
+  - What the <Tab> key produces can be specified per syntax with 'tabgives'.
+  - The ability to perform a search at startup with +/string or +?string.
+  - Comment characters are copied when automatic hard-wrapping occurs.
+  - 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.
+  - A key can be bound to a string -- any mix of text and control codes.
   - 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'.
@@ -14,7 +47,6 @@ Since 2.9.0:
     for the history files (of search strings and cursor positions).
 
 Since 2.8.0:
-  - Meta-Up/Meta-Down will search the previous/next occurrence.
   - ^U pastes the first line of the cutbuffer at a prompt.
   - Softwrapping can be done at whitespace (with --soft --atblanks).
   - The ^G help texts have become searchable (with ^W and M-W).
@@ -34,28 +66,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.
@@ -67,25 +100,19 @@ Noteworthy changes since 2.2
   - The option 'positionlog' for saving/restoring the cursor position.
   - The ability to read and write vim-style lock files.
 
-Visible changes since 2.0
--------------------------
-* Editor Features
-  - The ability to rebind (reassign) keys using the nanorc.
+Since 2.0.0:
+  - The ability to rebind keys, via a nanorc file.
   - The ability to read standard input like a pager ("nano -").
   - Color syntax highlighting can be set by the first line of a file.
   - The ability to silence nanorc error messages (-q).
-  - Undo/redo operations (-u).
+  - Undo/redo operations (M-U/M-E, enabled with -u).
   - Soft wrapping of text (-$).
-
-* File Handling
   - Better handling of backup files: if nano can't write a backup file,
     it won't try to write the original file afterward.
   - Emergency savefiles retain ownerships and permissions when possible.
   - Performance improvements in color syntax highlighting.
 
-Visible changes since 1.2
--------------------------
-* Editor Features
+Since 1.2.0:
   - Support for UTF-8.
   - Moving to a specified line and column of a file, instead of just a
     line (+LINE,COLUMN).
@@ -94,7 +121,7 @@ Visible changes since 1.2
   - Insertion of spaces instead of a tab when Tab is pressed (-E).
   - The long option for -K is now --rebindkeypad.
   - Regular expression searching can now be toggled when nano is built
-    with --enable-tiny, so -R now means something else (see below).
+    with --enable-tiny, so -R now means something else (see next item).
   - Restricted mode that provides more security than -o (-R).
   - Blanking of the statusbar after 1 keystroke instead of 25 (-U).
   - Word searches can optionally skip over punctuation (-W).
@@ -102,70 +129,58 @@ Visible changes since 1.2
   - Many more options are supported in the nanorc.
   - Improvements to color syntax highlighting support: case insensitive
     matching, the ability to include color syntaxes in separate files,
-    the ability to specify background colors without foreground colors,
-    etc.
+    the ability to specify background colors without foreground colors...
   - Insertion of single-byte characters via Esc Esc <000-255>.
-  - Insertion of all characters via "Verbatim Input" mode.
+  - Insertion of any character via Meta-V, "Verbatim Input".
   - Workaround for the "NumLock glitch".
-  - Meta-W now repeats the last search.  Wrapping is now toggled via
-    Meta-L.
+  - Meta-W now repeats the last search.  Wrapping is toggled via Meta-L.
   - Replacing and spell checking only selected text.
   - Indenting lines with one keystroke.
   - Copying text into the cutbuffer without cutting it.
-  - Scrolling the text up and down single lines without moving the
-    cursor.
+  - Scrolling the text up and down single lines without moving the cursor.
   - PageUp and PageDown work more smoothly when using -S.
   - Scrolling the help text up and down single lines.
   - Cutting all text from the current position to the end of the file
-    with one keystroke.
-  - Justifying the entire file with one keystroke.
+    with one keystroke (Meta-T).
+  - Justifying the entire file with one keystroke (Meta-J).
   - Justifying without removing spaces from the ends of lines.
   - Unjustifying after justifying and immediately resizing.
   - Going to the first or last line of the current paragraph.
   - Going to the first or last line of the file without having to go to
     the "Search" prompt.
   - Searching for filenames in the file browser.
-  - Displaying spaces and tabs differently to make it easier to tell
-    them apart.
-  - Many more functions available at the statusbar prompt: moving to the
-    next or previous word, searching for matching brackets, "Verbatim
-    Input" mode, etc.
-  - The glibc 2.2.3 crashes involving extended regular expressions are
-    no longer worked around, as they can break anything using extended
-    regular expressions, and glibc 2.2.3 is old.  You should upgrade to
-    at least glibc 2.2.4.
-
-* File Handling
+  - Spaces and tabs are shown differently to make it easier to tell them apart.
+  - Many more functions are available at the prompt: moving to the next or
+    previous word, searching for matching brackets, "Verbatim Input"...
+  - "To Line" (^W^T) and "Read from Command" (^R^X) return to their parent
+    menu when their keystroke is entered again (^W^T^T and ^R^X^X).
   - Automatic adding of newlines to the ends of files without them can
     now be disabled (-L).
-  - Converting from and to DOS/Mac file format is now toggled only at
-    the "Write File" prompt, via Meta-D and Meta-M, and the default file
-    format to save in is now set depending on what format the file was
-    originally in.  -D now makes nano use bold text instead of reverse
-    video text, and Meta-D at the edit window now does a
-    word/line/character count.  -O now makes the unused second line of
-    the screen part of the edit window, and Meta-O at the edit window
-    now toggles this behavior.
+  - Converting from and to DOS/Mac file format is now toggled only at the
+    "Write File" prompt, via Meta-D and Meta-M, and the default file format
+    to save in is now set depending on what format the file was originally
+    in.  -D now makes nano use bold text instead of reverse video text,
+    and Meta-D at the edit window now does a word/line/character count.
+    -O now makes the unused second line of the screen part of the edit
+    window, and Meta-O now toggles this behavior while editing.
   - Converting files that contain a mix of DOS and Mac format lines.
   - Automatic switching on of -N with binary files has been removed, as
     it causes problems with UTF-8 support.
 
-Visible changes since 1.0
--------------------------
-* Editor Features
-  - Complete Pico compatibility (--pico has been removed, and -p means
-    something else, see below).
-  - nanorc support (see nanorc.sample included in sources).
+Since 1.0
+  - Complete Pico compatibility (option --pico has been removed,
+    and -p now means something else, see below).
+  - Support for nanorc files.
   - Smooth scrolling (-S).
-  - Support for searching for matching braces, brackets, etc.
+  - Jumping to the matching brace, bracket, etc.
   - Help for all editor features.
   - Color syntax highlighting support.
   - Quote string support, useful for mail agents, etc. (-Q).
   - Insertion of output of external commands.
   - Optional enabling of XON and XOFF control characters (-p).
-  - Tons of bugfixes/enhancements for already existing features.
-
-* File Handling
+  - Option -o (--operatingdir) implements a chroot of sorts.
+  - Mouse support (-m) also allows clicking on shortcuts.
+  - Option -r allows a negative argument.
   - Overwriting and appending or prepending to files.
   - Writing marked text to separate files.
   - Multiple file buffers (-F).
@@ -174,4 +189,12 @@ Visible changes since 1.0
   - Creation of backup files (-B).
   - Search/replace history (-H).
 
-See the nano manual for detailed information on each feature.
+Available in 1.0:
+  - Spell checking (^T).
+  - Justification (^J) and unjustification (^U).
+  - Internationalization (more translations are welcome).
+  - Help texts (^G).
+  - Resizing in X.
+  - On PageUp/Down, the cursor is put on the first screen line (like Pico).
+  - Tab completion at the prompt (for filenames and ~user).
+  - Cut-to-end-of-line option (-k).

Makefile.am

@@ -6,7 +6,12 @@ if USE_COLOR
 SUBDIRS += syntax
 endif
 
-EXTRA_DIST = ChangeLog.1999-2006 ChangeLog.2007-2015 \
-		IMPROVEMENTS README.GIT nano.spec
+EXTRA_DIST = IMPROVEMENTS
 
 ACLOCAL_AMFLAGS = -I m4
+
+showinfo:
+	@ echo
+	@ echo "  The global nanorc file is: @sysconfdir@/nanorc"
+	@ echo "  Syntaxes get installed in: @PKGDATADIR@/"
+	@ echo

NEWS

@@ -1,3 +1,260 @@
+2020.08.24 - GNU nano 5.2 "Ranrapalca"
+• Making certain replacements after a large paste does not crash.
+• Hitting a toggle at the Search prompt does not clear the answer.
+• Using --positionlog does not complain at the first start.
+• A macro containing a Search command will not sometimes fail.
+
+2020.08.12 - GNU nano 5.1 "Cantabria"
+• M-Bsp (Alt+Backspace) deletes a word backwards, like in Bash.
+• M-[ has become bindable.  (Be careful, though: as it is the
+  starting combination of many escape sequences, avoid gluing
+  it together with other keystrokes, like in a macro.)
+• With --indicator and --softwrap, the first keystroke in an
+  empty buffer does not crash.
+• Invoking the formatter while text is marked does not crash.
+• In UTF-8 locales, an anchor is shown as a diamond.
+
+2020.07.29 - GNU nano 5.0 "Among the fields of barley"
+• With --indicator (or -q or 'set indicator') nano will show a kind
+  of scrollbar on the righthand side of the screen to indicate where
+  in the buffer the viewport is located and how much it covers.
+• With <Alt+Insert> any line can be "tagged" with an anchor, and
+  <Alt+PageUp> and <Alt+PageDown> will jump to the nearest anchor.
+  When using line numbers, an anchor is shown as "+" in the margin.
+• The Execute Command prompt is now directly accessible from the
+  main menu (with ^T, replacing the Spell Checker).  The Linter,
+  Formatter, Spell Checker, Full Justification, Suspension, and
+  Cut-Till-End functions are available in this menu too.
+• On terminals that support at least 256 colors, nine new color
+  names are available: pink, purple, mauve, lagoon, mint, lime,
+  peach, orange, and latte.  These do not have lighter versions.
+• For the color names red, green, blue, yellow, cyan, magenta,
+  white, and black, the prefix 'light' gives a brighter color.
+  Prefix 'bright' is deprecated, as it means both bold AND light.
+• All color names can be preceded with "bold," and/or "italic,"
+  (in that order) to get a bold and/or italic typeface.
+• With --bookstyle (or -O or 'set bookstyle') nano considers any
+  line that begins with whitespace as the start of a paragraph.
+• Refreshing the screen with ^L now works in every menu.
+• In the main menu, ^L also centers the line with the cursor.
+• Toggling the help lines with M-X now works in all menus except
+  in the help viewer and the linter.
+• At a filename prompt, the first <Tab> lists the possibilities,
+  and these are listed near the bottom instead of near the top.
+• Bindable function 'curpos' has been renamed to 'location'.
+• Long option --tempfile has been renamed to --saveonexit.
+• Short option -S is now a synonym of --softwrap.
+• The New Buffer toggle (M-F) has become non-persistent.  Options
+  --multibuffer and 'set multibuffer' still make it default to on.
+• Backup files will retain their group ownership (when possible).
+• Data is synced to disk before "... lines written" is shown.
+• The raw escape sequences for F13 to F16 are no longer recognized.
+• Distro-specific syntaxes, and syntaxes of less common languages,
+  have been moved down to subdirectory syntax/extra/.  The affected
+  distros and others may wish to move wanted syntaxes one level up.
+• Syntaxes for Markdown, Haskell, and Ada were added.
+
+
+2020.05.23 - GNU nano 4.9.3 "Almendras"
+• One more bug introduced in version 4.9 is fixed: a crash when
+  the terminal screen is resized while at a lock-file prompt.
+
+2020.04.07 - GNU nano 4.9.2 "Mali Lošinj"
+• Another bug introduced in version 4.9 is fixed: a likely crash
+  after undoing an <Enter> at the end of leading whitespace.
+
+2020.03.31 - GNU nano 4.9.1 "Sapperdeflap"
+• Two bugs introduced in version 4.9 are fixed: the cursor
+  getting misplaced when undoing line cuts, and filtering
+  of the whole buffer to a new buffer not working.
+
+2020.03.24 - GNU nano 4.9 "die fetten Jahre sind vorbei"
+• When justifying a selection, the new paragraph and the
+  succeeding one get the appropriate first-line indent.
+• Trying to justify an empty selection does not crash.
+• Redoing the insertion of an empty file does not crash.
+• On the BSDs and macOS, ^H has become rebindable again
+  (in most terminal emulators, not on the console).
+• DOS line endings in nanorc files are accepted.
+• Option --suspend / 'set suspend' has been renamed to
+  the more logical --suspendable / 'set suspendable'.
+
+2020.02.07 - GNU nano 4.8 "Jaška"
+• When something is pasted into nano, auto-indentation is suppressed,
+  and the paste can be undone as a whole with a single M-U.
+• When a lock file is encountered during startup, pressing ^C/Cancel
+  quits nano.  (Pressing 'No' just skips the file and continues.)
+• Shift+Meta+letter key combos can be bound with 'bind Sh-M-letter'.
+  Making any such binding dismisses the default behavior of ignoring
+  Shift for all Meta+letter keystrokes.
+• The configuration option --with-slang (to be avoided when possible)
+  can now be used only together with --enable-tiny.
+• A custom nanorc file can be specified on the command line, with
+  -f filename or --rcfile=filename.
+
+2019.12.23 - GNU nano 4.7 "Havikskruid"
+• A <Tab> will indent a marked region only when mark and cursor are
+  on different lines.
+• Two indentations (any mix of tabs and spaces) are considered the
+  same when they look the same (that is: indent to the same level).
+• When using --breaklonglines or ^J, a line will never be broken in
+  its leading whitespace or quoting.
+• The keywords in nanorc files must be in lowercase.
+
+2019.11.29 - GNU nano 4.6 "And don't you eat that yellow snow"
+• The 'formatter' command has returned, bound by default to M-F.
+  It allows running a syntax-specific command on the contents of
+  the buffer.
+• ^T will try to run 'hunspell' before 'spell', because it checks
+  spellling for the locale's language and understands UTF-8.
+• Multiple errors or warnings on startup will no longer slow nano
+  down but will be indicated on the status bar with trailing dots.
+
+2019.10.04 - GNU nano 4.5 "Košice"
+• The new 'tabgives' command allows you to specify per syntax what
+  the <Tab> key should produce: some spaces, a hard TAB, ...
+• The output of --help is properly aligned again for all languages.
+• <Tab> will indent a marked region also when M-} has been rebound.
+
+2019.08.25 - GNU nano 4.4 "Hagelslag"
+• At startup, the cursor can be put on the first or last occurrence
+  of a string by preceding the filename with +/string or +?string.
+• When automatic hard-wrapping occurs (--breaklonglines), any leading
+  quoting characters will be automatically copied to the new line.
+• M-6 works again also when the cursor is at end of buffer.
+
+2019.06.18 - GNU nano 4.3 "Musa Kart"
+• The ability to read from and write to a FIFO has been regained.
+• Startup time is reduced by fully parsing a syntax only when needed.
+• Asking for help (^G) when using --operatingdir does not crash.
+• The reading of a huge or slow file can be stopped with ^C.
+• Cut, zap, and copy operations are undone separately when intermixed.
+• M-D reports the correct number of lines (zero for an empty buffer).
+
+2019.04.24 - GNU nano 4.2 "Tax the rich, pay the teachers"
+• The integrated spell checker does not crash when 'spell' is missing.
+• Option --breaklonglines works also when --ignorercfiles is used.
+• Automatic hard-wrapping is more persistent in pushing words to the
+  same overflow line.
+
+2019.04.15 - GNU nano 4.1 "Qué corchos será eso?"
+• By default, a newline character is again automatically added at the
+  end of a buffer, to produce valid POSIX text files by default, but
+  also to get back the easy adding of text at the bottom.
+• The now unneeded option --finalnewline (-f) has been removed.
+• Syntax files are read in alphabetical order when globbing, so that
+  the precedence of syntaxes becomes predictable.
+• In the C syntax, preprocessor directives are highlighted differently.
+• M-S now toggles soft wrapping, and M-N toggles line numbers.
+• The jumpy-scrolling toggle has been removed.
+• The legacy keystrokes ^W^Y and ^W^V are recognized again.
+• Executing an external command is disallowed when in view mode.
+• Problems with resizing during external or speller commands were fixed.
+
+2019.03.24 - GNU nano 4.0 "Thy Rope of Sands"
+• An overlong line is no longer automatically hard-wrapped.
+• Smooth scrolling (one line at a time) has become the default.
+• A newline character is no longer automatically added at end of buffer.
+• The line below the title bar is by default part of the editing space.
+• Option --breaklonglines (-b) turns automatic hard-wrapping back on.
+• Option --jumpyscrolling (-j) gives the chunky, half-screen scrolling.
+• Option --finalnewline (-f) brings back the automatic newline at EOF.
+• Option --emptyline (-e) leaves the line below the title bar unused.
+• <Alt+Up> and <Alt+Down> now do a linewise scroll instead of a findnext.
+• Any number of justifications can be undone (like all other operations).
+• When marked text is justified, it becomes a single, separate paragraph.
+• Option --guidestripe=<number> draws a vertical bar at the given column.
+• Option --fill=<number> no longer turns on automatic hard-wrapping.
+• When a line continues offscreen, it now ends with a highlighted ">".
+• The halves of a split two-column character are shown as "[" and "]".
+• A line now scrolls horizontally one column earlier.
+• The bindable functions 'cutwordleft' and 'cutwordright' were renamed
+  to 'chopwordleft' and 'chopwordright' as they don't use the cutbuffer.
+• The paragraph-jumping functions were moved from Search to Go-to-Line.
+• Option --rebinddelete is able to compensate for more misbindings.
+• Options --morespace and --smooth are obsolete and thus ignored.
+• The --disable-wrapping-as-root configure option was removed.
+
+
+2018.11.11 - GNU nano 3.2 "Het kromme hout" changes the default binding
+             for the linter to M-B so that the spell checker (^T) can
+             always be used, and changes (when linting) the text in the
+             title bar and the color of the status bar to make linting
+             mode more obvious.  It also adds a bindable 'zap' function
+             for deleting a line or marked region without changing the
+             cutbuffer, adds --zap to bind the <Del> and <Backspace>
+             keys to the zap function when something is marked, and
+             hard-binds <Alt+Del> to 'zap'.  Furthermore, it shows the
+             cursor also in the help viewer (when --showcursor is used),
+             renames the bindable functions 'prevhistory' to 'older' and
+             'nexthistory' to 'newer' (update your nanorcs when needed),
+             reads the nanorc files also in restricted mode to allow
+             customization by the user (if this should not be allowed,
+             use --ignorercfiles in addition to --restricted), allows
+             in view mode to open also other files (if this should not
+             be allowed, use --restricted in addition to --view), makes
+             resizes respect a relative --fill again, no longer binds
+             F13...F15 by default, properly re-highlights a misspelled
+             word after invoking help in the internal spell checker,
+             and does not skip Unicode characters in string binds.
+
+2018.09.18 - GNU nano 3.1 "Je faisais des bonds comme ça!" fixes a
+             misbinding of ^H on some terminals and some systems,
+             does not leave stray stuff after the prompt upon exit
+             when having suspended nano while using --constantshow,
+             and does not allow to toggle to Replace in view mode.
+
+2018.09.09 - GNU nano 3.0 "Water Flowing Underground" speeds up the
+             reading of a file by seventy percent, roughly doubles the
+             speed of handling ASCII text, changes the way words at line
+             boundaries are deleted, makes <Ctrl+Delete> wipe the next
+             word and <Ctrl+Shift+Delete> the preceding word, binds M-Q
+             to 'findprevious' by default (the Tabs-to-Spaces toggle is
+             placed on M-O, and the More-Space toggle is fully removed),
+             makes an external spell check undoable, shows the correct
+             number of lines on the status bar when opening multiple
+             files, removes the 'formatter' command, removes the
+             'searchagain' bindable function (M-W is now bound to
+             'findnext' by default), moves the No-Convert toggle to the
+             Insert menu, removes the Backup and New-Buffer toggles from
+             the main menu (they remain in the Write-Out and Insert
+             menus, respectively), is more precise in what it accepts as
+             a rebindable key name, ignores any presses of <Esc> before
+             a valid command keystroke, recognizes some more escape
+             sequences for modified editing-pad keys, does not hide
+             rcfile error messages on a Linux console, renames the
+             bindable functions 'copytext' to 'copy' and 'uncut' to
+             'paste', and avoids a possible hang during a Full-Justify.
+
+
+2018.06.02 - GNU nano 2.9.8 "Espresso" brings the ability to filter the
+             buffer (or the marked region) through an external command
+             (^R^X and prefix the command with the pipe symbol, "|"), is
+             better at detecting and maintaining paragraphs, is able to
+             justify //-style comments, fixes a crash when the binding
+             of a key to a string lacks a closing quote, gives feedback
+             about the number of lines written also when prepending or
+             appending, and fixes a couple of bugs with the linter.
+
+2018.05.15 - GNU nano 2.9.7 "Hvide Sande" adds the option '--afterends'
+             for making Ctrl+Right (the nextword function) stop at word
+             ends instead of beginnings, accepts multibyte letters for
+             the Yes/No/All answers, does emergency saves of changed
+             buffers in the unlikely event that nano crashes, adds the
+             until-now missing bindable function 'linenumbers', and
+             renames the toggles 'constupdate' to 'constantshow' and
+             'cuttoend' to 'cutfromcursor', for consistency with the
+             corresponding options -- adjust your nanorc files soon.
+
+2018.04.27 - GNU nano 2.9.6 "Gomance" fixes a crash in word completion,
+             makes --enable-altrcname work again, improves the fluidity
+             of scrolling when using the touchpad, tweaks the syntaxes
+             for shell scripts and PO files, makes a replacing session
+             go always forward by default, no longer inserts a newline
+             after an external spell check of a selected region, always
+             accepts the English Y and N (and A) at a yes-no prompt in
+             any locale, and solves a few hypothetical bugs.
+
 2018.03.29 - GNU nano 2.9.5 "Kiša pada" changes the way the Scroll-Up
              and Scroll-Down commands work (M-- and M-+): instead of
              keeping the cursor in the same screen position they now
@@ -483,7 +740,7 @@
              like this what could POSSIBLY go WRONG?  Hahaha.
              Enjoy and if you find new bugs, as always please
              use Savannah's bug tracker.
-             http://savannah.gnu.org/bugs/?func=additem&group=nano
+             https://savannah.gnu.org/bugs/?func=additem&group=nano
 
 2010.01.17 - GNU nano 2.2.2 is released for you, you, you.  This
              release includes fixes for: crashes when writing
@@ -566,9 +823,9 @@
              without the usual truncation and a '$' symbol at the end
              of the line.  It can be enabled via Meta-$ inside the
              editor, via the -$ or --softwrap command-line flags,
-             or "set softwrap" in your .nanorc).  As always, please
-             report any bugs to the nano Savannah project page
-             (http://savannah.gnu.org/bugs/?func=additem&group=nano)
+             or via "set softwrap" in your .nanorc.  As always,
+             please report any bugs to the nano Savannah project page
+             (https://savannah.gnu.org/bugs/?func=additem&group=nano)
              Remember: data loss happens, back up your files.
 
 2009.07.28 - GNU nano 2.1.10 "Ellie" is released.  This version includes
@@ -596,45 +853,41 @@
              birthday lenny!
 
 2009.02.07 - GNU nano 2.1.8 "unsafe at any speed" is released.  This
-             release include some long overdue performance
-             improvements in syntax color highlighting, the ability
-             to abort running searches (useful mainly when
-             editing very large files) and the ability to use nano
-             like a pager for viewing standard input (i.e. "nano -").
-             Additionally, there are gentoo syntax highlighting
-             updates and fixes for issues with reading files
-             in a directory with strange parent directory permissions.
-             The key bindings code was also substantially changed
-             in order to be more ISO-C compatible.  Be sure to use
-             the Savannah page not only for bug reports but for any
+             release includes some long overdue performance improvements
+             in syntax color highlighting, the ability to abort running
+             searches (useful mainly when editing very large files) and
+             the ability to use nano like a pager for viewing standard
+             input (i.e. "nano -").  Additionally, there are gentoo
+             syntax highlighting updates and fixes for issues with
+             reading files in a directory with strange parent directory
+             permissions.  The key-bindings code was also substantially
+             changed in order to be more ISO-C compatible.  Be sure to
+             use the Savannah page not only for bug reports but for any
              features you would like to see before the next stable
              series is released.  Have fun with it!
 
 2008.11.10 - GNU nano 2.1.7 "Effingham" is ready to make good on those
              campaign promises of lower bug rates and 50% more pie.
-             This release includes a new check for external
-             modifications when saving a file, some code and
-             documentation cleanups, and more bug fixes for
-             the new undo code (but we continue to welcome
-             your bug reports via the Savannah bug page at
-             http://savannah.gnu.org/bugs/?func=additem&group=nano).
+             This release includes a new check for external modifications
+             when saving a file, some code and documentation cleanups,
+             and more bug fixes for the new undo code (but we continue
+             to welcome your bug reports via the Savannah bug page at
+             https://savannah.gnu.org/bugs/?func=additem&group=nano).
              Come get some.
 
 2008.10.03 - GNU nano 2.1.6 was for new features before it was against
-             them.  This release includes more undo capability,
-             several new syntax highlighting configurations including
-             Objective C, OCaml, and Fortran, and a new capability
-             to activate highlighting based on the 1st line of the
-             file being edited.  Also, the new default configure
-             options now include color syntax highlighting, .nanorc
-             support, multibuffer and extras.  These items can still
-             be disabled and are not enabled with --enable-tiny.  Bug
-             fixes include better signal handling under Cygwin, and
-             that's about it.  Again please remember to
-             submit bug reports via Savannah at
-             http://savannah.gnu.org/bugs/?func=additem&group=nano
-             as undo functions certainly need more testing.
-             Bon appetit.
+             them.  This release includes more undo capability, several
+             new syntax highlighting configurations including Objective
+             C, OCaml, and Fortran, and a new capability to activate
+             highlighting based on the 1st line of the file being
+             edited.  Also, the new default configure options now
+             include color syntax highlighting, .nanorc support,
+             multibuffer and extras.  These items can still be disabled
+             and are not enabled with --enable-tiny.  Bug fixes include
+             better signal handling under Cygwin, and that's about it.
+             Again please remember to submit bug reports via Savannah at
+             https://savannah.gnu.org/bugs/?func=additem&group=nano as
+             undo functions certainly need more testing.  Bon appetit.
 
 2008.08.30 - GNU nano 2.1.5 is ready to lead on day one.  This release
              contains a better fix for incorrectly reported successful
@@ -657,15 +910,15 @@
              are likely to run out of space; see Savannah bug #24000.
              Have fun with it!
 
-2008.08.04 - GNU nano 2.1.3 "least stable version ever" is released.  This
-             release includes new (and experimental) undo and redo
-             functionality for most text operations.  The default
-             key bindings are Meta-U for undo and Meta-E for redo, but
-             these can be remapped using the new 2.1 keybinding code.
-             Also included are some fixes for configuring using wide
-             curses, crashing when invoking the help menu with
-             certain locales, and not saving the search history when
-             compiled with configure options.
+2008.08.04 - GNU nano 2.1.3 "least stable version ever" is released.
+             This release includes new (and experimental) undo and redo
+             functionality for most text operations.  The default key
+             bindings are Meta-U for undo and Meta-E for redo, but these
+             can be remapped using the new 2.1 keybinding code.  Also
+             included are some fixes for configuring using wide curses,
+             crashing when invoking the help menu with certain locales,
+             and not saving the search history when compiled with
+             configure options.
 
 2008.04.24 - GNU nano 2.1.2 "New York City" is released.  This release
              contains fixes for binding bad keys, some
@@ -1379,9 +1632,9 @@
              some compatibility issues with older ncurses libraries
              have also been fixed.  All in all, a lot to see.
 
-2001.01.31 - Nano 0.9.99pre2 is released.  Not surprisingly, all that is
-             new is bugfixes, bugfixes, bugfixes.  There were a few
-             cleanups in unneeded global variables and duplicate
+2001.01.31 - Nano 0.9.99pre2 is released.  Not surprisingly, all that
+             is new is bugfixes, bugfixes, bugfixes.  There were a
+             few cleanups in unneeded global variables and duplicate
              functions, but most is just fixing.  Specifically, there
              is now a preliminary (read: needs testing) fix for
              resizing the editor in any mode other than normal edit
@@ -1425,9 +1678,9 @@
              main reason for this release is the less-than-optimal
              fix for the security issue in nano with following
              symbolic links.  Hopefully this will fix the problem
-             permanently.  The --nofollow option also works again for
-             those who are real security nuts.  There are also some
-             display and search fixes, and the --disable-spell
+             permanently.  The --nofollow option also works again
+             for those who are real security nuts.  There are also
+             some display and search fixes, and the --disable-spell
              function was renamed to --disable-speller to be in line
              with nano and Pico's "speller" term.
 
@@ -1551,12 +1804,11 @@
              (id).
 
 2000.06.06 - Nano 0.9.10 is primarily a bugfix for the loss of SIGINT
-             when using "run and terminate" flags (for example,
-             --help).  There are also some minor documentation
-             updates.  This version of nano is the most stable in
-             quite some time, and is likely to be the most stable for
-             awhile.  Users are encouraged to upgrade to this
-             version.
+             when using "run and terminate" flags (for example, --help).
+             There are also some minor documentation updates.  This
+             version of nano is the most stable in quite some time,
+             and is likely to be the most stable for awhile.  Users
+             are encouraged to upgrade to this version.
 
 2000.05.31 - Nano 0.9.9 introduces much better working i18n support,
              more portability, and a ton of bugfixes.  While nano is
@@ -1571,10 +1823,10 @@
              are also the obligatory display fixes and speedups.
              Have fun with it.
 
-2000.05.14 - Nano 0.9.7 (the Mother's Day release) continues in the long
-             line of display fixes, and also fixes the broken symlink
-             behavior (i.e. symlinks weren't being followed by
-             default).  Hopefully all major bugs can be worked out
+2000.05.14 - Nano 0.9.7 (the Mother's Day release) continues in the
+             long line of display fixes, and also fixes the broken
+             symlink behavior (i.e. symlinks weren't being followed
+             by default).  Hopefully all major bugs can be worked out
              soon and we can have a 1.0 release before the end of the
              year, but who knows.
 
@@ -1585,15 +1837,14 @@
              most stable versions of nano to date, but this one may
              not be too bad =-)
 
-2000.05.01 - Nano 0.9.5 attempts to speed up the display of text
-             to be at least somewhat reasonable.  Much code profiling
-             has been done to reduce the ridiculous number of
-             redundant display updates.  This will probably expose a
-             lot of bugs that can then be fixed, so this release is
-             probably not for the faint of heart.  For anyone
-             curious, I would call nano 0.9.2 the most stable version
-             recently, so use that if you're not particularly
-             concerned with being on the bleeding edge.
+2000.05.01 - Nano 0.9.5 attempts to speed up the display of text to be
+             at least somewhat reasonable.  Much code profiling has been
+             done to reduce the ridiculous number of redundant display
+             updates.  This will probably expose a lot of bugs that can
+             then be fixed, so this release is probably not for the faint
+             of heart.  For anyone curious, I would call nano 0.9.2 the
+             most stable version recently, so use that if you're not
+             particularly concerned with being on the bleeding edge.
 
 2000.04.25 - Nano 0.9.4 fixes some problems in 0.9.3 with the last
              line code and related segfaults.  It now also has much

README

@@ -1,5 +1,5 @@
 
-          GNU nano -- an enhanced clone of the Pico text editor
+          GNU nano -- a simple editor, inspired by Pico
 
 Overview
 
@@ -7,25 +7,28 @@ Overview
     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.
+    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.
+
+    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 http://www.gnu.org/.
+    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 latest nano source tarball, then:
 
-        tar xvzf nano-x.y.z.tar.gz
-        cd nano-x.y.z
+        tar -xvf nano-x.y.tar.gz
+        cd nano-x.y
         ./configure
         make
         make install

README.GIT

@@ -14,13 +14,13 @@ packages:
 - autoconf    (version >= 2.69)
 - automake    (version >= 1.14)
 - autopoint   (version >= 0.18.3)
+- gcc         (version >= 5.0)
 - gettext     (version >= 0.18.3)
 - git         (version >= 2.7.4)
 - groff       (version >= 1.12)
+- make        (any version)
 - pkg-config  (version >= 0.22)
 - texinfo     (version >= 4.0)
-- gcc         (any version)
-- make        (any version)
 
 If you want UTF-8 support, you will also need libncursesw5-dev installed
 (version >= 5.7), or libslang2-dev (version >= 2.0) if you use --with-slang.

THANKS

@@ -4,13 +4,14 @@ If we missed you here, let us know!
 
 Translations:
 ============
-Sharuzzaman Ahmat Raslan <sharuzzaman@excite.com>     Malay
+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
@@ -22,38 +23,40 @@ 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
 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
+Mehmet Kececi <mkececi@mehmetkececi.com>              Turkish
 Gabor Kelemen <kelemeng@gnome.hu>                     Hungarian
 Kalle Kivimaa <kalle.kivimaa@iki.fi>                  Finnish
 Eivind Kjørstad <ekj@vestdata.no>                     Norwegian Nynorsk
 Florian König <floki@bigfoot.com>                     German
 Klemen Košir <klemen913@gmail.com>                    Slovenian
 Wojciech Kotwica <wkotwica@post.pl>                   Polish
-Ask Hjorth Larsen <asklarsen@gmail.com>               Danish
 Clement Laforet <clem_laf@wanadoo.fr>                 French
+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
-Claudio Neves <cneves@nextis.com>                     Brazilian Portuguese
 Lauri Nurmi <lanurmi@iki.fi>                          Finnish
 Daniel Nylander <po@danielnylander.se>                Swedish
 Mikel Olasagasti <hey_neken@mundurat.net>             Basque
+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
@@ -76,6 +79,7 @@ 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
 
@@ -84,6 +88,7 @@ Other stuff:
 ===========
 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

TODO

@@ -1,83 +1,5 @@
-A list of desired features
---------------------------
 
-Somewhat urgent:
-- Make undo/redo work also for justifying.
-- Detect when text is being pasted, so that we can handle it faster.
-  See https://savannah.gnu.org/bugs/?40060.
-- Allow color syntaxes to apply to more than just color, so that we can
-  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.
+For a list of open bugs and requested features see:
 
-Vague musings:
-- Add support for right-to-left text (RTL), through FriBidi?
-- Allow setting marks (saved positions, not to be confused with the
-  mark set via Ctrl-^) at various lines and/or columns in the buffer,
-  and allow movement between them with a single keystroke?
-- Make matching bracket searches sophisticated enough to skip over
-  brackets inside comments?
+  https://savannah.gnu.org/bugs/?group=nano
 
-For version 2.9:
-- Make undo/redo work also for indenting. [DONE]
-- Allow to record and replay a macro: a stored series of keystrokes. [DONE]
-
-For version 2.8:
-- Allow text searches in the help viewer. [DONE]
-
-For version 2.4:
-- Handle window resizes better.  After we've resized, we should stay
-  wherever we were before we resized, as Pico does. [DONE]
-- Allow even better file-type detection than we have currently, e.g.
-  through libmagic. [DONE]
-- Compatibility with vim status files to let other editors know we're
-  in a file. [DONE]
-
-For version 2.2:
-- Rebindable keys? [DONE]
-- 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]
-- 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:
-- UTF-8 support. [DONE]
-- Support for paragraph searches. [DONE]
-- Support for justifying the entire file at once. [DONE]
-- Support for filename searches in the file browser. [DONE]
-- Keystroke to implement "Add next sequence as raw" like vi's ^V. [DONE]
-- Spell check selected text only. [DONE]
-- Make "To Line" (^W^T) and "Read from Command" (^R^X) reenter their
-  parent menu when their keystroke is entered a second time (^W^T^T and
-  (^R^X^X) (requires figuring out when to keep cursor position and when
-  not to). [DONE]
-- Fix resetstatuspos global which we shouldn't have. [DONE]
-
-For version 1.2:
-- Single-line scroll up/down? [DONE]
-- Color syntax highlighting? (There seems to be a demand for it.) [DONE]
-- Support for a .nanorc file. [DONE]
-- Backup making (filename~)? [DONE]
-- Search/replace string history. [DONE]
-- Implement Pico's -j and -g flags, as they are pretty easy to do. [DONE]
-- Make mouse support work with clicking on the shortcuts (-m). [DONE]
-- Implement -o (--operatingdir, a chroot of sorts). [DONE]
-- Allow -r to take a negative argument, meaning right margin instead of
-  left (allows resizing that way), formerly -W arg. [DONE]
-
-For version 1.0:
-- Implement Spelling. [DONE]
-- Implement Help. [DONE]
-- Internationalization [In progress, translators welcome!]
-- Allow nano to be resized in X. [DONE]
-- On PageUp/Down, put the cursor on the first line (like Pico), not the
-  center line. [DONE]
-- Implement justify function. [DONE]
-- Cut to end of line. [DONE]
-- Built-in speller command. [DONE]
-- Better statusbar interaction (scrolling, tab completion). [DONE]
-- Unjustify command (^U after ^J). [DONE]
-- Username completion (~user). [DONE]

autogen.sh

@@ -2,7 +2,7 @@
 # Generate configure & friends for GIT users.
 
 gnulib_url="git://git.sv.gnu.org/gnulib.git"
-gnulib_hash="59e59d99bc1ca635d178778b9b4ee544330775c4"
+gnulib_hash="6a78706ae230ad24bc06d33d9eddca25806ffb2a"
 
 modules="
 	futimens
@@ -30,7 +30,7 @@ modules="
 
 # Make sure the local gnulib git repo is up-to-date.
 if [ ! -d "gnulib" ]; then
-	git clone --depth=123 ${gnulib_url}
+	git clone --depth=1111 ${gnulib_url}
 fi
 cd gnulib >/dev/null || exit 1
 curr_hash=$(git log -1 --format=%H)

configure.ac

@@ -1,6 +1,6 @@
 # Configuration for GNU nano - a small and user-friendly text editor
 #
-# Copyright (C) 1999-2011, 2013-2017 Free Software Foundation, Inc.
+# Copyright (C) 1999-2011, 2013-2020 Free Software Foundation, Inc.
 # Copyright (C) 2014, 2017 Mike Frysinger
 #
 # GNU nano is free software: you can redistribute it and/or modify
@@ -14,9 +14,9 @@
 # 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/.
+# along with this program.  If not, see https://www.gnu.org/licenses/.
 
-AC_INIT([GNU nano], [2.9.5], [nano-devel@gnu.org], [nano])
+AC_INIT([GNU nano], [5.2], [nano-devel@gnu.org], [nano])
 AC_CONFIG_SRCDIR([src/nano.c])
 AC_CANONICAL_HOST
 AM_INIT_AUTOMAKE([1.14])
@@ -56,12 +56,46 @@ dnl Data location.
 pkgdatadir=${datadir}/${PACKAGE}
 AC_DEFINE_DIR([PKGDATADIR], [pkgdatadir], [Where data are placed to.])
 
+dnl Whether this is a git repository.
+
+AC_MSG_CHECKING([whether building from git])
+if test -f roll-a-release.sh ; then
+	AC_MSG_RESULT([yes])
+	from_git=yes
+else
+	AC_MSG_RESULT([no])
+	from_git=no
+fi
+AM_CONDITIONAL(BUILDING_FROM_GIT, test x$from_git = xyes)
+
+dnl Checks for pkg-config and gettext when building from git.
+
+if test x$from_git = xyes; then
+	if test ! -f $(aclocal --print-ac-dir)/pkg.m4; then
+		AC_MSG_ERROR([
+  *** The pkg.m4 macros are missing. ***
+  *** The pkg-config package needs to be installed when building from git. ***
+  *** After fixing this problem, rerun ./autogen.sh. ***])
+	fi
+	if test "$ac_cv_path_MSGFMT" = ":"; then
+		AC_MSG_ERROR([
+  *** The msgfmt program is missing. ***
+  *** The gettext package needs to be installed when building from git. ***])
+	fi
+fi
+
 dnl Checks for header files.
 
 AC_CHECK_HEADERS(libintl.h limits.h pwd.h termios.h sys/param.h)
 
 dnl Checks for options.
 
+if test "x$with_slang" = xyes; then
+	if test "x$enable_tiny" != xyes; then
+		AC_MSG_ERROR([--with-slang is supported only together with --enable-tiny])
+	fi
+fi
+
 AC_ARG_ENABLE(browser,
 AS_HELP_STRING([--disable-browser], [Disable the built-in file browser]))
 if test "x$enable_tiny" = xyes; then
@@ -271,12 +305,6 @@ if test "x$enable_wrapping" != xno; then
 	AC_DEFINE(ENABLE_WRAPPING, 1, [Define this to have hard text wrapping.])
 fi
 
-AC_ARG_ENABLE(wrapping-as-root,
-AS_HELP_STRING([--disable-wrapping-as-root], [Disable wrapping of text as root by default]))
-if test "x$enable_wrapping_as_root" = xno; then
-	AC_DEFINE(DISABLE_ROOTWRAPPING, 1, [Define this to disable text wrapping as root by default.])
-fi
-
 AC_ARG_ENABLE(debug,
 AS_HELP_STRING([--enable-debug], [Enable debugging (disabled by default)]))
 if test "x$enable_debug" = xyes; then
@@ -398,10 +426,10 @@ int main(void)
 	AC_MSG_WARN([*** Can not use slang when cross-compiling]))],
 	AC_MSG_WARN([*** Can not use slang when cross-compiling])),
 			AC_MSG_ERROR([
-*** The header file slcurses.h was not found.  If you wish to use
-*** slang support this header file is required.  Please either
-*** install a version of slang that includes the slcurses.h file or
-*** do not call the configure script with --with-slang.]))
+  *** The header file slcurses.h was not found.  This header file
+  *** is required if you wish to use Slang support.  Please either
+  *** install a version of Slang that includes the slcurses.h file
+  *** or do not call the configure script with --with-slang.]))
 		fi
 
 		if eval "test x$CURSES_LIB_NAME = x"; then
@@ -479,10 +507,10 @@ int main(void)
 	AC_MSG_WARN([*** Can not use slang when cross-compiling]))],
 	AC_MSG_WARN([*** Can not use slang when cross-compiling])),
 			AC_MSG_ERROR([
-*** The header file slcurses.h was not found.  If you wish to use
-*** slang support this header file is required.  Please either
-*** install a version of slang that includes the slcurses.h file or
-*** do not call the configure script with --with-slang.]))
+  *** The header file slcurses.h was not found.  This header file
+  *** is required if you wish to use Slang support.  Please either
+  *** install a version of Slang that includes the slcurses.h file
+  *** or do not call the configure script with --with-slang.]))
 		fi
 
 		if test "${_libs+set}" = "set"; then
@@ -495,7 +523,6 @@ int main(void)
 		;;
 	esac], [AC_MSG_RESULT(no)])
 
-
 dnl Checks for functions.
 
 if test "x$enable_utf8" != xno; then
@@ -566,11 +593,11 @@ fi
 
 if eval "test x$CURSES_LIB_NAME = x"; then
 	AC_MSG_ERROR([
-*** No curses lib was found.  Please install the curses header files
-*** from libncursesw5-dev (Debian), ncurses-devel (Fedora), or similar.
-*** (Or install ncurses from https://ftp.gnu.org/gnu/ncurses/.)])
+  *** No curses lib was found.  Please install the curses header files
+  *** from libncursesw5-dev (Debian), ncurses-devel (Fedora), or similar.
+  *** (Or install ncurses from https://ftp.gnu.org/gnu/ncurses/.)])
 else
-	AC_MSG_RESULT([Using $CURSES_LIB_NAME as the curses library])
+	AC_MSG_RESULT([  The curses library to be used is: $CURSES_LIB_NAME])
 fi
 
 AC_CHECK_LIB([$CURSES_LIB_NAME], [use_default_colors],
@@ -601,18 +628,16 @@ if test "x$enable_utf8" != xno && \
 else
 	if test "x$enable_utf8" = xyes; then
 		AC_MSG_ERROR([
-*** UTF-8 support was requested, but insufficient UTF-8 support was
-*** detected in your curses and/or C libraries.  Please verify that your
-*** slang was built with UTF-8 support or your curses was built with
-*** wide character support, and that your C library was built with wide
-*** character support.])
+  *** UTF-8 support was requested, but insufficient support was
+  *** detected in your curses and/or C libraries.  Please verify
+  *** that both your curses library and your C library were built
+  *** with wide-character support.])
 	elif test "x$enable_utf8" != xno; then
 		AC_MSG_WARN([
-*** Insufficient UTF-8 support was detected in your curses and/or C
-*** libraries.  If you want UTF-8 support, please verify that your slang
-*** was built with UTF-8 support or your curses was built with wide
-*** character support, and that your C library was built with wide
-*** character support.])
+  *** Insufficient UTF-8 support was detected in your curses
+  *** and/or C libraries.  If you want UTF-8 support, please
+  *** verify that both your curses library and your C library
+  *** were built with wide-character support.])
 	fi
 fi
 
@@ -638,55 +663,6 @@ fi
 AC_DEFINE_UNQUOTED(NANO_REG_EXTENDED, $nano_reg_extended,
 				   [Flag(s) to use to get the full range of extended regular expressions])
 
-# Check for word-boundary support (/< and />).
-AC_MSG_CHECKING([for GNU-style word boundary regex support])
-AC_ARG_WITH(wordbounds,
-AS_HELP_STRING([--with-wordbounds], [Use GNU-style word boundary delimiters]),
-		[with_wordbounds=$withval], [with_wordbounds=auto])
-if test "$with_wordbounds" != "no"; then
-	dnl If we're using the bundled gnulib regex module, we know it's supported.
-	if test "$ac_use_included_regex" = "yes"; then
-	    with_wordbounds="yes"
-	fi
-
-	dnl We explicitly don't check if the user forced the option, because
-	dnl this is needed for cross compilers and we can't test the target.
-	if test "$with_wordbounds" != "yes"; then
-	    AC_TRY_RUN([
-#ifdef HAVE_SYS_TYPES_H
-#include <sys/types.h>
-#endif
-#include <regex.h>
-int main(void)
-{
-	regex_t r;
-	size_t nmatch;
-	regmatch_t pmatch;
-
-	if (regcomp(&r, "\\\\>", $nano_reg_extended|REG_NOSUB))
-		return 1;
-	if (regexec(&r, "word boundary", nmatch, &pmatch, 0))
-		return 1;
-	return 0;
-}],
-	    with_wordbounds="yes",
-	    with_wordbounds="no",
-	    with_wordbounds="cross")
-	fi
-fi
-case $with_wordbounds in
-yes)
-	AC_MSG_RESULT(yes)
-	AC_DEFINE(GNU_WORDBOUNDS, 1, [Define this if the system supports GNU-style word boundaries in regexes.])
-	;;
-no)
-	AC_MSG_RESULT(no)
-	;;
-cross)
-	AC_MSG_WARN([*** Can't check for GNU-style word boundary support when cross-compiling])
-	;;
-esac
-
 if test x$color_support = xyes; then
 #    if test x$CURSES_LIB_NAME = xcurses; then
 		AC_MSG_CHECKING([whether _XOPEN_SOURCE_EXTENDED is needed])
@@ -742,8 +718,9 @@ AC_MSG_CHECKING([for HTML support in groff])
 groff -t -mandoc -Thtml </dev/null >/dev/null
 if test $? -ne 0 ; then
 	AC_MSG_RESULT([no])
-	AC_MSG_WARN([*** Will not generate HTML version of man pages  ***
-*** Consider installing a newer version of groff with HTML support ***])
+	AC_MSG_WARN([
+  *** Will not generate HTML version of man pages. ***
+  *** Consider installing a newer version of groff with HTML support. ***])
 	groff_html_support=no
 else
 	AC_MSG_RESULT([yes])
@@ -751,17 +728,6 @@ else
 fi
 AM_CONDITIONAL(GROFF_HTML, test x$groff_html_support = xyes)
 
-# Check whether this is a git repository.
-AC_MSG_CHECKING([whether building from git])
-if test -d .git ; then
-	AC_MSG_RESULT([yes])
-	from_git=yes
-else
-	AC_MSG_RESULT([no])
-	from_git=no
-fi
-AM_CONDITIONAL(BUILDING_FROM_GIT, test x$from_git = xyes)
-
 AC_CONFIG_FILES([
 Makefile
 doc/Makefile
@@ -771,7 +737,8 @@ m4/Makefile
 po/Makefile.in
 src/Makefile
 syntax/Makefile
-nano.spec
 ])
 
 AC_OUTPUT
+
+make showinfo

doc/cheatsheet.html

@@ -0,0 +1,134 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<html lang="en">
+
+<head>
+<title>Cheatsheet for nano</title>
+<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
+<meta name="description" content="A concise overview of the command shortcuts of the GNU nano editor, grouped by category.">
+<meta name="keywords" content="cheatsheet, nano, editor, shortcuts, keystrokes, functions, operations, commands">
+<meta name="author" content="Benno Schulenberg">
+</head>
+
+<body>
+
+<br>
+<h1 align="center">Overview of nano's shortcuts &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</h1>
+<h3 align="center">The editor's keystrokes and their functions &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</h3>
+<br>
+
+<table align="center"><tbody>
+<tr><td>
+
+<b>File handling</b>
+<table><tbody>
+<tr><td>Ctrl+S &nbsp;&nbsp;</td><td>Save current file</td></tr>
+<tr><td>Ctrl+O</td><td>Offer to write file ("Save as")</td></tr>
+<tr><td>Ctrl+R</td><td>Insert a file into current one</td></tr>
+<tr><td>Ctrl+X</td><td>Close buffer, exit from nano</td></tr>
+</tbody></table>
+<br>
+
+<b>Editing</b>
+<table><tbody>
+<tr><td>Ctrl+K &nbsp;&nbsp;</td><td>Cut current line into cutbuffer</td></tr>
+<tr><td>Alt+6</td><td>Copy current line into cutbuffer</td></tr>
+<tr><td>Ctrl+U</td><td>Paste contents of cutbuffer</td></tr>
+<tr><td>Alt+T</td><td>Cut until end of buffer</td></tr>
+<tr><td>Ctrl+]</td><td>Complete current word</td></tr>
+<tr><td>Alt+3</td><td>Comment/uncomment line/region</td></tr>
+<tr><td>Alt+U</td><td>Undo last action</td></tr>
+<tr><td>Alt+E</td><td>Redo last undone action</td></tr>
+</tbody></table>
+<br>
+
+<b>Search and replace</b>
+<table><tbody>
+<tr><td>Ctrl+Q &nbsp;&nbsp;</td><td>Start backward search</td></tr>
+<tr><td>Ctrl+W</td><td>Start forward search</td></tr>
+<tr><td>Alt+Q</td><td>Find next occurrence backward</td></tr>
+<tr><td>Alt+W</td><td>Find next occurrence forward</td></tr>
+<tr><td>Alt+R</td><td>Start a replacing session</td></tr>
+</tbody></table>
+<br>
+
+<b>Deletion</b>
+<table><tbody>
+<tr><td>Ctrl+H</td><td>Delete character before cursor &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</td></tr>
+<tr><td>Ctrl+D</td><td>Delete character under cursor</td></tr>
+<tr><td>Alt+Bsp</td><td>Delete word to the left</td></tr>
+<tr><td>Ctrl+Del &nbsp;&nbsp;</td><td>Delete word to the right</td></tr>
+<tr><td>Alt+Del</td><td>Delete current line</td></tr>
+</tbody></table>
+<br>
+
+<b>Operations</b>
+<table><tbody>
+<tr><td>Ctrl+T &nbsp;&nbsp;</td><td>Execute some command</td></tr>
+<tr><td>Ctrl+J</td><td>Justify paragraph or region</td></tr>
+<tr><td>Alt+J</td><td>Justify entire buffer</td></tr>
+<tr><td>Alt+B</td><td>Run a syntax check</td></tr>
+<tr><td>Alt+F</td><td>Run a formatter/fixer/arranger</td></tr>
+<tr><td>Alt+:</td><td>Start/stop recording of macro</td></tr>
+<tr><td>Alt+;</td><td>Replay macro</td></tr>
+</tbody></table>
+<br>
+
+</td><td>
+
+<b>Moving around</b>
+<table><tbody>
+<tr><td>Ctrl+B &nbsp;&nbsp;</td><td>One character backward</td></tr>
+<tr><td>Ctrl+F</td><td>One character forward</td></tr>
+<tr><td>Ctrl+<b>&leftarrow;</b></td><td>One word backward</td></tr>
+<tr><td>Ctrl+<b>&rightarrow;</b></td><td>One word forward</td></tr>
+<tr><td>Ctrl+A</td><td>To start of line</td></tr>
+<tr><td>Ctrl+E</td><td>To end of line</td></tr>
+<tr><td>Ctrl+P</td><td>One line up</td></tr>
+<tr><td>Ctrl+N</td><td>One line down</td></tr>
+<tr><td>Ctrl+<b>&uparrow;</b></td><td>To previous block</td></tr>
+<tr><td>Ctrl+<b>&downarrow;</b></td><td>To next block</td></tr>
+<tr><td>Ctrl+Y</td><td>One page up</td></tr>
+<tr><td>Ctrl+V</td><td>One page down</td></tr>
+<tr><td>Alt+\</td><td>To top of buffer</td></tr>
+<tr><td>Alt+/</td><td>To end of buffer</td></tr>
+</tbody></table>
+<br>
+
+<b>Special movement</b>
+<table><tbody>
+<tr><td>Alt+G &nbsp;&nbsp;&nbsp;</td><td>Go to specified line</td></tr>
+<tr><td>Alt+]</td><td>Go to complementary bracket</td></tr>
+<tr><td>Alt+<b>&uparrow;</b></td><td>Scroll viewport up</td></tr>
+<tr><td>Alt+<b>&downarrow;</b></td><td>Scroll viewport down</td></tr>
+<tr><td>Alt+&lt;</td><td>Switch to preceding buffer</td></tr>
+<tr><td>Alt+&gt;</td><td>Switch to succeeding buffer</td></tr>
+</tbody></table>
+<br>
+
+<b>Information</b>
+<table><tbody>
+<tr><td>Ctrl+C &nbsp;&nbsp;</td><td>Report cursor position</td></tr>
+<tr><td>Alt+D</td><td>Report word/line/char count</td></tr>
+<tr><td>Ctrl+G</td><td>Display help text</td></tr>
+</tbody></table>
+<br>
+
+<b>Various</b>
+<table><tbody>
+<tr><td>Alt+A</td><td>Turn the mark on/off</td></tr>
+<tr><td>Tab</td><td>Indent marked region</td></tr>
+<tr><td>Shift+Tab &nbsp;&nbsp;</td><td>Unindent marked region</td></tr>
+<tr><td>Alt+N</td><td>Turn line numbers on/off</td></tr>
+<tr><td>Alt+P</td><td>Turn visible whitespace on/off</td></tr>
+<tr><td>Alt+V</td><td>Enter next keystroke verbatim</td></tr>
+<tr><td>Ctrl+L</td><td>Refresh the screen</td></tr>
+<tr><td>Ctrl+Z</td><td>Suspend nano</td></tr>
+</tbody></table>
+<br>
+
+</td></tr>
+</tbody></table>
+
+</body>
+
+</html>

doc/faq.html

@@ -1,9 +1,12 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
-<html>
+<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<html lang="en">
+
 <head>
   <title>The GNU nano editor FAQ</title>
-  <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
+  <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
+  <meta name="description" content="The genesis story of the nano editor, plus the solution to some common problems.">
 </head>
+
 <body text="#330000" bgcolor="#ffffff" link="#0000ef" vlink="#51188e" alink="#ff0000">
 
 <h1>The GNU nano editor FAQ</h1>
@@ -28,29 +31,24 @@
   <a href="#3.1">3.1. How do I install the RPM or DEB package?</a><br>
   <a href="#3.2">3.2. Compiling from source: WHAT THE HECK DO I DO NOW?</a><br>
   <a href="#3.3">3.3. Why does everything go into /usr/local?</a><br>
-  <a href="#3.5">3.5. nano should automatically run strip on the binary when installing it!</a><br>
-  <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>
+  <a href="#3.4">3.4. nano should automatically run strip on the binary when installing it!</a><br>
+  <a href="#3.5">3.5. How can I make the executable smaller? This is too bloated!</a><br>
+  <a href="#3.6">3.6. Tell me more about this multibuffer stuff!</a><br>
+  <a href="#3.7">3.7. Tell me more about this verbatim input stuff!</a><br>
+  <a href="#3.8">3.8. How do I make a .nanorc file that nano will read when I start it?</a><br>
+  <a href="#3.9">3.9. Why does my self-compiled nano not read /etc/nanorc?</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.2">4.2. How can I make Ctrl+Shift+Left/Right select words on urxvt?</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 keystrokes here&gt;!</a><br>
-  <a href="#4.7">4.7. nano crashes when I resize my window. How can I fix that?</a><br>
-  <a href="#4.8a">4.8a. With what keystroke can I paste text from the clipboard into nano?</a><br>
-  <a href="#4.8b">4.8b. When I paste text into a document, each line gets indented further than the last. Why? And how can I stop this?</a><br>
-  <a href="#4.8c">4.8c. When I paste from Windows into a remote nano, nano rewraps the lines. What gives?<a><br>
-  <a href="#4.9">4.9. I've compiled nano with color support, but I don't see any color when I run it!</a><br>
-  <a href="#4.10">4.10. How do I make nano my default editor (in Pine, mutt, etc.)?</a><br>
-  <a href="#4.11">4.11. How do I select text for or paste text from the clipboard in an X terminal when I'm running nano in one and nano's mouse support is turned on?</a><br>
-  <a href="#4.12">4.12. On startup I get a message that says "Detected a legacy nano history file".  Now older nano versions can't find my search history!</a>
+  <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>
@@ -77,13 +75,13 @@
 
 <h1><a name="1"></a>1. General</h1>
 <h3><a name="1.1"></a>1.1. What is GNU nano?</h3>
-<blockquote><p>GNU nano is designed to be a free replacement for the Pico text editor, part of the Pine email suite from <a href="http://www.washington.edu/pine/">The University of Washington</a>. It aims to &quot;emulate Pico as closely as possible and then include extra functionality&quot;.</p></blockquote>
+<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>
@@ -91,7 +89,7 @@
 <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>
 <h3><a name="1.4"></a>1.4. What is the current version of nano?</h3>
-<blockquote><p>The current version of nano <i>should</i> be <b>2.9.5</b>.  Of course, you should always check the <a href="https://nano-editor.org/">nano homepage</a> to see what the latest and greatest version is.</p></blockquote>
+<blockquote><p>The current version of nano <i>should</i> be <b>5.2</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%">
@@ -100,8 +98,8 @@
 <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>
+    <li><a href="https://nano-editor.org/dist/latest/">https://nano-editor.org/dist/latest/</a></li>
+    <li><a href="https://ftpmirror.gnu.org/gnu/nano/">https://ftpmirror.gnu.org/gnu/nano/</a></li>
   </ul>
 </blockquote>
 <h3><a name="2.2"></a>2.2. RPM packages (RedHat, OpenSuse, and derivatives).</h3>
@@ -114,11 +112,11 @@
 <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>
+  <p>You can also have a look at the <a href="http://ftp.debian.org/debian/pool/main/n/nano/">Package Pool</a> to see all the available binary and source packages.</p>
 </blockquote>
 <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>
@@ -126,23 +124,23 @@
 
 <h1><a name="3"></a>3. Installation and Configuration</h1>
 <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>
+<blockquote><p>It's simple really! As root, type <b>rpm -Uvh nano-x.y-1*.rpm</b> if you have a RedHat-ish system or <b>dpkg -i nano_x.y-1*.deb</b> if you have a Debian-ish system, where <b>x.y</b> is the version number of nano. There are other programs to install packages, and if you wish to use those, knock yourself out.</p></blockquote>
 <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><b>tar -xvf nano-x.y.tar.gz</b></p>
   <p>Then you need to run <b>configure</b> with any options you might want (if any).</p>
   <p>The average case is this:</p>
-  <p><b>cd nano-x.y.z/</b><br>
+  <p><b>cd nano-x.y/</b><br>
   <b>./configure</b><br>
   <b>make</b><br>
   <b>make install</b> (as root, of course)</p></blockquote>
 <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>
-<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>
-<h3><a name="3.6"></a>3.6. How can I make the executable smaller? This is too bloated!</h3>
+  <p>This will put nano into /usr/bin when you run <b>make install</b>.</p></blockquote>
+<h3><a name="3.4"></a>3.4. nano should automatically run strip on the binary when installing it!</h3>
+<blockquote><p>It does when you use <b>make install-strip</b>. The default <b>make install</b> does not, and will not, run strip automatically.</p></blockquote>
+<h3><a name="3.5"></a>3.5. 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
@@ -162,54 +160,64 @@
   <b>--disable-tabcomp</b>       Disable the tab-completion functions
   <b>--disable-wordcomp</b>      Disable the word-completion function
   <b>--disable-wrapping</b>      Disable all hard-wrapping of text</pre>
-  <p>There's also the <b>--enable-tiny</b> option which disables everything above, as well as some larger chunks of the program (like the marker code that you use with Control-^ to select text). Also, if you know you aren't going to be using other languages, you can use <b>--disable-nls</b> to disable internationalization and save a few K to a few dozen K depending on whether you have locale support on your system. And finally, there's always good old <b>strip</b> to strip all debugging code and code that exists in libraries on your system.</p>
-  <p>With <b>--disable-wrapping-as-root</b> you can disable any hard-wrapping by default when the user is root, useful to prevent accidentally changing long lines in system configuration files.</p>
+  <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 undo/redo code and the code for selecting text). Also, if you know you don't need other languages, you can use <b>--disable-nls</b> to disable internationalization and save a few kilobytes. And finally, there's always good old <b>strip</b> to remove all unneeded symbols.</p>
 </blockquote>
-<h3><a name="3.7"></a>3.7. Tell me more about this multibuffer stuff!</h3>
+<h3><a name="3.6"></a>3.6. 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>
+<h3><a name="3.7"></a>3.7. Tell me more about this verbatim input stuff!</h3>
 <blockquote><p>When you want to insert a literal character into the file you're editing, such as a control character that nano usually treats as a command, first press <b>Meta-V</b> (if you're not at a prompt, you'll get the message &quot;Verbatim Input&quot; on the status bar), then press the key(s) that generate the character you want.</p>
   <p>Alternatively, if Unicode support is enabled (see section <a href="#5.3">5.3</a>), you can press <b>Meta-V</b> and then type a six-digit hexadecimal code (from 000000 to 10FFFF, case-insensitive), and the character with the corresponding value will be inserted. The status bar will change to &quot;Unicode Input: ......&quot; when you do this.</p></blockquote>
-<h3><a name="3.9a"></a>3.9a. How do I make a .nanorc file that will be read when I start nano?</h3>
-<blockquote><p>It's not hard at all! But, your nano must <b>not</b> have been compiled with <b>--disable-nanorc</b>. Then simply copy the <b>sample.nanorc</b> that came with the nano source or your nano package (most likely in /usr/doc/nano) to .nanorc in your home directory. If you didn't get one, the syntax of the file is simple. Flags are turned on and off by using the words <b>set</b> and <b>unset</b> plus the long option name for the feature. For example, &quot;set nowrap&quot; or &quot;set smarthome&quot;.</p></blockquote>
-<h3><a name="3.9b"></a>3.9b. How about in Win32?</h3>
-<blockquote><p>If you're using the official nano .zip file and have extracted all the files, you should take the file nano.rc and place it somewhere on your Win32 system (for example, if you have write permission to do so, at the top of C:\).  Then you must create an Environment variable called HOME which points to the directory where you put nano.rc.  In Windows XP, you can get to Environment variables by right-clicking "My Computer" either on the desktop or in the Start Menu, and selecting Properties.  This should bring up the System Properties panel.  Then click the Advanced Tab, and there should be a button called Environment Variables.  Click that to bring up the Environment Variables section. Now, under User Variables you should be able to click the New button, and make a new Variables Name called HOME, with the Variable Value of whatever path you copied nano.rc into (just the directory name; don't add nano.rc onto the end).</p>
-  <p>We're still working on documentation for enabling syntax highlighting on Win32; please bear with us.</p>
-  <p>Note that the nano.rc file must remain Unix-formatted in order for nano to understand it.  In other words, you should probably use only nano to edit its config file.  Other programs like Wordpad and Notepad will convert the file to DOS format when saving, and the latter does not even properly read Unix-formatted files to begin with.</p></blockquote>
+<h3><a name="3.8"></a>3.8. How do I make a .nanorc file that will be read when I start nano?</h3>
+<blockquote><p>It's not hard at all! Simply copy the <b>sample.nanorc</b> from the doc/ directory in the nano source package (or from /usr/doc/nano on your system) to <b>.nanorc</b> in your home directory, and then edit it. If you didn't get a sample nanorc, the syntax of the file is simple: features are turned on and off by using the words <b>set</b> and <b>unset</b> followed by the long option name of the feature (see <b>man nanorc</b> for the full list of options). For example, &quot;set quickblank&quot; or &quot;set smarthome&quot;. Of course, for this to work, your nano must <b>not</b> have been compiled with <b>--disable-nanorc</b>.</p></blockquote>
+<h3><a name="3.9"></a>3.9. Why does my self-compiled nano not read /etc/nanorc?</h3>
+<blockquote><p>By default (see <a href="#3.3">3.3</a>), nano gets installed into /usr/local. This also means that, at startup, nano will read <b>/usr/local/etc/nanorc</b> instead of <b>/etc/nanorc</b>. You can make a symlink from the former to the latter if you want your self-compiled nano to read the same nanorc as the system-installed nano. Or you can configure your nano to overwrite the system nano (again, see <a href="#3.3">3.3</a>).</p></blockquote>
 <hr width="100%">
 
 <h1><a name="4"></a>4. Running</h1>
 <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>
+<blockquote><p>If a command-line argument that begins with '+' is followed by another argument, the former is always treated as a starting line (plus column number), and the latter always as a filename. If a command-line argument that begins with '+' isn't followed by another argument, it's treated as a filename. Examples:</p>
+  <p>To open '+filename.txt': <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>
-<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>
+  To open '+filename.txt' starting on line 1 and 'filename.txt' starting on line 40: <b>nano +1 +filename.txt +40 filename.txt</b></p></blockquote>
+<h3><a name="4.2"></a>4.2. How can I make Ctrl+Shift+Left/Right select words on urxvt?</h3>
+<blockquote><p>The urxvt terminal emulator produces non-standard escape sequences for the modified cursor keys.  These deviant sequences are not listed in the terminfo database, which means that ncurses does not recognize them.  The easiest way around this is to tell urxvt to produce xterm-compatible escape sequences for the relevant keystrokes.  To achieve this, add the following lines to your ~/.Xresources file:</p>
+<pre>
+    URxvt.iso14755_52: False
+
+    URxvt.keysym.C-S-Up: \033[1;6A
+    URxvt.keysym.C-S-Down: \033[1;6B
+    URxvt.keysym.C-S-Right: \033[1;6C
+    URxvt.keysym.C-S-Left: \033[1;6D
+
+    URxvt.keysym.M-Up: \033[1;3A
+    URxvt.keysym.M-Down: \033[1;3B
+    URxvt.keysym.M-Right: \033[1;3C
+    URxvt.keysym.M-Left: \033[1;3D
+
+    URxvt.keysym.M-Insert: \033[2;3~
+    URxvt.keysym.M-Delete: \033[3;3~
+
+    URxvt.keysym.M-Page_Up: \033[5;3~
+    URxvt.keysym.M-Page_Down: \033[6;3~</pre>
+<p>Then run <b>xrdb ~/.Xresources</b> and restart your urxvt terminal.  Now <b>Ctrl+Shift+Left</b> and <b>Ctrl+Shift+Right</b> will select words, <b>Alt+Up</b> and <b>Alt+Down</b> will scroll the text without moving the cursor, and several such things more.</p></blockquote>
 <h3><a name="4.3"></a>4.3. Ack! My numeric keypad's keys don't work properly when NumLock is off! What can I do?</h3>
-<blockquote><p>You can use the <b>-K</b> or <b>--rebindkeypad</b> option on the command line, or add the line <b>set rebindkeypad</b> to your .nanorc. However, nano's mouse support won't work properly if you do any of these things.</p></blockquote>
-<h3><a name="4.4"></a>4.4. Ack! When I hold down a Meta key combination for a while, the character of the held key gets inserted now and then. What gives?</h3>
-<blockquote><p>This was a bug in how nano handled consecutive escape sequences. It should be fixed since version 2.6.0.</p></blockquote>
-<h3><a name="4.5"></a>4.5. How do I type the F13-F16 keys listed in the help viewer? My keyboard only has F1-F12!</h3>
-<blockquote><p>It depends on the terminal type you're using. On some terminals, such as the FreeBSD console, xterm, konsole, and gnome-terminal, Shift-F1 to Shift-F4 will generate F13 to F16. On other terminals, such as the Linux console, rxvt, and Eterm, Shift-F3 to Shift-F6 will generate F13 to F16.</p></blockquote>
-<h3><a name="4.6"></a>4.6. nano crashes when I type &lt;insert keystrokes here&gt;!</h3>
-<blockquote><p>If you aren't trying some bizarre keystroke combination with some bizarre $TERM entry, chances are you have found a bug. You are welcome to submit it to the <a href="mailto:nano-devel@gnu.org">nano-devel</a> list or in the <a href="https://savannah.gnu.org/bugs/?group=nano">bug tracker</a> on Savannah.</p></blockquote>
-<h3><a name="4.7"></a>4.7. nano crashes when I resize my window. How can I fix that?</h3>
-<blockquote><p>Older versions of nano had this problem.  Please upgrade to version 2.7.0 or newer.</p></blockquote>
-<h3><a name="4.8a"></a>4.8a. With what keystroke can I paste text from the clipboard into nano?</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.8b"></a>4.8b. When I paste text into a document, each line gets indented further than the last. Why? And how can I stop this?</h3>
-<blockquote><p>You have the <i>autoindent</i> feature turned on. Hit <b>Meta-I</b> to turn it off, paste your text, and then hit <b>Meta-I</b> again to turn it back on.</p></blockquote>
-<h3><a name="4.8c"></a>4.8c. When I paste from Windows into a remote nano, nano rewraps the lines. What gives?</h3>
-<blockquote><p>When pasting from Windows, in some situations linefeeds are sent instead of carriage returns (Enters). And linefeeds are <b>^J</b>s, which make nano justify (rewrap) the current paragraph. To prevent these linefeeds from causing these unwanted justifications, add this line to your .nanorc on the remote Linux box: <b>unbind ^J main</b> or <b>bind ^J enter main</b>, depending on whether the paste contains CR + LF or only LF.</p></blockquote>
-<h3><a name="4.9"></a>4.9. I've compiled nano with color support, but I don't see any color when I run it!</h3>
-<blockquote><p>If you want nano to actually use color, you have to specify the color configurations you want it to use in your .nanorc. Several example configurations are in the <b>syntax/</b> subdirectory of the nano source, which are normally installed to <b>/usr/local/share/nano/</b>. To enable all of them, uncomment the line <b># include "/usr/local/share/nano/*.nanorc"</b> in your nanorc. See also section <a href="#3.9a">3.9a</a>.</p></blockquote>
-<h3><a name="4.10"></a>4.10. How do I make nano my default editor (in Pine, mutt, etc.)?</h3>
+<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>
+  <p><i>Update:</i> Since version 4.8, nano will suppress auto-indentation during a paste, so you no longer need to toggle it off and on manually.</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>
+  <p><i>Update:</i> Since version 4.8, nano will ignore linefeed characters in a paste, so you no longer need the above workaround.</p></blockquote>
+<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>
@@ -220,21 +228,15 @@
   <b>[ ] enable-alternate-editor-implicitly</b></p>
   <p>Then exit (<b>E</b>) and select Yes (<b>Y</b>).</p>
   <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>
-<h3><a name="4.11"></a>4.11. How do I select text for or paste text from the clipboard in an X terminal when I'm running nano in one and nano's mouse support is turned on?</h3>
-<blockquote><p>Try holding down the Shift key and selecting or pasting the text as you normally would.</p></blockquote>
-<h3><a name="4.12"></a>4.12. On startup I get a message that says "Detected a legacy nano history file".  Now older nano versions can't find my search history!</h3>
-<blockquote><p>In nano 2.3.0, cursor-position history was introduced, and both history files now reside in a .nano subdirectory in your home directory.  A newer nano will move an existing search-history file to this new location so it can continue to be used.  This means that if you then try and use an earlier version of nano, it will be unable to see your current search history.  To fix this, run the following command:</p>
-  <p><b>ln -sf ~/.nano/search_history ~/.nano_history</b></p>
-  <p>The "migration service" (moving the search-history file to its new location) has been deleted from nano in late 2017, since version 2.9.0.  The search-history and position-history files will now be looked for first in ~/.nano/ and, when not found there, then in ~/.local/share/nano/.</p></blockquote>
+  <p><b>my_hdr X-Composer: nano-x.y</b></p>
+  <p>Again, replace x.y with the version of nano you use.</p></blockquote>
 <hr width="100%">
 
 <h1><a name="5"></a>5. Internationalization</h1>
 <h3><a name="5.1"></a>5.1. There's no translation for my language!</h3>
-<blockquote><p>In June 2001, GNU nano entered the <a href="http://translationproject.org/html/welcome.html">Translation Project</a> and since then, translations should be managed from there.</p>
-  <p>If there isn't a translation for your language, you could ask <a href="http://translationproject.org/team/">your language team</a> to translate nano, or better still, join that team and do it yourself. Joining a team is easy. You just need to ask the team leader to add you, and then send a <a href="http://translationproject.org/disclaim.txt">translation disclaimer to the FSF</a> (this is necessary as nano is an official GNU package, but it does <b>not</b> mean that you transfer the rights of your work to the FSF, it's just so the FSF can legally manage them).</p>
-  <p>In any case, translating nano is easy. Just grab the latest <b>nano.pot</b> file listed on <a href="http://translationproject.org/domain/nano.html">nano's page</a> at the TP, and translate each <b>msgid</b> line into your native language on the <b>msgstr</b> line. When you're done, you should send it to the TP's central PO-file repository.</p></blockquote>
+<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>
@@ -243,12 +245,11 @@
 
 <h1><a name="6"></a>6. Advocacy and Licensing</h1>
 <h3><a name="6.1"></a>6.1. Why should I use nano instead of Pico?</h3>
-<blockquote><p>There are many reasons to use nano instead of Pico. A more complete list can be found at the <a href="https://nano-editor.org/">nano homepage</a>.</p></blockquote>
+<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>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>
+<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="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>
+<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>
@@ -256,10 +257,10 @@
 
 <h1><a name="7"></a>7. Miscellaneous</h1>
 <h3><a name="7.1"></a>7.1. Where can I ask questions or send suggestions?</h3>
-<blockquote><p>There are three mailing lists for nano hosted at <a href="http://savannah.gnu.org/">Savannah</a>: info-nano, help-nano and nano-devel. info-nano is a very low traffic list where new versions of nano are announced (surprise!). help-nano is for getting help with the editor without needing to hear all of the development issues surrounding it. nano-devel is a normally low, sometimes high traffic list for discussing the present and future development of nano. Here are links to where you can sign up for a given list:</p>
-  <p>info-nano - <a href="http://mail.gnu.org/mailman/listinfo/info-nano/">http://mail.gnu.org/mailman/listinfo/info-nano/</a><br>
-  help-nano - <a href="http://mail.gnu.org/mailman/listinfo/help-nano/">http://mail.gnu.org/mailman/listinfo/help-nano/</a><br>
-  nano-devel - <a href="http://mail.gnu.org/mailman/listinfo/nano-devel/">http://mail.gnu.org/mailman/listinfo/nano-devel/</a></p></blockquote>
+<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.

doc/nano.1

@@ -1,4 +1,4 @@
-.\" Copyright (C) 1999-2011, 2013-2017 Free Software Foundation, Inc.
+.\" Copyright (C) 1999-2011, 2013-2020 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,34 +7,63 @@
 .\"   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.9.5" "March 2018"
+.TH NANO 1 "version 5.2" "August 2020"
 
 .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 "]..."
+.RI [ options "] [[\fB+" line [\fB, column "]] " file ]...
+.sp
+.BR nano " [" \fIoptions "] [[" + [ crCR ]( / | ? ) \fIstring "] " \fIfile ]...
+
+.SH NOTICE
+Since version 4.0, \fBnano\fR by default:
+.sp
+.RS 4
+\(bu does not automatically hard-wrap lines that become overlong,
+.br
+\(bu includes the line below the title bar in the editing area,
+.br
+\(bu does linewise (smooth) scrolling.
+.RE
+.sp
+If you want the old, Pico behavior back, you can use \fB\-\-breaklonglines\fR,
+\fB\-\-emptyline\fR, and \fB\-\-jumpyscrolling\fR (or \fB\-bej\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
 lacks, such as: opening multiple files, scrolling per line, undo/redo,
 syntax coloring, line numbering, and soft-wrapping overlong lines.
-
+.sp
 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.
-
+(Negative numbers count from the end of the file or line.)
+The cursor can be put on the first or last occurrence of a specific string
+by specifying that string after \fB+/\fR or \fB+?\fR before the filename.
+The string can be made case sensitive and/or caused to be interpreted as a
+regular expression by inserting \fBc\fR and/or \fBr\fR after the \fB+\fR sign.
+These search modes can be explicitly disabled by using the uppercase variant
+of those letters: \fBC\fR and/or \fBR\fR.  When the string contains spaces,
+it needs to be enclosed in quotes.  To give an example: to open a file at
+the first occurrence of the word "Foo", one would do:
+.sp
+.RS 4
+.BI "nano +c/Foo " file
+.RE
+.sp
 As a special case: if instead of a filename a dash (\fB\-\fR) is given,
 \fBnano\fR will read data from standard input.
 
@@ -47,17 +76,18 @@ 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
+.sp
 On some terminals, text can be selected also by holding down Shift while
-using the arrow keys.  Holding down the Alt key too will increase the stride.
+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.
-.PP
+.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 a \fInanorc\fR file -- see
@@ -82,7 +112,10 @@ numbered one every time a file is saved -- when backups are enabled (\fB\-B\fR).
 The uniquely numbered files are stored in the specified \fIdirectory\fR.
 .TP
 .BR \-D ", " \-\-boldtext
-Use bold text instead of reverse video text.
+For the interface, use bold instead of reverse video.  This will be overridden
+by setting the options \fBtitlecolor\fP, \fBstatuscolor\fP, \fBkeycolor\fP,
+\fBfunctioncolor\fP, \fBnumbercolor\fP, and/or \fBselectedcolor\fP in your
+nanorc file.  See \fBnanorc\fR(5).
 .TP
 .BR \-E ", " \-\-tabstospaces
 Convert typed tabs to spaces.
@@ -100,13 +133,20 @@ executed commands, so they can be easily reused in later sessions.
 .BR \-I ", " \-\-ignorercfiles
 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
@@ -115,31 +155,35 @@ hard-wrapping occurs or when text is justified.
 .BR \-N ", " \-\-noconvert
 Disable automatic conversion of files from DOS/Mac format.
 .TP
-.BR \-O ", " \-\-morespace
-Use the blank line below the title bar as extra editing space.
+.BR \-O ", " \-\-bookstyle
+When justifying, treat any line that starts with whitespace as the
+beginning of a paragraph (unless auto-indenting is on).
 .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.
 .TP
-.BR "\-Q ""\fIcharacters\fB""" ", " "\-\-quotestr=""" \fIcharacters """
-Set the quoting string for justifying.  The default is
-\fB"^([\ \\t]*[#:>\\|}])+"\fP if extended regular expression support is
-available, or \fB">\ "\fP otherwise.  Note that \fB\\t\fP stands for a
-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.
+.BR \-S ", " \-\-softwrap
+Display over multiple screen rows lines that exceed the screen's width.
+(You can make this soft-wrapping occur at whitespace instead of rudely at
+the screen's edge, by using also \fB\-\-atblanks\fR.)
+(The old short option, \fB\-$\fR, is deprecated.)
 .TP
 .BR \-T\ \fInumber ", " \-\-tabsize= \fInumber
 Set the size (width) of a tab to \fInumber\fP columns.  The value of
@@ -159,36 +203,57 @@ characters as part of a word.
 .TP
 .BR "\-X ""\fIcharacters\fB""" ", " "\-\-wordchars=""" \fIcharacters """
 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).
+should be considered as part of a word.  When using this option, you
+probably want to omit \fB\-W\fR (\fB\-\-wordbounds\fR).
 .TP
 .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 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 \-f\ \fIfile ", " \-\-rcfile= \fIfile
+Read only this \fIfile\fR for setting nano's options, instead of reading
+both the system-wide and the user's nanorc files.
 .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 \-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
@@ -196,6 +261,7 @@ position to the end of the line, instead of cutting the entire line.
 .TP
 .BR \-l ", " \-\-linenumbers
 Display line numbers to the left of the text area.
+(Any line with an anchor additionally gets a mark in the margin.)
 .TP
 .BR \-m ", " \-\-mouse
 Enable mouse support, if available for your system.  When enabled, mouse
@@ -216,24 +282,28 @@ Set the operating directory.  This makes \fBnano\fP set up something
 similar to a chroot.
 .TP
 .BR \-p ", " \-\-preserve
-Preserve the XON and XOFF sequences (^Q and ^S) so they will be caught
-by the terminal.
+Preserve the XON and XOFF sequences (\fB^Q\fR and \fB^S\fR) so they
+will be caught by the terminal.
 .TP
-.BR \-q ", " \-\-quiet
-Obsolete option.  Recognized but ignored.
+.BR \-q ", " \-\-indicator
+Display a "scrollbar" on the righthand side of the edit window.
+It shows the position of the viewport in the buffer
+and how much of the buffer is covered by the viewport.
 .TP
 .BR \-r\ \fInumber ", " \-\-fill= \fInumber
-Hard-wrap lines at column \fInumber\fP.  If this value is 0 or less, wrapping
-will occur at the width of the screen less \fInumber\fP columns, allowing
-the wrap point to vary along with the width of the screen if the screen
-is resized.  The default value is \-8.  This option conflicts with
-\fB\-w\fR (\fB\-\-nowrap\fR) -- the last one given takes effect.
+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 \-s\ \fIprogram ", " \-\-speller= \fIprogram
-Use this alternative spell checker command.
+.B "\-s ""\fIprogram\fR [\fIargument \fR...]\fB""\fR, \fB\-\-speller=""\fIprogram\fR [\fIargument \fR...]\fB"""
+Use this command to perform spell checking and correcting, instead of
+using the built-in corrector that calls \fBhunspell\fR or GNU \fBspell\fR.
 .TP
-.BR \-t ", " \-\-tempfile
+.BR \-t ", " \-\-saveonexit
 Save a changed buffer without prompting (when exiting with \fB^X\fR).
+(The old form of the long option, \fB\-\-tempfile\fR, is deprecated.)
 .TP
 .BR \-u ", " \-\-unix
 Save a file by default in Unix format.  This overrides nano's
@@ -242,41 +312,43 @@ 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 (\fB\-\-fill\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 \-z ", " \-\-suspend
-Enable the suspend ability.
+.BR \-y ", " \-\-afterends
+Make Ctrl+Right and Ctrl+Delete stop at word ends instead of beginnings.
 .TP
-.BR \-$ ", " \-\-softwrap
-Enable 'soft wrapping'.  This will make \fBnano\fP attempt to display the
-entire contents of any line, even if it is longer than the screen width, by
-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 \-b ", " \-e ", " \-f ", " \-j
-Ignored, for compatibility with Pico.
+.BR \-z ", " \-\-suspendable
+Allow the user to suspend the editor (with \fB^Z\fR by default).
 
 .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.
+.sp
+The \fBM\-X\fR toggle is special: it works in all menus except
+the help viewer and the linter.  All other toggles work in
+the main menu only.
 
-.SH INITIALIZATION FILE
+.SH FILES
+When \fB\-\-rcfile\fR is given, \fBnano\fR will read just the specified file
+for setting its options and syntaxes and key bindings.  Without that option,
 \fBnano\fR will read two configuration files: first the system's
 \fInanorc\fR (if it exists), and then the user's \fInanorc\fR (if it
-exists), either \fB~/.nanorc\fR or \fI$XDG_CONFIG_HOME\fB/nano/nanorc\fR
-or \fB~/.config/nano/nanorc\fR, whichever is encountered first.  See
+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.
 
@@ -296,29 +368,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)
-are not yet covered by the general undo system.  So after a justification
-that is not immediately undone, earlier edits
-cannot be undone any more.  The workaround is, of course, to exit without
-saving.
-.sp
 The recording and playback of keyboard macros works correctly only on a
 terminal emulator, not on a Linux console (VT), because the latter does
 not by default distinguish modified from unmodified arrow keys.
 .sp
 Please report any other bugs that you encounter via:
 .br
-\fIhttps://savannah.gnu.org/bugs/?group=nano\fR.
+.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-2020 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,28 +7,44 @@
 .\"   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.9.5" "March 2018"
+.TH NANORC 5 "version 5.2" "August 2020"
 
 .SH NAME
 nanorc \- GNU nano's configuration file
 
 .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
+The \fInanorc\fP files contain the default settings for \fBnano\fP,
+a small and friendly editor.  During startup, if \fB\-\-rcfile\fR
+is not given, \fBnano\fR will read two files: first the
+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 \fB~/.nanorc\fR or from \fI$XDG_CONFIG_HOME\fB/nano/nanorc\fR
-or from \fB~/.config/nano/nanorc\fR, whichever is encountered first.
+from \fI~/.nanorc\fR or from \fI$XDG_CONFIG_HOME/nano/nanorc\fR
+or from \fI~/.config/nano/nanorc\fR, whichever is encountered first.
+If \fB\-\-rcfile\fR is given, \fBnano\fR will read just the specified
+settings file.
+
+.SH NOTICE
+Since version 4.0, \fBnano\fR by default:
+.sp
+.RS 4
+\(bu does not automatically hard-wrap lines that become overlong,
+.br
+\(bu includes the line below the title bar in the editing area,
+.br
+\(bu does linewise (smooth) scrolling.
+.RE
+.sp
+To get the old, Pico behavior back, you can use \fBset breaklonglines\fR,
+\fBset emptyline\fR, and \fBset jumpyscrolling\fR.
 
 .SH OPTIONS
 The configuration file accepts a series of \fBset\fP and \fBunset\fP
@@ -36,23 +52,24 @@ 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
+All commands and keywords should be written in lowercase.
+.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 \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 and Ctrl+Delete 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
@@ -63,7 +80,9 @@ 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
@@ -75,22 +94,25 @@ 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
-Obsolete option.  Recognized but ignored.  \fB^Q\fR is available to
-start a backward search.
-.TP
 .B set boldtext
 Use bold instead of reverse video for the 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"
+.B set bookstyle
+When justifying, treat any line that starts with whitespace as the
+beginning of a paragraph (unless auto-indenting is on).
+.TP
+.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
@@ -100,46 +122,64 @@ This overrides the option \fBquickblank\fR.
 .TP
 .B set cutfromcursor
 Use cut-from-cursor-to-end-of-line by default, instead of cutting the whole line.
-(The old form of this option, '\fBset cut\fR', is deprecated.)
 .TP
-.B set errorcolor \fIfgcolor\fR,\fIbgcolor\fR
+.B set emptyline
+Do not use the line below the title bar, leaving it entirely blank.
+.TP
+.B set errorcolor \fR[\fBbold,\fR][\fBitalic,\fR]\fIfgcolor\fB,\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.
-The default value is \fB\-8\fR.  This option conflicts with
-\fBnowrap\fR -- the last one given takes effect.
+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
+.B set functioncolor \fR[\fBbold,\fR][\fBitalic,\fR]\fIfgcolor\fB,\fIbgcolor\fR
 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 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 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 keycolor \fIfgcolor\fR,\fIbgcolor\fR
+.B set indicator
+Display a "scrollbar" on the righthand side of the edit window.
+It shows the position of the viewport in the buffer
+and how much of the buffer is covered by the viewport.
+.TP
+.B set jumpyscrolling
+Scroll the buffer contents per half-screen instead of per line.
+.TP
+.B set keycolor \fR[\fBbold,\fR][\fBitalic,\fR]\fIfgcolor\fB,\fIbgcolor\fR
 Specify the color combination to use for the shortcut key combos
 in the two help lines at the bottom of the screen.
 See \fBset titlecolor\fR for more details.
 .TP
 .B set linenumbers
 Display line numbers to the left of the text area.
+(Any line with an anchor additionally gets a mark in the margin.)
 .TP
 .B set locking
 Enable vim-style lock-files for when editing files.
 .TP
-.B set matchbrackets "\fIstring\fP"
-Set the opening and closing brackets that can be found by bracket
+.BI "set matchbrackets """ characters """
+Specify 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 title bar 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,7 +189,7 @@ System, and on the console when gpm is running.  Text can still be
 selected through dragging by holding down the Shift key.
 .TP
 .B set multibuffer
-When reading in a file with ^R, insert it into a new buffer by default.
+When reading in a file with \fB^R\fR, insert it into a new buffer by default.
 .TP
 .B set noconvert
 Don't convert files from DOS/Mac format.
@@ -158,17 +198,17 @@ 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).
+Obsolete option.  Ignored.
 .TP
 .B set nowrap
-Don't hard-wrap text at all.  This option conflicts with
-\fBfill\fR -- the last one given takes effect.
+Deprecated option since it has become the default setting.
+When needed, use \fBunset breaklonglines\fR instead.
 .TP
-.B set numbercolor \fIfgcolor\fR,\fIbgcolor\fR
+.B set numbercolor \fR[\fBbold,\fR][\fBitalic,\fR]\fIfgcolor\fB,\fIbgcolor\fR
 Specify the color combination to use for line numbers.
 See \fBset titlecolor\fR for more details.
 .TP
@@ -183,9 +223,9 @@ Save the cursor position of files between editing sessions.
 The cursor position is remembered for the 200 most-recently edited files.
 .TP
 .B set preserve
-Preserve the XON and XOFF keys (^Q and ^S).
+Preserve the XON and XOFF keys (\fB^Q\fR and \fB^S\fR).
 .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
@@ -195,31 +235,33 @@ specfified closing punctuation, optionally followed by closing brackets
 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
-Obsolete option.  Recognized but ignored.
+.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
+.B set saveonexit
+Save a changed buffer automatically on exit (\fB^X\fR); don't prompt.
+(The old form of this option, \fBset tempfile\fR, is deprecated.)
+.TP
+.B set selectedcolor \fR[\fBbold,\fR][\fBitalic,\fR]\fIfgcolor\fB,\fIbgcolor\fR
 Specify the color combination to use for selected text.
 See \fBset titlecolor\fR for more details.
 .TP
@@ -235,21 +277,28 @@ 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.
+Display lines that exceed the screen's width over multiple screen lines.
+(You can make this soft-wrapping occur at whitespace instead of rudely at
+the screen's edge, by using also \fBset atblanks\fR.)
 .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\fR [\fIargument \fR...]\fB"""
+Use the given \fIprogram\fR to do spell checking and correcting, instead of
+using the built-in corrector that calls \fBhunspell\fR or GNU \fBspell\fR.
 .TP
-.B set statuscolor \fIfgcolor\fR,\fIbgcolor\fR
+.B set  statuscolor \fR[\fBbold,\fR][\fBitalic,\fR]\fIfgcolor\fB,\fIbgcolor\fR
 Specify the color combination to use for the status bar.
 See \fBset titlecolor\fR for more details.
 .TP
-.B set suspend
-Allow \fBnano\fP to be suspended.
+.B set stripecolor \fR[\fBbold,\fR][\fBitalic,\fR]\fIfgcolor\fB,\fIbgcolor\fR
+Specify the color combination to use for the vertical guiding stripe.
+See \fBset titlecolor\fR for more details.
+.TP
+.B set suspendable
+Allow \fBnano\fP to be suspended (with \fB^Z\fR by default).
 .TP
 .B set tabsize \fInumber\fR
 Use a tab size of \fInumber\fR columns.  The value of \fInumber\fP must be
@@ -258,17 +307,22 @@ greater than 0.  The default value is \fB8\fR.
 .B set tabstospaces
 Convert typed tabs to spaces.
 .TP
-.B set tempfile
-Save automatically on exit, don't prompt.
-.TP
-.B set titlecolor \fIfgcolor\fR,\fIbgcolor\fR
+.B set titlecolor \fR[\fBbold,\fR][\fBitalic,\fR]\fIfgcolor\fB,\fIbgcolor\fR
 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 ", "
-.BR cyan ", " yellow ", " magenta ", and " normal
+.BR red ", " green ", " blue ", " magenta ", " yellow ", " cyan ", "
+.BR white ", and " black .
+Each of these eight names may be prefixed with the word \fBlight\fR
+to get a brighter version of that color.
+On terminal emulators that can do at least 256 colors,
+other valid (but unprefixable) color names are:
+.BR pink ", " purple ", " mauve ", " lagoon ", " mint ", "
+.BR lime ", " peach ", " orange ", " latte ", 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.
+Either "\fIfgcolor\fR" or "\fB,\fIbgcolor\fR" may be left out,
+and the pair may be preceded by \fBbold\fR and/or \fBitalic\fR
+(separated by commas) to get a bold and/or slanting typeface,
+if your terminal can do those.
 .TP
 .B set trimblanks
 Remove trailing whitespace from wrapped lines when automatic
@@ -280,9 +334,11 @@ 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.  The default pair
 for a UTF-8 locale is "\fB\[Fc]\[md]\fR", and for other locales "\fB>.\fR".
@@ -291,10 +347,14 @@ for a UTF-8 locale is "\fB\[Fc]\[md]\fR", and for other locales "\fB>.\fR".
 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.
+should be considered as parts of words.  When using this option, you
+probably want to unset \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
@@ -304,10 +364,24 @@ 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
+All regular expressions in \fBnano\fR are POSIX extended regular expressions.
+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"" ...]"
+.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
@@ -316,20 +390,20 @@ command is encountered.
 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
+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,
+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
+The syntax \fBnone\fP is reserved; specifying it on the command line
 is the same as not having a syntax at all.
 .TP
-.BR header " ""\fIregex\fR"" " ...
+.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
-.BR magic " ""\fIregex\fR"" " ...
+.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
@@ -337,17 +411,17 @@ 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.)
+.BI formatter " program " \fR[ "argument " \fR...]
+Run the given \fIprogram\fR on the full contents of the current buffer.
+(The current buffer is written out to a temporary file, the program is
+run on it, and then the temporary file is read back in, replacing the
+contents of the buffer.)
 .TP
-.BI formatter " program " \fR[ "arg " \fR...]
-Use the given \fIprogram\fR to automatically reformat text --
-useful in a programming language like Go.
-(This overrides the speller and linter functions.)
+.BI linter " program " \fR[ "argument " \fR...]
+Use the given \fIprogram\fR to run a syntax check on the current buffer.
 .TP
-.BR comment " ""\fIstring\fR"""
-Use the given string for commenting and uncommenting lines.
+.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
@@ -357,41 +431,56 @@ for Python files.  If empty double quotes are specified, the comment/uncomment
 function is disabled; for example, "" for JSON.
 The default value is "\fB#\fP".
 .TP
-.B color \fIfgcolor\fR,\fIbgcolor\fR """\fIregex\fR""" ...
-Display all pieces of text that match
-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
-foreground.  If your terminal supports transparency, not specifying a
-\fIbgcolor\fP tells \fBnano\fP to attempt to use a transparent
-background.
+.BI "tabgives """ string """
+Make the <Tab> key produce the given \fIstring\fR.  Useful for languages like
+Python that want to see only spaces for indentation.
+This overrides the setting of the \fBtabstospaces\fR option.
 .TP
-.B icolor \fIfgcolor\fR,\fIbgcolor\fR """\fIregex\fR""" ...
+.BI "color \fR[\fBbold,\fR][\fBitalic,\fR]" fgcolor , bgcolor " """ regex """ " \fR...
+Paint all pieces of text that match the extended regular expression
+\fIregex\fP with the given foreground and background colors, at least
+one of which must be specified.  Valid color names are:
+.BR red ", " green ", " blue ", " magenta ", " yellow ", " cyan ", "
+.BR white ", and " black .
+Each of these eight names may be prefixed with the word \fBlight\fR
+to get a brighter version of that color.
+On terminal emulators that can do at least 256 colors,
+other valid (but unprefixable) color names are:
+.BR pink ", " purple ", " mauve ", " lagoon ", " mint ", "
+.BR lime ", " peach ", " orange ", " latte ", and " normal
+-- where \fBnormal\fR means the default foreground or background color.
+The color pair may be preceded by \fBbold\fR and/or \fBitalic\fR
+(separated by commas) to get a bold and/or slanting typeface,
+if your terminal can do those.
+.sp
+All coloring commands are applied in the order in which they are specified,
+which means that later commands can recolor stuff that was colored earlier.
+.TP
+.BI "icolor \fR[\fBbold,\fR][\fBitalic,\fR]" 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""
-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,
+.BI "color \fR[\fBbold,\fR][\fBitalic,\fR]" fgcolor , bgcolor " start=""" fromrx """ end=""" torx """
+Paint all pieces of text whose start matches extended regular expression
+\fIfromrx\fP and whose end matches extended regular expression \fItorx\fP
+with the given foreground and background colors,
 at least one of which must be specified.  This means that, after an
 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 \fR[\fBbold,\fR][\fBitalic,\fR]" 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 command " \fR[ "arg " \fR...]
+.BI extendsyntax " name command argument " \fR...
 Extend the syntax previously defined as \fIname\fR with another
 \fIcommand\fR.  This allows adding a new \fBcolor\fP, \fBicolor\fP,
-\fBheader\fP, \fBmagic\fP, \fBcomment\fP, \fBlinter\fP, or \fBformatter\fP
+\fBheader\fR, \fBmagic\fR, \fBformatter\fR, \fBlinter\fR, \fBcomment\fR,
+or \fBtabgives\fR
 command to an already defined syntax -- useful when you want to
 slightly improve a syntax defined in one of the system-installed
 files (which normally are not writable).
@@ -401,40 +490,58 @@ 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).
+Rebinds the given \fIkey\fP to the given \fIfunction\fP in the given \fImenu\fP
+(or in all menus where the function exists when \fBall\fP is used).
 .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.)
-
+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).
+Unbinds the given \fIkey\fP from the given \fImenu\fP (or from all
+menus where the key exists when \fBall\fP is used).
 .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
+.TP 7
+.BI ^ X
+where \fIX\fR is a Latin letter, or one of several ASCII characters
+(@, ], \\, ^, _), or the word "Space".
+Example: ^C.
 .TP
-.B M-
-followed by a printable character or the word "Space".
-Example: M-C
+.BI M\- X
+where \fIX\fR is any ASCII character except [, or the word "Space".
+Example: M\-8.
 .TP
-.B F
-followed by a numeric value from 1 to 16.
-Example: F10
+.BI Sh\-M\- X
+where \fIX\fR is a Latin letter.
+Example: Sh\-M\-U.
+By default, each Meta+letter keystroke does the same as the corresponding
+Shift+Meta+letter.  But when any Shift+Meta bind is made, that will
+no longer be the case, for all letters.
+.TP
+.BI F N
+where \fIN\fR is a numeric value from 1 to 24.
+Example: F10.
+(Often, \fBF13\fR to \fBF24\fR can be typed as \fBF1\fR to \fBF12\fR with Shift.)
+
+.TP
+.BR Ins " or " Del .
 .RE
 
+Rebinding \fB^M\fR (Enter) or \fB^I\fR (Tab) is probably not a good idea.
+Rebinding \fB^[\fR (Esc) is not possible, because its keycode
+is the starter byte of Meta keystrokes and escape sequences.
+Rebinding any of the dedicated cursor-moving keys (the arrows, Home, End,
+PageUp and PageDown) is not possible.
+On some terminals it's not possible to rebind \fB^H\fR (unless \fB\-\-raw\fR
+is used) because its keycode is identical to that of the Backspace key.
+
 .TP
 Valid \fIfunction\fP names to be bound are:
 .RS 3
@@ -446,7 +553,7 @@ Invokes the help viewer.
 Cancels the current command.
 .TP
 .B exit
-Exits from the program (or from the help viewer or the file browser).
+Exits from the program (or from the help viewer or file browser).
 .TP
 .B writeout
 Writes the current buffer to disk, asking for a name.
@@ -463,16 +570,14 @@ Starts a forward search for text in the current buffer -- or for filenames
 matching a string in the current list in the file browser.
 .TP
 .B wherewas
-Starts a backward search for text in the current buffer.
-.TP
-.B searchagain
-Repeats the last search command without prompting.
+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.
@@ -480,40 +585,61 @@ 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 \fB^H\fR 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 curpos
-Shows the current cursor position: the line, column, and character positions.
+.B mark
+Sets the mark at the current position, to start selecting text.
+Or, when it is set, unsets the mark.
+.TP
+.B location
+Reports the current position of the cursor in the buffer:
+the line, column, and character positions.
+(The old name of this function, 'curpos', is deprecated.)
 .TP
 .B wordcount
 Counts the number of words, lines and characters in the current buffer.
 .TP
+.B execute
+Prompts for a program to execute.  The program's output will be inserted
+into the current buffer (or into a new buffer when \fBM-F\fR is toggled).
+.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 \fBhunspell\fR or GNU
+\fBspell\fR, or the one defined by \fB\-\-speller\fR or \fBset speller\fR.
+.TP
+.B formatter
+Invokes a full-buffer-processing program (if the active syntax defines one).
 .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.
@@ -552,6 +678,9 @@ while keeping the cursor in the same text position, if possible.
 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 center
+Scrolls the line with the cursor to the middle of the screen.
+.TP
 .B prevword
 Moves the cursor to the beginning of the previous word.
 .TP
@@ -594,8 +723,18 @@ 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 findbracket
-Moves the cursor to the bracket (brace, parenthesis, etc.) that matches
-(pairs) with the one under the cursor.
+Moves the cursor to the bracket (or brace or parenthesis, etc.) that matches
+(pairs) with the one under the cursor.  See \fBset matchbrackets\fR.
+.TP
+.B anchor
+Places an anchor at the current line, or removes it when already present.
+(An anchor is visible when line numbers are activated.)
+.TP
+.B prevanchor
+Goes to the first anchor before the current line.
+.TP
+.B nextanchor
+Goes to the first anchor after the current line.
 .TP
 .B prevbuf
 Switches to editing/viewing the previous buffer when multiple buffers are open.
@@ -636,37 +775,45 @@ Refreshes the screen.
 .TP
 .B suspend
 Suspends the editor (if the suspending function is enabled, see the
-"suspendenable" entry below).
+\fBsuspendable\fR toggle item 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.
+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.
 .TP
 .B flipgoto
 Toggles between searching for text and targeting a line number.
-(The form 'gototext' is deprecated.)
 .TP
 .B flipexecute
 Toggles between inserting a file and executing a command.
 .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.
 .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).
 .TP
@@ -684,37 +831,37 @@ When writing a file, creates a backup of the current file.
 .TP
 .B discardbuffer
 When about to write a file, discard the current buffer without saving.
-(This function is bound by default only when option \fB\-\-tempfile\fR
+(This function is bound by default only when option \fB\-\-saveonexit\fR
 is in effect.)
 .TP
 .B browser
-Starts the file browser, allowing to select a file from a list.
+Starts the file browser (in the Read File and Write Out menus),
+allowing to select a file from a list.
 .TP
 .B gotodir
 Goes to a directory to be specified, allowing to browse anywhere
 in the filesystem.
 .TP
 .B firstfile
-Goes to the first file when using the file browser (reading or writing files).
+Goes to the first file in the list when using the file browser.
 .TP
 .B lastfile
-Goes to the last file when using the file browser (reading or writing files).
+Goes to the last file in the list when using the file browser.
 .TP
 .B nohelp
 Toggles the presence of the two-line list of key bindings at the bottom of the screen.
+(This toggle is special: it is available in all menus except the help viewer
+and the linter.  All further toggles are available in the main menu only.)
 .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 that 'separates' the title bar 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
@@ -725,9 +872,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
@@ -737,21 +886,13 @@ 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.
+.B suspendable
+Toggles whether the suspend keystroke (\fB^Z\fR by default)
+will actually suspend the editor.
+(The old name of this function, 'suspendenable', is deprecated.)
 .RE
 
 .TP
@@ -761,6 +902,9 @@ Valid \fImenu\fP sections are:
 .B main
 The main editor window where text is entered and edited.
 .TP
+.B help
+The help-viewer menu.
+.TP
 .B search
 The search menu (AKA whereis).
 .TP
@@ -770,6 +914,9 @@ The 'search to replace' menu.
 .B replacewith
 The 'replace with' menu, which comes up after 'search to replace'.
 .TP
+.B yesno
+The 'yesno' menu, where the Yes/No/All/Cancel question is asked.
+.TP
 .B gotoline
 The 'goto line (and column)' menu.
 .TP
@@ -779,20 +926,9 @@ The 'write file' menu.
 .B insert
 The 'insert file' menu.
 .TP
-.B extcmd
-The menu for inserting output from an external command, reached from the insert menu.
-.TP
-.B help
-The help-viewer menu.
-.TP
-.B spell
-The interactive spell checker Yes/no menu.
-.TP
-.B linter
-The linter menu.
-.TP
 .B browser
-The file browser for inserting or writing a file.
+The 'file browser' menu, for selecting a file to be opened or
+inserted or written to.
 .TP
 .B whereisfile
 The 'search for a file' menu in the file browser.
@@ -800,6 +936,18 @@ The 'search for a file' menu in the file browser.
 .B gotodir
 The 'go to directory' menu in the file browser.
 .TP
+.B execute
+The menu for inserting the output from an external command,
+or for filtering the buffer (or the marked region) through
+an external command, or for executing one of several tools.
+(The old form of this menu name, 'extcmd', is deprecated.)
+.TP
+.B spell
+The menu of the integrated spell checker where the user can edit a misspelled word.
+.TP
+.B linter
+The linter menu, which allows jumping through the linting messages.
+.TP
 .B all
 A special name that encompasses all menus.
 For \fBbind\fR it means all menus where the specified \fIfunction\fR exists;
@@ -808,16 +956,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
-.BR ~/.nanorc " or " \fI$XDG_CONFIG_HOME\fB/nano/nanorc " or " ~/.config/nano/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-2020 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,16 +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.9.5" "March 2018"
+.TH RNANO 1 "version 5.2" "August 2020"
 
 .SH NAME
 rnano \- a restricted nano
@@ -29,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]
@@ -47,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,25 +1,24 @@
 ## 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.
+## For the options that take parameters, the default value is shown.
+## Other options are unset by default.  To make sure that an option
+## is disabled, you can use "unset <option>".
 ##
-## 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 }.
+## Characters that are special in a shell should not be escaped here.
+## Inside string parameters, quotes should not be escaped -- the last
+## double quote on the line will be seen as the closing quote.
+
+## Make 'nextword' (Ctrl+Right) and 'chopwordright' (Ctrl+Delete)
+## stop at word ends instead of at beginnings.
+# set afterends
 
 ## When soft line wrapping is enabled, make it wrap lines at blanks
 ## (tabs and spaces) instead of always at the edge of the screen.
 # set atblanks
 
-## Use auto-indentation.
+## 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.
@@ -31,33 +30,45 @@
 ## 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.
+## Treat any line with leading whitespace as the beginning of a paragraph.
+# set bookstyle
+
+## 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 status bar.  Note that
 ## this overrides "quickblank".
 # set constantshow
-## (The old form, 'const', is deprecated.)
 
 ## Use cut-from-cursor-to-end-of-line by default.
 # set cutfromcursor
-## (The old form, 'cut', is deprecated.)
 
-## Set the line length for wrapping text and justifying paragraphs.
-## If the value is 0 or less, the wrapping point will be the screen
-## width less this number.
+## Do not use the line below the title bar, leaving it entirely blank.
+# set emptyline
+
+## Set the target width for automatic hard-wrapping and for justifying
+## paragraphs.  If the specified value is 0 or less, the wrapping point
+## will be the terminal's width minus this number.
 # set fill -8
 
 ## Remember the used search/replace strings for the next session.
 # set historylog
 
-## Display line numbers to the left of the text.
+## Display a "scrollbar" on the righthand side of the edit window.
+# set indicator
+
+## Scroll the buffer contents per half-screen instead of per line.
+# set jumpyscrolling
+
+## Display line numbers to the left (and any anchors in the margin).
 # set linenumbers
 
 ## Enable vim-style lock-files.  This is just to let a vim user know you
@@ -70,9 +81,6 @@
 ## come before the latter set, and both must be in the same order.
 # set matchbrackets "(<[{)>]}"
 
-## Use the blank line below the title bar 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
@@ -89,16 +97,9 @@
 ## Don't display the helpful shortcut lists at the bottom of the screen.
 # set nohelp
 
-## Don't pause between warnings at startup.  Which means that only the
-## last one will be readable (when there are multiple ones).
-# set nopauses
-
-## Don't add newlines to the ends of files.
+## Don't automatically add a newline when a file does not end with one.
 # 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
@@ -107,7 +108,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
@@ -122,25 +122,27 @@
 ## 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.
+## Save a changed buffer automatically on exit; don't prompt.
+# set saveonexit
+## (The old form of this option, 'set tempfile', is deprecated.)
+
+## 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
@@ -150,18 +152,16 @@
 ## beginning of the line.
 # set smarthome
 
-## Use smooth scrolling as the default.
-# set smooth
-
-## Enable soft line wrapping (AKA full-line display).
+## Spread overlong lines over multiple screen lines.
 # set softwrap
 
 ## Use this spelling checker instead of the internal one.  This option
 ## does not have a default value.
 # set speller "aspell -x -c"
 
-## Allow nano to be suspended.
-# set suspend
+## Allow nano to be suspended (with ^Z by default).
+# set suspendable
+## (The old form of this option, 'set suspend', is deprecated.)
 
 ## Use this tab size instead of the default; it must be greater than 0.
 # set tabsize 8
@@ -169,9 +169,6 @@
 ## Convert typed tabs to spaces.
 # set tabstospaces
 
-## Save automatically on exit; don't prompt.
-# set tempfile
-
 ## Snip whitespace at the end of lines when justifying or hard-wrapping.
 # set trimblanks
 
@@ -195,78 +192,96 @@
 ## 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, except for errorcolor.
-# set titlecolor brightwhite,blue
-# set statuscolor brightwhite,green
-# set errorcolor brightwhite,red
-# set selectedcolor brightwhite,magenta
+# set titlecolor bold,lightwhite,blue
+# set statuscolor bold,lightwhite,green
+# set errorcolor bold,lightwhite,red
+# set selectedcolor lightwhite,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,magenta
-# set statuscolor brightwhite,magenta
-# set errorcolor brightwhite,red
-# set selectedcolor brightwhite,cyan
+# set titlecolor bold,lightwhite,magenta
+# set statuscolor bold,lightwhite,magenta
+# set errorcolor bold,lightwhite,red
+# set selectedcolor lightwhite,cyan
+# set stripecolor ,yellow
 # set numbercolor magenta
-# set keycolor brightmagenta
+# set keycolor lightmagenta
 # set functioncolor magenta
 
 
-## Setup of syntax coloring.
-##
-## Format:
-##
-## syntax "short description" ["filename regex" ...]
-##
-## The "none" syntax is reserved; specifying it on the command line is
-## the same as not having a syntax at all.  The "default" syntax is
-## special: it takes no filename regexes, and applies to files that
-## don't match any other syntax's filename regexes.
-##
-## color foreground,background "regex" ["regex"...]
-## or
-## icolor foreground,background "regex" ["regex"...]
-##
-## "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.
-##
-## To use multi-line regexes, use the start="regex" end="regex"
-## [start="regex" end="regex"...] format.
-##
-## If your system supports transparency, not specifying a background
-## color will use a transparent color.  If you don't want this, be sure
-## to set the background color to black or white.
-##
-## 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:
-##
-## include "/path/to/syntax_file.nanorc"
-##
-## Unless otherwise noted, the name of the syntax file (without the
-## ".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.
-##
+## === Syntax coloring ===
+## For all details, see 'man nanorc', section SYNTAX HIGHLIGHTING.
+
 ## To include all existing syntax definitions, you can do:
 # include "@PKGDATADIR@/*.nanorc"
 
+## Or you can select just the ones you need.  For example:
+# include "@PKGDATADIR@/html.nanorc"
+# include "@PKGDATADIR@/python.nanorc"
+# include "@PKGDATADIR@/sh.nanorc"
 
-## Key bindings.
-## See nanorc(5) (section REBINDING KEYS) for more details on this.
-##
-## The following two functions are not bound to any key by default.
-## You may wish to choose other keys than the ones suggested here.
-# bind M-B cutwordleft main
-# bind M-N cutwordright main
+## In @PKGDATADIR@/extra/ you can find some syntaxes that are
+## specific for certain distros or for less common languages.
 
-## Set this if your Backspace key sends Del most of the time.
-# bind Del backspace all
+## If <Tab> should always produce four spaces when editing a Python file,
+## independent of the settings of 'tabsize' and 'tabstospaces':
+# extendsyntax python tabgives "    "
+
+## If <Tab> should always produce an actual TAB when editing a Makefile:
+# extendsyntax makefile tabgives "	"
+
+
+## === Key bindings ===
+## For all details, see 'man nanorc', section REBINDING KEYS.
+
+## 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 ^S savefile main
+#bind ^W writeout main
+#bind ^O insert main
+#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 M-X flipnewbuffer all
+#bind ^X cut all
+#bind ^C copy main
+#bind ^V paste all
+#bind ^P location main
+#bind ^A mark main
+#unbind ^K main
+#unbind ^U all
+#unbind ^N main
+#unbind ^Y all
+#unbind M-J main
+#unbind M-T main
+#bind ^T gotoline main
+#bind ^T gotodir browser
+#bind ^Y speller main
+#bind M-U undo main
+#bind M-R redo main
+#bind ^U undo main
+#bind ^E redo main
+#set multibuffer

m4/ChangeLog

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

nano.spec.in

@@ -1,53 +0,0 @@
-%define name	@PACKAGE@
-%define version	@VERSION@
-%define release	1
-
-Name		: %{name}
-Version		: %{version}
-Release		: %{release}
-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/latest/%{name}-%{version}.tar.gz
-
-BuildRoot	: %{_tmppath}/%{name}-%{version}-root
-BuildRequires	: autoconf, automake, gettext-devel, ncurses-devel, texinfo
-Requires(post)	: info
-Requires(preun)	: info
-
-%description
-GNU nano is a small and friendly text editor.  It aims to emulate the
-Pico text editor while also offering several enhancements.
-
-%prep
-%setup -q
-
-%build
-%configure
-make
-
-%install
-make DESTDIR="%{buildroot}" install
-#ln -s nano %{buildroot}/%{_bindir}/pico
-rm -f %{buildroot}/%{_infodir}/dir
-
-%post
-/sbin/install-info %{_infodir}/%{name}.info %{_infodir}/dir || :
-
-%preun
-if [ $1 = 0 ] ; then
-/sbin/install-info --delete %{_infodir}/%{name}.info %{_infodir}/dir || :
-fi
-
-%files
-%defattr(-,root,root)
-%doc AUTHORS COPYING ChangeLog INSTALL NEWS README THANKS TODO doc/faq.html doc/sample.nanorc
-%{_bindir}/*
-%{_docdir}/nano/*
-%{_mandir}/man*/*
-%{_mandir}/fr/man*/*
-%{_infodir}/nano.info*
-%{_datadir}/locale/*/LC_MESSAGES/nano.mo
-%{_datadir}/nano/*

po/ChangeLog

@@ -1,998 +0,0 @@
-2014-05-28  Benno Schulenberg  <bensberg@justemail.net>
-	* de.po, eo.po, nl.po: Updates for German, Dutch, and Esperanto.
-
-2014-05-27  Benno Schulenberg  <bensberg@justemail.net>
-	* de.po, nl.po, ru.po: Updates for Russian, Dutch, and German.
-
-2014-05-25  Benno Schulenberg  <bensberg@justemail.net>
-	* it.po, uk.po: Updates from the TP for Ukrainian and Italian.
-
-2014-05-22  Benno Schulenberg  <bensberg@justemail.net>
-	* de.po, uk.po: Updates from the TP for German and Ukrainian.
-
-2014-05-16  Benno Schulenberg  <bensberg@justemail.net>
-	* eo.po, fi.po, fr.po, nl.po, vi.po: Updates from the TP for
-	Vietnamese, Finnish, Dutch, French, and Esperanto.
-
-2014-05-13  Benno Schulenberg  <bensberg@justemail.net>
-	* nano.pot, *.po: Regenerated the POT file and refreshed the PO's.
-
-2014-03-22  Benno Schulenberg  <bensberg@justemail.net>
-	* nano.pot: Regenerated the POT file.
-	* cs.po, es.po, it.po, nb.po, sr.po, zh_TW: Updates from the TP
-	for Czech, Spanish, Italian, Norwegian, Serbian, and Chinese.
-	* LINGUAS: Removed rw (Kinyarwanda) -- it was just fragments.
-
-2007-12-09  Jordi Mallach  <jordi@gnu.org>
-
-	* LINGUAS: Add zh_CN.
-	* es.po, fr.po, it.po, nb.po, nl.po, pt_BR.po: New pull from the TP,
-	to fetch the now corrected latest pt_BR file.
-
-2007-12-08  Jordi Mallach  <jordi@gnu.org>
-
-	* zh_CN.po: New Simplified Chinese translation by
-	LI Daobing <lidaobing@gmail.com>.
-	* fr.po, ga.po, ms.po, nl.po, nn.po, vi.po: Translation updates taken
-	from the Translation Project.
-	* Refreshed the rest of the files from the latest TP archive.
-
-2007-09-18  Jordi Mallach  <jordi@gnu.org>
-
-	* po/ru.po: Updated Russian translation by Sergey A. Ribalchenko.
-
-2007-08-11  David Lawrence Ramsey  <pooka109@gmail.com>
-
-	* po/update.pl: Relicense to the GNU GPL version 3 or later.
-
-2007-07-31  David Lawrence Ramsey  <pooka109@gmail.com>
-
-	* po/update.pl: Update copyright notice to account for
-	modifications.
-
-2007-01-29  David Lawrence Ramsey  <pooka109@cox.net>
-
-	* ru.po: Updated Russian translation by Dimitriy Ryazantcev.
-	* ru.po: Fix incorrect "Project-Id-Version" entry and misplaced
-	space.
-
-2007-01-13  David Lawrence Ramsey  <pooka109@cox.net>
-
-	* es.po: Fix misplaced space.
-	* eu.po: Fix typos and misplaced space.
-	* fr.po: Fix misplaced space.
-	* gl.po: Fix typos and misplaced space.
-	* nb.po: Fix typos and more misplaced space.
-
-2007-01-06  David Lawrence Ramsey  <pooka109@cox.net>
-
-	* nb.po: Fix misplaced space.
-
-2006-12-06  David Lawrence Ramsey  <pooka109@cox.net>
-
-	* hu.po: Removed unneeded duplicate plural forms again.
-	* ms.po: Fix incorrect "Project-Id-Version" entry.
-
-2006-12-06  Jordi Mallach <jordi@gnu.org>
-
-	* hu.po: Updated Hungarian translation by Gabor Kelemen.
-	* ms.po: Updated Malay translation by
-	Sharuzzaman Ahmat Raslan.
-
-2006-11-20  David Lawrence Ramsey  <pooka109@cox.net>
-
-	* tr.po: Removed unneeded blank plural forms, as gettext 0.15
-	generates errors upon encountering them.
-
-2006-10-25  Jordi Mallach  <jordi@gnu.org>
-
-	* fr.po: Updated French translation by Jean-Philippe Guérard.
-	* nb.po: Updated Norwegian bokmål translation by
-	Geir Helland.
-
-2006-10-16  Jordi Mallach  <jordi@gnu.org>
-
-	* gl.po: Updated Galician translation by
-	Francisco Javier Tsao Santín.
-
-2006-10-16  Jordi Mallach  <jordi@gnu.org>
-
-	* eu.po: Updated Basque translation by Mikel Olasagasti.
-
-2006-10-10  Jordi Mallach  <jordi@gnu.org>
-
-	* gl.po: Updated Galician translation by
-	Francisco Javier Tsao Santín.
-
-2006-10-02  Jordi Mallach  <jordi@gnu.org>
-
-	* pt_BR.po: Refetch the current nano 1.9.99pre0 pt_BR file from
-	the TP, as the latest file offered is apparently for 1.3.11pre1.
-
-2006-10-02  David Lawrence Ramsey  <pooka109@cox.net>
-
-	* pt_BR.po: Restore previous version of pt_BR, as it was for
-	nano 1.9.99pre0, and the current version is for 1.3.11pre1.
-
-2006-09-27  Jordi Mallach  <jordi@gnu.org>
-
-	* pt_BR.po: Updated Brazilian Portuguese translation by
-	Joao Victor Duarte Martins.
-
-2006-09-10  David Lawrence Ramsey  <pooka109@cox.net>
-
-	* hu.po: Removed unneeded duplicate plural forms again.
-
-2006-09-10  Jordi Mallach  <jordi@gnu.org>
-
-	* hu.po: Updated Hungarian translation by Gabor Kelemen.
-
-2006-09-02  Jordi Mallach  <jordi@gnu.org>
-
-	* pt_BR.po: Updated Brazilian Portuguese translation by
-	Joao Victor Duarte Martins.
-
-2006-09-01  Benno Schulenberg  <bensberg@justemail.net>
-
-	* ChangeLog: Fix incorrect years in two entries.
-
-2006-08-31  David Lawrence Ramsey  <pooka109@cox.net>
-
-	* bg.po: Fix misplaced space.
-
-2006-08-31  Jordi Mallach  <jordi@gnu.org>
-
-	* ca.po: Updated Catalan translation.
-	* de.po: Updated German translation by Michael Piefel.
-	* es.po: Updated Spanish translation by
-	Ricardo Javier Cardenes Medina.
-
-2006-08-28  Jordi Mallach  <jordi@gnu.org>
-
-	* fr.po: Updated French translation by Jean-Philippe Guérard.
-
-2006-08-25  Jordi Mallach  <jordi@gnu.org>
-
-	* bg.po: Updated Bulgarian translation by Anton Zinoviev.
-	* ca.po: Updated Catalan translation.
-	* ga.po: Updated Irish translation by Kevin Patrick Scannell.
-	* it.po: Updated Italian translation by Marco Colombo.
-	* nl.po: Updated Dutch translation by Benno Schulenberg.
-	* sv.po: Updated Swedish translation by Daniel Nylander.
-
-2006-08-15  David Lawrence Ramsey  <pooka109@cox.net>
-
-	* hu.po: Removed unneeded duplicate plural forms, as gettext
-	0.15 generates errors upon encountering them.
-	* id.po: Removed unneeded duplicate plural forms, as gettext
-	0.15 generates errors upon encountering them.
-
-2006-06-20  Jordi Mallach  <jordi@gnu.org>
-
-	* ca.po: Updated Catalan translation.
-	* fr.po: Updated French translation by Jean-Philippe Guérard.
-	* hu.po: Updated Hungarian translation by Gabor Kelemen.
-	* nl.po: Updated Dutch translation by Benno Schulenberg.
-
-2006-06-20  David Lawrence Ramsey  <pooka109@cox.net>
-
-	* fr.po: Fix incorrect "Project-Id-Version" entry.
-	* hu.po: Fix incorrect "Project-Id-Version" entry.
-	* it.po: Fix incorrect "Project-Id-Version" entry.
-
-2006-06-19  Jordi Mallach  <jordi@gnu.org>
-
-	* bg.po: Updated Bulgarian translation by Anton Zinoviev.
-	* ga.po: Updated Irish translation by Kevin Patrick Scannell.
-
-2006-06-17  Jordi Mallach  <jordi@gnu.org>
-
-	* ca.po: Updated Catalan translation.
-	* de.po: Updated German translation by Michael Piefel.
-	* fr.po: Updated French translation by Jean-Philippe Guérard.
-	* hu.po: Updated Hungarian translation by Gabor Kelemen.
-	* it.po: Updated Italian translation by Marco Colombo.
-	* nl.po: Updated Dutch translation by Benno Schulenberg.
-
-2006-06-12  Jordi Mallach  <jordi@gnu.org>
-
-	* fr.po: Updated French translation by Jean-Philippe Guérard.
-	* hu.po: Updated Hungarian translation by Gabor Kelemen.
-
-2006-06-09  Jordi Mallach  <jordi@gnu.org>
-
-	* ca.po: Updated Catalan translation.
-	* ga.po: Updated Irish translation by Kevin Patrick Scannell.
-	* it.po: Updated Italian translation by Marco Colombo.
-	* nl.po: Updated Dutch translation by Benno Schulenberg.
-
-2006-05-17  Jordi Mallach  <jordi@gnu.org>
-
-	* LINGUAS: Added "ga".
-	* ga.po: New Irish translation by
-	Kevin Patrick Scannell <scannell@SLU.EDU>.
-
-2006-05-10  Jordi Mallach  <jordi@gnu.org>
-
-	* nl.po: Updated Dutch translation by Benno Schulenberg.
-
-2006-03-15  Jordi Mallach  <jordi@gnu.org>
-
-	* sv.po: Updated Swedish translation by Daniel Nylander.
-
-2006-03-06  Jordi Mallach  <jordi@gnu.org>
-
-	* ca.po: Updated Vietnamese translation by
-	Phan Vinh Thinh.
-
-2005-12-21  Jordi Mallach  <jordi@gnu.org>
-
-	* bg.po: Updated Bulgarian translation by Anton Zinoviev.
-	* ca.po: Updated Catalan translation.
-	* fr.po: Updated French translation by Jean-Philippe Guérard.
-	* ms.po: Updated Malay translation by Sharuzzaman Ahmat Raslan.
-	* zh_TW: Updated Traditional Chinese translation by
-	Wei-Lun Chao.
-
-2005-12-13  Jordi Mallach  <jordi@gnu.org>
-
-	* it.po: Updated Italian translation by Marco Colombo.
-	* de.po: Updated German translation by Michael Piefel.
-	* nl.po: Updated Dutch translation by Benno Schulenberg.
-
-2005-11-08  David Lawrence Ramsey  <pooka109@cox.net>
-
-	* POTFILES.in: Add prompt.c.
-
-2005-11-05  David Lawrence Ramsey  <pooka109@cox.net>
-
-	* POTFILES.in: Add browser.c.
-
-2005-11-01  David Lawrence Ramsey  <pooka109@cox.net>
-
-	* POTFILES.in: Add help.c.
-
-2005-10-23  Jordi Mallach  <jordi@gnu.org>
-
-	* ca.po: Updated Catalan translation.
-	* eu.po: Updated Basque translation by Mikel Olasagasti.
-	* fr.po: Updated French translation by Jean-Philippe Guérard.
-	* it.po: Updated Italian translation by Marco Colombo.
-	* ms.po: Updated Malay translation by Sharuzzaman Ahmat Raslan.
-	* nl.po: Updated Dutch translation by Benno Schulenberg.
-	* zh_TW: Updated Traditional Chinese translation by
-	Wei-Lun Chao.
-	
-2005-08-22  Jordi Mallach  <jordi@gnu.org>
-	* bg.po: New Bulgarian translation by
-	Yavor Doganov <yavor@doganov.org>.
-
-	* LINGUAS: Added "bg".
-
-2005-08-16  Jordi Mallach  <jordi@gnu.org>
-
-	* ca.po: Updated Catalan translation.
-
-2005-08-16  Jordi Mallach  <jordi@gnu.org>
-
-	* nl.po: Updated Dutch translation by
-	Benno Schulenberg and Reinout van Schouwen.
-
-2005-07-24  David Lawrence Ramsey  <pooka109@cox.net>
-
-	* POTFILES.in: Add text.c.
-
-2005-07-19  Jordi Mallach  <jordi@gnu.org>
-
-	* ms.po: Updated Malay translation by
-	Sharuzzaman Ahmat Raslan.
-
-2005-07-18  Jordi Mallach  <jordi@gnu.org>
-
-	* fr.po: Updated French translation by
-	Jean-Philippe Guérard.
-
-2005-07-07  Jordi Mallach  <jordi@gnu.org>
-
-	* it.po: Updated Italian translation by Marco Colombo.
-	* ca.po: Updated Catalan translation.
-
-2005-06-28  David Lawrence Ramsey  <pooka109@cox.net>
-
-	* POTFILES.in: Remove source files that contain no translatable
-	strings.
-
-2005-06-19  David Lawrence Ramsey  <pooka109@cox.net>
-
-	* pt_BR.po: Typo fix.
-
-2005-06-15  Jordi Mallach  <jordi@gnu.org>
-
-	* de.po: Typo fix by Jens Seidel.
-
-2005-05-23  Jordi Mallach  <jordi@gnu.org>
-
-	* fr.po: Updated French translation by
-	Jean-Philippe Guérard.
-
-2005-04-27  Jordi Mallach  <jordi@gnu.org>
-
-	* ms.po: Updated Malay translation by
-	Sharuzzaman Ahmat Raslan.
-
-2005-04-22  Jordi Mallach  <jordi@gnu.org>
-
-	* nb.po: Updated Norwegian bokmål translation by
-	Geir Helland.
-
-2005-04-20  Jordi Mallach  <jordi@gnu.org>
-
-	* ms.po: Updated Malay translation by
-	Sharuzzaman Ahmat Raslan.
-	* ro.po: Updated Romanian translation by Laurentiu Buzdugan.
-	* zh_TW.po: Updated Traditional Chinese translation by
-	CHAO Wei-Lun.
-
-2005-04-18  Jordi Mallach  <jordi@gnu.org>
-
-	* vi.po: Updated Vietnamese translation by Phan Vinh Thinh.
-
-2005-04-18  Jordi Mallach  <jordi@gnu.org>
-
-	* ca.po: Updated Catalan translation.
-	* it.po: Updated Italian translation by Marco Colombo.
-	* ro.po: Updated Romanian translation by Laurentiu Buzdugan.
-
-2005-04-14  Jordi Mallach  <jordi@gnu.org>
-
-	* es.po: Updated Spanish translation by
-	Ricardo Javier Cárdenes Medina.
-
-2005-04-13  Jordi Mallach  <jordi@gnu.org>
-
-	* vi.po: New Vietnamese translation by Phan Vinh Thinh.
-	* LINGUAS: Added "vi".
-
-2005-04-09  Jordi Mallach  <jordi@gnu.org>
-
-	* zh_TW.po: Added Plural-Forms header and fix format specification
-	typos.
-
-2005-04-08  Jordi Mallach  <jordi@gnu.org>
-
-	* ca.po: Updated Catalan translation.
-	* it.po: Updated Italian translation by Marco Colombo.
-	* zh_TW.po: Updated Traditional Chinese translation by
-	CHAO Wei-Lun.
-
-2005-04-06  Jordi Mallach  <jordi@gnu.org>
-
-	* rw.po: New Kinyarwanda translation by Steve Murphy.
-	* LINGUAS: Added "rw".
-
-2005-04-05  Jordi Mallach  <jordi@gnu.org>
-
-	* fr.po: Updated French translation by
-	Jean-Philippe Guérard.
-	* ro.po: Updated Romanian translation by
-	Laurentiu Buzdugan.
-
-2005-03-11  Jordi Mallach  <jordi@gnu.org>
-
-	* ms.po: Updated Malay translation by
-	Sharuzzaman Ahmat Raslan.
-
-2005-01-17  Jordi Mallach  <jordi@gnu.org>
-
-	* pt_BR.po: Updated Brazilian Portuguese translation by
-	Joao Victor Duarte Martins.
-
-2004-12-15  Jordi Mallach  <jordi@gnu.org>
-
-	* it.po: Updated Italian translation by Marco Colombo.
-
-2004-12-15  Jordi Mallach  <jordi@gnu.org>
-
-	* sv.po: Updated Swedish translation by Christian Rose.
-
-2004-12-13  Jordi Mallach  <jordi@gnu.org>
-
-	* sv.po: Updated Swedish translation by Christian Rose.
-
-2004-12-07  Jordi Mallach  <jordi@gnu.org>
-
-	* it.po: Updated Italian translation by
-	Marco Colombo.
-	* ro.po: Updated Romanian translation by
-	Laurentiu Buzdugan.
-
-2004-12-01  Jordi Mallach  <jordi@gnu.org>
-
-	* ca.po: Updated Catalan translation.
-	* nb: Updated Norwegian bokmål translation by
-	Geir Helland.
-	* fr.po: Updated French translation by
-	Jean-Philippe Guérard.
-
-2004-11-18  Jordi Mallach  <jordi@gnu.org>
-
-	* fr.po: Updated French translation by
-	Jean-Philippe Guérard.
-
-2004-11-18  Jordi Mallach  <jordi@gnu.org>
-
-	* ms.po: Updated Malay translation by
-	Sharuzzaman Ahmat Raslan.
-
-2004-10-07  Jordi Mallach  <jordi@gnu.org>
-
-	* eu.po: Updated Basque translation by
-	Mikel Olasagasti.
-
-2004-08-31  Jordi Mallach  <jordi@gnu.org>
-
-	* es.po: Updated Spanish translation by
-	Ricardo Javier Cárdenes Medina.
-
-2004-08-31  Jordi Mallach  <jordi@gnu.org>
-
-	* fr.po: Updated Catalan translation by
-	Jean-Philippe Guérard.
-
-2004-08-27  Jordi Mallach  <jordi@gnu.org>
-
-	* ca.po: Updated Catalan translation.
-	* de.po: Updated German translation by Michael Piefel.
-
-2004-06-01  Jordi Mallach  <jordi@gnu.org>
-
-	* zh_TW.po: Added Traditional Chinese translation by
-	CHAO Wei-Lun <chaoweilun@pcmail.com.tw>.
-	* LINGUAS: Added "zh_TW".
-
-2004-02-24  Jordi Mallach  <jordi@gnu.org>
-
-	* ms.po: Updated Malay translation by Sharuzzaman Ahmat Raslan.
-
-2003-11-25  Jordi Mallach  <jordi@gnu.org>
-
-	* ro.po: Updated Romanian translation by Laurentiu Buzdugan.
-
-2003-11-06  Jordi Mallach  <jordi@gnu.org>
-
-	* sr.po: Added Serbian translation by Danilo Segan <dsegan@gmx.net>.
-	* LINGUAS: Added "sr" (Serbian), and alphabetize.
-	* ChangeLog: Recoded as UTF-8.
-
-2003-10-30  Jordi Mallach  <jordi@gnu.org>
-
-	* fi.po: Patch from Martin-Eric Racine <q-funk@pp.fishpool.fi>
-	to accept "Yy" and "Nn" as well as the Finnish letters in Yes/No
-	prompts.
-
-2003-10-18  Jordi Mallach  <jordi@gnu.org>
-
-	* ca.po: Updated Catalan translation.
-
-2003-09-12  Jordi Mallach  <jordi@gnu.org>
-
-	* POTFILES.in: Updated path to sources.
-
-2003-09-01  Jordi Mallach  <jordi@gnu.org>
-
-	* fr.po: Updated French translation by Jean-Philippe Guérard.
-
-2003-08-17  Jordi Mallach  <jordi@gnu.org>
-
-	* tr.po: Updated Turkish translation by A. Murat EREN.
-
-2003-08-05  Jordi Mallach  <jordi@gnu.org>
-
-	* ca.po: Updated Catalan translation.
-
-2003-06-11  Jordi Mallach  <jordi@gnu.org>
-
-	* nb.po: Updated Norwegian bokmål translation by Geir Helland.
-
-2003-06-10  Jordi Mallach  <jordi@gnu.org>
-
-	* fr.po: Updated French translation by Jean-Philippe Guérard.
-
-2003-06-02  Jordi Mallach  <jordi@gnu.org>
-
-	* de.po: Updated German translation by Michael Piefel.
-
-2003-05-06  Jordi Mallach  <jordi@gnu.org>
-
-	* ms.po: Updated Malay translation by Sharuzzaman Ahmat Raslan.
-
-2003-04-24  Jordi Mallach  <jordi@gnu.org>
-
-	* ro.po: New Romanian translation by Laurentiu Buzdugan.
-	* id.po: Updated Indonesian translation by Tedi Heriyanto.
-	* LINGUAS: Added "ro" (Romanian).
-
-2003-04-12  Jordi Mallach  <jordi@gnu.org>
-
-	* ms.po: Updated Malay translation by Sharuzzaman Ahmat Raslan.
-
-2003-04-04  Jordi Mallach  <jordi@gnu.org>
-
-	* fr.po: Updated French translation by Jean-Philippe Guérard.
-
-2003-03-17  Jordi Mallach  <jordi@gnu.org>
-
-	* ms.po: Updated Malay translation by Sharuzzaman Ahmat Raslan.
-
-2003-03-10  Jordi Mallach  <jordi@gnu.org>
-
-	* da.po: Updated Danish translation by Keld Simonsen.
-
-2003-03-06  Jordi Mallach  <jordi@gnu.org>
-
-	* ms.po: Updated Malay translation by Sharuzzaman Ahmat Raslan.
-	* id.po: Updated Indonesian translation by Tedi Heriyanto.
-
-2003-02-23  Jordi Mallach  <jordi@gnu.org>
-
-	* nl.po: Updated Dutch translation by Guus Sliepen.
-
-2003-02-19  Jordi Mallach  <jordi@gnu.org>
-
-	* fi.po: Updated Finnish translation by Kalle Olavi Niemitalo.
-	* es.po: Updated Spanish translation by Ricardo Javier Cárdenes
-	Medina.
-
-2003-02-17  Jordi Mallach  <jordi@gnu.org>
-
-	* de.po: Updated German translation by Michael Piefel.
-	* ru.po: Updated Russian translation by Sergey A. Ribalchenko.
-	* uk.po: Updated Ukrainian translation by Sergey A. Ribalchenko.
-
-2003-02-16  Jordi Mallach  <jordi@gnu.org>
-
-	* gl.po: Updated Galician translation by Jacobo Tarrío.
-	* fr.po: Updated French translation by Jean-Philippe Guérard.
-
-2003-02-15  Jordi Mallach  <jordi@gnu.org>
-
-	* fr.po: Updated French translation by Jean-Philippe Guérard.
-	* nl.po: Updated Dutch translation by Guus Sliepen.
-	* sv.po: Updated Swedish translation by Christian Rose.
-	* ca.po: Updated Catalan translation.
-
-2003-02-13  Jordi Mallach  <jordi@gnu.org>
-
-	* ru.po: Updated Russian translation from Sergey A. Ribalchenko.
-
-2003-02-10  Jordi Mallach  <jordi@gnu.org>
-
-	* Makevars (XGETTEXT_OPTIONS): Added --keyword=P_:1,2.
-	* update.pl: likewise.
-	* fi.po: Added Plural-Forms: header.
-
-2003-02-10  Jordi Mallach  <jordi@gnu.org>
-
-	* fi.po: Updated Finnish translation by Kalle Kivimaa and
-	Kalle Olavi Niemitalo.
-
-2003-02-08  Chris Allegretta <chrisa@asty.org>
-
-	* it.po: Fix broken format string in translation.
-
-2003-02-08  Jordi Mallach  <jordi@gnu.org>
-
-	* it.po: Updated Italian translation by Marco Colombo.
-	* gl.po: Updated Galician translation by Jacobo Tarrío.
-	* es.po: Updated Spanish translation by Ricardo Javier Cárdenes
-	Medina.
-
-2003-02-06  Jordi Mallach  <jordi@gnu.org>
-
-	* pl.po: Updated Polish translation by Wojciech Kotwica.
-	* sv.po: Updated Swedish translation by Christian Rose.
-
-2003-02-04  Jordi Mallach  <jordi@gnu.org>
-
-	* ca.po: Updated Catalan translation.
-	* fr.po: Updated French translation by Jean-Philippe Guérard.
-	* uk.po: Updated Ukrainian translation by Sergey A. Ribalchenko.
-	* de.po: Updated German translation by Michael Piefel.
-
-2003-01-27  Jordi Mallach  <jordi@gnu.org>
-
-	* es.po: Updated translation by Ricardo Javier Cárdenes Medina.
-
-2002-01-26  Jordi Mallach  <jordi@gnu.org>
-
-	* pl.po: Updated translation by Wojciech Kotwica.
-
-2002-01-25  Jordi Mallach  <jordi@gnu.org>
-
-	* gl.po: Updated translation by Jacobo Tarrío.
-
-2002-01-22  Jordi Mallach  <jordi@gnu.org>
-
-	* de.po: Updated translation by Michael Piefel.
-
-2003-01-21  Jordi Mallach  <jordi@gnu.org>
-
-	* fr.po: Updated translation by Jean-Philippe Guérard.
-	* ms.po: Updated translation by Sharuzzaman Ahmat Raslan.
-	* uk.po: Updated translation by Sergey A. Ribalchenko. 
-
-2003-01-18  Jordi Mallach  <jordi@gnu.org>
-
-	* fr.po: Updated translation by Jean-Philippe Guérard.
-	* sv.po: Updated translation by Christian Rose.
-	* nl.po: Updated translation by Guus Sliepen.
-	* ca.po: Updated translation.
-
-2003-01-15  Jordi Mallach  <jordi@gnu.org>
-
-	* Makefile.in.in: Removed, generated by autopoint.
-	* Rules-quot: Likewise.
-	* boldquot.sed: Likewise.
-	* en@boldquot.header: Likewise.
-	* en@quot.header: Likewise.
-	* insert-header.sin: Likewise.
-	* quot.sed: Likewise.
-	* remove-potcdate.sin: Likewise.
-
-2003-01-15  Jordi Mallach  <jordi@gnu.org>
-
-	* LINGUAS: New file, exported values from configure.ac's ALL_LINGUAS.
-	* it.po: Updated translation by Marco Colombo.
-	* eu.po: New Basque translation by Peio Ziarsolo.
-
-2002-12-14  Jordi Mallach  <jordi@sindominio.net>
-
-	* fr.po: Updated translation by Jean-Philippe Guérard.
-	* tr.po: New Turkish translation by Doruk Fisek.
-
-2002-11-10  Jordi Mallach  <jordi@sindominio.net>
-
-	* uk.po: Updated translation by Sergey A. Ribalchenko.
-	* da.po: Updated translation by Keld Simonsen.
-
-2002-11-05  Jordi Mallach  <jordi@sindominio.net>
-
-	* ms.po: Updated translation by Sharuzzaman Ahmat Raslan.
-
-2002-11-03  Jordi Mallach  <jordi@sindominio.net>
-
-	* sv.po: Updated translation by Christian Rose.
-	* pl.po: Updated translation by Wojciech Kotwica.
-
-2002-10-29  Jordi Mallach  <jordi@sindominio.net>
-
-	* id.po: Updated translation by Tedi Heriyanto.
-	* fr.po: Updated translation by Jean-Philippe Guérard.
-
-2002-10-27  Jordi Mallach  <jordi@sindominio.net>
-
-	* fr.po: Updated translation by Jean-Philippe Guérard.
-
-2002-10-26  Jordi Mallach  <jordi@sindominio.net>
-
-	* es.po: Updated translation by Ricardo Javier Cárdenes Medina.
-
-2002-10-26  Jordi Mallach  <jordi@sindominio.net>
-
-	* gl.po: Updated translation by Jacobo Tarrío.
-	* sv.po: Updated translation by Christian Rose.
-	* de.po: Updated translation by Michael Piefel.
-	* fr.po: Updated translation by Jean-Philippe Guérard.
-	* ca.po: Updated translation.
-
-2002-10-17  Jordi Mallach  <jordi@sindominio.net>
-
-	* de.po: Updated translation by Michel Piefel.
-
-2002-10-14  Jordi Mallach  <jordi@sindominio.net>
-
-	* fr.po: Updated translation by Jean-Philippe Guérard.
-
-2002-10-13  Jordi Mallach  <jordi@sindominio.net>
-
-	* es.po: Updated translation by Ricardo Javier Cárdenes Medina.
-
-2002-10-08  Jordi Mallach  <jordi@sindominio.net>
-
-	* id.po: Updated translation by Tedi Heriyanto.
-	* ms.po: Updated translation by Sharuzzaman Ahmat Raslan.
-
-2002-10-07  Jordi Mallach  <jordi@sindominio.net>
-
-	* de.po: Updated translation by Michel Piefel.
-
-2002-10-07  Jordi Mallach  <jordi@sindominio.net>
-
-	* ca.po: Updated translation.
-
-2002-10-07  Jordi Mallach  <jordi@sindominio.net>
-
-	* sv.po: Updated translation by Christian Rose.
-	* gl.po: Updated translation by Jacobo Tarrío.
-	* pl.po: Updated translation by Wojciech Kotwica.
-
-2002-09-08  Jordi Mallach  <jordi@sindominio.net>
-
-	* ms.po: Updated translation by Sharuzzaman Ahmat Raslan.
-
-2002-09-08  Jordi Mallach  <jordi@sindominio.net>
-
-	* fr.po: Updated translation by Jean-Philippe Guérard. 
-	* da.po: Updated translation by Keld Simonsen.
-
-2002-08-19  Jordi Mallach  <jordi@sindominio.net>
-
-	* de.po: Updated translation by Michael Piefel.
-	* ms.po: Updated translation by Sharuzzaman Ahmat Raslan.
-
-2002-07-31  Jordi Mallach  <jordi@sindominio.net>
-
-	* gl.po: Updated translation by Jacobo Tarrío.
-
-2002-07-31  Jordi Mallach  <jordi@sindominio.net>
-
-	* es.po: Updated translation by Ricardo Javier Cárdenes Medina.
-
-2002-07-31  Jordi Mallach  <jordi@sindominio.net>
-
-	* fr.po: Updated translation by Jean-Philippe Guérard.
-
-2002-07-30  Jordi Mallach  <jordi@sindominio.net>
-
-	* pl.po: Updated translation by Wojciech Kotwica.
-	* sv.po: Upadted translation by Christian Rose.
-
-2002-07-29  Jordi Mallach  <jordi@sindominio.net>
-
-	* ca.po: Updated translation.
-
-2002-07-29  Jordi Mallach  <jordi@sindominio.net>
-
-	* sv.po: Updated translation by Christian Rose.
-
-2002-07-27  Jordi Mallach  <jordi@sindominio.net>
-
-	* pt_BR.po: New Brazilian Portuguese translation by
-	Claudio Neves.
-
-2002-07-25  Jordi Mallach  <jordi@sindominio.net>
-
-	* id.po: Updated translation by Tedi Heriyanto.
-
-2002-07-09  Jordi Mallach  <jordi@sindominio.net>
-
-	* de.po: Updated translation by Michael Piefel.
-
-2002-07-07  Jordi Mallach  <jordi@sindominio.net>
-
-	* da.po: Updated translation by Keld Simonsen.
-
-2002-07-03  Jordi Mallach  <jordi@sindominio.net>
-
-	* ms.po: New Bahasa Melayu translation by
-	Sharuzzaman Ahmat Raslan.
-
-2002-06-03  gettextize  <bug-gnu-gettext@gnu.org>
-
-	* Makefile.in.in: Upgrade to gettext-0.11.2.
-	* Rules-quot: New file, from gettext-0.11.2.
-	* boldquot.sed: New file, from gettext-0.11.2.
-	* en@boldquot.header: New file, from gettext-0.11.2.
-	* en@quot.header: New file, from gettext-0.11.2.
-	* insert-header.sin: New file, from gettext-0.11.2.
-	* quot.sed: New file, from gettext-0.11.2.
-	* remove-potcdate.sin: New file, from gettext-0.11.2.
-
-2002-05-13  Jordi Mallach  <jordi@sindominio.net>
-
-	* fr.po: Updated translation by Jean-Philippe Guérard.
-	* de.po: Updated translation by Michael Piefel.
-
-2002-05-13  Jordi Mallach  <jordi@sindominio.net>
-
-	* it.po: Updated translation by Marco Colombo.
-	* gl.po: Updated translation by Jacobo Tarrío.
-	* ca.po: Updated translation.
-	* es.po: Updated translation.
-
-2002-05-13  Jordi Mallach  <jordi@sindominio.net>
-
-	* sv.po: Updated translation by Christian Rose.
-
-2002-05-05  Jordi Mallach  <jordi@sindominio.net>
-
-	* sv.po: Updated translation by Christian Rose.
-
-2002-04-25  Jordi Mallach  <jordi@sindominio.net>
-
-	* id.po: Updated translation by Tedi Heriyanto.
-
-2002-04-19  Jordi Mallach  <jordi@sindominio.net>
-
-	* ru.po: Updated translation by Sergey A. Ribalchenko.
-	* uk.po: Updated translation by Sergey A. Ribalchenko.
-
-2002-04-13  Jordi Mallach  <jordi@sindominio.net>
-
-	* it.po: Updated translation by Marco Colombo.
-
-2002-04-13  Jordi Mallach  <jordi@sindominio.net>
-
-	* nl.po: Updated translation by Guus Sliepen.
-
-2002-04-10  Jordi Mallach  <jordi@sindominio.net>
-
-	* sv.po: Updated translation by Christian Rose.
-
-2002-04-05  Jordi Mallach  <jordi@sindominio.net>
-
-	* gl.po: Updated translation by Jacobo Tarrio.
-	* de.po: Updated translation by Michael Piefel.
-	* fr.po: Updated translation by Jean-Philippe Guérard.
-	* ca.po: Updated.
-	* es.po: Updated.
-
-2002-03-29  Jordi Mallach  <jordi@sindominio.net>
-
-	* da.po: Updated translation by Keld Simonsen.
-
-2002-03-27  Jordi Mallach  <jordi@sindominio.net>
-
-	* it.po: Updated translation by Marco Colombo.
-
-2002-03-25  Jordi Mallach  <jordi@sindominio.net>
-
-	* id.po: Updated translation by Tedi Heriyanto.
-
-2002-03-17  Jordi Mallach  <jordi@sindominio.net>
-
-	* fr.po: Updated translation by Jean-Philippe Guérard.
-
-2002-03-15  Jordi Mallach  <jordi@sindominio.net>
-
-	* pl.po: Updated translation by Wojciech Kotwica.
-
-2002-03-14  Jordi Mallach  <jordi@sindominio.net>
-
-	* uk.po, ru.po: Updated translations by Sergey A.
-	Ribalchenko.
-
-2002-03-12  Jordi Mallach  <jordi@sindominio.net>
-
-	* ca.po: Updated to current CVS.
-	* es.po: Updated to current CVS.
-	* gl.po: Updated translation to current CVS by Jacobo Tarrio.
-
-2002-03-12  Jordi Mallach  <jordi@sindominio.net>
-
-	* gl.po: Updated translation by Jacobo Tarrio.
-
-2002-03-11  Jordi Mallach  <jordi@sindominio.net>
-
-	* fr.po: Updated translation by Jean-Philippe Guérard.
-
-2002-03-09  Jordi Mallach  <jordi@sindominio.net>
-
-	* id.po: Updated translation by Tedi Heriyanto.
-	* ca.po: Updated.
-	* es.po: Updated.
-
-2002-03-07  Jordi Mallach  <jordi@sindominio.net>
-
-	* sv.po: Updated translation by Christian Rose.
-	* de.po: Updated translation by Michael Piefel.
-
-2002-03-05  Jordi Mallach  <jordi@sindominio.net>
-
-	* pl.po: Updated translation by Wojciech Kotwica.
-
-2002-02-20  Jordi Mallach  <jordi@sindominio.net>
-
-	* nl.po: Updated translation by Guus Sliepen.
-
-2002-02-15  Jordi Mallach  <jordi@sindominio.net>
-
-	* nb.po: Updated translation by Stig E Sandoe.
-
-2002-02-15  Jordi Mallach  <jordi@sindominio.net>
-
-	* nb.po: Updated translation by Stig E Sandoe.
-
-2002-02-14  Jordi Mallach  <jordi@sindominio.net>
-
-	* da.po: Updated translation by Keld Simonsen.
-
-2002-02-10  Jordi Mallach  <jordi@sindominio.net>
-
-	* hu.po: Updated translation by Gergely Nagy.
-
-2002-02-07  Jordi Mallach  <jordi@sindominio.net>
-
-	* uk.po, ru.po: Updated translations by Sergey A.
-	Ribalchenko.
-
-2002-02-06  Jordi Mallach  <jordi@sindominio.net>
-
-	* hu.po: Updated translation by Gergely Nagy.
-
-2002-02-06  Jordi Mallach  <jordi@sindominio.net>
-
-	* cs.po: Incomplete update by Václav Haisman.
-
-2002-01-27  Jordi Mallach  <jordi@sindominio.net>
-
-	* it.po: Updated translation by Marco Colombo.
-
-2002-01-26  Jordi Mallach  <jordi@sindominio.net>
-
-	* fr.po: Updated translation by Jean-Philippe Guérard.
-	* nn.po: Updated translation by Kjetil Torgrim Homme.
-	* de.po: Updated translation by Michael Piefel.
-
-2002-01-25  Jordi Mallach  <jordi@sindominio.net>
-
-	* sv.po: Updated translation by Christian Rose.
-	* fr.po: Updated translation by Jean-Philippe Guérard.
-
-2002-01-25  Jordi Mallach  <jordi@sindominio.net>
-
-	* ca.po: Updated.
-	* es.po: Updated.
-
-2002-01-23  Jordi Mallach  <jordi@sindominio.net>
-
-	* ca.po: Updated.
-	* es.po: Updated.
-
-2002-01-19  gettextize  <bug-gnu-utils@gnu.org>
-
-	* Makefile.in.in: Upgrade to gettext-0.10.40.
-	* cat-id-tbl.c: Remove file.
-	* stamp-cat-id: Remove file.
-
-2002-01-19  Jordi Mallach  <jordi@sindominio.net>
-
-	* ca.po: Updated.
-	* es.po: Updated.
-
-2002-01-19  Jordi Mallach  <jordi@sindominio.net>
-
-	* da.po: Updated translation by Keld Simonsen.
-
-2002-01-17  Jordi Mallach  <jordi@sindominio.net>
-
-	* no.po: Removed, replaced by nn.po.
-	* nn.po: Updated translation by Kjetil Torgrim Homme.
-	* nb.po: New Norwegian bokmål translation by Stig E Sandoe.
-
-2002-01-12  Jordi Mallach  <jordi@sindominio.net>
-
-	* fr.po: Updated translation by Jean-Philippe Guérard.
-
-2002-01-10  Jordi Mallach  <jordi@sindominio.net>
-
-	* fr.po: Updated translation by Jean-Philippe Guérard.
-
-2002-01-08  Jordi Mallach  <jordi@sindominio.net>
-
-	* ru.po, uk.po: Updated translations by Sergey A.
-	Ribalchenko.
-	* fr.po: Updated translation by Jean-Philippe Guérard.
-
-2002-01-07  Jordi Mallach  <jordi@sindominio.net>
-
-	* de.po: Updated translation by Michael Piefel.
-
-2002-01-07  Jordi Mallach  <jordi@sindominio.net>
-
-	* sv.po: Updated translation by Christian Rose.
-
-2002-01-07  Jordi Mallach  <jordi@sindominio.net>
-
-	* ca.po: Updated.
-	* es.po: Updated.

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 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,6 +2,7 @@
 
 src/browser.c
 src/color.c
+src/cut.c
 src/files.c
 src/global.c
 src/help.c
@@ -13,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,33 @@
+#!/bin/bash
+
+VERSION="5.2"
+
+./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" &&
+
+make pdf &&  rm -rf doc/nano.t2p &&
+scp doc/nano.pdf bens@wh0rd.org:nano.pdf &&
+scp doc/cheatsheet.html bens@wh0rd.org:cheatsheet.html &&
+
+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

@@ -21,7 +21,10 @@ revision.h: FORCE
 FORCE:
 
 bin_PROGRAMS = 	nano
-nano_SOURCES =	browser.c \
+nano_SOURCES = \
+		definitions.h \
+		prototypes.h \
+		browser.c \
 		chars.c \
 		color.c \
 		cut.c \
@@ -31,9 +34,7 @@ nano_SOURCES =	browser.c \
 		history.c \
 		move.c \
 		nano.c \
-		nano.h \
 		prompt.c \
-		proto.h \
 		rcfile.c \
 		search.c \
 		text.c \

src/browser.c

@@ -1,7 +1,7 @@
 /**************************************************************************
  *   browser.c  --  This file is part of GNU nano.                        *
  *                                                                        *
- *   Copyright (C) 2001-2011, 2013-2018 Free Software Foundation, Inc.    *
+ *   Copyright (C) 2001-2011, 2013-2020 Free Software Foundation, Inc.    *
  *   Copyright (C) 2015-2016 Benno Schulenberg                            *
  *                                                                        *
  *   GNU nano is free software: you can redistribute it and/or modify     *
@@ -19,15 +19,15 @@
  *                                                                        *
  **************************************************************************/
 
-#include "proto.h"
+#include "prototypes.h"
+
+#ifdef ENABLE_BROWSER
 
 #include <errno.h>
 #include <stdint.h>
 #include <string.h>
 #include <unistd.h>
 
-#ifdef ENABLE_BROWSER
-
 static char **filelist = NULL;
 		/* The list of files to display in the file browser. */
 static size_t filelist_len = 0;
@@ -39,24 +39,22 @@ static size_t longest = 0;
 static size_t selected = 0;
 		/* The currently selected filename in the list; zero-based. */
 
-/* Our main file browser function.  path is the tilde-expanded path we
- * start browsing from. */
-char *do_browser(char *path)
+/* Allow the user to browse through the directories in the filesystem,
+ * starting at the given path. */
+char *browse(char *path)
 {
-	char *retval = NULL;
-	int kbinput;
 	char *present_name = NULL;
 		/* The name of the currently selected file, or of the directory we
 		 * were in before backing up to "..". */
 	size_t old_selected;
 		/* The number of the selected file before the current selected file. */
-	functionptrtype func;
-		/* The function of the key the user typed in. */
 	DIR *dir;
 		/* The directory whose contents we are showing. */
+	char *chosen = NULL;
+		/* The name of the file that the user picked, or NULL if none. */
 
   read_directory_contents:
-		/* We come here when we refresh or select a new directory. */
+		/* We come here when the user refreshes or selects a new directory. */
 
 	path = free_and_assign(path, get_full_path(path));
 
@@ -67,18 +65,16 @@ char *do_browser(char *path)
 		statusline(ALERT, _("Cannot open directory: %s"), strerror(errno));
 		/* If we don't have a file list yet, there is nothing to show. */
 		if (filelist == NULL) {
-			napms(1200);
-			lastmessage = HUSH;
-			free(path);
+			lastmessage = VACUUM;
 			free(present_name);
+			free(path);
+			napms(1200);
 			return NULL;
 		}
 		path = mallocstrcpy(path, present_path);
 		present_name = mallocstrcpy(present_name, filelist[selected]);
 	}
 
-	assert(path != NULL && path[strlen(path) - 1] == '/');
-
 	if (dir != NULL) {
 		/* Get the file list, and set longest and width in the process. */
 		read_the_list(path, dir);
@@ -103,7 +99,10 @@ char *do_browser(char *path)
 	titlebar(path);
 
 	while (TRUE) {
-		lastmessage = HUSH;
+		functionptrtype func;
+		int kbinput;
+
+		lastmessage = VACUUM;
 
 		bottombars(MBROWSER);
 
@@ -140,24 +139,30 @@ char *do_browser(char *path)
 				/* If we selected the same filename as last time, fake a
 				 * press of the Enter key so that the file is read in. */
 				if (old_selected == selected)
-					unget_kbinput(KEY_ENTER, FALSE);
+					kbinput = KEY_ENTER;
 			}
 
-			continue;
+			if (kbinput == KEY_MOUSE)
+				continue;
 		}
 #endif /* ENABLE_MOUSE */
+#ifndef NANO_TINY
+		if (bracketed_paste || kbinput == BRACKETED_PASTE_MARKER) {
+			beep();
+			continue;
+		}
+#endif
+		func = interpret(&kbinput);
 
-		func = parse_browser_input(&kbinput);
-
-		if (func == total_refresh) {
-			total_redraw();
+		if (func == full_refresh) {
+			full_refresh();
 #ifndef NANO_TINY
 			/* Simulate a window resize to force a directory reread. */
 			kbinput = KEY_WINCH;
 #endif
-		} else if (func == do_help_void) {
+		} else if (func == do_help) {
 #ifdef ENABLE_HELP
-			do_help_void();
+			do_help();
 #ifndef NANO_TINY
 			/* The window dimensions might have changed, so act as if. */
 			kbinput = KEY_WINCH;
@@ -165,25 +170,29 @@ char *do_browser(char *path)
 #else
 			say_there_is_no_help();
 #endif
-		} else if (func == do_search_forward) {
-			do_filesearch();
-		} else if (func == do_research) {
-			do_fileresearch(TRUE);
 #ifndef NANO_TINY
-		} else if (func == do_findprevious) {
-			do_fileresearch(FALSE);
-		} else if (func == do_findnext) {
-			do_fileresearch(TRUE);
+		} else if (func == do_toggle_void) {
+			TOGGLE(NO_HELP);
+			window_init();
+			kbinput = KEY_WINCH;
 #endif
+		} else if (func == do_search_forward) {
+			do_filesearch(FORWARD);
+		} else if (func == do_search_backward) {
+			do_filesearch(BACKWARD);
+		} else if (func == do_findprevious) {
+			do_fileresearch(BACKWARD);
+		} else if (func == do_findnext) {
+			do_fileresearch(FORWARD);
 		} else if (func == do_left) {
 			if (selected > 0)
 				selected--;
 		} else if (func == do_right) {
 			if (selected < filelist_len - 1)
 				selected++;
-		} else if (func == do_prev_word_void) {
+		} else if (func == to_prev_word) {
 			selected -= (selected % width);
-		} else if (func == do_next_word_void) {
+		} else if (func == to_next_word) {
 			selected += width - 1 - (selected % width);
 			if (selected >= filelist_len)
 				selected = filelist_len - 1;
@@ -193,10 +202,10 @@ char *do_browser(char *path)
 		} else if (func == do_down) {
 			if (selected + width <= filelist_len - 1)
 				selected += width;
-		} else if (func == do_prev_block) {
+		} else if (func == to_prev_block) {
 			selected = ((selected / (editwinrows * width)) *
 								editwinrows * width) + selected % width;
-		} else if (func == do_next_block) {
+		} else if (func == to_next_block) {
 			selected = ((selected / (editwinrows * width)) *
 								editwinrows * width) + selected % width +
 								editwinrows * width - width;
@@ -223,13 +232,11 @@ char *do_browser(char *path)
 			selected = 0;
 		} else if (func == to_last_file) {
 			selected = filelist_len - 1;
-		} else if (func == goto_dir_void) {
+		} else if (func == goto_dir) {
 			/* Ask for the directory to go to. */
-			int i = do_prompt(TRUE, FALSE, MGOTODIR, NULL, NULL,
-						/* TRANSLATORS: This is a prompt. */
-						browser_refresh, _("Go To Directory"));
-
-			if (i < 0) {
+			if (do_prompt(MGOTODIR, "", NULL,
+							/* TRANSLATORS: This is a prompt. */
+							browser_refresh, _("Go To Directory")) < 0) {
 				statusbar(_("Cancelled"));
 				continue;
 			}
@@ -291,7 +298,7 @@ char *do_browser(char *path)
 
 			/* If it isn't a directory, a file was selected -- we're done. */
 			if (!S_ISDIR(st.st_mode)) {
-				retval = mallocstrcpy(NULL, filelist[selected]);
+				chosen = copy_of(filelist[selected]);
 				break;
 			}
 
@@ -307,13 +314,12 @@ char *do_browser(char *path)
 		} else if (func == (functionptrtype)implant) {
 			implant(first_sc_for(MBROWSER, func)->expansion);
 #endif
-		} else if (func == do_exit) {
-			/* Exit from the file browser. */
-			break;
 #ifndef NANO_TINY
 		} else if (kbinput == KEY_WINCH) {
-			;
+			;  /* Nothing to do. */
 #endif
+		} else if (func == do_exit) {
+			break;
 		} else
 			unbound_key(kbinput);
 
@@ -321,7 +327,7 @@ char *do_browser(char *path)
 		/* If the window resized, refresh the file list. */
 		if (kbinput == KEY_WINCH) {
 			/* Remember the selected file, to be able to reselect it. */
-			present_name = mallocstrcpy(NULL, filelist[selected]);
+			present_name = copy_of(filelist[selected]);
 			/* Reread the contents of the current directory. */
 			goto read_directory_contents;
 		}
@@ -337,38 +343,29 @@ char *do_browser(char *path)
 	filelist = NULL;
 	filelist_len = 0;
 
-	return retval;
+	return chosen;
 }
 
-/* The file browser front end.  We check to see if inpath has a
- * directory in it.  If it does, we start do_browser() from there.
- * Otherwise, we start do_browser() from the current directory. */
-char *do_browse_from(const char *inpath)
+/* Prepare to start browsing.  If the given path has a directory part,
+ * start browsing in that directory, otherwise in the current directory. */
+char *browse_in(const char *inpath)
 {
-	struct stat st;
-	char *path;
-		/* This holds the tilde-expanded version of inpath. */
+	char *path = real_dir_from_tilde(inpath);
+	struct stat fileinfo;
 
-	path = real_dir_from_tilde(inpath);
-
-	/* Perhaps path is a directory.  If so, we'll pass it to
-	 * do_browser().  Or perhaps path is a directory / a file.  If so,
-	 * we'll try stripping off the last path element and passing it to
-	 * do_browser().  Or perhaps path doesn't have a directory portion
-	 * at all.  If so, we'll just pass the current directory to
-	 * do_browser(). */
-	if (stat(path, &st) == -1 || !S_ISDIR(st.st_mode)) {
+	/* If path is not a directory, try to strip a filename from it; if then
+	 * still not a directory, use the current working directory instead. */
+	if (stat(path, &fileinfo) == -1 || !S_ISDIR(fileinfo.st_mode)) {
 		path = free_and_assign(path, strip_last_component(path));
 
-		if (stat(path, &st) == -1 || !S_ISDIR(st.st_mode)) {
+		if (stat(path, &fileinfo) == -1 || !S_ISDIR(fileinfo.st_mode)) {
 			char *currentdir = charalloc(PATH_MAX + 1);
 
-			free(path);
-			path = getcwd(currentdir, PATH_MAX + 1);
+			path = free_and_assign(path, getcwd(currentdir, PATH_MAX + 1));
 
 			if (path == NULL) {
-				free(currentdir);
 				statusline(MILD, _("The working directory has disappeared"));
+				free(currentdir);
 				beep();
 				napms(1200);
 				return NULL;
@@ -383,7 +380,7 @@ char *do_browse_from(const char *inpath)
 		path = mallocstrcpy(path, operating_dir);
 #endif
 
-	return do_browser(path);
+	return browse(path);
 }
 
 /* Set filelist to the list of files contained in the directory path,
@@ -396,13 +393,11 @@ void read_the_list(const char *path, DIR *dir)
 	const struct dirent *nextdir;
 	size_t i = 0, path_len = strlen(path);
 
-	assert(path != NULL && path[strlen(path) - 1] == '/' && dir != NULL);
-
 	longest = 0;
 
 	/* Find the length of the longest filename in the current folder. */
 	while ((nextdir = readdir(dir)) != NULL) {
-		size_t name_len = strlenpt(nextdir->d_name);
+		size_t name_len = breadth(nextdir->d_name);
 
 		if (name_len > longest)
 			longest = name_len;
@@ -447,8 +442,6 @@ void read_the_list(const char *path, DIR *dir)
 	 * filelist, so record it. */
 	filelist_len = i;
 
-	assert(filelist != NULL);
-
 	/* Sort the list of names. */
 	qsort(filelist, filelist_len, sizeof(char *), diralphasort);
 
@@ -458,51 +451,9 @@ void read_the_list(const char *path, DIR *dir)
 	width = (COLS + 2) / (longest + 2);
 }
 
-/* Return the function that is bound to the given key, accepting certain
- * plain characters too, for compatibility with Pico. */
-functionptrtype parse_browser_input(int *kbinput)
-{
-	if (!meta_key) {
-		switch (*kbinput) {
-			case ' ':
-				return do_page_down;
-			case '-':
-				return do_page_up;
-			case '?':
-				return do_help_void;
-			case 'E':
-			case 'e':
-			case 'Q':
-			case 'q':
-			case 'X':
-			case 'x':
-				return do_exit;
-			case 'G':
-			case 'g':
-				return goto_dir_void;
-			case 'S':
-			case 's':
-				return do_enter;
-			case 'W':
-			case 'w':
-			case '/':
-				return do_search_forward;
-			case 'N':
-#ifndef NANO_TINY
-				return do_findprevious;
-#endif
-			case 'n':
-				return do_research;
-		}
-	}
-	return func_from_key(kbinput);
-}
-
-/* Set width to the number of files that we can display per screen row,
- * if necessary, and display the list of files. */
+/* Display at most a screenful of filenames from the gleaned filelist. */
 void browser_refresh(void)
 {
-	size_t i;
 	int row = 0, col = 0;
 		/* The current row and column while the list is getting displayed. */
 	int the_row = 0, the_column = 0;
@@ -513,15 +464,11 @@ void browser_refresh(void)
 	titlebar(present_path);
 	blank_edit();
 
-	wmove(edit, 0, 0);
-
-	i = selected - selected % (editwinrows * width);
-
-	for (; i < filelist_len && row < editwinrows; i++) {
-		struct stat st;
-		const char *thename = tail(filelist[i]);
+	for (size_t index = selected - selected % (editwinrows * width);
+					index < filelist_len && row < editwinrows; index++) {
+		const char *thename = tail(filelist[index]);
 				/* The filename we display, minus the path. */
-		size_t namelen = strlenpt(thename);
+		size_t namelen = breadth(thename);
 				/* The length of the filename in columns. */
 		size_t infolen;
 				/* The length of the file information in columns. */
@@ -532,58 +479,56 @@ void browser_refresh(void)
 				/* Whether to put an ellipsis before the filename?  We don't
 				 * waste space on dots when there are fewer than 15 columns. */
 		char *disp = display_string(thename, dots ?
-				namelen + infomaxlen + 4 - longest : 0, longest, FALSE);
+				namelen + infomaxlen + 4 - longest : 0, longest, FALSE, FALSE);
 				/* The filename (or a fragment of it) in displayable format.
 				 * When a fragment, account for dots plus one space padding. */
+		struct stat state;
 
-		/* If this is the selected item, start its highlighting, and
+		/* If this is the selected item, draw its highlighted bar upfront, and
 		 * remember its location to be able to place the cursor on it. */
-		if (i == selected) {
+		if (index == selected) {
 			wattron(edit, interface_color_pair[SELECTED_TEXT]);
+			mvwprintw(edit, row, col, "%*s", longest, " ");
 			the_row = row;
 			the_column = col;
 		}
 
-		blank_row(edit, row, col, longest);
-
 		/* If the name is too long, we display something like "...ename". */
 		if (dots)
 			mvwaddstr(edit, row, col, "...");
 		mvwaddstr(edit, row, dots ? col + 3 : col, disp);
 
-		free(disp);
-
 		col += longest;
 
 		/* Show information about the file: "--" for symlinks (except when
 		 * they point to a directory) and for files that have disappeared,
 		 * "(dir)" for directories, and the file size for normal files. */
-		if (lstat(filelist[i], &st) == -1 || S_ISLNK(st.st_mode)) {
-			if (stat(filelist[i], &st) == -1 || !S_ISDIR(st.st_mode))
-				info = mallocstrcpy(NULL, "--");
+		if (lstat(filelist[index], &state) == -1 || S_ISLNK(state.st_mode)) {
+			if (stat(filelist[index], &state) == -1 || !S_ISDIR(state.st_mode))
+				info = copy_of("--");
 			else
 				/* TRANSLATORS: Try to keep this at most 7 characters. */
-				info = mallocstrcpy(NULL, _("(dir)"));
-		} else if (S_ISDIR(st.st_mode)) {
+				info = copy_of(_("(dir)"));
+		} else if (S_ISDIR(state.st_mode)) {
 			if (strcmp(thename, "..") == 0) {
 				/* TRANSLATORS: Try to keep this at most 12 characters. */
-				info = mallocstrcpy(NULL, _("(parent dir)"));
+				info = copy_of(_("(parent dir)"));
 				infomaxlen = 12;
 			} else
-				info = mallocstrcpy(NULL, _("(dir)"));
+				info = copy_of(_("(dir)"));
 		} else {
-			off_t result = st.st_size;
+			off_t result = state.st_size;
 			char modifier;
 
 			info = charalloc(infomaxlen + 1);
 
 			/* Massage the file size into a human-readable form. */
-			if (st.st_size < (1 << 10))
+			if (state.st_size < (1 << 10))
 				modifier = ' ';  /* bytes */
-			else if (st.st_size < (1 << 20)) {
+			else if (state.st_size < (1 << 20)) {
 				result >>= 10;
 				modifier = 'K';  /* kilobytes */
-			} else if (st.st_size < (1 << 30)) {
+			} else if (state.st_size < (1 << 30)) {
 				result >>= 20;
 				modifier = 'M';  /* megabytes */
 			} else {
@@ -601,7 +546,7 @@ void browser_refresh(void)
 		}
 
 		/* Make sure info takes up no more than infomaxlen columns. */
-		infolen = strlenpt(info);
+		infolen = breadth(info);
 		if (infolen > infomaxlen) {
 			info[actual_x(info, infomaxlen)] = '\0';
 			infolen = infomaxlen;
@@ -610,16 +555,16 @@ void browser_refresh(void)
 		mvwaddstr(edit, row, col - infolen, info);
 
 		/* If this is the selected item, finish its highlighting. */
-		if (i == selected)
+		if (index == selected)
 			wattroff(edit, interface_color_pair[SELECTED_TEXT]);
 
+		free(disp);
 		free(info);
 
 		/* Add some space between the columns. */
 		col += 2;
 
-		/* If the next entry isn't going to fit on the current row,
-		 * move to the next row. */
+		/* If the next entry will not fit on this row, move to next row. */
 		if (col > COLS - longest) {
 			row++;
 			col = 0;
@@ -659,42 +604,43 @@ void browser_select_dirname(const char *needle)
 	}
 }
 
-/* Set up the system variables for a filename search.  Return -1 or -2 if
- * the search should be canceled (due to Cancel or a blank search string),
- * return 0 when we have a string, and return a positive value when some
- * function was run. */
-int filesearch_init(void)
+/* Prepare the prompt and ask the user what to search for.  If forwards is
+ * TRUE, search forward in the list; otherwise, search backward.  Return -2
+ * for a blank answer, -1 for Cancel, 0 when we have a string, and a
+ * positive value when some function was run. */
+int filesearch_init(bool forwards)
 {
-	int input;
-	char *buf;
+	char *thedefault;
+	int response;
 
+	/* If something was searched for before, show it between square brackets. */
 	if (*last_search != '\0') {
-		char *disp = display_string(last_search, 0, COLS / 3, FALSE);
+		char *disp = display_string(last_search, 0, COLS / 3, FALSE, FALSE);
 
-		buf = charalloc(strlen(disp) + 7);
+		thedefault = charalloc(strlen(disp) + 7);
 		/* We use (COLS / 3) here because we need to see more on the line. */
-		sprintf(buf, " [%s%s]", disp,
-				(strlenpt(last_search) > COLS / 3) ? "..." : "");
+		sprintf(thedefault, " [%s%s]", disp,
+				(breadth(last_search) > COLS / 3) ? "..." : "");
 		free(disp);
 	} else
-		buf = mallocstrcpy(NULL, "");
+		thedefault = copy_of("");
 
-	/* This is now one simple call.  It just does a lot. */
-	input = do_prompt(FALSE, FALSE, MWHEREISFILE, NULL, &search_history,
-				browser_refresh, "%s%s", _("Search"), buf);
-
-	/* Release buf now that we don't need it anymore. */
-	free(buf);
+	/* Now ask what to search for. */
+	response = do_prompt(MWHEREISFILE, "", &search_history,
+						browser_refresh, "%s%s%s", _("Search"),
+						/* TRANSLATORS: A modifier of the Search prompt. */
+						!forwards ? _(" [Backwards]") : "", thedefault);
+	free(thedefault);
 
 	/* If only Enter was pressed but we have a previous string, it's okay. */
-	if (input == -2 && *last_search != '\0')
+	if (response == -2 && *last_search != '\0')
 		return 0;
 
-	/* Otherwise negative inputs are a bailout. */
-	if (input < 0)
+	/* Otherwise negative responses are a bailout. */
+	if (response < 0)
 		statusbar(_("Cancelled"));
 
-	return input;
+	return response;
 }
 
 /* Look for the given needle in the list of files.  If forwards is TRUE,
@@ -756,11 +702,12 @@ void findfile(const char *needle, bool forwards)
 	selected = looking_at;
 }
 
-/* Search for a filename. */
-void do_filesearch(void)
+/* Search for a filename.  If forwards is TRUE, search forward in the list;
+ * otherwise, search backward.*/
+void do_filesearch(bool forwards)
 {
 	/* If the user cancelled or jumped to first or last file, don't search. */
-	if (filesearch_init() != 0)
+	if (filesearch_init(forwards) != 0)
 		return;
 
 	/* If answer is now "", copy last_search into answer. */
@@ -775,7 +722,7 @@ void do_filesearch(void)
 		update_history(&search_history, answer);
 #endif
 
-	findfile(answer, TRUE);
+	findfile(answer, forwards);
 }
 
 /* Search again without prompting for the last given search string,
@@ -788,23 +735,11 @@ void do_fileresearch(bool forwards)
 		findfile(last_search, forwards);
 }
 
-/* Select the first file in the list. */
-void to_first_file(void)
-{
-	selected = 0;
-}
-
-/* Select the last file in the list. */
-void to_last_file(void)
-{
-	selected = filelist_len - 1;
-}
-
 /* Strip one element from the end of path, and return the stripped path.
  * The returned string is dynamically allocated, and should be freed. */
 char *strip_last_component(const char *path)
 {
-	char *copy = mallocstrcpy(NULL, path);
+	char *copy = copy_of(path);
 	char *last_slash = strrchr(copy, '/');
 
 	if (last_slash != NULL)

src/chars.c

@@ -1,8 +1,8 @@
 /**************************************************************************
  *   chars.c  --  This file is part of GNU nano.                          *
  *                                                                        *
- *   Copyright (C) 2001-2011, 2013-2018 Free Software Foundation, Inc.    *
- *   Copyright (C) 2016-2017 Benno Schulenberg                            *
+ *   Copyright (C) 2001-2011, 2013-2020 Free Software Foundation, Inc.    *
+ *   Copyright (C) 2016-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    *
@@ -19,7 +19,7 @@
  *                                                                        *
  **************************************************************************/
 
-#include "proto.h"
+#include "prototypes.h"
 
 #include <ctype.h>
 #include <string.h>
@@ -44,149 +44,104 @@ bool using_utf8(void)
 }
 #endif /* ENABLE_UTF8 */
 
-/* Concatenate two allocated strings, and free the second. */
-char *addstrings(char* str1, size_t len1, char* str2, size_t len2)
-{
-	str1 = charealloc(str1, len1 + len2 + 1);
-	str1[len1] = '\0';
-
-	strncat(&str1[len1], str2, len2);
-	free(str2);
-
-	return str1;
-}
-
-/* Return TRUE if the value of c is in byte range, and FALSE otherwise. */
-bool is_byte(int c)
-{
-	return ((unsigned int)c == (unsigned char)c);
-}
-
-void mbtowc_reset(void)
-{
-	IGNORE_CALL_RESULT(mbtowc(NULL, NULL, 0));
-}
-
-/* This function is equivalent to isalpha() for multibyte characters. */
-bool is_alpha_mbchar(const char *c)
+#ifdef ENABLE_SPELLER
+/* Return TRUE when the given character is some kind of letter. */
+bool is_alpha_char(const char *c)
 {
 #ifdef ENABLE_UTF8
-	if (use_utf8) {
-		wchar_t wc;
+	wchar_t wc;
 
-		if (mbtowc(&wc, c, MAXCHARLEN) < 0) {
-			mbtowc_reset();
-			return 0;
-		}
+	if (mbtowc(&wc, c, MAXCHARLEN) < 0)
+		return FALSE;
 
-		return iswalpha(wc);
-	} else
+	return iswalpha(wc);
+#else
+	return isalpha((unsigned char)*c);
 #endif
-		return isalpha((unsigned char)*c);
 }
+#endif /* ENABLE_SPELLER */
 
-/* This function is equivalent to isalnum() for multibyte characters. */
-bool is_alnum_mbchar(const char *c)
+/* Return TRUE when the given character is some kind of letter or a digit. */
+bool is_alnum_char(const char *c)
 {
 #ifdef ENABLE_UTF8
-	if (use_utf8) {
-		wchar_t wc;
+	wchar_t wc;
 
-		if (mbtowc(&wc, c, MAXCHARLEN) < 0) {
-			mbtowc_reset();
-			return 0;
-		}
+	if (mbtowc(&wc, c, MAXCHARLEN) < 0)
+		return FALSE;
 
-		return iswalnum(wc);
-	} else
+	return iswalnum(wc);
+#else
+	return isalnum((unsigned char)*c);
 #endif
-		return isalnum((unsigned char)*c);
 }
 
-/* This function is equivalent to isblank() for multibyte characters. */
-bool is_blank_mbchar(const char *c)
+/* Return TRUE when the given character is space or tab or other whitespace. */
+bool is_blank_char(const char *c)
 {
 #ifdef ENABLE_UTF8
-	if (use_utf8) {
-		wchar_t wc;
+	wchar_t wc;
 
-		if (mbtowc(&wc, c, MAXCHARLEN) < 0) {
-			mbtowc_reset();
-			return 0;
-		}
+	if ((signed char)*c >= 0)
+		return (*c == ' ' || *c == '\t');
 
-		return iswblank(wc);
-	} else
+	if (mbtowc(&wc, c, MAXCHARLEN) < 0)
+		return FALSE;
+
+	return iswblank(wc);
+#else
+	return isblank((unsigned char)*c);
 #endif
-		return isblank((unsigned char)*c);
 }
 
-/* This function is equivalent to iscntrl(), except in that it only
- * handles non-high-bit control characters. */
-bool is_ascii_cntrl_char(int c)
-{
-	return (0 <= c && c < 32);
-}
-
-/* This function is equivalent to iscntrl(), except in that it also
- * handles high-bit control characters. */
-bool is_cntrl_char(int c)
-{
-	return ((c & 0x60) == 0 || c == 127);
-}
-
-/* This function is equivalent to iscntrl() for multibyte characters,
- * except in that it also handles multibyte control characters with
- * their high bits set. */
-bool is_cntrl_mbchar(const char *c)
+/* Return TRUE when the given character is a control character. */
+bool is_cntrl_char(const char *c)
 {
 #ifdef ENABLE_UTF8
 	if (use_utf8) {
-		return ((c[0] & 0xE0) == 0 || c[0] == 127 ||
+		return ((c[0] & 0xE0) == 0 || c[0] == DEL_CODE ||
 				((signed char)c[0] == -62 && (signed char)c[1] < -96));
 	} else
 #endif
-		return is_cntrl_char((unsigned char)*c);
+		return ((*c & 0x60) == 0 || *c == DEL_CODE);
 }
 
-/* This function is equivalent to ispunct() for multibyte characters. */
-bool is_punct_mbchar(const char *c)
+/* Return TRUE when the given character is a punctuation character. */
+bool is_punct_char(const char *c)
 {
 #ifdef ENABLE_UTF8
-	if (use_utf8) {
-		wchar_t wc;
+	wchar_t wc;
 
-		if (mbtowc(&wc, c, MAXCHARLEN) < 0) {
-			mbtowc_reset();
-			return 0;
-		}
+	if (mbtowc(&wc, c, MAXCHARLEN) < 0)
+		return FALSE;
 
-		return iswpunct(wc);
-	} else
+	return iswpunct(wc);
+#else
+	return ispunct((unsigned char)*c);
 #endif
-		return ispunct((unsigned char)*c);
 }
 
-/* Return TRUE when the given multibyte character c is a word-forming
- * character (that is: alphanumeric, or specified in wordchars, or
- * punctuation when allow_punct is TRUE), and FALSE otherwise. */
-bool is_word_mbchar(const char *c, bool allow_punct)
+/* Return TRUE when the given character is word-forming (it is alphanumeric or
+ * specified in 'wordchars', or it is punctuation when allow_punct is TRUE). */
+bool is_word_char(const char *c, bool allow_punct)
 {
 	if (*c == '\0')
 		return FALSE;
 
-	if (is_alnum_mbchar(c))
+	if (is_alnum_char(c))
+		return TRUE;
+
+	if (allow_punct && is_punct_char(c))
 		return TRUE;
 
 	if (word_chars != NULL && *word_chars != '\0') {
 		char symbol[MAXCHARLEN + 1];
-		int symlen = parse_mbchar(c, symbol, NULL);
+		int symlen = collect_char(c, symbol);
 
 		symbol[symlen] = '\0';
 		return (strstr(word_chars, symbol) != NULL);
-	}
-
-	return (allow_punct && is_punct_mbchar(c));
+	} else
+		return FALSE;
 }
 
 /* Return the visible representation of control character c. */
@@ -220,163 +175,152 @@ char control_mbrep(const char *c, bool isdata)
 		return control_rep(*c);
 }
 
-/* Assess how many bytes the given (multibyte) character occupies.  Return -1
- * if the byte sequence is invalid, and return the number of bytes minus 8
- * when it encodes an invalid codepoint.  Also, in the second parameter,
- * return the number of columns that the character occupies. */
-int length_of_char(const char *c, int *width)
-{
 #ifdef ENABLE_UTF8
-	if (use_utf8) {
-		wchar_t wc;
-		int charlen = mbtowc(&wc, c, MAXCHARLEN);
-
-		/* If the sequence is invalid... */
-		if (charlen < 0) {
-			mbtowc_reset();
-			return -1;
-		}
-
-		/* If the codepoint is invalid... */
-		if (!is_valid_unicode(wc))
-			return charlen - 8;
-		else {
-			*width = wcwidth(wc);
-			/* If the codepoint is unassigned, assume a width of one. */
-			if (*width < 0)
-				*width = 1;
-			return charlen;
-		}
-	} else
-#endif
-		return 1;
-}
-
-/* This function is equivalent to wcwidth() for multibyte characters. */
+/* Return the width in columns of the given (multibyte) character. */
 int mbwidth(const char *c)
 {
-#ifdef ENABLE_UTF8
-	if (use_utf8) {
+	/* Ask for the width only when the character isn't plain ASCII. */
+	if ((signed char)*c <= 0) {
 		wchar_t wc;
 		int width;
 
-		if (mbtowc(&wc, c, MAXCHARLEN) < 0) {
-			mbtowc_reset();
+		if (mbtowc(&wc, c, MAXCHARLEN) < 0)
 			return 1;
-		}
 
 		width = wcwidth(wc);
 
-		if (width == -1)
+		if (width < 0)
 			return 1;
 
 		return width;
 	} else
+		return 1;
+}
+
+/* Convert the given Unicode value to a multibyte character, if possible.
+ * If the conversion succeeds, return the (dynamically allocated) multibyte
+ * character and its length.  Otherwise, return a length of zero. */
+char *make_mbchar(long code, int *length)
+{
+	char *mb_char = charalloc(MAXCHARLEN);
+
+	*length = wctomb(mb_char, (wchar_t)code);
+
+	/* Reject invalid Unicode characters. */
+	if (*length < 0 || !is_valid_unicode((wchar_t)code)) {
+		IGNORE_CALL_RESULT(wctomb(NULL, 0));
+		*length = 0;
+	}
+
+	return mb_char;
+}
+#endif /* ENABLE_UTF8 */
+
+/* Return the length (in bytes) of the character located at *pointer. */
+int char_length(const char *pointer)
+{
+#ifdef ENABLE_UTF8
+	/* If possibly a multibyte character, get its length; otherwise, it's 1. */
+	if ((signed char)*pointer < 0) {
+		int length = mblen(pointer, MAXCHARLEN);
+
+		return (length < 0 ? 1 : length);
+	} else
 #endif
 		return 1;
 }
 
-/* Convert the Unicode value in chr to a multibyte character, if possible.
- * If the conversion succeeds, return the (dynamically allocated) multibyte
- * character and its length.  Otherwise, return an undefined (dynamically
- * allocated) multibyte character and a length of zero. */
-char *make_mbchar(long chr, int *chr_mb_len)
+/* Return the number of (multibyte) characters in the given string. */
+size_t mbstrlen(const char *pointer)
 {
-	char *chr_mb;
+	size_t count = 0;
 
+	while (*pointer != '\0') {
 #ifdef ENABLE_UTF8
-	if (use_utf8) {
-		chr_mb = charalloc(MAXCHARLEN);
-		*chr_mb_len = wctomb(chr_mb, (wchar_t)chr);
+		if ((signed char)*pointer < 0) {
+			int length = mblen(pointer, MAXCHARLEN);
 
-		/* Reject invalid Unicode characters. */
-		if (*chr_mb_len < 0 || !is_valid_unicode((wchar_t)chr)) {
-			IGNORE_CALL_RESULT(wctomb(NULL, 0));
-			*chr_mb_len = 0;
-		}
-	} else
+			pointer += (length < 0 ? 1 : length);
+		} else
 #endif
-	{
-		*chr_mb_len = 1;
-		chr_mb = mallocstrncpy(NULL, (char *)&chr, 1);
+			pointer++;
+
+		count++;
 	}
 
-	return chr_mb;
+	return count;
 }
 
-/* Parse a multibyte character from buf.  Return the number of bytes
- * used.  If chr isn't NULL, store the multibyte character in it.  If
- * col isn't NULL, add the character's width (in columns) to it. */
-int parse_mbchar(const char *buf, char *chr, size_t *col)
+/* Return the length (in bytes) of the character at the start of the
+ * given string, and return a copy of this character in *thechar. */
+int collect_char(const char *string, char *thechar)
 {
+	int charlen;
+
 #ifdef ENABLE_UTF8
-	if (use_utf8) {
-		/* Get the number of bytes in the multibyte character. */
-		int length = mblen(buf, MAXCHARLEN);
+	/* If this is a UTF-8 starter byte, get the number of bytes of the character. */
+	if ((signed char)*string < 0) {
+		charlen = mblen(string, MAXCHARLEN);
 
 		/* When the multibyte sequence is invalid, only take the first byte. */
-		if (length <= 0) {
-			IGNORE_CALL_RESULT(mblen(NULL, 0));
-			length = 1;
-		}
-
-		/* When requested, store the multibyte character in chr. */
-		if (chr != NULL) {
-			int i;
-
-			for (i = 0; i < length; i++)
-				chr[i] = buf[i];
-		}
-
-		/* When requested, add the width of the character to col. */
-		if (col != NULL) {
-			/* If we have a tab, compute its width in columns based on the
-			 * current value of col. */
-			if (*buf == '\t')
-				*col += tabsize - *col % tabsize;
-			/* If we have a control character, it's two columns wide: one
-			 * column for the "^", and one for the visible character. */
-			else if (is_cntrl_mbchar(buf)) {
-				*col += 2;
-			/* If we have a normal character, get its width normally. */
-			} else
-				*col += mbwidth(buf);
-		}
-
-		return length;
+		if (charlen <= 0)
+			charlen = 1;
 	} else
 #endif
-	{
-		/* When requested, store the byte character in chr. */
-		if (chr != NULL)
-			*chr = *buf;
+		charlen = 1;
 
-		/* When requested, add the width of the character to col. */
-		if (col != NULL) {
-			/* If we have a tab, compute its width in columns using the
-			 * current value of col. */
-			if (*buf == '\t')
-				*col += tabsize - *col % tabsize;
-			/* If we have a control character, it's two columns wide: one
-			 * column for the "^", and one for the visible character. */
-			else if (is_cntrl_char((unsigned char)*buf))
-				*col += 2;
-			/* If we have a normal character, it's one column wide. */
+	for (int i = 0; i < charlen; i++)
+		thechar[i] = string[i];
+
+	return charlen;
+}
+
+/* Return the length (in bytes) of the character at the start of
+ * the given string, and add this character's width to *column. */
+int advance_over(const char *string, size_t *column)
+{
+#ifdef ENABLE_UTF8
+	if ((signed char)*string < 0) {
+		int charlen = mblen(string, MAXCHARLEN);
+
+		if (charlen > 0) {
+			if (is_cntrl_char(string))
+				*column += 2;
 			else
-				(*col)++;
+				*column += mbwidth(string);
+		} else {
+			charlen = 1;
+			*column += 1;
 		}
 
-		return 1;
+		return charlen;
 	}
+#endif
+
+	if ((unsigned char)*string < 0x20) {
+		if (*string == '\t')
+			*column += tabsize - *column % tabsize;
+		else
+			*column += 2;
+	} else if (*string == 0x7F)
+		*column += 2;
+#ifndef ENABLE_UTF8
+	else if (0x7F < (unsigned char)*string && (unsigned char)*string < 0xA0)
+		*column += 2;
+#endif
+	else
+		*column += 1;
+
+	return 1;
 }
 
 /* Return the index in buf of the beginning of the multibyte character
  * before the one at pos. */
-size_t move_mbleft(const char *buf, size_t pos)
+size_t step_left(const char *buf, size_t pos)
 {
 #ifdef ENABLE_UTF8
 	if (use_utf8) {
-		size_t before, char_len = 0;
+		size_t before, charlen = 0;
 
 		if (pos < 4)
 			before = 0;
@@ -399,21 +343,21 @@ size_t move_mbleft(const char *buf, size_t pos)
 		/* Move forward again until we reach the original character,
 		 * so we know the length of its preceding character. */
 		while (before < pos) {
-			char_len = parse_mbchar(buf + before, NULL, NULL);
-			before += char_len;
+			charlen = char_length(buf + before);
+			before += charlen;
 		}
 
-		return before - char_len;
+		return before - charlen;
 	} else
 #endif
-	return (pos == 0 ? 0 : pos - 1);
+		return (pos == 0 ? 0 : pos - 1);
 }
 
 /* Return the index in buf of the beginning of the multibyte character
  * after the one at pos. */
-size_t move_mbright(const char *buf, size_t pos)
+size_t step_right(const char *buf, size_t pos)
 {
-	return pos + parse_mbchar(buf + pos, NULL, NULL);
+	return pos + char_length(buf + pos);
 }
 
 /* This function is equivalent to strcasecmp() for multibyte strings. */
@@ -430,17 +374,8 @@ int mbstrncasecmp(const char *s1, const char *s2, size_t n)
 		wchar_t wc1, wc2;
 
 		while (*s1 != '\0' && *s2 != '\0' && n > 0) {
-			bool bad1 = FALSE, bad2 = FALSE;
-
-			if (mbtowc(&wc1, s1, MAXCHARLEN) < 0) {
-				mbtowc_reset();
-				bad1 = TRUE;
-			}
-
-			if (mbtowc(&wc2, s2, MAXCHARLEN) < 0) {
-				mbtowc_reset();
-				bad2 = TRUE;
-			}
+			bool bad1 = (mbtowc(&wc1, s1, MAXCHARLEN) < 0);
+			bool bad2 = (mbtowc(&wc2, s2, MAXCHARLEN) < 0);
 
 			if (bad1 || bad2) {
 				if (*s1 != *s2)
@@ -455,8 +390,8 @@ int mbstrncasecmp(const char *s1, const char *s2, size_t n)
 					return difference;
 			}
 
-			s1 += move_mbright(s1, 0);
-			s2 += move_mbright(s2, 0);
+			s1 += char_length(s1);
+			s2 += char_length(s2);
 			n--;
 		}
 
@@ -477,13 +412,13 @@ char *mbstrcasestr(const char *haystack, const char *needle)
 			if (mbstrncasecmp(haystack, needle, needle_len) == 0)
 				return (char *)haystack;
 
-			haystack += move_mbright(haystack, 0);
+			haystack += char_length(haystack);
 		}
 
 		return NULL;
 	} else
 #endif
-		return (char *) strcasestr(haystack, needle);
+		return (char *)strcasestr(haystack, needle);
 }
 
 /* This function is equivalent to strstr(), except in that it scans the
@@ -549,178 +484,116 @@ char *mbrevstrcasestr(const char *haystack, const char *needle,
 			if (pointer == haystack)
 				return NULL;
 
-			pointer = haystack + move_mbleft(haystack, pointer - haystack);
+			pointer = haystack + step_left(haystack, pointer - haystack);
 		}
 	} else
 #endif
 		return revstrcasestr(haystack, needle, pointer);
 }
 
-/* This function is equivalent to strlen() for multibyte strings. */
-size_t mbstrlen(const char *s)
-{
-	return mbstrnlen(s, (size_t)-1);
-}
-
-/* This function is equivalent to strnlen() for multibyte strings. */
-size_t mbstrnlen(const char *s, size_t maxlen)
-{
-#ifdef ENABLE_UTF8
-	if (use_utf8) {
-		size_t n = 0;
-
-		for (; *s != '\0' && maxlen > 0; s += move_mbright(s, 0),
-				maxlen--, n++)
-			;
-
-		return n;
-	} else
-#endif
-		return strnlen(s, maxlen);
-}
-
 #if !defined(NANO_TINY) || defined(ENABLE_JUSTIFY)
 /* This function is equivalent to strchr() for multibyte strings. */
-char *mbstrchr(const char *s, const char *c)
+char *mbstrchr(const char *string, const char *chr)
 {
 #ifdef ENABLE_UTF8
 	if (use_utf8) {
-		bool bad_s_mb = FALSE, bad_c_mb = FALSE;
-		char symbol[MAXCHARLEN];
-		const char *q = s;
+		bool bad_s = FALSE, bad_c = FALSE;
 		wchar_t ws, wc;
 
-		if (mbtowc(&wc, c, MAXCHARLEN) < 0) {
-			mbtowc_reset();
-			wc = (unsigned char)*c;
-			bad_c_mb = TRUE;
+		if (mbtowc(&wc, chr, MAXCHARLEN) < 0) {
+			wc = (unsigned char)*chr;
+			bad_c = TRUE;
 		}
 
-		while (*s != '\0') {
-			int sym_len = parse_mbchar(s, symbol, NULL);
+		while (*string != '\0') {
+			int symlen = mbtowc(&ws, string, MAXCHARLEN);
 
-			if (mbtowc(&ws, symbol, sym_len) < 0) {
-				mbtowc_reset();
-				ws = (unsigned char)*s;
-				bad_s_mb = TRUE;
+			if (symlen < 0) {
+				ws = (unsigned char)*string;
+				bad_s = TRUE;
 			}
 
-			if (bad_s_mb == bad_c_mb && ws == wc)
+			if (ws == wc && bad_s == bad_c)
 				break;
 
-			s += sym_len;
-			q += sym_len;
+			string += symlen;
 		}
 
-		if (*s == '\0')
-			q = NULL;
+		if (*string == '\0')
+			return NULL;
 
-		return (char *)q;
+		return (char *)string;
 	} else
 #endif
-		return (char *) strchr(s, *c);
+		return strchr(string, *chr);
 }
 #endif /* !NANO_TINY || ENABLE_JUSTIFY */
 
 #ifndef NANO_TINY
-/* This function is equivalent to strpbrk() for multibyte strings. */
-char *mbstrpbrk(const char *s, const char *accept)
+/* Locate, in the given string, the first occurrence of any of
+ * the characters in accept, searching forward. */
+char *mbstrpbrk(const char *string, const char *accept)
 {
-#ifdef ENABLE_UTF8
-	if (use_utf8) {
-		for (; *s != '\0'; s += move_mbright(s, 0)) {
-			if (mbstrchr(accept, s) != NULL)
-				return (char *)s;
-		}
+	while (*string != '\0') {
+		if (mbstrchr(accept, string) != NULL)
+			return (char *)string;
 
-		return NULL;
-	} else
-#endif
-		return (char *) strpbrk(s, accept);
-}
-
-/* Locate, in the string that starts at head, the first occurrence of any of
- * the characters in the string accept, starting from pointer and searching
- * backwards. */
-char *revstrpbrk(const char *head, const char *accept, const char *pointer)
-{
-	if (*pointer == '\0') {
-		if (pointer == head)
-			return NULL;
-		pointer--;
-	}
-
-	while (pointer >= head) {
-		if (strchr(accept, *pointer) != NULL)
-			return (char *)pointer;
-		pointer--;
+		string += char_length(string);
 	}
 
 	return NULL;
 }
 
-/* The same as the preceding function but then for multibyte strings. */
+/* Locate, in the string that starts at head, the first occurrence of any of
+ * the characters in accept, starting from pointer and searching backwards. */
 char *mbrevstrpbrk(const char *head, const char *accept, const char *pointer)
 {
-#ifdef ENABLE_UTF8
-	if (use_utf8) {
-		if (*pointer == '\0') {
-			if (pointer == head)
-				return NULL;
-			pointer = head + move_mbleft(head, pointer - head);
-		}
+	if (*pointer == '\0') {
+		if (pointer == head)
+			return NULL;
+		pointer = head + step_left(head, pointer - head);
+	}
 
-		while (TRUE) {
-			if (mbstrchr(accept, pointer) != NULL)
-				return (char *)pointer;
+	while (TRUE) {
+		if (mbstrchr(accept, pointer) != NULL)
+			return (char *)pointer;
 
-			/* If we've reached the head of the string, we found nothing. */
-			if (pointer == head)
-				return NULL;
+		/* If we've reached the head of the string, we found nothing. */
+		if (pointer == head)
+			return NULL;
 
-			pointer = head + move_mbleft(head, pointer - head);
-		}
-	} else
-#endif
-		return revstrpbrk(head, accept, pointer);
+		pointer = head + step_left(head, pointer - head);
+	}
 }
 #endif /* !NANO_TINY */
 
 #if defined(ENABLE_NANORC) && (!defined(NANO_TINY) || defined(ENABLE_JUSTIFY))
-/* Return TRUE if the string s contains one or more blank characters,
+/* Return TRUE if the given string contains at least one blank character,
  * and FALSE otherwise. */
-bool has_blank_chars(const char *s)
+bool has_blank_char(const char *string)
 {
-	for (; *s != '\0'; s++) {
-		if (isblank((unsigned char)*s))
+	char symbol[MAXCHARLEN];
+
+	while (*string != '\0') {
+		string += collect_char(string, symbol);
+
+		if (is_blank_char(symbol))
 			return TRUE;
 	}
 
 	return FALSE;
 }
-
-/* Return TRUE if the multibyte string s contains one or more blank
- * multibyte characters, and FALSE otherwise. */
-bool has_blank_mbchars(const char *s)
-{
-#ifdef ENABLE_UTF8
-	if (use_utf8) {
-		char symbol[MAXCHARLEN];
-
-		for (; *s != '\0'; s += move_mbright(s, 0)) {
-			parse_mbchar(s, symbol, NULL);
-
-			if (is_blank_mbchar(symbol))
-				return TRUE;
-		}
-
-		return FALSE;
-	} else
-#endif
-		return has_blank_chars(s);
-}
 #endif /* ENABLE_NANORC && (!NANO_TINY || ENABLE_JUSTIFY) */
 
+/* Return TRUE when the given string is empty or consists of only blanks. */
+bool white_string(const char *string)
+{
+	while (*string != '\0' && (is_blank_char(string) || *string == '\r'))
+		string += char_length(string);
+
+	return !*string;
+}
+
 #ifdef ENABLE_UTF8
 /* Return TRUE if wc is valid Unicode, and FALSE otherwise. */
 bool is_valid_unicode(wchar_t wc)
@@ -731,17 +604,3 @@ bool is_valid_unicode(wchar_t wc)
 				(0xFFFF < wc && wc <= 0x10FFFF && (wc & 0xFFFF) <= 0xFFFD));
 }
 #endif
-
-#ifdef ENABLE_NANORC
-/* Check if the string s is a valid multibyte string.  Return TRUE if it
- * is, and FALSE otherwise. */
-bool is_valid_mbstring(const char *s)
-{
-#ifdef ENABLE_UTF8
-	if (use_utf8)
-		return (mbstowcs(NULL, s, 0) != (size_t)-1);
-	else
-#endif
-		return TRUE;
-}
-#endif /* ENABLE_NANORC */

src/color.c

@@ -1,7 +1,7 @@
 /**************************************************************************
  *   color.c  --  This file is part of GNU nano.                          *
  *                                                                        *
- *   Copyright (C) 2001-2011, 2013-2018 Free Software Foundation, Inc.    *
+ *   Copyright (C) 2001-2011, 2013-2020 Free Software Foundation, Inc.    *
  *   Copyright (C) 2014-2017 Benno Schulenberg                            *
  *                                                                        *
  *   GNU nano is free software: you can redistribute it and/or modify     *
@@ -19,16 +19,15 @@
  *                                                                        *
  **************************************************************************/
 
-#include "proto.h"
+#include "prototypes.h"
+
+#ifdef ENABLE_COLOR
 
 #include <errno.h>
 #ifdef HAVE_MAGIC_H
 #include <magic.h>
 #endif
 #include <string.h>
-#include <unistd.h>
-
-#ifdef ENABLE_COLOR
 
 /* For early versions of ncurses-6.0, use an additional A_PROTECT attribute
  * for all colors, in order to work around an ncurses miscoloring bug. */
@@ -39,100 +38,85 @@
 #define A_BANDAID  A_NORMAL
 #endif
 
-/* Initialize the colors for nano's interface, and assign pair numbers
- * for the colors in each syntax. */
-void set_colorpairs(void)
+static bool defaults_allowed = FALSE;
+		/* Whether ncurses accepts -1 to mean "default color". */
+
+/* Initialize the color pairs for nano's interface. */
+void set_interface_colorpairs(void)
 {
-	const 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);
+	/* Ask ncurses to allow -1 to mean "default color". */
+	defaults_allowed = (use_default_colors() == OK);
 #endif
 
 	/* Initialize the color pairs for nano's interface elements. */
-	for (i = 0; i < NUMBER_OF_ELEMENTS; i++) {
-		colortype *combo = color_combo[i];
+	for (size_t index = 0; index < NUMBER_OF_ELEMENTS; index++) {
+		colortype *combo = color_combo[index];
 
 		if (combo != NULL) {
-			if (combo->fg == -1 && !using_defaults)
-				combo->fg = COLOR_WHITE;
-			if (combo->bg == -1 && !using_defaults)
-				combo->bg = COLOR_BLACK;
-			init_pair(i + 1, combo->fg, combo->bg);
-			interface_color_pair[i] = COLOR_PAIR(i + 1) | A_BANDAID |
-										(combo->bright ? A_BOLD : A_NORMAL);
+			if (!defaults_allowed) {
+				if (combo->fg == THE_DEFAULT)
+					combo->fg = COLOR_WHITE;
+				if (combo->bg == THE_DEFAULT)
+					combo->bg = COLOR_BLACK;
+			}
+			init_pair(index + 1, combo->fg, combo->bg);
+			interface_color_pair[index] = COLOR_PAIR(index + 1) | A_BANDAID |
+												combo->attributes;
 		} else {
-			if (i == FUNCTION_TAG)
-				interface_color_pair[i] = A_NORMAL;
-			else if (i == ERROR_MESSAGE) {
-				init_pair(i + 1, COLOR_WHITE, COLOR_RED);
-				interface_color_pair[i] = COLOR_PAIR(i + 1) | A_BOLD | A_BANDAID;
+			if (index == FUNCTION_TAG)
+				interface_color_pair[index] = A_NORMAL;
+			else if (index == GUIDE_STRIPE)
+				interface_color_pair[index] = A_REVERSE;
+			else if (index == ERROR_MESSAGE) {
+				init_pair(index + 1, COLOR_WHITE, COLOR_RED);
+				interface_color_pair[index] = COLOR_PAIR(index + 1) |
+												A_BOLD | A_BANDAID;
 			} else
-				interface_color_pair[i] = hilite_attribute;
+				interface_color_pair[index] = hilite_attribute;
 		}
 
-		free(color_combo[i]);
-	}
-
-	/* For each syntax, go through its list of colors and assign each
-	 * its pair number, giving identical color pairs the same number. */
-	for (sint = syntaxes; sint != NULL; sint = sint->next) {
-		colortype *ink;
-		int new_number = NUMBER_OF_ELEMENTS + 1;
-
-		for (ink = sint->color; ink != NULL; ink = ink->next) {
-			const colortype *beforenow = sint->color;
-
-			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++;
-
-			ink->attributes = COLOR_PAIR(ink->pairnum) | A_BANDAID |
-								(ink->bright ? A_BOLD : A_NORMAL);
-		}
+		free(color_combo[index]);
 	}
 }
 
-/* Initialize the color information. */
-void color_init(void)
+/* Assign a pair number to each of the foreground/background color combinations
+ * in the given syntax, giving identical combinations the same number. */
+void set_syntax_colorpairs(syntaxtype *sntx)
 {
-	const colortype *ink;
-	bool using_defaults = FALSE;
-	short foreground, background;
+	short number = NUMBER_OF_ELEMENTS;
+	colortype *older;
 
-	/* If the terminal is not capable of colors, forget it. */
-	if (!has_colors())
-		return;
+	for (colortype *ink = sntx->color; ink != NULL; ink = ink->next) {
+		if (!defaults_allowed) {
+			if (ink->fg == THE_DEFAULT)
+				ink->fg = COLOR_WHITE;
+			if (ink->bg == THE_DEFAULT)
+				ink->bg = COLOR_BLACK;
+		}
 
-#ifdef HAVE_USE_DEFAULT_COLORS
-	/* Allow using the default colors, if available. */
-	using_defaults = (use_default_colors() != ERR);
-#endif
+		older = sntx->color;
 
-	/* For each coloring expression, initialize the color pair. */
-	for (ink = openfile->colorstrings; ink != NULL; ink = ink->next) {
-		foreground = ink->fg;
-		background = ink->bg;
+		while (older != ink && (older->fg != ink->fg || older->bg != ink->bg))
+			older = older->next;
 
-		if (foreground == -1 && !using_defaults)
-			foreground = COLOR_WHITE;
+		ink->pairnum = (older != ink) ? older->pairnum : ++number;
 
-		if (background == -1 && !using_defaults)
-			background = COLOR_BLACK;
-
-		init_pair(ink->pairnum, foreground, background);
+		ink->attributes |= COLOR_PAIR(ink->pairnum) | A_BANDAID;
 	}
+}
+
+/* Initialize the color pairs for the current syntax. */
+void prepare_palette(void)
+{
+	short number = NUMBER_OF_ELEMENTS;
+
+	/* For each unique pair number, tell ncurses the combination of colors. */
+	for (colortype *ink = openfile->syntax->color; ink != NULL; ink = ink->next)
+		if (ink->pairnum > number) {
+			init_pair(ink->pairnum, ink->fg, ink->bg);
+			number = ink->pairnum;
+		}
 
 	have_palette = TRUE;
 }
@@ -145,7 +129,7 @@ bool found_in_list(regexlisttype *head, const char *shibboleth)
 	regex_t rgx;
 
 	for (item = head; item != NULL; item = item->next) {
-		regcomp(&rgx, fixbounds(item->full_regex), NANO_REG_EXTENDED);
+		regcomp(&rgx, item->full_regex, NANO_REG_EXTENDED);
 
 		if (regexec(&rgx, shibboleth, 0, NULL, 0) == 0) {
 			regfree(&rgx);
@@ -158,11 +142,11 @@ bool found_in_list(regexlisttype *head, const char *shibboleth)
 	return FALSE;
 }
 
-/* Update the color information based on the current filename and content. */
-void color_update(void)
+/* Find a syntax that applies to the current buffer, based upon filename
+ * or buffer content, and load and prime this syntax when needed. */
+void find_and_prime_applicable_syntax(void)
 {
-	syntaxtype *sint = NULL;
-	colortype *ink;
+	syntaxtype *sntx = NULL;
 
 	/* If the rcfiles were not read, or contained no syntaxes, get out. */
 	if (syntaxes == NULL)
@@ -174,56 +158,39 @@ void color_update(void)
 		if (strcmp(syntaxstr, "none") == 0)
 			return;
 
-		for (sint = syntaxes; sint != NULL; sint = sint->next) {
-			if (strcmp(sint->name, syntaxstr) == 0)
+		for (sntx = syntaxes; sntx != NULL; sntx = sntx->next)
+			if (strcmp(sntx->name, syntaxstr) == 0)
 				break;
-		}
 
-		if (sint == NULL && !inhelp)
+		if (sntx == NULL && !inhelp)
 			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 (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 (sntx == NULL && !inhelp) {
+		char *fullname = get_full_path(openfile->filename);
 
 		if (fullname == NULL)
 			fullname = mallocstrcpy(fullname, openfile->filename);
 
-		for (sint = syntaxes; sint != NULL; sint = sint->next) {
-			if (found_in_list(sint->extensions, fullname))
+		for (sntx = syntaxes; sntx != NULL; sntx = sntx->next)
+			if (found_in_list(sntx->extensions, fullname))
 				break;
-		}
 
-		free(joinednames);
 		free(fullname);
 	}
 
 	/* If the filename didn't match anything, try the first line. */
-	if (sint == NULL && !inhelp) {
-		for (sint = syntaxes; sint != NULL; sint = sint->next) {
-			if (found_in_list(sint->headers, openfile->fileage->data))
+	if (sntx == NULL && !inhelp) {
+		for (sntx = syntaxes; sntx != NULL; sntx = sntx->next)
+			if (found_in_list(sntx->headers, openfile->filetop->data))
 				break;
-		}
 	}
 
 #ifdef HAVE_LIBMAGIC
 	/* If we still don't have an answer, try using magic. */
-	if (sint == NULL && !inhelp) {
+	if (sntx == NULL && !inhelp) {
 		struct stat fileinfo;
 		magic_t cookie = NULL;
 		const char *magicstring = NULL;
@@ -247,10 +214,9 @@ void color_update(void)
 
 		/* 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))
+			for (sntx = syntaxes; sntx != NULL; sntx = sntx->next)
+				if (found_in_list(sntx->magics, magicstring))
 					break;
-			}
 		}
 
 		if (stat(openfile->filename, &fileinfo) == 0)
@@ -259,34 +225,33 @@ void color_update(void)
 #endif /* HAVE_LIBMAGIC */
 
 	/* 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)
+	if (sntx == NULL && !inhelp) {
+		for (sntx = syntaxes; sntx != NULL; sntx = sntx->next)
+			if (strcmp(sntx->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 (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 (sntx != NULL && sntx->filename != NULL) {
+		parse_one_include(sntx->filename, sntx);
+		set_syntax_colorpairs(sntx);
 	}
+
+	openfile->syntax = sntx;
+}
+
+/* Allocate and initialize (for the given line) the cache for multiline info. */
+void set_up_multicache(linestruct *line)
+{
+	line->multidata = (short *)nmalloc(openfile->syntax->nmultis * sizeof(short));
+
+	for (short index = 0; index < openfile->syntax->nmultis; index++)
+		line->multidata[index] = -1;
 }
 
 /* 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;
@@ -297,13 +262,14 @@ void check_the_multis(filestruct *line)
 	if (openfile->syntax == NULL || openfile->syntax->nmultis == 0)
 		return;
 
-	for (ink = openfile->colorstrings; ink != NULL; ink = ink->next) {
+	if (line->multidata == NULL)
+		set_up_multicache(line);
+
+	for (ink = openfile->syntax->color; ink != NULL; ink = ink->next) {
 		/* If it's not a multiline regex, skip. */
 		if (ink->end == NULL)
 			continue;
 
-		alloc_multidata_if_needed(line);
-
 		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);
@@ -330,43 +296,30 @@ void check_the_multis(filestruct *line)
 	}
 }
 
-/* Allocate (for one line) the cache space for multiline color regexes. */
-void alloc_multidata_if_needed(filestruct *fileptr)
-{
-	int i;
-
-	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;
-	}
-}
-
 /* 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;
+	linestruct *line, *tailline;
 
-	if (openfile->colorstrings == NULL || ISSET(NO_COLOR_SYNTAX))
+	if (openfile->syntax == NULL || openfile->syntax->nmultis == 0 ||
+					openfile->filetop->multidata || ISSET(NO_SYNTAX))
 		return;
 
-#ifdef DEBUG
-	fprintf(stderr, "Precalculating the multiline color info...\n");
-#endif
+	/* For each line, allocate cache space for the multiline-regex info. */
+	for (line = openfile->filetop; line != NULL; line = line->next)
+		set_up_multicache(line);
 
-	for (ink = openfile->colorstrings; ink != NULL; ink = ink->next) {
+	for (ink = openfile->syntax->color; ink != NULL; ink = ink->next) {
 		/* If this is not a multi-line regex, skip it. */
 		if (ink->end == NULL)
 			continue;
 
-		for (line = openfile->fileage; line != NULL; line = line->next) {
+		for (line = openfile->filetop; 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;
 
@@ -379,14 +332,14 @@ void precalc_multicolorinfo(void)
 			/* 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) {
+							&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) {
+							&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. */
@@ -395,7 +348,7 @@ void precalc_multicolorinfo(void)
 						/* When at end-of-line, we're done. */
 						if (line->data[index] == '\0')
 							break;
-						index = move_mbright(line->data, index);
+						index = step_right(line->data, index);
 					}
 					continue;
 				}
@@ -418,12 +371,9 @@ void precalc_multicolorinfo(void)
 				 * 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);
+				for (line = line->next; line != tailline; line = line->next)
 					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. */

src/cut.c

@@ -1,9 +1,9 @@
 /**************************************************************************
  *   cut.c  --  This file is part of GNU nano.                            *
  *                                                                        *
- *   Copyright (C) 1999-2011, 2013-2018 Free Software Foundation, Inc.    *
+ *   Copyright (C) 1999-2011, 2013-2020 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    *
@@ -20,246 +20,694 @@
  *                                                                        *
  **************************************************************************/
 
-#include "proto.h"
+#include "prototypes.h"
 
 #include <string.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;
+	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
+		size_t old_amount = openfile->current->extrarows;
+
+		/* 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->head_lineno)
+			add_undo(action, NULL);
+		else
+			update_undo(action);
+#endif
+		/* Move the remainder of the line "in", over the current character. */
+		memmove(&openfile->current->data[openfile->current_x],
+					&openfile->current->data[openfile->current_x + charlen],
+					line_len - charlen + 1);
+#ifndef NANO_TINY
+		/* When softwrapping, recompute the number of chunks in the line,
+		 * and schedule a refresh if the number changed. */
+		if (ISSET(SOFTWRAP)) {
+			openfile->current->extrarows = extra_chunks_in(openfile->current);
+			if (openfile->current->extrarows != old_amount)
+				refresh_needed = TRUE;
+		}
+
+		/* 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, NULL);
+#endif
+			return;
+		}
+
+#ifndef NANO_TINY
+		add_undo(action, NULL);
+
+		/* Adjust the mark if it is on the line that will be "eaten". */
+		if (openfile->mark == joining) {
+			openfile->mark = openfile->current;
+			openfile->mark_x += openfile->current_x;
+		}
+
+		openfile->current->has_anchor |= joining->has_anchor;
+#endif
+		/* Add the content of the next line to that 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);
+
+		unlink_node(joining);
+
+#ifndef NANO_TINY
+		if (ISSET(SOFTWRAP))
+			openfile->current->extrarows = extra_chunks_in(openfile->current);
+#endif
+		/* Two lines were joined, so do a renumbering and refresh the screen. */
+		renumber_from(openfile->current);
+		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;
+#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;
-}
-
-/* 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)
-{
-	if (openfile->current != openfile->filebot)
-		extract_buffer(&cutbuffer, &cutbottom, openfile->current, 0,
-				openfile->current->next, 0);
+#ifndef NANO_TINY
+	if (openfile->mark && ISSET(LET_THEM_ZAP))
+		zap_text();
 	else
-		extract_buffer(&cutbuffer, &cutbottom, openfile->current, 0,
-				openfile->current, strlen(openfile->current->data));
-	openfile->placewewant = 0;
+#endif
+		do_deletion(DEL);
+}
+
+/* Backspace over one character.  That is, move the cursor left one
+ * character, and then delete the character under the cursor. */
+void do_backspace(void)
+{
+#ifndef NANO_TINY
+	if (openfile->mark && ISSET(LET_THEM_ZAP))
+		zap_text();
+	else
+#endif
+	if (openfile->current_x > 0 || openfile->current != openfile->filetop) {
+		do_left();
+		do_deletion(BACK);
+	}
+}
+
+/* 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)
+{
+	size_t from = (test_cliff) ? openfile->current_x : 0;
+
+	if ((openfile->current->next == NULL && openfile->current->data[from] == '\0'
+#ifndef NANO_TINY
+					&& openfile->mark == NULL) ||
+					(openfile->mark == openfile->current &&
+					openfile->mark_x == openfile->current_x) ||
+					(from > 0 && !ISSET(NO_NEWLINES) &&
+					openfile->current->data[from] == '\0' &&
+					openfile->current->next == openfile->filebot
+#endif
+					)) {
+#ifndef NANO_TINY
+		statusbar(_("Nothing was cut"));
+		openfile->mark = NULL;
+#endif
+		return FALSE;
+	} else
+		return TRUE;
 }
 
 #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;
+	/* 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;
+
+	cutbuffer = NULL;
+
+	/* 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(ISSET(AFTER_ENDS), 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. */
+	add_undo(CUT, NULL);
+	do_snip(TRUE, FALSE, FALSE);
+	update_undo(CUT);
+
+	/* Discard the cut word and restore the cutbuffer. */
+	free_lines(cutbuffer);
+	cutbuffer = is_cutbuffer;
+}
+
+/* Delete a word leftward. */
+void chop_previous_word(void)
+{
+	if (openfile->current->prev == NULL && openfile->current_x == 0)
+		statusbar(_("Nothing was cut"));
+	else
+		chop_word(BACKWARD);
+}
+
+/* Delete a word rightward. */
+void chop_next_word(void)
+{
+	openfile->mark = NULL;
+
+	if (is_cuttable(TRUE))
+		chop_word(FORWARD);
+}
+#endif /* !NANO_TINY */
+
+/* Excise the text between the given two points and add it to the cutbuffer. */
+void extract_segment(linestruct *top, size_t top_x, linestruct *bot, size_t bot_x)
+{
+	linestruct *taken, *last;
+	bool edittop_inside = (openfile->edittop->lineno >= top->lineno &&
+							openfile->edittop->lineno <= bot->lineno);
+#ifndef NANO_TINY
+	bool same_line = (openfile->mark == top);
+	bool post_marked = (openfile->mark && (openfile->mark->lineno > top->lineno ||
+						(same_line && openfile->mark_x > top_x)));
+	bool was_anchored = top->has_anchor;
+
+	if (top == bot && top_x == bot_x)
+		return;
+
+	if (top != bot)
+		for (linestruct *line = top->next; line != bot->next; line = line->next)
+			was_anchored |= line->has_anchor;
+#endif
+
+	if (top == bot) {
+		taken = make_new_node(NULL);
+		taken->data = measured_copy(top->data + top_x, bot_x - top_x);
+		memmove(top->data + top_x, top->data + bot_x,
+										strlen(top->data + bot_x) + 1);
+		last = taken;
+	} else if (top_x == 0 && bot_x == 0) {
+		taken = top;
+		last = make_new_node(NULL);
+		last->data = copy_of("");
+
+		last->prev = bot->prev;
+		bot->prev->next = last;
+		last->next = NULL;
+
+		bot->prev = top->prev;
+		if (top->prev)
+			top->prev->next = bot;
+		else
+			openfile->filetop = bot;
+
+		openfile->current = bot;
+	} else {
+		taken = make_new_node(NULL);
+		taken->data = copy_of(top->data + top_x);
+		taken->next = top->next;
+		top->next->prev = taken;
+
+		top->next = bot->next;
+		if (bot->next)
+			bot->next->prev = top;
+
+		top->data = charealloc(top->data, top_x + strlen(bot->data + bot_x) + 1);
+		strcpy(top->data + top_x, bot->data + bot_x);
+
+		last = bot;
+		last->data[bot_x] = '\0';
+		last->next = NULL;
+
+		openfile->current = top;
+	}
+
+	/* Subtract the size of the excised text from the buffer size. */
+	openfile->totsize -= number_of_characters_in(taken, last);
+
+	/* If the cutbuffer is currently empty, just move all the text directly
+	 * into it; otherwise, append the text to what is already there. */
+	if (cutbuffer == NULL) {
+		cutbuffer = taken;
+		cutbottom = last;
+	} else {
+		cutbottom->data = charealloc(cutbottom->data,
+							strlen(cutbottom->data) + strlen(taken->data) + 1);
+		strcat(cutbottom->data, taken->data);
+
+		cutbottom->next = taken->next;
+		delete_node(taken);
+
+		if (cutbottom->next != NULL) {
+			cutbottom->next->prev = cutbottom;
+			cutbottom = last;
+		}
+	}
+
+	openfile->current_x = top_x;
+
+#ifndef NANO_TINY
+	openfile->current->has_anchor = was_anchored;
+
+	if (ISSET(SOFTWRAP))
+		openfile->current->extrarows = extra_chunks_in(openfile->current);
+
+	if (post_marked || same_line)
+		openfile->mark = openfile->current;
+	if (post_marked)
+		openfile->mark_x = openfile->current_x;
+#endif
+	if (openfile->filebot == bot)
+		openfile->filebot = openfile->current;
+
+	renumber_from(openfile->current);
+
+	/* When the beginning of the viewport was inside the excision, adjust. */
+	if (edittop_inside) {
+		adjust_viewport(STATIONARY);
+		refresh_needed = TRUE;
+	}
+
+	/* If the text doesn't end with a newline, and it should, add one. */
+	if (!ISSET(NO_NEWLINES) && openfile->filebot->data[0] != '\0')
+		new_magicline();
+}
+
+/* Meld the buffer that starts at topline into the current file buffer
+ * at the current cursor position. */
+void ingraft_buffer(linestruct *topline)
+{
+	linestruct *line = openfile->current;
+	size_t length = strlen(line->data);
+	size_t extralen = strlen(topline->data);
+	size_t xpos = openfile->current_x;
+	char *tailtext = copy_of(line->data + xpos);
+#ifndef NANO_TINY
+	bool mark_follows = (openfile->mark == line && !mark_is_before_cursor());
+#endif
+	linestruct *botline = topline;
+
+	while (botline->next != NULL)
+		botline = botline->next;
+
+	/* Add the size of the text to be grafted to the buffer size. */
+	openfile->totsize += number_of_characters_in(topline, botline);
+
+	if (topline != botline)
+		length = xpos;
+
+	if (extralen > 0) {
+		/* Insert the text of topline at the current cursor position. */
+		line->data = charealloc(line->data, length + extralen + 1);
+		memmove(line->data + xpos + extralen, line->data + xpos, length - xpos + 1);
+		strncpy(line->data + xpos, topline->data, extralen);
+	}
+
+	if (topline != botline) {
+#ifndef NANO_TINY
+		/* First compute the softwrapped chunks for each line in the graft. */
+		compute_the_extra_rows_per_line_from(topline);
+#endif
+		/* When inserting at end-of-buffer, update the relevant pointer. */
+		if (line->next == NULL)
+			openfile->filebot = botline;
+
+		line->data[xpos + extralen] = '\0';
+
+		/* Hook the grafted lines in after the current one. */
+		botline->next = openfile->current->next;
+		if (botline->next)
+			botline->next->prev = botline;
+		openfile->current->next = topline->next;
+		topline->next->prev = openfile->current;
+
+		/* Add the text after the cursor position at the end of botline. */
+		length = strlen(botline->data);
+		extralen = strlen(tailtext);
+		botline->data = charealloc(botline->data, length + extralen + 1);
+		strcpy(botline->data + length, tailtext);
+
+		/* Put the cursor at the end of the grafted text. */
+		openfile->current = botline;
+		openfile->current_x = length;
+	} else
+		openfile->current_x += extralen;
+
+#ifndef NANO_TINY
+	/* When needed, update the mark's pointer and position. */
+	if (mark_follows && topline != botline) {
+		openfile->mark = botline;
+		openfile->mark_x += length - xpos;
+	} else if (mark_follows)
+		openfile->mark_x += extralen;
+
+	if (ISSET(SOFTWRAP)) {
+		line->extrarows = extra_chunks_in(line);
+		openfile->current->extrarows = extra_chunks_in(openfile->current);
+	}
+#endif
+
+	delete_node(topline);
+	free(tailtext);
+
+	renumber_from(line);
+
+	/* If the text doesn't end with a newline, and it should, add one. */
+	if (!ISSET(NO_NEWLINES) && openfile->filebot->data[0] != '\0')
+		new_magicline();
+}
+
+/* Meld a copy of the given buffer into the current file buffer. */
+void copy_from_buffer(linestruct *somebuffer)
+{
+	linestruct *the_copy = copy_buffer(somebuffer);
+
+	ingraft_buffer(the_copy);
+}
+
+#ifndef NANO_TINY
+/* Move all marked text from the current buffer into the cutbuffer. */
+void cut_marked_region(void)
+{
+	linestruct *top, *bot;
 	size_t top_x, bot_x;
 
-	mark_order((const filestruct **)&top, &top_x,
-				(const filestruct **)&bot, &bot_x, right_side_up);
+	get_region(&top, &top_x, &bot, &bot_x);
+
+	extract_segment(top, top_x, bot, bot_x);
 
-	extract_buffer(&cutbuffer, &cutbottom, top, top_x, bot, bot_x);
 	openfile->placewewant = xplustabs();
 }
-
-/* If we aren't at the end of the current line, move all the text from
- * 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. */
-void cut_to_eol(void)
-{
-	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();
-	}
-}
-
-/* Move all the text from the current cursor position to the end of the
- * file into the cutbuffer. */
-void cut_to_eof(void)
-{
-	extract_buffer(&cutbuffer, &cutbottom,
-				openfile->current, openfile->current_x,
-				openfile->filebot, strlen(openfile->filebot->data));
-}
-#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)
-{
-#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. */
 #endif
-	size_t was_totsize = openfile->totsize;
 
-	/* If a chain of cuts was broken, empty the cutbuffer. */
-	if (!keep_cutbuffer) {
-		free_filestruct(cutbuffer);
+/* Move text from the current buffer into the cutbuffer.
+ * 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_snip(bool marked, bool until_eof, bool append)
+{
+	linestruct *line = openfile->current;
+
+#ifndef NANO_TINY
+	keep_cutbuffer &= (openfile->last_action != COPY);
+#endif
+
+	/* If cuts were not continuous, or when cutting a region, clear the slate. */
+	if ((marked || until_eof || !keep_cutbuffer) && !append) {
+		free_lines(cutbuffer);
 		cutbuffer = NULL;
-		/* Indicate that future cuts should add to the cutbuffer. */
-		keep_cutbuffer = TRUE;
 	}
 
 #ifndef NANO_TINY
-	if (copy_text) {
-		/* If the cutbuffer isn't empty, remember where it currently ends. */
-		if (cutbuffer != NULL) {
-			cb_save = cutbottom;
-			cb_save_len = strlen(cutbottom->data);
-		}
-		/* 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) {
-		/* Move the marked text to the cutbuffer, and turn the mark off. */
-		cut_marked(&right_side_up);
+	/* Now move the relevant piece of text into the cutbuffer. */
+	if (until_eof)
+		extract_segment(openfile->current, openfile->current_x,
+		                openfile->filebot, strlen(openfile->filebot->data));
+	else if (openfile->mark) {
+		cut_marked_region();
 		openfile->mark = NULL;
-	} else if (ISSET(CUT_FROM_CURSOR))
-		/* Move all text up to the end of the line into the cutbuffer. */
-		cut_to_eol();
-	else
-#endif
-		/* Move the entire line into the cutbuffer. */
-		cut_line();
-
-#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 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();
+	} else if (ISSET(CUT_FROM_CURSOR)) {
+		/* 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 just the "line separator" into the cutbuffer. */
+		if (openfile->current_x < strlen(openfile->current->data))
+			extract_segment(line, openfile->current_x, line, strlen(line->data));
+		else if (openfile->current != openfile->filebot) {
+			extract_segment(line, openfile->current_x, line->next, 0);
+			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;
-
-#ifdef DEBUG
-	dump_filestruct(cutbuffer);
 #endif
+	{
+		/* When not at end-of-buffer, move one full line into the cutbuffer;
+		 * otherwise, move all text until end-of-line into the cutbuffer. */
+		if (openfile->current != openfile->filebot)
+			extract_segment(line, 0, line->next, 0);
+		else
+			extract_segment(line, 0, line, strlen(line->data));
+
+		openfile->placewewant = 0;
+	}
+
+	/* After a line operation, future ones should add to the cutbuffer. */
+	keep_cutbuffer = !marked && !until_eof;
+
+	set_modified();
+	refresh_needed = 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);
-#endif
-}
+	if (!is_cuttable(ISSET(CUT_FROM_CURSOR) && openfile->mark == NULL))
+		return;
 
-#ifndef NANO_TINY
-/* Move text from the current buffer into the cutbuffer, and copy it
- * back into the buffer afterward.  If the mark is set or the cursor
- * was moved, blow away previous contents of the cutbuffer. */
-void do_copy_text(void)
-{
-	static struct filestruct *next_contiguous_line = NULL;
-	bool mark_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;
-
-	if (mark_is_set || openfile->current != next_contiguous_line)
-		cutbuffer_reset();
-
-	do_cut_text(TRUE, FALSE);
-
-	/* If the mark was set, blow away the cutbuffer on the next copy. */
-	next_contiguous_line = (mark_is_set ? NULL : openfile->current);
-
-	/* If the mark was set, restore the viewport and cursor position. */
-	if (mark_is_set) {
-		openfile->edittop = fsfromline(is_edittop_lineno);
-		openfile->firstcolumn = is_firstcolumn;
-		openfile->current = fsfromline(is_current_lineno);
-		openfile->current_x = is_current_x;
+	/* 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, NULL);
 	}
+
+	do_snip(openfile->mark != NULL, FALSE, FALSE);
+
+	update_undo(CUT);
+#else
+	if (is_cuttable(FALSE))
+		do_snip(FALSE, FALSE, FALSE);
+#endif
+	wipe_statusbar();
 }
 
+#ifndef NANO_TINY
 /* 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_TO_EOF);
-	do_cut_text(FALSE, TRUE);
+	ran_a_tool = TRUE;
+
+	if (openfile->current->data[openfile->current_x] == '\0' &&
+				(openfile->current->next == NULL ||
+				(!ISSET(NO_NEWLINES) && openfile->current_x > 0 &&
+				openfile->current->next == openfile->filebot))) {
+		statusbar(_("Nothing was cut"));
+		return;
+	}
+
+	add_undo(CUT_TO_EOF, NULL);
+	do_snip(FALSE, TRUE, FALSE);
 	update_undo(CUT_TO_EOF);
+	wipe_statusbar();
+}
+
+/* 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, NULL);
+
+	/* Use the cutbuffer from the ZAP undo item, so the cut can be undone. */
+	cutbuffer = openfile->current_undo->cutbuffer;
+
+	do_snip(openfile->mark != NULL, FALSE, TRUE);
+
+	update_undo(ZAP);
+	wipe_statusbar();
+
+	cutbuffer = was_cutbuffer;
+}
+
+/* Make a copy of the marked region, putting it in the cutbuffer. */
+void copy_marked_region(void)
+{
+	linestruct *topline, *botline, *afterline;
+	char *was_datastart, saved_byte;
+	size_t top_x, bot_x;
+
+	get_region(&topline, &top_x, &botline, &bot_x);
+
+	openfile->last_action = OTHER;
+	keep_cutbuffer = FALSE;
+	openfile->mark = NULL;
+	refresh_needed = TRUE;
+
+	if (topline == botline && top_x == bot_x) {
+		statusbar(_("Copied nothing"));
+		return;
+	}
+
+	/* Make the area that was marked look like a separate buffer. */
+	afterline = botline->next;
+	botline->next = NULL;
+	saved_byte = botline->data[bot_x];
+	botline->data[bot_x] = '\0';
+	was_datastart = topline->data;
+	topline->data += top_x;
+
+	cutbuffer = copy_buffer(topline);
+
+	/* Restore the proper state of the buffer. */
+	topline->data = was_datastart;
+	botline->data[bot_x] = saved_byte;
+	botline->next = afterline;
+}
+
+/* Copy text from the current buffer into the cutbuffer.  The text is either
+ * the marked region, the whole line, the text from cursor to end-of-line,
+ * just the line break, or nothing, depending on mode and cursor position. */
+void copy_text(void)
+{
+	bool at_eol = (openfile->current->data[openfile->current_x] == '\0');
+	bool sans_newline = (ISSET(NO_NEWLINES) && openfile->current->next == NULL);
+	size_t from_x = (ISSET(CUT_FROM_CURSOR)) ? openfile->current_x : 0;
+	linestruct *was_current = openfile->current;
+	linestruct *addition;
+
+	if (openfile->mark || openfile->last_action != COPY || !keep_cutbuffer) {
+		free_lines(cutbuffer);
+		cutbuffer = NULL;
+	}
+
+	wipe_statusbar();
+
+	if (openfile->mark) {
+		copy_marked_region();
+		return;
+	}
+
+	/* When at the very end of the buffer, there is nothing to do. */
+	if (openfile->current->next == NULL && at_eol && (ISSET(CUT_FROM_CURSOR) ||
+									openfile->current_x == 0 || cutbuffer)) {
+		statusbar(_("Copied nothing"));
+		return;
+	}
+
+	addition = make_new_node(NULL);
+	addition->data = copy_of(openfile->current->data + from_x);
+
+	if (ISSET(CUT_FROM_CURSOR))
+		sans_newline = !at_eol;
+
+	/* Create the cutbuffer OR add to it, depending on the mode, the position
+	 * of the cursor, and whether or not the cutbuffer is currently empty. */
+	if (cutbuffer == NULL && sans_newline) {
+		cutbuffer = addition;
+		cutbottom = addition;
+	} else if (cutbuffer == NULL) {
+		cutbuffer = addition;
+		cutbottom = make_new_node(cutbuffer);
+		cutbottom->data = copy_of("");
+		cutbuffer->next = cutbottom;
+	} else if (sans_newline) {
+		addition->prev = cutbottom->prev;
+		addition->prev->next = addition;
+		delete_node(cutbottom);
+		cutbottom = addition;
+	} else if (ISSET(CUT_FROM_CURSOR)) {
+		addition->prev = cutbottom;
+		cutbottom->next = addition;
+		cutbottom = addition;
+	} else {
+		addition->prev = cutbottom->prev;
+		addition->prev->next = addition;
+		addition->next = cutbottom;
+		cutbottom->prev = addition;
+	}
+
+	/* When needed and possible, move the cursor to the next line. */
+	if ((!ISSET(CUT_FROM_CURSOR) || at_eol) && openfile->current->next) {
+		openfile->current = openfile->current->next;
+		openfile->current_x = 0;
+	} else
+		openfile->current_x = strlen(openfile->current->data);
+
+	edit_redraw(was_current, FLOWING);
+
+	openfile->last_action = COPY;
+	keep_cutbuffer = TRUE;
 }
 #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. */
 
-	/* If the cutbuffer is empty, there is nothing to do. */
-	if (cutbuffer == NULL)
+	if (cutbuffer == NULL) {
+		statusbar(_("Cutbuffer is empty"));
 		return;
+	}
 
 #ifndef NANO_TINY
-	add_undo(PASTE);
+	add_undo(PASTE, NULL);
 
 	if (ISSET(SOFTWRAP))
 		was_leftedge = leftedge_for(xplustabs(), openfile->current);
@@ -281,5 +729,6 @@ void do_uncut_text(void)
 	openfile->placewewant = xplustabs();
 
 	set_modified();
+	wipe_statusbar();
 	refresh_needed = TRUE;
 }

src/definitions.h

@@ -1,7 +1,7 @@
 /**************************************************************************
- *   nano.h  --  This file is part of GNU nano.                           *
+ *   definitions.h  --  This file is part of GNU nano.                    *
  *                                                                        *
- *   Copyright (C) 1999-2011, 2013-2018 Free Software Foundation, Inc.    *
+ *   Copyright (C) 1999-2011, 2013-2020 Free Software Foundation, Inc.    *
  *   Copyright (C) 2014-2017 Benno Schulenberg                            *
  *                                                                        *
  *   GNU nano is free software: you can redistribute it and/or modify     *
@@ -19,25 +19,22 @@
  *                                                                        *
  **************************************************************************/
 
-#ifndef NANO_H
-#define NANO_H 1
-
 #ifdef HAVE_CONFIG_H
 #include <config.h>
 #endif
 
 #ifdef NEED_XOPEN_SOURCE_EXTENDED
 #ifndef _XOPEN_SOURCE_EXTENDED
-#define _XOPEN_SOURCE_EXTENDED 1
+#define _XOPEN_SOURCE_EXTENDED  1
 #endif
 #endif
 
 #ifdef __TANDEM
 /* Tandem NonStop Kernel support. */
 #include <floss.h>
-#define NANO_ROOT_UID 65535
+#define ROOT_UID  65535
 #else
-#define NANO_ROOT_UID 0
+#define ROOT_UID  0
 #endif
 
 #ifdef HAVE_LIMITS_H
@@ -49,32 +46,30 @@
 #endif
 
 /* Suppress warnings for __attribute__((warn_unused_result)). */
-#define IGNORE_CALL_RESULT(call) do { if (call) {} } while(0)
+#define IGNORE_CALL_RESULT(call)  do { if (call) {} } while(0)
 
 /* Macros for flags, indexing each bit in a small array. */
-#define FLAGS(flag) flags[((flag) / (sizeof(unsigned) * 8))]
-#define FLAGMASK(flag) ((unsigned)1 << ((flag) % (sizeof(unsigned) * 8)))
-#define SET(flag) FLAGS(flag) |= FLAGMASK(flag)
-#define UNSET(flag) FLAGS(flag) &= ~FLAGMASK(flag)
-#define ISSET(flag) ((FLAGS(flag) & FLAGMASK(flag)) != 0)
-#define TOGGLE(flag) FLAGS(flag) ^= FLAGMASK(flag)
+#define FLAGS(flag)  flags[((flag) / (sizeof(unsigned) * 8))]
+#define FLAGMASK(flag)  ((unsigned)1 << ((flag) % (sizeof(unsigned) * 8)))
+#define SET(flag)  FLAGS(flag) |= FLAGMASK(flag)
+#define UNSET(flag)  FLAGS(flag) &= ~FLAGMASK(flag)
+#define ISSET(flag)  ((FLAGS(flag) & FLAGMASK(flag)) != 0)
+#define TOGGLE(flag)  FLAGS(flag) ^= FLAGMASK(flag)
 
-/* Macros for character allocation and more. */
-#define charalloc(howmuch) (char *)nmalloc((howmuch) * sizeof(char))
-#define charealloc(ptr, howmuch) (char *)nrealloc(ptr, (howmuch) * sizeof(char))
-#define charmove(dest, src, n) memmove(dest, src, (n) * sizeof(char))
-#define charset(dest, src, n) memset(dest, src, (n) * sizeof(char))
+/* Macros for allocation of character strings. */
+#define charalloc(howmuch)  (char *)nmalloc(howmuch)
+#define charealloc(ptr, howmuch)  (char *)nrealloc(ptr, howmuch)
 
 /* In UTF-8 a character is at most six bytes long. */
 #ifdef ENABLE_UTF8
-#define MAXCHARLEN 6
+#define MAXCHARLEN  6
 #else
-#define MAXCHARLEN 1
+#define MAXCHARLEN  1
 #endif
 
 /* Set a default value for PATH_MAX if there isn't one. */
 #ifndef PATH_MAX
-#define PATH_MAX 4096
+#define PATH_MAX  4096
 #endif
 
 #ifdef USE_SLANG
@@ -82,8 +77,8 @@
 #include <slcurses.h>
 /* Slang curses emulation brain damage, part 3: Slang doesn't define the
  * curses equivalents of the Insert or Delete keys. */
-#define KEY_DC SL_KEY_DELETE
-#define KEY_IC SL_KEY_IC
+#define KEY_DC  SL_KEY_DELETE
+#define KEY_IC  SL_KEY_IC
 /* Ncurses support. */
 #elif defined(HAVE_NCURSESW_NCURSES_H)
 #include <ncursesw/ncurses.h>
@@ -95,7 +90,7 @@
 #endif /* CURSES_H */
 
 #if defined(NCURSES_VERSION_MAJOR) && (NCURSES_VERSION_MAJOR < 6)
-#define USING_OLD_NCURSES yes
+#define USING_OLD_NCURSES  yes
 #endif
 
 #ifdef ENABLE_NLS
@@ -103,24 +98,21 @@
 #ifdef HAVE_LIBINTL_H
 #include <libintl.h>
 #endif
-#define _(string) gettext(string)
-#define P_(singular, plural, number) ngettext(singular, plural, number)
+#define _(string)  gettext(string)
+#define P_(singular, plural, number)  ngettext(singular, plural, number)
 #else
-#define _(string) (string)
-#define P_(singular, plural, number) (number == 1 ? singular : plural)
+#define _(string)  (string)
+#define P_(singular, plural, number)  (number == 1 ? singular : plural)
 #endif
-#define gettext_noop(string) (string)
-#define N_(string) gettext_noop(string)
+#define gettext_noop(string)  (string)
+#define N_(string)  gettext_noop(string)
 		/* 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. */
@@ -129,26 +121,33 @@
 #endif
 
 #if defined(ENABLE_WRAPPING) || defined(ENABLE_JUSTIFY)
-#define ENABLED_WRAPORJUSTIFY 1
+#define ENABLED_WRAPORJUSTIFY  1
 #endif
 
-#define BACKWARD FALSE
-#define FORWARD TRUE
+#define BACKWARD  FALSE
+#define FORWARD  TRUE
 
-#define BLIND FALSE
-#define VISIBLE TRUE
+#define BLIND  FALSE
+#define VISIBLE  TRUE
 
-#define JUSTFIND  0
-#define REPLACING 1
-#define INREGION  2
+#define JUSTFIND   0
+#define REPLACING  1
+#define INREGION   2
+
+#ifdef ENABLE_COLOR
+#define THE_DEFAULT  -1
+#define BAD_COLOR  -2
+#endif
+
+#define STANDARD_INPUT  0
 
 /* Enumeration types. */
 typedef enum {
 	NIX_FILE, DOS_FILE, MAC_FILE
-} file_format;
+} format_type;
 
 typedef enum {
-	HUSH, MILD, ALERT
+	VACUUM, HUSH, NOTICE, MILD, ALERT
 } message_type;
 
 typedef enum {
@@ -173,37 +172,29 @@ typedef enum {
 #ifdef ENABLE_COMMENT
 	COMMENT, UNCOMMENT, PREFLIGHT,
 #endif
-	CUT, CUT_TO_EOF, PASTE, INSERT, OTHER
+	ZAP, CUT, CUT_TO_EOF, COPY, PASTE, INSERT,
+	COUPLE_BEGIN, COUPLE_END, OTHER
 } undo_type;
 
 /* Structure types. */
 #ifdef ENABLE_COLOR
 typedef struct colortype {
+	short id;
+		/* An ordinal number (if this color combo is for a multiline regex). */
 	short fg;
-		/* This syntax's foreground color. */
+		/* This combo'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. */
+		/* This combo'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. */
-	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. */
+		/* The compiled regular expression for 'start=', or the only one. */
 	regex_t *end;
-		/* The compiled end (if any) of the regex string. */
+		/* The compiled regular expression for 'end=', if any. */
 	struct colortype *next;
-		/* Next set of colors. */
-	int id;
-		/* Basic id for assigning to lines later. */
+		/* Next color combination. */
 } colortype;
 
 typedef struct regexlisttype {
@@ -213,9 +204,26 @@ typedef struct regexlisttype {
 		/* 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. */
+	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;
@@ -225,14 +233,16 @@ typedef struct syntaxtype {
 	char *linter;
 		/* The command with which to lint this type of file. */
 	char *formatter;
-		/* The formatting command (for programming languages mainly). */
+		/* The command with which to format/modify/arrange this type of file. */
+	char *tab;
+		/* What the Tab key should produce; NULL for default behavior. */
 #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;
+	short nmultis;
 		/* How many multiline regex strings this syntax has. */
 	struct syntaxtype *next;
 		/* Next syntax. */
@@ -269,79 +279,67 @@ typedef struct lintstruct {
 #endif /* ENABLE_COLOR */
 
 /* More structure types. */
-typedef struct filestruct {
+typedef struct linestruct {
 	char *data;
 		/* The text of this line. */
 	ssize_t lineno;
 		/* The number of this line. */
-	struct filestruct *next;
+#ifndef NANO_TINY
+	ssize_t extrarows;
+		/* The extra rows that this line occupies when softwrapping. */
+#endif
+	struct linestruct *next;
 		/* Next node. */
-	struct filestruct *prev;
+	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;
+#ifndef NANO_TINY
+	bool has_anchor;
+		/* Whether the user has placed an anchor at this line. */
+#endif
+} linestruct;
 
 #ifndef NANO_TINY
-typedef struct undo_group {
+typedef struct groupstruct {
 	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;
+	struct groupstruct *next;
+		/* The next group, if any. */
+} groupstruct;
 
-typedef struct undo {
-	ssize_t lineno;
+typedef struct undostruct {
 	undo_type type;
-		/* What type of undo this was. */
-	size_t begin;
-		/* Where did this action begin or end. */
+		/* The operation type that this undo item is for. */
+	int xflags;
+		/* Some flag data to mark certain corner cases. */
+	ssize_t head_lineno;
+		/* The line number where the operation began or ended. */
+	size_t head_x;
+		/* The x position where the operation began or ended. */
 	char *strdata;
-		/* String type data we will use for copying the affected line back. */
+		/* String data to help restore the affected line. */
 	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;
+	groupstruct *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;
+	linestruct *cutbuffer;
+		/* A copy of the cutbuffer. */
+	ssize_t tail_lineno;
 		/* Mostly the line number of the current line; sometimes something else. */
-	size_t mark_begin_x;
+	size_t tail_x;
 		/* The x position corresponding to the above line number. */
-	struct undo *next;
+	struct undostruct *next;
 		/* A pointer to the undo item of the preceding action. */
-} undo;
+} undostruct;
 #endif /* !NANO_TINY */
 
 #ifdef ENABLE_HISTORIES
@@ -351,21 +349,22 @@ typedef struct poshiststruct {
 	ssize_t lineno;
 		/* Line number we left off on. */
 	ssize_t xno;
-		/* x position in the file we left off on. */
+		/* The x position in the file we left off on. */
 	struct poshiststruct *next;
+		/* The next item of position history. */
 } poshiststruct;
 #endif
 
 typedef struct openfilestruct {
 	char *filename;
 		/* The file's name. */
-	filestruct *fileage;
+	linestruct *filetop;
 		/* The file's first line. */
-	filestruct *filebot;
+	linestruct *filebot;
 		/* The file's last line. */
-	filestruct *edittop;
+	linestruct *edittop;
 		/* The current top of the edit window for this file. */
-	filestruct *current;
+	linestruct *current;
 		/* The current line for this file. */
 	size_t totsize;
 		/* The file's total number of characters. */
@@ -378,35 +377,37 @@ typedef struct openfilestruct {
 		/* 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. */
+	struct stat *statinfo;
+		/* The file's stat information from when it was opened or last saved. */
+#ifdef ENABLE_WRAPPING
+	linestruct *spillage_line;
+		/* The line for prepending stuff to during automatic hard-wrapping. */
+#endif
 #ifndef NANO_TINY
-	filestruct *mark;
+	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;
+	format_type fmt;
+		/* The file's format -- Unix or DOS or Mac. */
+	char *lock_filename;
+		/* The path of the lockfile, if we created one. */
+	undostruct *undotop;
 		/* The top of the undo list. */
-	undo *current_undo;
+	undostruct *current_undo;
 		/* The current (i.e. next) level of undo. */
-	undo *last_saved;
+	undostruct *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
+	bool modified;
+		/* Whether the file has been modified. */
 #ifdef ENABLE_COLOR
 	syntaxtype *syntax;
-		/* The  syntax struct for this file, if any. */
-	colortype *colorstrings;
-		/* The file's associated colors. */
+		/* The syntax that applies to this file, if any. */
 #endif
 #ifdef ENABLE_MULTIBUFFER
 	struct openfilestruct *next;
@@ -425,17 +426,15 @@ typedef struct rcoption {
 } rcoption;
 #endif
 
-typedef struct sc {
+typedef struct keystruct {
 	const char *keystr;
-		/* The string that describes a keystroke, like "^C" or "M-R". */
-	bool meta;
-		/* Whether this is a Meta keystroke. */
+		/* The string that describes the keystroke, like "^C" or "M-R". */
 	int keycode;
 		/* The integer that, together with meta, identifies the keystroke. */
 	int menus;
-		/* Which menus this applies to. */
+		/* The menus in which this keystroke is bound. */
 	void (*func)(void);
-		/* The function we're going to run. */
+		/* The function to which this keystroke is bound. */
 #ifndef NANO_TINY
 	int toggle;
 		/* If a toggle, what we're toggling. */
@@ -447,11 +446,11 @@ typedef struct sc {
 	char *expansion;
 		/* The string of keycodes to which this shortcut is expanded. */
 #endif
-	struct sc *next;
+	struct keystruct *next;
 		/* Next in the list. */
-} sc;
+} keystruct;
 
-typedef struct subnfunc {
+typedef struct funcstruct {
 	void (*func)(void);
 		/* The actual function to call. */
 	int menus;
@@ -469,9 +468,9 @@ typedef struct subnfunc {
 		/* Is this function allowed when in view mode? */
 	long toggle;
 		/* If this is a toggle, which toggle to affect. */
-	struct subnfunc *next;
+	struct funcstruct *next;
 		/* Next item in the list. */
-} subnfunc;
+} funcstruct;
 
 #ifdef ENABLE_WORDCOMPLETION
 typedef struct completion_word {
@@ -485,6 +484,7 @@ enum
 {
 	TITLE_BAR = 0,
 	LINE_NUMBER,
+	GUIDE_STRIPE,
 	SELECTED_TEXT,
 	STATUS_BAR,
 	ERROR_MESSAGE,
@@ -500,23 +500,23 @@ enum
 	CASE_SENSITIVE,
 	CONSTANT_SHOW,
 	NO_HELP,
-	SUSPEND,
+	SUSPENDABLE,
 	NO_WRAP,
 	AUTOINDENT,
 	VIEW_MODE,
 	USE_MOUSE,
 	USE_REGEXP,
-	TEMP_FILE,
+	SAVE_ON_EXIT,
 	CUT_FROM_CURSOR,
 	BACKWARDS_SEARCH,
 	MULTIBUFFER,
 	SMOOTH_SCROLL,
 	REBIND_DELETE,
-	REBIND_KEYPAD,
+	RAW_SEQUENCES,
 	NO_CONVERT,
-	BACKUP_FILE,
+	MAKE_BACKUP,
 	INSECURE_BACKUP,
-	NO_COLOR_SYNTAX,
+	NO_SYNTAX,
 	PRESERVE,
 	HISTORYLOG,
 	RESTRICTED,
@@ -528,9 +528,8 @@ enum
 	WORD_BOUNDS,
 	NO_NEWLINES,
 	BOLD_TEXT,
-	QUIET,
 	SOFTWRAP,
-	POS_HISTORY,
+	POSITIONLOG,
 	LOCKING,
 	NOREAD_MODE,
 	MAKE_IT_UNIX,
@@ -538,7 +537,14 @@ enum
 	SHOW_CURSOR,
 	LINE_NUMBERS,
 	NO_PAUSES,
-	AT_BLANKS
+	AT_BLANKS,
+	AFTER_ENDS,
+	LET_THEM_ZAP,
+	BREAK_LONG_LINES,
+	JUMPY_SCROLLING,
+	EMPTY_LINE,
+	INDICATOR,
+	BOOKSTYLE
 };
 
 /* Flags for the menus in which a given function should be present. */
@@ -549,7 +555,7 @@ enum
 #define MGOTOLINE       (1<<4)
 #define MWRITEFILE      (1<<5)
 #define MINSERTFILE     (1<<6)
-#define MEXTCMD         (1<<7)
+#define MEXECUTE        (1<<7)
 #define MHELP           (1<<8)
 #define MSPELL          (1<<9)
 #define MBROWSER        (1<<10)
@@ -558,90 +564,99 @@ enum
 #define MYESNO          (1<<13)
 #define MLINTER         (1<<14)
 #define MFINDINHELP     (1<<15)
-/* This is an abbreviation for all menus except Help and YesNo. */
+/* 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)
+                MEXECUTE|MWHEREISFILE|MGOTODIR|MFINDINHELP|MSPELL|MLINTER)
 #ifndef NANO_TINY
-#define MSOME  MMOST
+#define MSOME  MMOST|MBROWSER
 #else
 #define MSOME  MMAIN|MBROWSER
 #endif
 
 /* Basic control codes. */
-#define TAB_CODE  0x09
 #define ESC_CODE  0x1B
 #define DEL_CODE  0x7F
 
 /* Codes for "modified" Arrow keys, beyond KEY_MAX of ncurses. */
-#define CONTROL_LEFT 0x401
-#define CONTROL_RIGHT 0x402
-#define CONTROL_UP 0x403
-#define CONTROL_DOWN 0x404
-#define CONTROL_HOME 0x405
-#define CONTROL_END 0x406
-#define SHIFT_CONTROL_LEFT 0x411
-#define SHIFT_CONTROL_RIGHT 0x412
-#define SHIFT_CONTROL_UP 0x413
-#define SHIFT_CONTROL_DOWN 0x414
-#define SHIFT_CONTROL_HOME 0x415
-#define SHIFT_CONTROL_END 0x416
-#define ALT_LEFT 0x421
-#define ALT_RIGHT 0x422
-#define ALT_UP 0x423
-#define ALT_DOWN 0x424
-#define SHIFT_ALT_LEFT 0x431
-#define SHIFT_ALT_RIGHT 0x432
-#define SHIFT_ALT_UP 0x433
-#define SHIFT_ALT_DOWN 0x434
-#define SHIFT_HOME 0x455
-#define SHIFT_END 0x456
-#define SHIFT_PAGEUP 0x457
-#define SHIFT_PAGEDOWN 0x458
-#define SHIFT_TAB 0x45F
+#define CONTROL_LEFT    0x401
+#define CONTROL_RIGHT   0x402
+#define CONTROL_UP      0x403
+#define CONTROL_DOWN    0x404
+#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_PAGEUP    0x427
+#define ALT_PAGEDOWN  0x428
+#define ALT_INSERT    0x42C
+#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
+
+/* A special keycode for when <Tab> is pressed while the mark is on. */
+#define INDENT_KEY  0x4F1
+
+/* A special keycode to signal the beginning and end of a bracketed paste. */
+#define BRACKETED_PASTE_MARKER  0x4FB
+
+/* A special keycode for when a key produces an unknown escape sequence. */
+#define FOREIGN_SEQUENCE  0x4FC
 
 #ifdef USE_SLANG
 #ifdef ENABLE_UTF8
-#define KEY_BAD 0xFF  /* Clipped error code. */
+#define KEY_BAD  0xFF  /* Clipped error code. */
 #endif
-#define KEY_FLUSH 0x91  /* User-definable control code. */
+#define KEY_FLUSH  0x91  /* User-definable control code. */
 #else
-#define KEY_FLUSH KEY_F0  /* Nonexistent function key. */
+#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
+#define KEY_WINCH  -2
 
 /* Some extra flags for the undo function. */
-#define WAS_FINAL_BACKSPACE   (1<<1)
+#define WAS_BACKSPACE_AT_EOF  (1<<1)
 #define WAS_WHOLE_LINE        (1<<2)
-#define WAS_FINAL_LINE        (1<<3)
-/* The flags for the mark need to be the highest. */
+#define INCLUDED_LAST_LINE    (1<<3)
 #define MARK_WAS_SET          (1<<4)
-#define WAS_MARKED_FORWARD    (1<<5)
+#define CURSOR_WAS_AT_HEAD    (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
+#define WIDTH_OF_TAB  8
 
 /* The default comment character when a syntax does not specify any. */
-#define GENERAL_COMMENT_CHARACTER "#"
+#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
-
-/* The maximum number of bytes buffered at one time. */
-#define MAX_BUF_SIZE 128
+#define MAX_SEARCH_HISTORY  100
 
 /* The largest size_t number that doesn't have the high bit set. */
-#define HIGHEST_POSITIVE ((~(size_t)0) >> 1)
-
-#endif /* !NANO_H */
+#define HIGHEST_POSITIVE  ((~(size_t)0) >> 1)

src/help.c

@@ -1,9 +1,9 @@
 /**************************************************************************
  *   help.c  --  This file is part of GNU nano.                           *
  *                                                                        *
- *   Copyright (C) 2000-2011, 2013-2018 Free Software Foundation, Inc.    *
+ *   Copyright (C) 2000-2011, 2013-2020 Free Software Foundation, Inc.    *
  *   Copyright (C) 2017 Rishabh Dave                                      *
- *   Copyright (C) 2014-2017 Benno Schulenberg                            *
+ *   Copyright (C) 2014-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    *
@@ -20,277 +20,24 @@
  *                                                                        *
  **************************************************************************/
 
-#include "proto.h"
+#include "prototypes.h"
+
+#ifdef ENABLE_HELP
 
 #include <errno.h>
 #include <string.h>
 
-#ifdef ENABLE_HELP
-
 static char *help_text = NULL;
 		/* The text displayed in the help window. */
-
 static const char *start_of_body = NULL;
 		/* The point in the help text just after the title. */
-
 static char *end_of_intro = NULL;
 		/* The point in the help text where the shortcut descriptions begin. */
-
 static size_t location;
 		/* The offset (in bytes) of the topleft of the shown help text. */
 
-char *tempfilename = NULL;
-		/* Name of the temporary file used for wrapping the help text. */
-
-/* Hard-wrap the help text, write it to the existing temporary file, and
- * read that file into a new buffer. */
-void wrap_the_help_text(bool redisplaying)
-{
-	size_t sum = 0;
-	const char *ptr = start_of_body;
-	FILE *tempfile = fopen(tempfilename, "w+b");
-
-	/* If re-opening the temporary file failed, give up. */
-	if (tempfile == NULL) {
-		statusline(ALERT, _("Error writing temp file: %s"), strerror(errno));
-		return;
-	}
-
-	/* Write the body of the help_text into the temporary file. */
-	while (*ptr != '\0') {
-		int length = help_line_len(ptr);
-
-		fwrite(ptr, sizeof(char), length, tempfile);
-		ptr += length;
-
-		/* Hard-wrap the lines in the help text. */
-		if (*ptr != '\n')
-			fwrite("\n", sizeof(char), 1, tempfile);
-		else while (*ptr == '\n')
-			fwrite(ptr++, sizeof(char), 1, tempfile);
-	}
-
-	fclose(tempfile);
-
-	if (redisplaying)
-		close_buffer();
-
-	open_buffer(tempfilename, TRUE);
-	remove_magicline();
-
-	prepare_for_display();
-
-	/* Move to the position in the file where we were before. */
-	while (TRUE) {
-		sum += strlen(openfile->current->data);
-		if (sum > location)
-			break;
-		openfile->current = openfile->current->next;
-	}
-
-	openfile->edittop = openfile->current;
-}
-
-/* Our main help-viewer function. */
-void do_help(void)
-{
-	int kbinput = ERR;
-	functionptrtype func;
-		/* The function of the key the user typed in. */
-	int oldmenu = currmenu;
-		/* The menu we were called from. */
-#ifdef ENABLE_LINENUMBERS
-	int was_margin = margin;
-#endif
-	ssize_t was_tabsize = tabsize;
-#ifdef ENABLE_COLOR
-	char *was_syntax = syntaxstr;
-#endif
-	char *saved_answer = (answer != NULL) ? strdup(answer) : NULL;
-		/* The current answer when the user invokes help at the prompt. */
-	unsigned stash[sizeof(flags) / sizeof(flags[0])];
-		/* A storage place for the current flag settings. */
-	filestruct *line;
-	int length;
-	FILE *fp;
-
-	blank_statusbar();
-
-	/* Get a temporary file for the help text.  If it fails, give up. */
-	tempfilename = safe_tempfile(&fp);
-	if (tempfilename == NULL) {
-		statusline(ALERT, _("Error writing temp file: %s"), strerror(errno));
-		free(saved_answer);
-		return;
-	}
-
-	fclose(fp);
-
-	/* Save the settings of all flags. */
-	memcpy(stash, flags, sizeof(flags));
-
-	/* Ensure that the help screen's shortcut list can be displayed. */
-	if (ISSET(NO_HELP) && LINES > 4) {
-		UNSET(NO_HELP);
-		window_init();
-	}
-
-	/* When searching, do it forward, case insensitive, and without regexes. */
-	UNSET(BACKWARDS_SEARCH);
-	UNSET(CASE_SENSITIVE);
-	UNSET(USE_REGEXP);
-
-	UNSET(WHITESPACE_DISPLAY);
-	UNSET(NOREAD_MODE);
-
-#ifdef ENABLE_LINENUMBERS
-	UNSET(LINE_NUMBERS);
-	editwincols = COLS;
-	margin = 0;
-#endif
-	tabsize = 8;
-#ifdef ENABLE_COLOR
-	syntaxstr = "nanohelp";
-#endif
-	curs_set(0);
-
-	/* Compose the help text from all the pieces. */
-	help_init();
-	inhelp = TRUE;
-	location = 0;
-	didfind = 0;
-
-	bottombars(MHELP);
-	wnoutrefresh(bottomwin);
-
-	/* Extract the title from the head of the help text. */
-	length = break_line(help_text, MAX_BUF_SIZE, TRUE);
-	title = charalloc(length * sizeof(char) + 1);
-	strncpy(title, help_text, length);
-	title[length] = '\0';
-
-	titlebar(title);
-
-	/* Skip over the title to point at the start of the body text. */
-	start_of_body = help_text + length;
-	while (*start_of_body == '\n')
-		start_of_body++;
-
-	wrap_the_help_text(FALSE);
-	edit_refresh();
-
-	while (TRUE) {
-		lastmessage = HUSH;
-		focusing = TRUE;
-
-		/* Show the cursor when we searched and found something. */
-		kbinput = get_kbinput(edit, didfind == 1);
-		didfind = 0;
-
-		func = parse_help_input(&kbinput);
-
-		if (func == total_refresh) {
-			total_redraw();
-		} else if (func == do_up) {
-			do_scroll_up();
-		} else if (func == do_down) {
-			if (openfile->edittop->lineno + editwinrows - 1 <
-								openfile->filebot->lineno)
-				do_scroll_down();
-		} else if (func == do_page_up) {
-			do_page_up();
-		} else if (func == do_page_down) {
-			do_page_down();
-		} else if (func == to_first_line) {
-			to_first_line();
-		} else if (func == to_last_line) {
-			to_last_line();
-		} else if (func == do_search_forward) {
-			do_search();
-			bottombars(MHELP);
-		} else if (func == do_research) {
-			do_research();
-#ifndef NANO_TINY
-		} else if (func == do_findprevious) {
-			do_findprevious();
-		} else if (func == do_findnext) {
-			do_findnext();
-#ifdef ENABLE_NANORC
-		} else if (func == (functionptrtype)implant) {
-			implant(first_sc_for(MHELP, func)->expansion);
-#endif
-		} else if (kbinput == KEY_WINCH) {
-			; /* Nothing to do. */
-#endif
-#ifdef ENABLE_MOUSE
-		} else if (kbinput == KEY_MOUSE) {
-			int dummy_row, dummy_col;
-			get_mouseinput(&dummy_row, &dummy_col, TRUE);
-#endif
-		} else if (func == do_exit) {
-			/* Exit from the help viewer. */
-			close_buffer();
-			curs_set(0);
-			break;
-		} else
-			unbound_key(kbinput);
-
-		currmenu = MHELP;
-		edit_refresh();
-
-		location = 0;
-		line = openfile->fileage;
-
-		/* Count how far (in bytes) edittop is into the file. */
-		while (line != openfile->edittop) {
-			location += strlen(line->data);
-			line = line->next;
-		}
-	}
-
-	/* Restore the settings of all flags. */
-	memcpy(flags, stash, sizeof(flags));
-
-#ifdef ENABLE_LINENUMBERS
-	margin = was_margin;
-	editwincols = COLS - margin;
-#endif
-	tabsize = was_tabsize;
-#ifdef ENABLE_COLOR
-	syntaxstr = was_syntax;
-#endif
-
-	/* Switch back to the buffer we were invoked from. */
-	switch_to_prev_buffer();
-
-	if (ISSET(NO_HELP)) {
-		currmenu = oldmenu;
-		window_init();
-	} else
-		bottombars(oldmenu);
-
-	free(title);
-	title = NULL;
-	inhelp = FALSE;
-
-#ifdef ENABLE_BROWSER
-	if (oldmenu == MBROWSER || oldmenu == MWHEREISFILE || oldmenu == MGOTODIR)
-		browser_refresh();
-	else
-#endif
-		total_refresh();
-
-	free(answer);
-	answer = saved_answer;
-
-	remove(tempfilename);
-	free(tempfilename);
-
-	free(help_text);
-}
-
-/* Allocate space for the help text for the current menu, and concatenate
- * the different pieces of text into it. */
+/* Allocate space for the help text for the current menu,
+ * and concatenate the different pieces of text into it. */
 void help_init(void)
 {
 	size_t allocsize = 0;
@@ -298,9 +45,9 @@ void help_init(void)
 	const char *htx[3];
 		/* Untranslated help introduction.  We break it up into three chunks
 		 * in case the full string is too long for the compiler to handle. */
+	const funcstruct *f;
+	const keystruct *s;
 	char *ptr;
-	const subnfunc *f;
-	const sc *s;
 
 	/* First, set up the initial help text for the current function. */
 	if (currmenu == MWHEREIS || currmenu == MREPLACE || currmenu == MREPLACEWITH) {
@@ -410,15 +157,26 @@ void help_init(void)
 	}
 #endif /* ENABLE_SPELLER */
 #ifndef NANO_TINY
-	else if (currmenu == MEXTCMD) {
+	else if (currmenu == MEXECUTE) {
 		htx[0] = N_("Execute Command Help Text\n\n "
 				"This mode allows you to insert the output of a "
 				"command run by the shell into the current buffer (or "
-				"a new buffer in multiple file buffer mode).  If you "
-				"need another blank buffer, do not enter any "
-				"command.\n\n The following function keys are "
+				"into a new buffer).  If the command is preceded by '|' "
+				"(the pipe symbol), the current contents of the buffer "
+				"(or marked region) will be piped to the command.  ");
+		htx[1] = N_("If you just need another blank buffer, do not enter any "
+				"command.\n\n You can also pick one of four tools, or cut a "
+				"large piece of the buffer, or put the editor to sleep.\n\n");
+		htx[2] = N_(" The following function keys are "
 				"available in Execute Command mode:\n\n");
-		htx[1] = NULL;
+	} else if (currmenu == MLINTER) {
+		htx[0] = N_("=== Linter ===\n\n "
+				"In this mode, the status bar shows an error message or "
+				"warning, and the cursor is put at the corresponding "
+				"position in the file.  With PageUp and PageDown you "
+				"can switch to earlier and later messages.\n\n");
+		htx[1] = N_(" The following function keys are "
+				"available in Linter mode:\n\n");
 		htx[2] = NULL;
 	}
 #endif /* !NANO_TINY */
@@ -461,23 +219,23 @@ void help_init(void)
 	if (htx[2] != NULL)
 		allocsize += strlen(htx[2]);
 
-	/* Calculate the length of the shortcut help text.  Each entry has
-	 * one or two keys, which fill 16 columns, plus translated text,
-	 * plus one or two \n's. */
+	/* Calculate the length of the descriptions of the shortcuts.
+	 * Each entry has one or two keystrokes, which fill 17 cells,
+	 * plus translated text, plus one or two \n's. */
 	for (f = allfuncs; f != NULL; f = f->next)
 		if (f->menus & currmenu)
-			allocsize += (16 * MAXCHARLEN) + strlen(_(f->help)) + 2;
+			allocsize += strlen(_(f->help)) + 21;
 
 #ifndef NANO_TINY
 	/* If we're on the main list, we also count the toggle help text.
-	 * Each entry has "M-%c\t\t", five chars which fill 16 columns,
-	 * plus a space, plus translated text, plus one or two '\n's. */
+	 * Each entry has "M-%c\t\t ", six chars which fill 17 cells, plus
+	 * two translated texts, plus a space, plus one or two '\n's. */
 	if (currmenu == MMAIN) {
-		size_t endis_len = strlen(_("enable/disable"));
+		size_t onoff_len = strlen(_("enable/disable"));
 
 		for (s = sclist; s != NULL; s = s->next)
 			if (s->func == do_toggle_void)
-				allocsize += strlen(_(flagtostr(s->toggle))) + endis_len + 8;
+				allocsize += strlen(_(flagtostr(s->toggle))) + onoff_len + 9;
 	}
 #endif
 
@@ -491,48 +249,39 @@ void help_init(void)
 	if (htx[2] != NULL)
 		strcat(help_text, htx[2]);
 
-	ptr = help_text + strlen(help_text);
-
 	/* Remember this end-of-introduction, start-of-shortcuts. */
-	end_of_intro = ptr;
+	end_of_intro = help_text + strlen(help_text);
+	ptr = end_of_intro;
 
-	/* Now add our shortcut info. */
+	/* Now add the shortcuts and their descriptions. */
 	for (f = allfuncs; f != NULL; f = f->next) {
-		int scsfound = 0;
+		int tally = 0;
 
 		if ((f->menus & currmenu) == 0)
 			continue;
 
-		/* Let's simply show the first two shortcuts from the list. */
+		/* Show the first two shortcuts (if any) for each function. */
 		for (s = sclist; s != NULL; s = s->next) {
-
-			if ((s->menus & currmenu) == 0)
-				continue;
-
-			if (s->func == f->func) {
-				scsfound++;
-				/* Make the first column narrower (6) than the second (10),
-				 * but allow it to spill into the second, for "M-Space". */
-				if (scsfound == 1) {
-					sprintf(ptr, "%s               ", s->keystr);
+			if ((s->menus & currmenu) && s->func == f->func && s->keystr[0]) {
+				/* Make the first column 7 cells wide and the second 10. */
+				if (++tally == 1) {
+					sprintf(ptr, "%s                ", s->keystr);
 					/* Unicode arrows take three bytes instead of one. */
-					if (strstr(s->keystr, "\xE2") != NULL)
-						ptr += 8;
-					else
-						ptr += 6;
+					ptr += (strstr(s->keystr, "\xE2") != NULL ? 9 : 7);
 				} else {
-					ptr += sprintf(ptr, "(%s)\t", s->keystr);
+					sprintf(ptr, "(%s)       ", s->keystr);
+					ptr += (strstr(s->keystr, "\xE2") != NULL ? 12 : 10);
 					break;
 				}
 			}
 		}
 
-		if (scsfound == 0)
-			ptr += sprintf(ptr, "\t\t");
-		else if (scsfound == 1)
+		if (tally == 0)
+			ptr += sprintf(ptr, "\t\t ");
+		else if (tally == 1)
 			ptr += 10;
 
-		/* The shortcut's help text. */
+		/* The shortcut's description. */
 		ptr += sprintf(ptr, "%s\n", _(f->help));
 
 		if (f->blank_after)
@@ -553,88 +302,271 @@ void help_init(void)
 			counter++;
 			for (s = sclist; s != NULL; s = s->next)
 				if (s->toggle && s->ordinal == counter) {
-					ptr += sprintf(ptr, "%s\t\t%s %s\n", (s->menus == MMAIN ? s->keystr : ""),
+					ptr += sprintf(ptr, "%s\t\t %s %s\n", (s->menus & MMAIN ? s->keystr : ""),
 								_(flagtostr(s->toggle)), _("enable/disable"));
-					if (s->toggle == NO_COLOR_SYNTAX || s->toggle == TABS_TO_SPACES)
+					if (s->toggle == NO_SYNTAX || s->toggle == TABS_TO_SPACES)
 						ptr += sprintf(ptr, "\n");
 					break;
 				}
 		}
 	}
 #endif /* !NANO_TINY */
-
-	if (strlen(help_text) > allocsize)
-		statusline(ALERT, "Help text spilled over -- please report a bug");
 }
 
-/* Return the function that is bound to the given key, accepting certain
- * plain characters too, for consistency with the file browser. */
-functionptrtype parse_help_input(int *kbinput)
+/* Hard-wrap the concatenated help text, and write it into a new buffer. */
+void wrap_help_text_into_buffer(void)
 {
-	if (!meta_key) {
-		switch (*kbinput) {
-			case ' ':
-				return do_page_down;
-			case '-':
-				return do_page_up;
-			case 'W':
-			case 'w':
-			case '/':
-				return do_search_forward;
-			case 'N':
-#ifndef NANO_TINY
-				return do_findprevious;
+	size_t sum = 0;
+	/* Avoid overtight and overwide paragraphs in the introductory text. */
+	size_t wrapping_point = ((COLS < 40) ? 40 : (COLS > 74) ? 74 : COLS) - thebar;
+	const char *ptr = start_of_body;
+
+	make_new_buffer();
+
+	/* Copy the help text into the just-created new buffer. */
+	while (*ptr != '\0') {
+		int length, shim;
+		char *oneline;
+
+		if (ptr == end_of_intro)
+			wrapping_point = ((COLS < 40) ? 40 : COLS) - thebar;
+
+		if (ptr < end_of_intro || *(ptr - 1) == '\n') {
+			length = break_line(ptr, wrapping_point, TRUE);
+			oneline = nmalloc(length + 1);
+			shim = (*(ptr + length - 1) == ' ') ? 0 : 1;
+			snprintf(oneline, length + shim, "%s", ptr);
+		} else {
+			length = break_line(ptr, ((COLS < 40) ? 22 : COLS - 18) - thebar, TRUE);
+			oneline = nmalloc(length + 5);
+			snprintf(oneline, length + 5, "\t\t  %s", ptr);
+		}
+
+		free(openfile->current->data);
+		openfile->current->data = oneline;
+
+		ptr += length;
+		if (*ptr != '\n')
+			ptr--;
+
+		/* Create a new line, and then one more for each extra \n. */
+		do {
+			openfile->current->next = make_new_node(openfile->current);
+			openfile->current = openfile->current->next;
+			openfile->current->data = copy_of("");
+		} while (*(++ptr) == '\n');
+	}
+
+	openfile->filebot = openfile->current;
+	openfile->current = openfile->filetop;
+
+	remove_magicline();
+#ifdef ENABLE_COLOR
+	find_and_prime_applicable_syntax();
 #endif
-			case 'n':
-				return do_research;
-			case 'E':
-			case 'e':
-			case 'Q':
-			case 'q':
-			case 'X':
-			case 'x':
-				return do_exit;
+	prepare_for_display();
+
+	/* Move to the position in the file where we were before. */
+	while (TRUE) {
+		sum += strlen(openfile->current->data);
+		if (sum > location)
+			break;
+		openfile->current = openfile->current->next;
+	}
+
+	openfile->edittop = openfile->current;
+}
+
+/* Assemble a help text, display it, and allow scrolling through it. */
+void show_help(void)
+{
+	int kbinput = ERR;
+	functionptrtype func;
+		/* The function of the key the user typed in. */
+	int oldmenu = currmenu;
+		/* The menu we were called from. */
+#ifdef ENABLE_LINENUMBERS
+	int was_margin = margin;
+#endif
+	ssize_t was_tabsize = tabsize;
+#ifdef ENABLE_COLOR
+	char *was_syntax = syntaxstr;
+#endif
+	char *saved_answer = (answer != NULL) ? copy_of(answer) : NULL;
+		/* The current answer when the user invokes help at the prompt. */
+	unsigned stash[sizeof(flags) / sizeof(flags[0])];
+		/* A storage place for the current flag settings. */
+	linestruct *line;
+	int length;
+
+	/* Save the settings of all flags. */
+	memcpy(stash, flags, sizeof(flags));
+
+	/* Ensure that the help screen's shortcut list can be displayed. */
+	if (ISSET(NO_HELP) && LINES > 4) {
+		UNSET(NO_HELP);
+		window_init();
+	} else
+		blank_statusbar();
+
+	/* When searching, do it forward, case insensitive, and without regexes. */
+	UNSET(BACKWARDS_SEARCH);
+	UNSET(CASE_SENSITIVE);
+	UNSET(USE_REGEXP);
+
+	UNSET(WHITESPACE_DISPLAY);
+	UNSET(NOREAD_MODE);
+
+#ifdef ENABLE_LINENUMBERS
+	UNSET(LINE_NUMBERS);
+	editwincols = COLS - thebar;
+	margin = 0;
+#endif
+	tabsize = 8;
+#ifdef ENABLE_COLOR
+	syntaxstr = "nanohelp";
+#endif
+	curs_set(0);
+
+	/* Compose the help text from all the relevant pieces. */
+	help_init();
+
+	inhelp = TRUE;
+	location = 0;
+	didfind = 0;
+
+	bottombars(MHELP);
+
+	/* Extract the title from the head of the help text. */
+	length = break_line(help_text, HIGHEST_POSITIVE, TRUE);
+	title = measured_copy(help_text, length);
+
+	titlebar(title);
+
+	/* Skip over the title to point at the start of the body text. */
+	start_of_body = help_text + length;
+	while (*start_of_body == '\n')
+		start_of_body++;
+
+	wrap_help_text_into_buffer();
+	edit_refresh();
+
+	while (TRUE) {
+		lastmessage = VACUUM;
+		focusing = TRUE;
+
+		/* Show the cursor when we searched and found something. */
+		kbinput = get_kbinput(edit, didfind == 1 || ISSET(SHOW_CURSOR));
+		didfind = 0;
+
+#ifndef NANO_TINY
+		if (bracketed_paste || kbinput == BRACKETED_PASTE_MARKER) {
+			beep();
+			continue;
+		}
+#endif
+		func = interpret(&kbinput);
+
+		if (func == full_refresh) {
+			full_refresh();
+		} else if (ISSET(SHOW_CURSOR) && (func == do_left || func == do_right ||
+											func == do_up || func == do_down)) {
+			func();
+		} else if (func == do_up || func == do_scroll_up) {
+			do_scroll_up();
+		} else if (func == do_down || func == do_scroll_down) {
+			if (openfile->edittop->lineno + editwinrows - 1 <
+								openfile->filebot->lineno)
+				do_scroll_down();
+		} else if (func == do_page_up || func == do_page_down ||
+					func == to_first_line || func == to_last_line ||
+					func == do_findprevious || func == do_findnext) {
+			func();
+		} else if (func == do_search_forward || func == do_search_backward) {
+			func();
+			bottombars(MHELP);
+#ifdef ENABLE_NANORC
+		} else if (func == (functionptrtype)implant) {
+			implant(first_sc_for(MHELP, func)->expansion);
+#endif
+#ifdef ENABLE_MOUSE
+		} else if (kbinput == KEY_MOUSE) {
+			int dummy_row, dummy_col;
+			get_mouseinput(&dummy_row, &dummy_col, TRUE);
+#endif
+#ifndef NANO_TINY
+		} else if (kbinput == KEY_WINCH) {
+			;  /* Nothing to do. */
+#endif
+		} else if (func == do_exit) {
+			break;
+		} else
+			unbound_key(kbinput);
+
+		currmenu = MHELP;
+		edit_refresh();
+
+		location = 0;
+		line = openfile->filetop;
+
+		/* Count how far (in bytes) edittop is into the file. */
+		while (line != openfile->edittop) {
+			location += strlen(line->data);
+			line = line->next;
 		}
 	}
-	return func_from_key(kbinput);
-}
 
-/* Calculate the displayable length of the help-text line starting at ptr. */
-size_t help_line_len(const char *ptr)
-{
-	size_t wrapping_point = (COLS > 24) ? COLS - 1 : 24;
-		/* The target width for wrapping long lines. */
-	ssize_t wrap_location;
-		/* Actual position where the line can be wrapped. */
-	size_t length = 0;
-		/* Full length of the line, until the first newline. */
+	/* Discard the help-text buffer. */
+	close_buffer();
 
-	/* Avoid overwide paragraphs in the introductory text. */
-	if (ptr < end_of_intro && COLS > 74)
-		wrapping_point = 74;
+	/* Restore the settings of all flags. */
+	memcpy(flags, stash, sizeof(flags));
 
-	wrap_location = break_line(ptr, wrapping_point, TRUE);
+#ifdef ENABLE_LINENUMBERS
+	margin = was_margin;
+	editwincols = COLS - margin - thebar;
+#endif
+	tabsize = was_tabsize;
+#ifdef ENABLE_COLOR
+	syntaxstr = was_syntax;
+	have_palette = FALSE;
+#endif
 
-	/* Get the length of the entire line up to a null or a newline. */
-	while (*(ptr + length) != '\0' && *(ptr + length) != '\n')
-		length = move_mbright(ptr, length);
+	free(title);
+	title = NULL;
+	free(answer);
+	answer = saved_answer;
+	free(help_text);
+	inhelp = FALSE;
 
-	/* If the entire line will just fit the screen, don't wrap it. */
-	if (strnlenpt(ptr, length) <= wrapping_point + 1)
-		return length;
-	else if (wrap_location > 0)
-		return wrap_location;
+	curs_set(0);
+
+	if (ISSET(NO_HELP)) {
+		currmenu = oldmenu;
+		window_init();
+	} else {
+		blank_statusbar();
+		bottombars(oldmenu);
+	}
+
+#ifdef ENABLE_BROWSER
+	if (oldmenu == MBROWSER || oldmenu == MWHEREISFILE || oldmenu == MGOTODIR)
+		browser_refresh();
 	else
-		return 1;
+#endif
+	{
+		titlebar(NULL);
+		edit_refresh();
+	}
 }
 
 #endif /* ENABLE_HELP */
 
-/* Start the help viewer. */
-void do_help_void(void)
+/* Start the help viewer, or indicate that there is no help. */
+void do_help(void)
 {
 #ifdef ENABLE_HELP
-	do_help();
+	show_help();
 #else
 	if (currmenu == MMAIN)
 		say_there_is_no_help();

src/history.c

@@ -1,8 +1,8 @@
 /**************************************************************************
  *   history.c  --  This file is part of GNU nano.                        *
  *                                                                        *
- *   Copyright (C) 2003-2011, 2013-2018 Free Software Foundation, Inc.    *
- *   Copyright (C) 2016-2017 Benno Schulenberg                            *
+ *   Copyright (C) 2003-2011, 2013-2020 Free Software Foundation, Inc.    *
+ *   Copyright (C) 2016, 2017, 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    *
@@ -19,50 +19,52 @@
  *                                                                        *
  **************************************************************************/
 
-#include "proto.h"
+#include "prototypes.h"
+
+#ifdef ENABLE_HISTORIES
 
 #include <errno.h>
 #include <string.h>
 
-#ifdef ENABLE_HISTORIES
-
 #ifndef SEARCH_HISTORY
-#define SEARCH_HISTORY "search_history"
+#define SEARCH_HISTORY  "search_history"
 #endif
 
 #ifndef POSITION_HISTORY
-#define POSITION_HISTORY "filepos_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 time_t latest_timestamp = 942927132;
+		/* The last time the positions-history file was written. */
+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, "");
+	search_history->data = copy_of("");
 	searchtop = search_history;
 	searchbot = search_history;
 
 	replace_history = make_new_node(NULL);
-	replace_history->data = mallocstrcpy(NULL, "");
+	replace_history->data = copy_of("");
 	replacetop = replace_history;
 	replacebot = replace_history;
 
 	execute_history = make_new_node(NULL);
-	execute_history->data = mallocstrcpy(NULL, "");
+	execute_history->data = copy_of("");
 	executetop = execute_history;
 	executebot = execute_history;
 }
 
 /* Set the current position in the given history list to the bottom. */
-void history_reset(const filestruct *list)
+void history_reset(const linestruct *list)
 {
 	if (list == search_history)
 		search_history = searchbot;
@@ -75,14 +77,14 @@ void history_reset(const filestruct *list)
 /* Return from the history list that starts at start and ends at end
  * the first node that contains the first len characters of the given
  * text, or NULL if there is no such node. */
-filestruct *find_history(const filestruct *start, const filestruct *end,
+linestruct *find_history(const linestruct *start, const linestruct *end,
 		const char *text, size_t len)
 {
-	const filestruct *item;
+	const linestruct *item;
 
 	for (item = start; item != end->prev && item != NULL; item = item->prev) {
 		if (strncmp(item->data, text, len) == 0)
-			return (filestruct *)item;
+			return (linestruct *)item;
 	}
 
 	return NULL;
@@ -90,9 +92,9 @@ filestruct *find_history(const filestruct *start, const filestruct *end,
 
 /* Update a history list (the one in which item is the current position)
  * with a fresh string text.  That is: add text, or move it to the end. */
-void update_history(filestruct **item, const char *text)
+void update_history(linestruct **item, const char *text)
 {
-	filestruct **htop = NULL, **hbot = NULL, *thesame;
+	linestruct **htop = NULL, **hbot = NULL, *thesame;
 
 	if (*item == search_history) {
 		htop = &searchtop;
@@ -110,31 +112,31 @@ void update_history(filestruct **item, const char *text)
 
 	/* If an identical string was found, delete that item. */
 	if (thesame != NULL) {
-		filestruct *after = thesame->next;
+		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(after);
+		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) {
-		filestruct *oldest = *htop;
+		linestruct *oldest = *htop;
 
 		*htop = (*htop)->next;
 		unlink_node(oldest);
-		renumber(*htop);
+		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, "");
+	(*hbot)->data = copy_of("");
 
 	/* Indicate that the history needs to be saved on exit. */
 	history_changed = TRUE;
@@ -145,7 +147,7 @@ void update_history(filestruct **item, const char *text)
 
 /* Move h to the string in the history list just before it, and return
  * that string.  If there isn't one, don't move h and return NULL. */
-char *get_history_older(filestruct **h)
+char *get_history_older(linestruct **h)
 {
 	if ((*h)->prev == NULL)
 		return NULL;
@@ -157,7 +159,7 @@ char *get_history_older(filestruct **h)
 
 /* Move h to the string in the history list just after it, and return
  * that string.  If there isn't one, don't move h and return NULL. */
-char *get_history_newer(filestruct **h)
+char *get_history_newer(linestruct **h)
 {
 	if ((*h)->next == NULL)
 		return NULL;
@@ -167,80 +169,61 @@ char *get_history_newer(filestruct **h)
 	return (*h)->data;
 }
 
-/* More placeholders. */
-void get_history_newer_void(void)
-{
-	;
-}
+/* 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(filestruct **h, char *s, size_t len)
+/* Go backward through one of three history lists, starting at its item h,
+ * searching for a string that is a tab completion of the given string s,
+ * looking at only the first len characters of s.  When found, make h point
+ * at it and return that string; otherwise, don't move h and return s. */
+char *get_history_completion(linestruct **h, char *s, size_t len)
 {
-	if (len > 0) {
-		filestruct *htop = NULL, *hbot = NULL, *p;
+	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 (*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;
 	}
 
-	/* If we're here, we didn't find a match, we didn't find an inexact
-	 * match, or len is 0.  Return s. */
+	/* First search from the current position to the top of the list
+	 * 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);
+	}
+
+	/* Now search from the bottom of the list to the original position. */
+	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);
+	}
+
+	/* When no useful match was found, simply return the given string. */
 	return (char *)s;
 }
-#endif /* ENSABLE_TABCOMP */
-
-void history_error(const char *msg, ...)
-{
-	va_list ap;
-
-	va_start(ap, msg);
-	vfprintf(stderr, _(msg), ap);
-	va_end(ap);
-
-	fprintf(stderr, _("\nPress Enter to continue\n"));
-	while (getchar() != '\n')
-		;
-}
+#endif /* ENABLE_TABCOMP */
 
 /* Check whether we have or could make a directory for history files. */
 bool have_statedir(void)
@@ -280,14 +263,14 @@ bool have_statedir(void)
 			free(statepath);
 		}
 		if (mkdir(statedir, S_IRWXU) == -1) {
-			history_error(N_("Unable to create directory %s: %s\n"
+			jot_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"
+		jot_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);
@@ -298,237 +281,248 @@ bool have_statedir(void)
 	return TRUE;
 }
 
-/* Load the histories for Search and Replace and Execute Command. */
+/* Load the histories for Search, Replace With, and Execute Command. */
 void load_history(void)
 {
 	char *histname = concatenate(statedir, SEARCH_HISTORY);
-	FILE *hisfile = fopen(histname, "rb");
+	FILE *histfile = fopen(histname, "rb");
 
-	if (hisfile == NULL) {
-		if (errno != ENOENT) {
-			/* When reading failed, don't save history when we quit. */
-			UNSET(HISTORYLOG);
-			history_error(N_("Error reading %s: %s"), histname,
-						strerror(errno));
-		}
-	} else {
-		/* Load the three history lists -- first search, then replace,
-		 * then execute -- from oldest entry to newest.  Between two
-		 * lists there is an empty line. */
-		filestruct **history = &search_history;
-		char *line = NULL;
-		size_t buf_len = 0;
-		ssize_t read;
-
-		while ((read = getline(&line, &buf_len, hisfile)) > 0) {
-			line[--read] = '\0';
-			if (read > 0) {
-				/* Encode any embedded NUL as 0x0A. */
-				unsunder(line, read);
-				update_history(history, line);
-			} else if (history == &search_history)
-				history = &replace_history;
-			else
-				history = &execute_history;
-		}
-
-		fclose(hisfile);
-		free(line);
+	/* If reading an existing file failed, don't save history when we quit. */
+	if (histfile == NULL && errno != ENOENT) {
+		jot_error(N_("Error reading %s: %s"), histname, strerror(errno));
+		UNSET(HISTORYLOG);
 	}
 
-	/* After reading them in, set the status of the lists to "unchanged". */
-	history_changed = FALSE;
+	if (histfile == NULL) {
+		free(histname);
+		return;
+	}
+
+	linestruct **history = &search_history;
+	char *line = NULL;
+	size_t buf_len = 0;
+	ssize_t read;
+
+	/* Load the three history lists (first search, then replace, then execute)
+	 * from oldest entry to newest.  Between two lists there is an empty line. */
+	while ((read = getline(&line, &buf_len, histfile)) > 0) {
+		line[--read] = '\0';
+		if (read > 0) {
+			recode_NUL_to_LF(line, read);
+			update_history(history, line);
+		} else if (history == &search_history)
+			history = &replace_history;
+		else
+			history = &execute_history;
+	}
+
+	if (fclose(histfile) == EOF)
+		jot_error(N_("Error reading %s: %s"), histname, strerror(errno));
 
 	free(histname);
+	free(line);
+
+	/* Reading in the lists has marked them as changed; undo this side effect. */
+	history_changed = FALSE;
 }
 
 /* Write the lines of a history list, starting at head, from oldest to newest,
  * to the given file.  Return TRUE if writing succeeded, and FALSE otherwise. */
-bool write_list(const filestruct *head, FILE *hisfile)
+bool write_list(const linestruct *head, FILE *histfile)
 {
-	const filestruct *item;
+	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);
+		recode_LF_to_NUL(item->data);
 
-		if (fwrite(item->data, sizeof(char), length, hisfile) < length)
+		if (fwrite(item->data, sizeof(char), length, histfile) < length)
 			return FALSE;
-		if (putc('\n', hisfile) == EOF)
+		if (putc('\n', histfile) == EOF)
 			return FALSE;
 	}
 
 	return TRUE;
 }
 
-/* Save the histories for Search and Replace and Execute Command. */
+/* Save the histories for Search, Replace With, and Execute Command. */
 void save_history(void)
 {
 	char *histname;
-	FILE *hisfile;
+	FILE *histfile;
 
 	/* If the histories are unchanged, don't bother saving them. */
 	if (!history_changed)
 		return;
 
 	histname = concatenate(statedir, SEARCH_HISTORY);
-	hisfile = fopen(histname, "wb");
+	histfile = 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);
+	if (histfile == NULL) {
+		jot_error(N_("Error writing %s: %s\n"), histname, strerror(errno));
+		free(histname);
+		return;
 	}
 
+	/* Don't allow others to read or write the history file. */
+	chmod(histname, S_IRUSR | S_IWUSR);
+
+	if (!write_list(searchtop, histfile) || !write_list(replacetop, histfile) ||
+											!write_list(executetop, histfile))
+		jot_error(N_("Error writing %s: %s\n"), histname, strerror(errno));
+
+	if (fclose(histfile) == EOF)
+		jot_error(N_("Error writing %s: %s\n"), histname, strerror(errno));
+
 	free(histname);
 }
 
 /* Load the recorded cursor positions for files that were edited. */
 void load_poshistory(void)
 {
-	FILE *hisfile = fopen(poshistname, "rb");
+	FILE *histfile = fopen(poshistname, "rb");
 
-	if (hisfile == NULL) {
-		if (errno != ENOENT) {
-			/* When reading failed, don't save history when we quit. */
-			UNSET(POS_HISTORY);
-			history_error(N_("Error reading %s: %s"), poshistname, strerror(errno));
-		}
-	} else {
-		char *line = NULL, *lineptr, *xptr;
-		size_t buf_len = 0;
-		ssize_t read, count = 0;
-		poshiststruct *record_ptr = NULL, *newrecord;
-
-		/* Read and parse each line, and store the extracted data. */
-		while ((read = getline(&line, &buf_len, hisfile)) > 5) {
-			/* Decode nulls as embedded newlines. */
-			unsunder(line, read);
-
-			/* Find where the x index and line number are in the line. */
-			xptr = revstrstr(line, " ", line + read - 3);
-			if (xptr == NULL)
-				continue;
-			lineptr = revstrstr(line, " ", xptr - 2);
-			if (lineptr == NULL)
-				continue;
-
-			/* Now separate the three elements of the line. */
-			*(xptr++) = '\0';
-			*(lineptr++) = '\0';
-
-			/* Create a new position record. */
-			newrecord = (poshiststruct *)nmalloc(sizeof(poshiststruct));
-			newrecord->filename = mallocstrcpy(NULL, line);
-			newrecord->lineno = atoi(lineptr);
-			newrecord->xno = atoi(xptr);
-			newrecord->next = NULL;
-
-			/* Add the record to the list. */
-			if (position_history == NULL)
-				position_history = newrecord;
-			else
-				record_ptr->next = newrecord;
-
-			record_ptr = newrecord;
-
-			/* Impose a limit, so the file will not grow indefinitely. */
-			if (++count > 200) {
-				poshiststruct *drop_record = position_history;
-
-				position_history = position_history->next;
-
-				free(drop_record->filename);
-				free(drop_record);
-			}
-		}
-		fclose(hisfile);
-		free(line);
-
-		stat(poshistname, &stat_of_positions_file);
+	/* If reading an existing file failed, don't save history when we quit. */
+	if (histfile == NULL && errno != ENOENT) {
+		jot_error(N_("Error reading %s: %s"), poshistname, strerror(errno));
+		UNSET(POSITIONLOG);
 	}
+
+	if (histfile == NULL)
+		return;
+
+	char *line = NULL, *lineptr, *xptr;
+	size_t buf_len = 0;
+	ssize_t read, count = 0;
+	struct stat fileinfo;
+	poshiststruct *record_ptr = NULL, *newrecord;
+
+	/* Read and parse each line, and store the extracted data. */
+	while ((read = getline(&line, &buf_len, histfile)) > 5) {
+		/* Decode NULs as embedded newlines. */
+		recode_NUL_to_LF(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 = copy_of(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);
+		}
+	}
+
+	if (fclose(histfile) == EOF)
+		jot_error(N_("Error reading %s: %s"), poshistname, strerror(errno));
+
+	free(line);
+
+	if (stat(poshistname, &fileinfo) == 0)
+		latest_timestamp = fileinfo.st_mtime;
 }
 
 /* Save the recorded cursor positions for files that were edited. */
 void save_poshistory(void)
 {
 	poshiststruct *posptr;
-	FILE *hisfile = fopen(poshistname, "wb");
+	struct stat fileinfo;
+	FILE *histfile = 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);
+	if (histfile == NULL) {
+		jot_error(N_("Error writing %s: %s\n"), poshistname, strerror(errno));
+		return;
 	}
+
+	/* 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 NULs. */
+		recode_LF_to_NUL(path_and_place);
+		/* Restore the terminating newline. */
+		path_and_place[length - 1] = '\n';
+
+		if (fwrite(path_and_place, sizeof(char), length, histfile) < length)
+			jot_error(N_("Error writing %s: %s\n"), poshistname, strerror(errno));
+
+		free(path_and_place);
+	}
+
+	if (fclose(histfile) == EOF)
+		jot_error(N_("Error writing %s: %s\n"), poshistname, strerror(errno));
+
+	if (stat(poshistname, &fileinfo) == 0)
+		latest_timestamp = fileinfo.st_mtime;
 }
 
 /* Reload the position history file if it has been modified since last load. */
 void reload_positions_if_needed(void)
 {
-	struct stat newstat;
+	struct stat fileinfo;
 
-	stat(poshistname, &newstat);
+	if (stat(poshistname, &fileinfo) == 0 && fileinfo.st_mtime != latest_timestamp) {
+		poshiststruct *item, *nextone;
 
-	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);
+		for (item = position_history; item != NULL; item = nextone) {
+			nextone = item->next;
+			free(item->filename);
+			free(item);
 		}
+
 		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)
+/* Update the recorded last file positions with the current position in the
+ * current buffer.  If no existing entry is found, add a new one at the end. */
+void update_poshistory(void)
 {
 	poshiststruct *posptr, *theone, *posprev = NULL;
-	char *fullpath = get_full_path(filename);
+	char *fullpath = get_full_path(openfile->filename);
 
-	if (fullpath == NULL || fullpath[strlen(fullpath) - 1] == '/' || inhelp) {
+	if (fullpath == NULL || openfile->filename[0] == '\0') {
 		free(fullpath);
 		return;
 	}
@@ -543,7 +537,7 @@ void update_poshistory(char *filename, ssize_t lineno, ssize_t xpos)
 	}
 
 	/* Don't record files that have the default cursor position. */
-	if (lineno == 1 && xpos == 1) {
+	if (openfile->current->lineno == 1 && openfile->current_x == 0) {
 		if (posptr != NULL) {
 			if (posprev == NULL)
 				position_history = posptr->next;
@@ -563,7 +557,7 @@ void update_poshistory(char *filename, ssize_t lineno, ssize_t xpos)
 	 * not at the end, move the matching one to the end. */
 	if (theone == NULL) {
 		theone = (poshiststruct *)nmalloc(sizeof(poshiststruct));
-		theone->filename = mallocstrcpy(NULL, fullpath);
+		theone->filename = copy_of(fullpath);
 		if (position_history == NULL)
 			position_history = theone;
 		else
@@ -579,8 +573,8 @@ void update_poshistory(char *filename, ssize_t lineno, ssize_t xpos)
 	}
 
 	/* Store the last cursor position. */
-	theone->lineno = lineno;
-	theone->xno = xpos;
+	theone->lineno = openfile->current->lineno;
+	theone->xno = xplustabs() + 1;
 	theone->next = NULL;
 
 	free(fullpath);
@@ -593,7 +587,7 @@ void update_poshistory(char *filename, ssize_t lineno, ssize_t xpos)
  * set line and column to the retrieved values. */
 bool has_old_position(const char *file, ssize_t *line, ssize_t *column)
 {
-	poshiststruct *posptr = position_history;
+	poshiststruct *posptr;
 	char *fullpath = get_full_path(file);
 
 	if (fullpath == NULL)
@@ -601,6 +595,7 @@ bool has_old_position(const char *file, ssize_t *line, ssize_t *column)
 
 	reload_positions_if_needed();
 
+	posptr = position_history;
 	while (posptr != NULL && strcmp(posptr->filename, fullpath) != 0)
 		posptr = posptr->next;
 

src/move.c

@@ -1,8 +1,8 @@
 /**************************************************************************
  *   move.c  --  This file is part of GNU nano.                           *
  *                                                                        *
- *   Copyright (C) 1999-2011, 2013-2018 Free Software Foundation, Inc.    *
- *   Copyright (C) 2014-2017 Benno Schulenberg                            *
+ *   Copyright (C) 1999-2011, 2013-2020 Free Software Foundation, Inc.    *
+ *   Copyright (C) 2014-2018 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    *
@@ -19,14 +19,14 @@
  *                                                                        *
  **************************************************************************/
 
-#include "proto.h"
+#include "prototypes.h"
 
 #include <string.h>
 
 /* Move to the first line of the file. */
 void to_first_line(void)
 {
-	openfile->current = openfile->fileage;
+	openfile->current = openfile->filetop;
 	openfile->current_x = 0;
 	openfile->placewewant = 0;
 
@@ -37,7 +37,7 @@ void to_first_line(void)
 void to_last_line(void)
 {
 	openfile->current = openfile->filebot;
-	openfile->current_x = strlen(openfile->filebot->data);
+	openfile->current_x = (inhelp) ? 0 : strlen(openfile->filebot->data);
 	openfile->placewewant = xplustabs();
 
 	/* Set the last line of the screen as the target for the cursor. */
@@ -68,14 +68,14 @@ void get_edge_and_target(size_t *leftedge, size_t *target_column)
  * chunk that starts at the given leftedge.  If the target column has landed
  * on a tab, prevent the cursor from falling back a row when moving forward,
  * or from skipping a row when moving backward, by incrementing the index. */
-size_t proper_x(filestruct *line, size_t *leftedge, bool forward,
+size_t proper_x(linestruct *line, size_t *leftedge, bool forward,
 				size_t column, bool *shifted)
 {
 	size_t index = actual_x(line->data, column);
 
 #ifndef NANO_TINY
 	if (ISSET(SOFTWRAP) && line->data[index] == '\t' &&
-				((forward && strnlenpt(line->data, index) < *leftedge) ||
+				((forward && wideness(line->data, index) < *leftedge) ||
 				(!forward && column / tabsize == (*leftedge - 1) / tabsize &&
 				column / tabsize < (*leftedge + editwincols - 1) / tabsize))) {
 		index++;
@@ -85,7 +85,7 @@ size_t proper_x(filestruct *line, size_t *leftedge, bool forward,
 	}
 
 	if (ISSET(SOFTWRAP))
-		*leftedge = leftedge_for(strnlenpt(line->data, index), line);
+		*leftedge = leftedge_for(wideness(line->data, index), line);
 #endif
 
 	return index;
@@ -109,7 +109,7 @@ void set_proper_index_and_pww(size_t *leftedge, size_t target, bool forward)
 	openfile->placewewant = *leftedge + target;
 }
 
-/* Move up nearly one screenful. */
+/* Move up almost one screenful. */
 void do_page_up(void)
 {
 	int mustmove = (editwinrows < 3) ? 1 : editwinrows - 2;
@@ -117,7 +117,7 @@ void do_page_up(void)
 
 	/* If we're not in smooth scrolling mode, put the cursor at the
 	 * beginning of the top line of the edit window, as Pico does. */
-	if (!ISSET(SMOOTH_SCROLL)) {
+	if (ISSET(JUMPY_SCROLLING)) {
 		openfile->current = openfile->edittop;
 		leftedge = openfile->firstcolumn;
 		openfile->current_y = 0;
@@ -139,7 +139,7 @@ void do_page_up(void)
 	refresh_needed = TRUE;
 }
 
-/* Move down nearly one screenful. */
+/* Move down almost one screenful. */
 void do_page_down(void)
 {
 	int mustmove = (editwinrows < 3) ? 1 : editwinrows - 2;
@@ -147,7 +147,7 @@ void do_page_down(void)
 
 	/* If we're not in smooth scrolling mode, put the cursor at the
 	 * beginning of the top line of the edit window, as Pico does. */
-	if (!ISSET(SMOOTH_SCROLL)) {
+	if (ISSET(JUMPY_SCROLLING)) {
 		openfile->current = openfile->edittop;
 		leftedge = openfile->firstcolumn;
 		openfile->current_y = 0;
@@ -170,71 +170,61 @@ void do_page_down(void)
 }
 
 #ifdef ENABLE_JUSTIFY
-/* Move to the beginning of the last beginning-of-paragraph line before the
- * current line.  If update_screen is TRUE, update the screen afterwards. */
-void do_para_begin(bool update_screen)
+/* Move to the first beginning of a paragraph before the current line. */
+void do_para_begin(linestruct **line)
 {
-	filestruct *was_current = openfile->current;
+	if ((*line)->prev != NULL)
+		*line = (*line)->prev;
 
-	if (openfile->current != openfile->fileage)
-		openfile->current = openfile->current->prev;
-
-	while (!begpar(openfile->current))
-		openfile->current = openfile->current->prev;
-
-	openfile->current_x = 0;
-
-	if (update_screen)
-		edit_redraw(was_current, CENTERING);
+	while (!begpar(*line, 0))
+		*line = (*line)->prev;
 }
 
-/* Move down to the beginning of the last line of the current paragraph.
- * Then move down one line farther if there is such a line, or to the
- * end of the current line if not.  If update_screen is TRUE, update the
- * screen afterwards.  A line is the last line of a paragraph if it is
- * in a paragraph, and the next line either is the beginning line of a
- * paragraph or isn't in a paragraph. */
-void do_para_end(bool update_screen)
+/* Move down to the last line of the first found paragraph. */
+void do_para_end(linestruct **line)
 {
-	filestruct *was_current = openfile->current;
+	while ((*line)->next != NULL && !inpar(*line))
+		*line = (*line)->next;
 
-	while (openfile->current != openfile->filebot &&
-				!inpar(openfile->current))
-		openfile->current = openfile->current->next;
+	while ((*line)->next != NULL && inpar((*line)->next) &&
+									!begpar((*line)->next, 0))
+		*line = (*line)->next;
+}
 
-	while (openfile->current != openfile->filebot &&
-				inpar(openfile->current->next) &&
-				!begpar(openfile->current->next)) {
-		openfile->current = openfile->current->next;
-	}
+/* Move up to first start of a paragraph before the current line. */
+void to_para_begin(void)
+{
+	linestruct *was_current = openfile->current;
 
-	if (openfile->current != openfile->filebot) {
+	do_para_begin(&openfile->current);
+	openfile->current_x = 0;
+
+	edit_redraw(was_current, CENTERING);
+}
+
+/* Move down to just after the first found end of a paragraph. */
+void to_para_end(void)
+{
+	linestruct *was_current = openfile->current;
+
+	do_para_end(&openfile->current);
+
+	/* Step beyond the last line of the paragraph, if possible;
+	 * otherwise, move to the end of the line. */
+	if (openfile->current->next != NULL) {
 		openfile->current = openfile->current->next;
 		openfile->current_x = 0;
 	} else
 		openfile->current_x = strlen(openfile->current->data);
 
-	if (update_screen)
-		edit_redraw(was_current, CENTERING);
-}
-
-/* Move up to first start of a paragraph before the current line. */
-void do_para_begin_void(void)
-{
-	do_para_begin(TRUE);
-}
-
-/* Move down to just after the first end of a paragraph. */
-void do_para_end_void(void)
-{
-	do_para_end(TRUE);
+	edit_redraw(was_current, CENTERING);
 }
 #endif /* ENABLE_JUSTIFY */
 
 /* Move to the preceding block of text. */
-void do_prev_block(void)
+void to_prev_block(void)
 {
-	filestruct *was_current = openfile->current;
+	linestruct *was_current = openfile->current;
 	bool is_text = FALSE, seen_text = FALSE;
 
 	/* Skip backward until first blank line after some nonblank line(s). */
@@ -244,8 +234,8 @@ void do_prev_block(void)
 		seen_text = seen_text || is_text;
 	}
 
-	/* Step forward one line again if this one is blank. */
-	if (openfile->current->next != NULL &&
+	/* Step forward one line again if we passed text but this line is blank. */
+	if (seen_text && openfile->current->next != NULL &&
 				white_string(openfile->current->data))
 		openfile->current = openfile->current->next;
 
@@ -254,9 +244,9 @@ void do_prev_block(void)
 }
 
 /* Move to the next block of text. */
-void do_next_block(void)
+void to_next_block(void)
 {
-	filestruct *was_current = openfile->current;
+	linestruct *was_current = openfile->current;
 	bool is_white = white_string(openfile->current->data);
 	bool seen_white = is_white;
 
@@ -272,10 +262,9 @@ void do_next_block(void)
 }
 
 /* Move to the previous word.  If allow_punct is TRUE, treat punctuation
- * as part of a word.  When requested, update the screen afterwards. */
-void do_prev_word(bool allow_punct, bool update_screen)
+ * as part of a word. */
+void do_prev_word(bool allow_punct)
 {
-	filestruct *was_current = openfile->current;
 	bool seen_a_word = FALSE, step_forward = FALSE;
 
 	/* Move backward until we pass over the start of a word. */
@@ -289,10 +278,10 @@ void do_prev_word(bool allow_punct, bool update_screen)
 		}
 
 		/* Step back one character. */
-		openfile->current_x = move_mbleft(openfile->current->data,
+		openfile->current_x = step_left(openfile->current->data,
 												openfile->current_x);
 
-		if (is_word_mbchar(openfile->current->data + openfile->current_x,
+		if (is_word_char(openfile->current->data + openfile->current_x,
 								allow_punct)) {
 			seen_a_word = TRUE;
 			/* If at the head of a line now, this surely is a word start. */
@@ -307,22 +296,21 @@ void do_prev_word(bool allow_punct, bool update_screen)
 
 	if (step_forward)
 		/* Move one character forward again to sit on the start of the word. */
-		openfile->current_x = move_mbright(openfile->current->data,
+		openfile->current_x = step_right(openfile->current->data,
 												openfile->current_x);
-
-	if (update_screen)
-		edit_redraw(was_current, FLOWING);
 }
 
-/* Move to the next word.  If allow_punct is TRUE, treat punctuation
- * as part of a word.   When requested, update the screen afterwards.
- * Return TRUE if we started on a word, and FALSE otherwise. */
-bool do_next_word(bool allow_punct, bool update_screen)
+/* Move to the next word.  If after_ends is TRUE, stop at the ends of words
+ * instead of their beginnings.  If allow_punct is TRUE, treat punctuation as
+ * part of a word.  Return TRUE if we started on a word, and FALSE otherwise. */
+bool do_next_word(bool after_ends, bool allow_punct)
 {
-	filestruct *was_current = openfile->current;
-	bool started_on_word = is_word_mbchar(openfile->current->data +
+	bool started_on_word = is_word_char(openfile->current->data +
 								openfile->current_x, allow_punct);
 	bool seen_space = !started_on_word;
+#ifndef NANO_TINY
+	bool seen_word = started_on_word;
+#endif
 
 	/* Move forward until we reach the start of a word. */
 	while (TRUE) {
@@ -336,38 +324,56 @@ bool do_next_word(bool allow_punct, bool update_screen)
 			seen_space = TRUE;
 		} else {
 			/* Step forward one character. */
-			openfile->current_x = move_mbright(openfile->current->data,
+			openfile->current_x = step_right(openfile->current->data,
 												openfile->current_x);
 		}
 
-		/* If this is not a word character, then it's a separator; else
-		 * if we've already seen a separator, then it's a word start. */
-		if (!is_word_mbchar(openfile->current->data + openfile->current_x,
+#ifndef NANO_TINY
+		if (after_ends) {
+			/* If this is a word character, continue; else it's a separator,
+			 * and if we've already seen a word, then it's a word end. */
+			if (is_word_char(openfile->current->data + openfile->current_x,
 								allow_punct))
-			seen_space = TRUE;
-		else if (seen_space)
-			break;
+				seen_word = TRUE;
+			else if (seen_word)
+				break;
+		} else
+#endif
+		{
+			/* If this is not a word character, then it's a separator; else
+			 * if we've already seen a separator, then it's a word start. */
+			if (!is_word_char(openfile->current->data + openfile->current_x,
+								allow_punct))
+				seen_space = TRUE;
+			else if (seen_space)
+				break;
+		}
 	}
 
-	if (update_screen)
-		edit_redraw(was_current, FLOWING);
-
-	/* Return whether we started on a word. */
 	return started_on_word;
 }
 
 /* Move to the previous word in the file, treating punctuation as part of a
  * word if the WORD_BOUNDS flag is set, and update the screen afterwards. */
-void do_prev_word_void(void)
+void to_prev_word(void)
 {
-	do_prev_word(ISSET(WORD_BOUNDS), TRUE);
+	linestruct *was_current = openfile->current;
+
+	do_prev_word(ISSET(WORD_BOUNDS));
+
+	edit_redraw(was_current, FLOWING);
 }
 
-/* Move to the next word in the file, treating punctuation as part of a word
- * if the WORD_BOUNDS flag is set, and update the screen afterwards. */
-void do_next_word_void(void)
+/* Move to the next word in the file.  If the AFTER_ENDS flag is set, stop
+ * at word ends instead of beginnings.  If the WORD_BOUNDS flag is set, treat
+ * punctuation as part of a word.  Update the screen afterwards. */
+void to_next_word(void)
 {
-	do_next_word(ISSET(WORD_BOUNDS), TRUE);
+	linestruct *was_current = openfile->current;
+
+	do_next_word(ISSET(AFTER_ENDS), ISSET(WORD_BOUNDS));
+
+	edit_redraw(was_current, FLOWING);
 }
 
 /* Move to the beginning of the current line (or softwrapped chunk).
@@ -375,7 +381,7 @@ void do_next_word_void(void)
  * of the full line when already at the start of a chunk. */
 void do_home(void)
 {
-	filestruct *was_current = openfile->current;
+	linestruct *was_current = openfile->current;
 	size_t was_column = xplustabs();
 	bool moved_off_chunk = TRUE;
 #ifndef NANO_TINY
@@ -431,11 +437,11 @@ void do_home(void)
 }
 
 /* Move to the end of the current line (or softwrapped chunk).
- * When softwrapping and alredy at the end of a chunk, go to the
+ * When softwrapping and already at the end of a chunk, go to the
  * end of the full line. */
 void do_end(void)
 {
-	filestruct *was_current = openfile->current;
+	linestruct *was_current = openfile->current;
 	size_t was_column = xplustabs();
 	size_t line_len = strlen(openfile->current->data);
 	bool moved_off_chunk = TRUE;
@@ -484,7 +490,7 @@ void do_end(void)
 /* Move the cursor to the preceding line or chunk. */
 void do_up(void)
 {
-	filestruct *was_current = openfile->current;
+	linestruct *was_current = openfile->current;
 	size_t leftedge, target_column;
 
 	get_edge_and_target(&leftedge, &target_column);
@@ -495,7 +501,10 @@ void do_up(void)
 
 	set_proper_index_and_pww(&leftedge, target_column, FALSE);
 
-	edit_redraw(was_current, FLOWING);
+	if (openfile->current_y == 0 && !ISSET(JUMPY_SCROLLING))
+		edit_scroll(BACKWARD);
+	else
+		edit_redraw(was_current, FLOWING);
 
 	/* <Up> should not change placewewant, so restore it. */
 	openfile->placewewant = leftedge + target_column;
@@ -504,7 +513,7 @@ void do_up(void)
 /* Move the cursor to next line or chunk. */
 void do_down(void)
 {
-	filestruct *was_current = openfile->current;
+	linestruct *was_current = openfile->current;
 	size_t leftedge, target_column;
 
 	get_edge_and_target(&leftedge, &target_column);
@@ -515,14 +524,17 @@ void do_down(void)
 
 	set_proper_index_and_pww(&leftedge, target_column, TRUE);
 
-	edit_redraw(was_current, FLOWING);
+	if (openfile->current_y == editwinrows - 1 && !ISSET(JUMPY_SCROLLING))
+		edit_scroll(FORWARD);
+	else
+		edit_redraw(was_current, FLOWING);
 
 	/* <Down> should not change placewewant, so restore it. */
 	openfile->placewewant = leftedge + target_column;
 }
 
-#ifdef ENABLE_HELP
-/* Scroll up one line or chunk without scrolling the cursor. */
+#if !defined(NANO_TINY) || defined(ENABLE_HELP)
+/* Scroll up one line or chunk without moving the cursor textwise. */
 void do_scroll_up(void)
 {
 	/* When the top of the file is onscreen, we can't scroll. */
@@ -532,34 +544,43 @@ void do_scroll_up(void)
 	if (openfile->current_y == editwinrows - 1)
 		do_up();
 
-	edit_scroll(BACKWARD);
+	if (editwinrows > 1)
+		edit_scroll(BACKWARD);
 }
 
-/* Scroll down one line or chunk without scrolling the cursor. */
+/* Scroll down one line or chunk without moving the cursor textwise. */
 void do_scroll_down(void)
 {
 	if (openfile->current_y == 0)
 		do_down();
 
-	if (openfile->edittop->next != NULL
+	if (editwinrows > 1 && (openfile->edittop->next != NULL
 #ifndef NANO_TINY
-				|| chunk_for(openfile->firstcolumn, openfile->edittop) <
-					number_of_chunks_in(openfile->edittop)
+				|| (ISSET(SOFTWRAP) && (extra_chunks_in(openfile->edittop) >
+					chunk_for(openfile->firstcolumn, openfile->edittop)))
 #endif
-										)
+										))
 		edit_scroll(FORWARD);
 }
-#endif
+
+/* Scroll the line with the cursor to the center of the screen. */
+void do_center(void)
+{
+	adjust_viewport(CENTERING);
+	draw_all_subwindows();
+	full_refresh();
+}
+#endif /* !NANO_TINY || ENABLE_HELP */
 
 /* Move left one character. */
 void do_left(void)
 {
-	filestruct *was_current = openfile->current;
+	linestruct *was_current = openfile->current;
 
 	if (openfile->current_x > 0)
-		openfile->current_x = move_mbleft(openfile->current->data,
+		openfile->current_x = step_left(openfile->current->data,
 												openfile->current_x);
-	else if (openfile->current != openfile->fileage) {
+	else if (openfile->current != openfile->filetop) {
 		openfile->current = openfile->current->prev;
 		openfile->current_x = strlen(openfile->current->data);
 	}
@@ -570,10 +591,10 @@ void do_left(void)
 /* Move right one character. */
 void do_right(void)
 {
-	filestruct *was_current = openfile->current;
+	linestruct *was_current = openfile->current;
 
 	if (openfile->current->data[openfile->current_x] != '\0')
-		openfile->current_x = move_mbright(openfile->current->data,
+		openfile->current_x = step_right(openfile->current->data,
 												openfile->current_x);
 	else if (openfile->current != openfile->filebot) {
 		openfile->current = openfile->current->next;

src/prototypes.h

@@ -1,7 +1,7 @@
 /**************************************************************************
- *   proto.h  --  This file is part of GNU nano.                          *
+ *   prototypes.h  --  This file is part of GNU nano.                     *
  *                                                                        *
- *   Copyright (C) 1999-2011, 2013-2018 Free Software Foundation, Inc.    *
+ *   Copyright (C) 1999-2011, 2013-2020 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    *
@@ -18,10 +18,7 @@
  *                                                                        *
  **************************************************************************/
 
-#ifndef PROTO_H
-#define PROTO_H 1
-
-#include "nano.h"
+#include "definitions.h"
 
 /* All external variables.  See global.c for their descriptions. */
 
@@ -29,108 +26,108 @@
 extern volatile sig_atomic_t the_window_resized;
 #endif
 
-#ifdef __linux__
 extern bool on_a_vt;
-#endif
+extern bool shifted_metas;
 
 extern bool meta_key;
 extern bool shift_held;
+extern bool mute_modifiers;
+extern bool bracketed_paste;
+
+extern bool we_are_running;
+extern bool more_than_one;
+
+extern bool ran_a_tool;
+
+extern bool inhelp;
+extern char *title;
 
 extern bool focusing;
 
 extern bool as_an_at;
 
-extern int margin;
-extern int editwincols;
-
-extern bool suppress_cursorpos;
+extern bool control_C_was_pressed;
 
 extern message_type lastmessage;
 
-extern filestruct *pletion_line;
-
-extern bool inhelp;
-extern char *title;
-
-extern bool more_than_one;
+extern linestruct *pletion_line;
 
 extern bool also_the_last;
 
-extern int didfind;
-
-extern int controlleft;
-extern int controlright;
-extern int controlup;
-extern int controldown;
-extern int controlhome;
-extern int controlend;
-#ifndef NANO_TINY
-extern int shiftcontrolleft;
-extern int shiftcontrolright;
-extern int shiftcontrolup;
-extern int shiftcontroldown;
-extern int shiftcontrolhome;
-extern int shiftcontrolend;
-extern int altleft;
-extern int altright;
-extern int altup;
-extern int altdown;
-extern int shiftaltleft;
-extern int shiftaltright;
-extern int shiftaltup;
-extern int shiftaltdown;
-#endif
-
-#ifdef ENABLED_WRAPORJUSTIFY
-extern ssize_t fill;
-extern ssize_t wrap_at;
-#endif
+extern char *answer;
 
 extern char *last_search;
+extern int didfind;
 
 extern char *present_path;
 
 extern unsigned flags[4];
+
+extern int controlleft, controlright;
+extern int controlup, controldown;
+extern int controlhome, controlend;
+#ifndef NANO_TINY
+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 altpageup, altpagedown;
+extern int altinsert, altdelete;
+extern int shiftaltleft, shiftaltright;
+extern int shiftaltup, shiftaltdown;
+#endif
+
+#ifdef ENABLED_WRAPORJUSTIFY
+extern ssize_t fill;
+extern size_t wrap_at;
+#endif
+
 extern WINDOW *topwin;
 extern WINDOW *edit;
 extern WINDOW *bottomwin;
 extern int editwinrows;
+extern int editwincols;
+extern int margin;
+extern int thebar;
+#ifndef NANO_TINY
+extern int *bardata;
+extern ssize_t stripe_column;
+#endif
+
+extern linestruct *cutbuffer;
+extern linestruct *cutbottom;
+extern bool keep_cutbuffer;
 
-extern filestruct *cutbuffer;
-extern filestruct *cutbottom;
-extern partition *filepart;
 extern openfilestruct *openfile;
-extern openfilestruct *firstfile;
+#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;
 #ifdef ENABLE_JUSTIFY
-extern const char *unjust_tag;
 extern char *punct;
 extern char *brackets;
 extern char *quotestr;
 extern regex_t quotereg;
-extern int quoterc;
-extern char *quoteerr;
 #endif
 
 extern char *word_chars;
 
-extern char *answer;
-
 extern ssize_t tabsize;
 
 #ifndef NANO_TINY
 extern char *backup_dir;
-extern const char *locking_prefix;
-extern const char *locking_suffix;
 #endif
 #ifdef ENABLE_OPERATINGDIR
 extern char *operating_dir;
@@ -149,22 +146,20 @@ extern bool have_palette;
 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;
 
-extern filestruct *search_history;
-extern filestruct *replace_history;
-extern filestruct *execute_history;
+extern linestruct *search_history;
+extern linestruct *replace_history;
+extern linestruct *execute_history;
 #ifdef ENABLE_HISTORIES
-extern filestruct *searchtop;
-extern filestruct *searchbot;
-extern filestruct *replacetop;
-extern filestruct *replacebot;
-extern filestruct *executetop;
-extern filestruct *executebot;
-extern poshiststruct *position_history;
+extern linestruct *searchtop;
+extern linestruct *searchbot;
+extern linestruct *replacetop;
+extern linestruct *replacebot;
+extern linestruct *executetop;
+extern linestruct *executebot;
 #endif
 
 extern regex_t search_regexp;
@@ -178,21 +173,27 @@ extern int interface_color_pair[NUMBER_OF_ELEMENTS];
 
 extern char *homedir;
 extern char *statedir;
-extern char *rcfile_with_errors;
+#if defined(ENABLE_NANORC) || defined(ENABLE_HISTORIES)
+extern char *startup_problem;
+#endif
+#ifdef ENABLE_NANORC
+extern char *custom_nanorc;
+#endif
+
+extern bool spotlighted;
+extern size_t light_from_col;
+extern size_t light_to_col;
 
 typedef void (*functionptrtype)(void);
 
 /* Most functions in browser.c. */
 #ifdef ENABLE_BROWSER
-char *do_browse_from(const char *inpath);
+char *browse_in(const char *inpath);
 void read_the_list(const char *path, DIR *dir);
-functionptrtype parse_browser_input(int *kbinput);
 void browser_refresh(void);
 void browser_select_dirname(const char *needle);
-void do_filesearch(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
 
@@ -201,168 +202,157 @@ char *strip_last_component(const char *path);
 void utf8_init(void);
 bool using_utf8(void);
 #endif
-char *addstrings(char* str1, size_t len1, char* str2, size_t len2);
-bool is_byte(int c);
-bool is_alpha_mbchar(const char *c);
-bool is_blank_mbchar(const char *c);
-bool is_ascii_cntrl_char(int c);
-bool is_cntrl_mbchar(const char *c);
-bool is_word_mbchar(const char *c, bool allow_punct);
+bool is_alpha_char(const char *c);
+bool is_blank_char(const char *c);
+bool is_cntrl_char(const char *c);
+bool is_word_char(const char *c, bool allow_punct);
 char control_mbrep(const char *c, bool isdata);
-int length_of_char(const char *c, int *width);
+#ifdef ENABLE_UTF8
 int mbwidth(const char *c);
-char *make_mbchar(long chr, int *chr_mb_len);
-int parse_mbchar(const char *buf, char *chr, size_t *col);
-size_t move_mbleft(const char *buf, size_t pos);
-size_t move_mbright(const char *buf, size_t pos);
+char *make_mbchar(long code, int *length);
+#endif
+int char_length(const char *pointer);
+size_t mbstrlen(const char *pointer);
+int collect_char(const char *string, char *thechar);
+int advance_over(const char *string, size_t *column);
+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);
-size_t mbstrlen(const char *s);
-size_t mbstrnlen(const char *s, size_t maxlen);
+char *revstrstr(const char *haystack, const char *needle, const char *pointer);
+char *mbrevstrcasestr(const char *haystack, const char *needle, const char *pointer);
 #if !defined(NANO_TINY) || defined(ENABLE_JUSTIFY)
-char *mbstrchr(const char *s, const char *c);
+char *mbstrchr(const char *string, const char *chr);
 #endif
 #ifndef NANO_TINY
-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);
+char *mbstrpbrk(const char *string, const char *accept);
+char *mbrevstrpbrk(const char *head, const char *accept, const char *pointer);
 #endif
 #if defined(ENABLE_NANORC) && (!defined(NANO_TINY) || defined(ENABLE_JUSTIFY))
-bool has_blank_mbchars(const char *s);
+bool has_blank_char(const char *string);
 #endif
+bool white_string(const char *string);
 #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. */
 #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 set_interface_colorpairs(void);
+void prepare_palette(void);
+void find_and_prime_applicable_syntax(void);
+void set_up_multicache(linestruct *line);
+void check_the_multis(linestruct *line);
 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 cut_marked(bool *right_side_up);
+void chop_previous_word(void);
+void chop_next_word(void);
 #endif
-void do_cut_text(bool copy_text, bool cut_till_eof);
-void do_cut_text_void(void);
+void extract_segment(linestruct *top, size_t top_x, linestruct *bot, size_t bot_x);
+void ingraft_buffer(linestruct *topline);
+void copy_from_buffer(linestruct *somebuffer);
 #ifndef NANO_TINY
-void do_copy_text(void);
-void do_cut_till_eof(void);
+void cut_marked_region(void);
 #endif
-void do_uncut_text(void);
+void do_snip(bool marked, bool until_eof, bool append);
+void cut_text(void);
+#ifndef NANO_TINY
+void cut_till_eof(void);
+void zap_text(void);
+void copy_marked_region(void);
+void copy_text(void);
+#endif
+void paste_text(void);
 
 /* Most functions in files.c. */
-void initialize_buffer_text(void);
-void set_modified(void);
-bool open_buffer(const char *filename, bool new_buffer);
-#ifdef ENABLE_SPELLER
-void replace_buffer(const char *filename);
+void make_new_buffer(void);
 #ifndef NANO_TINY
-void replace_marked_buffer(const char *filename, filestruct *top, size_t top_x,
-		filestruct *bot, size_t bot_x);
-#endif
+bool delete_lockfile(const char *lockfilename);
 #endif
+bool open_buffer(const char *filename, bool new_one);
+void set_modified(void);
 void prepare_for_display(void);
 #ifdef ENABLE_MULTIBUFFER
+void mention_name_and_linecount(void);
 void switch_to_prev_buffer(void);
 void switch_to_next_buffer(void);
-bool close_buffer(void);
+void close_buffer(void);
 #endif
 void read_file(FILE *f, int fd, const char *filename, bool undoable);
-int open_file(const char *filename, bool newfie, bool quiet, FILE **f);
+int open_file(const char *filename, bool new_one, FILE **f);
 char *get_next_filename(const char *name, const char *suffix);
 void do_insertfile_void(void);
+#ifndef NANO_TINY
+void do_execute(void);
+#endif
 char *get_full_path(const char *origpath);
-char *safe_tempfile(FILE **f);
+char *safe_tempfile(FILE **stream);
 #ifdef ENABLE_OPERATINGDIR
 void init_operating_dir(void);
 bool outside_of_confinement(const char *currpath, bool allow_tabcomp);
 #endif
 #ifndef NANO_TINY
 void init_backup_dir(void);
-int delete_lockfile(const char *lockfilename);
-int write_lockfile(const char *lockfilename, const char *origfilename, bool modified);
 #endif
 int copy_file(FILE *inn, FILE *out, bool close_out);
-bool write_file(const char *name, FILE *f_open, bool tmp,
+bool write_file(const char *name, FILE *thefile, bool tmp,
 		kind_of_writing_type method, bool fullbuffer);
 #ifndef NANO_TINY
-bool write_marked_file(const char *name, FILE *f_open, bool tmp,
+bool write_marked_file(const char *name, FILE *stream, bool tmp,
 		kind_of_writing_type method);
 #endif
 int do_writeout(bool exiting, bool withprompt);
 void do_writeout_void(void);
 void do_savefile(void);
-char *real_dir_from_tilde(const char *buf);
+char *real_dir_from_tilde(const char *path);
 #if defined(ENABLE_TABCOMP) || defined(ENABLE_BROWSER)
 int diralphasort(const void *va, const void *vb);
 #endif
 #ifdef ENABLE_TABCOMP
-char *input_tab(char *buf, bool allow_files, size_t *place,
-		bool *lastwastab, void (*refresh_func)(void), bool *listed);
+char *input_tab(char *buf, size_t *place, 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));
-int the_code_for(void (*func)(void), int defaultval);
-functionptrtype func_from_key(int *kbinput);
+const keystruct *first_sc_for(int menu, void (*func)(void));
+size_t shown_entries_for(int menu);
+const keystruct *get_shortcut(int *keycode);
+functionptrtype func_from_key(int *keycode);
+#if defined(ENABLE_BROWSER) || defined(ENABLE_HELP)
+functionptrtype interpret(int *keycode);
+#endif
 int keycode_from_string(const char *keystring);
-void assign_keyinfo(sc *s, const char *keystring, const int keycode);
-void print_sclist(void);
 void shortcut_init(void);
-#ifdef ENABLE_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);
-#endif
 
-/* All functions in help.c. */
+/* Some functions in help.c. */
 #ifdef ENABLE_HELP
-void wrap_the_help_text(bool redisplaying);
-void do_help(void);
-void help_init(void);
-functionptrtype parse_help_input(int *kbinput);
-size_t help_line_len(const char *ptr);
+void wrap_help_text_into_buffer(void);
 #endif
-void do_help_void(void);
+void do_help(void);
 
 /* Most functions in history.c. */
 #ifdef ENABLE_HISTORIES
 void history_init(void);
-void history_reset(const filestruct *h);
-void update_history(filestruct **h, const char *s);
-char *get_history_older(filestruct **h);
-char *get_history_newer(filestruct **h);
+void history_reset(const linestruct *list);
+void update_history(linestruct **item, const char *text);
+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(filestruct **h, char *s, size_t len);
+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);
+void update_poshistory(void);
 bool has_old_position(const char *file, ssize_t *line, ssize_t *column);
 #endif
 
@@ -372,183 +362,160 @@ void to_last_line(void);
 void do_page_up(void);
 void do_page_down(void);
 #ifdef ENABLE_JUSTIFY
-void do_para_begin(bool update_screen);
-void do_para_end(bool update_screen);
-void do_para_begin_void(void);
-void do_para_end_void(void);
+void do_para_begin(linestruct **line);
+void do_para_end(linestruct **line);
+void to_para_begin(void);
+void to_para_end(void);
 #endif
-void do_prev_block(void);
-void do_next_block(void);
-void do_prev_word(bool allow_punct, bool update_screen);
-bool do_next_word(bool allow_punct, bool update_screen);
-void do_prev_word_void(void);
-void do_next_word_void(void);
+void to_prev_block(void);
+void to_next_block(void);
+void do_prev_word(bool allow_punct);
+bool do_next_word(bool after_ends, bool allow_punct);
+void to_prev_word(void);
+void to_next_word(void);
 void do_home(void);
 void do_end(void);
 void do_up(void);
 void do_down(void);
-#ifdef ENABLE_HELP
+#if !defined(NANO_TINY) || defined(ENABLE_HELP)
 void do_scroll_up(void);
 void do_scroll_down(void);
+void do_center(void);
 #endif
 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 *line);
-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);
-#ifdef ENABLE_MULTIBUFFER
-void unlink_opennode(openfilestruct *fileptr);
-void delete_opennode(openfilestruct *fileptr);
-#endif
+linestruct *make_new_node(linestruct *prevnode);
+void splice_node(linestruct *afterthis, linestruct *newnode);
+void unlink_node(linestruct *line);
+void delete_node(linestruct *line);
+linestruct *copy_buffer(const linestruct *src);
+void free_lines(linestruct *src);
+void renumber_from(linestruct *line);
 void print_view_warning(void);
-void show_restricted_warning(void);
+bool in_restricted_mode(void);
 #ifndef ENABLE_HELP
 void say_there_is_no_help(void);
 #endif
 void finish(void);
-void die(const char *msg, ...);
-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 do_exit(void);
+void die(const char *msg, ...);
+void window_init(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) || defined(ENABLE_COLOR)
+void block_sigwinch(bool blockit);
+#endif
 #ifndef NANO_TINY
 RETSIGTYPE handle_sigwinch(int signal);
+void compute_the_extra_rows_per_line_from(linestruct *fromline);
 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);
+#ifdef ENABLE_LINENUMBERS
+void confirm_margin(void);
+#endif
 void unbound_key(int code);
-bool okay_for_view(const sc *shortcut);
-int do_input(bool allow_funcs);
-void do_output(char *output, size_t output_len, bool allow_cntrls);
+bool okay_for_view(const keystruct *shortcut);
+void inject(char *burst, size_t count);
 
 /* Most functions in prompt.c. */
-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);
-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);
-int do_prompt(bool allow_tabs, bool allow_files,
-		int menu, const char *curranswer, filestruct **history_list,
+size_t get_statusbar_page_start(size_t base, size_t column);
+void put_cursor_at_end_of_answer(void);
+void add_or_remove_pipe_symbol_from_answer(void);
+int do_prompt(int menu, const char *provided, linestruct **history_list,
 		void (*refresh_func)(void), const char *msg, ...);
 int do_yesno_prompt(bool all, const char *msg);
 
 /* Most functions in rcfile.c. */
+#if defined(ENABLE_NANORC) || defined(ENABLE_HISTORIES)
+void display_rcfile_errors(void);
+void jot_error(const char *msg, ...);
+#endif
 #ifdef ENABLE_NANORC
 #ifdef ENABLE_COLOR
-bool parse_color_names(char *combostr, short *fg, short *bg, bool *bright);
+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);
+bool regexp_init(const char *regexp);
+void tidy_up_after_search(void);
 int findnextstr(const char *needle, bool whole_word_only, int modus,
-		size_t *match_len, bool skipone, const filestruct *begin, size_t begin_x);
-void do_search(void);
+		size_t *match_len, bool skipone, const linestruct *begin, size_t begin_x);
 void do_search_forward(void);
 void do_search_backward(void);
-#ifndef NANO_TINY
 void do_findprevious(void);
 void do_findnext(void);
-#endif
-void do_research(void);
+void 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 ask_for_and_do_replacements(void);
 void goto_line_posx(ssize_t line, size_t pos_x);
-void do_gotolinecolumn(ssize_t line, ssize_t column, bool use_answer,
+void do_gotolinecolumn(ssize_t line, ssize_t column, bool retain_answer,
 		bool interactive);
 void do_gotolinecolumn_void(void);
 #ifndef NANO_TINY
 void do_find_bracket(void);
+void put_or_lift_anchor(void);
+void to_prev_anchor(void);
+void to_next_anchor(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(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);
 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, bool keep);
-void add_undo(undo_type action);
+void discard_until(const undostruct *thisitem);
+void add_undo(undo_type action, const char *message);
 void update_multiline_undo(ssize_t lineno, char *indentation);
 void update_undo(undo_type action);
 #endif /* !NANO_TINY */
 #ifdef ENABLE_WRAPPING
-void wrap_reset(void);
-bool do_wrap(filestruct *line);
+bool do_wrap(void);
 #endif
 #if defined(ENABLE_HELP) || defined(ENABLED_WRAPORJUSTIFY)
-ssize_t break_line(const char *line, ssize_t goal, bool snap_at_nl);
+ssize_t break_line(const char *textstart, ssize_t goal, bool snap_at_nl);
 #endif
-#if !defined(NANO_TINY) || defined(ENABLE_JUSTIFY)
+#if !defined(NANO_TINY) || defined(ENABLED_WRAPORJUSTIFY)
 size_t indent_length(const char *line);
 #endif
 #ifdef ENABLE_JUSTIFY
-void justify_format(filestruct *paragraph, size_t skip);
-bool begpar(const filestruct *const foo);
-bool inpar(const filestruct *const foo);
+size_t quote_length(const char *line);
+bool begpar(const linestruct *const line, int depth);
+bool inpar(const linestruct *const line);
 void do_justify(bool full_justify);
 void do_justify_void(void);
 void do_full_justify(void);
@@ -573,146 +540,130 @@ 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_num(const char *str, ssize_t *result);
 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);
+void recode_NUL_to_LF(char *string, size_t length);
+void recode_LF_to_NUL(char *string);
 #if !defined(ENABLE_TINY) || defined(ENABLE_TABCOMP) || defined(ENABLE_BROWSER)
 void free_chararray(char **array, size_t len);
 #endif
-const char *fixbounds(const char *r);
 #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);
 void *nmalloc(size_t howmuch);
 void *nrealloc(void *ptr, size_t howmuch);
-char *mallocstrncpy(char *dest, const char *src, size_t n);
+char *measured_copy(const char *string, size_t count);
 char *mallocstrcpy(char *dest, const char *src);
+char *copy_of(const char *string);
 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 *text, size_t column);
-size_t strnlenpt(const char *text, size_t maxlen);
-size_t strlenpt(const char *text);
+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_range(const filestruct **top, const filestruct **bot);
+bool mark_is_before_cursor(void);
+void get_region(linestruct **top, size_t *top_x, linestruct **bot, size_t *bot_x);
+void get_range(linestruct **top, linestruct **bot);
 #endif
-size_t get_totsize(const filestruct *begin, const filestruct *end);
+size_t number_of_characters_in(const linestruct *begin, const linestruct *end);
 #ifndef NANO_TINY
-filestruct *fsfromline(ssize_t lineno);
-#endif
-#ifdef DEBUG
-void dump_filestruct(const filestruct *inptr);
+linestruct *line_from_number(ssize_t number);
 #endif
 
 /* Most functions in winio.c. */
 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);
 #ifdef ENABLE_NANORC
 void implant(const char *string);
 #endif
-int get_kbinput(WINDOW *win, bool showcursor);
 int parse_kbinput(WINDOW *win);
-int arrow_from_abcd(int kbinput);
-int parse_escape_sequence(WINDOW *win, int kbinput);
-int get_byte_kbinput(int kbinput);
-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);
+int get_kbinput(WINDOW *win, bool showcursor);
+char *get_verbatim_kbinput(WINDOW *win, size_t *count);
 #ifdef ENABLE_MOUSE
-int get_mouseinput(int *mouse_row, int *mouse_col, bool allow_shortcuts);
+int get_mouseinput(int *mouse_y, int *mouse_x, bool allow_shortcuts);
 #endif
-const sc *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);
-void statusbar(const char *msg);
-void warn_and_shortly_pause(const char *msg);
 void statusline(message_type importance, const char *msg, ...);
+void statusbar(const char *msg);
+void warn_and_briefly_pause(const char *msg);
 void bottombars(int menu);
 void post_one_key(const char *keystroke, const char *tag, int width);
 void place_the_cursor(void);
-void edit_draw(filestruct *fileptr, const char *converted,
-		int line, size_t from_col);
-int update_line(filestruct *fileptr, size_t index);
+int update_line(linestruct *line, size_t index);
 #ifndef NANO_TINY
-int update_softwrapped_line(filestruct *fileptr);
+int update_softwrapped_line(linestruct *line);
 #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(bool direction);
 #ifndef NANO_TINY
 size_t get_softwrap_breakpoint(const char *text, size_t leftedge,
 								bool *end_of_line);
-size_t get_chunk_and_edge(size_t column, filestruct *line, size_t *leftedge);
-size_t chunk_for(size_t column, filestruct *line);
-size_t leftedge_for(size_t column, filestruct *line);
-size_t number_of_chunks_in(filestruct *line);
+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 extra_chunks_in(linestruct *line);
 void ensure_firstcolumn_is_aligned(void);
 #endif
 size_t actual_last_column(size_t leftedge, size_t column);
-void edit_redraw(filestruct *old_current, update_type manner);
+void edit_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, size_t from_col, size_t to_col);
+void adjust_viewport(update_type manner);
+void full_refresh(void);
+void draw_all_subwindows(void);
+void report_cursor_position(void);
+void spotlight(size_t from_col, size_t to_col);
 #ifndef NANO_TINY
-void spotlight_softwrapped(bool active, size_t from_col, size_t to_col);
+void spotlight_softwrapped(size_t from_col, size_t to_col);
 #endif
 void do_suspend_void(void);
-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 flip_goto(void);
 #ifdef ENABLE_BROWSER
-void to_files_void(void);
-void goto_dir_void(void);
+void to_files(void);
+void to_first_file(void);
+void to_last_file(void);
+void goto_dir(void);
 #endif
 #ifndef NANO_TINY
+void do_nothing(void);
+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);
-
-#endif /* !PROTO_H */
+void do_cancel(void);

src/utils.c

@@ -1,8 +1,8 @@
 /**************************************************************************
  *   utils.c  --  This file is part of GNU nano.                          *
  *                                                                        *
- *   Copyright (C) 1999-2011, 2013-2018 Free Software Foundation, Inc.    *
- *   Copyright (C) 2016-2017 Benno Schulenberg                            *
+ *   Copyright (C) 1999-2011, 2013-2020 Free Software Foundation, Inc.    *
+ *   Copyright (C) 2016, 2017, 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    *
@@ -19,7 +19,7 @@
  *                                                                        *
  **************************************************************************/
 
-#include "proto.h"
+#include "prototypes.h"
 
 #include <errno.h>
 #ifdef HAVE_PWD_H
@@ -38,7 +38,7 @@ void get_homedir(void)
 #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) {
+		if (homenv == NULL || geteuid() == ROOT_UID) {
 			const struct passwd *userage = getpwuid(geteuid());
 
 			if (userage != NULL)
@@ -49,7 +49,7 @@ void get_homedir(void)
 		/* Only set homedir if some home directory could be determined,
 		 * otherwise keep homedir NULL. */
 		if (homenv != NULL && *homenv != '\0')
-			homedir = mallocstrcpy(NULL, homenv);
+			homedir = copy_of(homenv);
 	}
 }
 
@@ -149,7 +149,7 @@ bool parse_line_column(const char *str, ssize_t *line, ssize_t *column)
 	if (comma == str)
 		return retval;
 
-	firstpart = mallocstrcpy(NULL, str);
+	firstpart = copy_of(str);
 	firstpart[comma - str] = '\0';
 
 	retval = parse_num(firstpart, line) && retval;
@@ -159,37 +159,24 @@ bool parse_line_column(const char *str, ssize_t *line, ssize_t *column)
 	return retval;
 }
 
-/* Reduce the memory allocation of a string to what is needed. */
-void snuggly_fit(char **str)
+/* In the given string, recode each embedded NUL as a newline. */
+void recode_NUL_to_LF(char *string, size_t length)
 {
-	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';
+	while (length > 0) {
+		if (*string == '\0')
+			*string = '\n';
+		length--;
+		string++;
 	}
 }
 
-/* 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)
+/* In the given string, recode each embedded newline as a NUL. */
+void recode_LF_to_NUL(char *string)
 {
-	for (; *str != '\0'; str++) {
-		if (*str == '\n')
-			*str = '\0';
+	while (*string != '\0') {
+		if (*string == '\n')
+			*string = '\0';
+		string++;
 	}
 }
 
@@ -207,37 +194,6 @@ void free_chararray(char **array, size_t len)
 }
 #endif
 
-/* 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)
-{
-#ifndef GNU_WORDBOUNDS
-	int i, j = 0;
-	char *r2 = charalloc(strlen(r) * 5);
-	char *r3;
-
-	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);
-
-	return (const char *) r3;
-#endif /* !GNU_WORDBOUNDS */
-
-	return r;
-}
-
 #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?*/
@@ -247,14 +203,14 @@ bool is_separate_word(size_t position, size_t length, const char *buf)
 	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);
+	collect_char(buf + step_left(buf, position), before);
+	collect_char(buf + word_end, 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)));
+	return ((position == 0 || !is_alpha_char(before)) &&
+				(buf[word_end] == '\0' || !is_alpha_char(after)));
 }
 #endif /* ENABLE_SPELLER */
 
@@ -266,13 +222,6 @@ bool is_separate_word(size_t position, size_t length, const char *buf)
 const char *strstrwrapper(const char *haystack, const char *needle,
 		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;
@@ -298,7 +247,7 @@ const char *strstrwrapper(const char *haystack, const char *needle,
 				/* If this is the last possible match, don't try to advance. */
 				if (last_find == ceiling)
 					break;
-				next_rung = move_mbright(haystack, last_find);
+				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,
@@ -325,26 +274,18 @@ const char *strstrwrapper(const char *haystack, const char *needle,
 		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);
-	} else if (ISSET(BACKWARDS_SEARCH))
+	}
+
+	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();
+	else
+		return mbstrcasestr(start, needle);
 }
 
 /* This is a wrapper for the malloc() function that properly handles
@@ -354,7 +295,7 @@ void *nmalloc(size_t howmuch)
 	void *r = malloc(howmuch);
 
 	if (r == NULL && howmuch != 0)
-		die(_("nano is out of memory!"));
+		die(_("Nano is out of memory!\n"));
 
 	return r;
 }
@@ -366,33 +307,39 @@ void *nrealloc(void *ptr, size_t howmuch)
 	void *r = realloc(ptr, howmuch);
 
 	if (r == NULL && howmuch != 0)
-		die(_("nano is out of memory!"));
+		die(_("Nano is out of memory!\n"));
 
 	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)
+/* Return an appropriately reallocated dest string holding a copy of src.
+ * Usage: "dest = mallocstrcpy(dest, src);". */
+char *mallocstrcpy(char *dest, const char *src)
 {
-	if (src == NULL)
-		src = "";
+	size_t count = strlen(src) + 1;
 
-#ifndef NANO_TINY
-	if (src == dest)
-		fprintf(stderr, "\r*** Copying a string to itself -- please report a bug ***");
-#endif
-	dest = charealloc(dest, n);
-	strncpy(dest, src, n);
+	dest = charealloc(dest, count);
+	strncpy(dest, src, count);
 
 	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 an allocated copy of the first count characters
+ * of the given string, and NUL-terminate the copy. */
+char *measured_copy(const char *string, size_t count)
 {
-	return mallocstrncpy(dest, src, (src == NULL) ? 1 : strlen(src) + 1);
+	char *thecopy = charalloc(count + 1);
+
+	memcpy(thecopy, string, count);
+	thecopy[count] = '\0';
+
+	return thecopy;
+}
+
+/* Return an allocated copy of the given string. */
+char *copy_of(const char *string)
+{
+	return measured_copy(string, strlen(string));
 }
 
 /* Free the string at dest and return the string at src. */
@@ -409,10 +356,10 @@ 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)
+	if (column + 2 < editwincols || ISSET(SOFTWRAP) || column == 0)
 		return 0;
 	else if (editwincols > 8)
-		return column - 7 - (column - 7) % (editwincols - 8);
+		return column - 6 - (column - 6) % (editwincols - 8);
 	else
 		return column - (editwincols - 2);
 }
@@ -421,7 +368,7 @@ size_t get_page_start(size_t column)
  * 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
@@ -434,7 +381,7 @@ size_t actual_x(const char *text, size_t column)
 		/* The current accumulated span, in columns. */
 
 	while (*text != '\0') {
-		int charlen = parse_mbchar(text, NULL, &width);
+		int charlen = advance_over(text, &width);
 
 		if (width > column)
 			break;
@@ -447,16 +394,15 @@ size_t actual_x(const char *text, size_t column)
 
 /* 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]. */
 
 	if (maxlen == 0)
 		return 0;
 
 	while (*text != '\0') {
-		size_t charlen = parse_mbchar(text, NULL, &width);
+		size_t charlen = advance_over(text, &width);
 
 		if (maxlen <= charlen)
 			break;
@@ -469,34 +415,37 @@ size_t strnlenpt(const char *text, size_t maxlen)
 }
 
 /* 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;
 
 	while (*text != '\0')
-		text += parse_mbchar(text, NULL, &span);
+		text += advance_over(text, &span);
 
 	return span;
 }
 
-/* Append a new magicline to the end of the buffer. */
+/* 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->next->data = copy_of("");
 	openfile->filebot = openfile->filebot->next;
+#ifndef NANO_TINY
+	openfile->filebot->extrarows = 0;
+#endif
 	openfile->totsize++;
 }
 
 #if !defined(NANO_TINY) || defined(ENABLE_HELP)
-/* Remove the magicline from the end of the buffer, if there is one and
+/* 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->filetop) {
 		openfile->filebot = openfile->filebot->prev;
-		free_filestruct(openfile->filebot->next);
+		delete_node(openfile->filebot->next);
 		openfile->filebot->next = NULL;
 		openfile->totsize--;
 	}
@@ -504,35 +453,35 @@ void remove_magicline(void)
 #endif
 
 #ifndef NANO_TINY
-/* Set (top, top_x) and (bot, bot_x) to 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 mark_order(const filestruct **top, size_t *top_x,
-		const filestruct **bot, size_t *bot_x, bool *right_side_up)
+/* Return TRUE when the mark is before or at the cursor, and FALSE otherwise. */
+bool mark_is_before_cursor(void)
 {
-	if ((openfile->current->lineno == openfile->mark->lineno &&
-				openfile->current_x > openfile->mark_x) ||
-				openfile->current->lineno > openfile->mark->lineno) {
+	return (openfile->mark->lineno < openfile->current->lineno ||
+						(openfile->mark == openfile->current &&
+						openfile->mark_x <= openfile->current_x));
+}
+
+/* Return in (top, top_x) and (bot, bot_x) the start and end "coordinates"
+ * of the marked region. */
+void get_region(linestruct **top, size_t *top_x, linestruct **bot, size_t *bot_x)
+{
+	if (mark_is_before_cursor()) {
 		*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;
 	}
 }
 
 /* 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 filestruct **top, const filestruct **bot)
+void get_range(linestruct **top, linestruct **bot)
 {
 	if (!openfile->mark) {
 		*top = openfile->current;
@@ -540,7 +489,7 @@ void get_range(const filestruct **top, const filestruct **bot)
 	} else {
 		size_t top_x, bot_x;
 
-		mark_order(top, &top_x, bot, &bot_x, NULL);
+		get_region(top, &top_x, bot, &bot_x);
 
 		if (bot_x == 0 && *bot != *top && !also_the_last)
 			*bot = (*bot)->prev;
@@ -549,59 +498,32 @@ void get_range(const filestruct **top, const filestruct **bot)
 	}
 }
 
-/* Given a line number, return a pointer to the corresponding struct. */
-filestruct *fsfromline(ssize_t lineno)
+/* Return a pointer to the line that has the given line number. */
+linestruct *line_from_number(ssize_t number)
 {
-	filestruct *f = openfile->current;
+	linestruct *line = openfile->current;
 
-	if (lineno <= openfile->current->lineno)
-		while (f->lineno != lineno && f->prev != NULL)
-			f = f->prev;
+	if (line->lineno > number)
+		while (line->lineno != number)
+			line = line->prev;
 	else
-		while (f->lineno != lineno && f->next != NULL)
-			f = f->next;
+		while (line->lineno != number)
+			line = line->next;
 
-	if (f->lineno != lineno) {
-		statusline(ALERT, "Gone undo line -- please report a bug");
-		return NULL;
-	}
-
-	return f;
+	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 number_of_characters_in(const linestruct *begin, const linestruct *end)
 {
-	const filestruct *line;
-	size_t totsize = 0;
+	const linestruct *line;
+	size_t count = 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;
+		count += 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--;
-
-	return totsize;
+	/* Do not count the final newline. */
+	return (count - 1);
 }
-
-#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, "(%zd) %s\n", inptr->lineno, inptr->data);
-		inptr = inptr->next;
-	}
-}
-#endif /* DEBUG */

syntax/Makefile.am

@@ -5,11 +5,9 @@ pkgdata_DATA =	asm.nanorc \
 		cmake.nanorc \
 		c.nanorc \
 		css.nanorc \
-		debian.nanorc \
 		default.nanorc \
 		elisp.nanorc \
-		fortran.nanorc \
-		gentoo.nanorc \
+		email.nanorc \
 		go.nanorc \
 		groff.nanorc \
 		guile.nanorc \
@@ -20,8 +18,7 @@ pkgdata_DATA =	asm.nanorc \
 		lua.nanorc \
 		makefile.nanorc \
 		man.nanorc \
-		mgp.nanorc \
-		mutt.nanorc \
+		markdown.nanorc \
 		nanohelp.nanorc \
 		nanorc.nanorc \
 		nftables.nanorc \
@@ -31,16 +28,23 @@ pkgdata_DATA =	asm.nanorc \
 		perl.nanorc \
 		php.nanorc \
 		po.nanorc \
-		postgresql.nanorc \
-		pov.nanorc \
 		python.nanorc \
 		ruby.nanorc \
 		rust.nanorc \
 		sh.nanorc \
-		spec.nanorc \
+		sql.nanorc \
 		tcl.nanorc \
 		tex.nanorc \
 		texinfo.nanorc \
 		xml.nanorc
 
-EXTRA_DIST = $(pkgdata_DATA)
+nobase_pkgdata_DATA = \
+		extra/ada.nanorc \
+		extra/debian.nanorc \
+		extra/fortran.nanorc \
+		extra/gentoo.nanorc \
+		extra/haskell.nanorc \
+		extra/povray.nanorc \
+		extra/spec.nanorc
+
+EXTRA_DIST = $(pkgdata_DATA) $(nobase_pkgdata_DATA)

syntax/asm.nanorc

@@ -1,4 +1,4 @@
-## Here is an example for assembler.
+## Syntax highlighting for assembler.
 
 syntax asm "\.(S|s|asm)$"
 magic "assembler source"
@@ -8,14 +8,11 @@ color red "\<[A-Z_]{2,}\>"
 color brightgreen "\.(data|subsection|text)"
 color green "\.(align|file|globl|global|hidden|section|size|type|weak)"
 color brightyellow "\.(ascii|asciz|byte|double|float|hword|int|long|short|single|struct|word)"
-icolor brightred "^[[:space:]]*[.0-9A-Z_]*:"
+color brightred "^[[:space:]]*[.0-9A-Za-z_]*:"
 color brightcyan "^[[:space:]]*#[[:space:]]*(define|undef|include|ifn?def|endif|elif|else|if|warning|error)"
 
 # Strings.
 color brightyellow "<[^= 	]*>" ""(\\.|[^"])*""
-# Multiline strings.  This regex is VERY resource intensive,
-# and sometimes colours things that shouldn't be coloured.
-###color brightyellow start=""(\\.|[^"])*\\[[:space:]]*$" end="^(\\.|[^"])*""
 
 # Comments.
 color brightblue "//.*"

syntax/autoconf.nanorc

@@ -1,11 +1,11 @@
-## Here is an example for Autoconf.
+## Syntax highlighting for Autoconf.
 
 syntax autoconf "\.(ac|m4)$"
 comment "#"
 
 # Keywords:
 color yellow "\<(if|test|then|elif|else|fi|for|in|do|done)\>"
-color yellow "(=|!=|&&|\|\|)"
+color yellow "=|!=|&&|\|\|"
 
 # Macros:
 color cyan "\<[[:upper:]_[:digit:]]+\>"
@@ -14,13 +14,13 @@ color cyan "\<[[:upper:]_[:digit:]]+\>"
 color red "\<[-_.0-9]+\>"
 
 # Strings:
-color red "\"[^"]*\""  "\'[^']*\'"
+color red ""[^"]*""  "'[^']*'"
 
 # Backticks:
 color green "`[^`]*`"
 
 # Error lines:
-color brightred "^\*\*\*.*"
+color brightred "^[[:space:]]*\*\*\*.*"
 
 # Brackets:
 color magenta "\[|\]|\(|\)"

syntax/awk.nanorc

@@ -1,11 +1,12 @@
-## Here is an example for awk.
+## Syntax highlighting for AWK scripts.
 
 syntax awk "\.awk$"
+header "^#!.*awk"
 magic "awk script"
 comment "#"
 
 # Records.
-icolor brightred "\$[0-9A-Z_!@#$*?-]+"
+color brightred "\$[0-9A-Za-z_!@#$*?-]+"
 # Awk-set variables.
 color red "\<(ARGC|ARGIND|ARGV|BINMODE|CONVFMT|ENVIRON|ERRNO|FIELDWIDTHS)\>"
 color red "\<(FILENAME|FNR|FS|IGNORECASE|LINT|NF|NR|OFMT|OFS|ORS)\>"
@@ -13,13 +14,12 @@ color red "\<(PROCINFO|RS|RT|RSTART|RLENGTH|SUBSEP|TEXTDOMAIN)\>"
 # Function declarations and special patterns.
 color brightgreen "\<(function|extension|BEGIN|END)\>"
 # Operators.
-color green "(\{|\}|\(|\)|\;|\]|\[|\\|<|>|!|=|&|\+|-|\*|%|/|\?:|\^|\|)"
+color green "\{|\}|\(|\)|\;|\[|\]|\\|<|>|!|=|&|\+|-|\*|%|/|\?:|\^|\|"
 # Flow control.
 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,6 +1,7 @@
-## Here is an example for C/C++.
+## Syntax highlighting for C and C++ files.
 
-syntax c "\.(c(c|pp|xx|\+\+)?|C)$" "\.(h(h|pp|xx)?|H)$" "\.ii?$"
+syntax c "\.([ch](pp|xx)?|C|cc|c\+\+|cu|H|hh|ii?)$"
+header "-\*-.*\<C(\+\+)?((;|\s).*)?-\*-"
 magic "^(C|C\+\+) (source|program)"
 comment "//"
 
@@ -10,12 +11,11 @@ color brightred "\<[A-Z_][0-9A-Z_]+\>"
 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:]][[:lower:]_]*|(u_?)?int(8|16|32|64))_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.
@@ -23,10 +23,11 @@ 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:]=]*>"
-# Multiline strings.  This regex is VERY resource intensive,
-# and sometimes colours things that shouldn't be coloured.
-###color brightyellow start=""(\\.|[^"])*\\[[:space:]]*$" end="^(\\.|[^"])*""
+color brightyellow ""([^"]|\\")*"" "#[[:space:]]*include[[:space:]]+<[^[:blank:]=]*>"
+
+# 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 "//.*"

syntax/changelog.nanorc

@@ -1,9 +1,9 @@
-## Colouring for Changelogs.
+## Syntax highlighting 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.
@@ -12,7 +12,7 @@ color yellow "<[^>]*@[^>]*>"
 # Command-line options.
 color cyan "[[:space:]]-[a-zA-Z\$]" "--[8a-z-]+"
 # Bug and patch numbers.
-color cyan "(BZ|bug|patch) #[0-9]+" "PR [[:alnum:]]+/[0-9]+"
+color cyan "(BZ|bug|patch)[ ]#[0-9]+" "PR [[:alnum:]]+/[0-9]+"
 # Probable constants, for variety.
 color brightred "\<[A-Z_][0-9A-Z_]+\>"
 # Key sequences.

syntax/cmake.nanorc

@@ -3,7 +3,7 @@
 syntax cmake "(CMakeLists\.txt|\.cmake)$"
 comment "#"
 
-icolor green "^[[:space:]]*[A-Z0-9_]+"
+color green "^[[:space:]]*[0-9A-Za-z_]+"
 icolor brightyellow "^[[:space:]]*(include|include_directories|include_external_msproject)\>"
 
 icolor brightgreen "^[[:space:]]*((else|end)?if|else|(end)?while|(end)?foreach|break)\>"
@@ -12,9 +12,8 @@ color brightgreen "[[:space:]](OR|AND|IS_NEWER_THAN|MATCHES|(STR|VERSION_)?(LESS
 
 icolor brightred "^[[:space:]]*((end)?(function|macro)|return)"
 
-icolor cyan start="\$(\{|ENV\{)" end="\}"
+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,11 +1,20 @@
-## Here is an example for CSS files.
+## Syntax highlighting for CSS files.
 
 syntax css "\.css$"
 comment "/*|*/"
 
+# First make everything red:
 color brightred     "."
+# Then everything between braces yellow:
 color brightyellow  start="\{" end="\}"
-color brightwhite   start=":" end="([;^\{]|$)"
-color brightblue    ":active|:focus|:hover|:link|:visited|:link|:after|:before|$"
-color brightblue    start="\/\*" end="\\*/"
+# Then everything after a colon white:
+color brightwhite   start=":" end="([;^{]|$)"
+
+# Pseudo-classes:
+color brightcyan   ":(active|checked|focus|hover|link|visited|after|before)\>"
+
+# Comments:
+color brightblue    start="/\*" end="\*/"
+
+# Syntactic characters:
 color green         ";|:|\{|\}"

syntax/default.nanorc

@@ -1,4 +1,4 @@
-## An example of a default syntax.  The default syntax is used for
+## This is an example of a default syntax.  The default syntax is used for
 ## files that do not match any other syntax.
 
 syntax default
@@ -11,7 +11,13 @@ color cyan "^[[:space:]]*#.*"
 color ,red " +	+"
 
 # Nano's name, including version.
-color brightred "(GNU )?nano [1-9]\.[0-9]\.[^[:space:][:punct:]]+"
+color brightred "(GNU )?[Nn]ano [1-5]\.[0-9][-.[:alnum:]]*\>"
 
 # Email addresses.
 color magenta "<[[:alnum:].%_+-]+@[[:alnum:].-]+\.[[:alpha:]]{2,}>"
+
+# Bracketed captions in certain config files.
+color brightgreen "^\[[^][]+\]$"
+
+# Control codes.
+color latte "[[:cntrl:]]"

syntax/elisp.nanorc

@@ -1,4 +1,4 @@
-## Here is an example for Emacs Lisp.
+## Syntax highlighting for Emacs Lisp.
 
 syntax elisp "\.el$"
 magic "Lisp/Scheme program"
@@ -27,7 +27,7 @@ color brightred "\<(t|nil)\>"
 # Keywords
 color blue ":(\w|[?-])+"
 # Strings
-color yellow start="^[[:blank:]]+\"" end="[^\]\""
+color yellow start="^[[:blank:]]+"" end="[^\]""
 color yellow ""(\\.|[^"])*""
 # Comments
-color cyan "(^|[[:space:]]);.*$"
+color cyan "(^|[[:space:]]);.*"

syntax/email.nanorc

@@ -0,0 +1,17 @@
+## Syntax highlighting for emails.
+
+syntax email "\.eml$"
+
+# Quoted lines.
+color green "^>.*"
+color cyan "^> ?>.*"
+color yellow "^> ?> ?>.*"
+
+# Email addresses.
+color brightmagenta "<[^@]+@[^@]+>"
+
+# URLs.
+color brightblue "(https?|ftp)://\S+\.\S+[^\s.)]"
+
+# Signatures, even quoted ones.
+color yellow start="^>* ?-- $" end="^>* ?$"

syntax/extra/ada.nanorc

@@ -0,0 +1,39 @@
+## Syntax highlighting for Ada.
+
+## Original author:  Andreas K. Foerster
+## License:  GPL version 3 or newer
+
+## Language reference: http://www.ada-auth.org/standards/12rm/html/RM-TTL.html
+
+syntax ada "\.ad[abcs]$"
+comment "--"
+
+# This linter command leaves an ALI file in the working directory.
+linter gcc -c -gnatc
+
+# Reserved Words (RM 2.9)
+icolor yellow "\<(abort|abs|abstract|accept|access|aliased|all|and|array|at)\>"
+icolor yellow "\<(begin|body|case|constant|declare|delay|delta|do)\>"
+icolor yellow "\<(else|elsif|end|entry|exception|exit|for|function|generic|goto)\>"
+icolor yellow "\<(if|in|interface|is|limited|loop|mod|new|not|null|of|or|others|out|overriding)\>"
+icolor yellow "\<(package|pragma|private|procedure|protected|raise|range|record|rem|renames)\>"
+icolor yellow "\<(requeue|return|reverse|select|separate|some|subtype|synchronized)\>"
+icolor yellow "\<(tagged|task|terminate|then|type|until|use|when|while|with|xor)\>"
+
+# Separators / Operators
+color magenta "'|&|\*|\+|\-|\.|\,|\/|:|;|\(|\)|<|>|\||="
+
+# Attributes
+color cyan "'[[:alnum:]]+"
+
+# Numbers (RM 2.4)
+color green "\<[0-9][0-9A-Fa-f_#.+-]*"
+
+# Characters / Strings
+color red "'.'" ""[^"]*""
+
+# Comments
+color brightblue "--.*"
+
+# Trailing whitespace
+color ,blue "[[:space:]]+$"

syntax/extra/debian.nanorc

@@ -1,6 +1,6 @@
-## Here is an example for apt's sources.list.
+## Syntax highlighting 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/extra/fortran.nanorc

@@ -1,6 +1,6 @@
-## Here is an example for Fortran 90/95.
+## Syntax highlighting for Fortran 90/95.
 
-syntax fortran "\.(f|f90|f95)$"
+syntax fortran "\.(f|for|f90|f95)$"
 comment "!"
 
 color red "\<[0-9]+\>"
@@ -34,7 +34,7 @@ icolor yellow "\<(.or.|repeat|select case|then|where|while)\>"
 icolor magenta "\<(continue|cycle|exit|go?to|result|return)\>"
 
 # Strings.
-icolor yellow "<[^= 	]*>" ""(\\.|[^"])*""
+color yellow "<[^= 	]*>" ""(\\.|[^"])*""
 
 # Comments.
-icolor blue "!.*"
+color blue "!.*"

syntax/extra/gentoo.nanorc

@@ -1,5 +1,5 @@
-## Here is an example for Gentoo ebuilds/eclasses,
-## and (further down) one for Portage control files.
+## Syntax highlighting for Gentoo ebuilds/eclasses,
+## and (further down) for Portage control files.
 
 syntax ebuild "\.e(build|class|blit)$"
 comment "#"
@@ -17,7 +17,7 @@ color green "-(eq|ne|gt|lt|ge|le)\>"
 ## 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)\>"
+color red "\<(EAPI|ARCH|HOMEPAGE|DESCRIPTION|IUSE|SRC_URI|LICENSE|SLOT|KEYWORDS|[BHPR]?DEPEND|PROVIDE|PROPERTIES|REQUIRED_USE|RESTRICT|USERLAND)\>"
 color red "\<(S|E?D|T|PV|PF|P|PN|PR|PVR|A|CATEGORY|DISTDIR|FILESDIR|EPREFIX|E?ROOT|WORKDIR)\>"
 color red "\<(AS|C(PP|XX)?|LD)FLAGS\>" "\<C(HOST|TARGET|BUILD)\>" "\<(MERGE_TYPE|REPLACING_VERSIONS|REPLACED_BY_VERSION)\>"
 color red "\<EBUILD_PHASE(_FUNC)?\>"
@@ -39,7 +39,7 @@ color brightblue "\<tc-(arch(-kernel)?|export|has-(tls|openmp))\>"
 ## 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)\>"
 ## Comments (doesn't work that well):
-color yellow "(^|[[:space:]])#.*$"
+color yellow "(^|[[:space:]])#.*"
 ## Strings (doesn't work that well):
 color brightyellow ""(\\.|[^\"])*"" "'(\\.|[^'])*'"
 ## Trailing space is bad!
@@ -52,7 +52,7 @@ 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:]]|$)"
@@ -67,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/extra/haskell.nanorc

@@ -0,0 +1,40 @@
+## Syntax highlighting for Haskell files.
+
+## Original author:  Alex Taber
+## License:  GPL version 3
+
+syntax "haskell" "\.hs$"
+comment "--"
+
+# Keywords
+color red "\<(as|case|of|class|data|default|deriving|do|forall|foreign|hiding|if|then|else|import|infix(l|r)?|instance|let|in|mdo|module|newtype|qualified|type|where)\>"
+
+# Various symbols
+color cyan "\||@|!|:|_|~|=|\\|;|\(\)|,|\[|\]|\{|\}"
+
+# Operators
+color magenta "==|/=|&&|\|\||<|>|<=|>="
+
+# More symbols
+color cyan "->|<-|=>"
+color magenta "\.|\$"
+
+# Data constructors
+color magenta "\<(True|False|Nothing|Just|Left|Right|LT|EQ|GT)\>"
+# Data classes
+color magenta "\<(Bounded|Data|Enum|Eq|Floating|Fractional|Functor|Integral|Monad|MonadPlus|Num|Ord|Read|Real|RealFloat|RealFrac|Show|Typeable)\>"
+
+# Special keyword
+color brightred "undefined"
+
+# Strings
+color yellow ""([^\"]|\\.)*""
+# Characters
+color brightyellow "'([^\']|\\.)'"
+
+# Comments
+color green "--.*"
+color green start="\{-" end="-\}"
+
+# Trailing whitespace
+color ,green "[[:space:]]+$"