po: update translations and regenerate POT file and PO files

(The 'in_edit' variable was a duplicate because also when the pointer is
on the line numbers, we want to scroll when the mouse wheel is rolled.)

.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

@@ -69,6 +69,7 @@ Rishabh Dave <rishabhddave@gmail.com>
 
 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).

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
@@ -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,6 +1,26 @@
 Improvements in GNU nano
 ========================
 
+Since 6.0:
+  - Option --zero hides the interface and uses the whole terminal for editing.
+  - Colors can be given also in #rgb hexadecimal, to select the nearest color
+    from the 6x6x6 color-cube palette available on 256-color terminals.
+  - Fourteen new color names are available, from rosy to crimson.
+
+Since 5.0:
+  - A search briefly spotlights the found text, in black on yellow by default.
+  - Option --minibar reduces the interface to a bottom bar with basic info.
+  - The cursor skips over combining characters, <Del> deletes them together
+    with the character they combine with, but <Bsp> deletes them separately.
+  - For using libmagic the option --magic or -! or 'set magic' is required.
+  - With --stateflags the state of some things is shown in the title bar.
+  - 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.
@@ -28,7 +48,7 @@ Since 2.9.0:
   - 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'.
@@ -92,25 +112,19 @@ Since 2.3.0:
   - 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).
@@ -119,7 +133,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).
@@ -127,70 +141,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).
@@ -199,4 +201,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,196 @@
+2022.02.09 - GNU nano 6.1 "Rețelele de socializare sunt ca un frigider"
+• The behavior of ^K at a prompt has been enhanced: when there is some
+  text after the cursor, just this text is erased.  In the most common
+  situation, when the cursor is at the end of the answer, the behavior
+  is as before: the whole answer is erased.
+• At a prompt, M-6 copies the current answer into the cutbuffer.
+• Large external pastes into nano are handled more quickly.
+
+2021.12.15 - GNU nano 6.0 "Humor heeft ook zijn leuke kanten"
+• Option --zero hides the title bar, status bar and help lines, and
+  uses all rows of the terminal as editing area.  The title bar and
+  status bar can be toggled with M-Z.
+• Colors can now be specified also as three-digit hexadecimal numbers,
+  in the format #rgb.  This picks from the 216 index colors (that most
+  terminals know) the color that is nearest to the given values.
+• For users who dislike numbers, there are fourteen new color names:
+  rosy, beet, plum, sea, sky, slate, teal, sage, brown, ocher, sand,
+  tawny, brick, and crimson.
+• Suspension is enabled by default, invokable with ^T^Z.  The options
+  -z, --suspendable, and 'set suspendable' are obsolete and ignored.
+  (In case you want to be able to suspend nano with a single keystroke,
+  you can put 'bind ^Z suspend main' in your nanorc.)
+• When automatic hard-wrapping is in effect, pasting just a few words
+  (without a line break) will now hard-wrap the line when needed.
+• Toggling Append or Prepend clears the current filename.
+• The word count as shown by M-D is now affected by option --wordbounds;
+  with it, nano counts words as 'wc' does; without it (the new default),
+  words are counted in a more human way: seeing punctuation as space.
+• The YAML syntax file is now actually included in the tarball.
+
+
+2021.10.06 - GNU nano 5.9 "El manicomio ha decidido: mañana sol!"
+• The extension of a filename is added to the name of a corresponding
+  temporary file, so that spell checking a C file, for example, will
+  check only the comments and strings (when using 'aspell').
+• The process number is added to the name of an emergency save file,
+  so that when multiple nanos die they will not fight over a filename.
+• Undoing a cutting operation will restore an anchor that was located
+  in the cut area to its original line.
+• When using --locking, saving a new buffer will create a lock file.
+• Syntax highlighting for YAML files has been added.
+
+2021.06.15 - GNU nano 5.8 "Why is it necessary to be special?"
+• After a search, the spotlighting is dropped after 1.5 seconds (0.8
+  seconds with --quick) to avoid the idea that the text is selected.
+• A + and a space before a filename on the command line will put the
+  cursor at the end of the corresponding buffer.
+• Linter messages no longer include filename and line/column numbers.
+• Color name "grey" or "gray" can be used instead of "lightblack".
+• The color of the minibar can be chosen with 'set minicolor'.
+
+2021.04.29 - GNU nano 5.7 "Toți ceilalți arau câmpurile"
+• The output of --constantshow (without --minibar) is more stable.
+• When opening multiple buffers and there is an error message, this
+  message is shown again upon first switch to the relevant buffer.
+• The position and size of the indicator now follow actual lines,
+  instead of visual lines when in softwrap mode, meaning that the
+  size of the indicator can change when scrolling in softwrap mode.
+
+2021.03.03 - GNU nano 5.6.1 "Geelgors"
+• Search matches are properly colorized in softwrap mode too.
+• Option 'highlightcolor' has been renamed to 'spotlightcolor'.
+
+2021.02.24 - GNU nano 5.6 "Wielewaal"
+• A search match gets highlighted (in black on yellow by default),
+  in addition to placing the cursor at the start of the match.
+  The color combination can be changed with 'set highlightcolor'.
+  By default the cursor is hidden until the next keystroke, but
+  it can be forced on with --showcursor / 'set showcursor'.
+• Option --markmatch / 'set markmatch' has been removed.
+• Cursor position and character code are displayed in the minibar
+  only when option --constantshow / 'set constantshow' is used,
+  and their display can be toggled with M-C.
+• The state flags are displayed in the minibar only when option
+  --stateflags / 'set stateflags' is used.
+
+2021.01.14 - GNU nano 5.5 "Rebecca"
+• Option 'set minibar' makes nano suppress the title bar and instead
+  show a bar with basic editing information at the bottom: file name
+  (plus an asterisk when the buffer is modified), the cursor position
+  (line,column), the character under the cursor (U+xxxx), the flags
+  that --stateflags normally shows, plus the percentage of the buffer
+  that is above the cursor.
+• With 'set promptcolor' the color combination of the prompt bar can
+  be changed, to allow contrasting it with the mini bar (which always
+  has the same color as the title bar).
+• Option 'set markmatch' highlights the result of a successful search
+  by putting the mark at the end of the match, making the match more
+  visible.  It also suppresses the cursor until the next keystroke.
+  (If you dislike the hiding of the cursor, use 'set showcursor'.)
+• The bindable toggle 'nowrap' has been renamed to 'breaklonglines',
+  to match the corresponding option, like for all other toggles.
+• Support for Slang has been removed.
+
+2020.12.02 - GNU nano 5.4 "Terre des hommes"
+• Moving the cursor now skips over combining characters (and other
+  zero-width characters).  Deleting a character deletes also any
+  succeeding zero-width characters, but backspacing deletes just
+  one character at a time.
+• Workarounds for older ncurses and older libvtes were removed.
+
+2020.10.07 - GNU nano 5.3 "Revolution!"
+• Option 'set stateflags' makes nano show the state of auto-indenting,
+  the mark, hard-wrapping, macro recording, and soft-wrapping in the
+  title bar.  The flags take the place of "Modified", and a modified
+  buffer is instead indicated by an asterisk (*) after its name.
+• Nano no longer by default tries using libmagic to determine the type
+  of a file (when neither filename nor first line gave a clue), because
+  in most cases it is a waste of time.  It requires using the option
+  --magic or -! or 'set magic' to make nano try libmagic.
+• The color of the indicator can be changed with 'set scrollercolor'.
+
+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.
@@ -25,7 +218,7 @@
   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.
+  spelling 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.
 
@@ -44,6 +237,7 @@
 
 2019.06.18 - GNU nano 4.3 "Musa Kart"
 • The ability to read from and write to a FIFO has been regained.
+• Opening a file no longer triggers an inotify CLOSE_WRITE event.
 • 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.
@@ -448,7 +642,7 @@
 
 2016.02.12 - GNU nano 2.5.2 is carrying too many dogs.  This release
              includes several fixes for various memory leaks, position-
-             history size growth, and a long standing issue with using
+             history size growth, and a long-standing issue with using
              nano under sudo creating root-owned files.  There are also
              the usual bevy of documentation and other miscellaneous
              fixes and touchups.  Upgrade today while supplies last,
@@ -690,28 +884,27 @@
 
 2009.11.30 - GNU nano 2.2.0 "Doc Brown" is released!  The culmination
              of almost two years of development and hot on the heels
-             of nano's 10th birthday is available for all your
-             editing needs!  Bugs fixed since the last release
-             include several fixes for tiny mode (involving both
-             the help keys and replace menu text), more 'final'
-             fixes for soft wrapping, and several typo and documentation
-             updates including nanorc tweaks and a new syntax
-             highlighting file for makefiles.  Also included is a long
-             standing fix for random crashing when using nanorc on
-             FreeBSD, and nano will no longer clear the screen on
-             suspend to maintain compatibility with other *nix editors.
-             For those who haven't been playing along at home, please
-             see the official web page for the summary of new
-             features since 2.0.  Special thanks to all who have
-             submitted bug reports recently in support of our new
-             stable release, and apologies for all those bugs we
-             didn't yet find :-) Peace to all.
+             of nano's 10th birthday is available for all your editing
+             needs!  Bugs fixed since the last release include several
+             fixes for tiny mode (involving both the help keys and
+             replace menu text), more 'final' fixes for soft wrapping,
+             and several typo and documentation updates including nanorc
+             tweaks and a new syntax highlighting file for makefiles.
+             Also included is a long-standing fix for random crashing
+             when using nanorc on FreeBSD, and nano will no longer clear
+             the screen on suspend to maintain compatibility with other
+             *nix editors.  For those who haven't been playing along at
+             home, please see the official web page for the summary of
+             new features since 2.0.  Special thanks to all who have
+             submitted bug reports recently in support of our new stable
+             release, and apologies for all those bugs we didn't yet
+             find :-)  Peace to all.
 
 
 2009.11.21 - GNU nano 2.1.99pre2 is available for a special pre-Black
              Friday discount.  Included are some (hopefully final)
              fixes for issues with last page display caused by the
-             soft wrapping code, and a fix for a long standing issue
+             soft wrapping code, and a fix for a long-standing issue
              with hitting the Home key when going through the search
              history.  On the features front, nano will now attempt to
              retain the proper ownership and permissions when trying
@@ -839,31 +1032,31 @@
              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
-             configure-specific compilation failures, and more issues
-             with the new input back end and in particular the status
-             bar.  Also fixed are some long standing issues with
-             compiling on AIX, and a segfault when making the terminal
-             window too small.  Rest in Peace Tim and George!
+2008.06.24 - GNU nano 2.1.2 "New York City" is released.  This
+             release contains fixes for binding bad keys, some
+             configure-specific compilation failures, and more
+             issues with the new input back end and in particular
+             the status bar.  Also fixed are some long-standing
+             issues with compiling on AIX, and a segfault when
+             making the terminal window too small.  Rest in Peace
+             Tim and George!
 
-2008.04.01 - GNU nano 2.1.1 won't get fooled again.  This release contains
-             fixes for the new user-rebindable keys (in particular
-             bracket match which was mis-bound), and various
-             problems with translations and configure-related
-             compilation problems are now fixed as well.
-             It also contains new syntax highlighting
-             definitions for TCL, PHP, Gentoo and Debian-related
-             files, and some documentation updates as well.
-             Please continue to send reports with the key
-             binding code to the Savannah page
-             (https://savannah.gnu.org/bugs/?group=nano).
+2008.04.01 - GNU nano 2.1.1 won't get fooled again.  This release
+             contains fixes for the new user-rebindable keys (in
+             particular bracket match which was mis-bound), and
+             various problems with translations and configure-
+             related compilation problems are now fixed as well.
+             It also contains new syntax highlighting definitions
+             for Tcl, PHP, Gentoo and Debian-related files, and
+             some documentation updates as well.  Please continue to
+             send reports with the key binding code to the Savannah
+             page (https://savannah.gnu.org/bugs/?group=nano).
 
 2008.03.18 - GNU nano 2.1.0 "under old mismanagement" is released.
              This first release in the 2.1 development series
              introduces rebindable keys for most actions inside
-             the editor.  Please see the nanorc(5) page for
-             more information on configuring key bindings.  Please
+             the editor.  Please see the nanorc(5) page for more
+             information on configuring key bindings.  Please
              also report all keybinding bugs (crashes, missing
              menu functions) using the Savannah bug tracker URL,
              https://savannah.gnu.org/bugs/?group=nano and
@@ -1024,7 +1217,7 @@
 
 2005.12.23 - GNU nano 1.3.10 rises to the surface.  This release
              contains several new features as well as fixes for
-             several longstanding bugs.  The former include the
+             several long-standing bugs.  The former include the
              ability to scroll up or down single lines without
              scrolling the cursor, reworked bracket searching code
              that doesn't require regular expression support,
@@ -1061,9 +1254,9 @@
              Have fun with it.
 
 2005.06.30 - GNU nano 1.3.8 floats at its own level.  This release
-             contains several new features.  Among other things, you
-             can now move to a specified column number as well as
-             line number within a file, file backups saved in a
+             contains several new features.  Among other things,
+             you can now move to a specified column number as well
+             as line number within a file, file backups saved in a
              backup directory will have unique names, the search and
              replace history routines should work more consistently,
              you can get a word count by pressing Meta-D at the edit
@@ -1074,8 +1267,8 @@
              screen updates, UTF-8 display, and flow control; a fix
              for a segfault when displaying some lines ending with
              tabs; better handling of constant cursor position
-             display; improved color parsing in the rcfile; and
-             support for the "Regexp" toggle in tiny mode
+             display; improved color parsing in the rcfile;
+             and support for the "Regexp" toggle in tiny mode
              (-R/--regexp is gone, and --restricted's short option
              has been changed to -R), among other things.  Enjoy.
 
@@ -1246,38 +1439,37 @@
              and enjoy GNU nano 1.2.0.
 
 
-2003.02.13 - GNU nano 1.1.99pre3 "The last testing version, no
-             really!" is released.  This release includes fixes for
-             wrapping (again), resizing, color syntax highlighting,
-             rcfile parsing, the mouse code, more memory leaks, and
-             some reversion of the code to get the user's home
-             directory (nano will now again rely on $HOME).  There
-             are also translation updates, a new manual page for the
-             nanorc file, and an UPGRADE file detailing the changes
-             since version 1.0.  Please submit reports for any bugs
-             you might find to the development team
-             (nano-devel@gnu.org), and enjoy nano almost-1.2.0 ;-)
+2003.02.13 - GNU nano 1.1.99pre3 "The last testing version, no really!"
+             is released.  This release includes fixes for wrapping
+             (again), resizing, color syntax highlighting, rcfile
+             parsing, the mouse code, more memory leaks, and some
+             reversion of the code to get the user's home directory
+             (nano will now again rely on $HOME).  There are also
+             translation updates, a new manual page for the nanorc
+             file, and an UPGRADE file detailing the changes since
+             version 1.0.  Please submit reports for any bugs you
+             might find to the development team (nano-devel@gnu.org),
+             and enjoy nano almost-1.2.0 ;-)
 
-2003.02.03 - GNU nano 1.1.99pre2 "bugs in my pockets, bugs in my
-             shoes" is released.  There are, not surprisingly, only
-             bugfixes in this release as we move toward the stable
-             1.2.0 release.  Fixes are included for translatable
-             string format, subexpression replacement, constant
-             cursor position, invalid search regexes, justify, screen
-             state on SIGHUP and SIGTERM, cutting to end cuts with
-             long lines, many file browser and operating directory
-             bugs, memory and file descriptor leaks, marker code,
-             spell checker, the mouse code with long lines, multiple
-             buffers and non-file open errors, replacement string
-             length, and a silly but serious history message crash.
-             There is also a drastic improvement in CPU utilization
-             for the color regex code.
-                 Depending on the number of bugs found in this
-             release, there may be a 1.1.99pre3 or RC1, or just a
-             1.2.0 release.  Most of the major bugs seem to have been
-             worked out, so if you are waiting for a good time to
-             test nano before the official 1.2.0 release, this would
-             be the one to use.  Happy bug hunting!
+2003.02.03 - GNU nano 1.1.99pre2 "bugs in my pockets, bugs in my shoes"
+             is released.  There are, not surprisingly, only bugfixes
+             in this release as we move toward the stable 1.2.0
+             release.  Fixes are included for translatable string
+             format, subexpression replacement, constant cursor
+             position, invalid search regexes, justify, screen state on
+             SIGHUP and SIGTERM, cutting to end cuts with long lines,
+             many file browser and operating directory bugs, memory and
+             file descriptor leaks, marker code, spell checker, the
+             mouse code with long lines, multiple buffers and non-file
+             open errors, replacement string length, and a silly but
+             serious history message crash.  There is also a drastic
+             improvement in CPU utilization for the color regex code.
+                 Depending on the number of bugs found in this release,
+             there may be a 1.1.99pre3 or RC1, or just a 1.2.0 release.
+             Most of the major bugs seem to have been worked out, so if
+             you are waiting for a good time to test nano before the
+             official 1.2.0 release, this would be the one to use.
+             Happy bug hunting!
 
 2003.01.17 - GNU nano 1.1.99pre1 "enough already" has been released.
              This release is, barring bug fixes and documentation
@@ -1338,19 +1530,19 @@
              word and next word, nanorc parser and line wrapping
              code.  Have fun!
 
-2002.07.25 - At long last!  GNU nano 1.1.10 "What didn't we break?" is
-             released.  This version of GNU nano features version
+2002.07.25 - At long last!  GNU nano 1.1.10 "What didn't we break?"
+             is released.  This version of GNU nano features version
              0.11.2 of gettext, building with automake 1.6, some new
              code for displaying control characters, browser
-             improvements, a new backup file option (-B, --backup), a
-             new option to ignore rc files (-I, --ignorercfiles),
+             improvements, a new backup file option (-B, --backup),
+             a new option to ignore rc files (-I, --ignorercfiles),
              compatibility with -pedantic, handling null characters
              before EOF, a slightly sportier nanorc.sample and more.
-                 Fixes are included for justification,
-             the reading and writing file routines, resizing and fill
-             length, millions of memory leaks, the usage screen was
-             updated, and the --quotestr and --regexp really work
-             now ;-)  Enjoy :)
+                 Fixes are included for justification, the reading
+             and writing file routines, resizing and fill length,
+             millions of memory leaks, the usage screen was updated,
+             and the --quotestr and --regexp really work now ;-)
+             Enjoy :)
 
 2002.05.12 - GNU nano 1.1.9 is released, happy Mother's Day!  This
              release includes many new features, including a prepend
@@ -1551,9 +1743,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
@@ -1597,9 +1789,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.
 
@@ -1620,27 +1812,26 @@
 
 2000.11.23 - Happy Thanksgiving!  Nano 0.9.21 is our "last version was
              a big turkey" release.  It fixes several bugs introduced
-             by the previous version, as well as a few long- standing
+             by the previous version, as well as a few long-standing
              display bugs.  All 0.9.20 users are strongly encouraged
              to upgrade to this release.
 
 2000.11.18 - Nano 0.9.20 is finally out the door.  Probably the biggest
-             change is the brand new way nano displays previous
-             search and replace strings (they are now editable!)
-             This is a break from Pico's (inconsistent) interface, so
-             if you don't like the new way, "Pico" mode (-p on the
-             command line or Meta-P within nano) still works the
-             "old" way.
+             change is the brand new way nano displays previous search
+             and replace strings (they are now editable!)  This is a
+             break from Pico's (inconsistent) interface, so if you
+             don't like the new way, "Pico" mode (-p on the command
+             line or Meta-P within nano) still works the "old" way.
                  Other new features include being able to deal with
-             search strings of any length, a new internal spell
-             feature (courtesy of Mr. Rocco Corsi) and tab completion
-             when reading in or writing out files!  There's also the
-             usual billion or so bug fixes.  Feedback on this release
-             is welcome because so much has changed, especially with
-             the previous string display in search and replace.
-             Email -> nano@nano-editor.org <-.  If you like
-             something, don't like something, or just want to order a
-             pizza, let us know!
+             search strings of any length, a new internal spell feature
+             (courtesy of Mr. Rocco Corsi) and tab completion when
+             reading in or writing out files!  There's also the usual
+             billion or so bug fixes.  Feedback on this release is
+             welcome because so much has changed, especially with the
+             previous string display in search and replace.  Email
+             -> nano@nano-editor.org <-.  If you like something,
+             don't like something, or just want to order a pizza,
+             let us know!
 
 2000.10.02 - Nano 0.9.19 is the "Chris is getting married in less than
              a week and needs a distraction" release.  There are only
@@ -1723,12 +1914,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
@@ -1743,10 +1933,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.
 
@@ -1757,15 +1947,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
@@ -1843,19 +2032,19 @@
              it is yours to take care of and keep up to date.
 
 2000.03.01 - Well, to continue my trend of going back on my previous
-             release's comments, nano 0.8.7 is released.  The
-             crashing behavior was still occurring, and this most
-             recent fix also fixes some other wrapping problems, so
-             here you go.  There may be another release soon, there
-             may not be, is that vague enough? =)
+             release's comments, nano 0.8.7 is released.  The crashing
+             behavior was still occurring, and this most recent fix
+             also fixes some other wrapping problems, so here you go.
+             There may be another release soon, there may not be, is
+             that vague enough? =)
 
 2000.02.25 - More minor bugfixes in 0.8.6, the bizarre behavior at the
              end of a page has ceased, thankfully.  I'm also moving
              next weekend, so don't be shocked if you don't see a new
              version of nano next week  =-)
 
-2000.02.11 - Okay, here we go again.  Aside from a few minor fixes and
-             some under-the-hood changes, you won't notice much
+2000.02.11 - Okay, here we go again.  Aside from a few minor fixes
+             and some under-the-hood changes, you won't notice much
              different in this version of nano.  I haven't gotten
              much feedback on the help feature, is it simply amazing
              or does no one care?  Write and let me know! =)
@@ -1870,23 +2059,22 @@
              address nano@asty.org for bugs, etc.
 
 2000.02.02 - Okay, I hate to go back on what I said in the last release,
-             but I may be changing jobs very soon.  I will release
-             version 0.8.2 as is (no i18n, no help menu (yet)).  I
-             expect things to settle down by the end of next week,
-             and then I can try to start on the i18n support and help
-             menu; look for these new features in version 0.8.5 to
-             0.9.0.
+             but I may be changing jobs very soon.  I will release version
+             0.8.2 as is (no i18n, no help menu (yet)).  I expect things
+             to settle down by the end of next week, and then I can try to
+             start on the i18n support and help menu; look for these new
+             features in version 0.8.5 to 0.9.0.
 
 2000.01.28 - Nano 0.8.1 marks our first official step toward
-             internationalization (i18n) and the help system (^G).  I
-             will be merging in Jordi's patches for initial i18n in
-             the next version, and will implement the help system
+             internationalization (i18n) and the help system (^G).
+             I will be merging in Jordi's patches for initial i18n
+             in the next version, and will implement the help system
              with i18n built into it shortly after that.  Please
              don't hesitate to send bug reports, as long as you're
              sure the fault lies with nano =-).
 
-2000.01.25 - Nano 0.8.0 is officially the 'let's try and be at least a
-             little portable, mmmmkay?' release.  There are many
+2000.01.25 - Nano 0.8.0 is officially the "let's try and be at least
+             a little portable, mmmmkay?" release.  There are many
              portability checks and fixes; many thanks to Andy Kahn
              for his patches.  I removed the broken do_spell behavior
              with the 'spell' program; for now, we only try to call
@@ -1896,31 +2084,29 @@
 2000.01.24 - Nano 0.7.9 features many new features.  Among them are a
              new autoindent feature (-i, --autoindent), tempfile flag
              like Pico's -t flag (-t, --tempfile), and preliminary
-             spelling program support.  The spelling function tries
-             to run 'spell' and then 'ispell' in that order, but you
-             can specify another spelling program with -s or
-             --speller.
+             spelling program support.  The spelling function tries to
+             run 'spell' and then 'ispell' in that order, but you can
+             specify another spelling program with -s or --speller.
 
-2000.01.17 - Nano 0.7.7 is officially the 'way too much stuff changed this
-             release' release.  It's the busy time at work for me, so
-             please don't get offended if your patch doesn't get
-             included in the next immediate version of nano.  I'm
-             sure all the changes in this release will cause a few
-             bugs, so 0.7.8 will primarily be about fixing those
-             bugs.
+2000.01.17 - Nano 0.7.7 is officially the "way too much stuff changed
+             this release" release.  It's the busy time at work for me,
+             so please don't get offended if your patch doesn't get
+             included in the next immediate version of nano.  I'm sure
+             all the changes in this release will cause a few bugs, so
+             0.7.8 will primarily be about fixing those bugs.
 
              Things added this release include resizability (kinda),
              new -x and -c flags (see nano -h for help), long command
              line flag support, and the usual array of bugfixes.
 
-2000.01.15 - Nano 0.7.6 is officially the 'lightning' release.  It now
-             loads large files much faster than previous versions,
-             and is even much faster than Pico or vi in some rather
-             rudimentary tests.  Many thanks to Adam Rogoyski for the
-             read_byte patch!
+2000.01.15 - Nano 0.7.6 is officially the "lightning" release.
+             It now loads large files much faster than previous
+             versions, and is even much faster than Pico or vi
+             in some rather rudimentary tests.  Many thanks to
+             Adam Rogoyski for the read_byte patch!
 
-2000.01.09 - As of this version (0.7.4), TIP has officially been renamed
-             to nano.  The new homepage is at
-             http://faculty.plattsburgh.edu/astyanax/nano.  Please
-             update your bookmarks, tell your friends, and all that
-             jazz.
+2000.01.09 - As of this version (0.7.4), TIP has officially
+             been renamed to nano.  The new homepage is at
+             http://faculty.plattsburgh.edu/astyanax/nano.
+             Please update your bookmarks, tell your friends,
+             and all that jazz.

README

@@ -1,10 +1,42 @@
 
           GNU nano -- a simple editor, inspired by Pico
 
-Overview
+Purpose
 
-    The nano project was started because of a few "problems" with the
-    wonderfully easy-to-use and friendly Pico text editor.
+    Nano is a small and simple text editor for use on the terminal.
+    It copied the interface and key bindings of the Pico editor but
+    added several missing features: undo/redo, syntax highlighting,
+    line numbers, softwrapping, multiple buffers, selecting text by
+    holding Shift, search-and-replace with regular expressions, and
+    several other conveniences.
+
+Appearance
+
+    In rough ASCII graphics, this is what nano's screen looks like:
+
+   ____________________________________________________________________
+  |  GNU nano 6.1                  filename                  Modified  |
+   --------------------------------------------------------------------
+  | This is the text window, displaying the contents of a 'buffer',    |
+  | the contents of the file you are editing.                          |
+  |                                                                    |
+  | The top row of the screen is the 'title bar'; it shows nano's      |
+  | version, the name of the file, and whether you modified it.        |
+  | The two bottom rows display the most important shortcuts; in       |
+  | those lines ^ means Ctrl.  The third row from the bottom shows     |
+  | some feedback message, or gets replaced with a prompt bar when     |
+  | you tell nano to do something that requires extra input.           |
+  |                                                                    |
+   --------------------------------------------------------------------
+  |                       [ Some status message ]                      |
+  |^G Help       ^O Write Out  ^W Where Is   ^K Cut        ^T Execute  |
+  |^X Exit       ^R Read File  ^\ Replace    ^U Paste      ^J Justify  |
+   --------------------------------------------------------------------
+
+Origin
+
+    The nano project was started in 1999 because of a few "problems"
+    with the wonderfully easy-to-use and friendly Pico text editor.
 
     First and foremost was its license: the Pine suite does not use
     the GPL, and (before using the Apache License) it had unclear
@@ -23,9 +55,22 @@ Overview
     The nano editor is an official GNU package.  For more information on
     GNU and the Free Software Foundation, please see https://www.gnu.org/.
 
+License
+
+    Nano's code and documentation are covered by the GPL version 3 or
+    (at your option) any later version, except for two functions that
+    were copied from busybox which are under a BSD license.  Nano's
+    documentation is additionally covered by the GNU Free Documentation
+    License version 1.2 or (at your option) any later version.  See the
+    files COPYING and COPYING.DOC for the full text of these licenses.
+
+    When in any file of this package a copyright notice mentions a
+    year range (such as 1999-2011), it is a shorthand for a list of
+    all the years in that interval.
+
 How to compile and install nano
 
-    Download the latest nano source tarball, then:
+    Download the latest nano source tarball, and then:
 
         tar -xvf nano-x.y.tar.gz
         cd nano-x.y
@@ -33,12 +78,13 @@ How to compile and install nano
         make
         make install
 
-    It's that simple.  Use --prefix with configure to override the
-    default installation directory of /usr/local.
+    You will need the header files of ncurses installed for ./configure
+    to succeed -- get them from libncurses-dev (Debian) or ncurses-devel
+    (Fedora) or a similarly named package.  Use --prefix with ./configure
+    to override the default installation directory of /usr/local.
 
-    If you haven't configured with the --disable-nanorc option, after
-    installation you may want to copy the doc/sample.nanorc file to
-    your home directory, rename it to ".nanorc", and then edit it
+    After installation you may want to copy the doc/sample.nanorc file
+    to your home directory, rename it to ".nanorc", and then edit it
     according to your taste.
 
 Web Page
@@ -49,31 +95,28 @@ Mailing Lists
 
     There are three nano-related mailing-lists.
 
-    + info-nano@gnu.org is a very low traffic list used to announce
+    * <info-nano@gnu.org> is a very low traffic list used to announce
       new nano versions or other important info about the project.
-    + help-nano@gnu.org is for those seeking to get help without
+
+    * <help-nano@gnu.org> is for those seeking to get help without
       wanting to hear about the technical details of its development.
-    + nano-devel@gnu.org is the list used by the people that make nano
+
+    * <nano-devel@gnu.org> is the list used by the people that make nano
       and a general development discussion list, with moderate traffic.
 
     To subscribe, send email to <name>-request@gnu.org with a subject
     of "subscribe", where <name> is the list you want to subscribe to.
 
+    The archives of the development and help mailing lists are here:
+
+        https://lists.gnu.org/archive/html/nano-devel/
+        https://lists.gnu.org/archive/html/help-nano/
+
 Bug Reports
 
-    To report a bug, please file a description of the problem on nano's
-    bug tracker (https://savannah.gnu.org/bugs/?group=nano -- hover on
-    "Bugs", then click "Submit new").  The issue may have already been
-    reported, so please look first.
+    If you find a bug, please file a detailed description of the problem
+    on nano's issue tracker: https://savannah.gnu.org/bugs/?group=nano
+    (you will need an account to be able to do so), or send an email
+    to the nano-devel list (no need to subscribe, but mention it if
+    you want to be CC'ed on an answer).
 
-Current Status
-
-    Since version 2.5.0, GNU nano has abandoned the distinction between
-    a stable and a development branch: it is now on a "rolling" release
-    -- fixing bugs and adding new features go hand in hand.
-
-Copyright Years
-
-    When in any file of this package a copyright notice mentions a
-    year range (such as 1999-2011), it is a shorthand for a list of
-    all the years in that interval.

README.GIT

@@ -22,11 +22,11 @@ packages:
 - pkg-config  (version >= 0.22)
 - texinfo     (version >= 4.0)
 
-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.
+You will also need to have the header files for ncurses installed,
+from libncurses-dev on Debian, ncurses-devel on Fedora, or similar.
 
-These should all be available in your distro's package manager or software
-center, or otherwise on any GNU mirror.
+These should all be available in your distro's package manager or
+software center, or otherwise on any GNU mirror.
 
 
 Download the source
@@ -84,7 +84,6 @@ Problems?
 Please submit any bugs you find in the code in git via the bug tracker
 on Savannah (https://savannah.gnu.org/bugs/?group=nano).
 
-
 Contributing something
 ----------------------
 
@@ -114,3 +113,11 @@ to include 'set tabsize 4', or you could use -T4 on the command line.
 To make git display things as intended, you can do:
 
     $ git config --local core.pager "less -x1,5"
+
+To see all types that are used in nano's source code colorized as types,
+you can add these lines to your ~/.nanorc:
+
+    extendsyntax c color green "\<struct (dirent|option|passwd)\>"
+    extendsyntax c color green "\<struct (sigaction|stat|termios)\>"
+    extendsyntax c color green "\<struct (timespec|vt_stat|winsize)\>"
+    extendsyntax c color green "\<([[:lower:]_]+(struct|type)|va_list)\>"

THANKS

@@ -18,6 +18,8 @@ Mihai Cristescu <mihai.cristescu@archlinux.info>      Romanian
 Yavor Doganov <yavor@doganov.org>                     Bulgarian
 Karl Eichwalder <keichwa@gmx.net>                     German
 A. Murat EREN <meren@comu.edu.tr>                     Turkish
+Sveinn í Felli <sv1@fellsnet.is>                      Icelandic
+Marek Felšöci <marek@felsoci.sk>                      Slovak
 Doruk Fisek <dfisek@fisek.com.tr>                     Turkish
 Rafael Fontenelle <rffontenelle@gmail.com>            Brazilian Portuguese
 Pavel Fric <pavelfric@seznam.cz>                      Czech
@@ -73,6 +75,7 @@ Johnny A. Solbu <johnny@solbu.net>                    Norwegian Bokmål
 Pierre Tane <tanep@bigfoot.com>                       French
 Yasuaki Taniguchi <yasuakit@gmail.com>                Japanese
 Jacobo Tarrío <jtarrio@trasno.net>                    Galician
+Andika Triwidada <andika@gmail.com>                   Indonesian
 Francisco Javier Tsao Santín <tsao@members.fsf.org>   Galician
 Balázs Úr <urbalazs@gmail.com>                        Hungarian
 Miquel Vidal <miquel@sindominio.net>                  Catalan

TODO

@@ -1,84 +1,5 @@
-A list of desired features
---------------------------
 
-Somewhat urgent:
-- 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.
+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 4.0:
-- Make undo/redo work also for justifying. [DONE]
-
-For version 2.9:
-- Allow piping (marked) text to an external command and replacing it with
-  the command's output.  That is: implement filtering. [DONE]
-- Allow to record and replay a macro: a stored series of keystrokes. [DONE]
-- Make undo/redo work also for indenting. [DONE]
-
-For version 2.8:
-- Allow text searches in the help viewer. [DONE]
-
-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="e313a5367b1e4edfa19ab5f0d001d0b060a77066"
+gnulib_hash="6ef3d783333346333f35bb181ba90f5bc46c0b29"
 
 modules="
 	futimens
@@ -13,6 +13,7 @@ modules="
 	isblank
 	iswblank
 	lstat
+	mkstemps
 	nl_langinfo
 	regex
 	sigaction
@@ -30,19 +31,31 @@ 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)
 if [ "${gnulib_hash}" != "${curr_hash}" ]; then
+	echo "Pulling..."
 	git pull
-	git checkout -f ${gnulib_hash}
+	git checkout --force ${gnulib_hash}
 fi
 cd .. >/dev/null || exit 1
 
-rm -rf lib
-./gnulib/gnulib-tool \
-	--import \
-	${modules}
+echo "Autopoint..."
+autopoint --force
 
-autoreconf -f -i -s
+rm -rf lib
+echo "Gnulib-tool..."
+./gnulib/gnulib-tool --import ${modules}
+echo
+
+echo "Aclocal..."
+aclocal -I m4
+echo "Autoconf..."
+autoconf
+echo "Autoheader..."
+autoheader
+echo "Automake..."
+automake --add-missing
+echo "Done."

configure.ac

@@ -1,6 +1,6 @@
 # Configuration for GNU nano - a small and user-friendly text editor
 #
-# Copyright (C) 1999-2011, 2013-2020 Free Software Foundation, Inc.
+# Copyright (C) 1999-2011, 2013-2022 Free Software Foundation, Inc.
 # Copyright (C) 2014, 2017 Mike Frysinger
 #
 # GNU nano is free software: you can redistribute it and/or modify
@@ -16,7 +16,7 @@
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see https://www.gnu.org/licenses/.
 
-AC_INIT([GNU nano], [4.8], [nano-devel@gnu.org], [nano])
+AC_INIT([GNU nano], [6.1], [nano-devel@gnu.org], [nano])
 AC_CONFIG_SRCDIR([src/nano.c])
 AC_CANONICAL_HOST
 AM_INIT_AUTOMAKE([1.14])
@@ -36,12 +36,12 @@ gl_cv_glob_lists_symlinks=yes
 
 dnl Checks for programs.
 
-AC_GNU_SOURCE
+AC_USE_SYSTEM_EXTENSIONS
 AC_PROG_CC
 gl_EARLY
 gl_INIT
 AC_PROG_LN_S
-AC_ISC_POSIX
+AC_SEARCH_LIBS([strerror], [cposix])
 AC_SYS_LARGEFILE
 PKG_PROG_PKG_CONFIG
 
@@ -59,7 +59,7 @@ 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 -d .git ; then
+if test -f "$srcdir/roll-a-release.sh" ; then
 	AC_MSG_RESULT([yes])
 	from_git=yes
 else
@@ -73,13 +73,14 @@ 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. ***])
+  *** 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. ***])
+  *** The msgfmt program is missing.
+  *** The gettext package needs to be installed when building from git.])
 	fi
 fi
 
@@ -89,12 +90,6 @@ 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
@@ -111,7 +106,8 @@ AS_HELP_STRING([--disable-color], [Disable color and syntax highlighting]))
 if test "x$enable_tiny" = xyes; then
 	if test "x$enable_color" = xyes; then
 		if test "x$enable_nanorc" != xyes; then
-			AC_MSG_ERROR([--enable-color needs --enable-nanorc to work])
+			AC_MSG_ERROR([
+  ***  --enable-color needs --enable-nanorc to work])
 		fi
 	else
 		enable_color=no
@@ -119,7 +115,8 @@ if test "x$enable_tiny" = xyes; then
 fi
 if test "x$enable_nanorc" = xno; then
 	if test "x$enable_color" = xyes; then
-		AC_MSG_ERROR([--enable-color cannot work with --disable-nanorc])
+		AC_MSG_ERROR([
+  ***  --enable-color cannot work with --disable-nanorc])
 	else
 		# Disabling nanorc silently disables color support.
 		enable_color=no
@@ -134,7 +131,8 @@ AC_ARG_ENABLE(comment,
 AS_HELP_STRING([--disable-comment], [Disable the comment/uncomment function]))
 if test "x$enable_tiny" = xyes; then
 	if test "x$enable_comment" = xyes; then
-		AC_MSG_ERROR([--enable-comment cannot work with --enable-tiny])
+		AC_MSG_ERROR([
+  ***  --enable-comment cannot work with --enable-tiny])
 	else
 		enable_comment=no
 	fi
@@ -159,7 +157,8 @@ AS_HELP_STRING([--disable-help], [Disable the built-in help texts]))
 if test "x$enable_tiny" = xyes; then
 	if test "x$enable_help" = xyes; then
 		if test "x$enable_multibuffer" != xyes; then
-			AC_MSG_ERROR([--enable-help needs --enable-multibuffer to work])
+			AC_MSG_ERROR([
+  ***  --enable-help needs --enable-multibuffer to work])
 		fi
 	else
 		enable_help=no
@@ -167,7 +166,8 @@ if test "x$enable_tiny" = xyes; then
 fi
 if test "x$enable_multibuffer" = xno; then
 	if test "x$enable_help" = xyes; then
-		AC_MSG_ERROR([--enable-help cannot work with --disable-multibuffer])
+		AC_MSG_ERROR([
+  ***  --enable-help cannot work with --disable-multibuffer])
 	else
 		# Disabling multibuffer silently disables the help texts.
 		enable_help=no
@@ -201,6 +201,18 @@ fi
 
 AC_ARG_ENABLE(libmagic,
 AS_HELP_STRING([--disable-libmagic], [Disable detection of file types via libmagic]))
+if test "x$enable_libmagic" = xyes; then
+	if test "x$enable_tiny" = xyes; then
+		if test "x$enable_color" != xyes; then
+			AC_MSG_ERROR([
+  ***  --enable-libmagic needs --enable-color and --enable-nanorc to work])
+		fi
+	fi
+	if test "x$enable_color" = xno; then
+		AC_MSG_ERROR([
+  ***  --enable-libmagic cannot work with --disable-color nor --disable-nanorc])
+	fi
+fi
 
 AC_ARG_ENABLE(linenumbers,
 AS_HELP_STRING([--disable-linenumbers], [Disable line numbering]))
@@ -284,7 +296,8 @@ AC_ARG_ENABLE(wordcomp,
 AS_HELP_STRING([--disable-wordcomp], [Disable the word-completion function]))
 if test "x$enable_tiny" = xyes; then
 	if test "x$enable_wordcomp" = xyes; then
-		AC_MSG_ERROR([--enable-wordcomp cannot work with --enable-tiny])
+		AC_MSG_ERROR([
+  ***  --enable-wordcomp cannot work with --enable-tiny])
 	else
 		enable_wordcomp=no
 	fi
@@ -334,209 +347,16 @@ AS_HELP_STRING([--enable-altrcname], [Specify an alternate rcfile name (default:
 	AC_DEFINE_UNQUOTED(RCFILE_NAME, "$enableval", [Specify an alternate rcfile name (default: .nanorc).]) rcfilename=$enableval
 fi])
 
-
-AC_MSG_CHECKING([whether to use slang])
-CURSES_LIB_NAME=""
-AC_ARG_WITH(slang,
-AS_HELP_STRING([--with-slang[=DIR]], [Use the slang library instead of curses]),
-[    case "$with_slang" in
-	no)
-		AC_MSG_RESULT(no)
-		;;
-	*)
-		AC_MSG_RESULT(yes)
-
-		if test x$with_slang != xyes; then
-			# Add additional search path.
-			LDFLAGS="-L$with_slang/lib $LDFLAGS"
-			CPPFLAGS="-I$with_slang/include $CPPFLAGS"
-		fi
-
-		if test "x$enable_utf8" != xno; then
-			AC_CHECK_HEADER(slcurses.h,
-				AC_MSG_CHECKING([for SLutf8_enable in -lslang])
-				_libs=$LIBS
-				LIBS="$LIBS -lslang"
-				AC_TRY_RUN([
-#include <slcurses.h>
-int main(void)
-{
-	SLutf8_enable(1);
-	return 0;
-}],
-					[AC_MSG_RESULT(yes)
-					AC_DEFINE(USE_SLANG, 1, [Define this to use the slang wrappers for curses instead of native curses.])
-					CURSES_LIB_WIDE=yes
-					if test x$with_slang != xyes; then
-						CURSES_LIB="-L${with_slang}/lib -lslang"
-					else
-						CURSES_LIB="-lslang"
-					fi
-					CURSES_LIB_NAME=slang],
-					[AC_MSG_RESULT(no)
-
-					# We might need the term library.
-					for termlib in ncurses curses termcap terminfo termlib; do
-						AC_CHECK_LIB([${termlib}], tputs, [tcap="-l$termlib"])
-						test -n "$tcap" && break
-					done
-
-					AC_MSG_CHECKING([for SLutf8_enable in -lslang $tcap])
-					LIBS="$LIBS $tcap"
-					AC_TRY_RUN([
-#include <slcurses.h>
-int main(void)
-{
-	SLutf8_enable(1);
-	return 0;
-}],
-						[AC_MSG_RESULT(yes)
-						AC_DEFINE(USE_SLANG, 1, [Define this to use the slang wrappers for curses instead of native curses.])
-						CURSES_LIB_WIDE=yes
-						if test x$with_slang != xyes; then
-							CURSES_LIB="-L${with_slang}/lib -lslang $tcap"
-						else
-							CURSES_LIB="-lslang $tcap"
-						fi
-						CURSES_LIB_NAME=slang],
-						[AC_MSG_RESULT(no)
-
-						# We might need the math library.
-						AC_MSG_CHECKING([for SLutf8_enable in -lslang $tcap -lm])
-						LIBS="$LIBS -lm"
-						AC_TRY_RUN([
-#include <slcurses.h>
-int main(void)
-{
-	SLutf8_enable(1);
-	return 0;
-}],
-							[AC_MSG_RESULT(yes)
-							AC_DEFINE(USE_SLANG, 1, [Define this to use the slang wrappers for curses instead of native curses.])
-							CURSES_LIB_WIDE=yes
-							if test x$with_slang != xyes; then
-								CURSES_LIB="-L${with_slang}/lib -lslang $tcap -lm"
-							else
-								CURSES_LIB="-lslang $tcap -lm"
-							fi
-							CURSES_LIB_NAME=slang],
-							[AC_MSG_RESULT(no)],
-	AC_MSG_WARN([*** Can not use slang when cross-compiling]))],
-	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.  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
-			# Reset libs if the above slang tests failed.
-			if test "x$enable_utf8" != xno; then
-				LIBS=$_libs
-			fi
-
-			AC_CHECK_HEADER(slcurses.h,
-				AC_MSG_CHECKING([for SLtt_initialize in -lslang])
-				_libs=$LIBS
-				LIBS="$LIBS -lslang"
-				AC_TRY_RUN([
-#include <slcurses.h>
-int main(void)
-{
-	SLtt_initialize(NULL);
-	return 0;
-}],
-					[AC_MSG_RESULT(yes)
-					AC_DEFINE(USE_SLANG, 1, [Define this to use the slang wrappers for curses instead of native curses.])
-					if test x$with_slang != xyes; then
-						CURSES_LIB="-L${with_slang}/lib -lslang"
-					else
-						CURSES_LIB="-lslang"
-					fi
-					CURSES_LIB_NAME=slang],
-					[AC_MSG_RESULT(no)
-
-					# We might need the term library.
-					for termlib in ncurses curses termcap terminfo termlib; do
-						AC_CHECK_LIB([${termlib}], tputs, [tcap="-l$termlib"])
-						test -n "$tcap" && break
-					done
-
-					AC_MSG_CHECKING([for SLtt_initialize in -lslang $tcap])
-					LIBS="$LIBS $tcap"
-					AC_TRY_RUN([
-#include <slcurses.h>
-int main(void)
-{
-	SLtt_initialize(NULL);
-	return 0;
-}],
-						[AC_MSG_RESULT(yes)
-						AC_DEFINE(USE_SLANG, 1, [Define this to use the slang wrappers for curses instead of native curses.])
-						if test x$with_slang != xyes; then
-							CURSES_LIB="-L${with_slang}/lib -lslang $tcap"
-						else
-							CURSES_LIB="-lslang $tcap"
-						fi
-						CURSES_LIB_NAME=slang],
-						[AC_MSG_RESULT(no)
-
-						# We might need the math library.
-						AC_MSG_CHECKING([for SLtt_initialize in -lslang $tcap -lm])
-						LIBS="$LIBS -lm"
-						AC_TRY_RUN([
-#include <slcurses.h>
-int main(void)
-{
-	SLtt_initialize(NULL);
-	return 0;
-}],
-							[AC_MSG_RESULT(yes)
-							AC_DEFINE(USE_SLANG, 1, [Define this to use the slang wrappers for curses instead of native curses.])
-							if test x$with_slang != xyes; then
-								CURSES_LIB="-L${with_slang}/lib -lslang $tcap -lm"
-							else
-								CURSES_LIB="-lslang $tcap -lm"
-							fi
-							CURSES_LIB_NAME=slang],
-							[AC_MSG_RESULT(no)],
-	AC_MSG_WARN([*** Can not use slang when cross-compiling]))],
-	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.  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
-			LIBS=$_libs
-		fi
-
-		if test x$with_slang != xyes; then
-			LDFLAGS=${_ldflags}
-		fi
-		;;
-	esac], [AC_MSG_RESULT(no)])
-
 dnl Checks for functions.
 
 if test "x$enable_utf8" != xno; then
-	AC_CHECK_FUNCS(iswalnum iswpunct mblen mbstowcs mbtowc wctomb)
+	AC_CHECK_FUNCS(iswalpha iswalnum iswpunct mbstowcs wctomb)
 fi
-dnl Checks for typedefs, structures, and compiler characteristics.
 
 dnl Checks for available flags.
 
 AX_CHECK_COMPILE_FLAG([-Wall], [CFLAGS="$CFLAGS -Wall"], [], [])
 
-dnl Checks for library functions.
-
-AC_TYPE_SIGNAL
-
 dnl Checks for libraries.
 
 if eval "test x$CURSES_LIB_NAME = x"; then
@@ -566,9 +386,9 @@ if eval "test x$CURSES_LIB_NAME = x"; then
 			CURSES_LIB=`$NCURSESW_CONFIG --libs`
 			LIBS="$CURSES_LIB $LIBS"
 			CPPFLAGS="`$NCURSESW_CONFIG --cflags` $CPPFLAGS"
-			AC_CHECK_LIB(ncursesw, get_wch, [CURSES_LIB_NAME=ncursesw CURSES_LIB_WIDE=yes])
+			AC_CHECK_LIB(ncursesw, wget_wch, [CURSES_LIB_NAME=ncursesw CURSES_LIB_WIDE=yes])
 		else
-			AC_CHECK_LIB(ncursesw, get_wch, [CURSES_LIB="-lncursesw" CURSES_LIB_NAME=ncursesw CURSES_LIB_WIDE=yes])
+			AC_CHECK_LIB(ncursesw, wget_wch, [CURSES_LIB="-lncursesw" CURSES_LIB_NAME=ncursesw CURSES_LIB_WIDE=yes])
 		fi
 		LIBS="$OLDLIBS"
 	fi
@@ -582,7 +402,7 @@ if eval "test x$CURSES_LIB_NAME = x"; then
 	AC_CHECK_HEADERS(curses.h)
 
 	if test "x$enable_utf8" != xno; then
-		AC_CHECK_LIB(curses, get_wch, [CURSES_LIB="-lcurses" CURSES_LIB_NAME=curses CURSES_LIB_WIDE=yes])
+		AC_CHECK_LIB(curses, wget_wch, [CURSES_LIB="-lcurses" CURSES_LIB_NAME=curses CURSES_LIB_WIDE=yes])
 	fi
 
 	if eval "test x$CURSES_LIB_NAME = x"; then
@@ -593,10 +413,10 @@ 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.
+  *** from libncurses-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],
@@ -609,36 +429,31 @@ AC_CHECK_LIB([$CURSES_LIB_NAME], [key_defined],
 			 [AC_DEFINE(HAVE_KEY_DEFINED, 1, [Define this if your curses library has the key_defined() function.])],
 			 [], [$CURSES_LIB])
 
-dnl Parse any configure options.
-
 LIBS="$LIBS $CURSES_LIB"
 
 AC_SUBST(CURSES_LIB)
 
 if test "x$enable_utf8" != xno && \
 	test x$CURSES_LIB_WIDE = xyes && \
+	test x$ac_cv_func_iswalpha = xyes && \
 	test x$ac_cv_func_iswalnum = xyes && \
 	test x$ac_cv_func_iswpunct = xyes && \
-	test x$ac_cv_func_mblen = xyes && \
 	test x$ac_cv_func_mbstowcs = xyes && \
-	test x$ac_cv_func_mbtowc = xyes && \
 	test x$ac_cv_func_wctomb = xyes; then
 		AC_DEFINE(ENABLE_UTF8, 1, [Define this if your system has sufficient UTF-8 support.])
 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
+  *** 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
 
@@ -665,16 +480,16 @@ AC_DEFINE_UNQUOTED(NANO_REG_EXTENDED, $nano_reg_extended,
 				   [Flag(s) to use to get the full range of extended regular expressions])
 
 if test x$color_support = xyes; then
-#    if test x$CURSES_LIB_NAME = xcurses; then
-		AC_MSG_CHECKING([whether _XOPEN_SOURCE_EXTENDED is needed])
-		AC_TRY_RUN([
+	AC_MSG_CHECKING([whether _XOPEN_SOURCE_EXTENDED is needed])
+	AC_RUN_IFELSE([AC_LANG_SOURCE([[
 #include <curses.h>
 int main(void)
 {
 	int testcolor = COLOR_WHITE;
 	return 0;
-}], AC_MSG_RESULT(no),
-	    AC_TRY_RUN([
+}]])],
+	AC_MSG_RESULT(no),
+	AC_RUN_IFELSE([AC_LANG_SOURCE([[
 #ifndef _XOPEN_SOURCE_EXTENDED
 #define _XOPEN_SOURCE_EXTENDED 1
 #endif
@@ -683,35 +498,38 @@ int main(void)
 {
 	int testcolor = COLOR_WHITE;
 	return 0;
-}],
-		AC_DEFINE(NEED_XOPEN_SOURCE_EXTENDED, 1, [Define this if you need the _XOPEN_SOURCE_EXTENDED macro for color support.])
-		AC_MSG_RESULT(yes),
-		AC_MSG_RESULT(not sure)
-		AC_MSG_WARN([*** Couldn't successfully compile basic color test with or without _XOPEN_SOURCE_EXTENDED])
-		AC_MSG_WARN([*** This build may not compile. Consider configuring with --disable-color or installing ncurses])),
-		AC_MSG_WARN([*** Can't check need for _XOPEN_SOURCE_EXTENDED when cross-compiling]))
-#    fi
+}]])],
+	AC_DEFINE(NEED_XOPEN_SOURCE_EXTENDED, 1, [Define this if you need the _XOPEN_SOURCE_EXTENDED macro for color support.])
+	AC_MSG_RESULT(yes),
+	AC_MSG_RESULT(not sure)
+	AC_MSG_WARN([
+  *** Couldn't successfully compile basic color test with or without
+  *** _XOPEN_SOURCE_EXTENDED.  This build may not compile.  Consider
+  *** configuring with --disable-color or installing ncurses.])),
+	AC_MSG_WARN([
+  *** Can't check need for _XOPEN_SOURCE_EXTENDED when cross-compiling.]))
 fi
 
 AC_MSG_CHECKING([whether LINES and COLS can be redefined])
-AC_TRY_RUN([
+AC_RUN_IFELSE([AC_LANG_SOURCE([[
 #include <curses.h>
 int main(void)
 {
 	LINES = 80;
 	COLS = 25;
 	return 0;
-}],
+}]])],
 AC_DEFINE(REDEFINING_MACROS_OK, 1, [Define this if you know your curses library allows LINES and COLS to be redefined to deal with a resizing bug.])
 AC_MSG_RESULT(yes),
 AC_MSG_RESULT(no),
-AC_MSG_WARN([*** Can't check for macro redefinability when cross-compiling]))
+AC_MSG_WARN([
+  *** Can't check for macro redefinability when cross-compiling.]))
 
 AS_IF([test "x$enable_libmagic" != "xno"], [
-  AC_CHECK_HEADERS([magic.h])
-  AC_CHECK_LIB(magic, magic_open)
-  AC_CHECK_HEADERS([zlib.h])
-  AC_CHECK_LIB(z, inflate)
+	AC_CHECK_HEADERS([magic.h])
+	AC_CHECK_LIB(magic, magic_open)
+	AC_CHECK_HEADERS([zlib.h])
+	AC_CHECK_LIB(z, inflate)
 ])
 
 # Check for groff html support.
@@ -720,8 +538,8 @@ 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. ***])
+  *** 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])
@@ -738,7 +556,8 @@ m4/Makefile
 po/Makefile.in
 src/Makefile
 syntax/Makefile
-nano.spec
 ])
 
 AC_OUTPUT
+
+make showinfo

doc/cheatsheet.html

@@ -2,9 +2,9 @@
 <html lang="en">
 
 <head>
-<title>Cheatsheet for nano</title>
+<title>Cheatsheet for GNU 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="description" content="A concise overview of the command shortcuts for nano, the editor, grouped by category.">
 <meta name="keywords" content="cheatsheet, nano, editor, shortcuts, keystrokes, functions, operations, commands">
 <meta name="author" content="Benno Schulenberg">
 </head>
@@ -55,15 +55,15 @@
 <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>Ctrl+Shift+Del &nbsp;&nbsp;</td><td>Delete word to the left</td></tr>
-<tr><td>Ctrl+Del</td><td>Delete word to the right</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>Run a spell check</td></tr>
+<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>
@@ -79,14 +79,14 @@
 <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+<b>&larr;</b></td><td>One word backward</td></tr>
+<tr><td>Ctrl+<b>&rarr;</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+<b>&uarr;</b></td><td>To previous block</td></tr>
+<tr><td>Ctrl+<b>&darr;</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>
@@ -98,8 +98,8 @@
 <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+<b>&uarr;</b></td><td>Scroll viewport up</td></tr>
+<tr><td>Alt+<b>&darr;</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>
@@ -108,7 +108,7 @@
 <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>Alt+D</td><td>Report line/word/character count</td></tr>
 <tr><td>Ctrl+G</td><td>Display help text</td></tr>
 </tbody></table>
 <br>
@@ -118,11 +118,11 @@
 <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+V</td><td>Enter next keystroke verbatim</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>Alt+X</td><td>Hide or unhide the help lines</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>
 

doc/faq.html

@@ -5,6 +5,9 @@
   <title>The GNU nano editor FAQ</title>
   <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.">
+  <style>
+    .indented { margin-left: 2em; font-family: courier; font-size: 110%; }
+  </style>
 </head>
 
 <body text="#330000" bgcolor="#ffffff" link="#0000ef" vlink="#51188e" alink="#ff0000">
@@ -40,13 +43,13 @@
 </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.1">4.1. Alt+Up does nothing on a Linux console. How can I make it scroll?</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. 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.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>
@@ -89,7 +92,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>4.8</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>6.1</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%">
@@ -127,39 +130,39 @@
 <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.tar.gz</b></p>
+  <p class="indented"><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/</b><br>
+  <p class="indented"><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>
+  <b>make install</b>&nbsp;&nbsp; #(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 class="indented"><b>./configure --prefix=/usr</b></p>
   <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
-  <b>--disable-color</b>         Disable color and syntax highlighting
-  <b>--disable-comment</b>       Disable the comment/uncomment function
-  <b>--disable-extra</b>         Disable the easter egg
-  <b>--disable-help</b>          Disable the built-in help texts
-  <b>--disable-histories</b>     Disable the saving of search strings and cursor positions
-  <b>--disable-justify</b>       Disable the justify/unjustify functions
-  <b>--disable-libmagic</b>      Disable the use of libmagic for determining a file's syntax
-  <b>--disable-linenumbers</b>   Disable line numbering
-  <b>--disable-mouse</b>         Disable mouse support
-  <b>--disable-multibuffer</b>   Disable the opening of multiple file buffers
-  <b>--disable-nanorc</b>        Disable the use of .nanorc files
-  <b>--disable-operatingdir</b>  Disable the setting of an operating directory
-  <b>--disable-speller</b>       Disable the spell-checker functions
-  <b>--disable-tabcomp</b>       Disable the tab-completion functions
-  <b>--disable-wordcomp</b>      Disable the word-completion function
-  <b>--disable-wrapping</b>      Disable all hard-wrapping of text</pre>
+    <b>--disable-browser</b>       Disable the built-in file browser
+    <b>--disable-color</b>         Disable color and syntax highlighting
+    <b>--disable-comment</b>       Disable the comment/uncomment function
+    <b>--disable-extra</b>         Disable the easter egg
+    <b>--disable-help</b>          Disable the built-in help texts
+    <b>--disable-histories</b>     Disable the saving of search strings and cursor positions
+    <b>--disable-justify</b>       Disable the justify/unjustify functions
+    <b>--disable-libmagic</b>      Disable the use of libmagic for determining a file's syntax
+    <b>--disable-linenumbers</b>   Disable line numbering
+    <b>--disable-mouse</b>         Disable mouse support
+    <b>--disable-multibuffer</b>   Disable the opening of multiple file buffers
+    <b>--disable-nanorc</b>        Disable the use of .nanorc files
+    <b>--disable-operatingdir</b>  Disable the setting of an operating directory
+    <b>--disable-speller</b>       Disable the spell-checker functions
+    <b>--disable-tabcomp</b>       Disable the tab-completion functions
+    <b>--disable-wordcomp</b>      Disable the word-completion function
+    <b>--disable-wrapping</b>      Disable all hard-wrapping of text</pre>
   <p>There's also the <b>--enable-tiny</b> option which disables everything above, as well as some larger chunks of the program (like the 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.6"></a>3.6. Tell me more about this multibuffer stuff!</h3>
@@ -175,17 +178,40 @@
 <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 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: <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>
+<h3><a name="4.1"></a>4.1. Alt+Up does nothing on a Linux console. How can I make it scroll?</h3>
+<blockquote><p>On Debian and its derivatives, the <b>Alt+Up</b> keystroke on a Linux console
+  produces by default a 'KeyboardSignal', which normally does absolutely nothing and is useless
+  for the average user.  To get the keystroke to do what it ought to do (scroll the viewport
+  one row up), run this in a Linux console:</p>
+  <p class="indented"><b>dumpkeys --full | sed s/KeyboardSignal/Up/ | sudo loadkeys -</b></p>
+  <p>You will need to run this command whenever you first switch to a Linux console.</p>
+  <p>Or you can (as root) execute the following little script just once:</p>
+  <p class="indented"><b>for file in /etc/console-setup/cached*.kmap.gz; do<br>
+  &nbsp;&nbsp;&nbsp;&nbsp;gunzip $file;<br>
+  &nbsp;&nbsp;&nbsp;&nbsp;sed -i 's/KeyboardSignal/Up/' ${file%.gz};<br>
+  &nbsp;&nbsp;&nbsp;&nbsp;gzip ${file%.gz};<br>
+  done</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>--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>
@@ -202,16 +228,16 @@
 <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 class="indented"><b>export EDITOR=/usr/local/bin/nano</b></p>
   <p>or, if you use tcsh, put this in your <b>.cshrc</b> file:</p>
-  <p><b>setenv EDITOR /usr/local/bin/nano</b></p>
+  <p class="indented"><b>setenv EDITOR /usr/local/bin/nano</b></p>
   <p>Change /usr/local/bin/nano to wherever nano is installed on your system. Type &quot;which nano&quot; to find out. This will not take effect until the next time you log in. So log out and back in again.</p>
   <p>Then, on top of that, if you use Pine, you must go into setup (type <b>S</b> at the main menu), and then configure (type <b>C</b>). Hit Enter on the lines that say:</p>
-  <p><b>[ ] enable-alternate-editor-cmd</b><br>
+  <p class="indented"><b>[ ] enable-alternate-editor-cmd</b><br>
   <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</b></p>
+  <p class="indented"><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%">
 

doc/nano.1

@@ -1,4 +1,4 @@
-.\" Copyright (C) 1999-2011, 2013-2020 Free Software Foundation, Inc.
+.\" Copyright (C) 1999-2011, 2013-2022 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:
@@ -16,7 +16,7 @@
 .\"   Documentation License along with this program.  If not, see
 .\"   <https://www.gnu.org/licenses/>.
 .\"
-.TH NANO 1 "version 4.8" "February 2020"
+.TH NANO 1 "version 6.1" "February 2022"
 
 .SH NAME
 nano \- Nano's ANOther editor, inspired by Pico
@@ -27,20 +27,6 @@ nano \- Nano's ANOther editor, inspired by Pico
 .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
@@ -58,7 +44,7 @@ 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:
+the first occurrence of the word "Foo", you would do:
 .sp
 .RS 4
 .BI "nano +c/Foo " file
@@ -77,11 +63,11 @@ 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.
 .sp
-When a more precise piece of text needs to be cut or copied, one can mark
+When a more precise piece of text needs to be cut or copied, you 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.
+cutbuffer.  You can also save the marked text to a file with \fB^O\fR, or
+spell check it with \fB^T^T\fR.
 .sp
 On some terminals, text can be selected also by holding down Shift while
 using the arrow keys.  Holding down the Ctrl or Alt key too will increase
@@ -93,6 +79,20 @@ 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
 .BR nanorc (5).
 
+.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 OPTIONS
 .TP
 .BR \-A ", " \-\-smarthome
@@ -118,7 +118,8 @@ by setting the options \fBtitlecolor\fP, \fBstatuscolor\fP, \fBkeycolor\fP,
 nanorc file.  See \fBnanorc\fR(5).
 .TP
 .BR \-E ", " \-\-tabstospaces
-Convert typed tabs to spaces.
+Convert each typed tab to spaces -- to the number of spaces
+that a tab at that position would take up.
 .TP
 .BR \-F ", " \-\-multibuffer
 Read a file into a new buffer by default.
@@ -139,10 +140,12 @@ 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.
+Interpret escape sequences directly, instead of asking \fBncurses\fR
+to translate them.  (If you need this option to get some keys to work
+properly, it means that the terminfo terminal description that is used
+does not fully match the actual behavior of your terminal.  This can
+happen when you ssh into a BSD machine, for example.)
+Using this option disables \fBnano\fR's mouse support.
 .TP
 .BR \-L ", " \-\-nonewlines
 Don't automatically add a newline when a text does not end with one.
@@ -155,10 +158,9 @@ hard-wrapping occurs or when text is justified.
 .BR \-N ", " \-\-noconvert
 Disable automatic conversion of files from DOS/Mac format.
 .TP
-.BR \-O ", " \-\-morespace
-Obsolete and ignored option, since the line below the title bar is included
-into the editing space by default.  If you prefer to keep this line blank,
-use \fB\-e\fR or \fB\-\-emptyline\fR.
+.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,
@@ -166,7 +168,7 @@ and place it at that position again upon reopening such a file.
 .TP
 .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.
+The default value is "\fB^([\ \\t]*([!#%:;>|}]|//))+\fR".
 (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.
@@ -180,19 +182,23 @@ 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
-Obsolete and ignored option, since smooth scrolling has become the default.
-If you prefer the chunk-by-chunk scrolling behavior,
-use \fB\-j\fR or \fB\-\-jumpyscrolling\fR.
+.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
-\fInumber\fP must be greater than 0.  The default value is 8.
+\fInumber\fR must be greater than 0.  The default value is \fB8\fR.
 .TP
 .BR \-U ", " \-\-quickblank
-Do quick status-bar blanking: status-bar messages will disappear after 1
-keystroke instead of 25.  Note that option \fB\-c\fR (\fB\-\-constantshow\fR)
-overrides this.
+Make status-bar messages disappear after 1 keystroke instead of after 20.
+Note that option \fB\-c\fR (\fB\-\-constantshow\fR) overrides this.
+When option \fB\-\-minibar\fR or \fB\-\-zero\fR is in effect,
+\fB\-\-quickblank\fR makes a message disappear after
+0.8 seconds instead of after the default 1.5 seconds.
+.
 .TP
 .BR \-V ", " \-\-version
 Show the current version number and exit.
@@ -203,8 +209,8 @@ 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
@@ -261,6 +267,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
@@ -281,22 +288,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 ", " \-\-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
 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.
+The default value is \fB\-8\fR.
 .TP
 .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.
+using the built-in corrector that calls \fBhunspell\fR(1) or \fBspell\fR(1).
 .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
@@ -312,24 +325,54 @@ unless \fB\-\-restricted\fR is given too.
 Do not automatically hard-wrap the current line when it becomes overlong.
 This is the default.  (This option is the opposite of \fB\-b\fR
 (\fB\-\-breaklonglines\fR) -- the last one given takes effect.)
-
 .TP
 .BR \-x ", " \-\-nohelp
 Don't show the two help lines at the bottom of the screen.
 .TP
 .BR \-y ", " \-\-afterends
-Make Ctrl+Right stop at word ends instead of beginnings.
+Make Ctrl+Right and Ctrl+Delete stop at word ends instead of beginnings.
 .TP
-.BR \-z ", " \-\-suspend
-Enable the suspend ability.
+.BR \-z ", " \-\-suspendable
+Obsolete option; ignored.  Suspension is enabled by default,
+reachable via \fB^T^Z\fR.  (If you want a plain \fB^Z\fR to
+suspend nano, add \fBbind ^Z suspend main\fR to your nanorc.)
 .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 \-$').
+.BR \-% ", " \-\-stateflags
+Use the top-right corner of the screen for showing some state flags:
+\fBI\fR when auto-indenting, \fBM\fR when the mark is on, \fBL\fR when
+hard-wrapping (breaking long lines), \fBR\fR when recording a macro,
+and \fBS\fR when soft-wrapping.
+When the buffer is modified, a star (\fB*\fR) is shown after the
+filename in the center of the title bar.
+.TP
+.BR \-_ ", " \-\-minibar
+Suppress the title bar and instead show information about
+the current buffer at the bottom of the screen, in the space
+for the status bar.  In this "minibar" the filename is shown
+on the left, followed by an asterisk if the buffer has been modified.
+On the right are displayed the current line and column number, the
+code of the character under the cursor (in Unicode format: U+xxxx),
+the same flags as are shown by \fB\-\-stateflags\fR, and a percentage
+that expresses how far the cursor is into the file (linewise).
+When a file is loaded or saved, and also when switching between buffers,
+the number of lines in the buffer is displayed after the filename.
+This number is cleared upon the next keystroke, or replaced with an
+[i/n] counter when multiple buffers are open.
+The line plus column numbers and the character code are displayed only when
+\fB\-\-constantshow\fR is used, and can be toggled on and off with \fBM-C\fR.
+The state flags are displayed only when \fB\-\-stateflags\fR is used.
+.TP
+.BR \-0 ", " \-\-zero
+Hide all elements of the interface (title bar, status bar, and help lines)
+and use all rows of the terminal for showing the contents of the buffer.
+The status bar appears only when there is a significant message,
+and disappears after 1.5 seconds or upon the next keystroke.
+With \fBM-Z\fR the title bar plus status bar can be toggled.
+With \fBM-X\fR the help lines.
+.TP
+.BR \-! ", " \-\-magic
+When neither the file's name nor its first line give a clue,
+try using libmagic to determine the applicable syntax.
 
 .SH TOGGLES
 Several of the above options can be switched on and off also while
@@ -338,6 +381,10 @@ 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 FILES
 When \fB\-\-rcfile\fR is given, \fBnano\fR will read just the specified file
@@ -348,6 +395,9 @@ 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.
+.sp
+See \fI/usr/share/nano/\fR and \fI/usr/share/nano/extra/\fR
+for available syntax-coloring definitions.
 
 .SH NOTES
 If no alternative spell checker command is specified on the command

doc/nanorc.5

@@ -1,4 +1,4 @@
-.\" Copyright (C) 2003-2011, 2013-2020 Free Software Foundation, Inc.
+.\" Copyright (C) 2003-2011, 2013-2022 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:
@@ -16,16 +16,15 @@
 .\"   Documentation License along with this program.  If not, see
 .\"   <https://www.gnu.org/licenses/>.
 .\"
-.TH NANORC 5 "version 4.8" "February 2020"
+.TH NANORC 5 "version 6.1" "February 2022"
 
 .SH NAME
 nanorc \- GNU nano's configuration file
 
 .SH DESCRIPTION
-The \fInanorc\fP files contain the default settings for \fBnano\fP, a
-small and friendly editor.  They should be in Unix format, not in
-DOS or Mac format.  During startup, if \fB\-\-rcfile\fR is not given,
-\fBnano\fR will read two files: first the
+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 \fI~/.nanorc\fR or from \fI$XDG_CONFIG_HOME/nano/nanorc\fR
@@ -66,10 +65,9 @@ Quotes inside the \fIcharacters\fR  parameters below should not be escaped.
 The last double quote on the line will be seen as the closing quote.
 .sp
 The supported commands and arguments are:
-
 .TP 3
 .B set afterends
-Make Ctrl+Right stop at word ends instead of beginnings.
+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
@@ -101,11 +99,15 @@ 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 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 \fBset punct\fP), optionally followed by the specified
-closing brackets, can end sentences.  The default value is "\fB"')>]}\fP".
+closing brackets, can end sentences.  The default value is "\fB\(dq')>]}\fR".
 .TP
 .B set breaklonglines
 Automatically hard-wrap the current line when it becomes overlong.
@@ -123,9 +125,9 @@ Use cut-from-cursor-to-end-of-line by default, instead of cutting the whole line
 .B set emptyline
 Do not use the line below the title bar, leaving it entirely blank.
 .TP
-.B set errorcolor \fIfgcolor\fR,\fIbgcolor\fR
+.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.
+The default value is \fBbold,white,red\fR.
 See \fBset titlecolor\fR for valid color names.
 .TP
 .B set fill \fInumber\fR
@@ -135,8 +137,8 @@ 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
-Specify the color combination to use for the function descriptions
+.B set functioncolor \fR[\fBbold,\fR][\fBitalic,\fR]\fIfgcolor\fB,\fIbgcolor\fR
+Use this color combination for the concise function descriptions
 in the two help lines at the bottom of the screen.
 See \fBset titlecolor\fR for more details.
 .TP
@@ -148,29 +150,59 @@ text.  (The color of the stripe can be changed with \fBset stripecolor\fR.)
 Save the last hundred search strings and replacement strings and
 executed commands, so they can be easily reused in later sessions.
 .TP
+.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 \fIfgcolor\fR,\fIbgcolor\fR
-Specify the color combination to use for the shortcut key combos
+.B set keycolor \fR[\fBbold,\fR][\fBitalic,\fR]\fIfgcolor\fB,\fIbgcolor\fR
+Use this color combination 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 magic
+When neither the file's name nor its first line give a clue,
+try using libmagic to determine the applicable syntax.
+(Calling libmagic can be relatively time consuming.
+It is therefore not done by default.)
+.TP
 .BI "set matchbrackets """ characters """
-Set the opening and closing brackets that can be found by bracket
+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
-Deprecated option since it has become the default setting.
-When needed, use \fBunset emptyline\fR instead.
+.B set minibar
+Suppress the title bar and instead show information about
+the current buffer at the bottom of the screen, in the space
+for the status bar.  In this "minibar" the filename is shown
+on the left, followed by an asterisk if the buffer has been modified.
+On the right are displayed the current line and column number, the
+code of the character under the cursor (in Unicode format: U+xxxx),
+the same flags as are shown by \fBset stateflags\fR, and a percentage
+that expresses how far the cursor is into the file (linewise).
+When a file is loaded or saved, and also when switching between buffers,
+the number of lines in the buffer is displayed after the filename.
+This number is cleared upon the next keystroke, or replaced with an
+[i/n] counter when multiple buffers are open.
+The line plus column numbers and the character code are displayed only when
+\fBset constantshow\fR is used, and can be toggled on and off with \fBM-C\fR.
+The state flags are displayed only when \fBset stateflags\fR is used.
+.TP
+.B set minicolor \fR[\fBbold,\fR][\fBitalic,\fR]\fIfgcolor\fB,\fIbgcolor\fR
+Use this color combination for the minibar.
+(When this option is not specified, the colors of the title bar are used.)
+See \fBset titlecolor\fR for more details.
 .TP
 .B set mouse
 Enable mouse support, if available for your system.  When enabled, mouse
@@ -180,7 +212,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.
@@ -192,15 +224,12 @@ Don't display the two help lines at the bottom of the screen.
 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
-Obsolete option.  Ignored.
-.TP
 .B set nowrap
 Deprecated option since it has become the default setting.
 When needed, use \fBunset breaklonglines\fR instead.
 .TP
-.B set numbercolor \fIfgcolor\fR,\fIbgcolor\fR
-Specify the color combination to use for line numbers.
+.B set numbercolor \fR[\fBbold,\fR][\fBitalic,\fR]\fIfgcolor\fB,\fIbgcolor\fR
+Use this color combination for line numbers.
 See \fBset titlecolor\fR for more details.
 .TP
 .B set operatingdir "\fIdirectory\fP"
@@ -214,7 +243,12 @@ 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 promptcolor \fR[\fBbold,\fR][\fBitalic,\fR]\fIfgcolor\fB,\fIbgcolor\fR
+Use this color combination for the prompt bar.
+(When this option is not specified, the colors of the title bar are used.)
+See \fBset titlecolor\fR for more details.
 .TP
 .BI "set punct """ characters """
 Set the characters treated as closing punctuation when justifying
@@ -223,8 +257,11 @@ specfified closing punctuation, optionally followed by closing brackets
 (see \fBbrackets\fP), can end sentences.  The default value is "\fB!.?\fP".
 .TP
 .B set quickblank
-Do quick status-bar blanking: status-bar messages will disappear after 1
-keystroke instead of 25.  The option \fBconstantshow\fR overrides this.
+Make status-bar messages disappear after 1 keystroke instead of after 20.
+Note that option \fBconstantshow\fR overrides this.
+When option \fBminibar\fR or \fBzero\fR is in effect,
+\fBquickblank\fR makes a message disappear after
+0.8 seconds instead of after the default 1.5 seconds.
 .TP
 .BI "set quotestr """ regex """
 Set the regular expression for matching the quoting part of a line.
@@ -234,10 +271,12 @@ 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 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.
+Interpret escape sequences directly, instead of asking \fBncurses\fR
+to translate them.  (If you need this option to get some keys to work
+properly, it means that the terminfo terminal description that is used
+does not fully match the actual behavior of your terminal.  This can
+happen when you ssh into a BSD machine, for example.)
+Using this option disables \fBnano\fR's mouse support.
 .TP
 .B set rebinddelete
 Interpret the Delete and Backspace keys differently so that both Backspace
@@ -248,13 +287,24 @@ system either Backspace acts like Delete or Delete acts like Backspace.
 Do regular-expression searches by default.
 Regular expressions in \fBnano\fR are of the extended type (ERE).
 .TP
-.B set selectedcolor \fIfgcolor\fR,\fIbgcolor\fR
-Specify the color combination to use for selected text.
+.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 scrollercolor \fIfgcolor\fB,\fIbgcolor\fR
+Use this color combination for the indicator alias "scrollbar".
+(On terminal emulators that link to a libvte older than version 0.55,
+using a background color here does not work correctly.)
+See \fBset titlecolor\fR for more details.
+.TP
+.B set selectedcolor \fR[\fBbold,\fR][\fBitalic,\fR]\fIfgcolor\fB,\fIbgcolor\fR
+Use this color combination for selected text.
 See \fBset titlecolor\fR for more details.
 .TP
 .B set showcursor
-Put the cursor on the highlighted item in the file browser, to aid
-braille users.
+Put the cursor on the highlighted item in the file browser, and show
+the cursor in the help viewer, to aid braille users and people with
+poor vision.
 .TP
 .B set smarthome
 Make the Home key smarter.  When Home is pressed anywhere but at the
@@ -263,46 +313,75 @@ jump to that beginning (either forwards or backwards).  If the cursor is
 already at that position, it will jump to the true beginning of the
 line.
 .TP
-.B set smooth
-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 """\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.
+using the built-in corrector that calls \fBhunspell\fR(1) or \fBspell\fR(1).
 .TP
-.B set statuscolor \fIfgcolor\fR,\fIbgcolor\fR
-Specify the color combination to use for the status bar.
+.B set spotlightcolor \fR[\fBbold,\fR][\fBitalic,\fR]\fIfgcolor\fB,\fIbgcolor\fR
+Use this color combination for highlighting a search match.
+The default value is \fBblack,lightyellow\fR.
+See \fBset titlecolor\fR for valid color names.
+.TP
+.B set stateflags
+Use the top-right corner of the screen for showing some state flags:
+\fBI\fR when auto-indenting, \fBM\fR when the mark is on, \fBL\fR when
+hard-wrapping (breaking long lines), \fBR\fR when recording a macro,
+and \fBS\fR when soft-wrapping.
+When the buffer is modified, a star (\fB*\fR) is shown after the
+filename in the center of the title bar.
+.TP
+.B set  statuscolor \fR[\fBbold,\fR][\fBitalic,\fR]\fIfgcolor\fB,\fIbgcolor\fR
+Use this color combination for the status bar.
 See \fBset titlecolor\fR for more details.
 .TP
-.B set stripecolor \fIfgcolor\fR,\fIbgcolor\fR
-Specify the color combination to use for the vertical guiding stripe.
+.B set stripecolor \fR[\fBbold,\fR][\fBitalic,\fR]\fIfgcolor\fB,\fIbgcolor\fR
+Use this color combination for the vertical guiding stripe.
 See \fBset titlecolor\fR for more details.
 .TP
-.B set suspend
-Allow \fBnano\fP to be suspended.
+.B set suspendable
+Obsolete option; ignored.  Suspension is enabled by default,
+reachable via \fB^T^Z\fR.  (If you want a plain \fB^Z\fR to
+suspend nano, add \fBbind ^Z suspend main\fR to your nanorc.)
 .TP
 .B set tabsize \fInumber\fR
 Use a tab size of \fInumber\fR columns.  The value of \fInumber\fP must be
 greater than 0.  The default value is \fB8\fR.
 .TP
 .B set tabstospaces
-Convert typed tabs to spaces.
+Convert each typed tab to spaces -- to the number of spaces
+that a tab at that position would take up.
 .TP
-.B set tempfile
-Save automatically on exit, don't prompt.
-.TP
-.B set titlecolor \fIfgcolor\fR,\fIbgcolor\fR
-Specify the color combination to use for the title bar.
+.B set titlecolor \fR[\fBbold,\fR][\fBitalic,\fR]\fIfgcolor\fB,\fIbgcolor\fR
+Use this color combination 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.
+The word \fBgrey\fR or \fBgray\fR may be used
+as a synonym for \fBlightblack\fR.
+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 ", "
+.BR rosy ", " beet ", " plum ", " sea ", " sky ", " slate ", "
+.BR teal ", " sage ", " brown ", " ocher ", " sand ", " tawny ", "
+.BR brick ", " crimson ", 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.
+On such emulators, the color may also be specified as a three-digit hexadecimal
+number prefixed with \fB#\fR, with the digits representing the amounts of red,
+green, and blue, respectively.  This tells \fBnano\fR to select from the
+available palette the color that approximates the given values.
+
+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
@@ -313,11 +392,6 @@ Save a file by default in Unix format.  This overrides nano's
 default behavior of saving a file in the format that it had.
 (This option has no effect when you also use \fBset noconvert\fR.)
 .TP
-.B set view
-Disallow file modification: 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
 .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
@@ -329,12 +403,20 @@ characters as parts of words.
 .TP
 .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).
+.TP
+.B set zero
+Hide all elements of the interface (title bar, status bar, and help lines)
+and use all rows of the terminal for showing the contents of the buffer.
+The status bar appears only when there is a significant message,
+and disappears after 1.5 seconds or upon the next keystroke.
+With \fBM-Z\fR the title bar plus status bar can be toggled.
+With \fBM-X\fR the help lines.
 
 .SH SYNTAX HIGHLIGHTING
 Coloring the different syntactic elements of a file
@@ -366,13 +448,13 @@ Start the definition of a syntax with this \fIname\fR.
 All subsequent \fBcolor\fR and other such commands
 will be added to this syntax, until a new \fBsyntax\fR
 command is encountered.
-
+.sp
 When \fBnano\fR is run, this syntax will be automatically
 activated if the current filename matches the extended regular
 expression \fIfileregex\fR.  Or the syntax can be explicitly
 activated by using the \fB\-Y\fR or \fB\-\-syntax\fR
 command-line option followed by the \fIname\fR.
-
+.sp
 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
@@ -416,24 +498,40 @@ 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
-.BI "color " fgcolor , bgcolor " """ regex """ " \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 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.
+The word \fBgrey\fR or \fBgray\fR may be used
+as a synonym for \fBlightblack\fR.
+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 ", "
+.BR rosy ", " beet ", " plum ", " sea ", " sky ", " slate ", "
+.BR teal ", " sage ", " brown ", " ocher ", " sand ", " tawny ", "
+.BR brick ", " crimson ", and " normal
 -- where \fBnormal\fR means the default foreground or background color.
-You may use the prefix \fBbright\fR for the foreground color to get a
-stronger highlight.  If your terminal supports transparency, not specifying
-a \fIbgcolor\fP tells \fBnano\fP to attempt to use a transparent background.
+On such emulators, the color may also be specified as a three-digit hexadecimal
+number prefixed with \fB#\fR, with the digits representing the amounts of red,
+green, and blue, respectively.  This tells \fBnano\fR to select from the
+available palette the color that approximates the given values.
+
+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 " fgcolor , bgcolor " """ regex """ " \fR...
+.BI "icolor \fR[\fBbold,\fR][\fBitalic,\fR]" fgcolor , bgcolor " """ regex """ " \fR...
 Same as above, except that the matching is case insensitive.
 .TP
-.BI "color " fgcolor , bgcolor " start=""" fromrx """ end=""" torx """
+.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,
@@ -442,7 +540,7 @@ 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
-.BI "icolor " fgcolor , bgcolor " start=""" fromrx """ end=""" torx """
+.BI "icolor \fR[\fBbold,\fR][\fBitalic,\fR]" fgcolor , bgcolor " start=""" fromrx """ end=""" torx """
 Same as above, except that the matching is case insensitive.
 .TP
 .BI "include """ syntaxfile """
@@ -503,12 +601,15 @@ no longer be the case, for all letters.
 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
-
+.sp
 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.
 
@@ -523,7 +624,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.
@@ -570,7 +671,7 @@ Throws away the current line (or the marked region).
 Deletes from the cursor position to the beginning of the preceding word.
 (This function is bound by default to <Shift+Ctrl+Delete>.  If your terminal
 produces \fB^H\fR for <Ctrl+Backspace>, you can make <Ctrl+Backspace> delete
-the word to the left of the cursor by rebinding ^H to this function.)
+the word to the left of the cursor by rebinding \fB^H\fR to this function.)
 .TP
 .B chopwordright
 Deletes from the cursor position to the beginning of the next word.
@@ -583,15 +684,22 @@ Cuts all text from the cursor position till the end of the buffer.
 Sets the mark at the current position, to start selecting text.
 Or, when it is set, unsets the mark.
 .TP
-.B curpos
-Shows the current cursor position: the line, column, and character positions.
+.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.
+Counts and reports on the status bar the number of lines, words,
+and characters in the current buffer (or in the marked region).
+.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, either the default \fBhunspell\fR or GNU
-\fBspell\fR, or the one defined by \fB\-\-speller\fR or \fBset speller\fR.
+Invokes a spell-checking program, either the default \fBhunspell\fR(1) or GNU
+\fBspell\fR(1), 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).
@@ -600,27 +708,28 @@ Invokes a full-buffer-processing program (if the active syntax defines one).
 Invokes a syntax-checking program (if the active syntax defines one).
 .TP
 .B justify
-Justifies the current paragraph.  A paragraph is a group of contiguous lines
+Justifies the current paragraph (or the marked region).
+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.
+Justifies the entire current buffer (or the marked region).
 .TP
 .B indent
-Indents (shifts to the right) the currently marked text.
+Indents (shifts to the right) the current line or the marked lines.
 .TP
 .B unindent
-Unindents (shifts to the left) the currently marked text.
+Unindents (shifts to the left) the current line or the marked lines.
 .TP
 .B comment
-Comments or uncomments the current line or marked lines, using the comment
-style specified in the active syntax.
+Comments or uncomments the current line or the marked lines,
+using the comment style specified in the active syntax.
 .TP
 .B complete
-Completes the fragment before the cursor to a full word found elsewhere
-in the current buffer.
+Completes (when possible) the fragment before the cursor
+to a full word found elsewhere in the current buffer.
 .TP
 .B left
 Goes left one position (in the editor or browser).
@@ -637,10 +746,18 @@ Goes one line down (in the editor or browser).
 .B scrollup
 Scrolls the viewport up one row (meaning that the text slides down)
 while keeping the cursor in the same text position, if possible.
+(This function is bound by default to <Alt+Up>.
+If <Alt+Up> does nothing on your Linux console, see the FAQ:
+.UR https://nano\-editor.org/dist/latest/faq.html#4.1
+.UE .)
 .TP
 .B scrolldown
 Scrolls the viewport down one row (meaning that the text slides up)
 while keeping the cursor in the same text position, if possible.
+(This function is bound by default to <Alt+Down>.)
+.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.
@@ -684,8 +801,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.
@@ -725,8 +852,8 @@ Redoes the last undone action (i.e., it undoes an undo).
 Refreshes the screen.
 .TP
 .B suspend
-Suspends the editor (if the suspending function is enabled, see the
-"suspendenable" entry below).
+Suspends the editor and returns control to the shell
+(until you tell the process to resume execution with \fBfg\fR).
 .TP
 .B casesens
 Toggles whether searching/replacing ignores or respects the case of
@@ -782,24 +909,30 @@ 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 zero
+Toggles the presence of title bar and status bar.
 .TP
 .B constantshow
 Toggles the constant display of the current line, column, and character positions.
@@ -828,17 +961,15 @@ is the beginning of a paragraph.
 Toggles whether cutting text will cut the whole line or just from the current cursor
 position to the end of the line.
 .TP
-.B nowrap
+.B breaklonglines
 Toggles whether long lines will be hard-wrapped to the next line.
+(The old name of this function, 'nowrap', is deprecated.)
 .TP
 .B tabstospaces
 Toggles whether typed tabs will be converted to spaces.
 .TP
 .B mouse
 Toggles mouse support.
-.TP
-.B suspendenable
-Toggles whether the suspend sequence (normally ^Z) will suspend the editor window.
 .RE
 
 .TP
@@ -848,6 +979,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
@@ -869,20 +1003,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 menu of the integrated spell checker where the user can edit a misspelled word.
-.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.
@@ -890,6 +1013,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;
@@ -903,6 +1038,13 @@ System-wide configuration file.
 .TP
 .IR ~/.nanorc " or " $XDG_CONFIG_HOME/nano/nanorc " or " ~/.config/nano/nanorc
 Per-user configuration file.
+.TP
+.I /usr/share/nano/*
+Syntax definitions for the syntax coloring of common file types
+(and for less common file types in the \fIextra/\fR subdirectory).
 
 .SH SEE ALSO
 .BR nano (1)
+.TP
+.I https://nano-editor.org/cheatsheet.html
+An overview of the default key bindings.

doc/rnano.1

@@ -1,4 +1,4 @@
-.\" Copyright (C) 2002-2007, 2014-2020 Free Software Foundation, Inc.
+.\" Copyright (C) 2002-2007, 2014-2022 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:
@@ -16,7 +16,7 @@
 .\"   Documentation License along with this program.  If not, see
 .\"   <https://www.gnu.org/licenses/>.
 .\"
-.TH RNANO 1 "version 4.8" "February 2020"
+.TH RNANO 1 "version 6.1" "February 2022"
 
 .SH NAME
 rnano \- a restricted nano

doc/sample.nanorc.in

@@ -1,18 +1,15 @@
 ## Sample initialization file for GNU nano.
 ##
-## This file should not be in DOS or Mac format, and 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.
-##
-## Inside string parameters, quotes should not be escaped.  The last
+## 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 the 'nextword' function (Ctrl+Right) stop at word ends
-## instead of at beginnings.
+## 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
@@ -33,6 +30,9 @@
 ## Use bold text instead of reverse video text.
 # set boldtext
 
+## 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.
@@ -44,8 +44,7 @@
 ## Do case-sensitive searches by default.
 # set casesensitive
 
-## Constantly display the cursor position in the status bar.  Note that
-## this overrides "quickblank".
+## Constantly display the cursor position in the status bar or minibar.
 # set constantshow
 
 ## Use cut-from-cursor-to-end-of-line by default.
@@ -59,13 +58,20 @@
 ## will be the terminal's width minus this number.
 # set fill -8
 
+## Draw a vertical stripe at the given column, to help judge text width.
+## (This option does not have a default value.)
+# set guidestripe 75
+
 ## Remember the used search/replace strings for the next session.
 # set historylog
 
+## 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 of the text.
+## 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
@@ -73,15 +79,22 @@
 ## no plans to implement vim-style undo state in these files.
 # set locking
 
-## The opening and closing brackets that can be found by bracket
-## searches.  They cannot contain blank characters.  The former set must
-## come before the latter set, and both must be in the same order.
+## Fall back to slow libmagic to try and determine an applicable syntax.
+# set magic
+
+## The opening and closing brackets that are found by a matching-bracket
+## search.  This may not contain blank characters.  The opening brackets
+## must come before the closing ones, and they must be in the same order.
 # set matchbrackets "(<[{)>]}"
 
+## Suppress the title bar and show the filename plus a cursor-position
+## percentage in the space of the status bar.
+# set minibar
+
 ## 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
-## Window System, and on the console when gpm is running.
+## double click), and execute shortcuts.  The mouse will work in the
+## X Window System, and on the console when gpm is running.
 # set mouse
 
 ## Switch on multiple file buffers (inserting a file will put it into
@@ -109,14 +122,12 @@
 ## Preserve the XON and XOFF keys (^Q and ^S).
 # set preserve
 
-## The characters treated as closing punctuation when justifying
-## paragraphs.  They cannot contain blank characters.  Only closing
-## punctuation, optionally followed by closing brackets, can end
-## sentences.
+## The characters treated as closing punctuation when justifying paragraphs.
+## This may not contain blank characters.  Only these closing punctuations,
+## optionally followed by closing brackets, can end sentences.
 # set punct "!.?"
 
-## Do quick status-bar blanking.  Status-bar messages will disappear after
-## 1 keystroke instead of 26.  Note that "constantshow" overrides this.
+## Make status-bar messages disappear after 1 keystroke instead of after 20.
 # set quickblank
 
 ## The regular expression that matches quoting characters in email
@@ -133,42 +144,44 @@
 ## Regular expressions are of the extended type (ERE).
 # set regexp
 
-## 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.
+## 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
+## Make the Home key smarter: when Home is pressed anywhere but at the
 ## very beginning of non-whitespace characters on a line, the cursor
 ## will jump to that beginning (either forwards or backwards).  If the
-## cursor is already at that position, it will jump to the true
-## beginning of the line.
+## cursor is already at that position, it will jump to the true start
+## of the line (the left edge).
 # set smarthome
 
-## 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
+## Use the end of the title bar for some state flags: I = auto-indenting,
+## M = mark, L = hard-wrapping long lines, R = recording, S = soft-wrapping.
+# set stateflags
 
 ## Use this tab size instead of the default; it must be greater than 0.
 # set tabsize 8
 
-## Convert typed tabs to spaces.
+## Convert each typed tab to the fitting number of 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
 
-## Disallow file modification.  Why would you want this in an rcfile? ;)
-# set view
+## Save files by default in Unix format (also when they were DOS or Mac).
+# set unix
 
 ## The two single-column characters used to display the first characters
 ## of tabs and spaces.  187 in ISO 8859-1 (0000BB in Unicode) and 183 in
@@ -191,58 +204,52 @@
 ## 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
+## Hide the bars plus help lines and use the whole terminal as edit area.
+# set zero
+
+
+## Paint the interface elements of nano.  These are examples; there are
+## no colors by default, except for errorcolor and spotlightcolor.
+# set titlecolor bold,white,blue
+# set promptcolor lightwhite,grey
+# set statuscolor bold,white,green
+# set errorcolor bold,white,red
+# set spotlightcolor black,lightyellow
+# set selectedcolor lightwhite,magenta
 # set stripecolor ,yellow
+# set scrollercolor cyan
 # 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,white,magenta
+# set promptcolor black,yellow
+# set statuscolor bold,white,magenta
+# set errorcolor bold,white,red
+# set spotlightcolor black,orange
+# set selectedcolor lightwhite,cyan
 # set stripecolor ,yellow
+# set scrollercolor magenta
 # set numbercolor magenta
-# set keycolor brightmagenta
+# set keycolor lightmagenta
 # set functioncolor magenta
 
 
-## Setup of syntax coloring.
-##
-##   syntax "name" ["filename regex" ...]
-##
-##   color|icolor foreground,background "regex" ["regex"...]
-##   [...]
-##
-## 'color' will do case-sensitive matches, while 'icolor' will do
-## case-insensitive matches.
-##
-## All color commands are applied in the order in which they are specified,
-## meaning that later commands can recolor stuff that was colored earlier.
-##
-## Valid color names for foreground and background are: white, black, normal,
-## red, blue, green, yellow, magenta, cyan.  For foreground colors, you may
-## use the prefix "bright" to get a stronger highlight.
-##
-## All regexes (regular expressions) are of the extended type (ERE).
-##
-## If the coloring rule should span multiple lines, use the following format:
-##
-##   color fg,bg  start="regex" end="regex"
-##
-## 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"
+## === Syntax coloring ===
+## For all details, see 'man nanorc', section SYNTAX HIGHLIGHTING.
 
-## To include all existing syntax definitions, you can do:
+## To include most of the 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"
+
+## In @PKGDATADIR@/extra/ you can find some syntaxes that are
+## specific for certain distros or for some less common languages.
+
 
 ## If <Tab> should always produce four spaces when editing a Python file,
 ## independent of the settings of 'tabsize' and 'tabstospaces':
@@ -252,8 +259,11 @@
 # extendsyntax makefile tabgives "	"
 
 
-## Key bindings.
-## See nanorc(5) (section REBINDING KEYS) for more details on this.
+## === Key bindings ===
+## For all details, see 'man nanorc', section REBINDING KEYS.
+
+## If you want to suspend nano with one keystroke (instead of with ^T^Z):
+# bind ^Z suspend main
 
 ## The <Ctrl+Delete> keystroke deletes the word to the right of the cursor.
 ## On some terminals the <Ctrl+Backspace> keystroke produces ^H, which is
@@ -264,13 +274,34 @@
 ## <Ctrl+Backspace> delete the word to the left of the cursor with:
 # bind ^H chopwordleft main
 
+## For a more mnemonic Comment keystroke (overriding Cut-from-cursor):
+# bind M-K comment main
+
+## If you want ^L to just refresh the screen and not center the cursor:
+# bind ^L refresh main
+
+## When you sometimes type M-J instead of M-K, or M-T instead of M-R:
+# unbind M-J main
+# unbind M-T main
+## (Those functions are still accessible through ^T^J and ^T^V.)
+
+## For quickly uppercasing or lowercasing the word under the cursor.
+## (These effectively do a Ctrl+Right followed by a Shift+Ctrl+Left,
+## and then pipe the selected text through a sed command.)
+# bind Sh-M-U "Oc|sed 's/.*/\U&/'
+" main
+# bind Sh-M-L "Oc|sed 's/.*/\L&/'
 " 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 ^X cut main
 #bind ^C copy main
 #bind ^V paste all
 #bind ^Q exit all
 #bind ^S savefile main
+#bind ^W writeout main
 #bind ^O insert main
 #set multibuffer
 #bind ^H help all
@@ -278,23 +309,18 @@
 #bind ^F whereis all
 #bind ^G findnext all
 #bind ^B wherewas all
-#bind M-X flipnewbuffer all
-#bind ^X cut all
-#bind ^C copy main
-#bind ^V paste all
-#bind ^P curpos main
-#bind ^A mark main
+#bind ^D findprevious all
+#bind ^R replace main
 #bind ^Z undo main
 #bind ^Y redo main
 #unbind ^K main
 #unbind ^U all
 #unbind ^N main
 #unbind ^Y all
+#unbind M-J main
+#unbind M-T main
 #bind ^A mark main
 #bind ^P location main
-#bind ^Y speller main
-#bind M-U undo main
-#bind M-R redo main
-#bind ^U undo main
-#bind ^E redo main
-#set multibuffer
+#bind ^T gotoline main
+#bind ^T gotodir browser
+#bind ^T cutrestoffile execute

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

po/update_linguas.sh

@@ -9,6 +9,9 @@ rm *.po
 wget --recursive --level=1 --accept=po --no-directories --no-verbose \
        https://translationproject.org/latest/nano/  ||  exit 2
 
+# This PO file is less than twenty percent translated:
+rm -v  nn.po
+
 # Are there now PO files that are not in git yet?
 NEWSTUFF=$(git status --porcelain *.po | grep "^??")
 
@@ -26,6 +29,11 @@ for pofile in *.po; do
 	msgattrib --no-obsolete --no-fuzzy $pofile >trimmed.po || exit 4
 	mv trimmed.po $pofile || exit 4
 done
+echo
+
+if grep "[[:cntrl:]]" ./*.po; then
+	echo "*** PO file contains control character"; exit 5;
+fi
 
 # If needed, fix a problem in the Makefile template.
 grep -q '^datarootdir' Makefile.in.in || \

roll-a-release.sh

@@ -1,6 +1,6 @@
 #!/bin/bash
 
-VERSION="4.8"
+VERSION="6.1"
 
 ./configure -C --enable-tiny &&  make &&  ./configure -C &&
 
@@ -12,7 +12,7 @@ po/update_linguas.sh &&
 
 make distcheck &&  make dist-xz &&
 
-git add po/*.po po/nano.pot &&
+git add po/*.po po/nano.pot po/LINGUAS &&
 git commit -m "$(git log -1 --grep 'po: up' | grep o: | sed 's/^    //')" &&
 
 gpg -a -b nano-$VERSION.tar.gz &&

src/Makefile.am

@@ -6,7 +6,7 @@ CLEANFILES = revision.h
 if BUILDING_FROM_GIT
 SOMETHING = "REVISION \"`git describe --tags 2>/dev/null`\""
 else
-SOMETHING = "NOTHING \"from tarball\""
+SOMETHING = "PLAINBUILD \"from tarball\""
 endif
 
 nano.o: revision.h
@@ -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/chars.c

@@ -1,8 +1,8 @@
 /**************************************************************************
  *   chars.c  --  This file is part of GNU nano.                          *
  *                                                                        *
- *   Copyright (C) 2001-2011, 2013-2020 Free Software Foundation, Inc.    *
- *   Copyright (C) 2016-2019 Benno Schulenberg                            *
+ *   Copyright (C) 2001-2011, 2013-2022 Free Software Foundation, Inc.    *
+ *   Copyright (C) 2016-2021 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,118 +44,94 @@ 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);
-}
-
-/* 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)
-			return FALSE;
+	if (mbtowide(&wc, c) < 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)
-			return FALSE;
+	if (mbtowide(&wc, c) < 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)
-			return FALSE;
+	if ((signed char)*c >= 0)
+		return (*c == ' ' || *c == '\t');
 
-		return iswblank(wc);
-	} else
+	if (mbtowide(&wc, c) < 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() 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 (((unsigned char)*c & 0x60) == 0 || (unsigned char)*c == 127);
+		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)
-			return FALSE;
+	if (mbtowide(&wc, c) < 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') {
@@ -164,9 +140,8 @@ bool is_word_mbchar(const char *c, bool allow_punct)
 
 		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. */
@@ -201,66 +176,123 @@ char control_mbrep(const char *c, bool isdata)
 }
 
 #ifdef ENABLE_UTF8
-/* Return the width in columns of the given (multibyte) character. */
-int mbwidth(const char *c)
+/* Convert the given multibyte sequence c to wide character wc, and return
+ * the number of bytes in the sequence, or -1 for an invalid sequence. */
+int mbtowide(wchar_t *wc, const char *c)
 {
-	/* Ask for the width only when the character isn't plain ASCII. */
-	if ((signed char)*c <= 0) {
-		wchar_t wc;
-		int width;
+	if ((signed char)*c < 0 && use_utf8) {
+		unsigned char v1 = (unsigned char)c[0];
+		unsigned char v2 = (unsigned char)c[1] ^ 0x80;
 
-		if (mbtowc(&wc, c, MAXCHARLEN) < 0)
-			return 1;
+		if (v2 > 0x3F || v1 < 0xC2)
+			return -1;
 
-		width = wcwidth(wc);
-
-		if (width < 0)
-			return 1;
-
-		return width;
-	} else
-		return 1;
-}
-#endif
-
-/* Convert the Unicode value in code 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 code, int *length)
-{
-	char *mb_char;
-
-#ifdef ENABLE_UTF8
-	if (use_utf8) {
-		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;
+		if (v1 < 0xE0) {
+			*wc = (((unsigned int)(v1 & 0x1F) << 6) | (unsigned int)v2);
+			return 2;
 		}
-	} else
-#endif
-	{
-		mb_char = measured_copy((char *)&code, 1);
-		*length = 1;
+
+		unsigned char v3 = (unsigned char)c[2] ^ 0x80;
+
+		if (v3 > 0x3F)
+			return -1;
+
+		if (v1 < 0xF0) {
+			if ((v1 > 0xE0 || v2 >= 0x20) && (v1 != 0xED || v2 < 0x20)) {
+				*wc = (((unsigned int)(v1 & 0x0F) << 12) |
+							((unsigned int)v2 << 6) | (unsigned int)v3);
+				return 3;
+			} else
+				return -1;
+		}
+
+		unsigned char v4 = (unsigned char)c[3] ^ 0x80;
+
+		if (v4 > 0x3F || v1 > 0xF4)
+			return -1;
+
+		if ((v1 > 0xF0 || v2 >= 0x10) && (v1 != 0xF4 || v2 < 0x10)) {
+			*wc = (((unsigned int)(v1 & 0x07) << 18) | ((unsigned int)v2 << 12) |
+							((unsigned int)v3 << 6) | (unsigned int)v4);
+			return 4;
+		} else
+			return -1;
 	}
 
-	return mb_char;
+	*wc = (unsigned int)*c;
+	return 1;
 }
 
-/* Return the length (in bytes) of the character located at *pointer. */
+/* Return TRUE when the given character occupies two cells. */
+bool is_doublewidth(const char *ch)
+{
+	wchar_t wc;
+
+	/* Only from U+1100 can code points have double width. */
+	if ((unsigned char)*ch < 0xE1 || !use_utf8)
+		return FALSE;
+
+	if (mbtowide(&wc, ch) < 0)
+		return FALSE;
+
+	return (wcwidth(wc) == 2);
+}
+
+/* Return TRUE when the given character occupies zero cells. */
+bool is_zerowidth(const char *ch)
+{
+	wchar_t wc;
+
+	/* Only from U+0300 can code points have zero width. */
+	if ((unsigned char)*ch < 0xCC || !use_utf8)
+		return FALSE;
+
+	if (mbtowide(&wc, ch) < 0)
+		return FALSE;
+
+#if defined(__OpenBSD__)
+	/* Work around an OpenBSD bug -- see https://sv.gnu.org/bugs/?60393. */
+	if (wc >= 0xF0000)
+		return FALSE;
+#endif
+
+	return (wcwidth(wc) == 0);
+}
+#endif /* ENABLE_UTF8 */
+
+/* Return the number of bytes in the character that starts 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);
+	if ((unsigned char)*pointer > 0xC1 && use_utf8) {
+		unsigned char c1 = (unsigned char)pointer[0];
+		unsigned char c2 = (unsigned char)pointer[1];
 
-		return (length < 0 ? 1 : length);
-	} else
+		if ((c2 ^ 0x80) > 0x3F)
+			return 1;
+
+		if (c1 < 0xE0)
+			return 2;
+
+		if (((unsigned char)pointer[2] ^ 0x80) > 0x3F)
+			return 1;
+
+		if (c1 < 0xF0) {
+			if ((c1 > 0xE0 || c2 >= 0xA0) && (c1 != 0xED || c2 < 0xA0))
+				return 3;
+			else
+				return 1;
+		}
+
+		if (((unsigned char)pointer[3] ^ 0x80) > 0x3F)
+			return 1;
+
+		if (c1 > 0xF4)
+			return 1;
+
+		if ((c1 > 0xF0 || c2 >= 0x90) && (c1 != 0xF4 || c2 < 0x90))
+			return 4;
+	}
 #endif
 		return 1;
 }
@@ -271,15 +303,7 @@ size_t mbstrlen(const char *pointer)
 	size_t count = 0;
 
 	while (*pointer != '\0') {
-#ifdef ENABLE_UTF8
-		if ((signed char)*pointer < 0) {
-			int length = mblen(pointer, MAXCHARLEN);
-
-			pointer += (length < 0 ? 1 : length);
-		} else
-#endif
-			pointer++;
-
+		pointer += char_length(pointer);
 		count++;
 	}
 
@@ -290,19 +314,7 @@ size_t mbstrlen(const char *pointer)
  * 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 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 (charlen <= 0)
-			charlen = 1;
-	} else
-#endif
-		charlen = 1;
+	int charlen = char_length(string);
 
 	for (int i = 0; i < charlen; i++)
 		thechar[i] = string[i];
@@ -315,20 +327,29 @@ int collect_char(const char *string, char *thechar)
 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_mbchar(string))
-				*column += 2;
-			else
-				*column += mbwidth(string);
+	if ((signed char)*string < 0 && use_utf8) {
+		/* A UTF-8 upper control code has two bytes and takes two columns. */
+		if (((unsigned char)string[0] == 0xC2 && (signed char)string[1] < -96)) {
+			*column += 2;
+			return 2;
 		} else {
-			charlen = 1;
-			*column += 1;
-		}
+			wchar_t wc;
+			int charlen = mbtowide(&wc, string);
 
-		return charlen;
+			if (charlen < 0) {
+				*column += 1;
+				return 1;
+			}
+
+			int width = wcwidth(wc);
+
+#if defined(__OpenBSD__)
+			*column += (width < 0 || wc >= 0xF0000) ? 1 : width;
+#else
+			*column += (width < 0) ? 1 : width;
+#endif
+			return charlen;
+		}
 	}
 #endif
 
@@ -337,12 +358,8 @@ int advance_over(const char *string, size_t *column)
 			*column += tabsize - *column % tabsize;
 		else
 			*column += 2;
-	} else if (*string == 0x7F)
+	} else if (0x7E < (unsigned char)*string && (unsigned char)*string < 0xA0)
 		*column += 2;
-#ifndef ENABLE_UTF8
-	else if (0x7F < (unsigned char)*string && (unsigned char)*string < 0xA0)
-		*column += 2;
-#endif
 	else
 		*column += 1;
 
@@ -409,8 +426,24 @@ int mbstrncasecmp(const char *s1, const char *s2, size_t n)
 		wchar_t wc1, wc2;
 
 		while (*s1 != '\0' && *s2 != '\0' && n > 0) {
-			bool bad1 = (mbtowc(&wc1, s1, MAXCHARLEN) < 0);
-			bool bad2 = (mbtowc(&wc2, s2, MAXCHARLEN) < 0);
+			if ((signed char)*s1 >= 0 && (signed char)*s2 >= 0) {
+				if ('A' <= (*s1 & 0x5F) && (*s1 & 0x5F) <= 'Z') {
+					if ('A' <= (*s2 & 0x5F) && (*s2 & 0x5F) <= 'Z') {
+						if ((*s1 & 0x5F) != (*s2 & 0x5F))
+							return ((*s1 & 0x5F) - (*s2 & 0x5F));
+					} else
+						return ((*s1 | 0x20) - *s2);
+				} else if ('A' <= (*s2 & 0x5F) && (*s2 & 0x5F) <= 'Z')
+					return (*s1 - (*s2 | 0x20));
+				else if (*s1 != *s2)
+					return (*s1 - *s2);
+
+				s1++; s2++; n--;
+				continue;
+			}
+
+			bool bad1 = (mbtowide(&wc1, s1) < 0);
+			bool bad2 = (mbtowide(&wc2, s2) < 0);
 
 			if (bad1 || bad2) {
 				if (*s1 != *s2)
@@ -465,7 +498,7 @@ char *revstrstr(const char *haystack, const char *needle,
 	size_t tail_len = strlen(pointer);
 
 	if (tail_len < needle_len)
-		pointer += tail_len - needle_len;
+		pointer -= (needle_len - tail_len);
 
 	while (pointer >= haystack) {
 		if (strncmp(pointer, needle, needle_len) == 0)
@@ -485,7 +518,7 @@ char *revstrcasestr(const char *haystack, const char *needle,
 	size_t tail_len = strlen(pointer);
 
 	if (tail_len < needle_len)
-		pointer += tail_len - needle_len;
+		pointer -= (needle_len - tail_len);
 
 	while (pointer >= haystack) {
 		if (strncasecmp(pointer, needle, needle_len) == 0)
@@ -507,7 +540,7 @@ char *mbrevstrcasestr(const char *haystack, const char *needle,
 		size_t tail_len = mbstrlen(pointer);
 
 		if (tail_len < needle_len)
-			pointer += tail_len - needle_len;
+			pointer -= (needle_len - tail_len);
 
 		if (pointer < haystack)
 			return NULL;
@@ -535,13 +568,13 @@ char *mbstrchr(const char *string, const char *chr)
 		bool bad_s = FALSE, bad_c = FALSE;
 		wchar_t ws, wc;
 
-		if (mbtowc(&wc, chr, MAXCHARLEN) < 0) {
+		if (mbtowide(&wc, chr) < 0) {
 			wc = (unsigned char)*chr;
 			bad_c = TRUE;
 		}
 
 		while (*string != '\0') {
-			int symlen = mbtowc(&ws, string, MAXCHARLEN);
+			int symlen = mbtowide(&ws, string);
 
 			if (symlen < 0) {
 				ws = (unsigned char)*string;
@@ -603,39 +636,21 @@ char *mbrevstrpbrk(const char *head, const char *accept, const char *pointer)
 #endif /* !NANO_TINY */
 
 #if defined(ENABLE_NANORC) && (!defined(NANO_TINY) || defined(ENABLE_JUSTIFY))
-/* Return TRUE if the given string contains at least one blank character,
- * and FALSE otherwise. */
+/* Return TRUE if the given string contains at least one blank character. */
 bool has_blank_char(const char *string)
 {
-	char symbol[MAXCHARLEN];
+	while (*string != '\0' && !is_blank_char(string))
+		string += char_length(string);
 
-	while (*string != '\0') {
-		string += collect_char(string, symbol);
-
-		if (is_blank_mbchar(symbol))
-			return TRUE;
-	}
-
-	return FALSE;
+	return *string;
 }
-#endif /* ENABLE_NANORC && (!NANO_TINY || ENABLE_JUSTIFY) */
+#endif
 
 /* Return TRUE when the given string is empty or consists of only blanks. */
 bool white_string(const char *string)
 {
-	while (*string != '\0' && (is_blank_mbchar(string) || *string == '\r'))
+	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)
-{
-	return ((0 <= wc && wc <= 0xD7FF) ||
-				(0xE000 <= wc && wc <= 0xFDCF) ||
-				(0xFDF0 <= wc && wc <= 0xFFFD) ||
-				(0xFFFF < wc && wc <= 0x10FFFF && (wc & 0xFFFF) <= 0xFFFD));
-}
-#endif

src/color.c

@@ -1,8 +1,8 @@
 /**************************************************************************
  *   color.c  --  This file is part of GNU nano.                          *
  *                                                                        *
- *   Copyright (C) 2001-2011, 2013-2020 Free Software Foundation, Inc.    *
- *   Copyright (C) 2014-2017 Benno Schulenberg                            *
+ *   Copyright (C) 2001-2011, 2013-2022 Free Software Foundation, Inc.    *
+ *   Copyright (C) 2014-2017, 2020, 2021 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"
 
 #ifdef ENABLE_COLOR
 
@@ -29,51 +29,15 @@
 #endif
 #include <string.h>
 
-/* For early versions of ncurses-6.0, use an additional A_PROTECT attribute
- * for all colors, in order to work around an ncurses miscoloring bug. */
-#if defined(NCURSES_VERSION_MAJOR) && (NCURSES_VERSION_MAJOR == 6) && \
-		(NCURSES_VERSION_MINOR == 0) && (NCURSES_VERSION_PATCH < 20151017)
-#define A_BANDAID  A_PROTECT
-#else
-#define A_BANDAID  A_NORMAL
-#endif
+static bool defaults_allowed = FALSE;
+		/* Whether ncurses accepts -1 to mean "default color". */
 
-/* Assign pair numbers for the colors in the given syntax, giving identical
- * color pairs the same number. */
-void set_syntax_colorpairs(syntaxtype *sint)
+/* Initialize the color pairs for nano's interface. */
+void set_interface_colorpairs(void)
 {
-	int new_number = NUMBER_OF_ELEMENTS + 1;
-	colortype *ink;
-
-	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;
-	}
-}
-
-/* Initialize the colors for nano's interface, and assign pair numbers
- * for the colors in each loaded syntax. */
-void set_colorpairs(void)
-{
-	syntaxtype *sint;
-	bool using_defaults = FALSE;
-
-	/* 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. */
@@ -81,64 +45,72 @@ void set_colorpairs(void)
 		colortype *combo = color_combo[index];
 
 		if (combo != NULL) {
-			if (combo->fg == USE_THE_DEFAULT && !using_defaults)
-				combo->fg = COLOR_WHITE;
-			if (combo->bg == USE_THE_DEFAULT && !using_defaults)
-				combo->bg = COLOR_BLACK;
+			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;
+			interface_color_pair[index] = COLOR_PAIR(index + 1) | combo->attributes;
 		} else {
-			if (index == FUNCTION_TAG)
+			if (index == FUNCTION_TAG || index == SCROLL_BAR)
 				interface_color_pair[index] = A_NORMAL;
 			else if (index == GUIDE_STRIPE)
 				interface_color_pair[index] = A_REVERSE;
+			else if (index == SPOTLIGHTED) {
+				init_pair(index + 1, COLOR_BLACK, COLOR_YELLOW + (COLORS > 15 ? 8 : 0));
+				interface_color_pair[index] = COLOR_PAIR(index + 1);
+			} else if (index == MINI_INFOBAR || index == PROMPT_BAR)
+				interface_color_pair[index] = interface_color_pair[TITLE_BAR];
 			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;
+				interface_color_pair[index] = COLOR_PAIR(index + 1) | A_BOLD;
 			} else
 				interface_color_pair[index] = hilite_attribute;
 		}
 
 		free(color_combo[index]);
 	}
-
-	/* For each loaded syntax, assign pair numbers to color combinations. */
-	for (sint = syntaxes; sint != NULL; sint = sint->next)
-		if (sint->filename == NULL)
-			set_syntax_colorpairs(sint);
 }
 
-/* Initialize the color information. */
-void color_init(void)
+/* 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 == USE_THE_DEFAULT && !using_defaults)
-			foreground = COLOR_WHITE;
+		ink->pairnum = (older != ink) ? older->pairnum : ++number;
 
-		if (background == USE_THE_DEFAULT && !using_defaults)
-			background = COLOR_BLACK;
-
-		init_pair(ink->pairnum, foreground, background);
+		ink->attributes |= COLOR_PAIR(ink->pairnum);
 	}
+}
+
+/* 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;
 }
@@ -147,27 +119,18 @@ void color_init(void)
  * the list starting at head.  Return TRUE upon success. */
 bool found_in_list(regexlisttype *head, const char *shibboleth)
 {
-	regexlisttype *item;
-	regex_t rgx;
-
-	for (item = head; item != NULL; item = item->next) {
-		regcomp(&rgx, item->full_regex, NANO_REG_EXTENDED);
-
-		if (regexec(&rgx, shibboleth, 0, NULL, 0) == 0) {
-			regfree(&rgx);
+	for (regexlisttype *item = head; item != NULL; item = item->next)
+		if (regexec(item->one_rgx, shibboleth, 0, NULL, 0) == 0)
 			return TRUE;
-		}
-
-		regfree(&rgx);
-	}
 
 	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;
+	syntaxtype *sntx = NULL;
 
 	/* If the rcfiles were not read, or contained no syntaxes, get out. */
 	if (syntaxes == NULL)
@@ -179,42 +142,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) {
+	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(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->filetop->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 we still don't have an answer, try using magic (when requested). */
+	if (sntx == NULL && !inhelp && ISSET(USE_MAGIC)) {
 		struct stat fileinfo;
 		magic_t cookie = NULL;
 		const char *magicstring = NULL;
@@ -238,10 +198,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)
@@ -250,30 +209,19 @@ 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;
-		}
 	}
 
 	/* When the syntax isn't loaded yet, parse it and initialize its colors. */
-	if (sint != NULL && sint->filename != NULL) {
-		parse_one_include(sint->filename, sint);
-		set_syntax_colorpairs(sint);
+	if (sntx != NULL && sntx->filename != NULL) {
+		parse_one_include(sntx->filename, sntx);
+		set_syntax_colorpairs(sntx);
 	}
 
-	openfile->syntax = sint;
-	openfile->colorstrings = (sint == NULL ? NULL : sint->color);
-}
-
-/* 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 (int index = 0; index < openfile->syntax->nmultis; index++)
-		line->multidata[index] = -1;
+	openfile->syntax = sntx;
 }
 
 /* Determine whether the matches of multiline regexes are still the same,
@@ -289,10 +237,12 @@ void check_the_multis(linestruct *line)
 	if (openfile->syntax == NULL || openfile->syntax->nmultis == 0)
 		return;
 
-	if (line->multidata == NULL)
-		set_up_multicache(line);
+	if (line->multidata == NULL) {
+		refresh_needed = TRUE;
+		return;
+	}
 
-	for (ink = openfile->colorstrings; ink != NULL; ink = ink->next) {
+	for (ink = openfile->syntax->color; ink != NULL; ink = ink->next) {
 		/* If it's not a multiline regex, skip. */
 		if (ink->end == NULL)
 			continue;
@@ -302,19 +252,22 @@ void check_the_multis(linestruct *line)
 		anend = (regexec(ink->end, afterstart, 1, &endmatch, 0) == 0);
 
 		/* Check whether the multidata still matches the current situation. */
-		if (line->multidata[ink->id] == CNONE ||
-						line->multidata[ink->id] == CWHOLELINE) {
+		if (line->multidata[ink->id] == NOTHING) {
+			if (!astart)
+				continue;
+		} else if (line->multidata[ink->id] & (WHOLELINE|WOULDBE)) {
 			if (!astart && !anend)
 				continue;
-		} else if (line->multidata[ink->id] == CSTARTENDHERE) {
-			if (astart && anend && startmatch.rm_so < endmatch.rm_so)
+		} else if (line->multidata[ink->id] == JUSTONTHIS) {
+			if (astart && anend && regexec(ink->start, line->data + endmatch.rm_eo,
+														1, &startmatch, 0) != 0)
 				continue;
-		} else if (line->multidata[ink->id] == CBEGINBEFORE) {
-			if (!astart && anend)
-				continue;
-		} else if (line->multidata[ink->id] == CENDAFTER) {
+		} else if (line->multidata[ink->id] == STARTSHERE) {
 			if (astart && !anend)
 				continue;
+		} else if (line->multidata[ink->id] == ENDSHERE) {
+			if (!astart && anend)
+				continue;
 		}
 
 		/* There is a mismatch, so something changed: repaint. */
@@ -331,14 +284,21 @@ void precalc_multicolorinfo(void)
 	regmatch_t startmatch, endmatch;
 	linestruct *line, *tailline;
 
-	if (openfile->colorstrings == NULL || ISSET(NO_COLOR_SYNTAX))
+	if (!openfile->syntax || openfile->syntax->nmultis == 0 || ISSET(NO_SYNTAX))
 		return;
 
+//#define TIMEPRECALC  123
+#ifdef TIMEPRECALC
+#include <time.h>
+	clock_t start = clock();
+#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);
+		if (!line->multidata)
+			line->multidata = nmalloc(openfile->syntax->nmultis * sizeof(short));
 
-	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;
@@ -347,66 +307,68 @@ void precalc_multicolorinfo(void)
 			int index = 0;
 
 			/* Assume nothing applies until proven otherwise below. */
-			line->multidata[ink->id] = CNONE;
+			line->multidata[ink->id] = NOTHING;
 
-			/* For an unpaired start match, mark all remaining lines. */
-			if (line->prev && line->prev->multidata[ink->id] == CWOULDBE) {
-				line->multidata[ink->id] = CWOULDBE;
-				continue;
-			}
-
-			/* When the line contains a start match, look for an end, and if
-			 * found, mark all the lines that are affected. */
-			while (regexec(ink->start, line->data + index, 1,
-							&startmatch, (index == 0) ? 0 : REG_NOTBOL) == 0) {
+			/* When the line contains a start match, look for an end,
+			 * and if found, mark all the lines that are affected. */
+			while (regexec(ink->start, line->data + index, 1, &startmatch,
+										(index == 0) ? 0 : REG_NOTBOL) == 0) {
 				/* Begin looking for an end match after the start match. */
 				index += startmatch.rm_eo;
 
-				/* If there is an end match on this line, mark the line, but
-				 * continue looking for other starts after it. */
-				if (regexec(ink->end, line->data + index, 1,
-							&endmatch, (index == 0) ? 0 : REG_NOTBOL) == 0) {
-					line->multidata[ink->id] = CSTARTENDHERE;
+				/* If there is an end match on this same line, mark the line,
+				 * but continue looking for other starts after it. */
+				if (regexec(ink->end, line->data + index, 1, &endmatch,
+										(index == 0) ? 0 : REG_NOTBOL) == 0) {
+					line->multidata[ink->id] = JUSTONTHIS;
+
 					index += endmatch.rm_eo;
-					/* If both start and end are mere anchors, step ahead. */
-					if (startmatch.rm_so == startmatch.rm_eo &&
-								endmatch.rm_so == endmatch.rm_eo) {
-						/* When at end-of-line, we're done. */
+
+					/* If the total match has zero length, force an advance. */
+					if (startmatch.rm_eo - startmatch.rm_so + endmatch.rm_eo == 0) {
+						/* When at end-of-line, there is no other start. */
 						if (line->data[index] == '\0')
 							break;
 						index = step_right(line->data, index);
 					}
+
 					continue;
 				}
 
 				/* Look for an end match on later lines. */
 				tailline = line->next;
 
-				while (tailline != NULL) {
-					if (regexec(ink->end, tailline->data, 1, &endmatch, 0) == 0)
-						break;
+				while (tailline && regexec(ink->end, tailline->data,
+											1, &endmatch, 0) != 0)
 					tailline = tailline->next;
-				}
 
+				/* When there is no end match, mark relevant lines as such. */
 				if (tailline == NULL) {
-					line->multidata[ink->id] = CWOULDBE;
+					for (; line->next != NULL; line = line->next)
+						line->multidata[ink->id] = WOULDBE;
+					line->multidata[ink->id] = WOULDBE;
 					break;
 				}
 
-				/* We found it, we found it, la la la la la.  Mark all
-				 * the lines in between and the end properly. */
-				line->multidata[ink->id] = CENDAFTER;
+				/* We found it, we found it, la lala lala.  Mark the lines. */
+				line->multidata[ink->id] = STARTSHERE;
 
+				// Note that this also advances the line in the main loop.
 				for (line = line->next; line != tailline; line = line->next)
-					line->multidata[ink->id] = CWHOLELINE;
+					line->multidata[ink->id] = WHOLELINE;
 
-				tailline->multidata[ink->id] = CBEGINBEFORE;
+				tailline->multidata[ink->id] = ENDSHERE;
 
-				/* Begin looking for a new start after the end match. */
+				/* Look for a possible new start after the end match. */
 				index = endmatch.rm_eo;
 			}
 		}
 	}
+
+#ifdef TIMEPRECALC
+	statusline(INFO, "Precalculation: %.1f ms", 1000 * (double)(clock() - start) / CLOCKS_PER_SEC);
+	napms(1200);
+#endif
 }
 
 #endif /* ENABLE_COLOR */

src/cut.c

@@ -1,9 +1,9 @@
 /**************************************************************************
  *   cut.c  --  This file is part of GNU nano.                            *
  *                                                                        *
- *   Copyright (C) 1999-2011, 2013-2020 Free Software Foundation, Inc.    *
+ *   Copyright (C) 1999-2011, 2013-2022 Free Software Foundation, Inc.    *
  *   Copyright (C) 2014 Mark Majeres                                      *
- *   Copyright (C) 2016, 2018, 2019 Benno Schulenberg                     *
+ *   Copyright (C) 2016, 2018-2020 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,17 +20,13 @@
  *                                                                        *
  **************************************************************************/
 
-#include "proto.h"
+#include "prototypes.h"
 
 #include <string.h>
 
 /* Delete the character under the cursor. */
 void do_deletion(undo_type action)
 {
-#ifndef NANO_TINY
-	size_t old_amount = 0;
-#endif
-
 	openfile->placewewant = xplustabs();
 
 	/* When in the middle of a line, delete the current character. */
@@ -38,22 +34,25 @@ void do_deletion(undo_type action)
 		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 = ISSET(SOFTWRAP) ? extra_chunks_in(openfile->current) : 0;
+
 		/* If the type of action changed or the cursor moved to a different
 		 * line, create a new undo item, otherwise update the existing item. */
 		if (action != openfile->last_action ||
-					openfile->current->lineno != openfile->current_undo->lineno)
+					openfile->current->lineno != openfile->current_undo->head_lineno)
 			add_undo(action, NULL);
 		else
 			update_undo(action);
-
-		if (ISSET(SOFTWRAP))
-			old_amount = number_of_chunks_in(openfile->current);
 #endif
 		/* Move the remainder of the line "in", over the current character. */
 		memmove(&openfile->current->data[openfile->current_x],
 					&openfile->current->data[openfile->current_x + charlen],
 					line_len - charlen + 1);
 #ifndef NANO_TINY
+		/* When softwrapping, a changed number of chunks requires a refresh. */
+		if (ISSET(SOFTWRAP) && extra_chunks_in(openfile->current) != 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)
@@ -65,7 +64,7 @@ void do_deletion(undo_type action)
 
 		/* 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)) {
+													!ISSET(NO_NEWLINES)) {
 #ifndef NANO_TINY
 			if (action == BACK)
 				add_undo(BACK, NULL);
@@ -75,23 +74,24 @@ void do_deletion(undo_type action)
 
 #ifndef NANO_TINY
 		add_undo(action, NULL);
-#endif
-		/* Add the contents of the next line to those of the current one. */
-		openfile->current->data = charealloc(openfile->current->data,
-				strlen(openfile->current->data) + strlen(joining->data) + 1);
-		strcat(openfile->current->data, joining->data);
 
-#ifndef NANO_TINY
-		/* Adjust the mark if it was on the line that was "eaten". */
+		/* 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;
 		}
-#endif
-		unlink_node(joining);
-		renumber_from(openfile->current);
 
-		/* Two lines were joined, so we need to refresh the screen. */
+		openfile->current->has_anchor |= joining->has_anchor;
+#endif
+		/* Add the content of the next line to that of the current one. */
+		openfile->current->data = nrealloc(openfile->current->data,
+				strlen(openfile->current->data) + strlen(joining->data) + 1);
+		strcat(openfile->current->data, joining->data);
+
+		unlink_node(joining);
+
+		/* 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. */
@@ -101,14 +101,7 @@ void do_deletion(undo_type action)
 	openfile->totsize--;
 #ifndef NANO_TINY
 	openfile->current_undo->newsize = openfile->totsize;
-
-	/* If the number of screen rows that a softwrapped line occupies
-	 * has changed, we need a full refresh. */
-	if (ISSET(SOFTWRAP) && refresh_needed == FALSE &&
-				number_of_chunks_in(openfile->current) != old_amount)
-		refresh_needed = TRUE;
 #endif
-
 	set_modified();
 }
 
@@ -120,7 +113,14 @@ void do_delete(void)
 		zap_text();
 	else
 #endif
-	do_deletion(DEL);
+	{
+		do_deletion(DEL);
+#ifdef ENABLE_UTF8
+		while (openfile->current->data[openfile->current_x] != '\0' &&
+				is_zerowidth(openfile->current->data + openfile->current_x))
+			do_deletion(DEL);
+#endif
+	}
 }
 
 /* Backspace over one character.  That is, move the cursor left one
@@ -132,12 +132,41 @@ void do_backspace(void)
 		zap_text();
 	else
 #endif
-	if (openfile->current != openfile->filetop || openfile->current_x > 0) {
+	if (openfile->current_x > 0) {
+		openfile->current_x = step_left(openfile->current->data, openfile->current_x);
+		do_deletion(BACK);
+	} else if (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
 /* Delete text from the cursor until the first start of a word to
  * the left, or to the right when forward is TRUE. */
@@ -156,7 +185,7 @@ void chop_word(bool forward)
 	 * 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));
+		do_prev_word();
 		if (openfile->current != is_current) {
 			if (is_current_x > 0) {
 				openfile->current = is_current;
@@ -165,7 +194,7 @@ void chop_word(bool forward)
 				openfile->current_x = strlen(openfile->current->data);
 		}
 	} else {
-		do_next_word(FALSE, ISSET(WORD_BOUNDS));
+		do_next_word(ISSET(AFTER_ENDS));
 		if (openfile->current != is_current &&
 							is_current->data[is_current_x] != '\0') {
 			openfile->current = is_current;
@@ -183,7 +212,7 @@ void chop_word(bool forward)
 
 	/* Now kill the marked region and a word is gone. */
 	add_undo(CUT, NULL);
-	do_snip(FALSE, TRUE, FALSE, FALSE);
+	do_snip(TRUE, FALSE, FALSE);
 	update_undo(CUT);
 
 	/* Discard the cut word and restore the cutbuffer. */
@@ -205,86 +234,119 @@ void chop_next_word(void)
 {
 	openfile->mark = NULL;
 
-	if (is_cuttable(openfile->current_x > 0))
+	if (is_cuttable(TRUE))
 		chop_word(FORWARD);
 }
 #endif /* !NANO_TINY */
 
-/* Move all text between (top, top_x) and (bot, bot_x) from the current buffer
- * into the cutbuffer. */
+/* 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 mark_inside = (openfile->mark &&
-						openfile->mark->lineno >= top->lineno &&
-						openfile->mark->lineno <= bot->lineno &&
-						(openfile->mark != top || openfile->mark_x >= top_x) &&
-						(openfile->mark != bot || openfile->mark_x <= bot_x));
 	bool same_line = (openfile->mark == top);
+	bool post_marked = (openfile->mark && (openfile->mark->lineno > top->lineno ||
+						(same_line && openfile->mark_x > top_x)));
+	static bool inherited_anchor = FALSE;
+	bool had_anchor = 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)
+			had_anchor |= line->has_anchor;
 #endif
 
-	/* Reduce the buffer to cover just the text that needs to be extracted. */
-	partition_buffer(top, top_x, bot, bot_x);
+	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("");
+#ifndef NANO_TINY
+		last->has_anchor = bot->has_anchor;
+#endif
+		last->prev = bot->prev;
+		bot->prev->next = last;
+		last->next = NULL;
 
-	/* Subtract the number of characters in that text from the file size. */
-	openfile->totsize -= get_totsize(top, bot);
+		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 = nrealloc(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 = openfile->filetop;
-		cutbottom = openfile->filebot;
+		cutbuffer = taken;
+		cutbottom = last;
+#ifndef NANO_TINY
+		inherited_anchor = taken->has_anchor;
+#endif
 	} else {
-		/* Tack the data of the first line of the text onto the data of
-		 * the last line in the given buffer. */
-		cutbottom->data = charealloc(cutbottom->data,
-								strlen(cutbottom->data) +
-								strlen(openfile->filetop->data) + 1);
-		strcat(cutbottom->data, openfile->filetop->data);
+		cutbottom->data = nrealloc(cutbottom->data,
+							strlen(cutbottom->data) + strlen(taken->data) + 1);
+		strcat(cutbottom->data, taken->data);
+#ifndef NANO_TINY
+		cutbottom->has_anchor = taken->has_anchor && !inherited_anchor;
+		inherited_anchor |= taken->has_anchor;
+#endif
+		cutbottom->next = taken->next;
+		delete_node(taken);
 
-		/* Attach the second line of the text (if any) to the last line
-		 * of the buffer, then remove the now superfluous first line. */
-		cutbottom->next = openfile->filetop->next;
-		delete_node(openfile->filetop);
-
-		/* If there is a second line, make the reverse attachment too and
-		 * update the buffer pointer to point at the end of the text. */
 		if (cutbottom->next != NULL) {
 			cutbottom->next->prev = cutbottom;
-			cutbottom = openfile->filebot;
+			cutbottom = last;
 		}
 	}
 
-	/* Since the text has now been saved, remove it from the file buffer. */
-	openfile->filetop = make_new_node(NULL);
-	openfile->filetop->data = copy_of("");
-	openfile->filebot = openfile->filetop;
-
-	/* Set the cursor at the point where the text was removed. */
-	openfile->current = openfile->filetop;
 	openfile->current_x = top_x;
-#ifndef NANO_TINY
-	/* If the mark was inside the partition, put it where the cursor now is. */
-	if (mark_inside) {
-		openfile->mark = openfile->current;
-		openfile->mark_x = openfile->current_x;
-	} else if (same_line)
-		/* Update the pointer to this partially cut line. */
-		openfile->mark = openfile->current;
-#endif
 
-	/* Glue the texts before and after the extraction together. */
-	unpartition_buffer();
+#ifndef NANO_TINY
+	openfile->current->has_anchor = had_anchor;
+
+	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);
 
-	/* If the top of the edit window was inside the old partition, put
-	 * it in range of current. */
+	/* When the beginning of the viewport was inside the excision, adjust. */
 	if (edittop_inside) {
 		adjust_viewport(STATIONARY);
 		refresh_needed = TRUE;
@@ -299,61 +361,71 @@ void extract_segment(linestruct *top, size_t top_x, linestruct *bot, size_t bot_
  * at the current cursor position. */
 void ingraft_buffer(linestruct *topline)
 {
-	size_t current_x_save = openfile->current_x;
-	/* Remember whether the current line is at the top of the edit window. */
-	bool edittop_inside = (openfile->edittop == openfile->current);
+	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
-	/* Remember whether mark and cursor are on the same line, and their order. */
-	bool same_line = (openfile->mark == openfile->current);
-	bool right_side_up = (openfile->mark &&
-						(openfile->mark->lineno < openfile->current->lineno ||
-						(same_line && openfile->mark_x <= openfile->current_x)));
+	bool mark_follows = (openfile->mark == line && !mark_is_before_cursor());
 #endif
+	linestruct *botline = topline;
 
-	/* Partition the buffer so that it contains no text, then delete it.*/
-	partition_buffer(openfile->current, openfile->current_x,
-						openfile->current, openfile->current_x);
-	delete_node(openfile->filetop);
+	while (botline->next != NULL)
+		botline = botline->next;
 
-	/* Replace the current buffer with the passed buffer. */
-	openfile->filetop = topline;
-	openfile->filebot = topline;
-	while (openfile->filebot->next != NULL)
-		openfile->filebot = openfile->filebot->next;
+	/* Add the size of the text to be grafted to the buffer size. */
+	openfile->totsize += number_of_characters_in(topline, botline);
 
-	/* Put the cursor at the end of the pasted text. */
-	openfile->current = openfile->filebot;
-	openfile->current_x = strlen(openfile->filebot->data);
+	if (topline != botline)
+		length = xpos;
 
-	/* When the pasted stuff contains no newline, adjust the cursor's
-	 * x coordinate for the text that is before the pasted stuff. */
-	if (openfile->filetop == openfile->filebot)
-		openfile->current_x += current_x_save;
-
-#ifndef NANO_TINY
-	/* When needed, refresh the mark's pointer and compensate the mark's
-	 * x coordinate for the change in the current line. */
-	if (same_line) {
-		if (!right_side_up) {
-			openfile->mark = openfile->filebot;
-			openfile->mark_x += openfile->current_x - current_x_save;
-		} else
-			openfile->mark = openfile->filetop;
+	if (extralen > 0) {
+		/* Insert the text of topline at the current cursor position. */
+		line->data = nrealloc(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) {
+		/* 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 = nrealloc(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;
 #endif
 
-	/* Add the number of characters in the copied text to the file size. */
-	openfile->totsize += get_totsize(openfile->filetop, openfile->filebot);
+	delete_node(topline);
+	free(tailtext);
 
-	/* If we pasted onto the first line of the edit window, the corresponding
-	 * record has been freed, so... point at the start of the copied text. */
-	if (edittop_inside)
-		openfile->edittop = openfile->filetop;
-
-	/* Weld the pasted text into the surrounding content of the buffer. */
-	unpartition_buffer();
-
-	renumber_from(topline);
+	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')
@@ -368,170 +440,77 @@ void copy_from_buffer(linestruct *somebuffer)
 	ingraft_buffer(the_copy);
 }
 
-/* Move the whole current line from the current buffer to the cutbuffer. */
-void cut_line(void)
-{
-	/* When not on the last line of the buffer, move the text from the
-	 * head of this line to the head of the next line into the cutbuffer;
-	 * otherwise, move all of the text of this line into the cutbuffer. */
-	if (openfile->current != openfile->filebot)
-		extract_segment(openfile->current, 0, openfile->current->next, 0);
-	else
-		extract_segment(openfile->current, 0,
-				openfile->current, strlen(openfile->current->data));
-
-	openfile->placewewant = 0;
-}
-
 #ifndef NANO_TINY
-/* Move all text from the cursor position until the end of this line into
- * the cutbuffer.  But when already at the end of a line, then move this
- * "newline" to the cutbuffer. */
-void cut_to_eol(void)
-{
-	size_t data_len = strlen(openfile->current->data);
-
-	/* When not at the end of a line, move the rest of this line into
-	 * the cutbuffer.  Otherwise, when not at the end of the buffer,
-	 * move the line separation into the cutbuffer. */
-	if (openfile->current_x < data_len)
-		extract_segment(openfile->current, openfile->current_x,
-				openfile->current, data_len);
-	else if (openfile->current != openfile->filebot) {
-		extract_segment(openfile->current, openfile->current_x,
-				openfile->current->next, 0);
-		openfile->placewewant = xplustabs();
-	}
-}
-
 /* Move all marked text from the current buffer into the cutbuffer. */
-void cut_marked(bool *right_side_up)
+void cut_marked_region(void)
 {
 	linestruct *top, *bot;
 	size_t top_x, bot_x;
 
-	get_region((const linestruct **)&top, &top_x,
-				(const linestruct **)&bot, &bot_x, right_side_up);
+	get_region(&top, &top_x, &bot, &bot_x);
 
 	extract_segment(top, top_x, bot, bot_x);
 
 	openfile->placewewant = xplustabs();
 }
+#endif
 
-/* Move all text from the cursor position to end-of-file into the cutbuffer. */
-void cut_to_eof(void)
-{
-	extract_segment(openfile->current, openfile->current_x,
-				openfile->filebot, strlen(openfile->filebot->data));
-}
-#endif /* !NANO_TINY */
-
-/* Move text from the current buffer into the cutbuffer.  If
- * copying is TRUE, copy the text back into the buffer afterward.
+/* 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 copying, bool marked, bool until_eof, bool append)
+void do_snip(bool marked, bool until_eof, bool append)
 {
+	linestruct *line = openfile->current;
+
 #ifndef NANO_TINY
-	linestruct *was_bottom = NULL;
-		/* The current end of the cutbuffer, before we add text to it. */
-	size_t botlen = 0;
-		/* The length of the string at the current end of the cutbuffer,
-		 * before we add text to it. */
-	bool using_magicline = !ISSET(NO_NEWLINES);
-		/* Whether an automatic newline should be added at end-of-buffer. */
-	bool right_side_up = TRUE;
-		/* There *is* no region, *or* it is marked forward. */
+	keep_cutbuffer &= (openfile->last_action != COPY);
 #endif
-	static bool precedent = FALSE;
-		/* Whether the previous operation was a copying operation. */
 
 	/* If cuts were not continuous, or when cutting a region, clear the slate. */
-	if ((!keep_cutbuffer || marked || until_eof || copying != precedent) &&
-				!append) {
+	if ((marked || until_eof || !keep_cutbuffer) && !append) {
 		free_lines(cutbuffer);
 		cutbuffer = NULL;
 	}
 
-	/* After a line operation, future ones should add to the cutbuffer. */
-	keep_cutbuffer = !marked && !until_eof;
-	precedent = copying;
-
 #ifndef NANO_TINY
-	if (copying) {
-		/* If the cutbuffer isn't empty, remember where it currently ends. */
-		if (cutbuffer != NULL) {
-			was_bottom = cutbottom;
-			botlen = strlen(cutbottom->data);
-		}
-		/* Don't add a magic line when moving text to the cutbuffer. */
-		SET(NO_NEWLINES);
-	}
-
 	/* Now move the relevant piece of text into the cutbuffer. */
 	if (until_eof)
-		cut_to_eof();
+		extract_segment(openfile->current, openfile->current_x,
+		                openfile->filebot, strlen(openfile->filebot->data));
 	else if (openfile->mark) {
-		cut_marked(&right_side_up);
+		cut_marked_region();
 		openfile->mark = NULL;
-	} else if (ISSET(CUT_FROM_CURSOR))
-		cut_to_eol();
-	else
-#endif
-		cut_line();
-
-#ifndef NANO_TINY
-	if (copying) {
-		/* Copy the text that was put into the cutbuffer back into the current
-		 * file buffer, so that in the end nothing has been deleted. */
-		if (cutbuffer != NULL) {
-			if (was_bottom != NULL) {
-				was_bottom->data += botlen;
-				copy_from_buffer(was_bottom);
-				was_bottom->data -= botlen;
-			} else
-				copy_from_buffer(cutbuffer);
-
-			/* If the copied region was marked forward, put the new desired
-			 * x position at its end; otherwise, leave it at its beginning. */
-			if (right_side_up)
-				openfile->placewewant = xplustabs();
+	} 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 magic-line behavior now that we're done fiddling. */
-		if (using_magicline)
-			UNSET(NO_NEWLINES);
 	} else
 #endif
-		set_modified();
+	{
+		/* 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;
 }
 
-/* Return FALSE when a cut command would not actually cut anything: when
- * on an empty line at EOF, or when the mark covers zero characters, or
- * (when test_cliff is TRUE) when the magic line would be cut. */
-bool is_cuttable(bool test_cliff)
-{
-	if ((openfile->current->next == NULL && openfile->current->data[0] == '\0'
-#ifndef NANO_TINY
-					&& openfile->mark == NULL) ||
-					(openfile->mark == openfile->current &&
-					openfile->mark_x == openfile->current_x) ||
-					(test_cliff && openfile->current->data[openfile->current_x] == '\0' &&
-					((ISSET(NO_NEWLINES) && openfile->current == openfile->filebot) ||
-					(!ISSET(NO_NEWLINES) && openfile->current == openfile->filebot->prev))
-#endif
-					)) {
-#ifndef NANO_TINY
-		statusbar(_("Nothing was cut"));
-		openfile->mark = NULL;
-#endif
-		return FALSE;
-	} else
-		return TRUE;
-}
-
 /* Move text from the current buffer into the cutbuffer. */
 void cut_text(void)
 {
@@ -546,56 +525,32 @@ void cut_text(void)
 		add_undo(CUT, NULL);
 	}
 
-	do_snip(FALSE, openfile->mark != NULL, FALSE, FALSE);
+	do_snip(openfile->mark != NULL, FALSE, FALSE);
 
 	update_undo(CUT);
 #else
 	if (is_cuttable(FALSE))
-		do_snip(FALSE, FALSE, FALSE, FALSE);
+		do_snip(FALSE, FALSE, FALSE);
 #endif
 	wipe_statusbar();
 }
 
 #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 copy_text(void)
-{
-	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;
-
-	do_snip(TRUE, mark_is_set, FALSE, FALSE);
-
-	/* If the mark was set, restore the viewport and cursor position. */
-	if (mark_is_set) {
-		openfile->edittop = line_from_number(is_edittop_lineno);
-		openfile->firstcolumn = is_firstcolumn;
-		openfile->current = line_from_number(is_current_lineno);
-		openfile->current_x = is_current_x;
-	} else
-		focusing = FALSE;
-
-	openfile->last_action = OTHER;
-}
-
 /* Cut from the current cursor position to the end of the file. */
 void cut_till_eof(void)
 {
-	if ((openfile->current == openfile->filebot && openfile->current->data[0] == '\0') ||
-				(!ISSET(NO_NEWLINES) && openfile->current->next == openfile->filebot &&
-				openfile->current->data[openfile->current_x] == '\0')) {
+	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, FALSE, TRUE, FALSE);
+	do_snip(FALSE, TRUE, FALSE);
 	update_undo(CUT_TO_EOF);
 	wipe_statusbar();
 }
@@ -617,25 +572,140 @@ void zap_text(void)
 	/* Use the cutbuffer from the ZAP undo item, so the cut can be undone. */
 	cutbuffer = openfile->current_undo->cutbuffer;
 
-	do_snip(FALSE, openfile->mark != NULL, FALSE, TRUE);
+	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 paste_text(void)
 {
+#if defined(ENABLE_WRAPPING) || !defined(NANO_TINY)
+	/* Remember where the paste started. */
+	linestruct *was_current = openfile->current;
+#endif
+#ifndef NANO_TINY
+	bool had_anchor = was_current->has_anchor;
+#endif
 	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 (cutbuffer == NULL) {
-		statusbar(_("Cutbuffer is empty"));
+		statusline(AHEM, _("Cutbuffer is empty"));
 		return;
 	}
 
@@ -651,12 +721,28 @@ void paste_text(void)
 	copy_from_buffer(cutbuffer);
 
 #ifndef NANO_TINY
+	/* Wipe any anchors in the pasted text, so that they don't proliferate. */
+	for (linestruct *line = was_current; line != openfile->current->next; line = line->next)
+		line->has_anchor = FALSE;
+
+	was_current->has_anchor = had_anchor;
+
 	update_undo(PASTE);
 #endif
 
+#ifdef ENABLE_WRAPPING
+	/* When still on the same line and doing hard-wrapping, limit the width. */
+	if (openfile->current == was_current && ISSET(BREAK_LONG_LINES))
+		do_wrap();
+#endif
+
 	/* If we pasted less than a screenful, don't center the cursor. */
 	if (less_than_a_screenful(was_lineno, was_leftedge))
 		focusing = FALSE;
+#ifdef ENABLE_COLOR
+	else
+		precalc_multicolorinfo();
+#endif
 
 	/* Set the desired x position to where the pasted text ends. */
 	openfile->placewewant = xplustabs();

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-2020 Free Software Foundation, Inc.    *
+ *   Copyright (C) 1999-2011, 2013-2022 Free Software Foundation, Inc.    *
  *   Copyright (C) 2014-2017 Benno Schulenberg                            *
  *                                                                        *
  *   GNU nano is free software: you can redistribute it and/or modify     *
@@ -25,139 +25,261 @@
 
 #ifdef NEED_XOPEN_SOURCE_EXTENDED
 #ifndef _XOPEN_SOURCE_EXTENDED
-#define _XOPEN_SOURCE_EXTENDED 1
+#define _XOPEN_SOURCE_EXTENDED  1
 #endif
 #endif
 
+#if defined(__HAIKU__) && !defined(_DEFAULT_SOURCE)
+#define _DEFAULT_SOURCE  1
+#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
 #include <limits.h>
 #endif
 
+/* Set a default value for PATH_MAX if there isn't one. */
+#ifndef PATH_MAX
+#define PATH_MAX  4096
+#endif
+
 #ifdef HAVE_SYS_PARAM_H
 #include <sys/param.h>
 #endif
 
-/* Suppress warnings for __attribute__((warn_unused_result)). */
-#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)
-
-/* 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
-#else
-#define MAXCHARLEN 1
-#endif
-
-/* Set a default value for PATH_MAX if there isn't one. */
-#ifndef PATH_MAX
-#define PATH_MAX 4096
-#endif
-
-#ifdef USE_SLANG
-/* Slang support. */
-#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
-/* Ncurses support. */
-#elif defined(HAVE_NCURSESW_NCURSES_H)
-#include <ncursesw/ncurses.h>
-#elif defined(HAVE_NCURSES_H)
-#include <ncurses.h>
-#else
-/* Curses support. */
-#include <curses.h>
-#endif /* CURSES_H */
-
-#if defined(NCURSES_VERSION_MAJOR) && (NCURSES_VERSION_MAJOR < 6)
-#define USING_OLD_NCURSES yes
-#endif
-
-#ifdef ENABLE_NLS
-/* Native language support. */
-#ifdef HAVE_LIBINTL_H
-#include <libintl.h>
-#endif
-#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)
-#endif
-#define gettext_noop(string) (string)
-#define N_(string) gettext_noop(string)
-		/* Mark a string that will be sent to gettext() later. */
-
 #include <dirent.h>
 #include <regex.h>
 #include <signal.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. */
+/* Prefer wide ncurses over normal ncurses over curses. */
+#if defined(HAVE_NCURSESW_NCURSES_H)
+#include <ncursesw/ncurses.h>
+#elif defined(HAVE_NCURSES_H)
+#include <ncurses.h>
+#else
+#include <curses.h>
+#endif
+
+/* Native language support. */
+#ifdef ENABLE_NLS
+#ifdef HAVE_LIBINTL_H
+#include <libintl.h>
+#endif
+#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)
+#endif
+/* For marking a string on which gettext() will be called later. */
+#define gettext_noop(string)  (string)
+#define N_(string)  gettext_noop(string)
+
+/* If we aren't using an ncurses with mouse support, then
+ * exclude the mouse routines, as they are useless then. */
 #ifndef NCURSES_MOUSE_VERSION
 #undef ENABLE_MOUSE
 #endif
 
 #if defined(ENABLE_WRAPPING) || defined(ENABLE_JUSTIFY)
-#define ENABLED_WRAPORJUSTIFY 1
+#define ENABLED_WRAPORJUSTIFY  1
 #endif
 
-#define BACKWARD FALSE
-#define FORWARD TRUE
+/* Suppress warnings for __attribute__((warn_unused_result)). */
+#define IGNORE_CALL_RESULT(call)  do { if (call) {} } while(0)
 
-#define BLIND FALSE
-#define VISIBLE TRUE
+/* 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 JUSTFIND  0
-#define REPLACING 1
-#define INREGION  2
+#define BACKWARD  FALSE
+#define FORWARD  TRUE
+
+#define YESORNO  FALSE
+#define YESORALLORNO  TRUE
+
+#define YES      1
+#define ALL      2
+#define NO       0
+#define CANCEL  -1
+
+#define BLIND  FALSE
+#define VISIBLE  TRUE
+
+#define JUSTFIND   0
+#define REPLACING  1
+#define INREGION   2
+
+#define NORMAL  TRUE
+#define SPECIAL  FALSE
+#define TEMPORARY  FALSE
+
+#define ANNOTATE  TRUE
+#define NONOTES  FALSE
+
+#define PRUNE_DUPLICATE  TRUE
+#define IGNORE_DUPLICATES  FALSE
+
+#ifdef ENABLE_UTF8
+/* In UTF-8 a valid character is at most four bytes long. */
+#define MAXCHARLEN  4
+#else
+#define MAXCHARLEN  1
+#endif
+
+/* The default width of a tab in spaces. */
+#define WIDTH_OF_TAB  8
+
+/* The default number of columns from end of line where wrapping occurs. */
+#define COLUMNS_FROM_EOL  8
+
+/* The default comment character when a syntax does not specify any. */
+#define GENERAL_COMMENT_CHARACTER  "#"
+
+/* The maximum number of search/replace history strings saved. */
+#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)
 
 #ifdef ENABLE_COLOR
-#define USE_THE_DEFAULT -1
-#define BAD_COLOR -2
+#define THE_DEFAULT  -1
+#define BAD_COLOR  -2
+
+/* Flags for indicating how a multiline regex pair apply to a line. */
+#define NOTHING      (1<<1)
+		/* The start/end regexes don't cover this line at all. */
+#define STARTSHERE   (1<<2)
+		/* The start regex matches on this line, the end regex on a later one. */
+#define WHOLELINE    (1<<3)
+		/* The start regex matches on an earlier line, the end regex on a later one. */
+#define ENDSHERE     (1<<4)
+		/* The start regex matches on an earlier line, the end regex on this one. */
+#define JUSTONTHIS   (1<<5)
+		/* Both the start and end regexes match within this line. */
+#define WOULDBE      (1<<6)
+		/* An unpaired start match is on or before this line. */
 #endif
 
-#define STANDARD_INPUT  0
+/* Basic control codes. */
+#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 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
+
+/* A special keycode for plugging into the input stream after a suspension. */
+#define KEY_FRESH  0x4FE
+
+#ifndef NANO_TINY
+/* A special keycode for when we get a SIGWINCH (a window resize). */
+#define KEY_WINCH  -2
+
+/* Some extra flags for the undo function. */
+#define WAS_BACKSPACE_AT_EOF  (1<<1)
+#define WAS_WHOLE_LINE        (1<<2)
+#define INCLUDED_LAST_LINE    (1<<3)
+#define MARK_WAS_SET          (1<<4)
+#define CURSOR_WAS_AT_HEAD    (1<<5)
+#define HAD_ANCHOR_AT_START   (1<<6)
+#endif /* !NANO_TINY */
+
+/* Identifiers for the different menus. */
+#define MMAIN          (1<<0)
+#define MWHEREIS       (1<<1)
+#define MREPLACE       (1<<2)
+#define MREPLACEWITH   (1<<3)
+#define MGOTOLINE      (1<<4)
+#define MWRITEFILE     (1<<5)
+#define MINSERTFILE    (1<<6)
+#define MEXECUTE       (1<<7)
+#define MHELP          (1<<8)
+#define MSPELL         (1<<9)
+#define MBROWSER      (1<<10)
+#define MWHEREISFILE  (1<<11)
+#define MGOTODIR      (1<<12)
+#define MYESNO        (1<<13)
+#define MLINTER       (1<<14)
+#define MFINDINHELP   (1<<15)
+/* This is an abbreviation for all menus except Help and Browser and YesNo. */
+#define MMOST  (MMAIN|MWHEREIS|MREPLACE|MREPLACEWITH|MGOTOLINE|MWRITEFILE|MINSERTFILE|\
+                MEXECUTE|MWHEREISFILE|MGOTODIR|MFINDINHELP|MSPELL|MLINTER)
+#ifndef NANO_TINY
+#define MSOME  MMOST|MBROWSER
+#else
+#define MSOME  MMAIN|MBROWSER
+#endif
 
 /* Enumeration types. */
 typedef enum {
-	NIX_FILE, DOS_FILE, MAC_FILE
+	UNSPECIFIED, NIX_FILE, DOS_FILE, MAC_FILE
 } format_type;
 
 typedef enum {
-	HUSH, NOTICE, MILD, ALERT
+	VACUUM, HUSH, REMARK, INFO, NOTICE, AHEM, MILD, ALERT
 } message_type;
 
 typedef enum {
 	OVERWRITE, APPEND, PREPEND
 } kind_of_writing_type;
 
-typedef enum {
-	SOFTMARK, HARDMARK
-} mark_type;
-
 typedef enum {
 	CENTERING, FLOWING, STATIONARY
 } update_type;
@@ -172,16 +294,90 @@ typedef enum {
 #ifdef ENABLE_COMMENT
 	COMMENT, UNCOMMENT, PREFLIGHT,
 #endif
-	ZAP, CUT, CUT_TO_EOF, PASTE, INSERT, COUPLE_BEGIN, COUPLE_END, OTHER
+	ZAP, CUT, CUT_TO_EOF, COPY, PASTE, INSERT,
+	COUPLE_BEGIN, COUPLE_END, OTHER
 } undo_type;
 
+/* The elements of the interface that can be colored differently. */
+enum {
+	TITLE_BAR = 0,
+	LINE_NUMBER,
+	GUIDE_STRIPE,
+	SCROLL_BAR,
+	SELECTED_TEXT,
+	SPOTLIGHTED,
+	MINI_INFOBAR,
+	PROMPT_BAR,
+	STATUS_BAR,
+	ERROR_MESSAGE,
+	KEY_COMBO,
+	FUNCTION_TAG,
+	NUMBER_OF_ELEMENTS
+};
+
+/* Enumeration used in the flags array.  See the definition of FLAGMASK. */
+enum {
+	DONTUSE = 0,
+	CASE_SENSITIVE,
+	CONSTANT_SHOW,
+	NO_HELP,
+	SUSPENDABLE,
+	NO_WRAP,
+	AUTOINDENT,
+	VIEW_MODE,
+	USE_MOUSE,
+	USE_REGEXP,
+	SAVE_ON_EXIT,
+	CUT_FROM_CURSOR,
+	BACKWARDS_SEARCH,
+	MULTIBUFFER,
+	REBIND_DELETE,
+	RAW_SEQUENCES,
+	NO_CONVERT,
+	MAKE_BACKUP,
+	INSECURE_BACKUP,
+	NO_SYNTAX,
+	PRESERVE,
+	HISTORYLOG,
+	RESTRICTED,
+	SMART_HOME,
+	WHITESPACE_DISPLAY,
+	TABS_TO_SPACES,
+	QUICK_BLANK,
+	WORD_BOUNDS,
+	NO_NEWLINES,
+	BOLD_TEXT,
+	SOFTWRAP,
+	POSITIONLOG,
+	LOCKING,
+	NOREAD_MODE,
+	MAKE_IT_UNIX,
+	TRIM_BLANKS,
+	SHOW_CURSOR,
+	LINE_NUMBERS,
+	AT_BLANKS,
+	AFTER_ENDS,
+	LET_THEM_ZAP,
+	BREAK_LONG_LINES,
+	JUMPY_SCROLLING,
+	EMPTY_LINE,
+	INDICATOR,
+	BOOKSTYLE,
+	STATEFLAGS,
+	USE_MAGIC,
+	MINIBAR,
+	ZERO
+};
+
 /* 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. */
+		/* This combo's background color. */
 	short pairnum;
 		/* The pair number for this foreground/background color combination. */
 	int attributes;
@@ -191,14 +387,12 @@ typedef struct colortype {
 	regex_t *end;
 		/* The compiled regular expression for 'end=', if any. */
 	struct colortype *next;
-		/* Next set of colors. */
-	int id;
-		/* Basic id for assigning to lines later. */
+		/* Next color combination. */
 } colortype;
 
 typedef struct regexlisttype {
-	char *full_regex;
-		/* A regex string to match things that imply a certain syntax. */
+	regex_t *one_rgx;
+		/* A regex to match things that imply a certain syntax. */
 	struct regexlisttype *next;
 		/* The next regex. */
 } regexlisttype;
@@ -221,7 +415,7 @@ typedef struct syntaxtype {
 		/* 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;
+	augmentstruct *augmentations;
 		/* List of extendsyntax commands to apply when loaded. */
 	regexlisttype *extensions;
 		/* The list of extensions that this syntax applies to. */
@@ -241,7 +435,7 @@ typedef struct syntaxtype {
 #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. */
@@ -261,20 +455,6 @@ typedef struct lintstruct {
 	struct lintstruct *prev;
 		/* Previous error. */
 } lintstruct;
-
-/* Flags that indicate how a multiline regex applies to a line. */
-#define CNONE           (1<<1)
-		/* Yay, regex doesn't apply to this line at all! */
-#define CBEGINBEFORE    (1<<2)
-		/* Regex starts on an earlier line, ends on this one. */
-#define CENDAFTER       (1<<3)
-		/* Regex starts on this line and ends on a later one. */
-#define CWHOLELINE      (1<<4)
-		/* Whole line engulfed by the regex, start < me, end > me. */
-#define CSTARTENDHERE   (1<<5)
-		/* Regex starts and ends within this line. */
-#define CWOULDBE        (1<<6)
-		/* An unpaired start match on or before this line. */
 #endif /* ENABLE_COLOR */
 
 /* More structure types. */
@@ -291,6 +471,10 @@ typedef struct linestruct {
 	short *multidata;
 		/* Array of which multi-line regexes apply to this line. */
 #endif
+#ifndef NANO_TINY
+	bool has_anchor;
+		/* Whether the user has placed an anchor at this line. */
+#endif
 } linestruct;
 
 #ifndef NANO_TINY
@@ -310,9 +494,9 @@ typedef struct undostruct {
 		/* The operation type that this undo item is for. */
 	int xflags;
 		/* Some flag data to mark certain corner cases. */
-	ssize_t lineno;
+	ssize_t head_lineno;
 		/* The line number where the operation began or ended. */
-	size_t begin;
+	size_t head_x;
 		/* The x position where the operation began or ended. */
 	char *strdata;
 		/* String data to help restore the affected line. */
@@ -324,9 +508,9 @@ typedef struct undostruct {
 		/* Undo info specific to groups of lines. */
 	linestruct *cutbuffer;
 		/* A copy of the cutbuffer. */
-	ssize_t mark_begin_lineno;
+	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 undostruct *next;
 		/* A pointer to the undo item of the preceding action. */
@@ -336,11 +520,11 @@ typedef struct undostruct {
 #ifdef ENABLE_HISTORIES
 typedef struct poshiststruct {
 	char *filename;
-		/* The file. */
-	ssize_t lineno;
-		/* Line number we left off on. */
-	ssize_t xno;
-		/* The x position in the file we left off on. */
+		/* The full path plus name of the file. */
+	ssize_t linenumber;
+		/* The line where the cursor was when we closed the file. */
+	ssize_t columnnumber;
+		/* The column where the cursor was. */
 	struct poshiststruct *next;
 		/* The next item of position history. */
 } poshiststruct;
@@ -368,8 +552,8 @@ typedef struct openfilestruct {
 		/* The file's x position we would like. */
 	ssize_t current_y;
 		/* The file's y-coordinate position. */
-	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. */
@@ -379,10 +563,10 @@ typedef struct openfilestruct {
 		/* 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. */
+	bool softmark;
+		/* Whether a marked region was made by holding Shift. */
 	format_type fmt;
-		/* The file's format -- Unix or DOS or Mac or mixed. */
+		/* The file's format -- Unix or DOS or Mac. */
 	char *lock_filename;
 		/* The path of the lockfile, if we created one. */
 	undostruct *undotop;
@@ -398,11 +582,11 @@ typedef struct openfilestruct {
 		/* 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
+	char *errormessage;
+		/* The ALERT message (if any) that occurred when opening the file. */
 	struct openfilestruct *next;
 		/* The next open file, if any. */
 	struct openfilestruct *prev;
@@ -446,8 +630,6 @@ typedef struct keystruct {
 typedef struct funcstruct {
 	void (*func)(void);
 		/* The actual function to call. */
-	int menus;
-		/* In what menus this function applies. */
 	const char *desc;
 		/* The function's short description, for example "Where Is". */
 #ifdef ENABLE_HELP
@@ -459,195 +641,15 @@ typedef struct funcstruct {
 #endif
 	bool viewok;
 		/* Is this function allowed when in view mode? */
-	long toggle;
-		/* If this is a toggle, which toggle to affect. */
+	int menus;
+		/* In what menus this function applies. */
 	struct funcstruct *next;
 		/* Next item in the list. */
 } funcstruct;
 
 #ifdef ENABLE_WORDCOMPLETION
-typedef struct completion_word {
+typedef struct completionstruct {
 	char *word;
-	struct completion_word *next;
-} completion_word;
+	struct completionstruct *next;
+} completionstruct;
 #endif
-
-/* The elements of the interface that can be colored differently. */
-enum
-{
-	TITLE_BAR = 0,
-	LINE_NUMBER,
-	GUIDE_STRIPE,
-	SELECTED_TEXT,
-	STATUS_BAR,
-	ERROR_MESSAGE,
-	KEY_COMBO,
-	FUNCTION_TAG,
-	NUMBER_OF_ELEMENTS
-};
-
-/* Enumeration used in the flags array.  See the definition of FLAGMASK. */
-enum
-{
-	DONTUSE,
-	CASE_SENSITIVE,
-	CONSTANT_SHOW,
-	NO_HELP,
-	SUSPEND,
-	NO_WRAP,
-	AUTOINDENT,
-	VIEW_MODE,
-	USE_MOUSE,
-	USE_REGEXP,
-	TEMP_FILE,
-	CUT_FROM_CURSOR,
-	BACKWARDS_SEARCH,
-	MULTIBUFFER,
-	SMOOTH_SCROLL,
-	REBIND_DELETE,
-	RAW_SEQUENCES,
-	NO_CONVERT,
-	BACKUP_FILE,
-	INSECURE_BACKUP,
-	NO_COLOR_SYNTAX,
-	PRESERVE,
-	HISTORYLOG,
-	RESTRICTED,
-	SMART_HOME,
-	WHITESPACE_DISPLAY,
-	MORE_SPACE,
-	TABS_TO_SPACES,
-	QUICK_BLANK,
-	WORD_BOUNDS,
-	NO_NEWLINES,
-	BOLD_TEXT,
-	SOFTWRAP,
-	POSITIONLOG,
-	LOCKING,
-	NOREAD_MODE,
-	MAKE_IT_UNIX,
-	TRIM_BLANKS,
-	SHOW_CURSOR,
-	LINE_NUMBERS,
-	NO_PAUSES,
-	AT_BLANKS,
-	AFTER_ENDS,
-	LET_THEM_ZAP,
-	BREAK_LONG_LINES,
-	JUMPY_SCROLLING,
-	EMPTY_LINE
-};
-
-/* Flags for the menus in which a given function should be present. */
-#define MMAIN           (1<<0)
-#define MWHEREIS        (1<<1)
-#define MREPLACE        (1<<2)
-#define MREPLACEWITH    (1<<3)
-#define MGOTOLINE       (1<<4)
-#define MWRITEFILE      (1<<5)
-#define MINSERTFILE     (1<<6)
-#define MEXTCMD         (1<<7)
-#define MHELP           (1<<8)
-#define MSPELL          (1<<9)
-#define MBROWSER        (1<<10)
-#define MWHEREISFILE    (1<<11)
-#define MGOTODIR        (1<<12)
-#define MYESNO          (1<<13)
-#define MLINTER         (1<<14)
-#define MFINDINHELP     (1<<15)
-/* This is an abbreviation for all menus except Help and Browser and YesNo. */
-#define MMOST  (MMAIN|MWHEREIS|MREPLACE|MREPLACEWITH|MGOTOLINE|MWRITEFILE|MINSERTFILE|\
-                MEXTCMD|MWHEREISFILE|MGOTODIR|MFINDINHELP|MSPELL|MLINTER)
-#ifndef NANO_TINY
-#define MSOME  MMOST|MBROWSER
-#else
-#define MSOME  MMAIN|MBROWSER
-#endif
-
-/* Basic control codes. */
-#define BS_CODE   0x08
-#define TAB_CODE  0x09
-#define CR_CODE   0x0D
-#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 CONTROL_DELETE 0x40D
-#define SHIFT_CONTROL_LEFT 0x411
-#define SHIFT_CONTROL_RIGHT 0x412
-#define SHIFT_CONTROL_UP 0x413
-#define SHIFT_CONTROL_DOWN 0x414
-#define SHIFT_CONTROL_HOME 0x415
-#define SHIFT_CONTROL_END 0x416
-#define CONTROL_SHIFT_DELETE 0x41D
-#define ALT_LEFT 0x421
-#define ALT_RIGHT 0x422
-#define ALT_UP 0x423
-#define ALT_DOWN 0x424
-#define ALT_DELETE 0x42D
-#define SHIFT_ALT_LEFT 0x431
-#define SHIFT_ALT_RIGHT 0x432
-#define SHIFT_ALT_UP 0x433
-#define SHIFT_ALT_DOWN 0x434
-//#define SHIFT_LEFT 0x451
-//#define SHIFT_RIGHT 0x452
-#define SHIFT_UP 0x453
-#define SHIFT_DOWN 0x454
-#define SHIFT_HOME 0x455
-#define SHIFT_END 0x456
-#define SHIFT_PAGEUP 0x457
-#define SHIFT_PAGEDOWN 0x458
-#define SHIFT_DELETE 0x45D
-#define SHIFT_TAB 0x45F
-
-/* 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
-
-#ifdef USE_SLANG
-#ifdef ENABLE_UTF8
-#define KEY_BAD 0xFF  /* Clipped error code. */
-#endif
-#define KEY_FLUSH 0x91  /* User-definable control code. */
-#else
-#define KEY_FLUSH KEY_F0  /* Nonexistent function key. */
-#endif
-
-#ifndef NANO_TINY
-/* An imaginary key for when we get a SIGWINCH (window resize). */
-#define KEY_WINCH -2
-
-/* Some extra flags for the undo function. */
-#define WAS_FINAL_BACKSPACE   (1<<1)
-#define WAS_WHOLE_LINE        (1<<2)
-#define WAS_FINAL_LINE        (1<<3)
-#define MARK_WAS_SET          (1<<4)
-#define WAS_MARKED_FORWARD    (1<<5)
-#endif /* !NANO_TINY */
-
-/* The default number of columns from end of line where wrapping occurs. */
-#define COLUMNS_FROM_EOL 8
-
-/* The default width of a tab in spaces. */
-#define WIDTH_OF_TAB 8
-
-/* The default comment character when a syntax does not specify any. */
-#define GENERAL_COMMENT_CHARACTER "#"
-
-/* The maximum number of search/replace history strings saved, not
- * counting the blank lines at their ends. */
-#define MAX_SEARCH_HISTORY 100
-
-/* The maximum number of bytes buffered at one time. */
-#define MAX_BUF_SIZE 128
-
-/* The largest size_t number that doesn't have the high bit set. */
-#define HIGHEST_POSITIVE ((~(size_t)0) >> 1)

src/help.c

@@ -1,7 +1,7 @@
 /**************************************************************************
  *   help.c  --  This file is part of GNU nano.                           *
  *                                                                        *
- *   Copyright (C) 2000-2011, 2013-2020 Free Software Foundation, Inc.    *
+ *   Copyright (C) 2000-2011, 2013-2022 Free Software Foundation, Inc.    *
  *   Copyright (C) 2017 Rishabh Dave                                      *
  *   Copyright (C) 2014-2019 Benno Schulenberg                            *
  *                                                                        *
@@ -20,7 +20,7 @@
  *                                                                        *
  **************************************************************************/
 
-#include "proto.h"
+#include "prototypes.h"
 
 #ifdef ENABLE_HELP
 
@@ -29,267 +29,15 @@
 
 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. */
 
-/* Hard-wrap the concatenated help text, and write it into a new buffer. */
-void wrap_help_text_into_buffer(void)
-{
-	size_t sum = 0;
-	/* Avoid overtight and overwide paragraphs in the introductory text. */
-	size_t wrapping_point = (COLS < 32) ? 32 : (COLS > 74) ? 74 : COLS;
-	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 < 32) ? 32 : COLS;
-
-		if (ptr > end_of_intro && *(ptr - 1) != '\n') {
-			length = break_line(ptr, (COLS < 32) ? 14 : COLS - 18, TRUE);
-			oneline = nmalloc(length + 5);
-			snprintf(oneline, length + 5, "\t\t  %s", ptr);
-		} else {
-			length = break_line(ptr, wrapping_point, TRUE);
-			oneline = nmalloc(length + 1);
-			shim = (*(ptr + length - 1) == ' ') ? 0 : 1;
-			snprintf(oneline, length + shim, "%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
-	color_update();
-#endif
-	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;
-
-	blank_statusbar();
-
-	/* 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 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, MAX_BUF_SIZE, TRUE);
-	title = measured_copy(help_text, length + 1);
-	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_help_text_into_buffer();
-	edit_refresh();
-
-	while (TRUE) {
-		lastmessage = HUSH;
-		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 == total_refresh) {
-			total_redraw();
-		} 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;
-		}
-	}
-
-	/* Discard the help-text buffer. */
-	close_buffer();
-
-	/* 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;
-	have_palette = FALSE;
-#endif
-
-	free(title);
-	title = NULL;
-	free(answer);
-	answer = saved_answer;
-	free(help_text);
-	inhelp = FALSE;
-
-	curs_set(0);
-
-	if (ISSET(NO_HELP)) {
-		currmenu = oldmenu;
-		window_init();
-	} else {
-		wipe_statusbar();
-		bottombars(oldmenu);
-	}
-
-#ifdef ENABLE_BROWSER
-	if (oldmenu == MBROWSER || oldmenu == MWHEREISFILE || oldmenu == MGOTODIR)
-		browser_refresh();
-	else
-#endif
-	{
-		titlebar(NULL);
-		edit_refresh();
-	}
-}
-
-/* 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;
@@ -297,12 +45,12 @@ 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. */
-	char *ptr;
 	const funcstruct *f;
 	const keystruct *s;
+	char *ptr;
 
 	/* First, set up the initial help text for the current function. */
-	if (currmenu == MWHEREIS || currmenu == MREPLACE || currmenu == MREPLACEWITH) {
+	if (currmenu & (MWHEREIS|MREPLACE|MREPLACEWITH)) {
 		htx[0] = N_("Search Command Help Text\n\n "
 				"Enter the words or characters you would like to "
 				"search for, and then press Enter.  If there is a "
@@ -409,7 +157,7 @@ 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 "
@@ -417,7 +165,8 @@ void help_init(void)
 				"(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");
+				"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");
 	} else if (currmenu == MLINTER) {
@@ -470,9 +219,9 @@ 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 17 cells, 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 += strlen(_(f->help)) + 21;
@@ -485,13 +234,13 @@ void help_init(void)
 		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))) + onoff_len + 9;
+			if (s->func == do_toggle)
+				allocsize += strlen(_(epithet_of_flag(s->toggle))) + onoff_len + 9;
 	}
 #endif
 
 	/* Allocate memory for the help text. */
-	help_text = charalloc(allocsize + 1);
+	help_text = nmalloc(allocsize + 1);
 
 	/* Now add the text we want. */
 	strcpy(help_text, htx[0]);
@@ -513,7 +262,7 @@ void help_init(void)
 
 		/* Show the first two shortcuts (if any) for each function. */
 		for (s = sclist; s != NULL; s = s->next) {
-			if ((s->menus & currmenu) && s->func == f->func) {
+			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);
@@ -553,16 +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 : ""),
-								_(flagtostr(s->toggle)), _("enable/disable"));
-					if (s->toggle == NO_COLOR_SYNTAX || s->toggle == TABS_TO_SPACES)
+					ptr += sprintf(ptr, "%s\t\t %s %s\n", (s->menus & MMAIN ? s->keystr : ""),
+								_(epithet_of_flag(s->toggle)), _("enable/disable"));
+					/* Add a blank like between two groups. */
+					if (s->toggle == NO_SYNTAX)
 						ptr += sprintf(ptr, "\n");
 					break;
 				}
 		}
 	}
-#endif /* !NANO_TINY */
+#endif
 }
+
+/* Hard-wrap the concatenated help text, and write it into a new buffer. */
+void wrap_help_text_into_buffer(void)
+{
+	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();
+
+	/* Ensure there is a blank line at the top of the text, for esthetics. */
+	if ((ISSET(MINIBAR) || !ISSET(EMPTY_LINE)) && LINES > 6) {
+		openfile->current->data = mallocstrcpy(openfile->current->data, " ");
+		openfile->current->next = make_new_node(openfile->current);
+		openfile->current = openfile->current->next;
+	}
+
+	/* 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
+	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) || ISSET(ZERO)) {
+		UNSET(NO_HELP);
+		UNSET(ZERO);
+		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);
+
+#ifdef ENABLE_LINENUMBERS
+	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(midwin, didfind == 1 || ISSET(SHOW_CURSOR));
+
+		didfind = 0;
+
+#ifndef NANO_TINY
+		spotlighted = FALSE;
+
+		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();
+		} else if (func == do_search_backward || func == do_search_forward ||
+					func == do_findprevious || func == do_findnext) {
+			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);
+
+		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;
+		}
+	}
+
+	/* Discard the help-text buffer. */
+	close_buffer();
+
+	/* Restore the settings of all flags. */
+	memcpy(flags, stash, sizeof(flags));
+
+#ifdef ENABLE_LINENUMBERS
+	margin = was_margin;
+	editwincols = COLS - margin - thebar;
+#endif
+	tabsize = was_tabsize;
+#ifdef ENABLE_COLOR
+	syntaxstr = was_syntax;
+	have_palette = FALSE;
+#endif
+
+	free(title);
+	title = NULL;
+	free(answer);
+	answer = saved_answer;
+	free(help_text);
+	inhelp = FALSE;
+
+	curs_set(0);
+
+	if (ISSET(NO_HELP) || ISSET(ZERO))
+		window_init();
+	else
+		blank_statusbar();
+
+	bottombars(oldmenu);
+
+#ifdef ENABLE_BROWSER
+	if (oldmenu & (MBROWSER|MWHEREISFILE|MGOTODIR))
+		browser_refresh();
+	else
+#endif
+	{
+		titlebar(NULL);
+		edit_refresh();
+	}
+}
+
 #endif /* ENABLE_HELP */
 
 /* Start the help viewer, or indicate that there is no help. */
@@ -571,8 +575,8 @@ void do_help(void)
 #ifdef ENABLE_HELP
 	show_help();
 #else
-	if (currmenu == MMAIN)
-		say_there_is_no_help();
+	if (currmenu & (MMAIN|MBROWSER))
+		statusbar(_("^W = Ctrl+W    M-W = Alt+W"));
 	else
 		beep();
 #endif

src/history.c

@@ -1,7 +1,7 @@
 /**************************************************************************
  *   history.c  --  This file is part of GNU nano.                        *
  *                                                                        *
- *   Copyright (C) 2003-2011, 2013-2020 Free Software Foundation, Inc.    *
+ *   Copyright (C) 2003-2011, 2013-2022 Free Software Foundation, Inc.    *
  *   Copyright (C) 2016, 2017, 2019 Benno Schulenberg                     *
  *                                                                        *
  *   GNU nano is free software: you can redistribute it and/or modify     *
@@ -19,7 +19,7 @@
  *                                                                        *
  **************************************************************************/
 
-#include "proto.h"
+#include "prototypes.h"
 
 #ifdef ENABLE_HISTORIES
 
@@ -27,19 +27,19 @@
 #include <string.h>
 
 #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. */
 
@@ -63,21 +63,21 @@ void history_init(void)
 	executebot = execute_history;
 }
 
-/* Set the current position in the given history list to the bottom. */
-void history_reset(const linestruct *list)
+/* Reset the pointer into the history list that contains item to the bottom. */
+void reset_history_pointer_for(const linestruct *item)
 {
-	if (list == search_history)
+	if (item == search_history)
 		search_history = searchbot;
-	else if (list == replace_history)
+	else if (item == replace_history)
 		replace_history = replacebot;
-	else if (list == execute_history)
+	else if (item == execute_history)
 		execute_history = executebot;
 }
 
 /* Return from the history list that starts at start and ends at end
  * the first node that contains the first len characters of the given
  * text, or NULL if there is no such node. */
-linestruct *find_history(const linestruct *start, const linestruct *end,
+linestruct *find_in_history(const linestruct *start, const linestruct *end,
 		const char *text, size_t len)
 {
 	const linestruct *item;
@@ -92,9 +92,10 @@ linestruct *find_history(const linestruct *start, const linestruct *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(linestruct **item, const char *text)
+void update_history(linestruct **item, const char *text, bool avoid_duplicates)
 {
-	linestruct **htop = NULL, **hbot = NULL, *thesame;
+	linestruct **htop = NULL, **hbot = NULL;
+	linestruct *thesame = NULL;
 
 	if (*item == search_history) {
 		htop = &searchtop;
@@ -107,11 +108,12 @@ void update_history(linestruct **item, const char *text)
 		hbot = &executebot;
 	}
 
-	/* See if the string is already in the history. */
-	thesame = find_history(*hbot, *htop, text, HIGHEST_POSITIVE);
+	/* When requested, check if the string is already in the history. */
+	if (avoid_duplicates)
+		thesame = find_in_history(*hbot, *htop, text, HIGHEST_POSITIVE);
 
 	/* If an identical string was found, delete that item. */
-	if (thesame != NULL) {
+	if (thesame) {
 		linestruct *after = thesame->next;
 
 		/* If the string is at the head of the list, move the head. */
@@ -145,102 +147,67 @@ void update_history(linestruct **item, const char *text)
 	*item = *hbot;
 }
 
-/* Move h to the string in the history list just before it, and return
- * that string.  If there isn't one, don't move h and return NULL. */
-char *get_history_older(linestruct **h)
-{
-	if ((*h)->prev == NULL)
-		return NULL;
-
-	*h = (*h)->prev;
-
-	return (*h)->data;
-}
-
-/* Move h to the string in the history list just after it, and return
- * that string.  If there isn't one, don't move h and return NULL. */
-char *get_history_newer(linestruct **h)
-{
-	if ((*h)->next == NULL)
-		return NULL;
-
-	*h = (*h)->next;
-
-	return (*h)->data;
-}
-
-/* Two empty placeholder functions. */
-void get_history_older_void(void)
-{
-}
-void get_history_newer_void(void)
-{
-}
-
 #ifdef ENABLE_TABCOMP
-/* Move h to the next string that's a tab completion of the string s,
- * looking at only the first len characters of s, and return that
- * string.  If there isn't one, or if len is 0, don't move h and return
- * s. */
-char *get_history_completion(linestruct **h, char *s, size_t len)
+/* Go backward through one of three history lists, starting at item *here,
+ * searching for a string that is a tab completion of the given string,
+ * looking at only its first len characters.  When found, make *here point
+ * at the item and return its string; otherwise, just return the string. */
+char *get_history_completion(linestruct **here, char *string, size_t len)
 {
-	if (len > 0) {
-		linestruct *htop = NULL, *hbot = NULL, *p;
+	linestruct *htop = NULL, *hbot = NULL;
+	linestruct *item;
 
-		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 (*here == search_history) {
+		htop = searchtop;
+		hbot = searchbot;
+	} else if (*here == replace_history) {
+		htop = replacetop;
+		hbot = replacebot;
+	} else if (*here == 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. */
-	return (char *)s;
+	/* First search from the current position to the top of the list
+	 * for a match of len characters.  Skip over an exact match. */
+	item = find_in_history((*here)->prev, htop, string, len);
+
+	while (item != NULL && strcmp(item->data, string) == 0)
+		item = find_in_history(item->prev, htop, string, len);
+
+	if (item) {
+		*here = item;
+		return mallocstrcpy(string, item->data);
+	}
+
+	/* Now search from the bottom of the list to the original position. */
+	item = find_in_history(hbot, *here, string, len);
+
+	while (item != NULL && strcmp(item->data, string) == 0)
+		item = find_in_history(item->prev, *here, string, len);
+
+	if (item) {
+		*here = item;
+		return mallocstrcpy(string, item->data);
+	}
+
+	/* When no useful match was found, simply return the given string. */
+	return (char *)string;
 }
 #endif /* ENABLE_TABCOMP */
 
 /* Check whether we have or could make a directory for history files. */
 bool have_statedir(void)
 {
-	struct stat dirstat;
 	const char *xdgdatadir;
+	struct stat dirinfo;
 
 	get_homedir();
 
 	if (homedir != NULL) {
 		statedir = concatenate(homedir, "/.nano/");
 
-		if (stat(statedir, &dirstat) == 0 && S_ISDIR(dirstat.st_mode)) {
+		if (stat(statedir, &dirinfo) == 0 && S_ISDIR(dirinfo.st_mode)) {
 			poshistname = concatenate(statedir, POSITION_HISTORY);
 			return TRUE;
 		}
@@ -257,7 +224,7 @@ bool have_statedir(void)
 	else
 		statedir = concatenate(homedir, "/.local/share/nano/");
 
-	if (stat(statedir, &dirstat) == -1) {
+	if (stat(statedir, &dirinfo) == -1) {
 		if (xdgdatadir == NULL) {
 			char *statepath = concatenate(homedir, "/.local");
 			mkdir(statepath, S_IRWXU | S_IRWXG | S_IRWXO);
@@ -273,7 +240,7 @@ bool have_statedir(void)
 								statedir, strerror(errno));
 			return FALSE;
 		}
-	} else if (!S_ISDIR(dirstat.st_mode)) {
+	} else if (!S_ISDIR(dirinfo.st_mode)) {
 		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"),
@@ -285,53 +252,54 @@ 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);
-			jot_error(N_("Error reading %s: %s"), histname,
-						strerror(errno));
-		}
-	} else {
-		/* Load the three history lists -- first search, then replace,
-		 * then execute -- from oldest entry to newest.  Between two
-		 * lists there is an empty line. */
-		linestruct **history = &search_history;
-		char *line = NULL;
-		size_t buf_len = 0;
-		ssize_t read;
-
-		while ((read = getline(&line, &buf_len, hisfile)) > 0) {
-			line[--read] = '\0';
-			if (read > 0) {
-				/* Encode any embedded NUL as 0x0A. */
-				unsunder(line, read);
-				update_history(history, line);
-			} else if (history == &search_history)
-				history = &replace_history;
-			else
-				history = &execute_history;
-		}
-
-		fclose(hisfile);
-		free(line);
+	/* 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 *stanza = NULL;
+	size_t dummy = 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(&stanza, &dummy, histfile)) > 0) {
+		stanza[--read] = '\0';
+		if (read > 0) {
+			recode_NUL_to_LF(stanza, read);
+			update_history(history, stanza, IGNORE_DUPLICATES);
+		} 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(stanza);
+
+	/* 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 linestruct *head, FILE *hisfile)
+bool write_list(const linestruct *head, FILE *histfile)
 {
 	const linestruct *item;
 
@@ -339,183 +307,199 @@ bool write_list(const linestruct *head, FILE *hisfile)
 		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"), histname, strerror(errno));
+		free(histname);
+		return;
 	}
 
+	/* Don't allow others to read or write the history file. */
+	if (chmod(histname, S_IRUSR | S_IWUSR) < 0)
+		jot_error(N_("Cannot limit permissions on %s: %s"), histname, strerror(errno));
+
+	if (!write_list(searchtop, histfile) || !write_list(replacetop, histfile) ||
+											!write_list(executetop, histfile))
+		jot_error(N_("Error writing %s: %s"), histname, strerror(errno));
+
+	if (fclose(histfile) == EOF)
+		jot_error(N_("Error writing %s: %s"), 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(POSITIONLOG);
-			jot_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 NULs 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 = 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);
-			}
-		}
-		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;
+
+	poshiststruct *lastitem = NULL;
+	poshiststruct *newitem;
+	char *lineptr, *columnptr;
+	char *stanza = NULL;
+	struct stat fileinfo;
+	size_t dummy = 0;
+	ssize_t count = 0;
+	ssize_t read;
+
+	/* Read and parse each line, and store the extracted data. */
+	while ((read = getline(&stanza, &dummy, histfile)) > 5) {
+		/* Decode NULs as embedded newlines. */
+		recode_NUL_to_LF(stanza, read);
+
+		/* Find the spaces before column number and line number. */
+		columnptr = revstrstr(stanza, " ", stanza + read - 3);
+		if (columnptr == NULL)
+			continue;
+		lineptr = revstrstr(stanza, " ", columnptr - 2);
+		if (lineptr == NULL)
+			continue;
+
+		/* Now separate the three elements of the line. */
+		*(columnptr++) = '\0';
+		*(lineptr++) = '\0';
+
+		/* Create a new position record. */
+		newitem = nmalloc(sizeof(poshiststruct));
+		newitem->filename = copy_of(stanza);
+		newitem->linenumber = atoi(lineptr);
+		newitem->columnnumber = atoi(columnptr);
+		newitem->next = NULL;
+
+		/* Add the record to the list. */
+		if (position_history == NULL)
+			position_history = newitem;
+		else
+			lastitem->next = newitem;
+
+		lastitem = newitem;
+
+		/* 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(stanza);
+
+	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");
+	FILE *histfile = fopen(poshistname, "wb");
+	struct stat fileinfo;
+	poshiststruct *item;
 
-	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 NULs. */
-			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"), poshistname, strerror(errno));
+		return;
 	}
+
+	/* Don't allow others to read or write the history file. */
+	if (chmod(poshistname, S_IRUSR | S_IWUSR) < 0)
+		jot_error(N_("Cannot limit permissions on %s: %s"), poshistname, strerror(errno));
+
+	for (item = position_history; item != NULL; item = item->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 = nmalloc(strlen(item->filename) + 44);
+		sprintf(path_and_place, "%s %zd %zd\n",
+								item->filename, item->linenumber, item->columnnumber);
+		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"), poshistname, strerror(errno));
+
+		free(path_and_place);
+	}
+
+	if (fclose(histfile) == EOF)
+		jot_error(N_("Error writing %s: %s"), 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;
+	poshiststruct *item, *nextone;
+	struct stat fileinfo;
 
-	stat(poshistname, &newstat);
+	if (stat(poshistname, &fileinfo) != 0 || fileinfo.st_mtime == latest_timestamp)
+		return;
 
-	if (newstat.st_mtime != stat_of_positions_file.st_mtime) {
-		poshiststruct *ptr, *nextone;
-
-		for (ptr = position_history; ptr != NULL; ptr = nextone) {
-			nextone = ptr->next;
-			free(ptr->filename);
-			free(ptr);
-		}
-		position_history = NULL;
-
-		load_poshistory();
+	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);
+	poshiststruct *previous = NULL;
+	poshiststruct *item, *theone;
 
-	if (fullpath == NULL || *filename == '\0') {
+	if (fullpath == NULL || openfile->filename[0] == '\0') {
 		free(fullpath);
 		return;
 	}
@@ -523,51 +507,51 @@ void update_poshistory(char *filename, ssize_t lineno, ssize_t xpos)
 	reload_positions_if_needed();
 
 	/* Look for a matching filename in the list. */
-	for (posptr = position_history; posptr != NULL; posptr = posptr->next) {
-		if (!strcmp(posptr->filename, fullpath))
+	for (item = position_history; item != NULL; item = item->next) {
+		if (!strcmp(item->filename, fullpath))
 			break;
-		posprev = posptr;
+		previous = item;
 	}
 
 	/* Don't record files that have the default cursor position. */
-	if (lineno == 1 && xpos == 1) {
-		if (posptr != NULL) {
-			if (posprev == NULL)
-				position_history = posptr->next;
+	if (openfile->current->lineno == 1 && openfile->current_x == 0) {
+		if (item != NULL) {
+			if (previous == NULL)
+				position_history = item->next;
 			else
-				posprev->next = posptr->next;
-			free(posptr->filename);
-			free(posptr);
+				previous->next = item->next;
+			free(item->filename);
+			free(item);
 			save_poshistory();
 		}
 		free(fullpath);
 		return;
 	}
 
-	theone = posptr;
+	theone = item;
 
 	/* If we didn't find it, make a new node; otherwise, if we're
 	 * not at the end, move the matching one to the end. */
 	if (theone == NULL) {
-		theone = (poshiststruct *)nmalloc(sizeof(poshiststruct));
+		theone = nmalloc(sizeof(poshiststruct));
 		theone->filename = copy_of(fullpath);
 		if (position_history == NULL)
 			position_history = theone;
 		else
-			posprev->next = theone;
-	} else if (posptr->next != NULL) {
-		if (posprev == NULL)
-			position_history = posptr->next;
+			previous->next = theone;
+	} else if (item->next != NULL) {
+		if (previous == NULL)
+			position_history = item->next;
 		else
-			posprev->next = posptr->next;
-		while (posptr->next != NULL)
-			posptr = posptr->next;
-		posptr->next = theone;
+			previous->next = item->next;
+		while (item->next != NULL)
+			item = item->next;
+		item->next = theone;
 	}
 
 	/* Store the last cursor position. */
-	theone->lineno = lineno;
-	theone->xno = xpos;
+	theone->linenumber = openfile->current->lineno;
+	theone->columnnumber = xplustabs() + 1;
 	theone->next = NULL;
 
 	free(fullpath);
@@ -580,25 +564,25 @@ 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;
 	char *fullpath = get_full_path(file);
+	poshiststruct *item;
 
 	if (fullpath == NULL)
 		return FALSE;
 
 	reload_positions_if_needed();
 
-	posptr = position_history;
-	while (posptr != NULL && strcmp(posptr->filename, fullpath) != 0)
-		posptr = posptr->next;
+	item = position_history;
+	while (item != NULL && strcmp(item->filename, fullpath) != 0)
+		item = item->next;
 
 	free(fullpath);
 
-	if (posptr == NULL)
+	if (item == NULL)
 		return FALSE;
 
-	*line = posptr->lineno;
-	*column = posptr->xno;
+	*line = item->linenumber;
+	*column = item->columnnumber;
 	return TRUE;
 }
 #endif /* ENABLE_HISTORIES */

src/move.c

@@ -1,7 +1,7 @@
 /**************************************************************************
  *   move.c  --  This file is part of GNU nano.                           *
  *                                                                        *
- *   Copyright (C) 1999-2011, 2013-2020 Free Software Foundation, Inc.    *
+ *   Copyright (C) 1999-2011, 2013-2022 Free Software Foundation, Inc.    *
  *   Copyright (C) 2014-2018 Benno Schulenberg                            *
  *                                                                        *
  *   GNU nano is free software: you can redistribute it and/or modify     *
@@ -19,7 +19,7 @@
  *                                                                        *
  **************************************************************************/
 
-#include "proto.h"
+#include "prototypes.h"
 
 #include <string.h>
 
@@ -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. */
@@ -115,6 +115,7 @@ void do_page_up(void)
 	int mustmove = (editwinrows < 3) ? 1 : editwinrows - 2;
 	size_t leftedge, target_column;
 
+#ifndef NANO_TINY
 	/* 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(JUMPY_SCROLLING)) {
@@ -123,6 +124,7 @@ void do_page_up(void)
 		openfile->current_y = 0;
 		target_column = 0;
 	} else
+#endif
 		get_edge_and_target(&leftedge, &target_column);
 
 	/* Move up the required number of lines or chunks.  If we can't, we're
@@ -145,6 +147,7 @@ void do_page_down(void)
 	int mustmove = (editwinrows < 3) ? 1 : editwinrows - 2;
 	size_t leftedge, target_column;
 
+#ifndef NANO_TINY
 	/* 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(JUMPY_SCROLLING)) {
@@ -153,6 +156,7 @@ void do_page_down(void)
 		openfile->current_y = 0;
 		target_column = 0;
 	} else
+#endif
 		get_edge_and_target(&leftedge, &target_column);
 
 	/* Move down the required number of lines or chunks.  If we can't, we're
@@ -192,7 +196,7 @@ void do_para_end(linestruct **line)
 }
 
 /* Move up to first start of a paragraph before the current line. */
-void do_para_begin_void(void)
+void to_para_begin(void)
 {
 	linestruct *was_current = openfile->current;
 
@@ -203,7 +207,7 @@ void do_para_begin_void(void)
 }
 
 /* Move down to just after the first found end of a paragraph. */
-void do_para_end_void(void)
+void to_para_end(void)
 {
 	linestruct *was_current = openfile->current;
 
@@ -222,7 +226,7 @@ void do_para_end_void(void)
 #endif /* ENABLE_JUSTIFY */
 
 /* Move to the preceding block of text. */
-void do_prev_block(void)
+void to_prev_block(void)
 {
 	linestruct *was_current = openfile->current;
 	bool is_text = FALSE, seen_text = FALSE;
@@ -234,8 +238,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;
 
@@ -244,7 +248,7 @@ void do_prev_block(void)
 }
 
 /* Move to the next block of text. */
-void do_next_block(void)
+void to_next_block(void)
 {
 	linestruct *was_current = openfile->current;
 	bool is_white = white_string(openfile->current->data);
@@ -261,10 +265,10 @@ void do_next_block(void)
 	edit_redraw(was_current, CENTERING);
 }
 
-/* Move to the previous word.  If allow_punct is TRUE, treat punctuation
- * as part of a word. */
-void do_prev_word(bool allow_punct)
+/* Move to the previous word. */
+void do_prev_word(void)
 {
+	bool punctuation_as_letters = ISSET(WORD_BOUNDS);
 	bool seen_a_word = FALSE, step_forward = FALSE;
 
 	/* Move backward until we pass over the start of a word. */
@@ -281,12 +285,16 @@ void do_prev_word(bool allow_punct)
 		openfile->current_x = step_left(openfile->current->data,
 												openfile->current_x);
 
-		if (is_word_mbchar(openfile->current->data + openfile->current_x,
-								allow_punct)) {
+		if (is_word_char(openfile->current->data + openfile->current_x,
+								punctuation_as_letters)) {
 			seen_a_word = TRUE;
 			/* If at the head of a line now, this surely is a word start. */
 			if (openfile->current_x == 0)
 				break;
+#ifdef ENABLE_UTF8
+		} else if (is_zerowidth(openfile->current->data + openfile->current_x)) {
+			; /* skip */
+#endif
 		} else if (seen_a_word) {
 			/* This is space now: we've overshot the start of the word. */
 			step_forward = TRUE;
@@ -301,12 +309,12 @@ void do_prev_word(bool allow_punct)
 }
 
 /* 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)
+ * instead of at their beginnings.  Return TRUE if we started on a word. */
+bool do_next_word(bool after_ends)
 {
-	bool started_on_word = is_word_mbchar(openfile->current->data +
-								openfile->current_x, allow_punct);
+	bool punctuation_as_letters = ISSET(WORD_BOUNDS);
+	bool started_on_word = is_word_char(openfile->current->data +
+								openfile->current_x, punctuation_as_letters);
 	bool seen_space = !started_on_word;
 #ifndef NANO_TINY
 	bool seen_word = started_on_word;
@@ -332,18 +340,27 @@ bool do_next_word(bool after_ends, bool allow_punct)
 		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_mbchar(openfile->current->data + openfile->current_x,
-								allow_punct))
+			if (is_word_char(openfile->current->data + openfile->current_x,
+								punctuation_as_letters))
 				seen_word = TRUE;
+#ifdef ENABLE_UTF8
+			else if (is_zerowidth(openfile->current->data + openfile->current_x))
+				; /* skip */
+#endif
 			else if (seen_word)
 				break;
 		} else
 #endif
 		{
+#ifdef ENABLE_UTF8
+			if (is_zerowidth(openfile->current->data + openfile->current_x))
+				; /* skip */
+			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_mbchar(openfile->current->data + openfile->current_x,
-								allow_punct))
+			if (!is_word_char(openfile->current->data + openfile->current_x,
+								punctuation_as_letters))
 				seen_space = TRUE;
 			else if (seen_space)
 				break;
@@ -353,25 +370,23 @@ bool do_next_word(bool after_ends, bool allow_punct)
 	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)
+/* Move to the previous word in the file, and update the screen afterwards. */
+void to_prev_word(void)
 {
 	linestruct *was_current = openfile->current;
 
-	do_prev_word(ISSET(WORD_BOUNDS));
+	do_prev_word();
 
 	edit_redraw(was_current, FLOWING);
 }
 
 /* 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 do_next_word_void(void)
+ * at word ends instead of beginnings.  Update the screen afterwards. */
+void to_next_word(void)
 {
 	linestruct *was_current = openfile->current;
 
-	do_next_word(ISSET(AFTER_ENDS), ISSET(WORD_BOUNDS));
+	do_next_word(ISSET(AFTER_ENDS));
 
 	edit_redraw(was_current, FLOWING);
 }
@@ -437,7 +452,7 @@ 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)
 {
@@ -556,23 +571,37 @@ void do_scroll_down(void)
 
 	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)
 {
 	linestruct *was_current = openfile->current;
 
-	if (openfile->current_x > 0)
+	if (openfile->current_x > 0) {
 		openfile->current_x = step_left(openfile->current->data,
 												openfile->current_x);
-	else if (openfile->current != openfile->filetop) {
+#ifdef ENABLE_UTF8
+		while (openfile->current_x > 0 &&
+					is_zerowidth(openfile->current->data + openfile->current_x))
+			openfile->current_x = step_left(openfile->current->data,
+												openfile->current_x);
+#endif
+	} else if (openfile->current != openfile->filetop) {
 		openfile->current = openfile->current->prev;
 		openfile->current_x = strlen(openfile->current->data);
 	}
@@ -585,10 +614,16 @@ void do_right(void)
 {
 	linestruct *was_current = openfile->current;
 
-	if (openfile->current->data[openfile->current_x] != '\0')
+	if (openfile->current->data[openfile->current_x] != '\0') {
 		openfile->current_x = step_right(openfile->current->data,
 												openfile->current_x);
-	else if (openfile->current != openfile->filebot) {
+#ifdef ENABLE_UTF8
+		while (openfile->current->data[openfile->current_x] != '\0' &&
+					is_zerowidth(openfile->current->data + openfile->current_x))
+			openfile->current_x = step_right(openfile->current->data,
+												openfile->current_x);
+#endif
+	} else if (openfile->current != openfile->filebot) {
 		openfile->current = openfile->current->next;
 		openfile->current_x = 0;
 	}

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-2020 Free Software Foundation, Inc.    *
+ *   Copyright (C) 1999-2011, 2013-2022 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,7 +18,7 @@
  *                                                                        *
  **************************************************************************/
 
-#include "nano.h"
+#include "definitions.h"
 
 /* All external variables.  See global.c for their descriptions. */
 
@@ -34,9 +34,10 @@ extern bool shift_held;
 extern bool mute_modifiers;
 extern bool bracketed_paste;
 
-extern bool started_curses;
 extern bool we_are_running;
 extern bool more_than_one;
+extern bool report_size;
+extern bool ran_a_tool;
 
 extern bool inhelp;
 extern char *title;
@@ -47,8 +48,6 @@ extern bool as_an_at;
 
 extern bool control_C_was_pressed;
 
-extern bool suppress_cursorpos;
-
 extern message_type lastmessage;
 
 extern linestruct *pletion_line;
@@ -76,7 +75,8 @@ extern int shiftcontrolup, shiftcontroldown;
 extern int shiftcontrolhome, shiftcontrolend;
 extern int altleft, altright;
 extern int altup, altdown;
-extern int altdelete;
+extern int altpageup, altpagedown;
+extern int altinsert, altdelete;
 extern int shiftaltleft, shiftaltright;
 extern int shiftaltup, shiftaltdown;
 #endif
@@ -87,12 +87,14 @@ extern size_t wrap_at;
 #endif
 
 extern WINDOW *topwin;
-extern WINDOW *edit;
-extern WINDOW *bottomwin;
+extern WINDOW *midwin;
+extern WINDOW *footwin;
 extern int editwinrows;
 extern int editwincols;
 extern int margin;
+extern int thebar;
 #ifndef NANO_TINY
+extern int *bardata;
 extern ssize_t stripe_column;
 #endif
 
@@ -184,18 +186,12 @@ extern size_t light_to_col;
 
 typedef void (*functionptrtype)(void);
 
-/* Most functions in browser.c. */
+/* The two needed functions from browser.c. */
 #ifdef ENABLE_BROWSER
-char *do_browse_from(const char *inpath);
-void read_the_list(const char *path, DIR *dir);
-functionptrtype parse_browser_input(int *kbinput);
 void browser_refresh(void);
-void browser_select_dirname(const char *needle);
-void do_filesearch(bool forwards);
-void do_fileresearch(bool forwards);
+char *browse_in(const char *inpath);
 void to_first_file(void);
 void to_last_file(void);
-char *strip_last_component(const char *path);
 #endif
 
 /* Most functions in chars.c. */
@@ -203,51 +199,44 @@ 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);
 #ifdef ENABLE_UTF8
-int mbwidth(const char *c);
+int mbtowide(wchar_t *wc, const char *c);
+bool is_doublewidth(const char *ch);
+bool is_zerowidth(const char *ch);
 #endif
-char *make_mbchar(long chr, int *chr_mb_len);
 int char_length(const char *pointer);
-size_t mbstrlen(const char *s);
-int collect_char(const char *buf, char *chr);
+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);
+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_char(const char *s);
-#endif
-bool white_string(const char *s);
-#ifdef ENABLE_UTF8
-bool is_valid_unicode(wchar_t wc);
+bool has_blank_char(const char *string);
 #endif
+bool white_string(const char *string);
 
 /* Most functions in color.c. */
 #ifdef ENABLE_COLOR
-void set_colorpairs(void);
-void color_init(void);
-void color_update(void);
-void set_up_multicache(linestruct *line);
+void set_interface_colorpairs(void);
+void prepare_palette(void);
+void find_and_prime_applicable_syntax(void);
 void check_the_multis(linestruct *line);
 void precalc_multicolorinfo(void);
 #endif
@@ -259,33 +248,28 @@ void do_backspace(void);
 void chop_previous_word(void);
 void chop_next_word(void);
 #endif
-void extract_segment(linestruct *top, size_t top_x,
-						linestruct *bot, size_t bot_x);
-void ingraft_buffer(linestruct *somebuffer);
+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 cut_marked(bool *right_side_up);
+void cut_marked_region(void);
 #endif
-void do_snip(bool copying, bool marked, bool until_eof, bool append);
-bool is_cuttable(bool test_cliff);
+void do_snip(bool marked, bool until_eof, bool append);
 void cut_text(void);
 #ifndef NANO_TINY
-void copy_text(void);
 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 make_new_buffer(void);
 #ifndef NANO_TINY
-int delete_lockfile(const char *lockfilename);
-#endif
-bool open_buffer(const char *filename, bool new_buffer);
-#ifdef ENABLE_SPELLER
-bool replace_buffer(const char *filename, undo_type action, bool marked,
-		const char *operation);
+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
@@ -295,11 +279,14 @@ void switch_to_next_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, 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);
+void do_insertfile(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);
@@ -308,54 +295,46 @@ bool outside_of_confinement(const char *currpath, bool allow_tabcomp);
 void init_backup_dir(void);
 #endif
 int copy_file(FILE *inn, FILE *out, bool close_out);
-bool write_file(const char *name, FILE *f_open, bool tmp,
-		kind_of_writing_type method, bool fullbuffer);
+bool write_file(const char *name, FILE *thefile, bool normal,
+				kind_of_writing_type method, bool annotate);
 #ifndef NANO_TINY
-bool write_marked_file(const char *name, FILE *f_open, bool tmp,
-		kind_of_writing_type method);
+bool write_region_to_file(const char *name, FILE *stream, bool normal,
+				kind_of_writing_type method);
 #endif
-int do_writeout(bool exiting, bool withprompt);
-void do_writeout_void(void);
+int write_it_out(bool exiting, bool withprompt);
+void do_writeout(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. */
 const keystruct *first_sc_for(int menu, void (*func)(void));
-int the_code_for(void (*func)(void), int defaultval);
 size_t shown_entries_for(int menu);
-const keystruct *get_shortcut(int *kbinput);
-functionptrtype func_from_key(int *kbinput);
+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 shortcut_init(void);
-const char *flagtostr(int flag);
+const char *epithet_of_flag(int flag);
 
-/* All functions in help.c. */
+/* Some functions in help.c. */
 #ifdef ENABLE_HELP
 void wrap_help_text_into_buffer(void);
-void help_init(void);
-functionptrtype parse_help_input(int *kbinput);
 #endif
 void do_help(void);
 
 /* Most functions in history.c. */
 #ifdef ENABLE_HISTORIES
 void history_init(void);
-void history_reset(const linestruct *h);
-void update_history(linestruct **h, const char *s);
-char *get_history_older(linestruct **h);
-char *get_history_newer(linestruct **h);
-void get_history_older_void(void);
-void get_history_newer_void(void);
+void reset_history_pointer_for(const linestruct *list);
+void update_history(linestruct **item, const char *text, bool avoid_duplicates);
 #ifdef ENABLE_TABCOMP
 char *get_history_completion(linestruct **h, char *s, size_t len);
 #endif
@@ -363,7 +342,7 @@ 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
 
@@ -375,15 +354,15 @@ void do_page_down(void);
 #ifdef ENABLE_JUSTIFY
 void do_para_begin(linestruct **line);
 void do_para_end(linestruct **line);
-void do_para_begin_void(void);
-void do_para_end_void(void);
+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 do_next_word(bool after_ends, bool allow_punct);
-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(void);
+bool do_next_word(bool after_ends);
+void to_prev_word(void);
+void to_next_word(void);
 void do_home(void);
 void do_end(void);
 void do_up(void);
@@ -391,6 +370,7 @@ void do_down(void);
 #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);
@@ -398,41 +378,39 @@ void do_right(void);
 /* Most functions in nano.c. */
 linestruct *make_new_node(linestruct *prevnode);
 void splice_node(linestruct *afterthis, linestruct *newnode);
-void unlink_node(linestruct *fileptr);
-void delete_node(linestruct *fileptr);
+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 partition_buffer(linestruct *top, size_t top_x,
-						linestruct *bot, size_t bot_x);
-void unpartition_buffer(void);
 void print_view_warning(void);
 bool in_restricted_mode(void);
-#ifndef ENABLE_HELP
-void say_there_is_no_help(void);
+#ifndef NANO_TINY
+void suggest_ctrlT_ctrlZ(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);
+#ifndef NANO_TINY
 void reconnect_and_store_state(void);
-RETSIGTYPE handle_hupterm(int signal);
-#ifndef DEBUG
-RETSIGTYPE handle_crash(int signal);
 #endif
-RETSIGTYPE do_suspend(int signal);
-RETSIGTYPE do_continue(int signal);
-#if !defined(NANO_TINY) || defined(ENABLE_SPELLER)
+void handle_hupterm(int signal);
+#ifndef DEBUG
+void handle_crash(int signal);
+#endif
+void suspend_nano(int signal);
+void do_suspend(void);
+void continue_nano(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 handle_sigwinch(int signal);
 void regenerate_screen(void);
-void do_toggle(int flag);
 #endif
 void disable_kb_interrupt(void);
 void enable_kb_interrupt(void);
@@ -444,30 +422,15 @@ void confirm_margin(void);
 #endif
 void unbound_key(int code);
 bool okay_for_view(const keystruct *shortcut);
-void inject(char *output, size_t output_len, bool filtering);
+void inject(char *burst, size_t count);
 
 /* Most functions in prompt.c. */
-void inject_into_answer(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 get_statusbar_page_start(size_t start_col, size_t column);
+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(bool allow_tabs, bool allow_files,
-		int menu, const char *curranswer, linestruct **history_list,
+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);
+int ask_user(bool withall, const char *question);
 
 /* Most functions in rcfile.c. */
 #if defined(ENABLE_NANORC) || defined(ENABLE_HISTORIES)
@@ -489,7 +452,6 @@ 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 linestruct *begin, size_t begin_x);
-void do_search(void);
 void do_search_forward(void);
 void do_search_backward(void);
 void do_findprevious(void);
@@ -499,13 +461,16 @@ void go_looking(void);
 ssize_t do_replace_loop(const char *needle, bool whole_word_only,
 		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 goto_line_and_column(ssize_t line, ssize_t column, bool retain_answer,
 		bool interactive);
-void do_gotolinecolumn_void(void);
+void do_gotolinecolumn(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. */
@@ -524,28 +489,25 @@ 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 undostruct *thisitem, openfilestruct *thefile, bool keep);
+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
-bool do_wrap(void);
+void 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(ENABLED_WRAPORJUSTIFY)
 size_t indent_length(const char *line);
 #endif
 #ifdef ENABLE_JUSTIFY
 size_t quote_length(const char *line);
-bool begpar(const linestruct *const foo, int depth);
-bool inpar(const linestruct *const foo);
-void do_justify(bool full_justify);
-void do_justify_void(void);
+bool begpar(const linestruct *const line, int depth);
+bool inpar(const linestruct *const line);
+void do_justify(void);
 void do_full_justify(void);
 #endif
 #ifdef ENABLE_SPELLER
@@ -556,7 +518,7 @@ void do_linter(void);
 void do_formatter(void);
 #endif
 #ifndef NANO_TINY
-void do_wordlinechar_count(void);
+void count_lines_words_and_characters(void);
 #endif
 void do_verbatim_input(void);
 void complete_a_word(void);
@@ -565,13 +527,11 @@ void complete_a_word(void);
 void get_homedir(void);
 const char *tail(const char *path);
 char *concatenate(const char *path, const char *name);
-#ifdef ENABLE_LINENUMBERS
 int digits(ssize_t n);
-#endif
-bool parse_num(const char *str, ssize_t *val);
+bool parse_num(const char *str, ssize_t *result);
 bool parse_line_column(const char *str, ssize_t *line, ssize_t *column);
-void unsunder(char *string, size_t length);
-void sunder(char *string);
+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
@@ -582,7 +542,7 @@ const char *strstrwrapper(const char *haystack, const char *needle,
 		const char *start);
 void *nmalloc(size_t howmuch);
 void *nrealloc(void *ptr, size_t howmuch);
-char *measured_copy(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);
@@ -596,48 +556,47 @@ void new_magicline(void);
 void remove_magicline(void);
 #endif
 #ifndef NANO_TINY
-void get_region(const linestruct **top, size_t *top_x,
-		const linestruct **bot, size_t *bot_x, bool *right_side_up);
-void get_range(const linestruct **top, const linestruct **bot);
+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 linestruct *begin, const linestruct *end);
+size_t number_of_characters_in(const linestruct *begin, const linestruct *end);
 #ifndef NANO_TINY
-linestruct *line_from_number(ssize_t lineno);
+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);
+size_t waiting_keycodes(void);
 #ifdef ENABLE_NANORC
 void implant(const char *string);
 #endif
-int parse_kbinput(WINDOW *win);
+int get_input(WINDOW *win);
 int get_kbinput(WINDOW *win, bool showcursor);
-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);
+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
 void blank_edit(void);
 void blank_statusbar(void);
 void wipe_statusbar(void);
 void blank_bottombars(void);
 void check_statusblank(void);
+void set_blankdelay_to_one(void);
 char *display_string(const char *buf, size_t column, size_t span,
 						bool isdata, bool isprompt);
 void titlebar(const char *path);
+void minibar(void);
 void statusline(message_type importance, const char *msg, ...);
 void statusbar(const char *msg);
-void warn_and_shortly_pause(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);
-int update_line(linestruct *fileptr, size_t index);
+int update_line(linestruct *line, size_t index);
 #ifndef NANO_TINY
-int update_softwrapped_line(linestruct *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, linestruct **line, size_t *leftedge);
@@ -650,24 +609,20 @@ size_t get_softwrap_breakpoint(const char *text, size_t leftedge,
 size_t get_chunk_and_edge(size_t column, linestruct *line, size_t *leftedge);
 size_t chunk_for(size_t column, linestruct *line);
 size_t leftedge_for(size_t column, linestruct *line);
-size_t number_of_chunks_in(linestruct *line);
+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(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 do_cursorpos(bool force);
-void do_cursorpos_void(void);
+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(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
@@ -676,6 +631,10 @@ void do_credits(void);
 void case_sens_void(void);
 void regexp_void(void);
 void backwards_void(void);
+#ifdef ENABLE_HISTORIES
+void get_older_item(void);
+void get_newer_item(void);
+#endif
 void flip_replace(void);
 void flip_goto(void);
 #ifdef ENABLE_BROWSER
@@ -684,12 +643,12 @@ 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 do_toggle(void);
+void dos_format(void);
+void mac_format(void);
+void append_it(void);
+void prepend_it(void);
+void back_it_up(void);
 void flip_execute(void);
 void flip_pipe(void);
 void flip_convert(void);

src/search.c

@@ -1,8 +1,8 @@
 /**************************************************************************
  *   search.c  --  This file is part of GNU nano.                         *
  *                                                                        *
- *   Copyright (C) 1999-2011, 2013-2020 Free Software Foundation, Inc.    *
- *   Copyright (C) 2015-2019 Benno Schulenberg                            *
+ *   Copyright (C) 1999-2011, 2013-2022 Free Software Foundation, Inc.    *
+ *   Copyright (C) 2015-2020 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,9 +19,10 @@
  *                                                                        *
  **************************************************************************/
 
-#include "proto.h"
+#include "prototypes.h"
 
 #include <string.h>
+#include <time.h>
 
 static bool came_full_circle = FALSE;
 		/* Have we reached the starting line again while searching? */
@@ -38,10 +39,10 @@ bool regexp_init(const char *regexp)
 	/* If regex compilation failed, show the error message. */
 	if (value != 0) {
 		size_t len = regerror(value, &search_regexp, NULL, 0);
-		char *str = charalloc(len);
+		char *str = nmalloc(len);
 
 		regerror(value, &search_regexp, str, len);
-		statusline(ALERT, _("Bad regex \"%s\": %s"), regexp, str);
+		statusline(AHEM, _("Bad regex \"%s\": %s"), regexp, str);
 		free(str);
 
 		return FALSE;
@@ -69,23 +70,19 @@ void tidy_up_after_search(void)
 /* Prepare the prompt and ask the user what to search for.  Keep looping
  * as long as the user presses a toggle, and only take action and exit
  * when <Enter> is pressed or a non-toggle shortcut was executed. */
-void search_init(bool replacing, bool keep_the_answer)
+void search_init(bool replacing, bool retain_answer)
 {
 	char *thedefault;
-		/* What will be searched for when the user typed nothing. */
-
-	/* When starting a new search, clear the current answer. */
-	if (!keep_the_answer)
-		answer = mallocstrcpy(answer, "");
+		/* What will be searched for when the user types just <Enter>. */
 
 	/* If something was searched for earlier, include it in the prompt. */
 	if (*last_search != '\0') {
 		char *disp = display_string(last_search, 0, COLS / 3, FALSE, FALSE);
 
-		thedefault = charalloc(strlen(disp) + 7);
+		thedefault = nmalloc(strlen(disp) + 7);
 		/* We use (COLS / 3) here because we need to see more on the line. */
 		sprintf(thedefault, " [%s%s]", disp,
-				(breadth(last_search) > COLS / 3) ? "..." : "");
+					(breadth(last_search) > COLS / 3) ? "..." : "");
 		free(disp);
 	} else
 		thedefault = copy_of("");
@@ -93,9 +90,9 @@ void search_init(bool replacing, bool keep_the_answer)
 	while (TRUE) {
 		functionptrtype func;
 		/* Ask the user what to search for (or replace). */
-		int response = do_prompt(FALSE, FALSE,
+		int response = do_prompt(
 					inhelp ? MFINDINHELP : (replacing ? MREPLACE : MWHEREIS),
-					answer, &search_history, edit_refresh,
+					retain_answer ? answer : "", &search_history, edit_refresh,
 					/* TRANSLATORS: This is the main search prompt. */
 					"%s%s%s%s%s%s", _("Search"),
 					/* TRANSLATORS: The next four modify the search prompt. */
@@ -121,23 +118,23 @@ void search_init(bool replacing, bool keep_the_answer)
 			if (*answer != '\0') {
 				last_search = mallocstrcpy(last_search, answer);
 #ifdef ENABLE_HISTORIES
-				update_history(&search_history, answer);
+				update_history(&search_history, answer, PRUNE_DUPLICATE);
 #endif
 			}
 
-			/* When not doing a regular-expression search, just search;
-			 * otherwise compile the search string, and only search when
-			 * the expression is valid. */
-			if (!ISSET(USE_REGEXP) || regexp_init(last_search)) {
-				if (replacing)
-					ask_for_replacement();
-				else
-					go_looking();
-			}
+			if (ISSET(USE_REGEXP) && !regexp_init(last_search))
+				break;
+
+			if (replacing)
+				ask_for_and_do_replacements();
+			else
+				go_looking();
 
 			break;
 		}
 
+		retain_answer = TRUE;
+
 		func = func_from_key(&response);
 
 		/* If we're here, one of the five toggles was pressed, or
@@ -155,7 +152,7 @@ void search_init(bool replacing, bool keep_the_answer)
 			} else
 				replacing = !replacing;
 		} else if (func == flip_goto) {
-			do_gotolinecolumn(openfile->current->lineno,
+			goto_line_and_column(openfile->current->lineno,
 								openfile->placewewant + 1, TRUE, TRUE);
 			break;
 		} else
@@ -189,35 +186,12 @@ int findnextstr(const char *needle, bool whole_word_only, int modus,
 		/* The time we last looked at the keyboard. */
 
 	/* Set non-blocking input so that we can just peek for a Cancel. */
-	disable_waiting();
+	nodelay(midwin, TRUE);
 
 	if (begin == NULL)
 		came_full_circle = FALSE;
 
-	/* Start searching through the lines, looking for the needle. */
 	while (TRUE) {
-		/* Glance at the keyboard once every second. */
-		if (time(NULL) - lastkbcheck > 0) {
-			int input = parse_kbinput(edit);
-
-			lastkbcheck = time(NULL);
-
-			/* Consume all waiting keystrokes until a Cancel. */
-			while (input != ERR) {
-				if (func_from_key(&input) == do_cancel) {
-					statusbar(_("Cancelled"));
-					enable_waiting();
-					return -2;
-				}
-				input = parse_kbinput(NULL);
-			}
-
-			if (++feedback > 0)
-				/* TRANSLATORS: This is shown when searching takes
-				 * more than half a second. */
-				statusbar(_("Searching..."));
-		}
-
 		/* When starting a new search, skip the first character, then
 		 * (in either case) search for the needle in the current line. */
 		if (skipone) {
@@ -249,33 +223,35 @@ int findnextstr(const char *needle, bool whole_word_only, int modus,
 			break;
 		}
 
+#ifndef NANO_TINY
+		if (the_window_resized) {
+			regenerate_screen();
+			nodelay(midwin, TRUE);
+			statusbar(_("Searching..."));
+			feedback = 1;
+		}
+#endif
 		/* If we're back at the beginning, then there is no needle. */
 		if (came_full_circle) {
-			enable_waiting();
+			nodelay(midwin, FALSE);
 			return 0;
 		}
 
 		/* Move to the previous or next line in the file. */
-		if (ISSET(BACKWARDS_SEARCH))
-			line = line->prev;
-		else
-			line = line->next;
+		line = (ISSET(BACKWARDS_SEARCH)) ? line->prev : line->next;
 
 		/* If we've reached the start or end of the buffer, wrap around;
 		 * but stop when spell-checking or replacing in a region. */
 		if (line == NULL) {
 			if (whole_word_only || modus == INREGION) {
-				enable_waiting();
+				nodelay(midwin, FALSE);
 				return 0;
 			}
 
-			if (ISSET(BACKWARDS_SEARCH))
-				line = openfile->filebot;
-			else
-				line = openfile->filetop;
+			line = (ISSET(BACKWARDS_SEARCH)) ? openfile->filebot : openfile->filetop;
 
 			if (modus == JUSTFIND) {
-				statusbar(_("Search Wrapped"));
+				statusline(REMARK, _("Search Wrapped"));
 				/* Delay the "Searching..." message for at least two seconds. */
 				feedback = -2;
 			}
@@ -289,11 +265,48 @@ int findnextstr(const char *needle, bool whole_word_only, int modus,
 		from = line->data;
 		if (ISSET(BACKWARDS_SEARCH))
 			from += strlen(line->data);
+
+		/* Glance at the keyboard once every second, to check for a Cancel. */
+		if (time(NULL) - lastkbcheck > 0) {
+			int input = wgetch(midwin);
+
+			lastkbcheck = time(NULL);
+
+			/* Consume any queued-up keystrokes, until a Cancel or nothing. */
+			while (input != ERR) {
+				if (input == ESC_CODE) {
+					napms(20);
+					input = wgetch(midwin);
+					meta_key = TRUE;
+				} else
+					meta_key = FALSE;
+
+				if (func_from_key(&input) == do_cancel) {
+#ifndef NANO_TINY
+					if (the_window_resized)
+						regenerate_screen();
+#endif
+					statusbar(_("Cancelled"));
+					/* Clear out the key buffer (in case a macro is running). */
+					while (input != ERR)
+						input = get_input(NULL);
+					nodelay(midwin, FALSE);
+					return -2;
+				}
+
+				input = wgetch(midwin);
+			}
+
+			if (++feedback > 0)
+				/* TRANSLATORS: This is shown when searching takes
+				 * more than half a second. */
+				statusbar(_("Searching..."));
+		}
 	}
 
 	found_x = found - line->data;
 
-	enable_waiting();
+	nodelay(midwin, FALSE);
 
 	/* Ensure that the found occurrence is not beyond the starting x. */
 	if (came_full_circle && ((!ISSET(BACKWARDS_SEARCH) && (found_x > begin_x ||
@@ -309,33 +322,33 @@ int findnextstr(const char *needle, bool whole_word_only, int modus,
 	if (match_len != NULL)
 		*match_len = found_len;
 
-	/* Wipe the "Searching..." message and unset the suppression flag. */
-	if (feedback > 0) {
-		wipe_statusbar();
-		suppress_cursorpos = FALSE;
+#ifndef NANO_TINY
+	if (modus == JUSTFIND && (!openfile->mark || openfile->softmark)) {
+		spotlighted = TRUE;
+		light_from_col = xplustabs();
+		light_to_col = wideness(line->data, found_x + found_len);
+		refresh_needed = TRUE;
 	}
+#endif
+
+	if (feedback > 0)
+		wipe_statusbar();
 
 	return 1;
 }
 
-/* Ask what to search for and then go looking for it. */
-void do_search(void)
-{
-	search_init(FALSE, FALSE);
-}
-
-/* Search forward for a string. */
+/* Ask for a string and then search forward for it. */
 void do_search_forward(void)
 {
 	UNSET(BACKWARDS_SEARCH);
-	do_search();
+	search_init(FALSE, FALSE);
 }
 
-/* Search backwards for a string. */
+/* Ask for a string and then search backwards for it. */
 void do_search_backward(void)
 {
 	SET(BACKWARDS_SEARCH);
-	do_search();
+	search_init(FALSE, FALSE);
 }
 
 /* Search for the last string without prompting. */
@@ -349,7 +362,7 @@ void do_research(void)
 #endif
 
 	if (*last_search == '\0') {
-		statusbar(_("No current search pattern"));
+		statusline(AHEM, _("No current search pattern"));
 		return;
 	}
 
@@ -359,7 +372,8 @@ void do_research(void)
 	/* Use the search-menu key bindings, to allow cancelling. */
 	currmenu = MWHEREIS;
 
-	wipe_statusbar();
+	if (LINES > 1)
+		wipe_statusbar();
 
 	go_looking();
 
@@ -386,7 +400,7 @@ void not_found_msg(const char *str)
 	char *disp = display_string(str, 0, (COLS / 2) + 1, FALSE, FALSE);
 	size_t numchars = actual_x(disp, wideness(disp, COLS / 2));
 
-	statusline(HUSH, _("\"%.*s%s\" not found"), numchars, disp,
+	statusline(AHEM, _("\"%.*s%s\" not found"), numchars, disp,
 						(disp[numchars] == '\0') ? "" : "...");
 	free(disp);
 }
@@ -398,7 +412,7 @@ void go_looking(void)
 	linestruct *was_current = openfile->current;
 	size_t was_current_x = openfile->current_x;
 
-//#define TIMEIT 12
+//#define TIMEIT  12
 #ifdef TIMEIT
 #include <time.h>
 	clock_t start = clock();
@@ -412,13 +426,13 @@ void go_looking(void)
 	/* If we found something, and we're back at the exact same spot
 	 * where we started searching, then this is the only occurrence. */
 	if (didfind == 1 && openfile->current == was_current &&
-				openfile->current_x == was_current_x)
-		statusbar(_("This is the only occurrence"));
+						openfile->current_x == was_current_x)
+		statusline(REMARK, _("This is the only occurrence"));
 	else if (didfind == 0)
 		not_found_msg(last_search);
 
 #ifdef TIMEIT
-	statusline(HUSH, "Took: %.2f", (double)(clock() - start) / CLOCKS_PER_SEC);
+	statusline(INFO, "Took: %.2f", (double)(clock() - start) / CLOCKS_PER_SEC);
 #endif
 
 	edit_redraw(was_current, CENTERING);
@@ -454,8 +468,7 @@ int replace_regexp(char *string, bool create)
 			/* And if create is TRUE, append the result of the
 			 * subexpression match to the new line. */
 			if (create) {
-				strncpy(string, openfile->current->data +
-										regmatches[num].rm_so, i);
+				strncpy(string, openfile->current->data + regmatches[num].rm_so, i);
 				string += i;
 			}
 		}
@@ -483,7 +496,7 @@ char *replace_line(const char *needle)
 		new_size += strlen(answer) - match_len;
 	}
 
-	copy = charalloc(new_size);
+	copy = nmalloc(new_size);
 
 	/* Copy the head of the original line. */
 	strncpy(copy, openfile->current->data, openfile->current_x);
@@ -518,14 +531,11 @@ ssize_t do_replace_loop(const char *needle, bool whole_word_only,
 	linestruct *was_mark = openfile->mark;
 	linestruct *top, *bot;
 	size_t top_x, bot_x;
-	bool right_side_up = FALSE;
-		/* TRUE if (mark_begin, mark_begin_x) is the top of the mark,
-		 * FALSE if (current, current_x) is. */
+	bool right_side_up = (openfile->mark && mark_is_before_cursor());
 
 	/* If the mark is on, frame the region, and turn the mark off. */
 	if (openfile->mark) {
-		get_region((const linestruct **)&top, &top_x,
-					(const linestruct **)&bot, &bot_x, &right_side_up);
+		get_region(&top, &top_x, &bot, &bot_x);
 		openfile->mark = NULL;
 		modus = INREGION;
 
@@ -538,12 +548,12 @@ ssize_t do_replace_loop(const char *needle, bool whole_word_only,
 			openfile->current_x = bot_x;
 		}
 	}
-#endif /* !NANO_TINY */
+#endif
 
 	came_full_circle = FALSE;
 
 	while (TRUE) {
-		int choice = 0;
+		int choice = NO;
 		int result = findnextstr(needle, whole_word_only, modus,
 						&match_len, skipone, real_current, *real_current_x);
 
@@ -579,32 +589,31 @@ ssize_t do_replace_loop(const char *needle, bool whole_word_only,
 			edit_refresh();
 
 			/* TRANSLATORS: This is a prompt. */
-			choice = do_yesno_prompt(TRUE, _("Replace this instance?"));
+			choice = ask_user(YESORALLORNO, _("Replace this instance?"));
 
 			spotlighted = FALSE;
 
-			if (choice == -1)  /* The replacing was cancelled. */
+			if (choice == CANCEL)
 				break;
-			else if (choice == 2)
-				replaceall = TRUE;
+
+			replaceall = (choice == ALL);
 
 			/* When "No" or moving backwards, the search routine should
 			 * first move one character further before continuing. */
 			skipone = (choice == 0 || ISSET(BACKWARDS_SEARCH));
 		}
 
-		if (choice == 1 || replaceall) {  /* Yes, replace it. */
-			char *copy;
+		if (choice == YES || replaceall) {
 			size_t length_change;
+			char *altered;
+
+			altered = replace_line(needle);
+
+			length_change = strlen(altered) - strlen(openfile->current->data);
 
 #ifndef NANO_TINY
 			add_undo(REPLACE, NULL);
-#endif
-			copy = replace_line(needle);
 
-			length_change = strlen(copy) - strlen(openfile->current->data);
-
-#ifndef NANO_TINY
 			/* If the mark was on and it was located after the cursor,
 			 * then adjust its x position for any text length changes. */
 			if (was_mark && !right_side_up) {
@@ -620,8 +629,9 @@ ssize_t do_replace_loop(const char *needle, bool whole_word_only,
 
 			/* If the mark was not on or it was before the cursor, then
 			 * adjust the cursor's x position for any text length changes. */
-			if (!was_mark || right_side_up) {
+			if (!was_mark || right_side_up)
 #endif
+			{
 				if (openfile->current == real_current &&
 						openfile->current_x < *real_current_x) {
 					if (*real_current_x < openfile->current_x + match_len)
@@ -629,8 +639,8 @@ ssize_t do_replace_loop(const char *needle, bool whole_word_only,
 					*real_current_x += length_change;
 #ifndef NANO_TINY
 					bot_x = *real_current_x;
-				}
 #endif
+				}
 			}
 
 			/* Don't find the same zero-length or BOL match again. */
@@ -643,20 +653,9 @@ ssize_t do_replace_loop(const char *needle, bool whole_word_only,
 				openfile->current_x += match_len + length_change;
 
 			/* Update the file size, and put the changed line into place. */
-			openfile->totsize += mbstrlen(copy) - mbstrlen(openfile->current->data);
+			openfile->totsize += mbstrlen(altered) - mbstrlen(openfile->current->data);
 			free(openfile->current->data);
-			openfile->current->data = copy;
-
-			if (!replaceall) {
-#ifdef ENABLE_COLOR
-				/* When doing syntax coloring, the replacement might require
-				 * a change of colors, so refresh the whole edit window. */
-				if (openfile->colorstrings != NULL && !ISSET(NO_COLOR_SYNTAX))
-					edit_refresh();
-				else
-#endif
-					update_line(openfile->current, openfile->current_x);
-			}
+			openfile->current->data = altered;
 
 			set_modified();
 			as_an_at = TRUE;
@@ -666,10 +665,7 @@ ssize_t do_replace_loop(const char *needle, bool whole_word_only,
 
 	if (numreplaced == -1)
 		not_found_msg(needle);
-#ifdef ENABLE_COLOR
-	else if (numreplaced > 0)
-		refresh_needed = TRUE;
-#endif
+
 #ifndef NANO_TINY
 	openfile->mark = was_mark;
 #endif
@@ -693,20 +689,22 @@ void do_replace(void)
 	}
 }
 
-/* Ask the user what the already given search string should be replaced with. */
-void ask_for_replacement(void)
+/* Ask the user what to replace the search string with, and do the replacements. */
+void ask_for_and_do_replacements(void)
 {
-	linestruct *edittop_save, *begin;
-	size_t firstcolumn_save, begin_x;
+	linestruct *was_edittop = openfile->edittop;
+	size_t was_firstcolumn = openfile->firstcolumn;
+	linestruct *beginline = openfile->current;
+	size_t begin_x = openfile->current_x;
 	ssize_t numreplaced;
-	int response = do_prompt(FALSE, FALSE, MREPLACEWITH, "",
-						/* TRANSLATORS: This is a prompt. */
-						&replace_history, edit_refresh, _("Replace with"));
+	int response = do_prompt(MREPLACEWITH, "", &replace_history,
+							/* TRANSLATORS: This is a prompt. */
+							edit_refresh, _("Replace with"));
 
 #ifdef ENABLE_HISTORIES
-	/* If the replace string is not "", add it to the replace history list. */
+	/* When not "", add the replace string to the replace history list. */
 	if (response == 0)
-		update_history(&replace_history, answer);
+		update_history(&replace_history, answer, PRUNE_DUPLICATE);
 #endif
 
 	/* When cancelled, or when a function was run, get out. */
@@ -716,24 +714,19 @@ void ask_for_replacement(void)
 	} else if (response > 0)
 		return;
 
-	/* Save where we are. */
-	edittop_save = openfile->edittop;
-	firstcolumn_save = openfile->firstcolumn;
-	begin = openfile->current;
-	begin_x = openfile->current_x;
-
-	numreplaced = do_replace_loop(last_search, FALSE, begin, &begin_x);
+	numreplaced = do_replace_loop(last_search, FALSE, beginline, &begin_x);
 
 	/* Restore where we were. */
-	openfile->edittop = edittop_save;
-	openfile->firstcolumn = firstcolumn_save;
-	openfile->current = begin;
+	openfile->edittop = was_edittop;
+	openfile->firstcolumn = was_firstcolumn;
+	openfile->current = beginline;
 	openfile->current_x = begin_x;
+
 	refresh_needed = TRUE;
 
 	if (numreplaced >= 0)
-		statusline(HUSH, P_("Replaced %zd occurrence",
-				"Replaced %zd occurrences", numreplaced), numreplaced);
+		statusline(REMARK, P_("Replaced %zd occurrence",
+					"Replaced %zd occurrences", numreplaced), numreplaced);
 }
 
 /* Go to the specified line and x position. */
@@ -752,15 +745,14 @@ void goto_line_posx(ssize_t line, size_t pos_x)
 /* Go to the specified line and column, or ask for them if interactive
  * is TRUE.  In the latter case also update the screen afterwards.
  * Note that both the line and column number should be one-based. */
-void do_gotolinecolumn(ssize_t line, ssize_t column, bool use_answer,
-		bool interactive)
+void goto_line_and_column(ssize_t line, ssize_t column, bool retain_answer,
+							bool interactive)
 {
 	if (interactive) {
 		/* Ask for the line and column. */
-		int response = do_prompt(FALSE, FALSE, MGOTOLINE,
-						use_answer ? answer : "", NULL, edit_refresh,
+		int response = do_prompt(MGOTOLINE, retain_answer ? answer : "", NULL,
 						/* TRANSLATORS: This is a prompt. */
-						_("Enter line number, column number"));
+						edit_refresh, _("Enter line number, column number"));
 
 		/* If the user cancelled or gave a blank answer, get out. */
 		if (response < 0) {
@@ -770,7 +762,7 @@ void do_gotolinecolumn(ssize_t line, ssize_t column, bool use_answer,
 
 		if (func_from_key(&response) == flip_goto) {
 			UNSET(BACKWARDS_SEARCH);
-			/* Retain what the user typed so far and switch to searching. */
+			/* Switch to searching but retain what the user typed so far. */
 			search_init(FALSE, TRUE);
 			return;
 		}
@@ -781,7 +773,7 @@ void do_gotolinecolumn(ssize_t line, ssize_t column, bool use_answer,
 
 		/* Try to extract one or two numbers from the user's response. */
 		if (!parse_line_column(answer, &line, &column)) {
-			statusline(ALERT, _("Invalid line or column number"));
+			statusline(AHEM, _("Invalid line or column number"));
 			return;
 		}
 	} else {
@@ -850,9 +842,9 @@ void do_gotolinecolumn(ssize_t line, ssize_t column, bool use_answer,
 }
 
 /* Go to the specified line and column, asking for them beforehand. */
-void do_gotolinecolumn_void(void)
+void do_gotolinecolumn(void)
 {
-	do_gotolinecolumn(openfile->current->lineno,
+	goto_line_and_column(openfile->current->lineno,
 						openfile->placewewant + 1, FALSE, TRUE);
 }
 
@@ -865,8 +857,8 @@ bool find_a_bracket(bool reverse, const char *bracket_pair)
 	linestruct *line = openfile->current;
 	const char *pointer, *found;
 
-	/* Step away from the current bracket, either backwards or forwards. */
 	if (reverse) {
+		/* First step away from the current bracket. */
 		if (openfile->current_x == 0) {
 			line = line->prev;
 			if (line == NULL)
@@ -874,31 +866,23 @@ bool find_a_bracket(bool reverse, const char *bracket_pair)
 			pointer = line->data + strlen(line->data);
 		} else
 			pointer = line->data + step_left(line->data, openfile->current_x);
-	} else
+
+		/* Now seek for any of the two brackets we are interested in. */
+		while (!(found = mbrevstrpbrk(line->data, bracket_pair, pointer))) {
+			line = line->prev;
+			if (line == NULL)
+				return FALSE;
+			pointer = line->data + strlen(line->data);
+		}
+	} else {
 		pointer = line->data + step_right(line->data, openfile->current_x);
 
-	/* Now seek for any of the two brackets, either backwards or forwards. */
-	while (TRUE) {
-		if (reverse)
-			found = mbrevstrpbrk(line->data, bracket_pair, pointer);
-		else
-			found = mbstrpbrk(pointer, bracket_pair);
-
-		if (found)
-			break;
-
-		if (reverse)
-			line = line->prev;
-		else
+		while (!(found = mbstrpbrk(pointer, bracket_pair))) {
 			line = line->next;
-
-		/* If we've reached the start or end of the buffer, get out. */
-		if (line == NULL)
-			return FALSE;
-
-		pointer = line->data;
-		if (reverse)
-			pointer += strlen(line->data);
+			if (line == NULL)
+				return FALSE;
+			pointer = line->data;
+		}
 	}
 
 	/* Set the current position to the found bracket. */
@@ -937,7 +921,7 @@ void do_find_bracket(void)
 	ch = mbstrchr(matchbrackets, openfile->current->data + openfile->current_x);
 
 	if (ch == NULL) {
-		statusbar(_("Not a bracket"));
+		statusline(AHEM, _("Not a bracket"));
 		return;
 	}
 
@@ -980,10 +964,61 @@ void do_find_bracket(void)
 		}
 	}
 
-	statusbar(_("No matching bracket"));
+	statusline(AHEM, _("No matching bracket"));
 
 	/* Restore the cursor position. */
 	openfile->current = was_current;
 	openfile->current_x = was_current_x;
 }
+
+/* Place an anchor at the current line when none exists, otherwise remove it. */
+void put_or_lift_anchor(void)
+{
+	openfile->current->has_anchor = !openfile->current->has_anchor;
+
+	update_line(openfile->current, openfile->current_x);
+
+	if (openfile->current->has_anchor)
+		statusline(REMARK, _("Placed anchor"));
+	else
+		statusline(REMARK, _("Removed anchor"));
+}
+
+/* Make the given line the current line, or report the anchoredness. */
+void go_to_and_confirm(linestruct *line)
+{
+	linestruct *was_current = openfile->current;
+
+	if (line != openfile->current) {
+		openfile->current = line;
+		openfile->current_x = 0;
+		edit_redraw(was_current, CENTERING);
+		statusbar(_("Jumped to anchor"));
+	} else if (openfile->current->has_anchor)
+		statusline(REMARK, _("This is the only anchor"));
+	else
+		statusline(AHEM, _("There are no anchors"));
+}
+
+/* Jump to the first anchor before the current line; wrap around at the top. */
+void to_prev_anchor(void)
+{
+	linestruct *line = openfile->current;
+
+	do { line = (line->prev) ? line->prev : openfile->filebot;
+	} while (!line->has_anchor && line != openfile->current);
+
+	go_to_and_confirm(line);
+}
+
+/* Jump to the first anchor after the current line; wrap around at the bottom. */
+void to_next_anchor(void)
+{
+	linestruct *line = openfile->current;
+
+	do { line = (line->next) ? line->next : openfile->filetop;
+	} while (!line->has_anchor && line != openfile->current);
+
+	go_to_and_confirm(line);
+}
 #endif /* !NANO_TINY */

src/utils.c

@@ -1,7 +1,7 @@
 /**************************************************************************
  *   utils.c  --  This file is part of GNU nano.                          *
  *                                                                        *
- *   Copyright (C) 1999-2011, 2013-2020 Free Software Foundation, Inc.    *
+ *   Copyright (C) 1999-2011, 2013-2022 Free Software Foundation, Inc.    *
  *   Copyright (C) 2016, 2017, 2019 Benno Schulenberg                     *
  *                                                                        *
  *   GNU nano is free software: you can redistribute it and/or modify     *
@@ -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)
@@ -61,14 +61,14 @@ const char *tail(const char *path)
 	if (slash == NULL)
 		return path;
 	else
-		return ++slash;
+		return slash + 1;
 }
 
 /* Return a copy of the two given strings, welded together. */
 char *concatenate(const char *path, const char *name)
 {
 	size_t pathlen = strlen(path);
-	char *joined = charalloc(pathlen + strlen(name) + 1);
+	char *joined = nmalloc(pathlen + strlen(name) + 1);
 
 	strcpy(joined, path);
 	strcpy(joined + pathlen, name);
@@ -76,7 +76,6 @@ char *concatenate(const char *path, const char *name)
 	return joined;
 }
 
-#ifdef ENABLE_LINENUMBERS
 /* Return the number of digits that the given integer n takes up. */
 int digits(ssize_t n)
 {
@@ -106,21 +105,20 @@ int digits(ssize_t n)
 		}
 	}
 }
-#endif
 
-/* Read an integer from str.  If it parses okay, store it in *result
- * and return TRUE; otherwise, return FALSE. */
-bool parse_num(const char *str, ssize_t *result)
+/* Read an integer from the given string.  If it parses okay,
+ * store it in *result and return TRUE; otherwise, return FALSE. */
+bool parse_num(const char *string, ssize_t *result)
 {
-	char *first_error;
 	ssize_t value;
+	char *excess;
 
-	/* The manual page for strtol() says this is required. */
+	/* Clear the error number so that we can check it afterward. */
 	errno = 0;
 
-	value = (ssize_t)strtol(str, &first_error, 10);
+	value = (ssize_t)strtol(string, &excess, 10);
 
-	if (errno == ERANGE || *str == '\0' || *first_error != '\0')
+	if (errno == ERANGE || *string == '\0' || *excess != '\0')
 		return FALSE;
 
 	*result = value;
@@ -160,7 +158,7 @@ bool parse_line_column(const char *str, ssize_t *line, ssize_t *column)
 }
 
 /* In the given string, recode each embedded NUL as a newline. */
-void unsunder(char *string, size_t length)
+void recode_NUL_to_LF(char *string, size_t length)
 {
 	while (length > 0) {
 		if (*string == '\0')
@@ -171,7 +169,7 @@ void unsunder(char *string, size_t length)
 }
 
 /* In the given string, recode each embedded newline as a NUL. */
-void sunder(char *string)
+void recode_LF_to_NUL(char *string)
 {
 	while (*string != '\0') {
 		if (*string == '\n')
@@ -195,22 +193,18 @@ void free_chararray(char **array, size_t len)
 #endif
 
 #ifdef ENABLE_SPELLER
-/* Is the word starting at the given position in buf and of the given length
- * a separate word?  That is: is it not part of a longer word?*/
-bool is_separate_word(size_t position, size_t length, const char *buf)
+/* Is the word starting at the given position in 'text' and of the given
+ * length a separate word?  That is: is it not part of a longer word? */
+bool is_separate_word(size_t position, size_t length, const char *text)
 {
-	char before[MAXCHARLEN], after[MAXCHARLEN];
-	size_t word_end = position + length;
-
-	/* Get the characters before and after the word, if any. */
-	collect_char(buf + step_left(buf, position), before);
-	collect_char(buf + word_end, after);
+	const char *before = text + step_left(text, position);
+	const char *after = text + position + length;
 
 	/* 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)) &&
+					(*after == '\0' || !is_alpha_char(after)));
 }
 #endif /* ENABLE_SPELLER */
 
@@ -288,28 +282,26 @@ const char *strstrwrapper(const char *haystack, const char *needle,
 		return mbstrcasestr(start, needle);
 }
 
-/* This is a wrapper for the malloc() function that properly handles
- * things when we run out of memory. */
+/* Allocate the given amount of memory and return a pointer to it. */
 void *nmalloc(size_t howmuch)
 {
-	void *r = malloc(howmuch);
+	void *section = malloc(howmuch);
 
-	if (r == NULL && howmuch != 0)
+	if (section == NULL)
 		die(_("Nano is out of memory!\n"));
 
-	return r;
+	return section;
 }
 
-/* This is a wrapper for the realloc() function that properly handles
- * things when we run out of memory. */
-void *nrealloc(void *ptr, size_t howmuch)
+/* Reallocate the given section of memory to have the given size. */
+void *nrealloc(void *section, size_t howmuch)
 {
-	void *r = realloc(ptr, howmuch);
+	section = realloc(section, howmuch);
 
-	if (r == NULL && howmuch != 0)
+	if (section == NULL)
 		die(_("Nano is out of memory!\n"));
 
-	return r;
+	return section;
 }
 
 /* Return an appropriately reallocated dest string holding a copy of src.
@@ -318,18 +310,20 @@ char *mallocstrcpy(char *dest, const char *src)
 {
 	size_t count = strlen(src) + 1;
 
-	dest = charealloc(dest, count);
+	dest = nrealloc(dest, count);
 	strncpy(dest, src, count);
 
 	return dest;
 }
 
-/* Return an allocated copy of the first count characters of the given string. */
+/* 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)
 {
-	char *thecopy = charalloc(count);
+	char *thecopy = nmalloc(count + 1);
 
-	strncpy(thecopy, string, count);
+	memcpy(thecopy, string, count);
+	thecopy[count] = '\0';
 
 	return thecopy;
 }
@@ -337,7 +331,7 @@ char *measured_copy(const char *string, size_t count)
 /* Return an allocated copy of the given string. */
 char *copy_of(const char *string)
 {
-	return measured_copy(string, strlen(string) + 1);
+	return measured_copy(string, strlen(string));
 }
 
 /* Free the string at dest and return the string at src. */
@@ -347,14 +341,12 @@ char *free_and_assign(char *dest, char *src)
 	return src;
 }
 
-/* When not in softwrap mode, nano scrolls horizontally within a line in
- * chunks (a bit smaller than the chunks used in softwrapping).  Return the
- * column number of the first character displayed in the edit window when the
- * cursor is at the given column.  Note that (0 <= column -
- * get_page_start(column) < COLS). */
+/* When not softwrapping, nano scrolls the current line horizontally by
+ * chunks ("pages").  Return the column number of the first character
+ * displayed in the edit window when the cursor is at the given column. */
 size_t get_page_start(size_t column)
 {
-	if (column + 2 < editwincols || ISSET(SOFTWRAP) || column == 0)
+	if (column == 0 || column + 2 < editwincols || ISSET(SOFTWRAP))
 		return 0;
 	else if (editwincols > 8)
 		return column - 6 - (column - 6) % (editwincols - 8);
@@ -448,35 +440,35 @@ void remove_magicline(void)
 #endif
 
 #ifndef NANO_TINY
-/* Return in (top, top_x) and (bot, bot_x) the start and end "coordinates"
- * of the marked region.  If right_side_up isn't NULL, set it to TRUE when
- * the mark is at the top of the marked region, and to FALSE otherwise. */
-void get_region(const linestruct **top, size_t *top_x,
-				const linestruct **bot, size_t *bot_x, bool *right_side_up)
+/* Return TRUE when the mark is before or at the cursor, and FALSE otherwise. */
+bool mark_is_before_cursor(void)
 {
-	if (openfile->mark->lineno < openfile->current->lineno ||
-				(openfile->mark == openfile->current &&
-				openfile->mark_x < openfile->current_x)) {
+	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 linestruct **top, const linestruct **bot)
+void get_range(linestruct **top, linestruct **bot)
 {
 	if (!openfile->mark) {
 		*top = openfile->current;
@@ -484,7 +476,7 @@ void get_range(const linestruct **top, const linestruct **bot)
 	} else {
 		size_t top_x, bot_x;
 
-		get_region(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;
@@ -510,19 +502,15 @@ linestruct *line_from_number(ssize_t number)
 #endif /* !NANO_TINY */
 
 /* Count the number of characters from begin to end, and return it. */
-size_t get_totsize(const linestruct *begin, const linestruct *end)
+size_t number_of_characters_in(const linestruct *begin, const linestruct *end)
 {
 	const linestruct *line;
-	size_t totsize = 0;
+	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);
 }

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,22 @@ 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
+		xml.nanorc \
+		yaml.nanorc
 
-EXTRA_DIST = $(pkgdata_DATA)
+nobase_pkgdata_DATA = \
+		extra/ada.nanorc \
+		extra/fortran.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)"
-color brightred "^[[:space:]]*[.0-9A-Za-z_]*:"
-color brightcyan "^[[:space:]]*#[[:space:]]*(define|undef|include|ifn?def|endif|elif|else|if|warning|error)"
+color brightred "^[[:blank:]]*[.0-9A-Za-z_]*:"
+color brightcyan "^[[:blank:]]*#[[:blank:]]*(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="^(\\.|[^"])*""
+# Strings and names of included files.
+color brightyellow ""([^"\]|\\.)*"|<[^= 	]*>"
 
 # Comments.
 color brightblue "//.*"

syntax/autoconf.nanorc

@@ -1,11 +1,14 @@
-## Here is an example for Autoconf.
+## Syntax highlighting for Autoconf.
+
+## Original author:  Benno Schulenberg
+## License:  GPL version 3 or newer
 
 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 +17,13 @@ color cyan "\<[[:upper:]_[:digit:]]+\>"
 color red "\<[-_.0-9]+\>"
 
 # Strings:
-color red "\"[^"]*\""  "\'[^']*\'"
+color red ""[^"]*"|'[^']*'"
 
 # Backticks:
 color green "`[^`]*`"
 
 # Error lines:
-color brightred "^[[:space:]]*\*\*\*.*"
+color brightred "^[[:blank:]]*\*\*\*.*"
 
 # Brackets:
 color magenta "\[|\]|\(|\)"

syntax/awk.nanorc

@@ -1,4 +1,4 @@
-## Here is an example for awk.
+## Syntax highlighting for AWK scripts.
 
 syntax awk "\.awk$"
 header "^#!.*awk"
@@ -14,7 +14,7 @@ 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)\>"
@@ -29,9 +29,9 @@ color magenta "\<(and|compl|lshift|or|rshift|xor)\>"
 color magenta "\<(bindtextdomain|dcgettext|dcngettext)\>"
 
 # Strings.
-color brightyellow "<[^= 	]*>" ""(\\.|[^"])*""
+color brightyellow ""([^"\]|\\.)*""
 # Comments.
-color brightblue "(^|[[:space:]])#.*$"
+color brightblue "(^|[[:blank:]])#.*"
 
 # Trailing whitespace.
 color ,green "[[:space:]]+$"

syntax/c.nanorc

@@ -1,36 +1,39 @@
-## Here is an example for C/C++.
+## Syntax highlighting for C and C++ files.
 
 syntax c "\.([ch](pp|xx)?|C|cc|c\+\+|cu|H|hh|ii?)$"
-header "-\*-.*\<C(\+\+)?((;|\s).*)?-\*-"
+header "-\*-.*\<C(\+\+)?((;|[[:blank:]]).*)?-\*-"
 magic "^(C|C\+\+) (source|program)"
 comment "//"
 
 # Constants.
-color brightred "\<[A-Z_][0-9A-Z_]+\>"
+color brightred "\<[A-Z_][0-9A-Z_]*\>"
 # Labels.
-color brightmagenta "^[[:space:]]*[A-Z_a-z]+:[[:space:]]*$"
+color brightmagenta "^[[:blank:]]*[A-Z_a-z][0-9A-Z_a-z]*:[[:blank:]]*$"
+color normal ":[[:blank:]]*$"
 
-color green "\<(float|double|bool|char|int|short|long|sizeof|enum|void|auto|static|const|struct|union|typedef|extern|(un)?signed|inline)\>"
+# Types and related keywords.
+color green "\<(auto|bool|char|const|double|enum|extern|float|inline|int|long|restrict|short|signed|sizeof|static|struct|typedef|union|unsigned|void)\>"
 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 green "\<(_(Alignas|Alignof|Atomic|Bool|Complex|Generic|Imaginary|Noreturn|Static_assert|Thread_local))\>"
+color green "\<(class|explicit|friend|mutable|namespace|override|private|protected|public|register|template|this|typename|using|virtual|volatile)\>"
+
+# Flow control.
+color brightyellow "\<(if|else|for|while|do|switch|case|default)\>"
 color brightyellow "\<(try|throw|catch|operator|new|delete)\>"
-color magenta "\<(goto|continue|break|return)\>"
-color brightmagenta "'([^'\]|(\\["'abfnrtv\\]))'" "'\\(([0-3]?[0-7]{1,2}))'" "'\\x[0-9A-Fa-f]{1,2}'"
+color magenta "\<(break|continue|goto|return)\>"
+
+# Single-quoted stuff (characters, backslash escapes, hex and octal byte codes).
+color brightmagenta "'([^'\]|\\(["'\abfnrtv]|x[[:xdigit:]]{1,2}|[0-3]?[0-7]{1,2}))'"
 
 # GCC builtins.
-color cyan "__attribute__[[:space:]]*\(\([^)]*\)\)" "__(aligned|asm|builtin|hidden|inline|packed|restrict|section|typeof|weak)__"
+color cyan "__attribute__[[:blank:]]*\(\([^)]*\)\)" "__(aligned|asm|builtin|hidden|inline|packed|restrict|section|typeof|weak)__"
 
-# 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 ""([^"]|\\")*"" "#[[:space:]]*include[[:space:]]+<[^[:blank:]=]*>"
-# Multiline strings.  This regex is VERY resource intensive,
-# and sometimes colours things that shouldn't be coloured.
-###color brightyellow start=""(\\.|[^"])*\\[[:space:]]*$" end="^(\\.|[^"])*""
+# Strings and names of included files.
+color brightyellow ""([^"]|\\")*"" "#[[:blank:]]*include[[: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)\>"
+color brightcyan start="^[[:blank:]]*#[[:blank:]]*(if(n?def)?|elif|warning|error|pragma)\>" end="(\`|[^\])$"
+color brightcyan "^[[:blank:]]*#[[:blank:]]*((define|else|endif|include(_next)?|line|undef)\>|$)"
 
 # Comments.
 color brightblue "//.*"

syntax/changelog.nanorc

@@ -1,4 +1,7 @@
-## Colouring for Changelogs.
+## Syntax highlighting for Changelogs.
+
+## Original author:  Benno Schulenberg
+## License:  GPL version 3 or newer
 
 syntax changelog "Change[Ll]og[^/]*$"
 
@@ -10,13 +13,13 @@ color red "^(19|20)[0-9-]{8}"
 color yellow "<[^>]*@[^>]*>"
 
 # Command-line options.
-color cyan "[[:space:]]-[a-zA-Z\$]" "--[8a-z-]+"
+color cyan "[[:blank:]]-[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.
-color brightblue "\^[A-Z^\]" "\<M-." "\<F1?[0-9]" "(\^|M-)Space"
+color brightblue "\^[A-Z^\]|\<M-.|\<F1?[0-9]|(\^|M-)Space"
 
 # Changed files.
 color magenta start="^(	| {8})\* " end="(:( |$)|^$)"

syntax/cmake.nanorc

@@ -3,17 +3,20 @@
 syntax cmake "(CMakeLists\.txt|\.cmake)$"
 comment "#"
 
-color green "^[[:space:]]*[0-9A-Za-z_]+"
-icolor brightyellow "^[[:space:]]*(include|include_directories|include_external_msproject)\>"
+color green "^[[:blank:]]*[0-9A-Za-z_]+"
+icolor brightyellow "^[[:blank:]]*(include|include_directories|include_external_msproject)\>"
 
-icolor brightgreen "^[[:space:]]*((else|end)?if|else|(end)?while|(end)?foreach|break)\>"
-color brightgreen "\<(NOT|COMMAND|POLICY|TARGET|EXISTS|IS_(DIRECTORY|ABSOLUTE)|DEFINED)[[:space:]]"
-color brightgreen "[[:space:]](OR|AND|IS_NEWER_THAN|MATCHES|(STR|VERSION_)?(LESS|GREATER|EQUAL))[[:space:]]"
+icolor brightgreen "^[[:blank:]]*((else|end)?if|else|(end)?while|(end)?foreach|break)\>"
+color brightgreen "\<(NOT|COMMAND|POLICY|TARGET|EXISTS|IS_(DIRECTORY|ABSOLUTE)|DEFINED)[[:blank:]]"
+color brightgreen "[[:blank:]](OR|AND|IS_NEWER_THAN|MATCHES|(STR|VERSION_)?(LESS|GREATER|EQUAL))[[:blank:]]"
 
-icolor brightred "^[[:space:]]*((end)?(function|macro)|return)"
+icolor brightred "^[[:blank:]]*((end)?(function|macro)|return)"
 
 icolor cyan start="\$(ENV)?\{" end="\}"
 color magenta "\<(APPLE|UNIX|WIN32|CYGWIN|BORLAND|MINGW|MSVC(_IDE|60|71|80|90)?)\>"
 
-color brightblue "(^|[[:space:]])#.*"
+# Comments.
+color brightblue "(^|[[:blank:]])#.*"
+
+# Trailing whitespace.
 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 "/*|*/"
 
-color brightred     "."
-color brightyellow  start="\{" end="\}"
-color brightwhite   start=":" end="([;^\{]|$)"
-color brightblue    ":active|:focus|:hover|:link|:visited|:link|:after|:before|$"
-color brightblue    start="\/\*" end="\\*/"
-color green         ";|:|\{|\}"
+# First make everything red:
+color brightred "."
+# Then everything between braces yellow:
+color brightyellow 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/debian.nanorc

@@ -1,21 +0,0 @@
-## Here is an example for apt's sources.list.
-
-syntax sources.list "sources\.list(\.d/.*\.list)?(~|\.old|\.save)?$"
-comment "#"
-
-# Coloring the deb lines, working from tail to head.  First the
-# components -- well, everything, and thus also the components.
-color brightmagenta "^deb.*"
-# Distribution -- well, everything, except the components.
-color brightred "^deb(-src)?\s+.*((ftp|https?|rsh|ssh|copy|file|spacewalk|tor):/\S+|cdrom:\[.+\]/)\s+\S+"
-# URIs.
-color brightgreen "^deb(-src)?\s+.*(ftp|https?|rsh|ssh|copy|file|spacewalk|tor):/\S+"
-# CDroms.
-color brightgreen "^deb(-src)?\s+.*cdrom:\[.+\]/"
-# Options.
-color brightcyan "^deb(-src)?\s+\[.+\]\s+"
-# And finally the initial deb tag.
-color yellow "^deb(-src)?"
-
-# Comments.
-color brightblue "#.*"

syntax/default.nanorc

@@ -1,20 +1,30 @@
-## 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
 comment "#"
 
-# Comments.
-color cyan "^[[:space:]]*#.*"
-
 # Spaces in front of tabs.
 color ,red " +	+"
 
-# Nano's name, including version.
-color brightred "(GNU )?[Nn]ano [1-4]\.[0-9][-.[:alnum:]]*\>"
+# Nano's release motto, then name plus version.
+color italic,lime "\<[Nn]ano [1-6]\.[0-9][-.[:alnum:]]* "[^"]+""
+color brightred "\<(GNU )?[Nn]ano [1-6]\.[0-9][-.[:alnum:]]*\>"
+
+# Dates
+color latte "\<[12][0-9]{3}\.(0[1-9]|1[012])\.(0[1-9]|[12][0-9]|3[01])\>"
 
 # Email addresses.
 color magenta "<[[:alnum:].%_+-]+@[[:alnum:].-]+\.[[:alpha:]]{2,}>"
 
+# URLs.
+color lightblue "\<https?://\S+\.\S+[^[:space:],.)]"
+
 # Bracketed captions in certain config files.
 color brightgreen "^\[[^][]+\]$"
+
+# Comments.
+color cyan "^[[:blank:]]*#.*"
+
+# Control codes.
+color orange "[[: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 ""(\\.|[^"])*""
+color yellow start="^[[:blank:]]+"" end="[^\]""
+color yellow ""([^"\]|\\.)*""
 # Comments
-color cyan "(^|[[:space:]]);.*"
+color cyan "(^|[[:blank:]]);.*"

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+[^[:space:].)]"
+
+# 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/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.
-color yellow "<[^= 	]*>" ""(\\.|[^"])*""
+color yellow ""([^"\]|\\.)*""
 
 # Comments.
 color blue "!.*"

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:]]+$"

syntax/extra/povray.nanorc

@@ -1,4 +1,4 @@
-## Here is an example for POV-Ray.
+## Syntax highlighting for POV-Ray files.
 
 syntax pov "\.(pov|POV|povray|POVRAY)$"
 comment "//"
@@ -8,7 +8,7 @@ color brightyellow "\<(sphere|cylinder|translate|matrix|rotate|scale)\>"
 color brightyellow "\<(orthographic|location|up|right|direction|clipped_by)\>"
 color brightyellow "\<(fog_type|fog_offset|fog_alt|rgb|distance|transform)\>"
 color brightred "\<(background|camera|fog|light_source|object|texture)\>"
-color green "(\{|\}|\(|\)|\;|\]|\[|`|\\|\$|<|>|!|=|&|\|)"
+color green "\{|\}|\(|\)|\;|\]|\[|`|\\|\$|<|>|!|=|&|\|"
 color brightmagenta "\<(union|group|subgroup)\>"
 
 # Comments.

syntax/extra/spec.nanorc

@@ -0,0 +1,41 @@
+## Syntax highlighting for RPM spec files.
+
+syntax spec "\.spec(\.[^/]+)?$"
+comment "#"
+
+# Main tags.
+color brightblue "\<(Name|Version|Release|Summary|Group|URL|Url|Epoch|Icon|Serial)[[:space:]]*:"
+color brightblue "\<(BuildArch(itectures)?|Exclusive(Arch|OS)|Exclude(Arch|OS))[[:space:]]*:"
+color brightblue "\<(Provides|Requires(\(.*\))?|Obsoletes|Conflicts|Recommends|Suggests|Supplements|Enhances|PreReq)[[:space:]]*:"
+color brightblue "\<(BuildRoot|BuildRequires|BuildConflicts|Prefix|RemovePathPostfixes)[[:space:]]*:"
+color brightblue "\<(AutoReq|AutoProv|AutoReqProv)[[:space:]]*:"
+color brightblue "\<(License|Copyright|Distribution|Vendor|Packager)[[:space:]]*:"
+color brightblue "\<((Source|Patch)[0-9]*|Nosource|Nopatch)[[:space:]]*:"
+# Architectures.
+color brightred "\<(i386|i486|i586|i686|athlon|ia64|alpha|alphaev5|alphaev56|alphapca56|alphaev6|alphaev67|sparc|sparcv9|sparc64armv3l|armv4b|armv4lm|ips|mipsel|ppc|ppciseries|ppcpseries|ppc64|m68k|m68kmint|Sgi|rs6000|i370|s390x?|noarch)\>"
+# Architecture and OS conditionals.
+color brightred "%(ifarch|elifarch|ifnarch|ifos|elifos|ifnos)\>"
+# %* strings.
+color green "%([A-Z_a-z_0-9_]*)"
+color magenta "%_([A-Z_a-z_0-9_]*)"
+color yellow start="%__" end="\ "
+color magenta start="%\{" end="\}"
+color yellow start="%\{__" end="\}"
+# Sections.
+color red "^%((prep|build|install|check|clean)$|(description|files|package|changelog)\>)"
+color red "^%((pre|post)(trans|un)?|trigger(prein|in|un|postun)?)\>"
+color red "^%(trans)?filetrigger(in|un|postun)\>"
+color red "^%(sourcelist|patchlist|generate_buildrequires|verifyscript)\>"
+# Conditionals and defines.
+color brightred "%(if|elif|else|endif|define|global|undefine)\>"
+
+# Comments.
+color cyan "(#|%dnl[[:space:]]).*"
+# Special case: "# norootforbuild" is handled as main tag.
+color brightblue "^# norootforbuild"
+# For %changelog entries: first the author, then just the date.
+color yellow "^\* .+>"
+color brightyellow "^\* [[:alnum:] ]+ [0-9]{4} "
+
+# Trailing whitespace.
+color ,green "[[:space:]]+$"