po: update translations and regenerate POT file and PO files

It was accidentally lost three years ago, in commit 7e1bc82d.

Also improve the description of this option in the other documents.

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,169 @@
+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.

IMPROVEMENTS

@@ -2,6 +2,10 @@ Improvements in GNU nano
 ========================
 
 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 +38,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,31 @@
+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

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="90f289f249a266b1afb9c63e182f5d979d17df5f"
 
 modules="
 	futimens

configure.ac

@@ -16,7 +16,7 @@
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see http://www.gnu.org/licenses/.
 
-AC_INIT([GNU nano], [2.9.5], [nano-devel@gnu.org], [nano])
+AC_INIT([GNU nano], [2.9.8], [nano-devel@gnu.org], [nano])
 AC_CONFIG_SRCDIR([src/nano.c])
 AC_CANONICAL_HOST
 AM_INIT_AUTOMAKE([1.14])

doc/faq.html

@@ -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>2.9.8</b>.  Of course, you should always check the <a href="https://nano-editor.org/">nano homepage</a> to see what the latest and greatest version is.</p></blockquote>
 <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%">

doc/nano.1

@@ -16,7 +16,7 @@
 .\"   Documentation License along with this program.  If not, see
 .\"   <http://www.gnu.org/licenses/>.
 .\"
-.TH NANO 1 "version 2.9.5" "March 2018"
+.TH NANO 1 "version 2.9.8" "June 2018"
 
 .SH NAME
 nano \- Nano's ANOther editor, an enhanced free Pico clone
@@ -106,7 +106,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,11 +122,11 @@ 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
@@ -187,8 +187,9 @@ highlighted item.  Useful for braille users.
 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
@@ -250,6 +251,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 +313,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 2.9.8
+@set UPDATED June 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 2.9.8
 
 @author Chris Allegretta
 @page
@@ -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 2.9.8.
 
 @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,11 +218,10 @@ 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
@@ -299,8 +298,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 +355,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.
 
@@ -392,6 +392,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
@@ -591,59 +595,59 @@ The following global toggles are available:
 
 @table @code
 
-@item Backup Files toggle
+@item Backup Files
 @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
+@item Multiple File Buffers
 @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
+@item No Conversion From DOS/Mac Format
 @kbd{Meta-N} toggles the @option{-N} (@option{--noconvert}) command-line option.
 
-@item More Space For Editing toggle
+@item More Space For Editing
 @kbd{Meta-O} toggles the @option{-O} (@option{--morespace}) command-line option.
 
-@item Whitespace Display toggle
-@kbd{Meta-P} toggles the whitespace-display mode (@pxref{Whitespace}).
+@item Whitespace Display
+@kbd{Meta-P} toggles the displaying of whitespace (@pxref{Whitespace}).
 
-@item Tabs To Spaces toggle
+@item Tabs To Spaces
 @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 +693,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 +706,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
@@ -726,7 +735,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 +806,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 +848,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
@@ -909,6 +916,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
@@ -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,12 +989,12 @@ 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.
+Use the given @var{program} to automatically reformat the text in
+the current buffer --- useful for a programming language like Go.
 (This overrides the speller and linter functions.)
 
 @item comment "@var{string}"
@@ -1153,11 +1161,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, or formatter 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.
@@ -1307,6 +1318,10 @@ 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.
@@ -1347,8 +1362,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.
+(The form @code{constupdate} is deprecated.)
 
 @item morespace
 Toggles the presence of the blank line that 'separates' the title bar from the file text.
@@ -1359,6 +1375,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 +1388,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.
@@ -1438,7 +1460,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 +1479,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 +1528,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

@@ -16,7 +16,7 @@
 .\"   Documentation License along with this program.  If not, see
 .\"   <http://www.gnu.org/licenses/>.
 .\"
-.TH NANORC 5 "version 2.9.5" "March 2018"
+.TH NANORC 5 "version 2.9.8" "June 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
@@ -88,7 +93,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 +163,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 +203,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 +243,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 +276,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
@@ -307,7 +311,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 +323,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 +342,16 @@ 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.
+Use the given \fIprogram\fR to automatically reformat the text in
+the current buffer -- 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,7 +361,7 @@ 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
@@ -368,10 +372,10 @@ 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 +384,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.
@@ -506,14 +510,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, or formatter 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.
@@ -663,6 +670,10 @@ 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.
@@ -703,8 +714,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.
+(The form 'constupdate' is deprecated.)
 .TP
 .B morespace
 Toggles the presence of the blank line that 'separates' the title bar from the file text.
@@ -715,6 +727,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 +740,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.

doc/rnano.1

@@ -16,7 +16,7 @@
 .\"   Documentation License along with this program.  If not, see
 .\"   <http://www.gnu.org/licenses/>.
 .\"
-.TH RNANO 1 "version 2.9.5" "March 2018"
+.TH RNANO 1 "version 2.9.8" "June 2018"
 
 .SH NAME
 rnano \- a restricted nano

doc/sample.nanorc.in

@@ -15,11 +15,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 +37,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,7 +48,6 @@
 ## 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
@@ -89,13 +93,13 @@
 ## Don't display the helpful shortcut lists at the bottom of the screen.
 # set nohelp
 
+## Don't automatically add a newline when a file does not end with one.
+# set nonewlines
+
 ## Don't pause between warnings at startup.  Which means that only the
 ## last one will be readable (when there are multiple ones).
 # set nopauses
 
-## Don't add newlines to the ends of files.
-# set nonewlines
-
 ## Don't wrap text at all.
 # set nowrap
 
@@ -107,7 +111,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 +126,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
@@ -174,6 +173,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

src/browser.c

@@ -168,12 +168,12 @@ char *do_browser(char *path)
 		} else if (func == do_search_forward) {
 			do_filesearch();
 		} else if (func == do_research) {
-			do_fileresearch(TRUE);
+			do_fileresearch(FORWARD);
 #ifndef NANO_TINY
 		} else if (func == do_findprevious) {
-			do_fileresearch(FALSE);
+			do_fileresearch(BACKWARD);
 		} else if (func == do_findnext) {
-			do_fileresearch(TRUE);
+			do_fileresearch(FORWARD);
 #endif
 		} else if (func == do_left) {
 			if (selected > 0)
@@ -659,42 +659,40 @@ 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. */
+/* Prepare the prompt and ask the user what to search for.  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(void)
 {
-	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", _("Search"), 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,

src/color.c

@@ -60,9 +60,9 @@ 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 |
@@ -125,10 +125,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/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    *
@@ -1109,6 +1109,24 @@ void do_insertfile(void)
 				answer = chosen;
 				i = 0;
 			}
+#endif
+#ifndef NANO_TINY
+			if (func == flip_pipe) {
+				/* Remove or add the pipe character at the answer's head. */
+				if (answer[0] == '|') {
+					charmove(answer, answer + 1, strlen(answer) + 1);
+					if (statusbar_x > 0)
+						statusbar_x--;
+				} else {
+					answer = charealloc(answer, strlen(answer) + 2);
+					charmove(answer + 1, answer, strlen(answer) + 1);
+					answer[0] = '|';
+					statusbar_x++;
+				}
+
+				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))
@@ -1915,16 +1933,16 @@ bool write_file(const char *name, FILE *f_open, bool tmp,
 		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 +1959,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:

src/global.c

@@ -2,7 +2,7 @@
  *   global.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    *
@@ -46,11 +46,6 @@ bool focusing = TRUE;
 bool as_an_at = TRUE;
 		/* Whether a 0x0A byte should be shown as a ^@ instead of a ^J. */
 
-int margin = 0;
-		/* The amount of space reserved at the left for line numbers. */
-int editwincols = -1;
-		/* The number of usable columns in the edit window: COLS - margin. */
-
 bool suppress_cursorpos = FALSE;
 		/* Should we skip constant position display for current keystroke? */
 
@@ -98,18 +93,22 @@ char *present_path = NULL;
 
 unsigned flags[4] = {0, 0, 0, 0};
 		/* Our flag containing the states of all global options. */
+
 WINDOW *topwin = NULL;
-		/* The top portion of the window, where we display the version
-		 * number of nano, the name of the current file, and whether the
-		 * current file has been modified. */
+		/* The top portion of the screen, showing the version number of nano,
+		 * the name of the file, and whether the buffer was modified. */
 WINDOW *edit = NULL;
-		/* The middle portion of the window, i.e. the edit window, where
-		 * we display the current file we're editing. */
+		/* The middle portion of the screen: the edit window, showing the
+		 * contents of the current buffer, the file we are editing. */
 WINDOW *bottomwin = NULL;
-		/* The bottom portion of the window, where we display statusbar
+		/* The bottom portion of the screen, where we display statusbar
 		 * messages, the statusbar prompt, and a list of shortcuts. */
 int editwinrows = 0;
 		/* How many rows does the edit window take up? */
+int editwincols = -1;
+		/* The number of usable columns in the edit window: COLS - margin. */
+int margin = 0;
+		/* The amount of space reserved at the left for line numbers. */
 
 filestruct *cutbuffer = NULL;
 		/* The buffer where we store cut text. */
@@ -153,6 +152,8 @@ char *word_chars = NULL;
 
 char *answer = NULL;
 		/* The answer string used by the statusbar prompt. */
+size_t statusbar_x = HIGHEST_POSITIVE;
+		/* The cursor position in answer. */
 
 ssize_t tabsize = -1;
 		/* The width of a tab in spaces.  The default is set in main(). */
@@ -266,7 +267,7 @@ size_t length_of_list(int menu)
 #define BLANKAFTER  TRUE    /* A blank line after this one. */
 #define TOGETHER  FALSE
 
-/* Just throw this here. */
+/* Empty functions, for the most part corresponding to toggles. */
 void case_sens_void(void)
 {
 }
@@ -291,6 +292,9 @@ void goto_dir_void(void)
 }
 #endif
 #ifndef NANO_TINY
+void do_toggle_void(void)
+{
+}
 void dos_format_void(void)
 {
 }
@@ -309,6 +313,9 @@ void backup_file_void(void)
 void flip_execute(void)
 {
 }
+void flip_pipe(void)
+{
+}
 #endif
 #ifdef ENABLE_MULTIBUFFER
 void flip_newbuffer(void)
@@ -318,6 +325,9 @@ void flip_newbuffer(void)
 void discard_buffer(void)
 {
 }
+void do_cancel(void)
+{
+}
 
 /* Add a function to the function list. */
 void add_to_funcs(void (*func)(void), int menus, const char *desc, const char *help,
@@ -392,7 +402,6 @@ const sc *first_sc_for(int menu, void (*func)(void))
 #ifdef DEBUG
 	fprintf(stderr, "Whoops, returning null given func %ld in menu %x\n", (long)func, menu);
 #endif
-	/* Otherwise... */
 	return NULL;
 }
 
@@ -576,6 +585,8 @@ void shortcut_init(void)
 	const char *lastline_gist = N_("Go to the last line of the file");
 #ifndef NANO_TINY
 	const char *bracket_gist = N_("Go to the matching bracket");
+#endif
+#ifdef ENABLE_HELP
 	const char *scrollup_gist =
 		N_("Scroll up one line without moving the cursor textually");
 	const char *scrolldown_gist =
@@ -644,6 +655,8 @@ void shortcut_init(void)
 	const char *prepend_gist = N_("Toggle prepending");
 	const char *backup_gist = N_("Toggle backing up of the original file");
 	const char *execute_gist = N_("Execute external command");
+	const char *pipe_gist =
+		N_("Pipe the current buffer (or marked region) to the command");
 #endif
 #ifdef ENABLE_MULTIBUFFER
 	const char *newbuffer_gist = N_("Toggle the use of a new buffer");
@@ -859,7 +872,7 @@ void shortcut_init(void)
 		prevline_tag, WITHORSANS(prevline_gist), TOGETHER, VIEW);
 	add_to_funcs(do_down, MMAIN|MHELP|MBROWSER,
 		nextline_tag, WITHORSANS(nextline_gist), TOGETHER, VIEW);
-#ifndef NANO_TINY
+#ifdef ENABLE_HELP
 	add_to_funcs(do_scroll_up, MMAIN,
 		N_("Scroll Up"), WITHORSANS(scrollup_gist), TOGETHER, VIEW);
 	add_to_funcs(do_scroll_down, MMAIN,
@@ -1028,7 +1041,11 @@ void shortcut_init(void)
 		add_to_funcs(flip_newbuffer, MINSERTFILE|MEXTCMD,
 			N_("New Buffer"), WITHORSANS(newbuffer_gist), TOGETHER, NOVIEW);
 #endif
-
+#ifndef NANO_TINY
+	if (!ISSET(RESTRICTED))
+		add_to_funcs(flip_pipe, MEXTCMD,
+			N_("Pipe Text"), WITHORSANS(pipe_gist), TOGETHER, NOVIEW);
+#endif
 #ifdef ENABLE_BROWSER
 	/* The file browser is only available when not in restricted mode. */
 	if (!ISSET(RESTRICTED))
@@ -1206,7 +1223,7 @@ void shortcut_init(void)
 	add_to_sclist(MMAIN, "M-)", 0, do_para_end_void, 0);
 	add_to_sclist(MMAIN, "M-0", 0, do_para_end_void, 0);
 #endif
-#ifndef NANO_TINY
+#ifdef ENABLE_HELP
 	add_to_sclist(MMAIN, "M--", 0, do_scroll_up, 0);
 	add_to_sclist(MMAIN, "M-_", 0, do_scroll_up, 0);
 	add_to_sclist(MMAIN, "M-+", 0, do_scroll_down, 0);
@@ -1323,8 +1340,12 @@ void shortcut_init(void)
 #endif
 #ifdef ENABLE_MULTIBUFFER
 	/* Only when not in restricted mode, allow multiple buffers. */
-	if (!ISSET(RESTRICTED))
+	if (!ISSET(RESTRICTED)) {
 		add_to_sclist(MINSERTFILE|MEXTCMD, "M-F", 0, flip_newbuffer, 0);
+#ifndef NANO_TINY
+		add_to_sclist(MEXTCMD, "M-\\", 0, flip_pipe, 0);
+#endif
+	}
 #endif
 #ifdef ENABLE_BROWSER
 	/* Only when not in restricted mode, allow entering the file browser. */
@@ -1387,8 +1408,7 @@ const subnfunc *sctofunc(const sc *s)
 }
 
 #ifndef NANO_TINY
-/* Now let's come up with a single (hopefully) function to get a string
- * for each flag. */
+/* Return the textual description that corresponds to the given flag. */
 const char *flagtostr(int flag)
 {
 	switch (flag) {
@@ -1526,10 +1546,6 @@ sc *strtosc(const char *input)
 		s->func = do_indent;
 	else if (!strcasecmp(input, "unindent"))
 		s->func = do_unindent;
-	else if (!strcasecmp(input, "scrollup"))
-		s->func = do_scroll_up;
-	else if (!strcasecmp(input, "scrolldown"))
-		s->func = do_scroll_down;
 	else if (!strcasecmp(input, "cutwordleft"))
 		s->func = do_cut_prev_word;
 	else if (!strcasecmp(input, "cutwordright"))
@@ -1559,6 +1575,12 @@ sc *strtosc(const char *input)
 	else if (!strcasecmp(input, "down") ||
 			 !strcasecmp(input, "nextline"))
 		s->func = do_down;
+#ifdef ENABLE_HELP
+	else if (!strcasecmp(input, "scrollup"))
+		s->func = do_scroll_up;
+	else if (!strcasecmp(input, "scrolldown"))
+		s->func = do_scroll_down;
+#endif
 	else if (!strcasecmp(input, "prevword"))
 		s->func = do_prev_word_void;
 	else if (!strcasecmp(input, "nextword"))
@@ -1631,6 +1653,8 @@ sc *strtosc(const char *input)
 		s->func = backup_file_void;
 	else if (!strcasecmp(input, "flipexecute"))
 		s->func = flip_execute;
+	else if (!strcasecmp(input, "flippipe"))
+		s->func = flip_pipe;
 #endif
 #ifdef ENABLE_MULTIBUFFER
 	else if (!strcasecmp(input, "flipnewbuffer"))
@@ -1652,7 +1676,8 @@ sc *strtosc(const char *input)
 		s->func = do_toggle_void;
 		if (!strcasecmp(input, "nohelp"))
 			s->toggle = NO_HELP;
-		else if (!strcasecmp(input, "constupdate"))
+		else if (!strcasecmp(input, "constantshow") ||
+				 !strcasecmp(input, "constupdate"))  /* Deprecated.  Remove end of 2018. */
 			s->toggle = CONSTANT_SHOW;
 		else if (!strcasecmp(input, "morespace"))
 			s->toggle = MORE_SPACE;
@@ -1660,6 +1685,10 @@ sc *strtosc(const char *input)
 			s->toggle = SMOOTH_SCROLL;
 		else if (!strcasecmp(input, "softwrap"))
 			s->toggle = SOFTWRAP;
+#ifdef ENABLE_LINENUMBERS
+		else if (!strcasecmp(input, "linenumbers"))
+			s->toggle = LINE_NUMBERS;
+#endif
 		else if (!strcasecmp(input, "whitespacedisplay"))
 			s->toggle = WHITESPACE_DISPLAY;
 #ifdef ENABLE_COLOR
@@ -1670,7 +1699,8 @@ sc *strtosc(const char *input)
 			s->toggle = SMART_HOME;
 		else if (!strcasecmp(input, "autoindent"))
 			s->toggle = AUTOINDENT;
-		else if (!strcasecmp(input, "cuttoend"))
+		else if (!strcasecmp(input, "cutfromcursor") ||
+				 !strcasecmp(input, "cuttoend"))  /* Deprecated.  Remove end of 2018. */
 			s->toggle = CUT_FROM_CURSOR;
 #ifdef ENABLE_WRAPPING
 		else if (!strcasecmp(input, "nowrap"))

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, ...)
 {

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    *
@@ -179,7 +179,7 @@ void do_para_begin(bool update_screen)
 	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;
@@ -204,7 +204,7 @@ void do_para_end(bool update_screen)
 
 	while (openfile->current != openfile->filebot &&
 				inpar(openfile->current->next) &&
-				!begpar(openfile->current->next)) {
+				!begpar(openfile->current->next, 0)) {
 		openfile->current = openfile->current->next;
 	}
 
@@ -314,15 +314,19 @@ void do_prev_word(bool allow_punct, bool 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.
+/* 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.  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)
+bool do_next_word(bool after_ends, bool allow_punct, bool update_screen)
 {
 	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,13 +344,26 @@ 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)
@@ -363,11 +380,12 @@ void do_prev_word_void(void)
 	do_prev_word(ISSET(WORD_BOUNDS), TRUE);
 }
 
-/* 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);
+	do_next_word(ISSET(AFTER_ENDS), ISSET(WORD_BOUNDS), TRUE);
 }
 
 /* Move to the beginning of the current line (or softwrapped chunk).
@@ -495,7 +513,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,7 +536,10 @@ 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;
@@ -532,7 +556,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    *
@@ -551,14 +551,15 @@ 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);
+
+	/* Switch on the cursor and exit from curses mode. */
 	curs_set(1);
 	endwin();
 
@@ -582,7 +583,8 @@ void finish(void)
 	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 +742,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 +755,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 +769,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 +785,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 +793,33 @@ 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"));
 #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,26 +827,26 @@ 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("-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"));
@@ -867,17 +865,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 +886,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
@@ -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)
 {
@@ -1401,12 +1417,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 +1509,6 @@ void terminal_init(void)
 
 	if (!newterm_set) {
 #endif
-
 		raw();
 		nonl();
 		noecho();
@@ -1532,6 +1541,30 @@ int get_keycode(const char *keyname, const int standard)
 		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)
 {
@@ -1995,6 +2028,7 @@ int main(int argc, char **argv)
 		{"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 +2087,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:abcdefghijklmno: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);
@@ -2178,6 +2206,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 +2217,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 +2284,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,14 +2297,11 @@ 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);
@@ -2426,21 +2464,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 {
@@ -2624,25 +2659,15 @@ int main(int argc, char **argv)
 	if (rcfile_with_errors != NULL)
 		statusline(ALERT, _("Mistakes in '%s'"), rcfile_with_errors);
 
+#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();
@@ -2662,6 +2687,7 @@ int main(int argc, char **argv)
 		} else
 			edit_refresh();
 
+		errno = 0;
 		focusing = TRUE;
 
 		/* Forget any earlier statusbar x position. */

src/nano.h

@@ -142,6 +142,11 @@
 #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
@@ -173,7 +178,7 @@ typedef enum {
 #ifdef ENABLE_COMMENT
 	COMMENT, UNCOMMENT, PREFLIGHT,
 #endif
-	CUT, CUT_TO_EOF, PASTE, INSERT, OTHER
+	CUT, CUT_TO_EOF, PASTE, INSERT, COUPLE_BEGIN, COUPLE_END, OTHER
 } undo_type;
 
 /* Structure types. */
@@ -538,7 +543,8 @@ enum
 	SHOW_CURSOR,
 	LINE_NUMBERS,
 	NO_PAUSES,
-	AT_BLANKS
+	AT_BLANKS,
+	AFTER_ENDS
 };
 
 /* Flags for the menus in which a given function should be present. */

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,8 +25,6 @@
 
 static char *prompt = NULL;
 		/* The prompt string used for statusbar questions. */
-static size_t statusbar_x = HIGHEST_POSITIVE;
-		/* The cursor position in answer. */
 
 #ifdef ENABLE_MOUSE
 /* Handle a mouse click on the statusbar prompt or the shortcut list. */
@@ -292,17 +290,28 @@ void do_statusbar_cut_text(void)
 void do_statusbar_next_word(void)
 {
 	bool seen_space = !is_word_mbchar(answer + statusbar_x, FALSE);
+	bool seen_word = !seen_space;
 
-	/* Move forward until we reach the start of a word. */
+	/* 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[statusbar_x] != '\0') {
 		statusbar_x = move_mbright(answer, statusbar_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 + statusbar_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 + statusbar_x, FALSE))
+				seen_space = TRUE;
+			else if (seen_space)
+				break;
+		}
 	}
 
 	update_the_statusbar();
@@ -659,19 +668,18 @@ 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)) {
@@ -689,16 +697,16 @@ 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);
 		}
@@ -715,12 +723,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;

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;
@@ -91,10 +88,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;
@@ -124,6 +124,7 @@ extern char *quoteerr;
 extern char *word_chars;
 
 extern char *answer;
+extern size_t statusbar_x;
 
 extern ssize_t tabsize;
 
@@ -380,7 +381,7 @@ void do_para_end_void(void);
 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);
+bool do_next_word(bool after_ends, bool allow_punct, bool update_screen);
 void do_prev_word_void(void);
 void do_next_word_void(void);
 void do_home(void);
@@ -426,6 +427,9 @@ 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
@@ -433,12 +437,14 @@ 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);
@@ -471,7 +477,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 +484,18 @@ 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);
+void do_research(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 +527,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 +551,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);
@@ -692,7 +696,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 +706,19 @@ 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);
 #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
@@ -85,6 +88,7 @@ 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},
@@ -92,9 +96,9 @@ static const rcoption rcopts[] = {
 	{"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},
@@ -396,7 +400,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;
@@ -506,7 +511,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") :
@@ -603,10 +608,38 @@ 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, 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;
+		}
+		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;
+	} else
+		*fg = USE_THE_DEFAULT;
+
+	return TRUE;
 }
 
 /* Parse the color string in the line at ptr, and add it to the current
@@ -736,36 +769,6 @@ 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)
 {
@@ -1144,19 +1147,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
@@ -1254,7 +1255,7 @@ void do_rcfiles(void)
 
 	/* 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))
+	if (have_nanorc(homedir, "/" HOME_RC_NAME))
 		parse_one_nanorc();
 	else if (have_nanorc(xdgconfdir, "/nano/" RCFILE_NAME))
 		parse_one_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
@@ -135,7 +115,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 +130,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;
 		}
 
@@ -184,7 +161,7 @@ void search_init(bool replacing, bool keep_the_answer)
 			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 +205,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 +340,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 +363,34 @@ void do_research(void)
 
 	go_looking();
 
-	search_replace_abort();
+	tidy_up_after_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 */
+
+/* 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
@@ -702,8 +690,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 +772,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

@@ -325,15 +325,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

src/winio.c

@@ -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);
@@ -984,7 +984,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. */
@@ -1944,7 +1944,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';
@@ -2159,6 +2159,7 @@ void statusline(message_type importance, const char *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;
@@ -3502,15 +3503,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/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,6 +1,6 @@
 ## Colouring for Changelogs.
 
-syntax changelog "Change[Ll]og.*"
+syntax changelog "Change[Ll]og[^/]*$"
 
 # Author lines.
 color green "^(19|20).*$"

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/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

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/nanorc.nanorc

@@ -7,7 +7,7 @@ comment "#"
 icolor brightred "^[[:space:]]*((un)?(bind|set)|include|syntax|header|magic|comment|linter|formatter|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)\>"
 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:]]*$)"

syntax/po.nanorc

@@ -20,9 +20,9 @@ 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.

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

@@ -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)\>"

syntax/spec.nanorc

@@ -1,6 +1,6 @@
 ## Syntax highlighting for RPM spec files.
 
-syntax spec "\.(spec$|spec\.*)"
+syntax spec "\.spec(\.[^/]+)?$"
 comment "#"
 
 # Main tags.