po: update translations and regenerate POT file and PO files

This fixes https://savannah.gnu.org/bugs/?54981.

Bug existed since commit fb8d981b from a month ago.

AUTHORS

@@ -5,6 +5,11 @@ nano editor.  Please see the ChangeLog for specific changes by author.
 Chris Allegretta <chrisa@asty.org>
 	* Original program author and long-time maintainer.
 
+Benno Schulenberg <bensberg@telfort.nl>
+	* An array of small bug fixes, the cut-word and block-jump
+	  routines, text selection by holding Shift, macro recording
+	  and replay, plus some key bindings.  Current maintainer.
+
 David Lawrence Ramsey <pooka109@gmail.com>
 	* Former stable series maintainer.  Multiple buffer support,
 	  operating dir (-o) option, bug fixes for display routines,
@@ -60,7 +65,5 @@ Sumedh Pendurkar <sumedh.pendurkar@gmail.com>
 Rishabh Dave <rishabhddave@gmail.com>
 	* Searchable help.
 
-Benno Schulenberg <bensberg@justemail.net>
-	* An array of small bug fixes, the cut-word and block-jump
-	  routines, text selection by holding Shift, and some extra
-	  key bindings.  Current maintainer.
+Marco Diego Aurélio Mesquita <marcodiegomesquita@gmail.com>
+	* Filtering text through an external command.

ChangeLog

@@ -1,3 +1,463 @@
+Changes between v3.1 and v3.2:
+------------------------------
+
+Benjamin Mintz (1):
+      syntax: python: do not highlight 'print' and 'exec' in Python 3
+
+Benno Schulenberg (87):
+      bindings: allow using <Enter> to exit from the linter
+      bindings: allow using ^X to exit from the linter
+      bindings: drop M-| as a keystroke for 'cutwordleft' -- set it free again
+      bindings: in tiny version with help, don't show unfunctional M-◀ and M-▶
+      bindings: make <Alt+Up> and <Alt+Down> work also on a Linux console
+      bindings: make the linter separately accessible, through M-B by default
+      bindings: make the Shift+arrow keys work by default on more terminals
+      bindings: no longer bind F13 and F14 and F15
+      bindings: recognize ASCII DEL as backspace also in viewer and browser
+      bindings: recognize <Ctrl+Shift+Delete> also on a Linux console
+      bindings: rename 'prevhistory' to 'older' and 'nexthistory' to 'newer'
+      bindings: stop binding <Bsp> to do_backspace() in the browser menu
+      bindings: when implanting a string, make sure to use positive values
+      build: exclude scrolling functions only from tiny version without help
+      build: fix compilation again when configured with --enable-tiny
+      build: fix compilation when configured with --disable-multibuffer
+      build: verify that --enable-tiny compiles before allowing a release
+      bump version numbers and add a news item for the 3.1 release
+      debug: report for which modified editing keys ncurses has no keycode
+      display: correct a mistaken label in the help lines of the browser
+      display: ensure that the help lines are shown when in linting mode
+      display: let the title bar show when nano is in linting mode
+      display: show the cursor also in a help text (when --showcursor is used)
+      display: use a different color when showing a linting message
+      docs: document the slightly changed workings of the --view option
+      docs: give suggestions for alternative key bindings in the sample nanorc
+      docs: remove a no-longer-needed suggestion from the sample nanorc
+      docs: update the description of -R/--restricted, as it now reads nanorc
+      docs, usage: mention that --showcursor now covers help texts too
+      feedback: give proper message for ^R when combining --view & --restricted
+      gnulib: update to its current upstream state
+      help: add a relevant explanatory text for the linter
+      help: move the linter to the end, to restore pairing in the help lines
+      help: pull "Older" and "Newer" into view on an 80-column terminal
+      help: restore the blank line between manipulation and position stuff
+      help: show <PgUp> and <PgDn> instead of F7 and F8 for pagewise scrolling
+      help: show the keystroke <Ctrl+Shift+Delete> as "Sh-^Del"
+      linter: allow using <Ctrl+Up> and <Ctrl+Down> to jump to other message
+      linter: do not pause when there are no messages for unopened files
+      linter: for "first"/"last", reshow actual message after a short pause
+      options: --ignorercfiles is now available in restricted mode
+      options: let view mode activate "multibuffer" to allow viewing more files
+      speller: remove a pointless message -- it is never seen
+      startup: allow reading nanorc in restricted mode, to permit customization
+      syntaxes: remove several redundant end-of-line anchors from regexes
+      tweaks: add a comment, and correct an indentation
+      tweaks: add two more translator hints
+      tweaks: capitalize the word "nano" when at the start of a sentence
+      tweaks: change a bunch of URLs to use 'https' instead of 'http'
+      tweaks: condense a handful of comments, and drop an assert
+      tweaks: condense another bit of code
+      tweaks: define a symbol to make the code itself a little simpler
+      tweaks: don't bother asking ncurses for keycodes for shifted Left/Right
+      tweaks: drop a check for the needle (the search string) being empty
+      tweaks: drop the checking of two flags that can no longer be toggled
+      tweaks: elide a function that is used just once and is a oneliner
+      tweaks: elide a wrapper function that is no longer useful
+      tweaks: exclude word-deletion keystrokes from the tiny version
+      tweaks: fold a few pairs of regexes into each other
+      tweaks: group a series of related variables together
+      tweaks: improve two comments, and reshuffle a line for consistency
+      tweaks: include an extra function call only where it is needed
+      tweaks: move all the function keys to the end of the shortcuts list
+      tweaks: move some calls of edit_redraw() to where they are needed
+      tweaks: redefine MMOST to exclude MBROWSER, to simplify the bindings
+      tweaks: reduce some repetitious and superfluous comments to just one
+      tweaks: remove a check that was made redundant by the previous commit
+      tweaks: remove a now-unused parameter from four functions
+      tweaks: remove an unneeded check for NULL, and rename a parameter
+      tweaks: remove a stray file that was accidentally comitted
+      tweaks: remove some old debugging code
+      tweaks: rename a bunch of variables, to make it clearer what they contain
+      tweaks: rename a flag, to match the name of the option
+      tweaks: rename a variable, to be a bit more fitting
+      tweaks: renumber a couple of symbols, and reshuffle a bit of code
+      tweaks: reorder some code to put backward motion before the forward one
+      tweaks: reshuffle a couple of conditions, to group things better
+      tweaks: reshuffle some conditions, putting the least likely one first
+      tweaks: reshuffle some lines to get standard order (first up, then down)
+      tweaks: reshuffle some lines, to put things in order of option name
+      tweaks: snip trailing whitespace that ended with a non-breaking space
+      tweaks: stop setting and requiring the Meta flag for special keycodes
+      tweaks: swap and reword two bullet points in the rnano manpage
+      tweaks: there is no reason to block SIGWINCHes while waiting for speller
+      undo: move another piece of checking to the two places that need it
+      undo: move some special checking code to the one place that needs it
+      wrapping: make the --fill option override 'set fill' again
+
+Brand Huntsman (5):
+      bindings: hard-bind the zap function to M-Del (Alt+Delete)
+      display: make all dying messages end in a newline
+      linter: throttle "first"/"last" message on repeated key presses
+      new feature: a bindable 'zap', to erase text without changing cutbuffer
+      options: add --zap, that makes <Bsp> and <Del> erase a marked region
+
+David Lawrence Ramsey (16):
+      display: do spotlighting as part of drawing the screen
+      docs: update rnano manpage, as -R/--restricted now reads nanorc
+      input: don't detect <Ctrl+Shift+Delete> on Linux console in tiny version
+      input: properly consume a modified Delete key also in the tiny version
+      input: properly recognize Alt+Delete when using -K/--rebindkeypad
+      input: recognize some escape sequences for <Shift+Delete>
+      speller: restore the mark coordinates slightly later
+      syntax: nanohelp: properly color the keystroke "Sh-^Del"
+      tweaks: don't define controldelete or controlshiftdelete in tiny version
+      tweaks: join two lines, and add a clarifying comment
+      tweaks: move the justifying of a single paragraph into its own function
+      tweaks: normalize the indentation of the shuffled code
+      tweaks: reshuffle some code to avoid several checks for having justified
+      tweaks: simplify by using a 'do/while' loop instead of 'while (TRUE)'
+      weeding: remove the 'active' parameter from spotlight()
+      wrapping: make relative fill values work again also for screen resizes
+
+
+Changes between v3.0 and v3.1:
+------------------------------
+
+Benno Schulenberg (13):
+      bindings: bind ASCII DEL during startup instead of repeatedly at runtime
+      bindings: make ^H rebindable also on NetBSD, FreeBSD and macOS
+      bindings: when Ctrl+Shift+Delete has no keycode, don't use KEY_BSP
+      bump version numbers and add a news item for the 3.1 release
+      input: keep the cursor in edit window after message, also on NetBSD
+      input: recognize the sequences for Ctrl+Shift+Delete on xterm and urxvt
+      main: allow toggling all editor features when in view mode
+      suspension: don't try to show the cursor position when going to sleep
+      syntax: sh: let the header regex match also busybox shell scripts
+      tweaks: condense a bit of code
+      tweaks: remove a superfluous comment and a redundant assignment
+      tweaks: rename a variable to be special and distinct
+      tweaks: sharpen an optimization, to allow DEL to be a shortcut
+
+Liu Hao (1):
+      search: disallow switching to the Replace prompt when in view mode
+
+
+Changes between v2.9.8 and v3.0:
+--------------------------------
+
+Benno Schulenberg (113):
+      bindings: bind M-Q to 'findprevious' by default, and M-W to 'findnext'
+      bindings: hard-bind <Ctrl+Shift+Delete> to 'cutwordleft'
+      bindings: make ^Q and M-Q available also in the help viewer
+      bindings: move the noconvert toggle from the main to the insert menu
+      bindings: reassign the M-| keystroke to 'cutwordleft' by default
+      bindings: remove backup and new-buffer toggles (M-B, M-F) from main menu
+      bindings: remove the More-Space toggle entirely
+      bindings: remove the 'searchagain' function entirely
+      bindings: rename two bindable functions: copytext to copy, uncut to paste
+      bindings: unassign the M-? keystroke, to free it up for future use
+      build: add the release script to the repository
+      build: fix compilation again when configured with --enable-tiny
+      build: fix compilation when configured with --enable-tiny
+      build: verify that 'msgfmt' is available when building from git
+      bump version numbers and add a news item for the 3.0 release
+      chars: make the UTF-8 case ever so slightly faster by eliding an 'if'
+      chars: speed up the counting of string length for the plain ASCII case
+      chars: speed up the parsing of a character for the plain ASCII case
+      completion: when the cursor is not after a word fragment, say so
+      cut: concentrate the logic for clearing the cutbuffer mostly in one place
+      cutting: when deleting whole words, don't join lines unexpectedly
+      debug: add some code to time the performance of get_totsize()
+      docs: improve a comment about rebinding <Backspace>
+      docs: mention that also Ctrl increases the stride when selecting text
+      docs: mention that "normal" can be used to give things the default color
+      docs: mention that the 'formatter' command has been superseded
+      docs: reshuffle a bindable function to a slightly better position
+      docs: say that 'cutwordright' is now bound to <Ctrl+Delete> by default
+      docs: slightly reword the description of four bindable functions
+      docs: the 'noconvert' bindable function was renamed to 'flipconvert'
+      dropping a feature: remove the ability to use the 'formatter' command
+      easter: show the crawl only when there is room enough for the lines
+      files: add the file format on the status bar when switching buffers
+      filtering: wait for the data-sending process to terminate too
+      gnulib: update to its current upstream state
+      help: for ^R^X, mention that the buffer can be piped to the command
+      help: move "Search Again" away from "Find Next" and "Find Previous"
+      input: consume the whole escape sequence for modified PgUp and PgDn keys
+      input: fully consume modified PgUp and PgDn keys also in the tiny version
+      input: ignore any <Escape>s before a valid command keystroke
+      input: stop <Alt+Insert> from entering "3~" into the buffer
+      input: stop a modified Delete key from entering stuff into the buffer
+      mouse: put the row/column arguments in the proper order  [coverity scan]
+      prompt: concentrate manipulations of 'statusbar_x' into a single file
+      prompt: remove redundant redrawings of the prompt bar
+      rcfile: allow to rebind the Cancel function in the yesno menu
+      rcfile, docs: no longer recognize nor mention 'set backwards'
+      rcfile: do not accept rebinding F0 nor function keys above F16
+      rcfile: ensure that in the yesno menu Cancel is bound to some keystroke
+      rcfile: explicitly check for disallowed keywords in included files
+      rcfile: reject things like "M-Del" and "^{" as invalid key names
+      rcfile: when a vital function is not mapped, mention in which menu
+      search: include 'findprevious' and 'findnext' in the tiny version
+      signals: don't call a print routine in a signal handler
+      speller: do not replace the text when the temporary file did not change
+      startup: don't overwrite rcfile error messages on a Linux console
+      startup: show the correct number of lines when opening multiple files
+      syntax: awk: recognize any {g,m,n,}awk script also by its shebang line
+      syntax: default: colorize also two-digit and capitalized nano versions
+      syntaxes: remove all traces of the 'formatter' command
+      syntax: nanorc: recognize 'yesno' as a valid menu to bind/unbind keys in
+      syntax: nanorc: show ^@ as validly rebindable, but not any ^digit
+      syntax: python: avoid coloring the three special values inside strings
+      text: add auto-whitespace to the file size after creating the undo item
+      tweaks: adjust indentation after the previous change
+      tweaks: adjust one more translator hint, for removed toggles
+      tweaks: adjust some translator hints for past changes, and add two more
+      tweaks: adjust two comments, to be more accurate and general
+      tweaks: avoid dereferencing a pointer when it is NULL  [coverity scan]
+      tweaks: close a temp file only when descriptor is valid  [coverity scan]
+      tweaks: correct a comment, rewrap a line, and drop some debugging stuff
+      tweaks: delete some old debugging code that no longer seems useful
+      tweaks: don't bother having debug code that deallocates all memory
+      tweaks: don't call va_start() without calling va_end()  [coverity scan]
+      tweaks: drop a condition that has been made redundant two commits ago
+      tweaks: drop some old debugging code
+      tweaks: elide a bunch of unneeded constant strings
+      tweaks: elide a function that is used just once
+      tweaks: elide another function that is used just once
+      tweaks: elide an unneeded/duplicate variable
+      tweaks: elide a one-line function -- no, a half-line function
+      tweaks: elide a subfunction that is used just once
+      tweaks: exclude a global flagging variable when it is not needed
+      tweaks: exclude the file-prepending code from the tiny version
+      tweaks: fix a pasting error from a month ago
+      tweaks: implement the name-to-menu function in another manner
+      tweaks: improve a couple of comments in the sample nanorc
+      tweaks: improve a translator hint and some other comments
+      tweaks: move a call to where it will be executed  [coverity scan]
+      tweaks: normalize the indentation after the previous change
+      tweaks: properly escape "\" in a man page and "@" in a texi document
+      tweaks: recognize escape sequences of modified Ins/Del more precisely
+      tweaks: reduce the counting of characters to just the needed function
+      tweaks: remove a redundant "struct" word, and replace it in comments
+      tweaks: remove a superfluous condition and a redundant refresh
+      tweaks: remove redundant braces and conditions after the previous change
+      tweaks: remove some braces that are now superfluous
+      tweaks: remove some ineffectual parts from header-line regexes
+      tweaks: remove the superfluous calls that reset the mbtowc() state
+      tweaks: remove two needless words, and split up a changed text further
+      tweaks: remove two superfluous assignments
+      tweaks: rename a constant, to match what it actually means
+      tweaks: rename a function and place its call better
+      tweaks: rename a function to better match its counterpart
+      tweaks: rename a function, to better state what it does
+      tweaks: rename a variable and a function, for more clarity
+      tweaks: rename a variable, to better match its task
+      tweaks: reshuffle some lines, in order to elide one
+      tweaks: reshuffle the order of the bindings, for help-line esthetics
+      tweaks: show "Space" and "Bsp" in the help text of the browser
+      tweaks: slightly improve error message when vital function is unmapped
+      tweaks: use a shorter message, because when the screen is small...
+      undo: differentiate between general filtering and spell checking
+
+Brand Huntsman (4):
+      input: give feedback for all unbound keys also in the help viewer
+      statusbar: elevate three messages to an ALERT, to make them more visible
+      tweaks: correct four spaces of indentation to a tab, in two places
+      tweaks: remove the 'bright' field from the colortype struct
+
+David Lawrence Ramsey (13):
+      bindings: make "n" work again in file browser and help viewer
+      bindings: make ^Q start a backward search also in the file browser
+      docs: mention that "Ins" and "Del" are valid rebindable keys
+      justify: verify being in a paragraph before trying to find its beginning
+      speller: hook up a full alternative spellcheck to the undo system
+      speller: hook up a marked-text alternative spellcheck to the undo system
+      speller: make replace_buffer() use the cutting functions directly
+      speller: make replace_marked_buffer() use the cutting functions directly
+      undo: actually enable undoing/redoing an alternative spellcheck
+      undo: always initialize the 'newsize' element in the undo struct
+      undo: position the cursor properly when undoing/redoing magicline cuts
+      undo: restore the cursor position when a cut and paste are paired
+      undo: store the correct cursor position after a paired cut+insert
+
+Devin Hussey (2):
+      files: speed up reading by using getc_unlocked() instead of getc()
+      syntax: sh: recognize more file extensions and header lines
+
+Marco Diego Aurélio Mesquita (1):
+      input: erase the next word when Ctrl is held while pressing Delete
+
+Mark-Weston (2):
+      build: fix compilation when CC=tcc
+      syntax: lua: do not color strings inside comments, and add a linter
+
+
+Changes between v2.9.7 and v2.9.8:
+----------------------------------
+
+Benno Schulenberg (64):
+      build: fix compilation failure when configured with --enable-tiny
+      build: fix compilation when configured with --disable-justify
+      build: fix compilation when configured with --disable-multibuffer
+      build: fix compilation with --enable-{tiny,help,multibuffer}
+      bump version numbers and add a news item for the 2.9.8 release
+      copyright: update the years for significantly changed files
+      credits: sort the names roughly according to amount of influence
+      docs: add a missing double quote in the default brackets string
+      docs: describe what constitutes a paragraph
+      docs: improve description of 'speller' and related bindable functions
+      docs: improve the description of --nonewlines, and properly sort it
+      docs: improve the description of the --autoindent option
+      docs: make quotes around regexes bold, as they are part of the command
+      docs: mark the filtering of text through an external command as done
+      docs: register Marco as the author of the filtering feature
+      docs: remove mention of the quotestr for when regex support is lacking
+      docs: remove quotes around the name of a syntax -- they are not needed
+      docs: thank Kamil for his bug fixes, and update an email address
+      docs, usage: make it clear that the argument of --quotestr is a regex
+      files: give feedback during writeout also when prepending or appending
+      filtering: pair the cut and the insert, so they can be undone together
+      gnulib: update to its current upstream state
+      justification: find the beginning of a paragraph in a better way
+      justification: limit the amount of recursion to prevent a stack overflow
+      justification: recognize indented paragraphs also without --autoindent
+      justification: when leading whitespace exceeds fill width, wrap anyway
+      linter: don't try to access absent stat info, as that gives a crash
+      linter: make sure that the margin is updated before displaying a buffer
+      linter: make sure the shortcuts bar will redrawn when exiting early
+      main: add "/" to the quoting regex, to allow justifying //-comments
+      main: interpret only a double slash (//) as quoting, not a single one
+      rcfile: don't crash when a bind to a string lacks the closing quote
+      startup: provide a hint for people unfamiliar with the ^char convention
+      syntaxes: condense and/or correct some extension regexes
+      syntax: makefile: color all keywords that GNU make recognizes
+      tweaks: adjust a translator hint
+      tweaks: avoid an unused-variable warning with --enable-tiny
+      tweaks: avoid a warning with --enable-{tiny,help,multibuffer}
+      tweaks: condense a comment, and elide an unneeded 'if'
+      tweaks: condense some repetitious comments, and check before assigning
+      tweaks: condense two statements into one, and elide a 'break'
+      tweaks: elide a function that is called just once
+      tweaks: elide another function that is called just once
+      tweaks: exclude an unneeded 'if' from the single-buffer version
+      tweaks: frob a couple of comments
+      tweaks: frob some comments, and rename two parameters to make sense
+      tweaks: give some continuation lines a more obvious indentation
+      tweaks: improve a couple of comments, and reshuffle a group of lines
+      tweaks: make better use of an existing variable
+      tweaks: make better use of an intermediate variable
+      tweaks: reduce the abundance of the word 'toggle' in the Info manual
+      tweaks: remove a superfluous assignment -- the lead length never changes
+      tweaks: remove two superfluous checks, after making one of them so
+      tweaks: rename a function, for more aptness and extra contrast
+      tweaks: rename a variable, for contrast, and improve two comments
+      tweaks: rename a variable, to give it some meaning
+      tweaks: rename two variables, to better fit their tasks
+      tweaks: reshuffle a condition, and adjust a comment and some indentation
+      tweaks: reshuffle a couple of assignments
+      tweaks: simplify the determining of the prefix for justified lines
+      tweaks: stop decreasing both the iterator and the limit of a loop
+      tweaks: use a more meaningful variable name, and avoid a distant 'else'
+      wrapping: use "smart" autoindenting only when hard-wrapping is enabled
+      wrapping: when autoindenting, use indentation of next line as example
+
+Brand Huntsman (1):
+      tweaks: avoid two unused variable warnings when NLS is disabled
+
+Cristian Caloghera (1):
+      syntax: makefile: recognize also an all-lowercase makefile name
+
+David Lawrence Ramsey (3):
+      bindings: add the "flippipe" bindable function
+      tweaks: avoid an unused variable warning with --enable-tiny
+      tweaks: fix some grammar plus a typo in the comments
+
+Marco Diego Aurélio Mesquita (2):
+      linter: check all open buffers, instead of just the next one
+      new feature: allow piping (selected) text to an external command
+
+
+Changes between v2.9.6 and v2.9.7:
+----------------------------------
+
+Benno Schulenberg (21):
+      bindings: add the 'linenumbers' bindable function
+      bindings: rename constupdate to constantshow, cuttoend to cutfromcursor
+      bump version numbers and add a news item for the 2.9.7 release
+      docs: add notes about deprecated options and function names
+      docs: break down some old improvements further per version
+      docs: note a small difference with Pico in the default hard-wrapping
+      docs: say thanks to three recent translators, and re-sort two others
+      docs: slightly improve the description of the file browser in the manual
+      main: clear a spurious error number, to avoid irrelevant messages later
+      prompt: when asking for Yes/No/All, recognize also UTF-8 letters
+      scrolling: only do a scroll when the edit window has more than one row
+      signals: don't trap segfault/abort when envvar NANO_NOCATCH is defined
+      signals: exclude the crash handler from the tiny version
+      startup: suggest using ^D to finish reading from standard input
+      tweaks: improve a couple of comments
+      tweaks: normalize indentation and whitespace after previous changes
+      tweaks: put check for -h and -l options in their alphabetical positions
+      tweaks: put Yes/No/All in a consistent order (for the translators)
+      tweaks: rename two variables, to be more descriptive
+      tweaks: sort an option better, and reschedule a removal
+      tweaks: use symbolic names instead of puzzling TRUE and FALSE
+
+Devin Hussey (1):
+      signals: upon a crash, save changed buffers and reset terminal state
+
+Mark-Weston (1):
+      new feature: an option to make the 'nextword' function stop at word ends
+
+
+Changes between v2.9.5 and v2.9.6:
+----------------------------------
+
+Benno Schulenberg (39):
+      build: do not prefix an alternative rcfilename with a dot
+      build: fix compilation when configured with --disable-help
+      bump version numbers and add a news item for the 2.9.6 release
+      command-execution: do not crash when opening the pipe would fail
+      completion: correctly do a signed comparison, to avoid a segfault
+      files: prevent a hang when a call to sigaction() would fail
+      formatting, linting: redetermine the argument list for every run
+      gnulib: update to its current upstream state
+      memory: use a reallocation to reduce the amount of leakage
+      prompt: recognize Yes/No/All in English when the locale gives no match
+      rcfile: skip color commands where some color name is invalid
+      scrolling: don't redraw entire edit window when cursor goes offscreen
+      search: always go forward by default, also when coming from Goto-Line
+      search: use a better value to mean "nothing was typed"
+      speller: don't add an extra newline when saving the text to a tempfile
+      syntax: po: highlight also other escaped characters, not just \n
+      syntax: sh: colorize options only when they are preceded by whitespace
+      tweaks: adjust the translator hint about Yes/No/All
+      tweaks: correct or improve a couple of comments
+      tweaks: elide a function that is called just once
+      tweaks: fix a typo, remove a blank line, and improve some comments
+      tweaks: frob a couple of comments
+      tweaks: group some more of the empty functions together
+      tweaks: improve some comments, and exit with nonzero status upon error
+      tweaks: improve the ordering of a couple of functions
+      tweaks: invert two conditions and reshuffle, to reduce duplication
+      tweaks: move a function to its proper location
+      tweaks: move a function to its proper location
+      tweaks: rearrange a few if statements more symmetrically
+      tweaks: remove the group handling for undoing/redoing (un)indents
+      tweaks: rename a function, to be more distinct from its caller
+      tweaks: rename a function, to be more fitting and descriptive
+      tweaks: rename a variable, for clarity
+      tweaks: rename a variable, to be a bit more fitting
+      tweaks: rename a variable, to be more clear and to match another
+      tweaks: rename a variable, to match another and to be more visible
+      tweaks: reshuffle two declarations
+      tweaks: set the correct flags just once for each spell-fixing session
+      tweaks: use meaningful names instead of puzzling values
+
+Liu Hao (1):
+      replacing: always clear the backwards flag for ^\, just like for ^W
+
+
 Changes between v2.9.4 and v2.9.5:
 ----------------------------------
 

ChangeLog.1999-2006

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

ChangeLog.2007-2015

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

IMPROVEMENTS

@@ -1,7 +1,16 @@
 Improvements in GNU nano
 ========================
 
+Since 3.0:
+  - Addition of --zap to make <Del> and <Bsp> obliterate marked text.
+  - <Ctrl+Delete> wipes next word and <Shift+Ctrl+Delete> preceding word.
+  - An external spell check can be undone.
+
 Since 2.9.0:
+  - The ability to filter text through an external command.
+  - Better detection of paragraphs, allowing a less indented beginning.
+  - Option 'set afterends' for making Ctrl+Right stop at word ends.
+  - A crash handler that saves changed buffers in case of a crash.
   - Addition of the color name "normal", meaning the default color.
   - A key can be bound to a string -- any mix of text and commands.
   - Error messages are shown by default in bright white on red.
@@ -34,24 +43,25 @@ Since 2.6.0:
   - The option 'wordchars' for specifying extra word characters.
   - Hi-bit control characters are shown in a more readable manner.
   - The ability to use negative numbers at the Go To Line prompt.
-
-Noteworthy changes since 2.2
-----------------------------
   - The ability to comment/uncomment lines with a single keystroke (M-3).
   - The ability to refresh the file list in the browser (^L).
   - The ability to abort re-searches (^C after an M-W).
   - Better feedback at startup when opening large or multiple files.
+
+Since 2.5.0:
   - The option 'justifytrim' for snipping whitespace from justified lines.
   - The ability to discard a buffer (^O ^Q) when --tempfile is used.
-  - Replacing things in a marked region now takes place in situ, in context,
-    instead of changing the view to only the marked text.
-  - On some terminals Ctrl+Left / Ctrl+Right now work for PrevWord/NextWord.
+  - On most terminals Ctrl+Left / Ctrl+Right now work for PrevWord/NextWord.
   - When in the middle of a word, PrevWord now jumps to the start of this
     word (like Pico does) instead of to the start of the preceding word.
+
+Since 2.4.0:
+  - Replacing things in a marked region now takes place in situ, in context,
+    instead of changing the view to only the marked text.
   - Invalid byte sequences are properly displayed and not mistakenly found.
   - Resizing the window does not exit from help viewer nor file browser.
-  - Improved arrangement of the shortcuts in the two help lines.
-  - Several small bug fixes in the syntax highlighting.
+
+Since 2.3.0:
   - System syntaxes can be improved upon with the 'extendsyntax' command.
   - The ability to delete whole words with 'cutwordleft' and 'cutwordright'.
   - The ability to save a file without prompting for its name ('savefile').

NEWS

@@ -1,3 +1,82 @@
+2018.11.11 - GNU nano 3.2 "Het kromme hout" changes the default binding
+             for the linter to M-B so that the spell checker (^T) can
+             always be used, and changes (when linting) the text in the
+             title bar and the color of the status bar to make linting
+             mode more obvious.  It also adds a bindable 'zap' function
+             for deleting a line or marked region without changing the
+             cutbuffer, adds --zap to bind the <Del> and <Backspace>
+             keys to the zap function when something is marked, and
+             hard-binds <Alt+Del> to 'zap'.  Furthermore, it shows the
+             cursor also in the help viewer (when --showcursor is used),
+             renames the bindable functions 'prevhistory' to 'older' and
+             'nexthistory' to 'newer' (update your nanorcs when needed),
+             reads the nanorc files also in restricted mode to allow
+             customization by the user (if this should not be allowed,
+             use --ignorercfiles in addition to --restricted), allows
+             in view mode to open also other files (if this should not
+             be allowed, use --restricted in addition to --view), makes
+             resizes respect a relative --fill again, no longer binds
+             F13...F15 by default, properly re-highlights a misspelled
+             word after invoking help in the internal spell checker,
+             and does not skip Unicode characters in string binds.
+
+2018.09.18 - GNU nano 3.1 "Je faisais des bonds comme ça!" fixes a
+             misbinding of ^H on some terminals and some systems,
+             does not leave stray stuff after the prompt upon exit
+             when having suspended nano while using --constantshow,
+             and does not allow to toggle to Replace in view mode.
+
+2018.09.09 - GNU nano 3.0 "Water Flowing Underground" speeds up the
+             reading of a file by seventy percent, roughly doubles the
+             speed of handling ASCII text, changes the way words at line
+             boundaries are deleted, makes <Ctrl+Delete> wipe the next
+             word and <Ctrl+Shift+Delete> the preceding word, binds M-Q
+             to 'findprevious' by default (the Tabs-to-Spaces toggle is
+             placed on M-O, and the More-Space toggle is fully removed),
+             makes an external spell check undoable, shows the correct
+             number of lines on the status bar when opening multiple
+             files, removes the 'formatter' command, removes the
+             'searchagain' bindable function (M-W is now bound to
+             'findnext' by default), moves the No-Convert toggle to the
+             Insert menu, removes the Backup and New-Buffer toggles from
+             the main menu (they remain in the Write-Out and Insert
+             menus, respectively), is more precise in what it accepts as
+             a rebindable key name, ignores any presses of <Esc> before
+             a valid command keystroke, recognizes some more escape
+             sequences for modified editing-pad keys, does not hide
+             rcfile error messages on a Linux console, renames the
+             bindable functions 'copytext' to 'copy' and 'uncut' to
+             'paste', and avoids a possible hang during a Full-Justify.
+
+
+2018.06.02 - GNU nano 2.9.8 "Espresso" brings the ability to filter the
+             buffer (or the marked region) through an external command
+             (^R^X and prefix the command with the pipe symbol, "|"), is
+             better at detecting and maintaining paragraphs, is able to
+             justify //-style comments, fixes a crash when the binding
+             of a key to a string lacks a closing quote, gives feedback
+             about the number of lines written also when prepending or
+             appending, and fixes a couple of bugs with the linter.
+
+2018.05.15 - GNU nano 2.9.7 "Hvide Sande" adds the option '--afterends'
+             for making Ctrl+Right (the nextword function) stop at word
+             ends instead of beginnings, accepts multibyte letters for
+             the Yes/No/All answers, does emergency saves of changed
+             buffers in the unlikely event that nano crashes, adds the
+             until-now missing bindable function 'linenumbers', and
+             renames the toggles 'constupdate' to 'constantshow' and
+             'cuttoend' to 'cutfromcursor', for consistency with the
+             corresponding options -- adjust your nanorc files soon.
+
+2018.04.27 - GNU nano 2.9.6 "Gomance" fixes a crash in word completion,
+             makes --enable-altrcname work again, improves the fluidity
+             of scrolling when using the touchpad, tweaks the syntaxes
+             for shell scripts and PO files, makes a replacing session
+             go always forward by default, no longer inserts a newline
+             after an external spell check of a selected region, always
+             accepts the English Y and N (and A) at a yes-no prompt in
+             any locale, and solves a few hypothetical bugs.
+
 2018.03.29 - GNU nano 2.9.5 "Kiša pada" changes the way the Scroll-Up
              and Scroll-Down commands work (M-- and M-+): instead of
              keeping the cursor in the same screen position they now

README

@@ -18,7 +18,7 @@ Overview
     providing other extra functionality.
 
     The nano editor is an official GNU package.  For more information on
-    GNU and the Free Software Foundation, please see http://www.gnu.org/.
+    GNU and the Free Software Foundation, please see https://www.gnu.org/.
 
 How to compile and install nano
 

THANKS

@@ -4,7 +4,7 @@ If we missed you here, let us know!
 
 Translations:
 ============
-Sharuzzaman Ahmat Raslan <sharuzzaman@excite.com>     Malay
+Pedro Albuquerque <palbuquerque73@gmail.com>          Portuguese
 Josef Andersson <josef.andersson@fripost.org>         Swedish
 Laurentiu Buzdugan <buzdugan@voyager.net>             Romanian
 Mario Blättermann <mario.blaettermann@gmail.com>      German
@@ -44,16 +44,18 @@ João Victor Duarte Martins <jvdm@sdf.lonestar.org>    Brazilian Portuguese
 Pavel Maryanov <acid@jack.kiev.ua>                    Russian
 Daniele Medri <madrid@linux.it>                       Italian
 Gergely Nagy <algernon@debian.org>                    Hungarian
+Claudio Neves <cneves@nextis.com>                     Brazilian Portuguese
 Kalle Olavi Niemitalo <kon@iki.fi>                    Finnish
 Мирослав Николић <miroslavnikolic@rocketmail.com>     Serbian
-Claudio Neves <cneves@nextis.com>                     Brazilian Portuguese
 Lauri Nurmi <lanurmi@iki.fi>                          Finnish
 Daniel Nylander <po@danielnylander.se>                Swedish
 Mikel Olasagasti <hey_neken@mundurat.net>             Basque
+Yi-Jyun Pan <pan93412@gmail.com>                      Chinese (traditional)
 Michael Piefel <piefel@informatik.hu-berlin.de>       German
 Sergey Poznyakoff <gray@gnu.org>                      Polish
 Božidar Putanec <bozidarp@yahoo.com>                  Croatian
 Trần Ngọc Quân <vnwildman@gmail.com>                  Vietnamese
+Sharuzzaman Ahmat Raslan <sharuzzaman@excite.com>     Malay
 Sergey A. Ribalchenko <fisher@obu.ck.ua>              Ukrainian and Russian
 Michel Robitaille <robitail@IRO.UMontreal.CA>         French
 Christian Rose <menthos@menthos.com>                  Swedish
@@ -76,6 +78,7 @@ Miquel Vidal <miquel@sindominio.net>                  Catalan
 Phan Vinh Thinh <teppi82@gmail.com>                   Vietnamese
 Pauli Virtanen <pauli.virtanen@saunalahti.fi>         Finnish
 Aron Xu <happyaron.xu@gmail.com>                      Chinese (simplified)
+Boyuan Yang <073plan@gmail.com>                       Chinese (simplified)
 Peio Ziarsolo <peio@sindominio.net>                   Basque
 Anton Zinoviev <zinoviev@debian.org>                  Bulgarian
 
@@ -84,6 +87,7 @@ Other stuff:
 ===========
 Ben Armstrong <synrg@sanctuary.nslug.ns.ca>    Negative -r value idea, code
 Thomas Dickey <dickey@herndon4.his.com>        Curses help and advice
+Kamil Dudka <kdudka@redhat.com>                Several small bug fixes
 Sven Guckes <guckes@math.fu-berlin.de>         Advice and advocacy
 Thijs Kinkhorst <thijs@kinkhorst.com>          rnano.1 manpage
 Jim Knoble <jmknoble@pobox.com>                Pico compat for browser

TODO

@@ -8,9 +8,6 @@ Somewhat urgent:
 - Allow color syntaxes to apply to more than just color, so that we can
   e.g. specify a different alternate spell checker depending on which
   file type we have open.
-- Allow piping marked text to an external command and replacing it with
-  the command's output -- that is: generalize the spell-check flow.
-  See also https://savannah.gnu.org/bugs/?28993.
 
 Vague musings:
 - Add support for right-to-left text (RTL), through FriBidi?
@@ -21,8 +18,10 @@ Vague musings:
   brackets inside comments?
 
 For version 2.9:
-- Make undo/redo work also for indenting. [DONE]
+- 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]

autogen.sh

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

configure.ac

@@ -14,9 +14,9 @@
 # See the GNU General Public License for more details.
 #
 # You should have received a copy of the GNU General Public License
-# along with this program.  If not, see http://www.gnu.org/licenses/.
+# along with this program.  If not, see https://www.gnu.org/licenses/.
 
-AC_INIT([GNU nano], [2.9.5], [nano-devel@gnu.org], [nano])
+AC_INIT([GNU nano], [3.2], [nano-devel@gnu.org], [nano])
 AC_CONFIG_SRCDIR([src/nano.c])
 AC_CANONICAL_HOST
 AM_INIT_AUTOMAKE([1.14])
@@ -762,6 +762,14 @@ else
 fi
 AM_CONDITIONAL(BUILDING_FROM_GIT, test x$from_git = xyes)
 
+if test x$from_git = xyes; then
+	if test "$ac_cv_path_MSGFMT" = ":"; then
+		AC_MSG_ERROR([
+*** The msgfmt program is missing. ***
+*** The gettext package needs to be installed when building from git. ***])
+	fi
+fi
+
 AC_CONFIG_FILES([
 Makefile
 doc/Makefile

doc/faq.html

@@ -83,7 +83,7 @@
   <p><b>In the beginning...</b></p>
   <p>For years Pine was THE program used to read email on a Unix system. The Pico text editor is the portion of the program one would use to compose his or her mail messages. Many beginners to Unix flocked to Pico and Pine because of their well organized, easy to use interfaces. With the proliferation of GNU/Linux in the mid to late 90's, many University students became intimately familiar with the strengths (and weaknesses) of Pine and Pico.</p>
   <p><b>Then came Debian...</b></p>
-  <p>The <a href="http://www.debian.org/">Debian GNU/Linux</a> distribution, known for its strict standards in distributing truly &quot;free&quot; software (i.e. software with no restrictions on redistribution), would not include a binary package for Pine or Pico. Many people had a serious dilemma: they loved these programs, but the versions available at the time were not truly free software in the <a href="http://www.gnu.org/philosophy/free-sw.html">GNU</a> sense of the word.</p>
+  <p>The <a href="https://www.debian.org/">Debian GNU/Linux</a> distribution, known for its strict standards in distributing truly &quot;free&quot; software (i.e. software with no restrictions on redistribution), would not include a binary package for Pine or Pico. Many people had a serious dilemma: they loved these programs, but the versions available at the time were not truly free software in the <a href="https://www.gnu.org/philosophy/free-sw.html">GNU</a> sense of the word.</p>
   <p><b>The event...</b></p>
   <p>It was in late 1999 when Chris Allegretta (our hero) was yet again complaining to himself about the less-than-perfect license Pico was distributed under, the 1000 makefiles that came with it and how just a few small improvements could make it the Best Editor in the World (TM). Having been a convert from Slackware to Debian, he missed having a simple binary package that included Pine and Pico, and had grown tired of downloading them himself.</p>
   <p>Finally something snapped inside and Chris coded and hacked like a madman for many hours straight one weekend to make a (barely usable) Pico clone, at the time called TIP (Tip Isn't Pico). The program could not be invoked without a filename, could not save files, had no help text display, spell checker, and so forth. But over time it improved, and with the help of a few great coders it matured to the (hopefully) stable state it is in today.</p>
@@ -91,7 +91,7 @@
 <h3><a name="1.3"></a>1.3. Why the name change from TIP?</h3>
 <blockquote><p>On January 10, 2000, TIP was officially renamed to nano because of a namespace conflict with another program called 'tip'. The original 'tip' program &quot;establishes a full duplex terminal connection to a remote host&quot;, and was included with many older Unix systems (and newer ones like Solaris). The conflict was not noticed at first because there is no 'tip' utility included with most GNU/Linux distributions (where nano was developed).</p></blockquote>
 <h3><a name="1.4"></a>1.4. What is the current version of nano?</h3>
-<blockquote><p>The current version of nano <i>should</i> be <b>2.9.5</b>.  Of course, you should always check the <a href="https://nano-editor.org/">nano homepage</a> to see what the latest and greatest version is.</p></blockquote>
+<blockquote><p>The current version of nano <i>should</i> be <b>3.2</b>.  Of course, you should always check the <a href="https://nano-editor.org/">nano homepage</a> to see what the latest and greatest version is.</p></blockquote>
 <h3><a name="1.5"></a>1.5. I want to read the man page without having to download the program!</h3>
 <blockquote><p>Jeez, demanding, aren't we? Okay, look <a href="https://nano-editor.org/dist/latest/nano.1.html">here</a>.</p></blockquote>
 <hr width="100%">
@@ -114,9 +114,9 @@
 <h3><a name="2.3"></a>2.3. Deb packages (Debian and derivatives):</h3>
 <blockquote><p>Debian users can check out the current nano packages for:</p>
   <ul>
-    <li><a href="http://packages.debian.org/stable/editors/nano">stable</a></li>
-    <li><a href="http://packages.debian.org/testing/editors/nano">testing</a></li>
-    <li><a href="http://packages.debian.org/unstable/editors/nano">unstable</a></li>
+    <li><a href="https://packages.debian.org/stable/editors/nano">stable</a></li>
+    <li><a href="https://packages.debian.org/testing/editors/nano">testing</a></li>
+    <li><a href="https://packages.debian.org/unstable/editors/nano">unstable</a></li>
   </ul>
   <p>You can also have a look at the <a href="ftp://ftp.debian.org/debian/pool/main/n/nano/">Package Pool</a> to see all the available binary and source packages.</p>
 </blockquote>
@@ -232,9 +232,9 @@
 
 <h1><a name="5"></a>5. Internationalization</h1>
 <h3><a name="5.1"></a>5.1. There's no translation for my language!</h3>
-<blockquote><p>In June 2001, GNU nano entered the <a href="http://translationproject.org/html/welcome.html">Translation Project</a> and since then, translations should be managed from there.</p>
-  <p>If there isn't a translation for your language, you could ask <a href="http://translationproject.org/team/">your language team</a> to translate nano, or better still, join that team and do it yourself. Joining a team is easy. You just need to ask the team leader to add you, and then send a <a href="http://translationproject.org/disclaim.txt">translation disclaimer to the FSF</a> (this is necessary as nano is an official GNU package, but it does <b>not</b> mean that you transfer the rights of your work to the FSF, it's just so the FSF can legally manage them).</p>
-  <p>In any case, translating nano is easy. Just grab the latest <b>nano.pot</b> file listed on <a href="http://translationproject.org/domain/nano.html">nano's page</a> at the TP, and translate each <b>msgid</b> line into your native language on the <b>msgstr</b> line. When you're done, you should send it to the TP's central PO-file repository.</p></blockquote>
+<blockquote><p>In June 2001, GNU nano entered the <a href="https://translationproject.org/html/welcome.html">Translation Project</a> and since then, translations should be managed from there.</p>
+  <p>If there isn't a translation for your language, you could ask <a href="https://translationproject.org/team/">your language team</a> to translate nano, or better still, join that team and do it yourself. Joining a team is easy. You just need to ask the team leader to add you, and then send a <a href="https://translationproject.org/disclaim.txt">translation disclaimer to the FSF</a> (this is necessary as nano is an official GNU package, but it does <b>not</b> mean that you transfer the rights of your work to the FSF, it's just so the FSF can legally manage them).</p>
+  <p>In any case, translating nano is easy. Just grab the latest <b>nano.pot</b> file listed on <a href="https://translationproject.org/domain/nano.html">nano's page</a> at the TP, and translate each <b>msgid</b> line into your native language on the <b>msgstr</b> line. When you're done, you should send it to the TP's central PO-file repository.</p></blockquote>
 <h3><a name="5.2"></a>5.2. I don't like the translation for &lt;x&gt; in my language. How can I fix it?</h3>
 <blockquote><p>The best way is to send an e-mail with your suggested corrections to the team's mailing list. The address is mentioned in the <code>Language-Team:</code> field in the relevant PO file. The team leader or the assigned translator can then make the changes reach the nano-devel list.</p></blockquote>
 <h3><a name="5.3"></a>5.3. What is the status of Unicode support?</h3>
@@ -248,7 +248,7 @@
 <blockquote><p>Again, check out the <a href="https://nano-editor.org/">nano homepage</a> for a good summary of reasons. It really is a matter of personal preference as to which editor you should use. If you're the type of person who likes using the original version of a program, then Pico is the editor for you. If you don't mind sacrificing mailer integration with Pine, and are looking for a few more features, as well as a 'better' license in terms of adding your own changes, nano is the way to go.</p>
 <p>Note that the last of these no longer applies to the new version of Pine, <a href="http://www.washington.edu/alpine/">Alpine</a>, which is under the Apache License, version 2.0.</p></blockquote>
 <h3><a name="6.3"></a>6.3. What is so bad about the older Pine license?</h3>
-<blockquote><p>The U of W license for older versions of Pine and Pico is not considered truly Free Software according to both the Free Software Foundation and the <a href="http://www.debian.org/social_contract#guidelines">Debian Free Software Guidelines</a>. The main problem regards the limitations on distributing derived works: according to UW, you can distribute their software, and you can modify it, but you can not do both, i.e. distribute modified binaries.</p></blockquote>
+<blockquote><p>The U of W license for older versions of Pine and Pico is not considered truly Free Software according to both the Free Software Foundation and the <a href="https://www.debian.org/social_contract#guidelines">Debian Free Software Guidelines</a>. The main problem regards the limitations on distributing derived works: according to UW, you can distribute their software, and you can modify it, but you can not do both, i.e. distribute modified binaries.</p></blockquote>
 <h3><a name="6.4"></a>6.4. Okay, well, what mail program should I use then?</h3>
 <blockquote><p>If you are looking to use a Free Software program similar to Pine, and Emacs is not your thing, you should definitely take a look at <a href="http://www.mutt.org/">mutt</a>. It is a full-screen, console based mail program that actually has a lot more flexibility than Pine, but has a keymap included in the distribution that allows you to use the same keystrokes as Pine would to send and receive mail. It's also under the GNU General Public License, version 2.0.</p>
 <p>Of course, due to the license change you can now use the <a href="http://www.washington.edu/alpine/">Alpine distribution</a> of PINE as it is now considered Free Software, but you would be sacrificing many of nano's features to do so.</p></blockquote>
@@ -256,10 +256,10 @@
 
 <h1><a name="7"></a>7. Miscellaneous</h1>
 <h3><a name="7.1"></a>7.1. Where can I ask questions or send suggestions?</h3>
-<blockquote><p>There are three mailing lists for nano hosted at <a href="http://savannah.gnu.org/">Savannah</a>: info-nano, help-nano and nano-devel. info-nano is a very low traffic list where new versions of nano are announced (surprise!). help-nano is for getting help with the editor without needing to hear all of the development issues surrounding it. nano-devel is a normally low, sometimes high traffic list for discussing the present and future development of nano. Here are links to where you can sign up for a given list:</p>
-  <p>info-nano - <a href="http://mail.gnu.org/mailman/listinfo/info-nano/">http://mail.gnu.org/mailman/listinfo/info-nano/</a><br>
-  help-nano - <a href="http://mail.gnu.org/mailman/listinfo/help-nano/">http://mail.gnu.org/mailman/listinfo/help-nano/</a><br>
-  nano-devel - <a href="http://mail.gnu.org/mailman/listinfo/nano-devel/">http://mail.gnu.org/mailman/listinfo/nano-devel/</a></p></blockquote>
+<blockquote><p>There are three mailing lists for nano hosted at <a href="https://savannah.gnu.org/">Savannah</a>: info-nano, help-nano and nano-devel. info-nano is a very low traffic list where new versions of nano are announced (surprise!). help-nano is for getting help with the editor without needing to hear all of the development issues surrounding it. nano-devel is a normally low, sometimes high traffic list for discussing the present and future development of nano. Here are links to where you can sign up for a given list:</p>
+  <p>info-nano - <a href="https://mail.gnu.org/mailman/listinfo/info-nano/">https://mail.gnu.org/mailman/listinfo/info-nano/</a><br>
+  help-nano - <a href="https://mail.gnu.org/mailman/listinfo/help-nano/">https://mail.gnu.org/mailman/listinfo/help-nano/</a><br>
+  nano-devel - <a href="https://mail.gnu.org/mailman/listinfo/nano-devel/">https://mail.gnu.org/mailman/listinfo/nano-devel/</a></p></blockquote>
 <h3><a name="7.2"></a>7.3. How do I submit a bug report or patch?</h3>
 <blockquote>
   <p>The best way to submit bugs is through the <a href="https://savannah.gnu.org/bugs/?group=nano">Savannah bug tracker</a>, as you can check whether the bug you are reporting has already been submitted, and it makes it easier for the maintainers to keep track of them.

doc/nano.1

@@ -7,16 +7,16 @@
 .\"   Foundation, version 3 or (at your option) any later version.  You
 .\"   should have received a copy of the GNU General Public License
 .\"   along with this program.  If not, see
-.\"   <http://www.gnu.org/licenses/>.
+.\"   <https://www.gnu.org/licenses/>.
 .\"
 .\" * The GNU Free Documentation License, as published by the Free
 .\"   Software Foundation, version 1.2 or (at your option) any later
 .\"   version, with no Invariant Sections, no Front-Cover Texts, and no
 .\"   Back-Cover Texts.  You should have received a copy of the GNU Free
 .\"   Documentation License along with this program.  If not, see
-.\"   <http://www.gnu.org/licenses/>.
+.\"   <https://www.gnu.org/licenses/>.
 .\"
-.TH NANO 1 "version 2.9.5" "March 2018"
+.TH NANO 1 "version 3.2" "November 2018"
 
 .SH NAME
 nano \- Nano's ANOther editor, an enhanced free Pico clone
@@ -55,7 +55,8 @@ cutbuffer.  One can also save the marked text to a file with \fB^O\fR, or
 spell check it with \fB^T\fR.
 .PP
 On some terminals, text can be selected also by holding down Shift while
-using the arrow keys.  Holding down the Alt key too will increase the stride.
+using the arrow keys.  Holding down the Ctrl or Alt key too will increase
+the stride.
 Any cursor movement without Shift being held will cancel such a selection.
 .PP
 The two lines at the bottom of the screen show some important commands;
@@ -106,7 +107,7 @@ should only need to use this option if they don't, as mouse support
 won't work properly with this option enabled.
 .TP
 .BR \-L ", " \-\-nonewlines
-Don't add newlines to the ends of files.
+Don't automatically add a newline when a file does not end with one.
 .TP
 .BR \-M ", " \-\-trimblanks
 Snip trailing whitespace from the wrapped line when automatic
@@ -122,19 +123,19 @@ Use the blank line below the title bar as extra editing space.
 For the 200 most recent files, log the last position of the cursor,
 and place it at that position again upon reopening such a file.
 .TP
-.BR "\-Q ""\fIcharacters\fB""" ", " "\-\-quotestr=""" \fIcharacters """
-Set the quoting string for justifying.  The default is
-\fB"^([\ \\t]*[#:>\\|}])+"\fP if extended regular expression support is
-available, or \fB">\ "\fP otherwise.  Note that \fB\\t\fP stands for a
-Tab.
+.BR "\-Q ""\fIregex\fB""" ", " "\-\-quotestr=""" \fIregex """
+Set the regular expression for matching the quoting part of a line.
+This is used when justifying.
+The default value is \fB"^([\ \\t]*([#:>|}]|//))+"\fP.
+Note that \fB\\t\fP stands for an actual Tab.
 .TP
 .BR \-R ", " \-\-restricted
 Restricted mode: don't read or write to any file not specified on the
-command line; don't read any \fInanorc\fP files nor history files;
-don't allow suspending nor spell checking;
+command line.  This means: don't read or write history files;
+don't allow suspending; don't allow spell checking;
 don't allow a file to be appended to, prepended to, or saved under a
-different name if it already has one; and don't use backup files.
-This restricted mode is also accessible by invoking \fBnano\fP
+different name if it already has one; and don't make backup files.
+Restricted mode can also be activated by invoking \fBnano\fP
 with any name beginning with 'r' (e.g. "rnano").
 .TP
 .BR \-S ", " \-\-smooth
@@ -166,6 +167,10 @@ should be considered as part of a word.  This overrides option
 Specify the name of the syntax highlighting to use from among the ones
 defined in the \fInanorc\fP files.
 .TP
+.BR \-Z ", " \-\-zap
+Let an unmodified Backspace or Delete erase the marked region
+(instead of a single character, and without affecting the cutbuffer).
+.TP
 .BR \-a ", " \-\-atblanks
 When doing soft line wrapping, wrap lines at whitespace
 instead of always at the edge of the screen.
@@ -180,15 +185,17 @@ work properly.  You should only need to use this option if Backspace
 acts like Delete on your system.
 .TP
 .BR \-g ", " \-\-showcursor
-Make the cursor visible in the file browser, putting it on the
-highlighted item.  Useful for braille users.
+Make the cursor visible in the file browser (putting it on the
+highlighted item) and in the help viewer.  Useful for braille users
+and people with poor vision.
 .TP
 .BR \-h ", " \-\-help
 Show a summary of the available command-line options and exit.
 .TP
 .BR \-i ", " \-\-autoindent
-Indent new lines to the previous line's indentation.  Useful when
-editing source code.
+Automatically indent a newly created line to the same number of tabs
+and/or spaces as the previous line (or as the next line if the previous
+line is the beginning of a paragraph).
 .TP
 .BR \-k ", " \-\-cutfromcursor
 Make the 'Cut Text' command (normally \fB^K\fR) cut from the current cursor
@@ -242,6 +249,8 @@ default behavior of saving a file in the format that it had.
 .TP
 .BR \-v ", " \-\-view
 Just view the file and disallow editing: read-only mode.
+This mode allows the user to open also other files for viewing,
+unless \fB--restricted\fR is given too.
 .TP
 .BR \-w ", " \-\-nowrap
 Disable the hard-wrapping of long lines.  This option conflicts with
@@ -250,6 +259,9 @@ Disable the hard-wrapping of long lines.  This option conflicts with
 .BR \-x ", " \-\-nohelp
 Don't show the two help lines at the bottom of the screen.
 .TP
+.BR \-y ", " \-\-afterends
+Make Ctrl+Right stop at word ends instead of beginnings.
+.TP
 .BR \-z ", " \-\-suspend
 Enable the suspend ability.
 .TP
@@ -309,6 +321,10 @@ not by default distinguish modified from unmodified arrow keys.
 Please report any other bugs that you encounter via:
 .br
 \fIhttps://savannah.gnu.org/bugs/?group=nano\fR.
+.sp
+When nano crashes, it will save any modified buffers to emergency .save files.
+If you are able to reproduce the crash and you want to get a backtrace, define
+the environment variable \fBNANO_NOCATCH\fR.
 
 .SH HOMEPAGE
 \fIhttps://nano-editor.org/\fR

doc/nano.texi

@@ -8,8 +8,8 @@
 
 @smallbook
 @set EDITION 0.5
-@set VERSION 2.9.5
-@set UPDATED March 2018
+@set VERSION 3.2
+@set UPDATED November 2018
 
 @dircategory Editors
 @direntry
@@ -23,7 +23,7 @@
 @titlepage
 @title GNU @command{nano}
 @subtitle a small and friendly text editor
-@subtitle version 2.9.5
+@subtitle version 3.2
 
 @author Chris Allegretta
 @page
@@ -43,14 +43,14 @@ under the terms of either of the following licenses:
 * The GNU General Public License, as published by the Free Software
   Foundation, version 3 or (at your option) any later version.  You
   should have received a copy of the GNU General Public License along
-  with this program.  If not, see @url{http://www.gnu.org/licenses/}.
+  with this program.  If not, see @url{https://www.gnu.org/licenses/}.
 
 @sp 1
 * The GNU Free Documentation License, as published by the Free Software
   Foundation, version 1.2 or (at your option) any later version, with no
   Invariant Sections, no Front-Cover Texts, and no Back-Cover Texts.
   You should have received a copy of the GNU Free Documentation License
-  along with this program.  If not, see @url{http://www.gnu.org/licenses/}.
+  along with this program.  If not, see @url{https://www.gnu.org/licenses/}.
 
 @sp 1
 You may contact the author by
@@ -63,7 +63,7 @@ e-mail: @email{chrisa@@asty.org}@*
 @node Top
 @top
 
-This manual documents the GNU @command{nano} editor, version 2.9.5.
+This manual documents the GNU @command{nano} editor, version 3.2.
 
 @menu
 * Introduction::
@@ -198,7 +198,7 @@ won't work properly with this option enabled.
 
 @item -L
 @itemx --nonewlines
-Don't add newlines to the ends of files.
+Don't automatically add a newline when a file does not end with one.
 
 @item -M
 @itemx --trimblanks
@@ -218,21 +218,20 @@ Use the blank line below the title bar as extra editing space.
 For the 200 most recent files, log the last position of the cursor,
 and place it at that position again upon reopening such a file.
 
-@item -Q "@var{characters}"
-@itemx --quotestr="@var{characters}"
-Set the quoting string for justifying.  The default value is
-@t{"^([ \t]*[|>:@}#])+"} if extended regular expression support
-is available, and @t{"> "} otherwise.
+@item -Q "@var{regex}"
+@itemx --quotestr="@var{regex}"
+Set the regular expression for matching the quoting part of a line, used
+when justifying.  The default value is @t{"^([@w{ }\t]*([#:>|@}]|//))+"}.
 Note that @code{\t} stands for a literal Tab character.
 
 @item -R
 @itemx --restricted
 Restricted mode: don't read or write to any file not specified on the
-command line; don't read any nanorc files nor history files; don't allow
-suspending nor spell checking; don't
+command line.  This means: don't read or write history files; don't allow
+suspending; don't allow spell checking; don't
 allow a file to be appended to, prepended to, or saved under a different
-name if it already has one; and don't use backup files.
-This restricted mode is also accessible by invoking @command{nano} with
+name if it already has one; and don't make backup files.
+Restricted mode can also be activated by invoking @command{nano} with
 any name beginning with @code{r} (e.g.@: @command{rnano}).
 
 @item -S
@@ -271,6 +270,11 @@ should be considered as parts of words.  This overrides option
 Specify the syntax to be used for highlighting.
 @xref{Syntax Highlighting} for more info.
 
+@item -Z
+@itemx --zap
+Let an unmodified @key{Backspace} or @key{Delete} erase the marked region
+(instead of a single character, and without affecting the cutbuffer).
+
 @item -a
 @itemx --atblanks
 When doing soft line wrapping, wrap lines at whitespace
@@ -290,8 +294,9 @@ acts like Delete on your system.
 
 @item -g
 @itemx --showcursor
-Make the cursor visible in the file browser, putting it on the
-highlighted item.  Useful for braille users.
+Make the cursor visible in the file browser (putting it on the
+highlighted item) and in the help viewer.  Useful for braille users
+and people with poor vision.
 
 @item -h
 @itemx --help
@@ -299,8 +304,9 @@ Show a summary of command-line options and exit.
 
 @item -i
 @itemx --autoindent
-Automatically indent new lines to the same number of spaces and tabs as
-the previous line.
+Automatically indent a newly created line to the same number of tabs
+and/or spaces as the previous line (or as the next line if the previous
+line is the beginning of a paragraph).
 
 @item -k
 @itemx --cutfromcursor
@@ -355,7 +361,7 @@ The default value is @t{-8}.  This option conflicts with @option{-w}
 @itemx --speller=@var{program}
 Use the given program to do spell checking and correcting.  By default,
 @command{nano} uses the command specified in the @env{SPELL} environment
-variable for this.  If @env{SPELL} is not set, and @option{--speller} is
+variable.  If @env{SPELL} is not set, and @option{--speller} is
 not specified either, then @command{nano} uses its own interactive spell
 corrector, which requires the GNU @command{spell} program to be installed.
 
@@ -373,9 +379,11 @@ default behavior of saving a file in the format that it had.
 
 @item -v
 @itemx --view
-Don't allow the contents of the file to be altered.  Note that this
-option should NOT be used in place of correct file permissions to
-implement a read-only file.
+Don't allow the contents of the file to be altered: read-only mode.
+This mode allows the user to open also other files for viewing,
+unless @option{--restricted} is given too.
+(Note that this option should NOT be used in place of correct
+file permissions to implement a read-only file.)
 
 @item -w
 @itemx --nowrap
@@ -392,6 +400,10 @@ is located at the very bottom of the editor.
 Note: When accessing the help system, Expert Mode is temporarily
 disabled to display the help-system navigation keys.
 
+@item -y
+@itemx --afterends
+Make Ctrl+Right stop at word ends instead of beginnings.
+
 @item -z
 @itemx --suspend
 Enable the ability to suspend @command{nano} using the system's suspend
@@ -502,8 +514,9 @@ This selection can now be cut or copied in its entirety with a single
 @kbd{^K} or @kbd{M-6}.  Or the selection can be used to limit the scope of
 a search-and-replace (@kbd{^\}) or spell-checking session (@kbd{^T}).
 
-On some terminals, it is also possible to select text by holding down
-@kbd{Shift} together with the cursor keys.  Such a selection is cancelled
+On some terminals, text can be selected also by holding down @kbd{Shift}
+while using the cursor keys.  Holding down the @kbd{Ctrl} or @kbd{Alt}
+key too will increase the stride.  Such a selection is cancelled
 upon any cursor movement where @kbd{Shift} isn't held.
 
 Cutting or copying selected text will toggle the mark off automatically.
@@ -591,59 +604,47 @@ The following global toggles are available:
 
 @table @code
 
-@item Backup Files toggle
-@kbd{Meta-B} toggles the @option{-B} (@option{--backup}) command-line option.
-
-@item Constant Cursor Position Display toggle
+@item Constant Cursor Position Display
 @kbd{Meta-C} toggles the @option{-c} (@option{--constantshow}) command-line option.
 
-@item Multiple File Buffers toggle
-@kbd{Meta-F} toggles the @option{-F} (@option{--multibuffer}) command-line option.
-
-@item Smart Home Key toggle
+@item Smart Home Key
 @kbd{Meta-H} toggles the @option{-A} (@option{--smarthome}) command-line option.
 
-@item Auto Indent toggle
+@item Auto Indent
 @kbd{Meta-I} toggles the @option{-i} (@option{--autoindent}) command-line option.
 
-@item Cut From Cursor To End-of-Line toggle
+@item Cut From Cursor To End-of-Line
 @kbd{Meta-K} toggles the @option{-k} (@option{--cutfromcursor}) command-line option.
 
-@item Long-Line Wrapping toggle
+@item Long-Line Wrapping
 @kbd{Meta-L} toggles the @option{-w} (@option{--nowrap}) command-line option.
 
-@item Mouse Support toggle
+@item Mouse Support
 @kbd{Meta-M} toggles the @option{-m} (@option{--mouse}) command-line option.
 
-@item No Conversion From DOS/Mac Format toggle
-@kbd{Meta-N} toggles the @option{-N} (@option{--noconvert}) command-line option.
+@item Tabs To Spaces
+@kbd{Meta-O} toggles the @option{-E} (@option{--tabstospaces}) command-line option.
 
-@item More Space For Editing toggle
-@kbd{Meta-O} toggles the @option{-O} (@option{--morespace}) command-line option.
+@item Whitespace Display
+@kbd{Meta-P} toggles the displaying of whitespace (@pxref{Whitespace}).
 
-@item Whitespace Display toggle
-@kbd{Meta-P} toggles the whitespace-display mode (@pxref{Whitespace}).
-
-@item Tabs To Spaces toggle
-@kbd{Meta-Q} toggles the @option{-E} (@option{--tabstospaces}) command-line option.
-
-@item Smooth Scrolling toggle
+@item Smooth Scrolling
 @kbd{Meta-S} toggles the @option{-S} (@option{--smooth}) command-line option.
 
-@item Expert/No Help toggle
+@item Expert/No Help
 @kbd{Meta-X} toggles the @option{-x} (@option{--nohelp}) command-line option.
 
-@item Color Syntax Highlighting toggle
+@item Color Syntax Highlighting
 @kbd{Meta-Y} toggles color syntax highlighting (if your nanorc defines syntaxes
 --- @pxref{Syntax Highlighting}).
 
-@item Suspension toggle
+@item Suspension
 @kbd{Meta-Z} toggles the @option{-z} (@option{--suspend}) command-line option.
 
-@item Line Numbers toggle
+@item Line Numbers
 @kbd{Meta-#} toggles the @option{-l} (@option{--linenumbers}) command-line option.
 
-@item Soft Wrapping toggle
+@item Soft Wrapping
 @kbd{Meta-$} toggles the @option{-$} (@option{--softwrap}) command-line option.
 
 @end table
@@ -689,6 +690,9 @@ The supported settings in a nanorc file are:
 
 @table @code
 
+@item set afterends
+Make Ctrl+Right stop at word ends instead of beginnings.
+
 @item set allow_insecure_backup
 When backing up files, allow the backup to succeed even if its
 permissions can't be (re)set due to special OS considerations.
@@ -699,7 +703,9 @@ When soft line wrapping is enabled, make it wrap lines at blank characters
 (tabs and spaces) instead of always at the edge of the screen.
 
 @item set autoindent
-Use auto-indentation.
+Automatically indent a newly created line to the same number of tabs
+and/or spaces as the previous line (or as the next line if the previous
+line is the beginning of a paragraph).
 
 @item set backup
 When saving a file, back up the previous version of it, using the current
@@ -711,10 +717,6 @@ numbered one every time a file is saved --- when backups are enabled
 with @code{set backup} or @option{--backup} or @option{-B}.
 The uniquely numbered files are stored in the specified directory.
 
-@item set backwards
-Obsolete option.  Recognized but ignored.  @code{^Q} is available to
-start a backward search.
-
 @item set boldtext
 Use bold instead of reverse video for the title bar, status bar, key combos,
 function tags, line numbers, and selected text.  This can be overridden by
@@ -726,7 +728,7 @@ Set the characters treated as closing brackets when justifying
 paragraphs.  This may not include blank characters.  Only closing
 punctuation (see @code{set punct}), optionally followed by the specified
 closing brackets, can end sentences.  The default value is
-@t{"')>]@}"}.
+@t{""')>]@}"}.
 
 @item set casesensitive
 Do case-sensitive searches by default.
@@ -797,13 +799,13 @@ Don't convert files from DOS/Mac format.
 @item set nohelp
 Don't display the help lists at the bottom of the screen.
 
+@item set nonewlines
+When a file does not end with a newline, don't automatically add one.
+
 @item set nopauses
 Don't pause between warnings at startup.  This means that only
 the last one will be visible (when there are multiple ones).
 
-@item set nonewlines
-Don't add newlines to the ends of files.
-
 @item set nowrap
 Don't hard-wrap text at all.  This option conflicts with
 @option{fill}; the last one given takes effect.
@@ -839,12 +841,10 @@ keystroke instead of 25.  Note that @option{constantshow} overrides this.
 @item set quiet
 Obsolete option.  Recognized but ignored.
 
-@item set quotestr "@var{string}"
+@item set quotestr "@var{regex}"
 The email-quote string, used to justify email-quoted paragraphs.  This
-is an extended regular expression if your system supports them,
-otherwise a literal string.  The default value is
-@t{"^([ \\t]*[#:>\\|@}])+"} if you have extended regular expression
-support, and @t{"> "} otherwise.
+is an extended regular expression.  The default value is
+@t{"^([@w{ }\t]*([#:>|@}]|//))+"}.
 Note that @code{\t} stands for a literal Tab character.
 
 @item set rebinddelete
@@ -865,8 +865,9 @@ Use this color combination for selected text.
 @xref{@code{set functioncolor}} for valid color names.
 
 @item 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.
 
 @item set smarthome
 Make the Home key smarter.  When Home is pressed anywhere but at the
@@ -909,6 +910,7 @@ Use this color combination for the title bar.
 @item set trimblanks
 Remove trailing whitespace from wrapped lines when automatic
 hard-wrapping occurs or when text is justified.
+(The old form of this option, @code{set justifytrim}, is deprecated.)
 
 @item set unix
 Save a file by default in Unix format.  This overrides nano's
@@ -916,7 +918,9 @@ default behavior of saving a file in the format that it had.
 (This option has no effect when you also use @code{set noconvert}.)
 
 @item set view
-Disallow file modification.
+Disallow file modification: read-only mode.
+This mode allows the user to open also other files for viewing,
+unless @option{--restricted} is given on the command line.
 
 @anchor{Whitespace}
 @item set whitespace "@var{string}"
@@ -933,6 +937,10 @@ Specify which other characters (besides the normal alphanumeric ones)
 should be considered as parts of words.  This overrides the option
 @code{wordbounds}.
 
+@item set zap
+Let an unmodified @key{Backspace} or @key{Delete} erase the marked region
+(instead of a single character, and without affecting the cutbuffer).
+
 @end table
 
 @node Syntax Highlighting
@@ -950,7 +958,7 @@ via the following commands in a nanorc file:
 
 @table @code
 
-@item syntax "@var{name}" ["@var{fileregex}" @dots{}]
+@item syntax @var{name} ["@var{fileregex}" @dots{}]
 Start the definition of a syntax with this @var{name}.
 All subsequent @code{color} and other such commands
 will be added to this syntax, until a new @code{syntax}
@@ -981,14 +989,9 @@ file, to determine whether this syntax should be used for it.
 on the system and will be silently ignored otherwise.)
 
 @item linter @var{program} [@var{arg} @dots{}]
-Use the given @var{program} to do a syntax check on the current file.
+Use the given @var{program} to do a syntax check on the current buffer.
 (This overrides the speller function.)
 
-@item formatter @var{program} [@var{arg} @dots{}]
-Use the given @var{program} to automatically reformat text ---
-useful for a programming language like Go.
-(This overrides the speller and linter functions.)
-
 @item comment "@var{string}"
 Use the given string for commenting and uncommenting lines.
 If the string contains a vertical bar or pipe character (@t{|}),
@@ -1004,8 +1007,11 @@ The default value is @t{"#"}.
 Display all pieces of text that match the
 extended regular expression "regex" with foreground color "fgcolor" and
 background color "bgcolor", at least one of which must be specified.
-Valid colors for foreground and background are: white, black, red,
-blue, green, yellow, magenta, and cyan.  You may use the prefix "bright"
+Valid names for foreground and background color are:
+@code{white}, @code{black}, @code{blue}, @code{green},
+@code{red}, @code{cyan}, @code{yellow}, @code{magenta}, and @code{normal}
+--- where @code{normal} means the default foreground or background color.
+You may use the prefix @code{bright}
 to get a stronger color highlight for the foreground.  If your
 terminal supports transparency, not specifying a "bgcolor" tells @command{nano}
 to attempt to use a transparent background.
@@ -1032,13 +1038,28 @@ to @code{icolor}.
 @item extendsyntax @var{name} @var{command} [@var{arg} @dots{}]
 Extend the syntax previously defined as "@var{name}" with another @var{command}.
 This allows you to add a new @code{color}, @code{icolor}, @code{header},
-@code{magic}, @code{comment}, @code{linter}, or @code{formatter} command
-to an already
+@code{magic}, @code{comment}, or @code{linter} command to an already
 defined syntax --- useful when you want to slightly improve a syntax defined
 in one of the system-installed files (which normally are not writable).
 
 @end table
 
+Note: the @code{formatter} command has been removed.  It was superseded by
+a more general mechanism: the filtering of buffer or marked text through
+an external command.  Such filtering is done by typing @code{^R^X} and then
+preceding your formatter command with the pipe symbol (@code{|}).  It has
+the added advantage that the operation can be undone.
+
+If you use such a formatting command regularly, you could assign the relevant
+series of keystrokes to a single key in your nanorc:
+
+@example
+   bind  M-F  "^R^X|yourformatcommand^M"  main
+@end example
+
+(Note that the @key{^R}, @key{^X}, and @key{^M} are each a single, literal
+control character.  You can enter them by preceding each with @key{M-V}.)
+
 @node Rebinding Keys
 @section Rebinding Keys
 
@@ -1069,16 +1090,20 @@ The format of @code{key} should be one of:
 
 @itemize @w{}
 @item
-@code{^}@  followed by an ASCII character or the word "Space".
+@code{^}@  followed by a Latin letter, by one of several ASCII characters
+(@@, ], \, ^, or _), or by the word "Space".
 Example: @code{^C}.
 
 @item
-@code{M-}@  followed by a ASCII character or the word "Space".
+@code{M-}@  followed by any ASCII character except [, or by the word "Space".
 Example: @code{M-C}.
 
 @item
 @code{F}@  followed by a numeric value from 1 to 16.
 Example: @code{F10}.
+
+@item
+the word "Ins" or the word "Del".
 @end itemize
 
 @sp 1
@@ -1110,16 +1135,14 @@ Starts a forward search for text in the current buffer --- or for filenames
 matching a string in the current list in the file browser.
 
 @item wherewas
-Starts a backward search for text in the current buffer.
-
-@item searchagain
-Repeats the last search command without prompting.
+Starts a backward search for text in the current buffer --- or for filenames
+matching a string in the current list in the file browser.
 
 @item findprevious
-As @code{searchagain}, but always in the backward direction.
+Searches the next occurrence in the backward direction.
 
 @item findnext
-As @code{searchagain}, but always in the forward direction.
+Searches the next occurrence in the forward direction.
 
 @item replace
 Interactively replaces text within the current buffer.
@@ -1127,25 +1150,36 @@ Interactively replaces text within the current buffer.
 @item cut
 Cuts and stores the current line (or the marked region).
 
-@item copytext
+@item copy
 Copies the current line (or the marked region) without deleting it.
+(The old form 'copytext' is deprecated.)
 
-@item uncut
-Copies the currently stored text into the current buffer at the
+@item paste
+Pastes the currently stored text into the current buffer at the
 current cursor position.
+(The old form 'uncut' is deprecated.)
 
-@item mark
-Sets the mark at the current position, to start selecting text.
+@item zap
+Throw away the current line (or the marked region).
+(This function is bound by default to <Meta+Delete>.)
 
 @item cutwordleft
 Cuts from the cursor position to the beginning of the preceding word.
+(This function is not bound by default.  If your terminal produces
+@code{^H} for <Ctrl+Backspace>, you can make <Ctrl+Backspace> delete
+the word to the left of the cursor by rebinding ^H to this function.)
 
 @item cutwordright
 Cuts from the cursor position to the beginning of the next word.
+(This function is bound by default to <Ctrl+Delete>.)
 
 @item cutrestoffile
 Cuts all text from the cursor position till the end of the buffer.
 
+@item mark
+Sets the mark at the current position, to start selecting text.
+Or, when it is set, unsets the mark.
+
 @item curpos
 Shows the current cursor position: the line, column, and character positions.
 
@@ -1153,11 +1187,14 @@ Shows the current cursor position: the line, column, and character positions.
 Counts the number of words, lines and characters in the current buffer.
 
 @item speller
-Invokes a spell-checking program (or a linting program, if the current
-syntax highlighting defines one).
+Invokes a spell-checking program (or linting program,
+if the active syntax defines such a thing).
 
 @item justify
-Justifies the current paragraph.
+Justifies the current paragraph.  A paragraph is a group of contiguous lines
+that, apart from possibly the first line, all have the same indentation.  The
+beginning of a paragraph is detected by either this lone line with a differing
+indentation or by a preceding blank line.
 
 @item fulljustify
 Justifies the entire current buffer.
@@ -1283,19 +1320,20 @@ Suspends the editor (if the suspending function is enabled, see the
 "suspendenable" entry below).
 
 @item casesens
-Toggles case sensitivity in searching (search/replace menus only).
+Toggles whether searching/replacing ignores or respects the case of
+the given characters.
 
 @item regexp
-Toggles whether searching/replacing is based on literal strings or regular expressions.
+Toggles whether searching/replacing uses literal strings or regular expressions.
 
 @item backwards
 Toggles whether searching/replacing goes forward or backward.
 
-@item prevhistory
-Shows the previous history entry in the prompt menus (e.g.@: search).
+@item older
+Retrieves the previous (earlier) entry at a prompt.
 
-@item nexthistory
-Shows the next history entry in the prompt menus (e.g.@: search).
+@item newer
+Retrieves the next (later) entry at a prompt.
 
 @item flipreplace
 Toggles between searching for something and replacing something.
@@ -1307,10 +1345,18 @@ Toggles between searching for text and targeting a line number.
 @item flipexecute
 Toggles between inserting a file and executing a command.
 
+@item flippipe
+When executing a command, toggles whether the current buffer (or marked
+region) is piped to the command.
+
 @item flipnewbuffer
 Toggles between inserting into the current buffer and into a new
 empty buffer.
 
+@item flipconvert
+When reading in a file, toggles between converting and not converting
+it from DOS/Mac format.  Converting is the default.
+
 @item dosformat
 When writing a file, switches to writing a DOS format (CR/LF).
 
@@ -1347,11 +1393,9 @@ Goes to the last file when using the file browser (reading or writing files).
 @item nohelp
 Toggles the presence of the two-line list of key bindings at the bottom of the screen.
 
-@item constupdate
+@item constantshow
 Toggles the constant display of the current line, column, and character positions.
-
-@item morespace
-Toggles the presence of the blank line that 'separates' the title bar from the file text.
+(The form @code{constupdate} is deprecated.)
 
 @item smoothscroll
 Toggles smooth scrolling (when moving around with the arrow keys).
@@ -1359,6 +1403,9 @@ Toggles smooth scrolling (when moving around with the arrow keys).
 @item softwrap
 Toggles the displaying of overlong lines on multiple screen lines.
 
+@item linenumbers
+Toggles the display of line numbers in front of the text.
+
 @item whitespacedisplay
 Toggles the showing of whitespace.
 
@@ -1369,11 +1416,14 @@ Toggles syntax highlighting.
 Toggles the smartness of the Home key.
 
 @item autoindent
-Toggles whether new lines will contain the same amount of whitespace as the preceding line.
+Toggles whether a newly created line will contain the same amount of leading
+whitespace as the preceding line --- or as the next line if the preceding line
+is the beginning of a paragraph.
 
-@item cuttoend
+@item cutfromcursor
 Toggles whether cutting text will cut the whole line or just from the current cursor
 position to the end of the line.
+(The form @code{cuttoend} is deprecated.)
 
 @item nowrap
 Toggles whether long lines will be hard-wrapped to the next line.
@@ -1381,19 +1431,9 @@ Toggles whether long lines will be hard-wrapped to the next line.
 @item tabstospaces
 Toggles whether typed tabs will be converted to spaces.
 
-@item backupfile
-Toggles whether a backup will be made of the file to be edited.
-
-@item multibuffer
-Toggles whether a file is inserted into the current buffer
-or read into a new buffer.
-
 @item mouse
 Toggles mouse support.
 
-@item noconvert
-Toggles automatic conversion of files from DOS/Mac format.
-
 @item suspendenable
 Toggles whether the suspend shortcut (normally @kbd{^Z}) will suspend the editor.
 
@@ -1416,6 +1456,9 @@ The 'search to replace' menu.
 @item replacewith
 The 'replace with' menu, which comes up after 'search to replace'.
 
+@item yesno
+The 'yesno' menu, where the Yes/No/All/Cancel question is asked.
+
 @item gotoline
 The 'goto line (and column)' menu.
 
@@ -1438,7 +1481,7 @@ The interactive spell checker Yes/no menu.
 The linter menu.
 
 @item browser
-The file browser for inserting or writing a file.
+The file browser, for choosing a file to read from or write to.
 
 @item whereisfile
 The 'search for a file' menu in the file browser.
@@ -1457,14 +1500,15 @@ it means all menus where the specified @code{key} exists.
 @node The File Browser
 @chapter The File Browser
 
-When reading or writing files, pressing @kbd{^T} will invoke the file browser.
+When in the Read-File (@kbd{^R}) or Write-Out menu (@kbd{^O}),
+pressing @kbd{^T} will invoke the file browser.
 Here, one can navigate directories in a graphical manner in order to
 find the desired file.
 
-Basic movement in the file browser is accomplished with the arrow keys,
-page up, and page down.  More advanced movement is accomplished by
-searching via @kbd{^W} (or @kbd{w'} and changing directories via
-@kbd{^_} (or @kbd{g}).  The behavior of the @kbd{Enter} key (or @kbd{s})
+Basic movement in the file browser is accomplished with the arrow and
+other cursor-movement keys.  More targeted movement is accomplished by
+searching, via @kbd{^W} or @kbd{w}, or by changing directory, via
+@kbd{^_} or @kbd{g}.  The behavior of the @kbd{Enter} key (or @kbd{s})
 varies by what is currently selected.
 If the currently selected object is a directory, the file browser will
 enter and display the contents of the directory.  If the object is a
@@ -1505,6 +1549,11 @@ The output of the "Display Cursor Position" command (@kbd{^C}) displays
 not only the current line and character position of the cursor,
 but also (between the two) the current column position.
 
+@item Hard-Wrapping
+By default, @command{nano} hard-wraps lines at screen width minus eight
+columns, whereas Pico does it at screen width minus six columns.  You can
+make @command{nano} do the same as Pico by using @option{--fill=-6}.
+
 @item Spell Checking
 In the internal spell checker misspelled words are sorted alphabetically
 and trimmed for uniqueness, such that the words 'apple' and 'Apple' will

doc/nanorc.5

@@ -7,16 +7,16 @@
 .\"   Foundation, version 3 or (at your option) any later version.  You
 .\"   should have received a copy of the GNU General Public License
 .\"   along with this program.  If not, see
-.\"   <http://www.gnu.org/licenses/>.
+.\"   <https://www.gnu.org/licenses/>.
 .\"
 .\" * The GNU Free Documentation License, as published by the Free
 .\"   Software Foundation, version 1.2 or (at your option) any later
 .\"   version, with no Invariant Sections, no Front-Cover Texts, and no
 .\"   Back-Cover Texts.  You should have received a copy of the GNU Free
 .\"   Documentation License along with this program.  If not, see
-.\"   <http://www.gnu.org/licenses/>.
+.\"   <https://www.gnu.org/licenses/>.
 .\"
-.TH NANORC 5 "version 2.9.5" "March 2018"
+.TH NANORC 5 "version 3.2" "November 2018"
 
 .SH NAME
 nanorc \- GNU nano's configuration file
@@ -53,6 +53,9 @@ match \fB"\fP, \fB'\fP, \fB)\fP, \fB>\fP, \fB]\fP, and \fB}\fP.
 The supported commands and arguments are:
 
 .TP 3
+.B set afterends
+Make Ctrl+Right stop at word ends instead of beginnings.
+.TP
 .B set allow_insecure_backup
 When backing up files, allow the backup to succeed even if its permissions
 can't be (re)set due to special OS considerations.  You should
@@ -63,7 +66,9 @@ When soft line wrapping is enabled, make it wrap lines at blank characters
 (tabs and spaces) instead of always at the edge of the screen.
 .TP
 .B set autoindent
-Use auto-indentation.
+Automatically indent a newly created line to the same number of tabs
+and/or spaces as the previous line (or as the next line if the previous
+line is the beginning of a paragraph).
 .TP
 .B set backup
 When saving a file, create a backup file by adding a tilde (\fB~\fP) to
@@ -75,10 +80,6 @@ numbered one every time a file is saved -- when backups are enabled
 with \fBset backup\fR or \fB\-\-backup\fR or \fB\-B\fR.
 The uniquely numbered files are stored in the specified \fIdirectory\fR.
 .TP
-.B set backwards
-Obsolete option.  Recognized but ignored.  \fB^Q\fR is available to
-start a backward search.
-.TP
 .B set boldtext
 Use bold instead of reverse video for the title bar, status bar, key combos,
 function tags, line numbers, and selected text.  This can be overridden by
@@ -88,7 +89,7 @@ setting the options \fBtitlecolor\fP, \fBstatuscolor\fP, \fBkeycolor\fP,
 .B set brackets "\fIstring\fP"
 Set the characters treated as closing brackets when justifying
 paragraphs.  This may not include blank characters.  Only closing
-punctuation (see \fBpunct\fP), optionally followed by the specified
+punctuation (see \fBset punct\fP), optionally followed by the specified
 closing brackets, can end sentences.  The default value is "\fB"')>]}\fP".
 .TP
 .B set casesensitive
@@ -158,7 +159,7 @@ Don't convert files from DOS/Mac format.
 Don't display the two help lines at the bottom of the screen.
 .TP
 .B set nonewlines
-Don't automatically add a newline to the ends of files.
+When a file does not end with a newline, don't automatically add one.
 .TP
 .B set nopauses
 Don't pause between warnings at startup.  This means that only
@@ -198,12 +199,10 @@ keystroke instead of 25.  The option \fBconstantshow\fR overrides this.
 .B set quiet
 Obsolete option.  Recognized but ignored.
 .TP
-.B set quotestr "\fIstring\fP"
+.B set quotestr "\fIregex\fP"
 The email-quote string, used to justify email-quoted paragraphs.  This
-is an extended regular expression if your system supports them,
-otherwise a literal string.  The default value is
-"\fB^([\ \\t]*[#:>\\|}])+\fP" if you have extended regular expression
-support, and "\fB>\ \fP" otherwise.  Note that '\\t' stands for a literal
+is an extended regular expression.  The default value is
+"\fB^([\ \\t]*([#:>|}]|//))+\fP".  Note that \fB\\t\fR stands for an actual
 Tab character.
 .TP
 .B set rebinddelete
@@ -240,9 +239,9 @@ Use smooth scrolling by default.
 .B set softwrap
 Enable soft line wrapping for easier viewing of very long lines.
 .TP
-.B set speller "\fIspellprog\fP"
-Use spelling checker \fIspellprog\fP instead of the built-in one, which
-calls \fIspell\fP.
+.B set speller "\fIprogram\fP"
+Use the given \fIprogram\fR to do spell checking and correcting,
+instead of the built-in corrector that calls \fBspell\fR.
 .TP
 .B set statuscolor \fIfgcolor\fR,\fIbgcolor\fR
 Specify the color combination to use for the status bar.
@@ -273,6 +272,7 @@ And either "\fIfgcolor\fR" or ",\fIbgcolor\fR" may be left out.
 .B set trimblanks
 Remove trailing whitespace from wrapped lines when automatic
 hard-wrapping occurs or when text is justified.
+(The old form of this option, '\fBset justifytrim\fR', is deprecated.)
 .TP
 .B set unix
 Save a file by default in Unix format.  This overrides nano's
@@ -280,7 +280,9 @@ default behavior of saving a file in the format that it had.
 (This option has no effect when you also use \fBset noconvert\fR.)
 .TP
 .B set view
-Disallow file modification.
+Disallow file modification: read-only mode.
+This mode allows the user to open also other files for viewing,
+unless \fB--restricted\fR is given on the command line.
 .TP
 .B set whitespace "\fIstring\fP"
 Set the two characters used to indicate the presence of tabs and
@@ -295,6 +297,10 @@ characters as parts of words.
 Specify which other characters (besides the normal alphanumeric ones)
 should be considered as parts of words.  This overrides the option
 \fBwordbounds\fR.
+.TP
+.B set zap
+Let an unmodified Backspace or Delete erase the marked region
+(instead of a single character, and without affecting the cutbuffer).
 
 .SH SYNTAX HIGHLIGHTING
 Coloring the different syntactic elements of a file
@@ -307,7 +313,7 @@ good fit for a small editor like \fBnano\fR.
 For each kind of file a separate syntax can be defined
 via the following commands:
 .TP
-.BR syntax " ""\fIname\fR"" [""\fIfileregex\fR"" ...]"
+.BI syntax " name \fR[" """" fileregex """ " \fR...]
 Start the definition of a syntax with this \fIname\fR.
 All subsequent \fBcolor\fR and other such commands
 will be added to this syntax, until a new \fBsyntax\fR
@@ -319,17 +325,17 @@ expression \fIfileregex\fR.  Or the syntax can be explicitly
 activated by using the \fB-Y\fR or \fB\-\-syntax\fR
 command-line option followed by the \fIname\fR.
 
-The syntax "\fBdefault\fP" is special: it takes no \fIfileregex\fR,
+The syntax \fBdefault\fP is special: it takes no \fIfileregex\fR,
 and applies to files that don't match any syntax's regexes.
-The syntax "\fBnone\fP" is reserved; specifying it on the command line
+The syntax \fBnone\fP is reserved; specifying it on the command line
 is the same as not having a syntax at all.
 .TP
-.BR header " ""\fIregex\fR"" " ...
+.BI "header """ regex """ \fR...
 If from all defined syntaxes no \fIfileregex\fR matched, then compare
 this \fIregex\fR (or regexes) against the first line of the current file,
 to determine whether this syntax should be used for it.
 .TP
-.BR magic " ""\fIregex\fR"" " ...
+.BI "magic """ regex """ \fR...
 If no \fIfileregex\fR matched and no \fBheader\fR regex matched
 either, then compare this \fIregex\fR (or regexes) against the
 result of querying the \fBmagic\fP database about the current
@@ -338,16 +344,11 @@ file, to determine whether this syntax should be used for it.
 system and will be silently ignored otherwise.)
 .TP
 .BI linter " program " \fR[ "arg " \fR...]
-Use the given \fIprogram\fR to run a syntax check on the current file.
+Use the given \fIprogram\fR to run a syntax check on the current buffer.
 (This overrides the speller function.)
 .TP
-.BI formatter " program " \fR[ "arg " \fR...]
-Use the given \fIprogram\fR to automatically reformat text --
-useful in a programming language like Go.
-(This overrides the speller and linter functions.)
-.TP
-.BR comment " ""\fIstring\fR"""
-Use the given string for commenting and uncommenting lines.
+.BI "comment """ string """
+Use the given \fIstring\fR for commenting and uncommenting lines.
 If the string contains a vertical bar or pipe character (\fB|\fR),
 this designates bracket-style comments; for example, "\fB/*|*/\fR" for
 CSS files.  The characters before the pipe are prepended to the line and the
@@ -357,21 +358,23 @@ for Python files.  If empty double quotes are specified, the comment/uncomment
 function is disabled; for example, "" for JSON.
 The default value is "\fB#\fP".
 .TP
-.B color \fIfgcolor\fR,\fIbgcolor\fR """\fIregex\fR""" ...
+.BI "color " fgcolor , bgcolor " """ regex """ " \fR...
 Display all pieces of text that match
 the extended regular expression \fIregex\fP with foreground color
 \fIfgcolor\fP and background color \fIbgcolor\fP, at least one of which
-must be specified.  Valid colors for foreground and background
-are: white, black, red, blue, green, yellow, magenta, and cyan.  You may
-use the prefix "bright" to get a stronger color highlight for the
+must be specified.  Valid names for foreground and background colors are:
+.BR white ", " black ", " blue ", " green ", " red ", "
+.BR cyan ", " yellow ", " magenta ", and " normal
+-- where \fBnormal\fR means the default foreground or background color.
+You may use the prefix \fBbright\fR to get a stronger color highlight for the
 foreground.  If your terminal supports transparency, not specifying a
 \fIbgcolor\fP tells \fBnano\fP to attempt to use a transparent
 background.
 .TP
-.B icolor \fIfgcolor\fR,\fIbgcolor\fR """\fIregex\fR""" ...
+.BI "icolor " fgcolor , bgcolor " """ regex """ " \fR...
 Same as above, except that the matching is case insensitive.
 .TP
-.BR color " \fIfgcolor\fR,\fIbgcolor\fR " start= """\fIfromrx\fR"" " end= """\fItorx\fR""
+.BI "color " fgcolor , bgcolor " start=""" fromrx """ end=""" torx """
 Display all pieces of text whose start matches extended regular expression
 \fIfromrx\fP and whose end matches extended regular expression \fItorx\fP with
 foreground color \fIfgcolor\fP and background color \fIbgcolor\fP,
@@ -380,10 +383,10 @@ initial instance of \fIfromrx\fP, all text until the first instance of
 \fItorx\fP will be colored.  This allows syntax highlighting to span
 multiple lines.
 .TP
-.BR icolor " \fIfgcolor\fR,\fIbgcolor\fR " start= """\fIfromrx\fR"" " end= """\fItorx\fR""
+.BI "icolor " fgcolor , bgcolor " start=""" fromrx """ end=""" torx """
 Same as above, except that the matching is case insensitive.
 .TP
-.BR include " ""\fIsyntaxfile\fR"""
+.BI "include """ syntaxfile """
 Read in self-contained color syntaxes from \fIsyntaxfile\fP.  Note that
 \fIsyntaxfile\fP may contain only the above commands, from \fBsyntax\fP
 to \fBicolor\fP.
@@ -391,11 +394,28 @@ to \fBicolor\fP.
 .BI extendsyntax " name command " \fR[ "arg " \fR...]
 Extend the syntax previously defined as \fIname\fR with another
 \fIcommand\fR.  This allows adding a new \fBcolor\fP, \fBicolor\fP,
-\fBheader\fP, \fBmagic\fP, \fBcomment\fP, \fBlinter\fP, or \fBformatter\fP
+\fBheader\fP, \fBmagic\fP, \fBcomment\fP, or \fBlinter\fP
 command to an already defined syntax -- useful when you want to
 slightly improve a syntax defined in one of the system-installed
 files (which normally are not writable).
 
+.P
+Note: the \fBformatter\fR command has been removed.  It was superseded by
+a more general mechanism: the filtering of buffer or marked text through
+an external command.  Such filtering is done by typing \fB^R^X\fR and then
+preceding your formatter command with the pipe symbol (\fB|\fR).  It has
+the added advantage that the operation can be undone.
+.PP
+If you use such a formatting command regularly, you could assign the relevant
+series of keystrokes to a single key in your nanorc:
+.PP
+.RS
+.B "bind  M\-F  \(dq^R^X|yourformatcommand^M\(dq  main"
+.RE
+.PP
+(Note that the \fB^R\fR, \fB^X\fR, and \fB^M\fR are each a single, literal
+control character.  You can enter them by preceding each with \fBM-V\fR.)
+
 .SH REBINDING KEYS
 Key bindings can be changed via the following three commands:
 .RS 3
@@ -423,16 +443,19 @@ The format of \fIkey\fP should be one of:
 .RS 3
 .TP 3
 .B ^
-followed by an alpha character or the word "Space".
-Example: ^C
+followed by a Latin letter, by one of several ASCII characters
+(@, ], \\, ^, or _), or by the word "Space".
+Example: ^C.
 .TP
 .B M-
-followed by a printable character or the word "Space".
-Example: M-C
+followed by any ASCII character except [, or by the word "Space".
+Example: M-C.
 .TP
 .B F
 followed by a numeric value from 1 to 16.
-Example: F10
+Example: F10.
+.TP
+the word "Ins" or the word "Del".
 .RE
 
 .TP
@@ -463,16 +486,14 @@ Starts a forward search for text in the current buffer -- or for filenames
 matching a string in the current list in the file browser.
 .TP
 .B wherewas
-Starts a backward search for text in the current buffer.
-.TP
-.B searchagain
-Repeats the last search command without prompting.
+Starts a backward search for text in the current buffer -- or for filenames
+matching a string in the current list in the file browser.
 .TP
 .B findprevious
-As \fBsearchagain\fR, but always in the backward direction.
+Searches the next occurrence in the backward direction.
 .TP
 .B findnext
-As \fBsearchagain\fR, but always in the forward direction.
+Searches the next occurrence in the forward direction.
 .TP
 .B replace
 Interactively replaces text within the current buffer.
@@ -480,25 +501,36 @@ Interactively replaces text within the current buffer.
 .B cut
 Cuts and stores the current line (or the marked region).
 .TP
-.B copytext
+.B copy
 Copies the current line (or the marked region) without deleting it.
+(The old form 'copytext' is deprecated.)
 .TP
-.B uncut
-Copies the currently stored text into the current buffer at the
+.B paste
+Pastes the currently stored text into the current buffer at the
 current cursor position.
+(The old form 'uncut' is deprecated.)
 .TP
-.B mark
-Sets the mark at the current position, to start selecting text.
+.B zap
+Throw away the current line (or the marked region).
+(This function is bound by default to <Meta+Delete>.)
 .TP
 .B cutwordleft
 Cuts from the cursor position to the beginning of the preceding word.
+(This function is not bound by default.  If your terminal produces
+\fB^H\fR for <Ctrl+Backspace>, you can make <Ctrl+Backspace> delete
+the word to the left of the cursor by rebinding ^H to this function.)
 .TP
 .B cutwordright
 Cuts from the cursor position to the beginning of the next word.
+(This function is bound by default to <Ctrl+Delete>.)
 .TP
 .B cutrestoffile
 Cuts all text from the cursor position till the end of the buffer.
 .TP
+.B mark
+Sets the mark at the current position, to start selecting text.
+Or, when it is set, unsets the mark.
+.TP
 .B curpos
 Shows the current cursor position: the line, column, and character positions.
 .TP
@@ -506,14 +538,17 @@ Shows the current cursor position: the line, column, and character positions.
 Counts the number of words, lines and characters in the current buffer.
 .TP
 .B speller
-Invokes a spell-checking program (or a linting program, if the current
-syntax highlighting defines one).
+Invokes a spell-checking program (or linting program,
+if the active syntax defines such a thing).
 .TP
 .B linter
 A synonym of \fBspeller\fR (for when the speller has not been configured).
 .TP
 .B justify
-Justifies the current paragraph.
+Justifies the current paragraph.  A paragraph is a group of contiguous lines
+that, apart from possibly the first line, all have the same indentation.  The
+beginning of a paragraph is detected by either this lone line with a differing
+indentation or by a preceding blank line.
 .TP
 .B fulljustify
 Justifies the entire current buffer.
@@ -639,19 +674,20 @@ Suspends the editor (if the suspending function is enabled, see the
 "suspendenable" entry below).
 .TP
 .B casesens
-Toggles case sensitivity in searching (search/replace menus only).
+Toggles whether searching/replacing ignores or respects the case of
+the given characters.
 .TP
 .B regexp
-Toggles whether searching/replacing is based on literal strings or regular expressions.
+Toggles whether searching/replacing uses literal strings or regular expressions.
 .TP
 .B backwards
 Toggles whether searching/replacing goes forward or backward.
 .TP
-.B prevhistory
-Shows the previous history entry in the prompt menus (e.g. search).
+.B older
+Retrieves the previous (earlier) entry at a prompt.
 .TP
-.B nexthistory
-Shows the next history entry in the prompt menus (e.g. search).
+.B newer
+Retrieves the next (later) entry at a prompt.
 .TP
 .B flipreplace
 Toggles between searching for something and replacing something.
@@ -663,10 +699,18 @@ Toggles between searching for text and targeting a line number.
 .B flipexecute
 Toggles between inserting a file and executing a command.
 .TP
+.B flippipe
+When executing a command, toggles whether the current buffer (or marked
+region) is piped to the command.
+.TP
 .B flipnewbuffer
 Toggles between inserting into the current buffer and into a new
 empty buffer.
 .TP
+.B flipconvert
+When reading in a file, toggles between converting and not converting
+it from DOS/Mac format.  Converting is the default.
+.TP
 .B dosformat
 When writing a file, switches to writing a DOS format (CR/LF).
 .TP
@@ -703,11 +747,9 @@ Goes to the last file when using the file browser (reading or writing files).
 .B nohelp
 Toggles the presence of the two-line list of key bindings at the bottom of the screen.
 .TP
-.B constupdate
+.B constantshow
 Toggles the constant display of the current line, column, and character positions.
-.TP
-.B morespace
-Toggles the presence of the blank line that 'separates' the title bar from the file text.
+(The form 'constupdate' is deprecated.)
 .TP
 .B smoothscroll
 Toggles smooth scrolling (when moving around with the arrow keys).
@@ -715,6 +757,9 @@ Toggles smooth scrolling (when moving around with the arrow keys).
 .B softwrap
 Toggles the displaying of overlong lines on multiple screen lines.
 .TP
+.B linenumbers
+Toggles the display of line numbers in front of the text.
+.TP
 .B whitespacedisplay
 Toggles the showing of whitespace.
 .TP
@@ -725,11 +770,14 @@ Toggles syntax highlighting.
 Toggles the smartness of the Home key.
 .TP
 .B autoindent
-Toggles whether new lines will contain the same amount of whitespace as the preceding line.
+Toggles whether a newly created line will contain the same amount of leading
+whitespace as the preceding line -- or as the next line if the preceding line
+is the beginning of a paragraph.
 .TP
-.B cuttoend
+.B cutfromcursor
 Toggles whether cutting text will cut the whole line or just from the current cursor
 position to the end of the line.
+(The form 'cuttoend' is deprecated.)
 .TP
 .B nowrap
 Toggles whether long lines will be hard-wrapped to the next line.
@@ -737,19 +785,9 @@ Toggles whether long lines will be hard-wrapped to the next line.
 .B tabstospaces
 Toggles whether typed tabs will be converted to spaces.
 .TP
-.B backupfile
-Toggles whether a backup will be made of the file being edited.
-.TP
-.B multibuffer
-Toggles whether a file is inserted into the current buffer
-or read into a new buffer.
-.TP
 .B mouse
 Toggles mouse support.
 .TP
-.B noconvert
-Toggles automatic conversion of files from DOS/Mac format.
-.TP
 .B suspendenable
 Toggles whether the suspend sequence (normally ^Z) will suspend the editor window.
 .RE
@@ -770,6 +808,9 @@ The 'search to replace' menu.
 .B replacewith
 The 'replace with' menu, which comes up after 'search to replace'.
 .TP
+.B yesno
+The 'yesno' menu, where the Yes/No/All/Cancel question is asked.
+.TP
 .B gotoline
 The 'goto line (and column)' menu.
 .TP

doc/rnano.1

@@ -7,16 +7,16 @@
 .\"   Foundation, version 3 or (at your option) any later version.  You
 .\"   should have received a copy of the GNU General Public License
 .\"   along with this program.  If not, see
-.\"   <http://www.gnu.org/licenses/>.
+.\"   <https://www.gnu.org/licenses/>.
 .\"
 .\" * The GNU Free Documentation License, as published by the Free
 .\"   Software Foundation, version 1.2 or (at your option) any later
 .\"   version, with no Invariant Sections, no Front-Cover Texts, and no
 .\"   Back-Cover Texts.  You should have received a copy of the GNU Free
 .\"   Documentation License along with this program.  If not, see
-.\"   <http://www.gnu.org/licenses/>.
+.\"   <https://www.gnu.org/licenses/>.
 .\"
-.TH RNANO 1 "version 2.9.5" "March 2018"
+.TH RNANO 1 "version 3.2" "November 2018"
 
 .SH NAME
 rnano \- a restricted nano
@@ -32,13 +32,11 @@ access to the filesystem nor to a command shell.
 .PP
 In restricted mode, \fBnano\fR will:
 .IP \[bu] 2
-not read any nanorc files;
-.IP \[bu]
 not allow suspending;
 .IP \[bu]
-not read nor write any file not specified on the command line;
+not allow saving the current buffer under a different name;
 .IP \[bu]
-not allow saving a file under a different name;
+not allow inserting another file or opening a new buffer;
 .IP \[bu]
 not allow appending or prepending to any file;
 .IP \[bu]

doc/sample.nanorc.in

@@ -1,9 +1,7 @@
 ## Sample initialization file for GNU nano.
 ##
-## Please note that you must have configured nano with --enable-nanorc
-## for this file to be read!  Also note that this file should not be in
-## DOS or Mac format, and that characters specially interpreted by the
-## shell should not be escaped here.
+## This file should not be in DOS or Mac format, and characters
+## specially interpreted by the shell should not be escaped here.
 ##
 ## To make sure an option is disabled, use "unset <option>".
 ##
@@ -15,11 +13,17 @@
 ## its end.  For example, for the "brackets" option, ""')>]}" will match
 ## ", ', ), >, ], and }.
 
+## Make the 'nextword' function (Ctrl+Right) stop at word ends
+## instead of at beginnings.
+# set afterends
+
 ## When soft line wrapping is enabled, make it wrap lines at blanks
 ## (tabs and spaces) instead of always at the edge of the screen.
 # set atblanks
 
-## Use auto-indentation.
+## Automatically indent a newly created line to the same number of
+## tabs and/or spaces as the preceding line -- or as the next line
+## if the preceding line is the beginning of a paragraph.
 # set autoindent
 
 ## Back up files to the current filename plus a tilde.
@@ -31,10 +35,9 @@
 ## Use bold text instead of reverse video text.
 # set boldtext
 
-## The characters treated as closing brackets when justifying
-## paragraphs.  They cannot contain blank characters.  Only closing
-## punctuation, optionally followed by closing brackets, can end
-## sentences.
+## The characters treated as closing brackets when justifying paragraphs.
+## This may not include any blank characters.  Only closing punctuation,
+## optionally followed by these closing brackets, can end sentences.
 # set brackets ""')>]}"
 
 ## Do case-sensitive searches by default.
@@ -43,15 +46,14 @@
 ## Constantly display the cursor position in the status bar.  Note that
 ## this overrides "quickblank".
 # set constantshow
-## (The old form, 'const', is deprecated.)
 
 ## Use cut-from-cursor-to-end-of-line by default.
 # set cutfromcursor
 ## (The old form, 'cut', is deprecated.)
 
-## Set the line length for wrapping text and justifying paragraphs.
-## If the value is 0 or less, the wrapping point will be the screen
-## width less this number.
+## Enable hard-wrapping and set the target width, both for automatic
+## line wrapping and for justifying paragraphs.  If the value is 0 or
+## less, the wrapping point will be the screen width minus this number.
 # set fill -8
 
 ## Remember the used search/replace strings for the next session.
@@ -89,14 +91,14 @@
 ## Don't display the helpful shortcut lists at the bottom of the screen.
 # set nohelp
 
+## Don't automatically add a newline when a file does not end with one.
+# set nonewlines
+
 ## Don't pause between warnings at startup.  Which means that only the
 ## last one will be readable (when there are multiple ones).
 # set nopauses
 
-## Don't add newlines to the ends of files.
-# set nonewlines
-
-## Don't wrap text at all.
+## Do not automatically hard-wrap text.
 # set nowrap
 
 ## Set operating directory.  nano will not read or write files outside
@@ -107,7 +109,6 @@
 
 ## Remember the cursor position in each file for the next editing session.
 # set positionlog
-## (The old form, 'poslog', is deprecated.)
 
 ## Preserve the XON and XOFF keys (^Q and ^S).
 # set preserve
@@ -123,12 +124,8 @@
 # set quickblank
 
 ## The email-quote string, used to justify email-quoted paragraphs.
-## This is an extended regular expression if your system supports them,
-## otherwise a literal string.
-## If you have extended regular expression support, the default is:
-# set quotestr "^([ 	]*[#:>\|}])+"
-## Otherwise:
-# set quotestr "> "
+## This is an extended regular expression.  The default is:
+# set quotestr "^([ 	]*([#:>|}]|//))+"
 
 ## Fix Backspace/Delete confusion problem.
 # set rebinddelete
@@ -139,8 +136,9 @@
 ## Do extended regular expression searches by default.
 # set regexp
 
-## Put the cursor on the highlighted item in the file browser;
-## useful for people who use a braille display.
+## Put the cursor on the highlighted item in the file browser, and show
+## the cursor in the help viewer; useful for people who use a braille
+## display and people with poor vision.
 # set showcursor
 
 ## Make the Home key smarter.  When Home is pressed anywhere but at the
@@ -150,7 +148,7 @@
 ## beginning of the line.
 # set smarthome
 
-## Use smooth scrolling as the default.
+## Use line-by-line scrolling instead of chunk-by-chunk.
 # set smooth
 
 ## Enable soft line wrapping (AKA full-line display).
@@ -174,6 +172,7 @@
 
 ## Snip whitespace at the end of lines when justifying or hard-wrapping.
 # set trimblanks
+## (The old form, 'justifytrim', is deprecated.)
 
 ## Disallow file modification.  Why would you want this in an rcfile? ;)
 # set view
@@ -195,6 +194,9 @@
 ## set, it overrides option 'set wordbounds'.
 # set wordchars "<_>."
 
+## Let an unmodified Backspace or Delete erase the marked region (instead
+## of a single character, and without affecting the cutbuffer).
+# set zap
 
 ## Paint the interface elements of nano.  These are examples;
 ## by default there are no colors, except for errorcolor.
@@ -233,9 +235,9 @@
 ## "color" will do case-sensitive matches, while "icolor" will do
 ## case-insensitive matches.
 ##
-## Valid colors: white, black, red, blue, green, yellow, magenta, cyan.
-## For foreground colors, you may use the prefix "bright" to get a
-## stronger highlight.
+## Valid color names ares: white, black, normal, red, blue, green,
+## yellow, magenta, cyan.  For foreground colors, you may use the
+## prefix "bright" to get a stronger highlight.
 ##
 ## To use multi-line regexes, use the start="regex" end="regex"
 ## [start="regex" end="regex"...] format.
@@ -255,18 +257,51 @@
 ## ".nanorc" extension) should be the same as the "short description"
 ## name inside that file.  These names are kept fairly short to make
 ## them easier to remember and faster to type using nano's -Y option.
-##
+
 ## To include all existing syntax definitions, you can do:
 # include "@PKGDATADIR@/*.nanorc"
 
 
 ## Key bindings.
 ## See nanorc(5) (section REBINDING KEYS) for more details on this.
-##
-## The following two functions are not bound to any key by default.
-## You may wish to choose other keys than the ones suggested here.
-# bind M-B cutwordleft main
-# bind M-N cutwordright main
 
-## Set this if your Backspace key sends Del most of the time.
-# bind Del backspace all
+## The <Ctrl+Delete> keystroke deletes the word to the right of the cursor.
+## On some terminals the <Ctrl+Backspace> keystroke produces ^H, which is
+## the ASCII character for backspace, so it is bound by default to the
+## backspace function.  The <Backspace> key itself produces a different
+## keycode, which is hard-bound to the backspace function.  So, if you
+## normally use <Backspace> for backspacing and not ^H, you can make
+## <Ctrl+Backspace> delete the word to the left of the cursor with:
+# bind ^H cutwordleft main
+
+## If you would like nano to have keybindings that are more "usual",
+## such as ^O for Open, ^F for Find, ^H for Help, and ^Q for Quit,
+## then uncomment these:
+#bind ^Q exit all
+#bind ^H help all
+#bind ^H exit help
+#bind ^F whereis all
+#bind ^G findnext all
+#bind ^B wherewas all
+#bind ^D findprevious all
+#bind ^R replace main
+#bind ^W writeout main
+#bind ^O insert main
+#unbind ^V all
+#unbind ^Y all
+#bind M-X flipnewbuffer all
+#bind ^X cut all
+#bind ^C copy all
+#bind ^V paste all
+#bind ^P curpos main
+#bind ^T gotoline main
+#bind ^T gotodir browser
+#bind ^Y speller main
+#unbind ^K all
+#unbind ^U all
+#bind M-R redo main
+#bind ^U undo main
+#bind ^E redo main
+#unbind M-J main
+#unbind M-T main
+#set multibuffer

roll-a-release.sh

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

src/browser.c

@@ -166,15 +166,13 @@ char *do_browser(char *path)
 			say_there_is_no_help();
 #endif
 		} else if (func == do_search_forward) {
-			do_filesearch();
-		} else if (func == do_research) {
-			do_fileresearch(TRUE);
-#ifndef NANO_TINY
+			do_filesearch(FORWARD);
+		} else if (func == do_search_backward) {
+			do_filesearch(BACKWARD);
 		} else if (func == do_findprevious) {
-			do_fileresearch(FALSE);
+			do_fileresearch(BACKWARD);
 		} else if (func == do_findnext) {
-			do_fileresearch(TRUE);
-#endif
+			do_fileresearch(FORWARD);
 		} else if (func == do_left) {
 			if (selected > 0)
 				selected--;
@@ -464,10 +462,11 @@ functionptrtype parse_browser_input(int *kbinput)
 {
 	if (!meta_key) {
 		switch (*kbinput) {
-			case ' ':
-				return do_page_down;
+			case DEL_CODE:
 			case '-':
 				return do_page_up;
+			case ' ':
+				return do_page_down;
 			case '?':
 				return do_help_void;
 			case 'E':
@@ -488,11 +487,9 @@ functionptrtype parse_browser_input(int *kbinput)
 			case '/':
 				return do_search_forward;
 			case 'N':
-#ifndef NANO_TINY
 				return do_findprevious;
-#endif
 			case 'n':
-				return do_research;
+				return do_findnext;
 		}
 	}
 	return func_from_key(kbinput);
@@ -659,42 +656,42 @@ void browser_select_dirname(const char *needle)
 	}
 }
 
-/* Set up the system variables for a filename search.  Return -1 or -2 if
- * the search should be canceled (due to Cancel or a blank search string),
- * return 0 when we have a string, and return a positive value when some
- * function was run. */
-int filesearch_init(void)
+/* Prepare the prompt and ask the user what to search for.  If forwards is
+ * TRUE, search forward in the list; otherwise, search backward.  Return -2
+ * for a blank answer, -1 for Cancel, 0 when we have a string, and a
+ * positive value when some function was run. */
+int filesearch_init(bool forwards)
 {
-	int input;
-	char *buf;
+	char *thedefault;
+	int response;
 
+	/* If something was searched for before, show it between square brackets. */
 	if (*last_search != '\0') {
 		char *disp = display_string(last_search, 0, COLS / 3, FALSE);
 
-		buf = charalloc(strlen(disp) + 7);
+		thedefault = charalloc(strlen(disp) + 7);
 		/* We use (COLS / 3) here because we need to see more on the line. */
-		sprintf(buf, " [%s%s]", disp,
+		sprintf(thedefault, " [%s%s]", disp,
 				(strlenpt(last_search) > COLS / 3) ? "..." : "");
 		free(disp);
 	} else
-		buf = mallocstrcpy(NULL, "");
+		thedefault = mallocstrcpy(NULL, "");
 
-	/* This is now one simple call.  It just does a lot. */
-	input = do_prompt(FALSE, FALSE, MWHEREISFILE, NULL, &search_history,
-				browser_refresh, "%s%s", _("Search"), buf);
-
-	/* Release buf now that we don't need it anymore. */
-	free(buf);
+	/* Now ask what to search for. */
+	response = do_prompt(FALSE, FALSE, MWHEREISFILE, NULL, &search_history,
+						browser_refresh, "%s%s%s", _("Search"),
+						!forwards ? _(" [Backwards]") : "", thedefault);
+	free(thedefault);
 
 	/* If only Enter was pressed but we have a previous string, it's okay. */
-	if (input == -2 && *last_search != '\0')
+	if (response == -2 && *last_search != '\0')
 		return 0;
 
-	/* Otherwise negative inputs are a bailout. */
-	if (input < 0)
+	/* Otherwise negative responses are a bailout. */
+	if (response < 0)
 		statusbar(_("Cancelled"));
 
-	return input;
+	return response;
 }
 
 /* Look for the given needle in the list of files.  If forwards is TRUE,
@@ -756,11 +753,12 @@ void findfile(const char *needle, bool forwards)
 	selected = looking_at;
 }
 
-/* Search for a filename. */
-void do_filesearch(void)
+/* Search for a filename.  If forwards is TRUE, search forward in the list;
+ * otherwise, search backward.*/
+void do_filesearch(bool forwards)
 {
 	/* If the user cancelled or jumped to first or last file, don't search. */
-	if (filesearch_init() != 0)
+	if (filesearch_init(forwards) != 0)
 		return;
 
 	/* If answer is now "", copy last_search into answer. */
@@ -775,7 +773,7 @@ void do_filesearch(void)
 		update_history(&search_history, answer);
 #endif
 
-	findfile(answer, TRUE);
+	findfile(answer, forwards);
 }
 
 /* Search again without prompting for the last given search string,

src/chars.c

@@ -62,11 +62,6 @@ bool is_byte(int c)
 	return ((unsigned int)c == (unsigned char)c);
 }
 
-void mbtowc_reset(void)
-{
-	IGNORE_CALL_RESULT(mbtowc(NULL, NULL, 0));
-}
-
 /* This function is equivalent to isalpha() for multibyte characters. */
 bool is_alpha_mbchar(const char *c)
 {
@@ -74,10 +69,8 @@ bool is_alpha_mbchar(const char *c)
 	if (use_utf8) {
 		wchar_t wc;
 
-		if (mbtowc(&wc, c, MAXCHARLEN) < 0) {
-			mbtowc_reset();
+		if (mbtowc(&wc, c, MAXCHARLEN) < 0)
 			return 0;
-		}
 
 		return iswalpha(wc);
 	} else
@@ -92,10 +85,8 @@ bool is_alnum_mbchar(const char *c)
 	if (use_utf8) {
 		wchar_t wc;
 
-		if (mbtowc(&wc, c, MAXCHARLEN) < 0) {
-			mbtowc_reset();
+		if (mbtowc(&wc, c, MAXCHARLEN) < 0)
 			return 0;
-		}
 
 		return iswalnum(wc);
 	} else
@@ -110,10 +101,8 @@ bool is_blank_mbchar(const char *c)
 	if (use_utf8) {
 		wchar_t wc;
 
-		if (mbtowc(&wc, c, MAXCHARLEN) < 0) {
-			mbtowc_reset();
+		if (mbtowc(&wc, c, MAXCHARLEN) < 0)
 			return 0;
-		}
 
 		return iswblank(wc);
 	} else
@@ -128,13 +117,6 @@ bool is_ascii_cntrl_char(int c)
 	return (0 <= c && c < 32);
 }
 
-/* This function is equivalent to iscntrl(), except in that it also
- * handles high-bit control characters. */
-bool is_cntrl_char(int c)
-{
-	return ((c & 0x60) == 0 || c == 127);
-}
-
 /* This function is equivalent to iscntrl() for multibyte characters,
  * except in that it also handles multibyte control characters with
  * their high bits set. */
@@ -146,7 +128,7 @@ bool is_cntrl_mbchar(const char *c)
 				((signed char)c[0] == -62 && (signed char)c[1] < -96));
 	} else
 #endif
-		return is_cntrl_char((unsigned char)*c);
+		return (((unsigned char)*c & 0x60) == 0 || (unsigned char)*c == 127);
 }
 
 /* This function is equivalent to ispunct() for multibyte characters. */
@@ -156,10 +138,8 @@ bool is_punct_mbchar(const char *c)
 	if (use_utf8) {
 		wchar_t wc;
 
-		if (mbtowc(&wc, c, MAXCHARLEN) < 0) {
-			mbtowc_reset();
+		if (mbtowc(&wc, c, MAXCHARLEN) < 0)
 			return 0;
-		}
 
 		return iswpunct(wc);
 	} else
@@ -232,10 +212,8 @@ int length_of_char(const char *c, int *width)
 		int charlen = mbtowc(&wc, c, MAXCHARLEN);
 
 		/* If the sequence is invalid... */
-		if (charlen < 0) {
-			mbtowc_reset();
+		if (charlen < 0)
 			return -1;
-		}
 
 		/* If the codepoint is invalid... */
 		if (!is_valid_unicode(wc))
@@ -260,10 +238,8 @@ int mbwidth(const char *c)
 		wchar_t wc;
 		int width;
 
-		if (mbtowc(&wc, c, MAXCHARLEN) < 0) {
-			mbtowc_reset();
+		if (mbtowc(&wc, c, MAXCHARLEN) < 0)
 			return 1;
-		}
 
 		width = wcwidth(wc);
 
@@ -309,65 +285,45 @@ char *make_mbchar(long chr, int *chr_mb_len)
  * col isn't NULL, add the character's width (in columns) to it. */
 int parse_mbchar(const char *buf, char *chr, size_t *col)
 {
+	int length;
+
 #ifdef ENABLE_UTF8
-	if (use_utf8) {
-		/* Get the number of bytes in the multibyte character. */
-		int length = mblen(buf, MAXCHARLEN);
+	/* If this is a UTF-8 starter byte, get the number of bytes of the character. */
+	if ((signed char)*buf < 0) {
+		length = mblen(buf, MAXCHARLEN);
 
 		/* When the multibyte sequence is invalid, only take the first byte. */
-		if (length <= 0) {
-			IGNORE_CALL_RESULT(mblen(NULL, 0));
+		if (length <= 0)
 			length = 1;
-		}
-
-		/* When requested, store the multibyte character in chr. */
-		if (chr != NULL) {
-			int i;
-
-			for (i = 0; i < length; i++)
-				chr[i] = buf[i];
-		}
-
-		/* When requested, add the width of the character to col. */
-		if (col != NULL) {
-			/* If we have a tab, compute its width in columns based on the
-			 * current value of col. */
-			if (*buf == '\t')
-				*col += tabsize - *col % tabsize;
-			/* If we have a control character, it's two columns wide: one
-			 * column for the "^", and one for the visible character. */
-			else if (is_cntrl_mbchar(buf)) {
-				*col += 2;
-			/* If we have a normal character, get its width normally. */
-			} else
-				*col += mbwidth(buf);
-		}
-
-		return length;
 	} else
 #endif
-	{
-		/* When requested, store the byte character in chr. */
-		if (chr != NULL)
-			*chr = *buf;
+		length = 1;
 
-		/* When requested, add the width of the character to col. */
-		if (col != NULL) {
-			/* If we have a tab, compute its width in columns using the
-			 * current value of col. */
-			if (*buf == '\t')
-				*col += tabsize - *col % tabsize;
-			/* If we have a control character, it's two columns wide: one
-			 * column for the "^", and one for the visible character. */
-			else if (is_cntrl_char((unsigned char)*buf))
-				*col += 2;
-			/* If we have a normal character, it's one column wide. */
-			else
-				(*col)++;
-		}
+	/* When requested, store the multibyte character in chr. */
+	if (chr != NULL)
+		for (int i = 0; i < length; i++)
+			chr[i] = buf[i];
 
-		return 1;
+	/* When requested, add the width of the character to col. */
+	if (col != NULL) {
+		/* If we have a tab, compute its width in columns based on the
+		 * current value of col. */
+		if (*buf == '\t')
+			*col += tabsize - *col % tabsize;
+		/* If we have a control character, it's two columns wide: one
+		 * column for the "^", and one for the visible character. */
+		else if (is_cntrl_mbchar(buf))
+			*col += 2;
+		/* If we have a normal character, get its width normally. */
+		else if (length == 1)
+			*col += 1;
+#ifdef ENABLE_UTF8
+		else
+			*col += mbwidth(buf);
+#endif
 	}
+
+	return length;
 }
 
 /* Return the index in buf of the beginning of the multibyte character
@@ -430,17 +386,8 @@ int mbstrncasecmp(const char *s1, const char *s2, size_t n)
 		wchar_t wc1, wc2;
 
 		while (*s1 != '\0' && *s2 != '\0' && n > 0) {
-			bool bad1 = FALSE, bad2 = FALSE;
-
-			if (mbtowc(&wc1, s1, MAXCHARLEN) < 0) {
-				mbtowc_reset();
-				bad1 = TRUE;
-			}
-
-			if (mbtowc(&wc2, s2, MAXCHARLEN) < 0) {
-				mbtowc_reset();
-				bad2 = TRUE;
-			}
+			bool bad1 = (mbtowc(&wc1, s1, MAXCHARLEN) < 0);
+			bool bad2 = (mbtowc(&wc2, s2, MAXCHARLEN) < 0);
 
 			if (bad1 || bad2) {
 				if (*s1 != *s2)
@@ -556,22 +503,26 @@ char *mbrevstrcasestr(const char *haystack, const char *needle,
 		return revstrcasestr(haystack, needle, pointer);
 }
 
-/* This function is equivalent to strlen() for multibyte strings. */
+/* Count the number of (multibyte) characters in the given string. */
 size_t mbstrlen(const char *s)
 {
-	return mbstrnlen(s, (size_t)-1);
-}
+	size_t maxlen = (size_t)-1;
 
-/* This function is equivalent to strnlen() for multibyte strings. */
-size_t mbstrnlen(const char *s, size_t maxlen)
-{
 #ifdef ENABLE_UTF8
 	if (use_utf8) {
 		size_t n = 0;
 
-		for (; *s != '\0' && maxlen > 0; s += move_mbright(s, 0),
-				maxlen--, n++)
-			;
+		while (*s != '\0' && maxlen > 0) {
+			if ((signed char)*s < 0) {
+				int length = mblen(s, MAXCHARLEN);
+
+				s += (length < 0 ? 1 : length);
+			} else
+				s++;
+
+			maxlen--;
+			n++;
+		}
 
 		return n;
 	} else
@@ -591,7 +542,6 @@ char *mbstrchr(const char *s, const char *c)
 		wchar_t ws, wc;
 
 		if (mbtowc(&wc, c, MAXCHARLEN) < 0) {
-			mbtowc_reset();
 			wc = (unsigned char)*c;
 			bad_c_mb = TRUE;
 		}
@@ -600,7 +550,6 @@ char *mbstrchr(const char *s, const char *c)
 			int sym_len = parse_mbchar(s, symbol, NULL);
 
 			if (mbtowc(&ws, symbol, sym_len) < 0) {
-				mbtowc_reset();
 				ws = (unsigned char)*s;
 				bad_s_mb = TRUE;
 			}
@@ -731,17 +680,3 @@ bool is_valid_unicode(wchar_t wc)
 				(0xFFFF < wc && wc <= 0x10FFFF && (wc & 0xFFFF) <= 0xFFFD));
 }
 #endif
-
-#ifdef ENABLE_NANORC
-/* Check if the string s is a valid multibyte string.  Return TRUE if it
- * is, and FALSE otherwise. */
-bool is_valid_mbstring(const char *s)
-{
-#ifdef ENABLE_UTF8
-	if (use_utf8)
-		return (mbstowcs(NULL, s, 0) != (size_t)-1);
-	else
-#endif
-		return TRUE;
-}
-#endif /* ENABLE_NANORC */

src/color.c

@@ -60,13 +60,13 @@ void set_colorpairs(void)
 		colortype *combo = color_combo[i];
 
 		if (combo != NULL) {
-			if (combo->fg == -1 && !using_defaults)
+			if (combo->fg == USE_THE_DEFAULT && !using_defaults)
 				combo->fg = COLOR_WHITE;
-			if (combo->bg == -1 && !using_defaults)
+			if (combo->bg == USE_THE_DEFAULT && !using_defaults)
 				combo->bg = COLOR_BLACK;
 			init_pair(i + 1, combo->fg, combo->bg);
 			interface_color_pair[i] = COLOR_PAIR(i + 1) | A_BANDAID |
-										(combo->bright ? A_BOLD : A_NORMAL);
+										combo->attributes;
 		} else {
 			if (i == FUNCTION_TAG)
 				interface_color_pair[i] = A_NORMAL;
@@ -98,8 +98,7 @@ void set_colorpairs(void)
 			else
 				ink->pairnum = new_number++;
 
-			ink->attributes = COLOR_PAIR(ink->pairnum) | A_BANDAID |
-								(ink->bright ? A_BOLD : A_NORMAL);
+			ink->attributes |= COLOR_PAIR(ink->pairnum) | A_BANDAID;
 		}
 	}
 }
@@ -125,10 +124,10 @@ void color_init(void)
 		foreground = ink->fg;
 		background = ink->bg;
 
-		if (foreground == -1 && !using_defaults)
+		if (foreground == USE_THE_DEFAULT && !using_defaults)
 			foreground = COLOR_WHITE;
 
-		if (background == -1 && !using_defaults)
+		if (background == USE_THE_DEFAULT && !using_defaults)
 			background = COLOR_BLACK;
 
 		init_pair(ink->pairnum, foreground, background);

src/cut.c

@@ -33,12 +33,6 @@ void cutbuffer_reset(void)
 	keep_cutbuffer = FALSE;
 }
 
-/* Return the status of cutbuffer preservation. */
-inline bool keeping_cutbuffer(void)
-{
-	return keep_cutbuffer;
-}
-
 /* If we aren't on the last line of the file, move all the text of the
  * current line, plus the newline at the end, into the cutbuffer.  If we
  * are, move all of the text of the current line into the cutbuffer.  In
@@ -110,8 +104,9 @@ void cut_to_eof(void)
 /* Move text from the current buffer into the cutbuffer.  If
  * copy_text is TRUE, copy the text back into the buffer afterward.
  * If cut_till_eof is TRUE, move all text from the current cursor
- * position to the end of the file into the cutbuffer. */
-void do_cut_text(bool copy_text, bool cut_till_eof)
+ * position to the end of the file into the cutbuffer.  If append
+ * is TRUE (when zapping), always append the cut to the cutbuffer. */
+void do_cut_text(bool copy_text, bool marked, bool cut_till_eof, bool append)
 {
 #ifndef NANO_TINY
 	filestruct *cb_save = NULL;
@@ -125,12 +120,12 @@ void do_cut_text(bool copy_text, bool cut_till_eof)
 #endif
 	size_t was_totsize = openfile->totsize;
 
-	/* If a chain of cuts was broken, empty the cutbuffer. */
-	if (!keep_cutbuffer) {
+	/* If cuts were not continuous, or when cutting a region, clear the slate. */
+	if (!append && (!keep_cutbuffer || marked || cut_till_eof)) {
 		free_filestruct(cutbuffer);
 		cutbuffer = NULL;
-		/* Indicate that future cuts should add to the cutbuffer. */
-		keep_cutbuffer = TRUE;
+		/* After a line cut, future line cuts should add to the cutbuffer. */
+		keep_cutbuffer = !marked && !cut_till_eof;
 	}
 
 #ifndef NANO_TINY
@@ -187,21 +182,22 @@ void do_cut_text(bool copy_text, bool cut_till_eof)
 		set_modified();
 
 	refresh_needed = TRUE;
-
-#ifdef DEBUG
-	dump_filestruct(cutbuffer);
-#endif
 }
 
 /* Move text from the current buffer into the cutbuffer. */
 void do_cut_text_void(void)
 {
 #ifndef NANO_TINY
-	add_undo(CUT);
-#endif
-	do_cut_text(FALSE, FALSE);
-#ifndef NANO_TINY
+	/* Only add a new undo item when the current item is not a CUT or when
+	 * the current cut is not contiguous with the previous cutting. */
+	if (openfile->last_action != CUT || openfile->current_undo == NULL ||
+			openfile->current_undo->mark_begin_lineno != openfile->current->lineno ||
+			!keep_cutbuffer)
+		add_undo(CUT);
+	do_cut_text(FALSE, openfile->mark, FALSE, FALSE);
 	update_undo(CUT);
+#else
+	do_cut_text(FALSE, FALSE, FALSE, FALSE);
 #endif
 }
 
@@ -211,7 +207,7 @@ void do_cut_text_void(void)
  * was moved, blow away previous contents of the cutbuffer. */
 void do_copy_text(void)
 {
-	static struct filestruct *next_contiguous_line = NULL;
+	static filestruct *next_contiguous_line = NULL;
 	bool mark_is_set = (openfile->mark != NULL);
 
 	/* Remember the current viewport and cursor position. */
@@ -223,7 +219,7 @@ void do_copy_text(void)
 	if (mark_is_set || openfile->current != next_contiguous_line)
 		cutbuffer_reset();
 
-	do_cut_text(TRUE, FALSE);
+	do_cut_text(TRUE, mark_is_set, FALSE, FALSE);
 
 	/* If the mark was set, blow away the cutbuffer on the next copy. */
 	next_contiguous_line = (mark_is_set ? NULL : openfile->current);
@@ -241,9 +237,35 @@ void do_copy_text(void)
 void do_cut_till_eof(void)
 {
 	add_undo(CUT_TO_EOF);
-	do_cut_text(FALSE, TRUE);
+	do_cut_text(FALSE, FALSE, TRUE, FALSE);
 	update_undo(CUT_TO_EOF);
 }
+
+/* Erase text (current line or marked region), sending it into oblivion. */
+void zap_text(void)
+{
+	/* Remember the current cutbuffer so it can be restored after the zap. */
+	filestruct *was_cutbuffer = cutbuffer;
+	filestruct *was_cutbottom = cutbottom;
+
+	/* Add a new undo item only when the current item is not a ZAP or when
+	 * the current zap is not contiguous with the previous zapping. */
+	if (openfile->last_action != ZAP || openfile->current_undo == NULL ||
+			openfile->current_undo->mark_begin_lineno != openfile->current->lineno ||
+			openfile->current_undo->xflags & (MARK_WAS_SET|WAS_MARKED_FORWARD))
+		add_undo(ZAP);
+
+	/* Use the cutbuffer from the ZAP undo item, so the cut can be undone. */
+	cutbuffer = openfile->current_undo->cutbuffer;
+	cutbottom = openfile->current_undo->cutbottom;
+
+	do_cut_text(FALSE, openfile->mark, FALSE, TRUE);
+
+	update_undo(ZAP);
+
+	cutbuffer = was_cutbuffer;
+	cutbottom = was_cutbottom;
+}
 #endif /* !NANO_TINY */
 
 /* Copy text from the cutbuffer into the current buffer. */

src/files.c

@@ -2,7 +2,7 @@
  *   files.c  --  This file is part of GNU nano.                          *
  *                                                                        *
  *   Copyright (C) 1999-2011, 2013-2018 Free Software Foundation, Inc.    *
- *   Copyright (C) 2015-2017 Benno Schulenberg                            *
+ *   Copyright (C) 2015-2018 Benno Schulenberg                            *
  *                                                                        *
  *   GNU nano is free software: you can redistribute it and/or modify     *
  *   it under the terms of the GNU General Public License as published    *
@@ -62,7 +62,7 @@ bool has_valid_path(const char *filename)
 /* Add an item to the circular list of openfile structs. */
 void make_new_buffer(void)
 {
-	openfilestruct *newnode = make_new_opennode();
+	openfilestruct *newnode = nmalloc(sizeof(openfilestruct));
 
 	if (openfile == NULL) {
 		/* Make the first open file the only element in the list. */
@@ -512,6 +512,7 @@ void replace_buffer(const char *filename)
 {
 	FILE *f;
 	int descriptor;
+	filestruct *was_cutbuffer = cutbuffer;
 
 	/* Open the file quietly. */
 	descriptor = open_file(filename, FALSE, TRUE, &f);
@@ -520,29 +521,44 @@ void replace_buffer(const char *filename)
 	if (descriptor < 0)
 		return;
 
-	/* Reinitialize the text of the current buffer. */
-	free_filestruct(openfile->fileage);
-	initialize_buffer_text();
+#ifndef NANO_TINY
+	add_undo(COUPLE_BEGIN);
+	openfile->undotop->strdata = mallocstrcpy(NULL, _("spelling correction"));
+#endif
+
+	/* Throw away the text of the file. */
+	cutbuffer = NULL;
+	openfile->current = openfile->fileage;
+	openfile->current_x = 0;
+#ifndef NANO_TINY
+	add_undo(CUT_TO_EOF);
+#endif
+	do_cut_text(FALSE, FALSE, TRUE, FALSE);
+#ifndef NANO_TINY
+	update_undo(CUT_TO_EOF);
+#endif
+	free_filestruct(cutbuffer);
+	cutbuffer = was_cutbuffer;
 
 	/* Insert the processed file into its place. */
-	read_file(f, descriptor, filename, FALSE);
+	read_file(f, descriptor, filename, TRUE);
 
-	/* Put current at a place that is certain to exist. */
-	openfile->current = openfile->fileage;
+#ifndef NANO_TINY
+	add_undo(COUPLE_END);
+	openfile->undotop->strdata = mallocstrcpy(NULL, _("spelling correction"));
+#endif
 }
 
 #ifndef NANO_TINY
 /* Open the specified file, and if that succeeds, blow away the text of
- * the current buffer at the given coordinates and read the file
+ * the current buffer covered by the mark and read the file
  * contents into its place. */
-void replace_marked_buffer(const char *filename, filestruct *top, size_t top_x,
-		filestruct *bot, size_t bot_x)
+void replace_marked_buffer(const char *filename)
 {
 	FILE *f;
 	int descriptor;
 	bool old_no_newlines = ISSET(NO_NEWLINES);
-	filestruct *trash_top = NULL;
-	filestruct *trash_bot = NULL;
+	filestruct *was_cutbuffer = cutbuffer;
 
 	descriptor = open_file(filename, FALSE, TRUE, &f);
 
@@ -552,15 +568,26 @@ void replace_marked_buffer(const char *filename, filestruct *top, size_t top_x,
 	/* Don't add a magicline when replacing text in the buffer. */
 	SET(NO_NEWLINES);
 
-	/* Throw away the text under the mark, and insert the processed file
-	 * where the marked text was. */
-	extract_buffer(&trash_top, &trash_bot, top, top_x, bot, bot_x);
-	free_filestruct(trash_top);
-	read_file(f, descriptor, filename, FALSE);
+	add_undo(COUPLE_BEGIN);
+	openfile->undotop->strdata = mallocstrcpy(NULL, _("spelling correction"));
+
+	/* Throw away the text under the mark. */
+	cutbuffer = NULL;
+	add_undo(CUT);
+	do_cut_text(FALSE, TRUE, FALSE, FALSE);
+	update_undo(CUT);
+	free_filestruct(cutbuffer);
+	cutbuffer = was_cutbuffer;
+
+	/* Insert the processed file where the marked text was. */
+	read_file(f, descriptor, filename, TRUE);
 
 	/* Restore the magicline behavior now that we're done fiddling. */
 	if (!old_no_newlines)
 		UNSET(NO_NEWLINES);
+
+	add_undo(COUPLE_END);
+	openfile->undotop->strdata = mallocstrcpy(NULL, _("spelling correction"));
 }
 #endif /* !NANO_TINY */
 #endif /* ENABLE_SPELLER */
@@ -585,12 +612,31 @@ void prepare_for_display(void)
 }
 
 #ifdef ENABLE_MULTIBUFFER
+/* Show name of current buffer and its number of lines on the status bar. */
+void mention_name_and_linecount(void)
+{
+	size_t count = openfile->filebot->lineno -
+						(openfile->filebot->data[0] == '\0' ? 1 : 0);
+#ifndef NANO_TINY
+	if (openfile->fmt != NIX_FILE)
+		/* TRANSLATORS: first %s is file name, second %s is file format. */
+		statusline(HUSH, P_("%s -- %zu line (%s)", "%s -- %zu lines (%s)", count),
+						openfile->filename[0] == '\0' ?
+						_("New Buffer") : tail(openfile->filename), count,
+						openfile->fmt == DOS_FILE ? _("DOS") : _("Mac"));
+	else
+#endif
+		statusline(HUSH, P_("%s -- %zu line", "%s -- %zu lines", count),
+						openfile->filename[0] == '\0' ?
+						_("New Buffer") : tail(openfile->filename), count);
+}
+
 /* Switch to a neighbouring file buffer; to the next if to_next is TRUE;
  * otherwise, to the previous one. */
 void switch_to_adjacent_buffer(bool to_next)
 {
 	/* If only one file buffer is open, say so and get out. */
-	if (openfile == openfile->next && !inhelp) {
+	if (openfile == openfile->next) {
 		statusbar(_("No more open file buffers"));
 		return;
 	}
@@ -615,14 +661,8 @@ void switch_to_adjacent_buffer(bool to_next)
 	/* Ensure that the main loop will redraw the help lines. */
 	currmenu = MMOST;
 
-	/* Indicate the switch on the statusbar. */
-	statusline(HUSH, _("Switched to %s"),
-						((openfile->filename[0] == '\0') ?
-						_("New Buffer") : openfile->filename));
-
-#ifdef DEBUG
-	dump_filestruct(openfile->current);
-#endif
+	/* Indicate on the status bar where we switched to. */
+	mention_name_and_linecount();
 }
 
 /* Switch to the previous entry in the list of open files. */
@@ -647,7 +687,7 @@ bool close_buffer(void)
 		return FALSE;
 
 #ifdef ENABLE_HISTORIES
-	if (ISSET(POS_HISTORY))
+	if (ISSET(POSITIONLOG))
 		update_poshistory(openfile->filename,
 						openfile->current->lineno, xplustabs() + 1);
 #endif
@@ -760,8 +800,12 @@ void read_file(FILE *f, int fd, const char *filename, bool undoable)
 	topline = make_new_node(NULL);
 	bottomline = topline;
 
+	/* Lock the file before starting to read it, to avoid the overhead
+	 * of locking it for each single byte that we read from it. */
+	flockfile(f);
+
 	/* Read the entire file into the new buffer. */
-	while ((input_int = getc(f)) != EOF) {
+	while ((input_int = getc_unlocked(f)) != EOF) {
 		input = (char)input_int;
 
 		/* If it's a *nix file ("\n") or a DOS file ("\r\n"), and file
@@ -828,6 +872,9 @@ void read_file(FILE *f, int fd, const char *filename, bool undoable)
 #endif
 	}
 
+	/* We are done with the file, unlock it. */
+	funlockfile(f);
+
 	/* Perhaps this could use some better handling. */
 	if (ferror(f))
 		nperror(filename);
@@ -1036,7 +1083,7 @@ void do_insertfile(void)
 		if (execute) {
 #ifdef ENABLE_MULTIBUFFER
 			if (ISSET(MULTIBUFFER))
-				/* TRANSLATORS: The next four messages are prompts. */
+				/* TRANSLATORS: The next six messages are prompts. */
 				msg = _("Command to execute in new buffer");
 			else
 #endif
@@ -1046,10 +1093,20 @@ void do_insertfile(void)
 		{
 #ifdef ENABLE_MULTIBUFFER
 			if (ISSET(MULTIBUFFER))
-				msg = _("File to insert into new buffer [from %s]");
+#ifndef NANO_TINY
+				if ISSET(NO_CONVERT)
+					msg = _("File to read unconverted into new buffer [from %s]");
+				else
+#endif
+					msg = _("File to read into new buffer [from %s]");
 			else
 #endif
-				msg = _("File to insert [from %s]");
+#ifndef NANO_TINY
+				if ISSET(NO_CONVERT)
+					msg = _("File to insert unconverted [from %s]");
+				else
+#endif
+					msg = _("File to insert [from %s]");
 		}
 
 		present_path = mallocstrcpy(present_path, "./");
@@ -1092,6 +1149,10 @@ void do_insertfile(void)
 			}
 #endif
 #ifndef NANO_TINY
+			if (func == flip_convert) {
+				TOGGLE(NO_CONVERT);
+				continue;
+			}
 			if (func == flip_execute) {
 				execute = !execute;
 				continue;
@@ -1109,6 +1170,13 @@ void do_insertfile(void)
 				answer = chosen;
 				i = 0;
 			}
+#endif
+#ifndef NANO_TINY
+			if (func == flip_pipe) {
+				add_or_remove_pipe_symbol_from_answer();
+				given = mallocstrcpy(given, answer);
+				continue;
+			}
 #endif
 			/* If we don't have a file yet, go back to the prompt. */
 			if (i != 0 && (!ISSET(MULTIBUFFER) || i != -2))
@@ -1153,7 +1221,7 @@ void do_insertfile(void)
 #ifdef ENABLE_MULTIBUFFER
 			if (ISSET(MULTIBUFFER)) {
 #ifdef ENABLE_HISTORIES
-				if (ISSET(POS_HISTORY)) {
+				if (ISSET(POSITIONLOG)) {
 					ssize_t priorline, priorcol;
 #ifndef NANO_TINY
 					if (!execute)
@@ -1190,10 +1258,6 @@ void do_insertfile_void(void)
 {
 	if (ISSET(RESTRICTED))
 		show_restricted_warning();
-#ifdef ENABLE_MULTIBUFFER
-	else if (ISSET(VIEW_MODE) && !ISSET(MULTIBUFFER))
-		statusbar(_("Key invalid in non-multibuffer mode"));
-#endif
 	else
 		do_insertfile();
 }
@@ -1755,6 +1819,7 @@ bool write_file(const char *name, FILE *f_open, bool tmp,
 			umask(original_umask);
 	}
 
+#ifndef NANO_TINY
 	/* If we're prepending, copy the file to a temp file. */
 	if (method == PREPEND) {
 		int fd_source;
@@ -1801,6 +1866,7 @@ bool write_file(const char *name, FILE *f_open, bool tmp,
 			goto cleanup_and_exit;
 		}
 	}
+#endif /* !NANO_TINY */
 
 	if (f_open == NULL) {
 		/* Now open the file in place.  Use O_EXCL if tmp is TRUE.  This
@@ -1834,13 +1900,12 @@ bool write_file(const char *name, FILE *f_open, bool tmp,
 	while (fileptr != NULL) {
 		size_t data_len = strlen(fileptr->data), size;
 
-		/* Convert newlines to nulls, just before we write to disk. */
+		/* Decode LFs as the NULs that they are, before writing to disk. */
 		sunder(fileptr->data);
 
 		size = fwrite(fileptr->data, sizeof(char), data_len, f);
 
-		/* Convert nulls to newlines.  data_len is the string's real
-		 * length. */
+		/* Re-encode any embedded NULs as LFs. */
 		unsunder(fileptr->data, data_len);
 
 		if (size < data_len) {
@@ -1882,6 +1947,7 @@ bool write_file(const char *name, FILE *f_open, bool tmp,
 		lineswritten++;
 	}
 
+#ifndef NANO_TINY
 	/* If we're prepending, open the temp file, and append it to f. */
 	if (method == PREPEND) {
 		int fd_source;
@@ -1909,22 +1975,24 @@ bool write_file(const char *name, FILE *f_open, bool tmp,
 		}
 
 		unlink(tempname);
-	} else if (fclose(f) != 0) {
+	} else
+#endif
+	if (fclose(f) != 0) {
 		statusline(ALERT, _("Error writing %s: %s"), realname,
 						strerror(errno));
 		goto cleanup_and_exit;
 	}
 
-	if (method == OVERWRITE && !tmp) {
-		/* If we must set the filename, and it changed, adjust things. */
-		if (fullbuffer && strcmp(openfile->filename, realname) != 0) {
+	/* When having written an entire buffer, update some administrivia. */
+	if (fullbuffer && method == OVERWRITE && !tmp) {
+		/* If the filename was changed, check if this means a new syntax. */
+		if (strcmp(openfile->filename, realname) != 0) {
 #ifdef ENABLE_COLOR
 			const char *oldname, *newname;
 
 			oldname = openfile->syntax ? openfile->syntax->name : "";
 #endif
 			openfile->filename = mallocstrcpy(openfile->filename, realname);
-
 #ifdef ENABLE_COLOR
 			/* See if the applicable syntax has changed. */
 			color_update();
@@ -1941,29 +2009,27 @@ bool write_file(const char *name, FILE *f_open, bool tmp,
 					line->multidata = NULL;
 					line = line->next;
 				}
+
 				precalc_multicolorinfo();
 				refresh_needed = TRUE;
 			}
 #endif
 		}
-
-		if (fullbuffer) {
 #ifndef NANO_TINY
-			/* Get or update the stat info to reflect the current state. */
-			stat_with_alloc(realname, &openfile->current_stat);
+		/* Get or update the stat info to reflect the current state. */
+		stat_with_alloc(realname, &openfile->current_stat);
 
-			/* Record at which point in the undo stack the file was saved. */
-			openfile->last_saved = openfile->current_undo;
-			openfile->last_action = OTHER;
+		/* Record at which point in the undo stack the file was saved. */
+		openfile->last_saved = openfile->current_undo;
+		openfile->last_action = OTHER;
 #endif
-			openfile->modified = FALSE;
-			titlebar(NULL);
-		}
-
-		statusline(HUSH, P_("Wrote %zu line", "Wrote %zu lines",
-						lineswritten), lineswritten);
+		openfile->modified = FALSE;
+		titlebar(NULL);
 	}
 
+	if (!tmp)
+		statusline(HUSH, P_("Wrote %zu line", "Wrote %zu lines",
+								lineswritten), lineswritten);
 	retval = TRUE;
 
   cleanup_and_exit:
@@ -2140,8 +2206,12 @@ int do_writeout(bool exiting, bool withprompt)
 		 * egg.  Display the credits. */
 		if (!did_credits && exiting && !ISSET(TEMP_FILE) &&
 								strcasecmp(answer, "zzy") == 0) {
-			do_credits();
-			did_credits = TRUE;
+			if (LINES > 5 && COLS > 31) {
+				do_credits();
+				did_credits = TRUE;
+			} else
+				/* TRANSLATORS: Concisely say the screen is too small. */
+				statusbar(_("Too tiny"));
 			break;
 		}
 #endif

src/help.c

@@ -161,7 +161,6 @@ void do_help(void)
 	didfind = 0;
 
 	bottombars(MHELP);
-	wnoutrefresh(bottomwin);
 
 	/* Extract the title from the head of the help text. */
 	length = break_line(help_text, MAX_BUF_SIZE, TRUE);
@@ -184,41 +183,34 @@ void do_help(void)
 		focusing = TRUE;
 
 		/* Show the cursor when we searched and found something. */
-		kbinput = get_kbinput(edit, didfind == 1);
+		kbinput = get_kbinput(edit, didfind == 1 || ISSET(SHOW_CURSOR));
 		didfind = 0;
 
 		func = parse_help_input(&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) {
 			do_scroll_up();
 		} else if (func == do_down) {
 			if (openfile->edittop->lineno + editwinrows - 1 <
 								openfile->filebot->lineno)
 				do_scroll_down();
-		} else if (func == do_page_up) {
-			do_page_up();
-		} else if (func == do_page_down) {
-			do_page_down();
-		} else if (func == to_first_line) {
-			to_first_line();
-		} else if (func == to_last_line) {
-			to_last_line();
-		} else if (func == do_search_forward) {
-			do_search();
+		} 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);
-		} else if (func == do_research) {
-			do_research();
-#ifndef NANO_TINY
-		} else if (func == do_findprevious) {
-			do_findprevious();
-		} else if (func == do_findnext) {
-			do_findnext();
 #ifdef ENABLE_NANORC
 		} else if (func == (functionptrtype)implant) {
 			implant(first_sc_for(MHELP, func)->expansion);
 #endif
+#ifndef NANO_TINY
 		} else if (kbinput == KEY_WINCH) {
 			; /* Nothing to do. */
 #endif
@@ -414,11 +406,21 @@ void help_init(void)
 		htx[0] = N_("Execute Command Help Text\n\n "
 				"This mode allows you to insert the output of a "
 				"command run by the shell into the current buffer (or "
-				"a new buffer in multiple file buffer mode).  If you "
-				"need another blank buffer, do not enter any "
-				"command.\n\n The following function keys are "
+				"into a new buffer).  If the command is preceded by '|' "
+				"(the pipe symbol), the current contents of the buffer "
+				"(or marked region) will be piped to the command.  ");
+		htx[1] = N_("If you just need another blank buffer, do not enter any "
+				"command.\n\n");
+		htx[2] = N_(" The following function keys are "
 				"available in Execute Command mode:\n\n");
-		htx[1] = NULL;
+	} else if (currmenu == MLINTER) {
+		htx[0] = N_("=== Linter ===\n\n "
+				"In this mode, the status bar shows an error message or "
+				"warning, and the cursor is put at the corresponding "
+				"position in the file.  With PageUp and PageDown you "
+				"can switch to earlier and later messages.\n\n");
+		htx[1] = N_(" The following function keys are "
+				"available in Linter mode:\n\n");
 		htx[2] = NULL;
 	}
 #endif /* !NANO_TINY */
@@ -498,28 +500,20 @@ void help_init(void)
 
 	/* Now add our shortcut info. */
 	for (f = allfuncs; f != NULL; f = f->next) {
-		int scsfound = 0;
+		int tally = 0;
 
 		if ((f->menus & currmenu) == 0)
 			continue;
 
 		/* Let's simply show the first two shortcuts from the list. */
 		for (s = sclist; s != NULL; s = s->next) {
-
-			if ((s->menus & currmenu) == 0)
-				continue;
-
-			if (s->func == f->func) {
-				scsfound++;
+			if ((s->menus & currmenu) && s->func == f->func) {
 				/* Make the first column narrower (6) than the second (10),
 				 * but allow it to spill into the second, for "M-Space". */
-				if (scsfound == 1) {
+				if (++tally == 1) {
 					sprintf(ptr, "%s               ", s->keystr);
 					/* Unicode arrows take three bytes instead of one. */
-					if (strstr(s->keystr, "\xE2") != NULL)
-						ptr += 8;
-					else
-						ptr += 6;
+					ptr += (strstr(s->keystr, "\xE2") != NULL ? 8 : 6);
 				} else {
 					ptr += sprintf(ptr, "(%s)\t", s->keystr);
 					break;
@@ -527,9 +521,9 @@ void help_init(void)
 			}
 		}
 
-		if (scsfound == 0)
+		if (tally == 0)
 			ptr += sprintf(ptr, "\t\t");
-		else if (scsfound == 1)
+		else if (tally == 1)
 			ptr += 10;
 
 		/* The shortcut's help text. */
@@ -573,20 +567,19 @@ functionptrtype parse_help_input(int *kbinput)
 {
 	if (!meta_key) {
 		switch (*kbinput) {
-			case ' ':
-				return do_page_down;
+			case DEL_CODE:
 			case '-':
 				return do_page_up;
+			case ' ':
+				return do_page_down;
 			case 'W':
 			case 'w':
 			case '/':
 				return do_search_forward;
 			case 'N':
-#ifndef NANO_TINY
 				return do_findprevious;
-#endif
 			case 'n':
-				return do_research;
+				return do_findnext;
 			case 'E':
 			case 'e':
 			case 'Q':

src/history.c

@@ -227,7 +227,7 @@ char *get_history_completion(filestruct **h, char *s, size_t len)
 	 * match, or len is 0.  Return s. */
 	return (char *)s;
 }
-#endif /* ENSABLE_TABCOMP */
+#endif /* ENABLE_TABCOMP */
 
 void history_error(const char *msg, ...)
 {
@@ -403,7 +403,7 @@ void load_poshistory(void)
 	if (hisfile == NULL) {
 		if (errno != ENOENT) {
 			/* When reading failed, don't save history when we quit. */
-			UNSET(POS_HISTORY);
+			UNSET(POSITIONLOG);
 			history_error(N_("Error reading %s: %s"), poshistname, strerror(errno));
 		}
 	} else {

src/move.c

@@ -2,7 +2,7 @@
  *   move.c  --  This file is part of GNU nano.                           *
  *                                                                        *
  *   Copyright (C) 1999-2011, 2013-2018 Free Software Foundation, Inc.    *
- *   Copyright (C) 2014-2017 Benno Schulenberg                            *
+ *   Copyright (C) 2014-2018 Benno Schulenberg                            *
  *                                                                        *
  *   GNU nano is free software: you can redistribute it and/or modify     *
  *   it under the terms of the GNU General Public License as published    *
@@ -170,41 +170,33 @@ void do_page_down(void)
 }
 
 #ifdef ENABLE_JUSTIFY
-/* Move to the beginning of the last beginning-of-paragraph line before the
- * current line.  If update_screen is TRUE, update the screen afterwards. */
-void do_para_begin(bool update_screen)
+/* Move to the beginning of the first-found beginning-of-paragraph line
+ * before the current line. */
+void do_para_begin(void)
 {
-	filestruct *was_current = openfile->current;
-
 	if (openfile->current != openfile->fileage)
 		openfile->current = openfile->current->prev;
 
-	while (!begpar(openfile->current))
+	while (!begpar(openfile->current, 0))
 		openfile->current = openfile->current->prev;
 
 	openfile->current_x = 0;
-
-	if (update_screen)
-		edit_redraw(was_current, CENTERING);
 }
 
 /* Move down to the beginning of the last line of the current paragraph.
  * Then move down one line farther if there is such a line, or to the
- * end of the current line if not.  If update_screen is TRUE, update the
- * screen afterwards.  A line is the last line of a paragraph if it is
- * in a paragraph, and the next line either is the beginning line of a
- * paragraph or isn't in a paragraph. */
-void do_para_end(bool update_screen)
+ * end of the current line if not.  A line is the last line of a paragraph
+ * if it is in a paragraph, and the next line either is the beginning line
+ * of a paragraph or isn't in a paragraph. */
+void do_para_end(void)
 {
-	filestruct *was_current = openfile->current;
-
 	while (openfile->current != openfile->filebot &&
 				!inpar(openfile->current))
 		openfile->current = openfile->current->next;
 
 	while (openfile->current != openfile->filebot &&
 				inpar(openfile->current->next) &&
-				!begpar(openfile->current->next)) {
+				!begpar(openfile->current->next, 0)) {
 		openfile->current = openfile->current->next;
 	}
 
@@ -213,21 +205,26 @@ void do_para_end(bool update_screen)
 		openfile->current_x = 0;
 	} else
 		openfile->current_x = strlen(openfile->current->data);
-
-	if (update_screen)
-		edit_redraw(was_current, CENTERING);
 }
 
 /* Move up to first start of a paragraph before the current line. */
 void do_para_begin_void(void)
 {
-	do_para_begin(TRUE);
+	filestruct *was_current = openfile->current;
+
+	do_para_begin();
+
+	edit_redraw(was_current, CENTERING);
 }
 
 /* Move down to just after the first end of a paragraph. */
 void do_para_end_void(void)
 {
-	do_para_end(TRUE);
+	filestruct *was_current = openfile->current;
+
+	do_para_end();
+
+	edit_redraw(was_current, CENTERING);
 }
 #endif /* ENABLE_JUSTIFY */
 
@@ -272,10 +269,9 @@ void do_next_block(void)
 }
 
 /* Move to the previous word.  If allow_punct is TRUE, treat punctuation
- * as part of a word.  When requested, update the screen afterwards. */
-void do_prev_word(bool allow_punct, bool update_screen)
+ * as part of a word. */
+void do_prev_word(bool allow_punct)
 {
-	filestruct *was_current = openfile->current;
 	bool seen_a_word = FALSE, step_forward = FALSE;
 
 	/* Move backward until we pass over the start of a word. */
@@ -309,20 +305,19 @@ void do_prev_word(bool allow_punct, bool update_screen)
 		/* Move one character forward again to sit on the start of the word. */
 		openfile->current_x = move_mbright(openfile->current->data,
 												openfile->current_x);
-
-	if (update_screen)
-		edit_redraw(was_current, FLOWING);
 }
 
-/* Move to the next word.  If allow_punct is TRUE, treat punctuation
- * as part of a word.   When requested, update the screen afterwards.
- * Return TRUE if we started on a word, and FALSE otherwise. */
-bool do_next_word(bool allow_punct, bool update_screen)
+/* Move to the next word.  If after_ends is TRUE, stop at the ends of words
+ * instead of their beginnings.  If allow_punct is TRUE, treat punctuation as
+ * part of a word.  Return TRUE if we started on a word, and FALSE otherwise. */
+bool do_next_word(bool after_ends, bool allow_punct)
 {
-	filestruct *was_current = openfile->current;
 	bool started_on_word = is_word_mbchar(openfile->current->data +
 								openfile->current_x, allow_punct);
 	bool seen_space = !started_on_word;
+#ifndef NANO_TINY
+	bool seen_word = started_on_word;
+#endif
 
 	/* Move forward until we reach the start of a word. */
 	while (TRUE) {
@@ -340,19 +335,28 @@ bool do_next_word(bool allow_punct, bool update_screen)
 												openfile->current_x);
 		}
 
-		/* If this is not a word character, then it's a separator; else
-		 * if we've already seen a separator, then it's a word start. */
-		if (!is_word_mbchar(openfile->current->data + openfile->current_x,
+#ifndef NANO_TINY
+		if (after_ends) {
+			/* If this is a word character, continue; else it's a separator,
+			 * and if we've already seen a word, then it's a word end. */
+			if (is_word_mbchar(openfile->current->data + openfile->current_x,
 								allow_punct))
-			seen_space = TRUE;
-		else if (seen_space)
-			break;
+				seen_word = TRUE;
+			else if (seen_word)
+				break;
+		} else
+#endif
+		{
+			/* If this is not a word character, then it's a separator; else
+			 * if we've already seen a separator, then it's a word start. */
+			if (!is_word_mbchar(openfile->current->data + openfile->current_x,
+								allow_punct))
+				seen_space = TRUE;
+			else if (seen_space)
+				break;
+		}
 	}
 
-	if (update_screen)
-		edit_redraw(was_current, FLOWING);
-
-	/* Return whether we started on a word. */
 	return started_on_word;
 }
 
@@ -360,14 +364,23 @@ bool do_next_word(bool allow_punct, bool update_screen)
  * word if the WORD_BOUNDS flag is set, and update the screen afterwards. */
 void do_prev_word_void(void)
 {
-	do_prev_word(ISSET(WORD_BOUNDS), TRUE);
+	filestruct *was_current = openfile->current;
+
+	do_prev_word(ISSET(WORD_BOUNDS));
+
+	edit_redraw(was_current, FLOWING);
 }
 
-/* Move to the next word in the file, treating punctuation as part of a word
- * if the WORD_BOUNDS flag is set, and update the screen afterwards. */
+/* 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)
 {
-	do_next_word(ISSET(WORD_BOUNDS), TRUE);
+	filestruct *was_current = openfile->current;
+
+	do_next_word(ISSET(AFTER_ENDS), ISSET(WORD_BOUNDS));
+
+	edit_redraw(was_current, FLOWING);
 }
 
 /* Move to the beginning of the current line (or softwrapped chunk).
@@ -495,7 +508,10 @@ void do_up(void)
 
 	set_proper_index_and_pww(&leftedge, target_column, FALSE);
 
-	edit_redraw(was_current, FLOWING);
+	if (openfile->current_y == 0 && ISSET(SMOOTH_SCROLL))
+		edit_scroll(BACKWARD);
+	else
+		edit_redraw(was_current, FLOWING);
 
 	/* <Up> should not change placewewant, so restore it. */
 	openfile->placewewant = leftedge + target_column;
@@ -515,13 +531,16 @@ void do_down(void)
 
 	set_proper_index_and_pww(&leftedge, target_column, TRUE);
 
-	edit_redraw(was_current, FLOWING);
+	if (openfile->current_y == editwinrows - 1 && ISSET(SMOOTH_SCROLL))
+		edit_scroll(FORWARD);
+	else
+		edit_redraw(was_current, FLOWING);
 
 	/* <Down> should not change placewewant, so restore it. */
 	openfile->placewewant = leftedge + target_column;
 }
 
-#ifdef ENABLE_HELP
+#if !defined(NANO_TINY) || defined(ENABLE_HELP)
 /* Scroll up one line or chunk without scrolling the cursor. */
 void do_scroll_up(void)
 {
@@ -532,7 +551,8 @@ void do_scroll_up(void)
 	if (openfile->current_y == editwinrows - 1)
 		do_up();
 
-	edit_scroll(BACKWARD);
+	if (editwinrows > 1)
+		edit_scroll(BACKWARD);
 }
 
 /* Scroll down one line or chunk without scrolling the cursor. */

src/nano.c

@@ -2,7 +2,7 @@
  *   nano.c  --  This file is part of GNU nano.                           *
  *                                                                        *
  *   Copyright (C) 1999-2011, 2013-2018 Free Software Foundation, Inc.    *
- *   Copyright (C) 2014-2017 Benno Schulenberg                            *
+ *   Copyright (C) 2014-2018 Benno Schulenberg                            *
  *                                                                        *
  *   GNU nano is free software: you can redistribute it and/or modify     *
  *   it under the terms of the GNU General Public License as published    *
@@ -465,11 +465,18 @@ void ingraft_buffer(filestruct *somebuffer)
 	}
 #endif
 
+#ifdef DEBUG
+#include <time.h>
+	clock_t start = clock();
+#endif
 	/* Add the number of characters in the copied text to the file size. */
 	openfile->totsize += get_totsize(openfile->fileage, openfile->filebot);
+#ifdef DEBUG
+	statusline(ALERT, "Took: %.2f", (double)(clock() - start) / CLOCKS_PER_SEC);
+#endif
 
 	/* If we pasted onto the first line of the edit window, the corresponding
-	 * struct has been freed, so... point at the start of the copied text. */
+	 * record has been freed, so... point at the start of the copied text. */
 	if (edittop_inside)
 		openfile->edittop = openfile->fileage;
 
@@ -495,12 +502,6 @@ void copy_from_buffer(filestruct *somebuffer)
 	ingraft_buffer(the_copy);
 }
 
-/* Create a new openfile node. */
-openfilestruct *make_new_opennode(void)
-{
-	return (openfilestruct *)nmalloc(sizeof(openfilestruct));
-}
-
 #ifdef ENABLE_MULTIBUFFER
 /* Unlink a node from the rest of the circular list, and delete it. */
 void unlink_opennode(openfilestruct *fileptr)
@@ -551,14 +552,22 @@ void say_there_is_no_help(void)
 }
 #endif
 
-/* Make nano exit gracefully. */
+/* Exit normally: restore the terminal state and save history files. */
 void finish(void)
 {
-	/* Blank the statusbar and (if applicable) the shortcut list,
-	 * and move the cursor to the last line of the screen. */
+	/* Blank the statusbar and (if applicable) the shortcut list. */
 	blank_statusbar();
 	blank_bottombars();
 	wrefresh(bottomwin);
+
+#ifndef NANO_TINY
+	/* Deallocate the two or three subwindows. */
+	if (topwin != NULL)
+		delwin(topwin);
+	delwin(edit);
+	delwin(bottomwin);
+#endif
+	/* Switch on the cursor and exit from curses mode. */
 	curs_set(1);
 	endwin();
 
@@ -569,20 +578,17 @@ void finish(void)
 	/* If the user wants history persistence, write the relevant files. */
 	if (ISSET(HISTORYLOG))
 		save_history();
-	if (ISSET(POS_HISTORY)) {
+	if (ISSET(POSITIONLOG)) {
 		update_poshistory(openfile->filename, openfile->current->lineno, xplustabs() + 1);
 	}
 #endif
 
-#ifdef DEBUG
-	thanks_for_all_the_fish();
-#endif
-
 	/* Get out. */
 	exit(0);
 }
 
-/* Make nano die gracefully. */
+/* Die gracefully -- by restoring the terminal state and saving any buffers
+ * that were modified. */
 void die(const char *msg, ...)
 {
 	va_list ap;
@@ -740,9 +746,7 @@ void mouse_init(void)
 }
 #endif /* ENABLE_MOUSE */
 
-/* Print one usage string to the screen.  This cuts down on duplicate
- * strings to translate, and leaves out the parts that shouldn't be
- * translatable (i.e. the flag names). */
+/* Print the usage line for the given option to the screen. */
 void print_opt(const char *shortflag, const char *longflag, const char *desc)
 {
 	printf(" %s\t", shortflag);
@@ -755,9 +759,7 @@ void print_opt(const char *shortflag, const char *longflag, const char *desc)
 	else if (strlenpt(longflag) < 16)
 		printf("\t");
 
-	if (desc != NULL)
-		printf("%s", _(desc));
-	printf("\n");
+	printf("%s\n", _(desc));
 }
 
 /* Explain how to properly use nano and its command-line options. */
@@ -771,14 +773,13 @@ void usage(void)
 	printf(_("When a filename is '-', nano reads data from standard input.\n\n"));
 	printf(_("Option\t\tGNU long option\t\tMeaning\n"));
 #ifndef NANO_TINY
-	print_opt("-A", "--smarthome",
-		/* TRANSLATORS: The next forty or so strings are option descriptions
-		 * for the --help output.  Try to keep them at most 40 characters. */
-				N_("Enable smart home key"));
+	/* TRANSLATORS: The next forty or so strings are option descriptions
+	 * for the --help output.  Try to keep them at most 40 characters. */
+	print_opt("-A", "--smarthome", N_("Enable smart home key"));
 	if (!ISSET(RESTRICTED)) {
 		print_opt("-B", "--backup", N_("Save backups of existing files"));
 		print_opt(_("-C <dir>"), _("--backupdir=<dir>"),
-				N_("Directory for saving unique backup files"));
+					N_("Directory for saving unique backup files"));
 	}
 #endif
 	print_opt("-D", "--boldtext", N_("Use bold instead of reverse video text"));
@@ -788,7 +789,7 @@ void usage(void)
 #ifdef ENABLE_MULTIBUFFER
 	if (!ISSET(RESTRICTED))
 		print_opt("-F", "--multibuffer",
-				N_("Read a file into a new buffer by default"));
+					N_("Read a file into a new buffer by default"));
 #endif
 #ifndef NANO_TINY
 	print_opt("-G", "--locking", N_("Use (vim-style) lock files"));
@@ -796,32 +797,32 @@ void usage(void)
 #ifdef ENABLE_HISTORIES
 	if (!ISSET(RESTRICTED))
 		print_opt("-H", "--historylog",
-				N_("Log & read search/replace string history"));
+					N_("Log & read search/replace string history"));
 #endif
 #ifdef ENABLE_NANORC
-	if (!ISSET(RESTRICTED))
-		print_opt("-I", "--ignorercfiles", N_("Don't look at nanorc files"));
+	print_opt("-I", "--ignorercfiles", N_("Don't look at nanorc files"));
 #endif
 	print_opt("-K", "--rebindkeypad",
-		N_("Fix numeric keypad key confusion problem"));
+					N_("Fix numeric keypad key confusion problem"));
 	print_opt("-L", "--nonewlines",
-		N_("Don't add newlines to the ends of files"));
+					N_("Don't add newlines to the ends of files"));
 #ifdef ENABLED_WRAPORJUSTIFY
 	print_opt("-M", "--trimblanks",
-		N_("Trim tail spaces when hard-wrapping"));
+					N_("Trim tail spaces when hard-wrapping"));
 #endif
 #ifndef NANO_TINY
 	print_opt("-N", "--noconvert",
-		N_("Don't convert files from DOS/Mac format"));
+					N_("Don't convert files from DOS/Mac format"));
 #endif
 	print_opt("-O", "--morespace", N_("Use one more line for editing"));
 #ifdef ENABLE_HISTORIES
 	if (!ISSET(RESTRICTED))
 		print_opt("-P", "--positionlog",
-				N_("Log & read location of cursor position"));
+					N_("Log & read location of cursor position"));
 #endif
 #ifdef ENABLE_JUSTIFY
-	print_opt(_("-Q <str>"), _("--quotestr=<str>"), N_("Quoting string"));
+	print_opt(_("-Q <regex>"), _("--quotestr=<regex>"),
+					 N_("Regular expression to match quoting"));
 #endif
 	if (!ISSET(RESTRICTED))
 		print_opt("-R", "--restricted", N_("Restricted mode"));
@@ -829,29 +830,30 @@ void usage(void)
 	print_opt("-S", "--smooth", N_("Scroll by line instead of half-screen"));
 #endif
 	print_opt(_("-T <#cols>"), _("--tabsize=<#cols>"),
-		N_("Set width of a tab to #cols columns"));
+					N_("Set width of a tab to #cols columns"));
 	print_opt("-U", "--quickblank", N_("Do quick statusbar blanking"));
 	print_opt("-V", "--version", N_("Print version information and exit"));
 #ifndef NANO_TINY
 	print_opt("-W", "--wordbounds",
-		N_("Detect word boundaries more accurately"));
+					N_("Detect word boundaries more accurately"));
 	print_opt(_("-X <str>"), _("--wordchars=<str>"),
-		N_("Which other characters are word parts"));
+					N_("Which other characters are word parts"));
 #endif
 #ifdef ENABLE_COLOR
 	if (!ISSET(RESTRICTED))
 		print_opt(_("-Y <name>"), _("--syntax=<name>"),
-				N_("Syntax definition to use for coloring"));
+					N_("Syntax definition to use for coloring"));
 #endif
 #ifndef NANO_TINY
+	print_opt("-Z", "--zap", N_("Let Bsp and Del erase a marked region"));
 	print_opt("-a", "--atblanks", N_("When soft-wrapping, do it at whitespace"));
 #endif
 	print_opt("-c", "--constantshow", N_("Constantly show cursor position"));
 	print_opt("-d", "--rebinddelete",
-		N_("Fix Backspace/Delete confusion problem"));
+					N_("Fix Backspace/Delete confusion problem"));
 #ifdef ENABLE_BROWSER
 	if (!ISSET(RESTRICTED))
-		print_opt("-g", "--showcursor", N_("Show cursor in file browser"));
+		print_opt("-g", "--showcursor", N_("Show cursor in file browser & help text"));
 #endif
 	print_opt("-h", "--help", N_("Show this help text and exit"));
 #ifndef NANO_TINY
@@ -867,17 +869,17 @@ void usage(void)
 	print_opt("-n", "--noread", N_("Do not read the file (only write it)"));
 #ifdef ENABLE_OPERATINGDIR
 	print_opt(_("-o <dir>"), _("--operatingdir=<dir>"),
-		N_("Set operating directory"));
+					N_("Set operating directory"));
 #endif
 	print_opt("-p", "--preserve", N_("Preserve XON (^Q) and XOFF (^S) keys"));
 #ifdef ENABLED_WRAPORJUSTIFY
 	print_opt(_("-r <#cols>"), _("--fill=<#cols>"),
-		N_("Set hard-wrapping point at column #cols"));
+					N_("Set hard-wrapping point at column #cols"));
 #endif
 #ifdef ENABLE_SPELLER
 	if (!ISSET(RESTRICTED))
 		print_opt(_("-s <prog>"), _("--speller=<prog>"),
-				N_("Enable alternate speller"));
+					N_("Enable alternate speller"));
 #endif
 	print_opt("-t", "--tempfile", N_("Auto save on exit, don't prompt"));
 #ifndef NANO_TINY
@@ -888,6 +890,9 @@ void usage(void)
 	print_opt("-w", "--nowrap", N_("Don't hard-wrap long lines"));
 #endif
 	print_opt("-x", "--nohelp", N_("Don't show the two help lines"));
+#ifndef NANO_TINY
+	print_opt("-y", "--afterends", N_("Make Ctrl+Right stop at word ends"));
+#endif
 	if (!ISSET(RESTRICTED))
 		print_opt("-z", "--suspend", N_("Enable suspension"));
 #ifndef NANO_TINY
@@ -1060,10 +1065,6 @@ void do_exit(void)
 						"(Answering \"No\" will DISCARD changes.) "));
 	}
 
-#ifdef DEBUG
-	dump_filestruct(openfile->fileage);
-#endif
-
 	/* If the user chose not to save, or if the user chose to save and
 	 * the save succeeded, we're ready to exit. */
 	if (i == 0 || (i == 1 && do_writeout(TRUE, TRUE) > 0))
@@ -1087,12 +1088,6 @@ void close_and_go(void)
 		finish();
 }
 
-/* Another placeholder for function mapping. */
-void do_cancel(void)
-{
-	;
-}
-
 /* Make a note that reading from stdin was concluded with ^C. */
 RETSIGTYPE make_a_note(int signal)
 {
@@ -1105,7 +1100,7 @@ bool scoop_stdin(void)
 	struct sigaction oldaction, newaction;
 		/* Original and temporary handlers for SIGINT. */
 	bool setup_failed = FALSE;
-		/* Whether setting up the SIGINT handler failed. */
+		/* Whether setting up the temporary SIGINT handler failed. */
 	FILE *stream;
 	int thetty;
 
@@ -1113,7 +1108,7 @@ bool scoop_stdin(void)
 	endwin();
 	tcsetattr(0, TCSANOW, &oldterm);
 
-	fprintf(stderr, _("Reading from stdin, ^C to abort\n"));
+	fprintf(stderr, _("Reading from standard input; type ^D or ^D^D to finish.\n"));
 
 #ifndef NANO_TINY
 	/* Enable interpretation of the special control keys so that
@@ -1124,12 +1119,12 @@ bool scoop_stdin(void)
 	/* Set things up so that SIGINT will cancel the reading. */
 	if (sigaction(SIGINT, NULL, &newaction) == -1) {
 		setup_failed = TRUE;
-		nperror("sigaction");
+		perror("sigaction");
 	} else {
 		newaction.sa_handler = make_a_note;
 		if (sigaction(SIGINT, &newaction, &oldaction) == -1) {
 			setup_failed = TRUE;
-			nperror("sigaction");
+			perror("sigaction");
 		}
 	}
 
@@ -1148,6 +1143,7 @@ bool scoop_stdin(void)
 	open_buffer("", TRUE);
 	read_file(stream, 0, "stdin", TRUE);
 	openfile->edittop = openfile->fileage;
+	fprintf(stderr, ".\n");
 
 	/* Reconnect the tty as the input source. */
 	thetty = open("/dev/tty", O_RDONLY);
@@ -1162,7 +1158,7 @@ bool scoop_stdin(void)
 
 	/* If it was changed, restore the handler for SIGINT. */
 	if (!setup_failed && sigaction(SIGINT, &oldaction, NULL) == -1)
-		nperror("sigaction");
+		perror("sigaction");
 
 	terminal_init();
 	doupdate();
@@ -1216,6 +1212,18 @@ void signal_init(void)
 		sigaction(SIGTSTP, &act, NULL);
 #endif
 	}
+
+#if !defined(NANO_TINY) && !defined(DEBUG)
+	if (getenv("NANO_NOCATCH") == NULL) {
+		/* Trap SIGSEGV and SIGABRT to save any changed buffers and reset
+		 * the terminal to a usable state.  Reset these handlers to their
+		 * defaults as soon as their signal fires. */
+		act.sa_handler = handle_crash;
+		act.sa_flags |= SA_RESETHAND;
+		sigaction(SIGSEGV, &act, NULL);
+		sigaction(SIGABRT, &act, NULL);
+	}
+#endif
 }
 
 /* Handler for SIGHUP (hangup) and SIGTERM (terminate). */
@@ -1224,6 +1232,14 @@ RETSIGTYPE handle_hupterm(int signal)
 	die(_("Received SIGHUP or SIGTERM\n"));
 }
 
+#if !defined(NANO_TINY) && !defined(DEBUG)
+/* Handler for SIGSEGV (segfault) and SIGABRT (abort). */
+RETSIGTYPE handle_crash(int signal)
+{
+	die(_("Sorry! Nano crashed!  Code: %d.  Please report a bug.\n"), signal);
+}
+#endif
+
 /* Handler for SIGTSTP (suspend). */
 RETSIGTYPE do_suspend(int signal)
 {
@@ -1242,6 +1258,9 @@ RETSIGTYPE do_suspend(int signal)
 	/* Restore the old terminal settings. */
 	tcsetattr(0, TCSANOW, &oldterm);
 
+	/* The suspend keystroke must not elicit cursor-position display. */
+	suppress_cursorpos=TRUE;
+
 #ifdef SIGSTOP
 	/* Do what mutt does: send ourselves a SIGSTOP. */
 	kill(0, SIGSTOP);
@@ -1340,24 +1359,12 @@ void regenerate_screen(void)
 	total_refresh();
 }
 
-/* If allow is FALSE, block any SIGWINCH signal.  If allow is TRUE,
- * unblock SIGWINCH so any pending ones can be dealt with. */
-void allow_sigwinch(bool allow)
-{
-	sigset_t winch;
-
-	sigemptyset(&winch);
-	sigaddset(&winch, SIGWINCH);
-	sigprocmask(allow ? SIG_UNBLOCK : SIG_BLOCK, &winch, NULL);
-}
-
 /* Handle the global toggle specified in flag. */
 void do_toggle(int flag)
 {
 	bool enabled;
 
-	if (ISSET(RESTRICTED) && (flag == SUSPEND || flag == MULTIBUFFER ||
-						flag == BACKUP_FILE || flag == NO_COLOR_SYNTAX)) {
+	if (flag == SUSPEND && ISSET(RESTRICTED)) {
 		show_restricted_warning();
 		return;
 	}
@@ -1370,7 +1377,6 @@ void do_toggle(int flag)
 			mouse_init();
 			break;
 #endif
-		case MORE_SPACE:
 		case NO_HELP:
 			window_init();
 			focusing = FALSE;
@@ -1401,12 +1407,6 @@ void do_toggle(int flag)
 	statusline(HUSH, "%s %s", _(flagtostr(flag)),
 						enabled ? _("enabled") : _("disabled"));
 }
-
-/* Bleh. */
-void do_toggle_void(void)
-{
-	;
-}
 #endif /* !NANO_TINY */
 
 /* Disable extended input and output processing in our terminal
@@ -1499,7 +1499,6 @@ void terminal_init(void)
 
 	if (!newterm_set) {
 #endif
-
 		raw();
 		nonl();
 		noecho();
@@ -1527,11 +1526,38 @@ int get_keycode(const char *keyname, const int standard)
 
 	if (keyvalue != 0 && keyvalue != (char *)-1 && key_defined(keyvalue))
 		return key_defined(keyvalue);
-	else
 #endif
-		return standard;
+#ifdef DEBUG
+	if (!ISSET(REBIND_KEYPAD))
+		fprintf(stderr, "Using fallback keycode for %s\n", keyname);
+#endif
+	return standard;
 }
 
+#ifdef ENABLE_LINENUMBERS
+/* Ensure that the margin can accomodate the buffer's highest line number. */
+void confirm_margin(void)
+{
+	int needed_margin = digits(openfile->filebot->lineno) + 1;
+
+	/* When not requested or space is too tight, suppress line numbers. */
+	if (!ISSET(LINE_NUMBERS) || needed_margin > COLS - 4)
+		needed_margin = 0;
+
+	if (needed_margin != margin) {
+		margin = needed_margin;
+		editwincols = COLS - margin;
+
+#ifndef NANO_TINY
+		/* Ensure that firstcolumn is the starting column of its chunk. */
+		ensure_firstcolumn_is_aligned();
+#endif
+		/* The margin has changed -- schedule a full refresh. */
+		refresh_needed = TRUE;
+	}
+}
+#endif /* ENABLE_LINENUMBERS */
+
 /* Say that an unbound key was struck, and if possible which one. */
 void unbound_key(int code)
 {
@@ -1544,7 +1570,7 @@ void unbound_key(int code)
 			statusline(ALERT, _("Unbound key: M-%c"), toupper(code));
 	} else if (code < 0x20)
 		statusline(ALERT, _("Unbound key: ^%c"), code + 0x40);
-	else if (currmenu != MHELP)
+	else
 		statusline(ALERT, _("Unbound key: %c"), code);
 }
 
@@ -1617,12 +1643,12 @@ bool wanted_to_move(void (*func)(void))
 			func == to_first_line || func == to_last_line;
 }
 
-/* Return TRUE when the given shortcut is valid in view mode. */
+/* Return TRUE when the given shortcut is admissible in view mode. */
 bool okay_for_view(const sc *shortcut)
 {
 	const subnfunc *func = sctofunc(shortcut);
 
-	return (func != NULL && func->viewok);
+	return (func == NULL || func->viewok);
 }
 
 /* Read in a keystroke.  Act on the keystroke if it is a shortcut or a toggle;
@@ -1726,7 +1752,6 @@ int do_input(bool allow_funcs)
 		if (shortcut->func == do_cut_text_void
 #ifndef NANO_TINY
 				|| shortcut->func == do_copy_text
-				|| shortcut->func == do_cut_till_eof
 #endif
 				)
 			retain_cuts = TRUE;
@@ -1853,7 +1878,12 @@ void do_output(char *output, size_t output_len, bool allow_cntrls)
 		set_modified();
 
 #ifndef NANO_TINY
-		add_undo(ADD);
+		/* Only add a new undo item when the current item is not an ADD or when
+		 * the current typing is not contiguous with the previous typing. */
+		if (openfile->last_action != ADD || openfile->current_undo == NULL ||
+				openfile->current_undo->mark_begin_lineno != openfile->current->lineno ||
+				openfile->current_undo->mark_begin_x != openfile->current_x)
+			add_undo(ADD);
 
 		/* Note that current_x has not yet been incremented. */
 		if (openfile->current == openfile->mark &&
@@ -1991,10 +2021,12 @@ int main(int argc, char **argv)
 		{"smooth", 0, NULL, 'S'},
 		{"wordbounds", 0, NULL, 'W'},
 		{"wordchars", 1, NULL, 'X'},
+		{"zap", 0, NULL, 'Z'},
 		{"atblanks", 0, NULL, 'a'},
 		{"autoindent", 0, NULL, 'i'},
 		{"cutfromcursor", 0, NULL, 'k'},
 		{"unix", 0, NULL, 'u'},
+		{"afterends", 0, NULL, 'y'},
 		{"softwrap", 0, NULL, '$'},
 #endif
 		{NULL, 0, NULL, 0}
@@ -2053,15 +2085,9 @@ int main(int argc, char **argv)
 
 	while ((optchr =
 		getopt_long(argc, argv,
-				"ABC:DEFGHIKLMNOPQ:RST:UVWX:Y:abcdefghijklmno:pqr:s:tuvwxz$",
+				"ABC:DEFGHIKLMNOPQ:RST:UVWX:Y:Zabcdefghijklmno:pqr:s:tuvwxyz$",
 				long_options, NULL)) != -1) {
 		switch (optchr) {
-			case 'b':
-			case 'e':
-			case 'f':
-			case 'j':
-				/* Pico compatibility flags. */
-				break;
 #ifndef NANO_TINY
 			case 'A':
 				SET(SMART_HOME);
@@ -2122,7 +2148,7 @@ int main(int argc, char **argv)
 				break;
 #ifdef ENABLE_HISTORIES
 			case 'P':
-				SET(POS_HISTORY);
+				SET(POSITIONLOG);
 				break;
 #endif
 #ifdef ENABLE_JUSTIFY
@@ -2165,6 +2191,9 @@ int main(int argc, char **argv)
 				break;
 #endif
 #ifndef NANO_TINY
+			case 'Z':
+				SET(LET_THEM_ZAP);
+				break;
 			case 'a':
 				SET(AT_BLANKS);
 				break;
@@ -2178,6 +2207,9 @@ int main(int argc, char **argv)
 			case 'g':
 				SET(SHOW_CURSOR);
 				break;
+			case 'h':
+				usage();
+				exit(0);
 #ifndef NANO_TINY
 			case 'i':
 				SET(AUTOINDENT);
@@ -2186,6 +2218,11 @@ int main(int argc, char **argv)
 				SET(CUT_FROM_CURSOR);
 				break;
 #endif
+#ifdef ENABLE_LINENUMBERS
+			case 'l':
+				SET(LINE_NUMBERS);
+				break;
+#endif
 #ifdef ENABLE_MOUSE
 			case 'm':
 				SET(USE_MOUSE);
@@ -2248,6 +2285,11 @@ int main(int argc, char **argv)
 			case 'x':
 				SET(NO_HELP);
 				break;
+#ifndef NANO_TINY
+			case 'y':
+				SET(AFTER_ENDS);
+				break;
+#endif
 			case 'z':
 				SET(SUSPEND);
 				break;
@@ -2256,69 +2298,53 @@ int main(int argc, char **argv)
 				SET(SOFTWRAP);
 				break;
 #endif
-#ifdef ENABLE_LINENUMBERS
-			case 'l':
-				SET(LINE_NUMBERS);
+			case 'b':  /* Pico compatibility flags. */
+			case 'e':
+			case 'f':
+			case 'j':
 				break;
-#endif
-			case 'h':
-				usage();
-				exit(0);
 			default:
 				printf(_("Type '%s -h' for a list of available options.\n"), argv[0]);
 				exit(1);
 		}
 	}
 
-	/* If we're using restricted mode, disable suspending, backups,
-	 * rcfiles, and history files, since they all would allow reading
-	 * from or writing to files not specified on the command line. */
-	if (ISSET(RESTRICTED)) {
-		UNSET(SUSPEND);
-		UNSET(BACKUP_FILE);
-#ifdef ENABLE_NANORC
-		no_rcfiles = TRUE;
-		UNSET(HISTORYLOG);
-		UNSET(POS_HISTORY);
-#endif
-	}
-
 	/* Set up the function and shortcut lists.  This needs to be done
 	 * before reading the rcfile, to be able to rebind/unbind keys. */
 	shortcut_init();
 
 #ifdef ENABLE_NANORC
 	if (!no_rcfiles) {
-		/* Back up the command-line options, then read the rcfile(s). */
-#ifdef ENABLE_OPERATINGDIR
-		char *operating_dir_cpy = operating_dir;
-#endif
+		/* Back up the command-line options, then clear the strings. */
 #ifdef ENABLED_WRAPORJUSTIFY
-		ssize_t wrap_at_cpy = wrap_at;
+		ssize_t wrap_at_cmdline = wrap_at;
 #endif
 #ifndef NANO_TINY
-		char *backup_dir_cpy = backup_dir;
-		char *word_chars_cpy = word_chars;
+		char *backup_dir_cmdline = backup_dir;
+		char *word_chars_cmdline = word_chars;
+#endif
+#ifdef ENABLE_OPERATINGDIR
+		char *operating_dir_cmdline = operating_dir;
 #endif
 #ifdef ENABLE_JUSTIFY
-		char *quotestr_cpy = quotestr;
+		char *quotestr_cmdline = quotestr;
 #endif
 #ifdef ENABLE_SPELLER
-		char *alt_speller_cpy = alt_speller;
+		char *alt_speller_cmdline = alt_speller;
 #endif
-		ssize_t tabsize_cpy = tabsize;
-		unsigned flags_cpy[sizeof(flags) / sizeof(flags[0])];
+		ssize_t tabsize_cmdline = tabsize;
+		unsigned flags_cmdline[sizeof(flags) / sizeof(flags[0])];
 		size_t i;
 
-		memcpy(flags_cpy, flags, sizeof(flags_cpy));
+		memcpy(flags_cmdline, flags, sizeof(flags_cmdline));
 
-#ifdef ENABLE_OPERATINGDIR
-		operating_dir = NULL;
-#endif
 #ifndef NANO_TINY
 		backup_dir = NULL;
 		word_chars = NULL;
 #endif
+#ifdef ENABLE_OPERATINGDIR
+		operating_dir = NULL;
+#endif
 #ifdef ENABLE_JUSTIFY
 		quotestr = NULL;
 #endif
@@ -2326,6 +2352,7 @@ int main(int argc, char **argv)
 		alt_speller = NULL;
 #endif
 
+		/* Now process the system's and the user's nanorc file, if any. */
 		do_rcfiles();
 
 #ifdef DEBUG
@@ -2334,44 +2361,44 @@ int main(int argc, char **argv)
 #endif
 
 		/* If the backed-up command-line options have a value, restore them. */
-#ifdef ENABLE_OPERATINGDIR
-		if (operating_dir_cpy != NULL) {
-			free(operating_dir);
-			operating_dir = operating_dir_cpy;
-		}
-#endif
 #ifdef ENABLED_WRAPORJUSTIFY
 		if (fill_used)
-			wrap_at = wrap_at_cpy;
+			wrap_at = wrap_at_cmdline;
 #endif
 #ifndef NANO_TINY
-		if (backup_dir_cpy != NULL) {
+		if (backup_dir_cmdline != NULL) {
 			free(backup_dir);
-			backup_dir = backup_dir_cpy;
+			backup_dir = backup_dir_cmdline;
 		}
-		if (word_chars_cpy != NULL) {
+		if (word_chars_cmdline != NULL) {
 			free(word_chars);
-			word_chars = word_chars_cpy;
+			word_chars = word_chars_cmdline;
+		}
+#endif
+#ifdef ENABLE_OPERATINGDIR
+		if (operating_dir_cmdline != NULL || ISSET(RESTRICTED)) {
+			free(operating_dir);
+			operating_dir = operating_dir_cmdline;
 		}
 #endif
 #ifdef ENABLE_JUSTIFY
-		if (quotestr_cpy != NULL) {
+		if (quotestr_cmdline != NULL) {
 			free(quotestr);
-			quotestr = quotestr_cpy;
+			quotestr = quotestr_cmdline;
 		}
 #endif
 #ifdef ENABLE_SPELLER
-		if (alt_speller_cpy != NULL) {
+		if (alt_speller_cmdline != NULL) {
 			free(alt_speller);
-			alt_speller = alt_speller_cpy;
+			alt_speller = alt_speller_cmdline;
 		}
 #endif
-		if (tabsize_cpy != -1)
-			tabsize = tabsize_cpy;
+		if (tabsize_cmdline != -1)
+			tabsize = tabsize_cmdline;
 
 		/* Simply OR the boolean flags from rcfile and command line. */
 		for (i = 0; i < sizeof(flags) / sizeof(flags[0]); i++)
-			flags[i] |= flags_cpy[i];
+			flags[i] |= flags_cmdline[i];
 	}
 #ifdef DISABLE_ROOTWRAPPING
 	/* If we don't have any rcfiles, --disable-wrapping-as-root is used,
@@ -2392,32 +2419,41 @@ int main(int argc, char **argv)
 	if (ISSET(BOLD_TEXT))
 		hilite_attribute = A_BOLD;
 
+	/* When in restricted mode, disable backups, suspending, and history files,
+	 * since they allow writing to files not specified on the command line. */
+	if (ISSET(RESTRICTED)) {
+		UNSET(BACKUP_FILE);
+		UNSET(SUSPEND);
+#ifdef ENABLE_NANORC
+		UNSET(HISTORYLOG);
+		UNSET(POSITIONLOG);
+#endif
+	}
+
 #ifdef ENABLE_HISTORIES
 	/* Initialize the pointers for the Search/Replace/Execute histories. */
 	history_init();
 
 	/* If we need history files, verify that we have a directory for them,
 	 * and when not, cancel the options. */
-	if ((ISSET(HISTORYLOG) || ISSET(POS_HISTORY)) && !have_statedir()) {
+	if ((ISSET(HISTORYLOG) || ISSET(POSITIONLOG)) && !have_statedir()) {
 		UNSET(HISTORYLOG);
-		UNSET(POS_HISTORY);
+		UNSET(POSITIONLOG);
 	}
 
 	/* If the user wants history persistence, read the relevant files. */
 	if (ISSET(HISTORYLOG))
 		load_history();
-	if (ISSET(POS_HISTORY))
+	if (ISSET(POSITIONLOG))
 		load_poshistory();
 #endif /* ENABLE_HISTORIES */
 
 #ifndef NANO_TINY
-	/* If backups are enabled and a backup directory was specified and
-	 * we're not in restricted mode, make sure the path exists and is
-	 * a directory, so that backup files can be saved there. */
-	if (ISSET(BACKUP_FILE) && backup_dir != NULL && !ISSET(RESTRICTED))
+	/* If backups are enabled and a backup directory was specified, make sure
+	 * the path exists and is a folder, so backup files can be saved there. */
+	if (ISSET(BACKUP_FILE) && backup_dir != NULL)
 		init_backup_dir();
 #endif
-
 #ifdef ENABLE_OPERATINGDIR
 	/* Set up the operating directory.  This entails chdir()ing there,
 	 * so that file reads and writes will be based there. */
@@ -2426,21 +2462,18 @@ int main(int argc, char **argv)
 #endif
 
 #ifdef ENABLE_JUSTIFY
-	/* If punct wasn't specified, set its default value. */
+	/* Set the default value for things that weren't specified. */
 	if (punct == NULL)
 		punct = mallocstrcpy(NULL, "!.?");
-
-	/* If brackets wasn't specified, set its default value. */
 	if (brackets == NULL)
 		brackets = mallocstrcpy(NULL, "\"')>]}");
-
-	/* If quotestr wasn't specified, set its default value. */
 	if (quotestr == NULL)
-		quotestr = mallocstrcpy(NULL, "^([ \t]*[#:>|}])+");
-	quoterc = regcomp(&quotereg, quotestr, NANO_REG_EXTENDED);
+		quotestr = mallocstrcpy(NULL, "^([ \t]*([#:>|}]|/{2}))+");
 
+	/* Compile the quoting regex, and free it when it's good; otherwise,
+	 * retrieve and store the error message, to be shown when justifying. */
+	quoterc = regcomp(&quotereg, quotestr, NANO_REG_EXTENDED);
 	if (quoterc == 0) {
-		/* We no longer need quotestr, just quotereg. */
 		free(quotestr);
 		quotestr = NULL;
 	} else {
@@ -2457,8 +2490,9 @@ int main(int argc, char **argv)
 	 * does (unless we're using restricted mode, in which case spell
 	 * checking is disabled, since it would allow reading from or
 	 * writing to files not specified on the command line). */
-	if (!ISSET(RESTRICTED) && alt_speller == NULL) {
+	if (alt_speller == NULL && !ISSET(RESTRICTED)) {
 		const char *spellenv = getenv("SPELL");
+
 		if (spellenv != NULL)
 			alt_speller = mallocstrcpy(NULL, spellenv);
 	}
@@ -2533,29 +2567,35 @@ int main(int argc, char **argv)
 	mouse_init();
 #endif
 
-	/* Ask ncurses for the key codes for Control+Left/Right/Up/Down. */
+	/* Ask ncurses for the key codes for most modified editing keys. */
 	controlleft = get_keycode("kLFT5", CONTROL_LEFT);
 	controlright = get_keycode("kRIT5", CONTROL_RIGHT);
 	controlup = get_keycode("kUP5", CONTROL_UP);
 	controldown = get_keycode("kDN5", CONTROL_DOWN);
-	/* Ask for the codes for Control+Home/End. */
+
 	controlhome = get_keycode("kHOM5", CONTROL_HOME);
 	controlend = get_keycode("kEND5", CONTROL_END);
 #ifndef NANO_TINY
-	/* Ask for the codes for Shift+Control+Left/Right/Up/Down. */
+	controldelete = get_keycode("kDC5", CONTROL_DELETE);
+	controlshiftdelete = get_keycode("kDC6", CONTROL_SHIFT_DELETE);
+
+	shiftup = get_keycode("kUP", SHIFT_UP);
+	shiftdown = get_keycode("kDN", SHIFT_DOWN);
+
 	shiftcontrolleft = get_keycode("kLFT6", SHIFT_CONTROL_LEFT);
 	shiftcontrolright = get_keycode("kRIT6", SHIFT_CONTROL_RIGHT);
 	shiftcontrolup = get_keycode("kUP6", SHIFT_CONTROL_UP);
 	shiftcontroldown = get_keycode("kDN6", SHIFT_CONTROL_DOWN);
-	/* Ask for the codes for Shift+Control+Home/End. */
+
 	shiftcontrolhome = get_keycode("kHOM6", SHIFT_CONTROL_HOME);
 	shiftcontrolend = get_keycode("kEND6", SHIFT_CONTROL_END);
-	/* Ask for the codes for Alt+Left/Right/Up/Down. */
+
 	altleft = get_keycode("kLFT3", ALT_LEFT);
 	altright = get_keycode("kRIT3", ALT_RIGHT);
 	altup = get_keycode("kUP3", ALT_UP);
 	altdown = get_keycode("kDN3", ALT_DOWN);
-	/* Ask for the codes for Shift+Alt+Left/Right/Up/Down. */
+	altdelete = get_keycode("kDC3", ALT_DELETE);
+
 	shiftaltleft = get_keycode("kLFT4", SHIFT_ALT_LEFT);
 	shiftaltright = get_keycode("kRIT4", SHIFT_ALT_RIGHT);
 	shiftaltup = get_keycode("kUP4", SHIFT_ALT_UP);
@@ -2594,7 +2634,7 @@ int main(int argc, char **argv)
 		if (givenline != 0 || givencol != 0)
 			do_gotolinecolumn(givenline, givencol, FALSE, FALSE);
 #ifdef ENABLE_HISTORIES
-		else if (ISSET(POS_HISTORY) && openfile->filename[0] != '\0') {
+		else if (ISSET(POSITIONLOG) && openfile->filename[0] != '\0') {
 			ssize_t savedline, savedcol;
 			/* If edited before, restore the last cursor position. */
 			if (has_old_position(argv[optind - 1], &savedline, &savedcol))
@@ -2611,8 +2651,13 @@ int main(int argc, char **argv)
 		UNSET(VIEW_MODE);
 	}
 #ifdef ENABLE_MULTIBUFFER
-	else
+	else {
 		openfile = openfile->next;
+		if (more_than_one)
+			mention_name_and_linecount();
+		if (ISSET(VIEW_MODE))
+			SET(MULTIBUFFER);
+	}
 #endif
 
 #ifdef DEBUG
@@ -2621,31 +2666,23 @@ int main(int argc, char **argv)
 
 	prepare_for_display();
 
+#ifdef ENABLE_NANORC
 	if (rcfile_with_errors != NULL)
 		statusline(ALERT, _("Mistakes in '%s'"), rcfile_with_errors);
+#endif
+
+#ifdef ENABLE_HELP
+	if (*openfile->filename == '\0' && openfile->totsize == 0 &&
+				openfile->next == openfile && !ISSET(NO_HELP))
+		statusbar(_("Welcome to nano.  For basic help, type Ctrl+G."));
+#endif
 
 	while (TRUE) {
 #ifdef ENABLE_LINENUMBERS
-		int needed_margin = digits(openfile->filebot->lineno) + 1;
-
-		/* Suppress line numbers when there is not enough room for them. */
-		if (!ISSET(LINE_NUMBERS) || needed_margin > COLS - 4)
-			needed_margin = 0;
-
-		if (needed_margin != margin) {
-			margin = needed_margin;
-			editwincols = COLS - margin;
-
-#ifndef NANO_TINY
-			/* Ensure that firstcolumn is the starting column of its chunk. */
-			ensure_firstcolumn_is_aligned();
-#endif
-			/* The margin has changed -- schedule a full refresh. */
-			refresh_needed = TRUE;
-		}
+		confirm_margin();
 #endif
 		if (currmenu != MMAIN)
-			display_main_list();
+			bottombars(MMAIN);
 
 		lastmessage = HUSH;
 		as_an_at = TRUE;
@@ -2662,10 +2699,11 @@ int main(int argc, char **argv)
 		} else
 			edit_refresh();
 
+		errno = 0;
 		focusing = TRUE;
 
-		/* Forget any earlier statusbar x position. */
-		reinit_statusbar_x();
+		/* Forget any earlier cursor position at the prompt. */
+		put_cursor_at_end_of_answer();
 
 		/* Read in and interpret keystrokes. */
 		do_input(TRUE);

src/nano.h

@@ -142,13 +142,18 @@
 #define REPLACING 1
 #define INREGION  2
 
+#ifdef ENABLE_COLOR
+#define USE_THE_DEFAULT -1
+#define BAD_COLOR -2
+#endif
+
 /* Enumeration types. */
 typedef enum {
 	NIX_FILE, DOS_FILE, MAC_FILE
 } file_format;
 
 typedef enum {
-	HUSH, MILD, ALERT
+	HUSH, NOTICE, MILD, ALERT
 } message_type;
 
 typedef enum {
@@ -173,7 +178,7 @@ typedef enum {
 #ifdef ENABLE_COMMENT
 	COMMENT, UNCOMMENT, PREFLIGHT,
 #endif
-	CUT, CUT_TO_EOF, PASTE, INSERT, OTHER
+	ZAP, CUT, CUT_TO_EOF, PASTE, INSERT, COUPLE_BEGIN, COUPLE_END, OTHER
 } undo_type;
 
 /* Structure types. */
@@ -183,8 +188,6 @@ typedef struct colortype {
 		/* This syntax's foreground color. */
 	short bg;
 		/* This syntax's background color. */
-	bool bright;
-		/* Is this color A_BOLD? */
 	int pairnum;
 		/* The color pair number used for this foreground color and
 		 * background color. */
@@ -224,8 +227,6 @@ typedef struct syntaxtype {
 		/* The list of libmagic results that this syntax applies to. */
 	char *linter;
 		/* The command with which to lint this type of file. */
-	char *formatter;
-		/* The formatting command (for programming languages mainly). */
 #ifdef ENABLE_COMMENT
 	char *comment;
 		/* The line comment prefix (and postfix) for this type of file. */
@@ -530,7 +531,7 @@ enum
 	BOLD_TEXT,
 	QUIET,
 	SOFTWRAP,
-	POS_HISTORY,
+	POSITIONLOG,
 	LOCKING,
 	NOREAD_MODE,
 	MAKE_IT_UNIX,
@@ -538,7 +539,9 @@ enum
 	SHOW_CURSOR,
 	LINE_NUMBERS,
 	NO_PAUSES,
-	AT_BLANKS
+	AT_BLANKS,
+	AFTER_ENDS,
+	LET_THEM_ZAP
 };
 
 /* Flags for the menus in which a given function should be present. */
@@ -558,11 +561,11 @@ enum
 #define MYESNO          (1<<13)
 #define MLINTER         (1<<14)
 #define MFINDINHELP     (1<<15)
-/* This is an abbreviation for all menus except Help and YesNo. */
+/* This is an abbreviation for all menus except Help and Browser and YesNo. */
 #define MMOST  (MMAIN|MWHEREIS|MREPLACE|MREPLACEWITH|MGOTOLINE|MWRITEFILE|MINSERTFILE|\
-                MEXTCMD|MBROWSER|MWHEREISFILE|MGOTODIR|MFINDINHELP|MSPELL|MLINTER)
+                MEXTCMD|MWHEREISFILE|MGOTODIR|MFINDINHELP|MSPELL|MLINTER)
 #ifndef NANO_TINY
-#define MSOME  MMOST
+#define MSOME  MMOST|MBROWSER
 #else
 #define MSOME  MMAIN|MBROWSER
 #endif
@@ -579,24 +582,32 @@ enum
 #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
 
 #ifdef USE_SLANG
@@ -616,7 +627,6 @@ enum
 #define WAS_FINAL_BACKSPACE   (1<<1)
 #define WAS_WHOLE_LINE        (1<<2)
 #define WAS_FINAL_LINE        (1<<3)
-/* The flags for the mark need to be the highest. */
 #define MARK_WAS_SET          (1<<4)
 #define WAS_MARKED_FORWARD    (1<<5)
 #endif /* !NANO_TINY */
@@ -624,9 +634,8 @@ enum
 /* The maximum number of entries displayed in the main shortcut list. */
 #define MAIN_VISIBLE (((COLS + 40) / 20) * 2)
 
-/* The default number of characters from the end of the line where
- * wrapping occurs. */
-#define CHARS_FROM_EOL 8
+/* The default number of columns from end of line where wrapping occurs. */
+#define COLUMNS_FROM_EOL 8
 
 /* The default width of a tab in spaces. */
 #define WIDTH_OF_TAB 8

src/prompt.c

@@ -2,7 +2,7 @@
  *   prompt.c  --  This file is part of GNU nano.                         *
  *                                                                        *
  *   Copyright (C) 1999-2011, 2013-2018 Free Software Foundation, Inc.    *
- *   Copyright (C) 2016 Benno Schulenberg                                 *
+ *   Copyright (C) 2016, 2018 Benno Schulenberg                           *
  *                                                                        *
  *   GNU nano is free software: you can redistribute it and/or modify     *
  *   it under the terms of the GNU General Public License as published    *
@@ -25,7 +25,7 @@
 
 static char *prompt = NULL;
 		/* The prompt string used for statusbar questions. */
-static size_t statusbar_x = HIGHEST_POSITIVE;
+static size_t typing_x = HIGHEST_POSITIVE;
 		/* The cursor position in answer. */
 
 #ifdef ENABLE_MOUSE
@@ -40,12 +40,10 @@ int do_statusbar_mouse(void)
 		size_t start_col = strlenpt(prompt) + 2;
 
 		/* Move to where the click occurred. */
-		if (click_row == 0 && click_col >= start_col) {
-			statusbar_x = actual_x(answer,
+		if (click_row == 0 && click_col >= start_col)
+			typing_x = actual_x(answer,
 							get_statusbar_page_start(start_col, start_col +
-							statusbar_xplustabs()) + click_col - start_col);
-			update_the_statusbar();
-		}
+							strnlenpt(answer, typing_x)) + click_col - start_col);
 	}
 
 	return retval;
@@ -210,102 +208,99 @@ void do_statusbar_output(int *the_input, size_t input_len,
 
 		/* Insert the typed character into the existing answer string. */
 		answer = charealloc(answer, strlen(answer) + char_len + 1);
-		charmove(answer + statusbar_x + char_len, answer + statusbar_x,
-								strlen(answer) - statusbar_x + 1);
-		strncpy(answer + statusbar_x, onechar, char_len);
+		charmove(answer + typing_x + char_len, answer + typing_x,
+								strlen(answer) - typing_x + 1);
+		strncpy(answer + typing_x, onechar, char_len);
 
-		statusbar_x += char_len;
+		typing_x += char_len;
 	}
 
 	free(output);
-
-	update_the_statusbar();
 }
 
 /* Move to the beginning of the answer. */
 void do_statusbar_home(void)
 {
-	statusbar_x = 0;
-	update_the_statusbar();
+	typing_x = 0;
 }
 
 /* Move to the end of the answer. */
 void do_statusbar_end(void)
 {
-	statusbar_x = strlen(answer);
-	update_the_statusbar();
+	typing_x = strlen(answer);
 }
 
 /* Move left one character. */
 void do_statusbar_left(void)
 {
-	if (statusbar_x > 0) {
-		statusbar_x = move_mbleft(answer, statusbar_x);
-		update_the_statusbar();
-	}
+	if (typing_x > 0)
+		typing_x = move_mbleft(answer, typing_x);
 }
 
 /* Move right one character. */
 void do_statusbar_right(void)
 {
-	if (answer[statusbar_x] != '\0') {
-		statusbar_x = move_mbright(answer, statusbar_x);
-		update_the_statusbar();
+	if (answer[typing_x] != '\0')
+		typing_x = move_mbright(answer, typing_x);
+}
+
+/* Delete one character. */
+void do_statusbar_delete(void)
+{
+	if (answer[typing_x] != '\0') {
+		int char_len = parse_mbchar(answer + typing_x, NULL, NULL);
+
+		charmove(answer + typing_x, answer + typing_x + char_len,
+						strlen(answer) - typing_x - char_len + 1);
 	}
 }
 
 /* Backspace over one character. */
 void do_statusbar_backspace(void)
 {
-	if (statusbar_x > 0) {
-		statusbar_x = move_mbleft(answer, statusbar_x);
+	if (typing_x > 0) {
+		typing_x = move_mbleft(answer, typing_x);
 		do_statusbar_delete();
 	}
 }
 
-/* Delete one character. */
-void do_statusbar_delete(void)
-{
-	if (answer[statusbar_x] != '\0') {
-		int char_len = parse_mbchar(answer + statusbar_x, NULL, NULL);
-
-		charmove(answer + statusbar_x, answer + statusbar_x + char_len,
-						strlen(answer) - statusbar_x - char_len + 1);
-
-		update_the_statusbar();
-	}
-}
-
 /* Zap some or all text from the answer. */
 void do_statusbar_cut_text(void)
 {
 	if (!ISSET(CUT_FROM_CURSOR))
-		statusbar_x = 0;
+		typing_x = 0;
 
-	answer[statusbar_x] = '\0';
-
-	update_the_statusbar();
+	answer[typing_x] = '\0';
 }
 
 #ifndef NANO_TINY
 /* Move to the next word in the answer. */
 void do_statusbar_next_word(void)
 {
-	bool seen_space = !is_word_mbchar(answer + statusbar_x, FALSE);
+	bool seen_space = !is_word_mbchar(answer + typing_x, FALSE);
+	bool seen_word = !seen_space;
 
-	/* Move forward until we reach the start of a word. */
-	while (answer[statusbar_x] != '\0') {
-		statusbar_x = move_mbright(answer, statusbar_x);
+	/* Move forward until we reach either the end or the start of a word,
+	 * depending on whether the AFTER_ENDS flag is set or not. */
+	while (answer[typing_x] != '\0') {
+		typing_x = move_mbright(answer, typing_x);
 
-		/* If this is not a word character, then it's a separator; else
-		 * if we've already seen a separator, then it's a word start. */
-		if (!is_word_mbchar(answer + statusbar_x, FALSE))
-			seen_space = TRUE;
-		else if (seen_space)
-			break;
+		if (ISSET(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(answer + typing_x, FALSE))
+				seen_word = TRUE;
+			else if (seen_word)
+				break;
+		} else {
+			/* 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(answer + typing_x, FALSE))
+				seen_space = TRUE;
+			else if (seen_space)
+				break;
+		}
 	}
-
-	update_the_statusbar();
 }
 
 /* Move to the previous word in the answer. */
@@ -314,10 +309,10 @@ void do_statusbar_prev_word(void)
 	bool seen_a_word = FALSE, step_forward = FALSE;
 
 	/* Move backward until we pass over the start of a word. */
-	while (statusbar_x != 0) {
-		statusbar_x = move_mbleft(answer, statusbar_x);
+	while (typing_x != 0) {
+		typing_x = move_mbleft(answer, typing_x);
 
-		if (is_word_mbchar(answer + statusbar_x, FALSE))
+		if (is_word_mbchar(answer + typing_x, FALSE))
 			seen_a_word = TRUE;
 		else if (seen_a_word) {
 			/* This is space now: we've overshot the start of the word. */
@@ -328,9 +323,7 @@ void do_statusbar_prev_word(void)
 
 	if (step_forward)
 		/* Move one character forward again to sit on the start of the word. */
-		statusbar_x = move_mbright(answer, statusbar_x);
-
-	update_the_statusbar();
+		typing_x = move_mbright(answer, typing_x);
 }
 #endif /* !NANO_TINY */
 
@@ -347,12 +340,6 @@ void do_statusbar_verbatim_input(void)
 	free(kbinput);
 }
 
-/* Return the zero-based column position of the cursor in the answer. */
-size_t statusbar_xplustabs(void)
-{
-	return strnlenpt(answer, statusbar_x);
-}
-
 /* Paste the first line of the cutbuffer into the current answer. */
 void do_statusbar_uncut_text(void)
 {
@@ -361,13 +348,13 @@ void do_statusbar_uncut_text(void)
 
 	/* Concatenate: the current answer before the cursor, the first line
 	 * of the cutbuffer, plus the rest of the current answer. */
-	strncpy(fusion, answer, statusbar_x);
-	strncpy(fusion + statusbar_x, cutbuffer->data, pastelen);
-	strcpy(fusion + statusbar_x + pastelen, answer + statusbar_x);
+	strncpy(fusion, answer, typing_x);
+	strncpy(fusion + typing_x, cutbuffer->data, pastelen);
+	strcpy(fusion + typing_x + pastelen, answer + typing_x);
 
 	free(answer);
 	answer = fusion;
-	statusbar_x += pastelen;
+	typing_x += pastelen;
 }
 
 /* Return the column number of the first character of the answer that is
@@ -385,19 +372,19 @@ size_t get_statusbar_page_start(size_t base, size_t column)
 }
 
 /* Reinitialize the cursor position in the answer. */
-void reinit_statusbar_x(void)
+void put_cursor_at_end_of_answer(void)
 {
-	statusbar_x = HIGHEST_POSITIVE;
+	typing_x = HIGHEST_POSITIVE;
 }
 
 /* Redraw the promptbar and place the cursor at the right spot. */
-void update_the_statusbar(void)
+void draw_the_promptbar(void)
 {
 	size_t base = strlenpt(prompt) + 2;
 	size_t the_page, end_page, column;
 	char *expanded;
 
-	the_page = get_statusbar_page_start(base, base + strnlenpt(answer, statusbar_x));
+	the_page = get_statusbar_page_start(base, base + strnlenpt(answer, typing_x));
 	end_page = get_statusbar_page_start(base, base + strlenpt(answer) - 1);
 
 	/* Color the promptbar over its full width. */
@@ -420,12 +407,29 @@ void update_the_statusbar(void)
 	wmove(bottomwin, 0, 0);
 	wrefresh(bottomwin);
 
-	/* Place the cursor at statusbar_x in the answer. */
-	column = base + statusbar_xplustabs();
+	/* Place the cursor at the right spot. */
+	column = base + strnlenpt(answer, typing_x);
 	wmove(bottomwin, 0, column - get_statusbar_page_start(base, column));
 	wnoutrefresh(bottomwin);
 }
 
+#ifndef NANO_TINY
+/* Remove or add the pipe character at the answer's head. */
+void add_or_remove_pipe_symbol_from_answer(void)
+{
+	if (answer[0] == '|') {
+		charmove(answer, answer + 1, strlen(answer) + 1);
+		if (typing_x > 0)
+			typing_x--;
+	} else {
+		answer = charealloc(answer, strlen(answer) + 2);
+		charmove(answer + 1, answer, strlen(answer) + 1);
+		answer[0] = '|';
+		typing_x++;
+	}
+}
+#endif
+
 /* Get a string of input at the statusbar prompt. */
 functionptrtype acquire_an_answer(int *actual, bool allow_tabs,
 		bool allow_files, bool *listed, filestruct **history_list,
@@ -442,8 +446,7 @@ functionptrtype acquire_an_answer(int *actual, bool allow_tabs,
 	char *history = NULL;
 		/* The current history string. */
 	char *magichistory = NULL;
-		/* The temporary string typed at the bottom of the history, if
-		 * any. */
+		/* The (partial) answer that was typed at the prompt, if any. */
 #ifdef ENABLE_TABCOMP
 	int last_kbinput = ERR;
 		/* The key we pressed before the current key. */
@@ -453,12 +456,12 @@ functionptrtype acquire_an_answer(int *actual, bool allow_tabs,
 #endif
 #endif /* ENABLE_HISTORIES */
 
-	if (statusbar_x > strlen(answer))
-		statusbar_x = strlen(answer);
-
-	update_the_statusbar();
+	if (typing_x > strlen(answer))
+		typing_x = strlen(answer);
 
 	while (TRUE) {
+		draw_the_promptbar();
+
 		kbinput = do_statusbar_input(&finished);
 
 #ifndef NANO_TINY
@@ -491,12 +494,12 @@ functionptrtype acquire_an_answer(int *actual, bool allow_tabs,
 				if (complete_len > 0) {
 					answer = get_history_completion(history_list,
 										answer, complete_len);
-					statusbar_x = strlen(answer);
+					typing_x = strlen(answer);
 				}
 			} else
 #endif
 			if (allow_tabs)
-				answer = input_tab(answer, allow_files, &statusbar_x,
+				answer = input_tab(answer, allow_files, &typing_x,
 										&tabbed, refresh_func, listed);
 		} else
 #endif /* ENABLE_TABCOMP */
@@ -512,7 +515,7 @@ functionptrtype acquire_an_answer(int *actual, bool allow_tabs,
 				 * answer.  If there is no older search, don't do anything. */
 				if ((history = get_history_older(history_list)) != NULL) {
 					answer = mallocstrcpy(answer, history);
-					statusbar_x = strlen(answer);
+					typing_x = strlen(answer);
 				}
 
 				/* This key has a shortcut-list entry when it's used to
@@ -527,16 +530,15 @@ functionptrtype acquire_an_answer(int *actual, bool allow_tabs,
 				 * answer.  If there is no newer search, don't do anything. */
 				if ((history = get_history_newer(history_list)) != NULL) {
 					answer = mallocstrcpy(answer, history);
-					statusbar_x = strlen(answer);
+					typing_x = strlen(answer);
 				}
 
-				/* If, after scrolling down, we're at the bottom of the
-				 * history list, answer is blank, and magichistory is set,
-				 * save magichistory in answer. */
+				/* If we've reached the bottom of the history list, and answer
+				 * is blank, and magichistory is set, restore the old answer. */
 				if ((*history_list)->next == NULL &&
 						*answer == '\0' && magichistory != NULL) {
 					answer = mallocstrcpy(answer, magichistory);
-					statusbar_x = strlen(answer);
+					typing_x = strlen(answer);
 				}
 
 				/* This key has a shortcut-list entry when it's used to
@@ -561,8 +563,6 @@ functionptrtype acquire_an_answer(int *actual, bool allow_tabs,
 		if (finished)
 			break;
 
-		update_the_statusbar();
-
 #if defined(ENABLE_HISTORIES) && defined(ENABLE_TABCOMP)
 		last_kbinput = kbinput;
 #endif
@@ -601,7 +601,7 @@ int do_prompt(bool allow_tabs, bool allow_files,
 	functionptrtype func = NULL;
 	bool listed = FALSE;
 	/* Save a possible current statusbar x position and prompt. */
-	size_t was_statusbar_x = statusbar_x;
+	size_t was_typing_x = typing_x;
 	char *saved_prompt = prompt;
 
 	bottombars(menu);
@@ -632,7 +632,7 @@ int do_prompt(bool allow_tabs, bool allow_files,
 	/* If we're done with this prompt, restore the x position to what
 	 * it was at a possible previous prompt. */
 	if (func == do_cancel || func == do_enter)
-		statusbar_x = was_statusbar_x;
+		typing_x = was_typing_x;
 
 	/* If we left the prompt via Cancel or Enter, set the return value
 	 * properly. */
@@ -659,24 +659,25 @@ int do_prompt(bool allow_tabs, bool allow_files,
 int do_yesno_prompt(bool all, const char *msg)
 {
 	int response = -2, width = 16;
-
-	/* TRANSLATORS: For the next three strings, if possible, specify
-	 * the single-byte letters for both your language and English.
-	 * For example, in French: "OoYy", for both "Oui" and "Yes". */
+	/* TRANSLATORS: For the next three strings, specify the starting letters
+	 * of the translations for "Yes"/"No"/"All".  The first letter of each of
+	 * these strings MUST be a single-byte letter; others may be multi-byte. */
 	const char *yesstr = _("Yy");
 	const char *nostr = _("Nn");
 	const char *allstr = _("Aa");
 
-	/* The above three variables consist of all the single-byte characters
-	 * that are accepted for the corresponding answer.  Of each variable,
-	 * the first character is displayed in the help lines. */
-
 	while (response == -2) {
+#ifdef ENABLE_NLS
+		char letter[MAXCHARLEN + 1];
+		int index = 0;
+#endif
 		int kbinput;
 
 		if (!ISSET(NO_HELP)) {
 			char shortstr[MAXCHARLEN + 2];
 				/* Temporary string for (translated) " Y", " N" and " A". */
+			const sc *cancelshortcut = first_sc_for(MYESNO, do_cancel);
+				/* The keystroke that is bound to the Cancel function. */
 
 			if (COLS < 32)
 				width = COLS / 2;
@@ -689,18 +690,18 @@ int do_yesno_prompt(bool all, const char *msg)
 			wmove(bottomwin, 1, 0);
 			post_one_key(shortstr, _("Yes"), width);
 
+			shortstr[1] = nostr[0];
+			wmove(bottomwin, 2, 0);
+			post_one_key(shortstr, _("No"), width);
+
 			if (all) {
 				shortstr[1] = allstr[0];
 				wmove(bottomwin, 1, width);
 				post_one_key(shortstr, _("All"), width);
 			}
 
-			shortstr[1] = nostr[0];
-			wmove(bottomwin, 2, 0);
-			post_one_key(shortstr, _("No"), width);
-
 			wmove(bottomwin, 2, width);
-			post_one_key("^C", _("Cancel"), width);
+			post_one_key(cancelshortcut->keystr, _("Cancel"), width);
 		}
 
 		/* Color the statusbar over its full width and display the question. */
@@ -715,12 +716,34 @@ int do_yesno_prompt(bool all, const char *msg)
 		/* When not replacing, show the cursor while waiting for a key. */
 		kbinput = get_kbinput(bottomwin, !all);
 
-		/* See if the pressed key is in the Yes, No, or All strings. */
-		if (strchr(yesstr, kbinput) != NULL)
+#ifdef ENABLE_NLS
+		letter[index++] = (unsigned char)kbinput;
+#ifdef ENABLE_UTF8
+		/* If the received code is a UTF-8 starter byte, get also the
+		 * continuation bytes and assemble them into one letter. */
+		if (using_utf8() && 0xC0 <= kbinput && kbinput <= 0xF7) {
+			int extras = (kbinput / 16) % 4 + (kbinput <= 0xCF ? 1 : 0);
+
+			while (extras <= get_key_buffer_len() && extras-- > 0)
+				letter[index++] = (unsigned char)get_kbinput(bottomwin, !all);
+		}
+#endif
+		letter[index] = '\0';
+
+		/* See if the typed letter is in the Yes, No, or All strings. */
+		if (strstr(yesstr, letter) != NULL)
 			response = 1;
-		else if (strchr(nostr, kbinput) != NULL)
+		else if (strstr(nostr, letter) != NULL)
 			response = 0;
-		else if (all && strchr(allstr, kbinput) != NULL)
+		else if (all && strstr(allstr, letter) != NULL)
+			response = 2;
+		else
+#endif /* ENABLE_NLS */
+		if (strchr("Yy", kbinput) != NULL)
+			response = 1;
+		else if (strchr("Nn", kbinput) != NULL)
+			response = 0;
+		else if (all && strchr("Aa", kbinput) != NULL)
 			response = 2;
 		else if (func_from_key(&kbinput) == do_cancel)
 			response = -1;
@@ -728,7 +751,7 @@ int do_yesno_prompt(bool all, const char *msg)
 		else if (kbinput == KEY_MOUSE) {
 			int mouse_x, mouse_y;
 			/* We can click on the Yes/No/All shortcuts to select an answer. */
-			if (get_mouseinput(&mouse_x, &mouse_y, FALSE) == 0 &&
+			if (get_mouseinput(&mouse_y, &mouse_x, FALSE) == 0 &&
 						wmouse_trafo(bottomwin, &mouse_y, &mouse_x, FALSE) &&
 						mouse_x < (width * 2) && mouse_y > 0) {
 				int x = mouse_x / width;

src/proto.h

@@ -40,9 +40,6 @@ extern bool focusing;
 
 extern bool as_an_at;
 
-extern int margin;
-extern int editwincols;
-
 extern bool suppress_cursorpos;
 
 extern message_type lastmessage;
@@ -58,32 +55,25 @@ extern bool also_the_last;
 
 extern int didfind;
 
-extern int controlleft;
-extern int controlright;
-extern int controlup;
-extern int controldown;
-extern int controlhome;
-extern int controlend;
+extern int controlleft, controlright;
+extern int controlup, controldown;
+extern int controlhome, controlend;
 #ifndef NANO_TINY
-extern int shiftcontrolleft;
-extern int shiftcontrolright;
-extern int shiftcontrolup;
-extern int shiftcontroldown;
-extern int shiftcontrolhome;
-extern int shiftcontrolend;
-extern int altleft;
-extern int altright;
-extern int altup;
-extern int altdown;
-extern int shiftaltleft;
-extern int shiftaltright;
-extern int shiftaltup;
-extern int shiftaltdown;
+extern int controldelete, controlshiftdelete;
+extern int shiftleft, shiftright;
+extern int shiftup, shiftdown;
+extern int shiftcontrolleft, shiftcontrolright;
+extern int shiftcontrolup, shiftcontroldown;
+extern int shiftcontrolhome, shiftcontrolend;
+extern int altleft, altright;
+extern int altup, altdown;
+extern int altdelete;
+extern int shiftaltleft, shiftaltright;
+extern int shiftaltup, shiftaltdown;
 #endif
 
 #ifdef ENABLED_WRAPORJUSTIFY
-extern ssize_t fill;
-extern ssize_t wrap_at;
+extern ssize_t wrap_at, fill;
 #endif
 
 extern char *last_search;
@@ -91,10 +81,13 @@ extern char *last_search;
 extern char *present_path;
 
 extern unsigned flags[4];
+
 extern WINDOW *topwin;
 extern WINDOW *edit;
 extern WINDOW *bottomwin;
 extern int editwinrows;
+extern int editwincols;
+extern int margin;
 
 extern filestruct *cutbuffer;
 extern filestruct *cutbottom;
@@ -178,7 +171,13 @@ extern int interface_color_pair[NUMBER_OF_ELEMENTS];
 
 extern char *homedir;
 extern char *statedir;
+#ifdef ENABLE_NANORC
 extern char *rcfile_with_errors;
+#endif
+
+extern bool spotlighted;
+extern size_t light_from_col;
+extern size_t light_to_col;
 
 typedef void (*functionptrtype)(void);
 
@@ -189,7 +188,7 @@ void read_the_list(const char *path, DIR *dir);
 functionptrtype parse_browser_input(int *kbinput);
 void browser_refresh(void);
 void browser_select_dirname(const char *needle);
-void do_filesearch(void);
+void do_filesearch(bool forwards);
 void do_fileresearch(bool forwards);
 void to_first_file(void);
 void to_last_file(void);
@@ -221,7 +220,6 @@ char *mbstrcasestr(const char *haystack, const char *needle);
 char *revstrstr(const char *haystack, const char *needle, const char *index);
 char *mbrevstrcasestr(const char *haystack, const char *needle, const char *index);
 size_t mbstrlen(const char *s);
-size_t mbstrnlen(const char *s, size_t maxlen);
 #if !defined(NANO_TINY) || defined(ENABLE_JUSTIFY)
 char *mbstrchr(const char *s, const char *c);
 #endif
@@ -236,9 +234,6 @@ bool has_blank_mbchars(const char *s);
 #ifdef ENABLE_UTF8
 bool is_valid_unicode(wchar_t wc);
 #endif
-#ifdef ENABLE_NANORC
-bool is_valid_mbstring(const char *s);
-#endif
 
 /* Most functions in color.c. */
 #ifdef ENABLE_COLOR
@@ -252,15 +247,15 @@ void precalc_multicolorinfo(void);
 
 /* Most functions in cut.c. */
 void cutbuffer_reset(void);
-bool keeping_cutbuffer(void);
 #ifndef NANO_TINY
 void cut_marked(bool *right_side_up);
 #endif
-void do_cut_text(bool copy_text, bool cut_till_eof);
+void do_cut_text(bool copy_text, bool marked, bool cut_till_eof, bool append);
 void do_cut_text_void(void);
 #ifndef NANO_TINY
 void do_copy_text(void);
 void do_cut_till_eof(void);
+void zap_text(void);
 #endif
 void do_uncut_text(void);
 
@@ -271,12 +266,12 @@ bool open_buffer(const char *filename, bool new_buffer);
 #ifdef ENABLE_SPELLER
 void replace_buffer(const char *filename);
 #ifndef NANO_TINY
-void replace_marked_buffer(const char *filename, filestruct *top, size_t top_x,
-		filestruct *bot, size_t bot_x);
+void replace_marked_buffer(const char *filename);
 #endif
 #endif
 void prepare_for_display(void);
 #ifdef ENABLE_MULTIBUFFER
+void mention_name_and_linecount(void);
 void switch_to_prev_buffer(void);
 void switch_to_next_buffer(void);
 bool close_buffer(void);
@@ -324,16 +319,12 @@ int keycode_from_string(const char *keystring);
 void assign_keyinfo(sc *s, const char *keystring, const int keycode);
 void print_sclist(void);
 void shortcut_init(void);
-#ifdef ENABLE_COLOR
-void set_lint_or_format_shortcuts(void);
-void set_spell_shortcuts(void);
-#endif
 const subnfunc *sctofunc(const sc *s);
 const char *flagtostr(int flag);
+#ifdef ENABLE_NANORC
 sc *strtosc(const char *input);
-int strtomenu(const char *input);
-#ifdef DEBUG
-void thanks_for_all_the_fish(void);
+int name_to_menu(const char *name);
+char *menu_to_name(int menu);
 #endif
 
 /* All functions in help.c. */
@@ -372,22 +363,22 @@ void to_last_line(void);
 void do_page_up(void);
 void do_page_down(void);
 #ifdef ENABLE_JUSTIFY
-void do_para_begin(bool update_screen);
-void do_para_end(bool update_screen);
+void do_para_begin(void);
+void do_para_end(void);
 void do_para_begin_void(void);
 void do_para_end_void(void);
 #endif
 void do_prev_block(void);
 void do_next_block(void);
-void do_prev_word(bool allow_punct, bool update_screen);
-bool do_next_word(bool allow_punct, bool update_screen);
+void do_prev_word(bool allow_punct);
+bool do_next_word(bool after_ends, bool allow_punct);
 void do_prev_word_void(void);
 void do_next_word_void(void);
 void do_home(void);
 void do_end(void);
 void do_up(void);
 void do_down(void);
-#ifdef ENABLE_HELP
+#if !defined(NANO_TINY) || defined(ENABLE_HELP)
 void do_scroll_up(void);
 void do_scroll_down(void);
 #endif
@@ -409,7 +400,6 @@ void extract_buffer(filestruct **file_top, filestruct **file_bot,
 		filestruct *top, size_t top_x, filestruct *bot, size_t bot_x);
 void ingraft_buffer(filestruct *somebuffer);
 void copy_from_buffer(filestruct *somebuffer);
-openfilestruct *make_new_opennode(void);
 #ifdef ENABLE_MULTIBUFFER
 void unlink_opennode(openfilestruct *fileptr);
 void delete_opennode(openfilestruct *fileptr);
@@ -426,19 +416,23 @@ void window_init(void);
 void do_exit(void);
 void close_and_go(void);
 RETSIGTYPE handle_hupterm(int signal);
+#ifndef DEBUG
+RETSIGTYPE handle_crash(int signal);
+#endif
 RETSIGTYPE do_suspend(int signal);
 RETSIGTYPE do_continue(int signal);
 #ifndef NANO_TINY
 RETSIGTYPE handle_sigwinch(int signal);
 void regenerate_screen(void);
-void allow_sigwinch(bool allow);
 void do_toggle(int flag);
-void do_toggle_void(void);
 void enable_signals(void);
 #endif
 void disable_flow_control(void);
 void enable_flow_control(void);
 void terminal_init(void);
+#ifdef ENABLE_LINENUMBERS
+void confirm_margin(void);
+#endif
 void unbound_key(int code);
 bool okay_for_view(const sc *shortcut);
 int do_input(bool allow_funcs);
@@ -459,10 +453,9 @@ void do_statusbar_prev_word(void);
 void do_statusbar_next_word(void);
 #endif
 void do_statusbar_verbatim_input(void);
-size_t statusbar_xplustabs(void);
 size_t get_statusbar_page_start(size_t start_col, size_t column);
-void reinit_statusbar_x(void);
-void update_the_statusbar(void);
+void put_cursor_at_end_of_answer(void);
+void add_or_remove_pipe_symbol_from_answer(void);
 int do_prompt(bool allow_tabs, bool allow_files,
 		int menu, const char *curranswer, filestruct **history_list,
 		void (*refresh_func)(void), const char *msg, ...);
@@ -471,7 +464,6 @@ int do_yesno_prompt(bool all, const char *msg);
 /* Most functions in rcfile.c. */
 #ifdef ENABLE_NANORC
 #ifdef ENABLE_COLOR
-bool parse_color_names(char *combostr, short *fg, short *bg, bool *bright);
 void grab_and_store(const char *kind, char *ptr, regexlisttype **storage);
 #endif
 void parse_rcfile(FILE *rcstream, bool syntax_only);
@@ -479,18 +471,15 @@ void do_rcfiles(void);
 #endif /* ENABLE_NANORC */
 
 /* Most functions in search.c. */
-void not_found_msg(const char *str);
-void search_replace_abort(void);
+void tidy_up_after_search(void);
 int findnextstr(const char *needle, bool whole_word_only, int modus,
 		size_t *match_len, bool skipone, const filestruct *begin, size_t begin_x);
 void do_search(void);
 void do_search_forward(void);
 void do_search_backward(void);
-#ifndef NANO_TINY
 void do_findprevious(void);
 void do_findnext(void);
-#endif
-void do_research(void);
+void not_found_msg(const char *str);
 void go_looking(void);
 ssize_t do_replace_loop(const char *needle, bool whole_word_only,
 		const filestruct *real_current, size_t *real_current_x);
@@ -522,7 +511,6 @@ void do_unindent(void);
 bool white_string(const char *s);
 #ifdef ENABLE_COMMENT
 void do_comment(void);
-bool comment_line(undo_type action, filestruct *f, const char *comment_seq);
 #endif
 void do_undo(void);
 void do_redo(void);
@@ -547,7 +535,7 @@ size_t indent_length(const char *line);
 #endif
 #ifdef ENABLE_JUSTIFY
 void justify_format(filestruct *paragraph, size_t skip);
-bool begpar(const filestruct *const foo);
+bool begpar(const filestruct *const foo, int depth);
 bool inpar(const filestruct *const foo);
 void do_justify(bool full_justify);
 void do_justify_void(void);
@@ -558,7 +546,6 @@ void do_spell(void);
 #endif
 #ifdef ENABLE_COLOR
 void do_linter(void);
-void do_formatter(void);
 #endif
 #ifndef NANO_TINY
 void do_wordlinechar_count(void);
@@ -612,9 +599,6 @@ size_t get_totsize(const filestruct *begin, const filestruct *end);
 #ifndef NANO_TINY
 filestruct *fsfromline(ssize_t lineno);
 #endif
-#ifdef DEBUG
-void dump_filestruct(const filestruct *inptr);
-#endif
 
 /* Most functions in winio.c. */
 void record_macro(void);
@@ -677,12 +661,11 @@ void edit_refresh(void);
 void adjust_viewport(update_type location);
 void total_redraw(void);
 void total_refresh(void);
-void display_main_list(void);
 void do_cursorpos(bool force);
 void do_cursorpos_void(void);
-void spotlight(bool active, size_t from_col, size_t to_col);
+void spotlight(size_t from_col, size_t to_col);
 #ifndef NANO_TINY
-void spotlight_softwrapped(bool active, size_t from_col, size_t to_col);
+void spotlight_softwrapped(size_t from_col, size_t to_col);
 #endif
 void do_suspend_void(void);
 void disable_waiting(void);
@@ -692,7 +675,6 @@ void do_credits(void);
 #endif
 
 /* These are just name definitions. */
-void do_cancel(void);
 void case_sens_void(void);
 void regexp_void(void);
 void backwards_void(void);
@@ -703,16 +685,20 @@ void to_files_void(void);
 void goto_dir_void(void);
 #endif
 #ifndef NANO_TINY
+void do_toggle_void(void);
 void dos_format_void(void);
 void mac_format_void(void);
 void append_void(void);
 void prepend_void(void);
 void backup_file_void(void);
 void flip_execute(void);
+void flip_pipe(void);
+void flip_convert(void);
 #endif
 #ifdef ENABLE_MULTIBUFFER
 void flip_newbuffer(void);
 #endif
 void discard_buffer(void);
+void do_cancel(void);
 
 #endif /* !PROTO_H */

src/rcfile.c

@@ -3,7 +3,7 @@
  *                                                                        *
  *   Copyright (C) 2001-2011, 2013-2018 Free Software Foundation, Inc.    *
  *   Copyright (C) 2014 Mike Frysinger                                    *
- *   Copyright (C) 2014-2017 Benno Schulenberg                            *
+ *   Copyright (C) 2014-2018 Benno Schulenberg                            *
  *                                                                        *
  *   GNU nano is free software: you can redistribute it and/or modify     *
  *   it under the terms of the GNU General Public License as published    *
@@ -31,14 +31,14 @@
 #ifdef ENABLE_NANORC
 
 #ifndef RCFILE_NAME
+#define HOME_RC_NAME ".nanorc"
 #define RCFILE_NAME "nanorc"
+#else
+#define HOME_RC_NAME RCFILE_NAME
 #endif
 
 static const rcoption rcopts[] = {
 	{"boldtext", BOLD_TEXT},
-#ifdef ENABLE_LINENUMBERS
-	{"linenumbers", LINE_NUMBERS},
-#endif
 #ifdef ENABLE_JUSTIFY
 	{"brackets", 0},
 #endif
@@ -48,6 +48,9 @@ static const rcoption rcopts[] = {
 #endif
 #ifdef ENABLE_HISTORIES
 	{"historylog", HISTORYLOG},
+#endif
+#ifdef ENABLE_LINENUMBERS
+	{"linenumbers", LINE_NUMBERS},
 #endif
 	{"morespace", MORE_SPACE},
 #ifdef ENABLE_MOUSE
@@ -66,7 +69,7 @@ static const rcoption rcopts[] = {
 	{"operatingdir", 0},
 #endif
 #ifdef ENABLE_HISTORIES
-	{"positionlog", POS_HISTORY},
+	{"positionlog", POSITIONLOG},
 #endif
 	{"preserve", PRESERVE},
 #ifdef ENABLE_JUSTIFY
@@ -85,16 +88,16 @@ static const rcoption rcopts[] = {
 	{"tempfile", TEMP_FILE},
 	{"view", VIEW_MODE},
 #ifndef NANO_TINY
+	{"afterends", AFTER_ENDS},
 	{"allow_insecure_backup", INSECURE_BACKUP},
 	{"atblanks", AT_BLANKS},
 	{"autoindent", AUTOINDENT},
 	{"backup", BACKUP_FILE},
 	{"backupdir", 0},
-	{"backwards", BACKWARDS_SEARCH},
 	{"casesensitive", CASE_SENSITIVE},
-	{"cut", CUT_FROM_CURSOR},  /* deprecated form, remove in 2020 */
+	{"cut", CUT_FROM_CURSOR},  /* deprecated form, remove end of 2018 */
 	{"cutfromcursor", CUT_FROM_CURSOR},
-	{"justifytrim", TRIM_BLANKS},  /* deprecated form, remove in 2020 */
+	{"justifytrim", TRIM_BLANKS},  /* deprecated form, remove end of 2018 */
 	{"locking", LOCKING},
 	{"matchbrackets", 0},
 	{"noconvert", NO_CONVERT},
@@ -109,6 +112,7 @@ static const rcoption rcopts[] = {
 	{"whitespace", 0},
 	{"wordbounds", WORD_BOUNDS},
 	{"wordchars", 0},
+	{"zap", LET_THEM_ZAP},
 #endif
 #ifdef ENABLE_COLOR
 	{"titlecolor", 0},
@@ -297,7 +301,6 @@ void parse_syntax(char *ptr)
 	live_syntax->headers = NULL;
 	live_syntax->magics = NULL;
 	live_syntax->linter = NULL;
-	live_syntax->formatter = NULL;
 #ifdef ENABLE_COMMENT
 	live_syntax->comment = mallocstrcpy(NULL, GENERAL_COMMENT_CHARACTER);
 #endif
@@ -311,10 +314,6 @@ void parse_syntax(char *ptr)
 
 	opensyntax = TRUE;
 
-#ifdef DEBUG
-	fprintf(stderr, "Starting a new syntax type: \"%s\"\n", nameptr);
-#endif
-
 	/* The default syntax should have no associated extensions. */
 	if (strcmp(live_syntax->name, "default") == 0 && *ptr != '\0') {
 		rcfile_error(N_("The \"default\" syntax does not accept extensions"));
@@ -347,10 +346,6 @@ void parse_binding(char *ptr, bool dobind)
 	sc *s, *newsc = NULL;
 	int menu;
 
-#ifdef DEBUG
-	fprintf(stderr, "Starting the rebinding code...\n");
-#endif
-
 	if (*ptr == '\0') {
 		rcfile_error(N_("Missing key name"));
 		return;
@@ -396,7 +391,8 @@ void parse_binding(char *ptr, bool dobind)
 		if (funcptr[0] == '\0') {
 			rcfile_error(N_("Must specify a function to bind the key to"));
 			goto free_things;
-		}
+		} else if (ptr == NULL)
+			goto free_things;
 	}
 
 	menuptr = ptr;
@@ -419,7 +415,7 @@ void parse_binding(char *ptr, bool dobind)
 			newsc->toggle = 0;
 #endif
 		} else
-		    newsc = strtosc(funcptr);
+			newsc = strtosc(funcptr);
 
 		if (newsc == NULL) {
 			rcfile_error(N_("Cannot map name \"%s\" to a function"), funcptr);
@@ -427,7 +423,7 @@ void parse_binding(char *ptr, bool dobind)
 		}
 	}
 
-	menu = strtomenu(menuptr);
+	menu = name_to_menu(menuptr);
 	if (menu < 1) {
 		rcfile_error(N_("Cannot map name \"%s\" to a menu"), menuptr);
 		goto free_things;
@@ -456,7 +452,9 @@ void parse_binding(char *ptr, bool dobind)
 		menu = menu & (is_universal(newsc->func) ? MMOST : mask);
 
 		if (!menu) {
-			rcfile_error(N_("Function '%s' does not exist in menu '%s'"), funcptr, menuptr);
+			if (!ISSET(RESTRICTED))
+				rcfile_error(N_("Function '%s' does not exist in menu '%s'"),
+									funcptr, menuptr);
 			goto free_things;
 		}
 
@@ -506,7 +504,7 @@ bool is_good_file(char *file)
 	if (access(file, R_OK) != 0)
 		return FALSE;
 
-	/* If the thing exists, it may not be a directory nor a device. */
+	/* If the thing exists, it may be neither a directory nor a device. */
 	if (stat(file, &rcinfo) != -1 && (S_ISDIR(rcinfo.st_mode) ||
 				S_ISCHR(rcinfo.st_mode) || S_ISBLK(rcinfo.st_mode))) {
 		rcfile_error(S_ISDIR(rcinfo.st_mode) ? _("\"%s\" is a directory") :
@@ -539,10 +537,6 @@ static void parse_one_include(char *file)
 	nanorc = file;
 	lineno = 0;
 
-#ifdef DEBUG
-	fprintf(stderr, "Parsing file \"%s\"\n", file);
-#endif
-
 	parse_rcfile(rcstream, TRUE);
 }
 
@@ -603,10 +597,44 @@ short color_to_short(const char *colorname, bool *bright)
 	else if (strcasecmp(colorname, "black") == 0)
 		return COLOR_BLACK;
 	else if (strcasecmp(colorname, "normal") == 0)
-		return -1;
+		return USE_THE_DEFAULT;
 
 	rcfile_error(N_("Color \"%s\" not understood"), colorname);
-	return -2;
+	return BAD_COLOR;
+}
+
+/* Parse the color name (or pair of color names) in the given string.
+ * Return FALSE when any color name is invalid; otherwise return TRUE. */
+bool parse_color_names(char *combostr, short *fg, short *bg, int *attributes)
+{
+	char *comma = strchr(combostr, ',');
+	bool bright;
+
+	*attributes = A_NORMAL;
+
+	if (comma != NULL) {
+		*bg = color_to_short(comma + 1, &bright);
+		if (bright) {
+			rcfile_error(N_("A background color cannot be bright"));
+			return FALSE;
+		}
+		if (*bg == BAD_COLOR)
+			return FALSE;
+		*comma = '\0';
+	} else
+		*bg = USE_THE_DEFAULT;
+
+	if (comma != combostr) {
+		*fg = color_to_short(combostr, &bright);
+		if (*fg == BAD_COLOR)
+			return FALSE;
+
+		if (bright)
+			*attributes = A_BOLD;
+	} else
+		*fg = USE_THE_DEFAULT;
+
+	return TRUE;
 }
 
 /* Parse the color string in the line at ptr, and add it to the current
@@ -615,7 +643,7 @@ short color_to_short(const char *colorname, bool *bright)
 void parse_colors(char *ptr, int rex_flags)
 {
 	short fg, bg;
-	bool bright;
+	int attributes;
 	char *item;
 
 	if (!opensyntax) {
@@ -631,7 +659,7 @@ void parse_colors(char *ptr, int rex_flags)
 
 	item = ptr;
 	ptr = parse_next_word(ptr);
-	if (!parse_color_names(item, &fg, &bg, &bright))
+	if (!parse_color_names(item, &fg, &bg, &attributes))
 		return;
 
 	if (*ptr == '\0') {
@@ -678,7 +706,7 @@ void parse_colors(char *ptr, int rex_flags)
 
 			newcolor->fg = fg;
 			newcolor->bg = bg;
-			newcolor->bright = bright;
+			newcolor->attributes = attributes;
 			newcolor->rex_flags = rex_flags;
 
 			newcolor->start_regex = mallocstrcpy(NULL, item);
@@ -736,42 +764,12 @@ void parse_colors(char *ptr, int rex_flags)
 	}
 }
 
-/* Parse the color name, or pair of color names, in combostr. */
-bool parse_color_names(char *combostr, short *fg, short *bg, bool *bright)
-{
-	char *comma = strchr(combostr, ',');
-
-	if (comma != NULL) {
-		*bg = color_to_short(comma + 1, bright);
-		if (*bright) {
-			rcfile_error(N_("A background color cannot be bright"));
-			return FALSE;
-		}
-		*comma = '\0';
-	} else
-		*bg = -1;
-
-	if (comma != combostr) {
-		*fg = color_to_short(combostr, bright);
-
-		/* If the specified foreground color is bad, ignore the regexes. */
-		if (*fg == -2)
-			return FALSE;
-	} else
-		*fg = -1;
-
-	if (*bg == -2)
-		*bg = -1;
-
-	return TRUE;
-}
-
 /* Parse the argument of an interface color option. */
 colortype *parse_interface_color(char *combostr)
 {
 	colortype *trio = nmalloc(sizeof(colortype));
 
-	if (parse_color_names(combostr, &trio->fg, &trio->bg, &trio->bright)) {
+	if (parse_color_names(combostr, &trio->fg, &trio->bg, &trio->attributes)) {
 		free(combostr);
 		return trio;
 	} else {
@@ -844,7 +842,7 @@ void grab_and_store(const char *kind, char *ptr, regexlisttype **storage)
 	}
 }
 
-/* Gather and store the string after a comment/linter/formatter command. */
+/* Gather and store the string after a comment/linter command. */
 void pick_up_name(const char *kind, char *ptr, char **storage)
 {
 	if (!opensyntax) {
@@ -883,17 +881,18 @@ static void check_vitals_mapped(void)
 {
 	subnfunc *f;
 	int v;
-#define VITALS 5
-	void (*vitals[VITALS])(void) = { do_exit, do_exit, do_cancel, do_cancel, do_cancel };
-	int inmenus[VITALS] = { MMAIN, MHELP, MWHEREIS, MREPLACE, MGOTOLINE };
+#define VITALS 3
+	void (*vitals[VITALS])(void) = { do_exit, do_exit, do_cancel };
+	int inmenus[VITALS] = { MMAIN, MHELP, MYESNO };
 
 	for  (v = 0; v < VITALS; v++) {
 		for (f = allfuncs; f != NULL; f = f->next) {
 			if (f->func == vitals[v] && f->menus & inmenus[v]) {
 				const sc *s = first_sc_for(inmenus[v], f->func);
 				if (!s) {
-					fprintf(stderr, _("Fatal error: no keys mapped for function "
-										"\"%s\".  Exiting.\n"), f->desc);
+					fprintf(stderr, _("No key is bound to function '%s' in "
+										"menu '%s'.  Exiting.\n"), f->desc,
+										menu_to_name(inmenus[v]));
 					fprintf(stderr, _("If needed, use nano with the -I option "
 										"to adjust your nanorc settings.\n"));
 					exit(1);
@@ -927,8 +926,7 @@ void parse_rcfile(FILE *rcstream, bool syntax_only)
 		while (isblank((unsigned char)*ptr))
 			ptr++;
 
-		/* If we have a blank line or a comment, skip to the next
-		 * line. */
+		/* If the line is empty or a comment, skip to next line. */
 		if (*ptr == '\0' || *ptr == '#')
 			continue;
 
@@ -938,7 +936,7 @@ void parse_rcfile(FILE *rcstream, bool syntax_only)
 
 #ifdef ENABLE_COLOR
 		/* Handle extending first... */
-		if (strcasecmp(keyword, "extendsyntax") == 0) {
+		if (strcasecmp(keyword, "extendsyntax") == 0 && !syntax_only) {
 			syntaxtype *sint;
 			char *syntaxname = ptr;
 
@@ -995,13 +993,12 @@ void parse_rcfile(FILE *rcstream, bool syntax_only)
 			parse_colors(ptr, NANO_REG_EXTENDED | REG_ICASE);
 		else if (strcasecmp(keyword, "linter") == 0)
 			pick_up_name("linter", ptr, &live_syntax->linter);
-		else if (strcasecmp(keyword, "formatter") == 0)
-#ifdef ENABLE_SPELLER
-			pick_up_name("formatter", ptr, &live_syntax->formatter);
-#else
-			;
-#endif
-		else if (syntax_only)
+		else if (syntax_only && (strcasecmp(keyword, "set") == 0 ||
+								strcasecmp(keyword, "unset") == 0 ||
+								strcasecmp(keyword, "bind") == 0 ||
+								strcasecmp(keyword, "unbind") == 0 ||
+								strcasecmp(keyword, "include") == 0 ||
+								strcasecmp(keyword, "extendsyntax") == 0))
 			rcfile_error(N_("Command \"%s\" not allowed in included file"),
 										keyword);
 		else if (strcasecmp(keyword, "include") == 0)
@@ -1047,10 +1044,6 @@ void parse_rcfile(FILE *rcstream, bool syntax_only)
 			continue;
 		}
 
-#ifdef DEBUG
-		fprintf(stderr, "    Option name = \"%s\"\n", rcopts[i].name);
-		fprintf(stderr, "    Flag = %ld\n", rcopts[i].flag);
-#endif
 		/* First handle unsetting. */
 		if (set == -1) {
 			if (rcopts[i].flag != 0)
@@ -1079,15 +1072,14 @@ void parse_rcfile(FILE *rcstream, bool syntax_only)
 		ptr = parse_argument(ptr);
 
 		option = mallocstrcpy(NULL, option);
-#ifdef DEBUG
-		fprintf(stderr, "    Option argument = \"%s\"\n", option);
-#endif
-		/* Make sure the option argument is a valid multibyte string. */
-		if (!is_valid_mbstring(option)) {
+
+#ifdef ENABLE_UTF8
+		/* When in a UTF-8 locale, ignore arguments with invalid sequences. */
+		if (using_utf8() && mbstowcs(NULL, option, 0) == (size_t)-1) {
 			rcfile_error(N_("Argument is not a valid multibyte string"));
 			continue;
 		}
-
+#endif
 #ifdef ENABLE_COLOR
 		if (strcasecmp(rcopts[i].name, "titlecolor") == 0)
 			color_combo[TITLE_BAR] = parse_interface_color(option);
@@ -1115,7 +1107,7 @@ void parse_rcfile(FILE *rcstream, bool syntax_only)
 			if (!parse_num(option, &wrap_at)) {
 				rcfile_error(N_("Requested fill size \"%s\" is invalid"),
 								option);
-				wrap_at = -CHARS_FROM_EOL;
+				wrap_at = -COLUMNS_FROM_EOL;
 			} else
 				UNSET(NO_WRAP);
 			free(option);
@@ -1144,19 +1136,17 @@ void parse_rcfile(FILE *rcstream, bool syntax_only)
 #endif
 #ifdef ENABLE_JUSTIFY
 		if (strcasecmp(rcopts[i].name, "punct") == 0) {
-			punct = option;
-			if (has_blank_mbchars(punct)) {
+			if (has_blank_mbchars(option)) {
 				rcfile_error(N_("Non-blank characters required"));
-				free(punct);
-				punct = NULL;
-			}
+				free(option);
+			} else
+				punct = option;
 		} else if (strcasecmp(rcopts[i].name, "brackets") == 0) {
-			brackets = option;
-			if (has_blank_mbchars(brackets)) {
+			if (has_blank_mbchars(option)) {
 				rcfile_error(N_("Non-blank characters required"));
-				free(brackets);
-				brackets = NULL;
-			}
+				free(option);
+			} else
+				brackets = option;
 		} else if (strcasecmp(rcopts[i].name, "quotestr") == 0)
 			quotestr = option;
 		else
@@ -1208,9 +1198,6 @@ void parse_one_nanorc(void)
 	if (!is_good_file(nanorc))
 		return;
 
-#ifdef DEBUG
-	fprintf(stderr, "Going to parse file \"%s\"\n", nanorc);
-#endif
 	rcstream = fopen(nanorc, "rb");
 
 	/* If opening the file succeeded, parse it.  Otherwise, only
@@ -1237,9 +1224,8 @@ void do_rcfiles(void)
 {
 	const char *xdgconfdir;
 
+	/* First process the system-wide nanorc, if there is one. */
 	nanorc = mallocstrcpy(nanorc, SYSCONFDIR "/nanorc");
-
-	/* Process the system-wide nanorc. */
 	parse_one_nanorc();
 
 	/* When configured with --disable-wrapping-as-root, turn wrapping off
@@ -1252,9 +1238,9 @@ void do_rcfiles(void)
 	get_homedir();
 	xdgconfdir = getenv("XDG_CONFIG_HOME");
 
-	/* Now try the to find a nanorc file in the user's home directory
-	 * or in the XDG configuration directories. */
-	if (have_nanorc(homedir, "/." RCFILE_NAME))
+	/* Now try the to find a nanorc file in the user's home directory or in
+	 * the XDG configuration directories, and process the first one found. */
+	if (have_nanorc(homedir, "/" HOME_RC_NAME))
 		parse_one_nanorc();
 	else if (have_nanorc(xdgconfdir, "/nano/" RCFILE_NAME))
 		parse_one_nanorc();
@@ -1265,6 +1251,16 @@ void do_rcfiles(void)
 
 	check_vitals_mapped();
 
+#ifdef __linux__
+	/* On a Linux console, don't start nano when there are rcfile errors,
+	 * because otherwise these error messages get wiped. */
+	if (on_a_vt && rcfile_with_errors) {
+		fprintf(stderr, _("If needed, use nano with the -I option "
+							"to adjust your nanorc settings.\n"));
+		exit(1);
+	}
+#endif
+
 	free(nanorc);
 }
 

src/search.c

@@ -2,7 +2,7 @@
  *   search.c  --  This file is part of GNU nano.                         *
  *                                                                        *
  *   Copyright (C) 1999-2011, 2013-2018 Free Software Foundation, Inc.    *
- *   Copyright (C) 2015-2017 Benno Schulenberg                            *
+ *   Copyright (C) 2015-2018 Benno Schulenberg                            *
  *                                                                        *
  *   GNU nano is free software: you can redistribute it and/or modify     *
  *   it under the terms of the GNU General Public License as published    *
@@ -28,8 +28,8 @@
 
 static bool came_full_circle = FALSE;
 		/* Have we reached the starting line again while searching? */
-static bool regexp_compiled = FALSE;
-		/* Have we compiled any regular expressions? */
+static bool have_compiled_regexp = FALSE;
+		/* Whether we have compiled a regular expression for the search. */
 
 /* Compile the given regular expression and store it in search_regexp.
  * Return TRUE if the expression is valid, and FALSE otherwise. */
@@ -50,43 +50,23 @@ bool regexp_init(const char *regexp)
 		return FALSE;
 	}
 
-	regexp_compiled = TRUE;
+	have_compiled_regexp = TRUE;
 
 	return TRUE;
 }
 
-/* Decompile the compiled regular expression we used in the last
- * search, if any. */
-void regexp_cleanup(void)
+/* Free a compiled regular expression, if one was compiled; and schedule a
+ * full screen refresh when the mark is on, in case the cursor has moved. */
+void tidy_up_after_search(void)
 {
-	if (regexp_compiled) {
-		regexp_compiled = FALSE;
+	if (have_compiled_regexp) {
 		regfree(&search_regexp);
+		have_compiled_regexp = FALSE;
 	}
-}
-
-/* Report on the status bar that the given string was not found. */
-void not_found_msg(const char *str)
-{
-	char *disp = display_string(str, 0, (COLS / 2) + 1, FALSE);
-	size_t numchars = actual_x(disp, strnlenpt(disp, COLS / 2));
-
-	statusline(HUSH, _("\"%.*s%s\" not found"), numchars, disp,
-				(disp[numchars] == '\0') ? "" : "...");
-	free(disp);
-}
-
-/* Abort the current search or replace.  Clean up by displaying the main
- * shortcut list, updating the screen if the mark was on before, and
- * decompiling the compiled regular expression we used in the last
- * search, if any. */
-void search_replace_abort(void)
-{
 #ifndef NANO_TINY
 	if (openfile->mark)
 		refresh_needed = TRUE;
 #endif
-	regexp_cleanup();
 }
 
 /* Prepare the prompt and ask the user what to search for.  Keep looping
@@ -121,12 +101,11 @@ void search_init(bool replacing, bool keep_the_answer)
 					answer, &search_history,
 					/* TRANSLATORS: This is the main search prompt. */
 					edit_refresh, "%s%s%s%s%s%s", _("Search"),
-					/* TRANSLATORS: The next three modify the search prompt. */
+					/* TRANSLATORS: The next four modify the search prompt. */
 					ISSET(CASE_SENSITIVE) ? _(" [Case Sensitive]") : "",
 					ISSET(USE_REGEXP) ? _(" [Regexp]") : "",
 					ISSET(BACKWARDS_SEARCH) ? _(" [Backwards]") : "", replacing ?
 #ifndef NANO_TINY
-					/* TRANSLATORS: The next two modify the search prompt. */
 					openfile->mark ? _(" (to replace) in selection") :
 #endif
 					_(" (to replace)") : "", thedefault);
@@ -135,7 +114,7 @@ void search_init(bool replacing, bool keep_the_answer)
 		 * nothing was searched for yet during this session, get out. */
 		if (i == -1 || (i == -2 && *last_search == '\0')) {
 			statusbar(_("Cancelled"));
-			search_replace_abort();
+			tidy_up_after_search();
 			free(thedefault);
 			return;
 		}
@@ -150,21 +129,18 @@ void search_init(bool replacing, bool keep_the_answer)
 #endif
 			}
 
-			free(thedefault);
-
-			/* If doing a regular-expression search, compile the
-			 * search string, and get out when it's invalid. */
-			if (ISSET(USE_REGEXP) && !regexp_init(last_search)) {
-				search_replace_abort();
-				return;
+			/* 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 (replacing)
-				ask_for_replacement();
-			else
-				go_looking();
-
-			search_replace_abort();
+			tidy_up_after_search();
+			free(thedefault);
 			return;
 		}
 
@@ -179,12 +155,18 @@ void search_init(bool replacing, bool keep_the_answer)
 		} else if (func == regexp_void) {
 			TOGGLE(USE_REGEXP);
 		} else if (func == flip_replace) {
+			if (ISSET(VIEW_MODE)) {
+				print_view_warning();
+				tidy_up_after_search();
+				free(thedefault);
+				return;
+			}
 			replacing = !replacing;
 		} else {
 			if (func == flip_goto)
 				do_gotolinecolumn(openfile->current->lineno,
 							openfile->placewewant + 1, TRUE, TRUE);
-			search_replace_abort();
+			tidy_up_after_search();
 			free(thedefault);
 			return;
 		}
@@ -228,7 +210,7 @@ int findnextstr(const char *needle, bool whole_word_only, int modus,
 			lastkbcheck = time(NULL);
 
 			/* Consume all waiting keystrokes until a Cancel. */
-			while (input) {
+			while (input != ERR) {
 				if (func_from_key(&input) == do_cancel) {
 					statusbar(_("Cancelled"));
 					enable_waiting();
@@ -363,22 +345,6 @@ void do_search_backward(void)
 	do_search();
 }
 
-#ifndef NANO_TINY
-/* Search in the backward direction for the next occurrence. */
-void do_findprevious(void)
-{
-	SET(BACKWARDS_SEARCH);
-	do_research();
-}
-
-/* Search in the forward direction for the next occurrence. */
-void do_findnext(void)
-{
-	UNSET(BACKWARDS_SEARCH);
-	do_research();
-}
-#endif /* !NANO_TINY */
-
 /* Search for the last string without prompting. */
 void do_research(void)
 {
@@ -402,7 +368,32 @@ void do_research(void)
 
 	go_looking();
 
-	search_replace_abort();
+	tidy_up_after_search();
+}
+
+/* Search in the backward direction for the next occurrence. */
+void do_findprevious(void)
+{
+	SET(BACKWARDS_SEARCH);
+	do_research();
+}
+
+/* Search in the forward direction for the next occurrence. */
+void do_findnext(void)
+{
+	UNSET(BACKWARDS_SEARCH);
+	do_research();
+}
+
+/* Report on the status bar that the given string was not found. */
+void not_found_msg(const char *str)
+{
+	char *disp = display_string(str, 0, (COLS / 2) + 1, FALSE);
+	size_t numchars = actual_x(disp, strnlenpt(disp, COLS / 2));
+
+	statusline(HUSH, _("\"%.*s%s\" not found"), numchars, disp,
+						(disp[numchars] == '\0') ? "" : "...");
+	free(disp);
 }
 
 /* Search for the global string 'last_search'.  Inform the user when
@@ -584,19 +575,18 @@ ssize_t do_replace_loop(const char *needle, bool whole_word_only,
 			numreplaced = 0;
 
 		if (!replaceall) {
-			size_t from_col = xplustabs();
-			size_t to_col = strnlenpt(openfile->current->data,
+			spotlighted = TRUE;
+			light_from_col = xplustabs();
+			light_to_col = strnlenpt(openfile->current->data,
 										openfile->current_x + match_len);
 
 			/* Refresh the edit window, scrolling it if necessary. */
 			edit_refresh();
 
-			spotlight(TRUE, from_col, to_col);
-
 			/* TRANSLATORS: This is a prompt. */
 			i = do_yesno_prompt(TRUE, _("Replace this instance?"));
 
-			spotlight(FALSE, from_col, to_col);
+			spotlighted = FALSE;
 
 			if (i == -1)  /* The replacing was cancelled. */
 				break;
@@ -702,8 +692,10 @@ void do_replace(void)
 {
 	if (ISSET(VIEW_MODE))
 		print_view_warning();
-	else
+	else {
+		UNSET(BACKWARDS_SEARCH);
 		search_init(TRUE, FALSE);
+	}
 }
 
 /* Ask the user what the already given search string should be replaced with. */
@@ -782,6 +774,7 @@ void do_gotolinecolumn(ssize_t line, ssize_t column, bool use_answer,
 		}
 
 		if (func_from_key(&i) == flip_goto) {
+			UNSET(BACKWARDS_SEARCH);
 			/* Retain what the user typed so far and switch to searching. */
 			search_init(FALSE, TRUE);
 			return;

src/utils.c

@@ -160,10 +160,9 @@ bool parse_line_column(const char *str, ssize_t *line, ssize_t *column)
 }
 
 /* Reduce the memory allocation of a string to what is needed. */
-void snuggly_fit(char **str)
+void snuggly_fit(char **string)
 {
-	if (*str != NULL)
-		*str = charealloc(*str, strlen(*str) + 1);
+	*string = charealloc(*string, strlen(*string) + 1);
 }
 
 /* Null a string at a certain index and align it. */
@@ -266,13 +265,6 @@ bool is_separate_word(size_t position, size_t length, const char *buf)
 const char *strstrwrapper(const char *haystack, const char *needle,
 		const char *start)
 {
-	if (*needle == '\0') {
-#ifndef NANO_TINY
-		statusline(ALERT, "Searching for nothing -- please report a bug");
-#endif
-		return (char *)start;
-	}
-
 	if (ISSET(USE_REGEXP)) {
 		if (ISSET(BACKWARDS_SEARCH)) {
 			size_t last_find, ceiling, far_end;
@@ -325,15 +317,18 @@ const char *strstrwrapper(const char *haystack, const char *needle,
 		else
 			return haystack + regmatches[0].rm_so;
 	}
+
 	if (ISSET(CASE_SENSITIVE)) {
 		if (ISSET(BACKWARDS_SEARCH))
 			return revstrstr(haystack, needle, start);
 		else
 			return strstr(start, needle);
-	} else if (ISSET(BACKWARDS_SEARCH))
-		return mbrevstrcasestr(haystack, needle, start);
+	}
 
-	return mbstrcasestr(start, needle);
+	if (ISSET(BACKWARDS_SEARCH))
+		return mbrevstrcasestr(haystack, needle, start);
+	else
+		return mbstrcasestr(start, needle);
 }
 
 /* This is a wrapper for the perror() function.  The wrapper temporarily
@@ -354,7 +349,7 @@ void *nmalloc(size_t howmuch)
 	void *r = malloc(howmuch);
 
 	if (r == NULL && howmuch != 0)
-		die(_("nano is out of memory!"));
+		die(_("Nano is out of memory!\n"));
 
 	return r;
 }
@@ -366,7 +361,7 @@ void *nrealloc(void *ptr, size_t howmuch)
 	void *r = realloc(ptr, howmuch);
 
 	if (r == NULL && howmuch != 0)
-		die(_("nano is out of memory!"));
+		die(_("Nano is out of memory!\n"));
 
 	return r;
 }
@@ -587,21 +582,3 @@ size_t get_totsize(const filestruct *begin, const filestruct *end)
 
 	return totsize;
 }
-
-#ifdef DEBUG
-/* Dump the given buffer to stderr. */
-void dump_filestruct(const filestruct *inptr)
-{
-	if (inptr == openfile->fileage)
-		fprintf(stderr, "Dumping file buffer to stderr...\n");
-	else if (inptr == cutbuffer)
-		fprintf(stderr, "Dumping cutbuffer to stderr...\n");
-	else
-		fprintf(stderr, "Dumping a buffer to stderr...\n");
-
-	while (inptr != NULL) {
-		fprintf(stderr, "(%zd) %s\n", inptr->lineno, inptr->data);
-		inptr = inptr->next;
-	}
-}
-#endif /* DEBUG */

src/winio.c

@@ -204,7 +204,7 @@ void read_keys_from(WINDOW *win)
 		 * check if errno is set to EIO ("Input/output error") and die in
 		 * that case, but it's not always set properly.  Argh. */
 		if (input == ERR && ++errcount == MAX_BUF_SIZE)
-			die(_("Too many errors from stdin"));
+			die(_("Too many errors from stdin\n"));
 	}
 
 	curs_set(0);
@@ -291,7 +291,7 @@ void unget_kbinput(int kbinput, bool metakey)
 void implant(const char *string)
 {
 	for (int i = strlen(string); i > 0; i--)
-		put_back(string[i - 1]);
+		put_back((unsigned char)string[i - 1]);
 }
 #endif
 
@@ -363,7 +363,7 @@ int parse_kbinput(WINDOW *win)
 	kbinput = get_input(win, 1);
 
 	if (kbinput == NULL && !waiting_mode)
-		return 0;
+		return ERR;
 
 	while (kbinput == NULL)
 		kbinput = get_input(win, 1);
@@ -371,11 +371,6 @@ int parse_kbinput(WINDOW *win)
 	keycode = *kbinput;
 	free(kbinput);
 
-#ifdef DEBUG
-	fprintf(stderr, "before parsing:  keycode = %d, escapes = %d, digit_count = %d\n",
-		keycode, escapes, digit_count);
-#endif
-
 	if (keycode == ERR)
 		return ERR;
 
@@ -385,7 +380,7 @@ int parse_kbinput(WINDOW *win)
 		if (escapes > 3)
 			escapes = 1;
 		/* Take note when an Esc arrived by itself. */
-		solitary = (escapes == 1 && key_buffer_len == 0);
+		solitary = (key_buffer_len == 0);
 		return ERR;
 	}
 
@@ -476,12 +471,13 @@ int parse_kbinput(WINDOW *win)
 					}
 				} else {
 					if (digit_count == 0)
-						/* Two escapes followed by a non-decimal
-						 * digit (or a decimal digit that would
-						 * create a byte sequence greater than 2XX)
-						 * and there aren't any other codes waiting:
-						 * control character sequence mode. */
-						retval = get_control_kbinput(keycode);
+						/* Two escapes followed by a non-digit: meta key
+						 * or control character sequence mode. */
+						if (!solitary) {
+							meta_key = TRUE;
+							retval = keycode;
+						} else
+							retval = get_control_kbinput(keycode);
 					else {
 						/* An invalid digit in the middle of a byte
 						 * sequence: reset the byte sequence counter
@@ -505,11 +501,13 @@ int parse_kbinput(WINDOW *win)
 			}
 			break;
 		case 3:
-			if (key_buffer_len == 0)
+			if (key_buffer_len == 0) {
+				if (!solitary)
+					meta_key = TRUE;
 				/* Three escapes followed by a non-escape, and no
 				 * other codes are waiting: normal input mode. */
 				retval = keycode;
-			else
+			} else
 				/* Three escapes followed by a non-escape, and more
 				 * codes are waiting: combined control character and
 				 * escape sequence mode.  First interpret the escape
@@ -536,7 +534,17 @@ int parse_kbinput(WINDOW *win)
 	else if (retval == controlend)
 		return CONTROL_END;
 #ifndef NANO_TINY
-	else if (retval == shiftcontrolleft) {
+	else if (retval == controldelete)
+		return CONTROL_DELETE;
+	else if (retval == controlshiftdelete)
+		return CONTROL_SHIFT_DELETE;
+	else if (retval == shiftup) {
+		shift_held = TRUE;
+		return KEY_UP;
+	} else if (retval == shiftdown) {
+		shift_held = TRUE;
+		return KEY_DOWN;
+	} else if (retval == shiftcontrolleft) {
 		shift_held = TRUE;
 		return CONTROL_LEFT;
 	} else if (retval == shiftcontrolright) {
@@ -562,6 +570,8 @@ int parse_kbinput(WINDOW *win)
 		return ALT_UP;
 	else if (retval == altdown)
 		return ALT_DOWN;
+	else if (retval == altdelete)
+		return ALT_DELETE;
 	else if (retval == shiftaltleft) {
 		shift_held = TRUE;
 		return KEY_HOME;
@@ -582,15 +592,31 @@ int parse_kbinput(WINDOW *win)
 	 * Shift/Ctrl/Alt are being held together with them. */
 	unsigned char modifiers = 6;
 
+	/* Modifiers are: Alt (8), Ctrl (4), Shift (1). */
 	if (on_a_vt && ioctl(0, TIOCLINUX, &modifiers) >= 0) {
 #ifndef NANO_TINY
+		/* Is Delete pressed together with Shift or Shift+Ctrl? */
+		if (retval == KEY_DC) {
+			if (modifiers == 0x01)
+				return SHIFT_DELETE;
+			if (modifiers == 0x05)
+				return CONTROL_SHIFT_DELETE;
+		}
 		/* Is Shift being held? */
 		if (modifiers & 0x01) {
-			/* A shifted <Tab> is a back tab. */
 			if (retval == TAB_CODE)
 				return SHIFT_TAB;
 			shift_held = TRUE;
 		}
+		/* Is Alt being held? */
+		if (modifiers == 0x08) {
+			if (retval == KEY_DC)
+				return ALT_DELETE;
+			if (retval == KEY_UP)
+				return ALT_UP;
+			if (retval == KEY_DOWN)
+				return ALT_DOWN;
+		}
 #endif
 		/* Is Ctrl being held? */
 		if (modifiers & 0x04) {
@@ -606,6 +632,8 @@ int parse_kbinput(WINDOW *win)
 				return CONTROL_HOME;
 			else if (retval == KEY_END)
 				return CONTROL_END;
+			else if (retval == KEY_DC)
+				return CONTROL_DELETE;
 		}
 #ifndef NANO_TINY
 		/* Are both Shift and Alt being held? */
@@ -698,12 +726,8 @@ int parse_kbinput(WINDOW *win)
 			return KEY_NPAGE;
 #ifdef KEY_SDC  /* Slang doesn't support KEY_SDC. */
 		case KEY_SDC:
+			return SHIFT_DELETE;
 #endif
-		case DEL_CODE:
-			if (ISSET(REBIND_DELETE))
-				return the_code_for(do_delete, KEY_DC);
-			else
-				return KEY_BACKSPACE;
 #ifdef KEY_SIC  /* Slang doesn't support KEY_SIC. */
 		case KEY_SIC:
 			return the_code_for(do_insertfile_void, KEY_IC);
@@ -984,7 +1008,7 @@ int convert_sequence(const int *seq, size_t length, int *consumed)
 				}
 				break;
 #ifndef NANO_TINY
-			case '9': /* To accomodate iTerm2 in "xterm mode". */
+			case '9': /* To accommodate iTerm2 in "xterm mode". */
 			case '3':
 				switch (seq[4]) {
 					case 'A': /* Esc [ 1 ; 3 A == Alt-Up on xterm. */
@@ -1077,11 +1101,42 @@ int convert_sequence(const int *seq, size_t length, int *consumed)
 							/* Esc [ 2 ~ == Insert on VT220/VT320/
 							 * Linux console/xterm/Terminal. */
 							return KEY_IC;
+						else if (length > 4 && seq[2] == ';' && seq[4] == '~')
+							/* Esc [ 2 ; x ~ == modified Insert on xterm. */
+							*consumed = 5;
 						break;
 					case '3': /* Esc [ 3 ~ == Delete on VT220/VT320/
 							   * Linux console/xterm/Terminal. */
 						if (length > 2 && seq[2] == '~')
 							return KEY_DC;
+						if (length > 4 && seq[2] == ';' && seq[4] == '~') {
+							*consumed = 5;
+#ifndef NANO_TINY
+							if (seq[3] == '2')
+								/* Esc [ 3 ; 2 ~ == Shift-Delete on xterm/Terminal. */
+								return SHIFT_DELETE;
+							if (seq[3] == '3')
+								/* Esc [ 3 ; 3 ~ == Alt-Delete on xterm/rxvt/Eterm/Terminal. */
+								return ALT_DELETE;
+							if (seq[3] == '5')
+								/* Esc [ 3 ; 5 ~ == Ctrl-Delete on xterm. */
+								return CONTROL_DELETE;
+							if (seq[3] == '6')
+								/* Esc [ 3 ; 6 ~ == Ctrl-Shift-Delete on xterm. */
+								return controlshiftdelete;
+#endif
+						}
+#ifndef NANO_TINY
+						if (length > 2 && seq[2] == '$')
+							/* Esc [ 3 $ == Shift-Delete on urxvt. */
+							return SHIFT_DELETE;
+						if (length > 2 && seq[2] == '^')
+							/* Esc [ 3 ^ == Ctrl-Delete on urxvt. */
+							return CONTROL_DELETE;
+						if (length > 2 && seq[2] == '@')
+							/* Esc [ 3 @ == Ctrl-Shift-Delete on urxvt. */
+							return controlshiftdelete;
+#endif
 						break;
 					case '4': /* Esc [ 4 ~ == End on VT220/VT320/
 							   * Linux console/xterm. */
@@ -1093,26 +1148,26 @@ int convert_sequence(const int *seq, size_t length, int *consumed)
 							   * Esc [ 5 ^ == PageUp on Eterm. */
 						if (length > 2 && (seq[2] == '~' || seq[2] == '^'))
 							return KEY_PPAGE;
-#ifndef NANO_TINY
-						else if (length > 4 && seq[2] == ';' &&
-									seq[3] == '2' && seq[4] == '~') {
+						else if (length > 4 && seq[2] == ';' && seq[4] == '~') {
 							*consumed = 5;
-							return shiftaltup;
-						}
+#ifndef NANO_TINY
+							if (seq[3] == '2')
+								return shiftaltup;
 #endif
+						}
 						break;
 					case '6': /* Esc [ 6 ~ == PageDown on VT220/VT320/
 							   * Linux console/xterm/Terminal;
 							   * Esc [ 6 ^ == PageDown on Eterm. */
 						if (length > 2 && (seq[2] == '~' || seq[2] == '^'))
 							return KEY_NPAGE;
-#ifndef NANO_TINY
-						else if (length > 4 && seq[2] == ';' &&
-									seq[3] == '2' && seq[4] == '~') {
+						else if (length > 4 && seq[2] == ';' && seq[4] == '~') {
 							*consumed = 5;
-							return shiftaltdown;
-						}
+#ifndef NANO_TINY
+							if (seq[3] == '2')
+								return shiftaltdown;
 #endif
+						}
 						break;
 					case '7': /* Esc [ 7 ~ == Home on Eterm/rxvt;
 							   * Esc [ 7 $ == Shift-Home on Eterm/rxvt;
@@ -1285,12 +1340,15 @@ int parse_escape_sequence(WINDOW *win, int kbinput)
 	/* If we got an unrecognized escape sequence, notify the user. */
 	if (retval == ERR && win == edit) {
 		/* TRANSLATORS: This refers to a sequence of escape codes
-		 * (from the keyboard) that nano does not recogize. */
+		 * (from the keyboard) that nano does not recognize. */
 		statusline(ALERT, _("Unknown sequence"));
 		suppress_cursorpos = FALSE;
 		lastmessage = HUSH;
 		if (currmenu == MMAIN) {
 			place_the_cursor();
+#ifdef __NetBSD__
+			wnoutrefresh(edit);  /* Needed for correct placement on NetBSD. */
+#endif
 			curs_set(1);
 		}
 	}
@@ -1460,10 +1518,6 @@ int get_control_kbinput(int kbinput)
 	else
 		retval = kbinput;
 
-#ifdef DEBUG
-	fprintf(stderr, "get_control_kbinput(): kbinput = %d, retval = %d\n", kbinput, retval);
-#endif
-
 	return retval;
 }
 
@@ -1730,29 +1784,17 @@ const sc *get_shortcut(int *kbinput)
 {
 	sc *s;
 
-#ifdef DEBUG
-	fprintf(stderr, "after parsing: kbinput = %d, meta_key = %s -- ",
-								*kbinput, meta_key ? "TRUE" : "FALSE");
-#endif
-
 	/* Plain characters cannot be shortcuts, so just skip those. */
-	if (!meta_key && (*kbinput & 0x7F) >= 0x20 && *kbinput <= 0xFF)
+	if (!meta_key && ((*kbinput >= 0x20 && *kbinput < 0x7F) ||
+						(*kbinput >= 0xA0 && *kbinput <= 0xFF)))
 		return NULL;
 
 	for (s = sclist; s != NULL; s = s->next) {
 		if ((s->menus & currmenu) && *kbinput == s->keycode &&
-										meta_key == s->meta) {
-#ifdef DEBUG
-			fprintf (stderr, "matched seq '%s'  (menu is %x from %x)\n",
-								s->keystr, currmenu, s->menus);
-#endif
+										meta_key == s->meta)
 			return s;
-		}
 	}
 
-#ifdef DEBUG
-	fprintf (stderr, "matched nothing\n");
-#endif
 	return NULL;
 }
 
@@ -1944,7 +1986,7 @@ char *display_string(const char *buf, size_t column, size_t span, bool isdata)
 			continue;
 		}
 
-		/* Represent an invalid sequence with the Replacement Character. */
+		/* Represent an invalid starter byte with the Replacement Character. */
 		converted[index++] = '\xEF';
 		converted[index++] = '\xBF';
 		converted[index++] = '\xBD';
@@ -2026,6 +2068,13 @@ void titlebar(const char *path)
 	 * then sacrifice the prefix, and only then start dottifying. */
 
 	/* Figure out the path, prefix and state strings. */
+#ifdef ENABLE_COLOR
+	if (currmenu == MLINTER) {
+		/* TRANSLATORS: The next four are "labels" in the title bar. */
+		prefix = _("Linting --");
+		path = openfile->filename;
+	} else
+#endif
 #ifdef ENABLE_BROWSER
 	if (!inhelp && path != NULL)
 		prefix = _("DIR:");
@@ -2132,8 +2181,7 @@ void statusbar(const char *msg)
  * message can be noticed and read. */
 void warn_and_shortly_pause(const char *msg)
 {
-	statusbar(msg);
-	beep();
+	statusline(ALERT, msg);
 	napms(1800);
 }
 
@@ -2154,21 +2202,22 @@ void statusline(message_type importance, const char *msg, ...)
 	UNSET(WHITESPACE_DISPLAY);
 #endif
 
+	/* Ignore a message with an importance that is lower than the last one. */
+	if ((lastmessage == ALERT && importance != ALERT) ||
+				(lastmessage == MILD && importance == HUSH))
+		return;
+
 	va_start(ap, msg);
 
 	/* Curses mode is turned off.  If we use wmove() now, it will muck
 	 * up the terminal settings.  So we just use vfprintf(). */
 	if (isendwin()) {
+		fprintf(stderr, "\n");
 		vfprintf(stderr, msg, ap);
 		va_end(ap);
 		return;
 	}
 
-	/* If there already was an alert message, ignore lesser ones. */
-	if ((lastmessage == ALERT && importance != ALERT) ||
-				(lastmessage == MILD && importance == HUSH))
-		return;
-
 	/* If the ALERT status has been reset, reset the counter. */
 	if (lastmessage == HUSH)
 		alerts = 0;
@@ -2184,7 +2233,9 @@ void statusline(message_type importance, const char *msg, ...)
 		else if (alerts < 4)
 			beep();
 		colorpair = interface_color_pair[ERROR_MESSAGE];
-	} else
+	} else if (importance == NOTICE)
+		colorpair = interface_color_pair[SELECTED_TEXT];
+	else
 		colorpair = interface_color_pair[STATUS_BAR];
 
 	lastmessage = importance;
@@ -2738,6 +2789,9 @@ int update_line(filestruct *fileptr, size_t index)
 	if (strlenpt(fileptr->data) > from_col + editwincols)
 		mvwaddch(edit, row, COLS - 1, '$');
 
+	if (spotlighted && !inhelp)
+		spotlight(light_from_col, light_to_col);
+
 	return 1;
 }
 
@@ -2804,6 +2858,9 @@ int update_softwrapped_line(filestruct *fileptr)
 		from_col = to_col;
 	}
 
+	if (spotlighted && !inhelp)
+		spotlight(light_from_col, light_to_col);
+
 	return (row - starting_row);
 }
 #endif
@@ -3306,21 +3363,6 @@ void total_refresh(void)
 	bottombars(currmenu);
 }
 
-/* Display the main shortcut list on the last two rows of the bottom
- * portion of the window. */
-void display_main_list(void)
-{
-#if defined(ENABLE_COLOR) && defined(ENABLE_SPELLER)
-	if (openfile->syntax &&
-				(openfile->syntax->formatter || openfile->syntax->linter))
-		set_lint_or_format_shortcuts();
-	else
-		set_spell_shortcuts();
-#endif
-
-	bottombars(MMAIN);
-}
-
 /* Show info about the current cursor position on the statusbar.
  * Do this unconditionally when force is TRUE; otherwise, only if
  * suppress_cursorpos is FALSE.  In any case, reset the latter. */
@@ -3381,9 +3423,8 @@ void enable_waiting(void)
 	nodelay(edit, FALSE);
 }
 
-/* Highlight the text between from_col and to_col when active is TRUE.
- * Remove the highlight when active is FALSE. */
-void spotlight(bool active, size_t from_col, size_t to_col)
+/* Highlight the text between from_col and to_col. */
+void spotlight(size_t from_col, size_t to_col)
 {
 	char *word;
 	size_t word_span, room;
@@ -3392,7 +3433,7 @@ void spotlight(bool active, size_t from_col, size_t to_col)
 
 #ifndef NANO_TINY
 	if (ISSET(SOFTWRAP)) {
-		spotlight_softwrapped(active, from_col, to_col);
+		spotlight_softwrapped(from_col, to_col);
 		return;
 	}
 #endif
@@ -3414,16 +3455,14 @@ void spotlight(bool active, size_t from_col, size_t to_col)
 	if (word_span > room)
 		room--;
 
-	if (active)
-		wattron(edit, interface_color_pair[SELECTED_TEXT]);
+	wattron(edit, interface_color_pair[SELECTED_TEXT]);
 
 	waddnstr(edit, word, actual_x(word, room));
 
 	if (word_span > room)
 		waddch(edit, '$');
 
-	if (active)
-		wattroff(edit, interface_color_pair[SELECTED_TEXT]);
+	wattroff(edit, interface_color_pair[SELECTED_TEXT]);
 
 	free(word);
 
@@ -3431,10 +3470,9 @@ void spotlight(bool active, size_t from_col, size_t to_col)
 }
 
 #ifndef NANO_TINY
-/* Highlight the text between from_col and to_col when active is TRUE; remove
- * the highlight when active is FALSE.  This will not highlight softwrapped
+/* Highlight the text between the given columns.  This will not highlight soft
  * line breaks, since they're not actually part of the spotlighted text. */
-void spotlight_softwrapped(bool active, size_t from_col, size_t to_col)
+void spotlight_softwrapped(size_t from_col, size_t to_col)
 {
 	ssize_t row = openfile->current_y;
 	size_t leftedge = leftedge_for(from_col, openfile->current);
@@ -3461,13 +3499,11 @@ void spotlight_softwrapped(bool active, size_t from_col, size_t to_col)
 			word = display_string(openfile->current->data, from_col,
 										break_col - from_col, FALSE);
 
-		if (active)
-			wattron(edit, interface_color_pair[SELECTED_TEXT]);
+		wattron(edit, interface_color_pair[SELECTED_TEXT]);
 
 		waddnstr(edit, word, actual_x(word, break_col));
 
-		if (active)
-			wattroff(edit, interface_color_pair[SELECTED_TEXT]);
+		wattroff(edit, interface_color_pair[SELECTED_TEXT]);
 
 		free(word);
 
@@ -3502,15 +3538,15 @@ void do_credits(void)
 		"",
 		NULL,                /* "Brought to you by:" */
 		"Chris Allegretta",
+		"Benno Schulenberg",
+		"David Lawrence Ramsey",
 		"Jordi Mallach",
+		"David Benbennick",
+		"Rocco Corsi",
+		"Mike Frysinger",
 		"Adam Rogoyski",
 		"Rob Siemborski",
-		"Rocco Corsi",
-		"David Lawrence Ramsey",
-		"David Benbennick",
 		"Mark Majeres",
-		"Mike Frysinger",
-		"Benno Schulenberg",
 		"Ken Tyler",
 		"Sven Guckes",
 		"Bill Soudan",

syntax/awk.nanorc

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

syntax/c.nanorc

@@ -1,6 +1,6 @@
 ## Here is an example for C/C++.
 
-syntax c "\.(c(c|pp|xx|\+\+)?|C)$" "\.(h(h|pp|xx)?|H)$" "\.ii?$"
+syntax c "\.([ch](pp|xx)?|C|cc|c\+\+|H|hh|ii?)$"
 magic "^(C|C\+\+) (source|program)"
 comment "//"
 

syntax/changelog.nanorc

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

syntax/cmake.nanorc

@@ -15,6 +15,5 @@ icolor brightred "^[[:space:]]*((end)?(function|macro)|return)"
 icolor cyan start="\$(\{|ENV\{)" end="\}"
 color magenta "\<(APPLE|UNIX|WIN32|CYGWIN|BORLAND|MINGW|MSVC(_IDE|60|71|80|90)?)\>"
 
-icolor brightblue "^([[:space:]]*)?#.*"
-icolor brightblue "[[:space:]]#.*"
+color brightblue "(^|[[:space:]])#.*"
 color ,green "[[:space:]]+$"

syntax/debian.nanorc

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

syntax/default.nanorc

@@ -11,7 +11,7 @@ color cyan "^[[:space:]]*#.*"
 color ,red " +	+"
 
 # Nano's name, including version.
-color brightred "(GNU )?nano [1-9]\.[0-9]\.[^[:space:][:punct:]]+"
+color brightred "(GNU )?[Nn]ano [1-3]\.[0-9][-.[:alnum:]]*\>"
 
 # Email addresses.
 color magenta "<[[:alnum:].%_+-]+@[[:alnum:].-]+\.[[:alpha:]]{2,}>"

syntax/elisp.nanorc

@@ -30,4 +30,4 @@ color blue ":(\w|[?-])+"
 color yellow start="^[[:blank:]]+\"" end="[^\]\""
 color yellow ""(\\.|[^"])*""
 # Comments
-color cyan "(^|[[:space:]]);.*$"
+color cyan "(^|[[:space:]]);.*"

syntax/gentoo.nanorc

@@ -39,7 +39,7 @@ color brightblue "\<tc-(arch(-kernel)?|export|has-(tls|openmp))\>"
 ## Common commands used in ebuilds:
 color blue "\<(awk|cat|cd|chmod|chown|cp|echo|env|find|e?grep|ln|make|mkdir|mv|popd|printf|pushd|rm|rmdir|sed|set|tar|touch|unset|xargs)\>"
 ## Comments (doesn't work that well):
-color yellow "(^|[[:space:]])#.*$"
+color yellow "(^|[[:space:]])#.*"
 ## Strings (doesn't work that well):
 color brightyellow ""(\\.|[^\"])*"" "'(\\.|[^'])*'"
 ## Trailing space is bad!
@@ -52,7 +52,7 @@ syntax /etc/portage "\.(accept_keywords|env|keywords|mask|unmask|use)(/.+)?$"
 comment "#"
 
 ## Base text:
-color green "^.+$"
+color green ".+"
 ## Likely version and slot numbers:
 color magenta "-[[:digit:].]+(_(alpha|beta|pre|rc|p)[[:digit:]]*)*(-r[[:digit:]]+)?([:[:space:]]|$)"
 color magenta ":[^[:space:]]+([[:space:]]|$)"
@@ -67,7 +67,7 @@ color cyan "^[[:space:]]*[^/]*/"
 ## Masking regulators:
 color brightmagenta "^[[:space:]]*(=|~|<|<=|>|>=)"
 ## Comments:
-color yellow "#.*$"
+color yellow "#.*"
 ## Trailing space is bad!
 color ,green "[[:space:]]+$"
 ## Mixed whitespace is also bad.

syntax/go.nanorc

@@ -3,9 +3,6 @@
 syntax go "\.go$"
 comment "//"
 
-# Set up a formatter since spelling is probably useless...
-formatter gofmt -w
-
 # Types.
 color green "\<(bool|u?int(8|16|32|64)?|float(32|64)|complex(64|128)|byte|rune|uintptr|string|error)\>"
 color green "\<((<-[[:space:]]*)chan|chan[[:space:]]*<-|const|func|interface|map|struct|type|var)\>"

syntax/groff.nanorc

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

syntax/guile.nanorc

@@ -21,4 +21,4 @@ color blue "#?:(\w|[?-])+"
 color yellow start="^[[:blank:]]+\"" end="[^\]\""
 color yellow ""(\\.|[^"])*""
 # Comments
-color cyan "(^|[[:space:]]);.*$"
+color cyan "(^|[[:space:]]);.*"

syntax/json.nanorc

@@ -28,7 +28,7 @@ color brightred "\{" "\}"
 color brightred "," ":"
 
 # Comments.
-color cyan "(^|[[:space:]]+)(//|#).*$"
+color cyan "(^|[[:space:]]+)(//|#).*"
 
 # Trailing whitespace.
 color ,green "[[:space:]]+$"

syntax/lua.nanorc

@@ -5,12 +5,15 @@
 
 syntax lua "\.lua$"
 magic "Lua script"
+linter "luacheck --no-color"
 comment "--"
 
 color brightwhite "\[\[.*\]\]"
 
 # Operators
-color brightyellow ":|\*|/|%|\+|-|\^|>|>=|<|<=|~=|=|\.\.|\<(not|and|or)\>"
+color brightyellow ":|\*|/|%|\+|-|\^|>|>=|<|<=|~=|=|\.\.|#|\<(not|and|or)\>"
+# Don't partially color ... as an operator
+color normal "\.\.\."
 
 # Statements
 color brightblue "\<(do|end|while|repeat|until|if|elseif|then|else|for|in|function|local|return|break)\>"
@@ -49,9 +52,9 @@ color brightmagenta "\(|\)|\[|\]|\{|\}"
 # Shebang
 color brightcyan "^#!.*"
 
+# Strings
+color red ""(\\.|[^"\])*"|'(\\.|[^'\])*'"
+
 # Simple comments and multiline comments
 color green "--.*"
 color green start="--\[\[" end="\]\]"
-
-# Strings
-color red ""(\\.|[^"\])*"|'(\\.|[^'\])*'"

syntax/makefile.nanorc

@@ -1,14 +1,24 @@
 ## Here is an example for Makefiles.
 
-syntax makefile "Makefile[^/]*$" "\.(make|mk)$"
+syntax makefile "(/((GNU)?m|M)akefile[^/]*$|\.(make|mk)$)"
 magic "makefile script"
 comment "#"
 
-color red "[:=]"
-color magenta "\<(if|ifeq|else|endif)\>"
+# Assignments.
+color red " (:?:|\+|\?)?= "
+
+# Keywords.
+color magenta "^(if|ifn?def|ifn?eq|else|endif|(-|s)?include)\>"
+color magenta "^((override +)?(un)?define|endef|(un)?export|private|vpath)\>"
+
+# Variable expansions.
 color blue "\$+[{(][a-zA-Z0-9_-]+[})]"
+
+# Targets.
 color brightblue "^[^ 	]+:"
+
+# Comments.
 color green "(^|[[:space:]]+)#.*"
 
-## Trailing whitespace.
+# Trailing whitespace.
 color ,green "[[:space:]]+$"

syntax/man.nanorc

@@ -4,15 +4,15 @@ syntax man "\.[1-9]x?$"
 magic "troff or preprocessor input"
 comment ".\""
 
-color green "\.(SH|SS|TH) .*$"
+color green "\.(SH|SS|TH) .*"
 color brightgreen "\.(SH|SS|TH) " "\.([HIT]P)"
-color brightred "\.(B[IR]?|I[BR]?|R[BI]|S[BM]) .*$"
+color brightred "\.(B[IR]?|I[BR]?|R[BI]|S[BM]) .*"
 color brightblue "\.(B[IR]?|I[BR]?|R[BI]|S[BM]) " "\.([LP]?P)$"
 color magenta "\\f[BIPR]"
 color yellow "\.(br|DT|RS|RE|PD)"
 
 # Comments.
-color cyan "\.?\\\".*$"
+color cyan "\.?\\\".*"
 
 # Trailing whitespace.
 color ,green "[[:space:]]+$"

syntax/mgp.nanorc

@@ -4,7 +4,6 @@ syntax mgp "\.mgp$"
 header "^%include.*"
 comment "#"
 
-icolor green "^%[a-z].*$"
-color cyan "(^|[[:space:]])#.*$"
-color cyan "(^|[[:space:]])%%.*$"
+icolor green "^%[a-z].*"
+color cyan "(^|[[:space:]])(#|%%).*"
 color ,green "[[:space:]]+$"

syntax/nanohelp.nanorc

@@ -4,8 +4,8 @@
 syntax nanohelp
 
 # Key combos:
-color cyan "\^[]4-8A-Z^\_◀▶▲▼]"  "[◀▶▲▼]"  "(\^|M-)Space"  "\<M-."  "\<F1?[0-9]"
-color cyan "\<(Tab|Sh-Tab|Enter|Ins|Del|Bsp|Up|Down|Left|Right|Home|End|PgUp|PgDn)\>"
+color cyan "\^[]4-8A-Z^\_◀▶▲▼]"  "[◀▶▲▼]"  "\<M-."  "\<F1?[0-9]"
+color cyan "\<((Sh-)?Tab|Enter|Ins|(Sh-\^?)?Del|Space|Bsp|Up|Down|Left|Right|Home|End|PgUp|PgDn)\>"
 
 # Quoted indicators:
 color brightred "'(\^|M-)'"

syntax/nanorc.nanorc

@@ -4,17 +4,17 @@ syntax nanorc "\.?nanorc$"
 comment "#"
 
 # Possible errors and parameters
-icolor brightred "^[[:space:]]*((un)?(bind|set)|include|syntax|header|magic|comment|linter|formatter|i?color|extendsyntax).*$"
+icolor brightred "^[[:space:]]*((un)?(bind|set)|include|syntax|header|magic|comment|linter|i?color|extendsyntax).*"
 
 # Keywords
-icolor brightgreen "^[[:space:]]*(set|unset)[[:space:]]+(allow_insecure_backup|atblanks|autoindent|backup|backwards|boldtext|casesensitive|constantshow|cutfromcursor|fill[[:space:]]+-?[[:digit:]]+|historylog|linenumbers|locking|morespace|mouse|multibuffer|noconvert|nohelp|nopauses|nonewlines|nowrap|positionlog|preserve|quickblank|quiet|rebinddelete|rebindkeypad|regexp|showcursor|smarthome|smooth|softwrap|suspend|tabsize[[:space:]]+[1-9][0-9]*|tabstospaces|tempfile|trimblanks|unix|view|wordbounds)\>"
+icolor brightgreen "^[[:space:]]*(set|unset)[[:space:]]+(afterends|allow_insecure_backup|atblanks|autoindent|backup|backwards|boldtext|casesensitive|constantshow|cutfromcursor|fill[[:space:]]+-?[[:digit:]]+|historylog|linenumbers|locking|morespace|mouse|multibuffer|noconvert|nohelp|nopauses|nonewlines|nowrap|positionlog|preserve|quickblank|quiet|rebinddelete|rebindkeypad|regexp|showcursor|smarthome|smooth|softwrap|suspend|tabsize[[:space:]]+[1-9][0-9]*|tabstospaces|tempfile|trimblanks|unix|view|wordbounds|zap)\>"
 icolor yellow "^[[:space:]]*set[[:space:]]+((error|function|key|number|selected|status|title)color)[[:space:]]+(bright)?(white|black|red|blue|green|yellow|magenta|cyan|normal)?(,(white|black|red|blue|green|yellow|magenta|cyan|normal))?\>"
 icolor brightgreen "^[[:space:]]*set[[:space:]]+(backupdir|brackets|errorcolor|functioncolor|keycolor|matchbrackets|numbercolor|operatingdir|punct|quotestr|selectedcolor|speller|statuscolor|titlecolor|whitespace|wordchars)[[:space:]]+"
-icolor brightgreen "^[[:space:]]*bind[[:space:]]+((\^([[:alpha:]]|[]0-9\^_]|Space)|M-([[:alpha:]]|[]!"#$%&'()*+,./0-9:;<=>?@\^_`{|}~-]|Space))|F([1-9]|1[0-6])|Ins|Del)[[:space:]]+([[:alpha:]]+|".*")[[:space:]]+(all|main|search|replace(with)?|gotoline|writeout|insert|ext(ernal)?cmd|help|spell|linter|browser|whereisfile|gotodir)([[:space:]]+#|[[:space:]]*$)"
-icolor brightgreen "^[[:space:]]*unbind[[:space:]]+((\^([[:alpha:]]|[]0-9\^_]|Space)|M-([[:alpha:]]|[]!"#$%&'()*+,./0-9:;<=>?@\^_`{|}~-]|Space))|F([1-9]|1[0-6])|Ins|Del)[[:space:]]+(all|main|search|replace(with)?|gotoline|writeout|insert|ext(ernal)?cmd|help|spell|linter|browser|whereisfile|gotodir)([[:space:]]+#|[[:space:]]*$)"
-icolor brightgreen "^[[:space:]]*extendsyntax[[:space:]]+[[:alpha:]]+[[:space:]]+(i?color|header|magic|comment|linter|formatter)[[:space:]]+.*$"
-icolor brightgreen "^[[:space:]]*(syntax|linter|formatter)[[:space:]]+[^[:blank:]]+"
-icolor green "^[[:space:]]*((un)?(bind|set)|include|syntax|header|magic|comment|linter|formatter|extendsyntax)\>"
+icolor brightgreen "^[[:space:]]*bind[[:space:]]+((\^([[:alpha:]]|[]@\^_]|Space)|M-([[:alpha:]]|[]!"#$%&'()*+,./0-9:;<=>?@\^_`{|}~-]|Space))|F([1-9]|1[0-6])|Ins|Del)[[:space:]]+([[:alpha:]]+|".*")[[:space:]]+(all|main|search|replace(with)?|yesno|gotoline|writeout|insert|ext(ernal)?cmd|help|spell|linter|browser|whereisfile|gotodir)([[:space:]]+#|[[:space:]]*$)"
+icolor brightgreen "^[[:space:]]*unbind[[:space:]]+((\^([[:alpha:]]|[]@\^_]|Space)|M-([[:alpha:]]|[]!"#$%&'()*+,./0-9:;<=>?@\^_`{|}~-]|Space))|F([1-9]|1[0-6])|Ins|Del)[[:space:]]+(all|main|search|replace(with)?|yesno|gotoline|writeout|insert|ext(ernal)?cmd|help|spell|linter|browser|whereisfile|gotodir)([[:space:]]+#|[[:space:]]*$)"
+icolor brightgreen "^[[:space:]]*extendsyntax[[:space:]]+[[:alpha:]]+[[:space:]]+(i?color|header|magic|comment|linter)[[:space:]]+.*"
+icolor brightgreen "^[[:space:]]*(syntax|linter)[[:space:]]+[^[:blank:]]+"
+icolor green "^[[:space:]]*((un)?(bind|set)|include|syntax|header|magic|comment|linter|extendsyntax)\>"
 
 # Strings
 color brightmagenta "".+"([[:space:]]|$)"
@@ -24,8 +24,8 @@ icolor yellow "^[[:space:]]*i?color[[:space:]]*(bright)?(white|black|red|blue|gr
 icolor magenta "^[[:space:]]*i?color\>" "\<(start|end)="
 
 # Comments
-color brightblue "(^|[[:space:]]+)#.*$"
-color cyan "^[[:space:]]*##.*$"
+color brightblue "(^|[[:space:]]+)#.*"
+color cyan "^[[:space:]]*##.*"
 
 # Trailing whitespace
 color ,green "[[:space:]]+$"

syntax/nftables.nanorc

@@ -17,7 +17,7 @@ color red "\<(drop|reject)\>"
 color brightblue "\<(accept|continue|(d|s)nat|goto|jump|masquerade|return)\>"
 
 # Comments
-color cyan "(^|[[:space:]])#.*$"
+color cyan "(^|[[:space:]])#.*"
 
 # Trailing whitespace
 color ,green "[[:space:]]+$"

syntax/objc.nanorc

@@ -38,5 +38,5 @@ color brightblue "^[[:space:]]*#[[:space:]]*(define|include|import|(un|ifn?)def|
 color yellow "//.*"
 color yellow start="/\*" end="\*/"
 
-# Trailing whitespace.                                                                                                       
+# Trailing whitespace.
 color ,green "[[:space:]]+$"

syntax/perl.nanorc

@@ -1,7 +1,7 @@
 ## Here is an example for Perl.
 
 syntax perl "\.p[lm]$"
-header "^#!.*perl[-0-9._]*"
+header "^#!.*perl"
 magic "Perl script"
 comment "#"
 

syntax/po.nanorc

@@ -20,10 +20,10 @@ color red " fuzzy(,|$)"
 color yellow " (no-)?[-[:alpha:]]+-format(,|$)"
 # Format specifiers.
 color brightmagenta "%([1-9]\$)?[a-z]*"
-# Quotes and newlines.
+# Quotes and escaped characters.
 color yellow "\""
-color cyan "\\n"
+color cyan "\\[abcefnrtv"\]"
 # Reminders.
 color brightwhite,yellow "(FIXME|TODO|XXX)"
 # Obsolete strings.
-color red "#~.*$"
+color red "#~.*"

syntax/postgresql.nanorc

@@ -59,9 +59,8 @@ color green "'([^']|(\\'))*'" "%[qw]\{[^}]*\}" "%[qw]\([^)]*\)" "%[qw]<[^>]*>"
 color green "%[qw]\[[^]]*\]" "%[qw]\$[^$]*\$" "%[qw]\^[^^]*\^" "%[qw]![^!]*!"
 
 # Comments.
-color red "#[^{].*$" "#$"
-color red "--[^{].*$" "#$"
-color red "##[^{].*$" "##$"
+color red "##?[^{].*" "##?$"
+color red "--[^{].*" "--$"
 color brightblue "//.*"
 color brightblue start="/\*" end="\*/"
 

syntax/python.nanorc

@@ -1,7 +1,7 @@
 ## Here is an example for Python.
 
 syntax python "\.py$"
-header "^#!.*python[-0-9._]*"
+header "^#!.*python"
 magic "Python script"
 linter pyflakes
 comment "#"
@@ -10,22 +10,27 @@ comment "#"
 icolor brightblue "def [0-9A-Z_]+"
 # Keywords.
 color brightcyan "\<(and|as|assert|async|await|break|class|continue)\>"
-color brightcyan "\<(def|del|elif|else|except|exec|finally|for|from)\>"
+color brightcyan "\<(def|del|elif|else|except|finally|for|from)\>"
 color brightcyan "\<(global|if|import|in|is|lambda|nonlocal|not|or)\>"
-color brightcyan "\<(pass|print|raise|return|try|while|with|yield)\>"
+color brightcyan "\<(pass|raise|return|try|while|with|yield)\>"
+
+# These two are keywords in Python 2, but functions in Python 3,
+# so only color them when they are followed by whitespace, assuming
+# that print(x) is a function invocation and print (x) is a statement.
+color brightcyan "\<(exec|print)([[:blank:]]|$)"
+
+# Special values.
+color brightmagenta "\<(False|None|True)\>"
 
 # Single-quoted strings.
 color brightgreen "'([^'\]|\\.)+'"
 color brightgreen ""([^"\]|\\.)+""
 # Comments.
-color brightred "(^|[[:blank:]])#.*$"
+color brightred "(^|[[:blank:]])#.*"
 # Triple-quoted strings.
 color brightgreen    start="'''([^'),]|$)" end="(^|[^(\])'''"
 color brightgreen start="\"\"\"([^"),]|$)" end="(^|[^(\])\"\"\""
 
-# Special values.
-color brightmagenta "\<(False|None|True)\>"
-
 # Reminders.
 color brightwhite,yellow "(FIXME|TODO|XXX)"
 

syntax/ruby.nanorc

@@ -1,7 +1,7 @@
 ## Here is an example for Ruby.
 
 syntax ruby "\.rb$"
-header "^#!.*ruby[-0-9._]*"
+header "^#!.*ruby"
 magic "Ruby script"
 linter ruby -w -c
 comment "#"
@@ -28,8 +28,8 @@ color brightgreen "#\{[^}]*\}"
 # Strings, single-quoted.
 color green "'([^']|(\\'))*'" "%[qw]\{[^}]*\}" "%[qw]\([^)]*\)" "%[qw]<[^>]*>" "%[qw]\[[^]]*\]" "%[qw]\$[^$]*\$" "%[qw]\^[^^]*\^" "%[qw]![^!]*!"
 # Comments.
-color cyan "#[^{].*$" "#$"
-color brightcyan "##[^{].*$" "##$"
+color cyan "#[^{].*" "#$"
+color brightcyan "##[^{].*" "##$"
 # "Here" docs.
 color green start="<<-?'?EOT'?" end="^EOT"
 # Some common markers.

syntax/rust.nanorc

@@ -4,7 +4,7 @@
 
 ## NOTE: Rules are applied in order: later rules re-colorize matching text.
 
-syntax rust "\.rs"
+syntax rust "\.(rlib|rs)$"
 comment "//"
 
 # Function definitions

syntax/sh.nanorc

@@ -1,7 +1,7 @@
 ## Here is an example for Bourne shell scripts.
 
-syntax sh "\.sh$"
-header "^#!.*((ba|da|k|pdk)?sh[-0-9_]*|openrc-run|runscript)"
+syntax sh "(\.sh|\.(a|ba|c|da|k|mk|pdk|tc|z)(sh|shrc|sh_profile)|/(etc/|\.)profile)$"
+header "^#!.*/(((a|ba|c|da|k|mk|pdk|tc|z)?sh)|(busybox|env) +sh|openrc-run|runscript)"
 magic "(POSIX|Bourne-Again) shell script.*text"
 linter dash -n
 comment "#"
@@ -16,7 +16,7 @@ color green "[{}():;|`$<>!=&\\]" "(\]|\[)"
 color green "-(eq|ne|gt|lt|ge|le|ef|ot|nt)\>"
 
 # Short and long options.
-color brightmagenta "-[A-Za-z]\>" "--[A-Za-z-]+\>"
+color brightmagenta "[[:blank:]]-[A-Za-z]\>" "[[:blank:]]--[A-Za-z-]+\>"
 
 # Common commands.
 color brightblue "\<(awk|cat|cd|ch(grp|mod|own)|cp|cut|echo|env|grep|head|install|ln|make|mkdir|mv|popd|printf|pushd|rm|rmdir|sed|set|sort|tail|tar|touch|umask|unset)\>"
@@ -28,7 +28,7 @@ color brightred "\$[-0-9@*#?$!]" "\$[[:alpha:]_][[:alnum:]_]*"
 color brightred "\$\{[#!]?([-@*#?$!]|[0-9]+|[[:alpha:]_][[:alnum:]_]*)(\[([[:space:]]*[[:alnum:]_]+[[:space:]]*|@)\])?(([#%/]|:?[-=?+])[^}]*\}|\[|\})"
 
 # Comments.
-color cyan "(^|[[:space:]])#.*$"
+color cyan "(^|[[:space:]])#.*"
 
 # Strings.
 color brightyellow ""(\\.|[^"])*"" "'(\\.|[^'])*'"

syntax/spec.nanorc

@@ -1,6 +1,6 @@
 ## Syntax highlighting for RPM spec files.
 
-syntax spec "\.(spec$|spec\.*)"
+syntax spec "\.spec(\.[^/]+)?$"
 comment "#"
 
 # Main tags.
@@ -31,7 +31,7 @@ color red "^%(post|posttrans|postun|trigger|triggerin|triggerpostun|triggerun|ve
 color brightred "%(if|else|endif|define|global|undefine)"
 
 # Comments.
-color cyan "#.*$"
+color cyan "#.*"
 # Special case: "# norootforbuild" is handled as main tag.
 color brightblue "^# norootforbuild"
 # %changelog date entries.

syntax/texinfo.nanorc

@@ -12,10 +12,10 @@ color brightmagenta "@[a-zA-Z]+\{[^}]*\}"
 color yellow "@[a-zA-Z]+\{?" "\}"
 
 # Menu items.
-color brightred "^\*[[:space:]]+.*::.*$"
+color brightred "^\*[[:space:]]+.*::.*"
 
 # Comments.
-color green "@c[[:space:]]+.*$"
+color green "@c[[:space:]]+.*"
 
 # Trailing whitespace.
 color ,green "[[:space:]]+$"