po: update translations and regenerate POT file and PO files

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

Bug existed since commit 7e422402 from two weeks ago.

AUTHORS

@@ -14,7 +14,9 @@ David Lawrence Ramsey <pooka109@gmail.com>
 	* Former stable series maintainer.  Multiple buffer support,
 	  operating dir (-o) option, bug fixes for display routines,
 	  wrapping code, spelling fixes, constantshow mode, parts of
-	  UTF-8 support, softwrap overhaul, and various other fixes.
+	  UTF-8 support, softwrap overhaul, undoable (un)indentations,
+	  undoable justifications, justifiable regions, and numerous
+	  other fixes.
 
 Jordi Mallach <jordi@gnu.org>
 	* Debian package maintainer, fellow bug squasher.
@@ -67,3 +69,6 @@ Rishabh Dave <rishabhddave@gmail.com>
 
 Marco Diego Aurélio Mesquita <marcodiegomesquita@gmail.com>
 	* Filtering text through an external command.
+
+Brand Huntsman <alpha@qzx.com>
+	* The delayed parsing of syntax files.

ChangeLog

@@ -1,3 +1,252 @@
+Changes between v4.2 and v4.3:
+------------------------------
+
+Benno Schulenberg (235):
+      bindings: at a Yes-No prompt, accept also ^N and ^Q for "No"
+      bindings: at a Yes-No prompt, accept also ^Y for "Yes"
+      bindings: bind the Alt+arrow keystrokes also in non-UTF-8 locales
+      browser: don't show a mistaken message when exiting from help viewer
+      build: avoid a warning on FreeBSD, OpenBSD, and Alpine
+      build: avoid a warning when using --disable-utf8
+      build: exclude the ability to open a FIFO from the tiny version
+      build: fix compilation on another system
+      build: fix compilation when configured with --disable-color
+      build: fix compilation when configured with --enable-tiny
+      build: move an #include to where it is needed
+      build: remove two #includes that don't seem to be needed
+      bump version numbers and add a news item for the 4.3 release
+      chars: create a dedicated function for getting the length of a character
+      chars: redo the speedup for plain ASCII from three commits ago
+      chars: speed up case-insensitive searching by roughly one percent
+      chars: speed up the determination of length and width for plain ASCII
+      copying: let a copy command break a chain of cut or zap commands
+      copying: make M-6 do nothing when at end of buffer
+      copying: scroll just one line when M-6 is pressed on the bottom row
+      cutting: clear the cutbuffer when the previous operation was copying
+      cutting: ignore the mark when a word is deleted
+      display: properly show all characters in a non-UTF-8 build
+      docs: add a light warning to the explanation of --nonewlines
+      docs: adjust the wording of the README to be factually correct
+      docs: clarify that in nano regexes are extended regular expressions
+      docs: mention the default value for 'errorcolor'
+      docs: note Brand as the author of the delayed syntax parsing
+      docs: note David as author of undoable indenting and undoable justifying
+      docs: remove "--" from the default value of 'quotestr'
+      docs: say thanks to the Korean translator, and trim a double space
+      docs: show double quotes where they are needed
+      docs: slightly reword the notice about the changed defaults since 4.0
+      feedback: don't clear off possible error messages after a spell check
+      feedback: don't try to represent keys outside of the seven-bit range
+      feedback: make an error check work also when curses hasn't started yet
+      feedback: print helpful message only when data comes from keyboard
+      feedback: show a more fitting message when opening a FIFO is interrupted
+      feedback: show an appropriate message when reading a file was cut short
+      feedback: treat statusline() being called outside of curses mode as a bug
+      feedback: when the last line is empty, don't include it in the count
+      files: allow a given file to be a special file but not a directory
+      files: allow to abort the reading of slow files with Ctrl+C
+      files: allow to interrupt the opening of a FIFO for writing with Ctrl+C
+      files: allow to interrupt the opening of a FIFO with Ctrl+C
+      files: check for writability by the access bits, not by trying to append
+      files: don't close a newly-created buffer when it is the only one
+      files: don't save the state of the terminal a second time
+      files: don't say "Error...: Success" when aborting after resizing
+      files: give feedback while waiting for a FIFO to open up
+      files: suppress feedback when writing an emergency or temporary file
+      files: try matching a syntax after scooping data from standard input
+      files: when needed, reconnect the keyboard and reenter curses mode
+      gnulib: update to its current upstream state
+      help: don't check for confinement when opening a temporary help-text file
+      help: don't cycle through the buffers for every resizing step
+      help: don't show Alt+Left and Alt+Right when running on a Linux console
+      help: make the column for the first keystroke a little wider
+      help: write the text directly into a new buffer, without using a tempfile
+      justify: remove "--" from the quoting regex, to avoid false paragraphs
+      oops: apparently the line numbers in the cutbuffer do matter
+      rcfile: at terminating points, verify that a defined syntax is not empty
+      rcfile: check for missing color commands only when a syntax is still open
+      rcfile: close off a syntax when a non-syntax command is encountered
+      rcfile: disallow extending a syntax that is defined in a main nanorc
+      rcfile: fully read each included file, so all its syntaxes are seen
+      search: stay in the Search menu when trying to Replace in view mode
+      softwrap: use smooth scrolling when softwrapping is toggled on
+      speller: be more concise and to the point when something goes wrong
+      speller: don't crash when the spell-checked tempfile cannot be opened
+      speller: ensure that a Shift-selected region is retained
+      speller: when something goes wrong with 'sort', do not blame 'spell'
+      startup: remove the now-unneeded workaround for a SIGWINCH during input
+      startup: resave the terminal's state only when there were no signals
+      syntax: po: colorize also escaped hex and octal codes
+      syntax: python: avoid miscoloring stuff between two empty strings
+      tweaks: add a missing forward declaration of make_new_buffer()
+      tweaks: add a pair of braces, to silence a compiler warning
+      tweaks: add a warning for something that shouldn't occur
+      tweaks: adjust a comment and drop two others, and reshuffle two lines
+      tweaks: adjust some indentation after the previous change
+      tweaks: adjust some whitespace and rewrap a few lines
+      tweaks: adjust the indentation after the previous change
+      tweaks: adjust the indentation after the previous change
+      tweaks: avoid an unneeded, extra stat() for temporary files
+      tweaks: avoid parsing a character twice
+      tweaks: be more sparing in redrawing things when exiting from help viewer
+      tweaks: change a function to void, to make things more direct
+      tweaks: check in a single place for files that should not be opened
+      tweaks: close a buffer differently and elide a parameter
+      tweaks: condense a comment and reshuffle a couple of lines
+      tweaks: condense a couple of comments, and reshuffle a line
+      tweaks: condense the setup of the two signal handlers for Ctrl+C
+      tweaks: condense two comments, and normalize the whitespace of a label
+      tweaks: consistently report failures to fork (and the like) as errors
+      tweaks: delete a leftover
+      tweaks: delete a now-unused function
+      tweaks: delete a now-unused function
+      tweaks: don't bother calling mblen() in a non-UTF-8 build
+      tweaks: don't bother checking the return value of wait()
+      tweaks: don't bother keeping track of whether a squeezed line has shrunk
+      tweaks: don't bother renumbering the lines in the cutbuffer
+      tweaks: don't bother saving and restoring 'cutbottom' all the time
+      tweaks: don't bother to free the content of 'extendsyntax' commands
+      tweaks: don't check the user's nanorc file for accessibility twice
+      tweaks: drop an unneeded parameter from open_file()
+      tweaks: drop a useless tidying-up call, as spelling does not use regexes
+      tweaks: drop most of the remaining debugging code, and some timing code
+      tweaks: drop some checks that were made redundant by the previous commit
+      tweaks: drop two checks that were made redundant by the previous commit
+      tweaks: elide a function that is an amalgam of three others
+      tweaks: elide a function that is called in just one place
+      tweaks: elide a function that is used just once
+      tweaks: elide another parameter, and rename the function to match
+      tweaks: elide an unneeded, duplicate stat() for the FIFO check
+      tweaks: elide an unneeded 'if' and 'break'
+      tweaks: elide an unneeded variable
+      tweaks: elide a parameter and a return value
+      tweaks: elide a pre-processor #else clause, by using braces instead
+      tweaks: elide a variable, drop a comment, and remove unneeded braces
+      tweaks: elide two unneeded variables
+      tweaks: enforce the miminum amount of scrolling in a simpler way
+      tweaks: exclude a bug check from the tiny version
+      tweaks: exclude another bug check from the tiny version
+      tweaks: factor out a fragment of code that is repeated three times
+      tweaks: factor out the installing and restoring of the ^C signal handler
+      tweaks: improve a couple of comments
+      tweaks: improve a handful of comments
+      tweaks: improve some comments, reshuffle a line, and rename a variable
+      tweaks: include the enabling of SIGINT into the tiny version
+      tweaks: invert a condition, in order to return earlier
+      tweaks: invert two conditions, in order to elide an extra variable
+      tweaks: just mark four rcfile errors for translation, like the others
+      tweaks: make better use of two variables, and reshuffle two comments
+      tweaks: merge two functions, as the first is called just once
+      tweaks: merge two functions, as the one is used only by the other
+      tweaks: merge two very similar functions into a single one
+      tweaks: move a bit of timing code to where it will be needed
+      tweaks: move a function to the file where it is used
+      tweaks: move an assignment that is useful only when searching forward
+      tweaks: move a syntax check to a better place, to reduce duplication
+      tweaks: move the tyding-up-after-a-search to a single exit point
+      tweaks: normalize the indentation after the previous two changes
+      tweaks: place a function better, and reduce some comments to a single one
+      tweaks: put some timing code back into the search function
+      tweaks: really don't bother renumbering the lines in the cutbuffer
+      tweaks: reduce a bit of mark-adjusting code to its essence
+      tweaks: reduce the scope of a variable, and let the compiler zero it
+      tweaks: remove a bit of redundant code
+      tweaks: remove a check that is no longer relevant
+      tweaks: remove a condition that has become superfluous
+      tweaks: remove an unneeded "closing" of a syntax after extending it
+      tweaks: remove an unneeded setting and unsetting of a flag
+      tweaks: remove a superfluous and ineffective assignment
+      tweaks: remove a superfluous condition, in three places
+      tweaks: remove four unneeded pre-processor directives
+      tweaks: remove some unneeded braces, and reshuffle for more symmetry
+      tweaks: remove the two remaining handfuls of asserts
+      tweaks: remove two more unneeded assignments
+      tweaks: remove two unneeded assignments, and improve a comment
+      tweaks: remove two unneeded checks for NULL
+      tweaks: rename a bunch of variables, to become identical to others
+      tweaks: rename a function and a variable, for contrast and variety
+      tweaks: rename a function and its parameters, to be more fitting
+      tweaks: rename a function, to be clearer and to stop using an old abbrev
+      tweaks: rename a function, to be more fitting
+      tweaks: rename a function, to better indicate what it does
+      tweaks: rename a function, to better suit what it does
+      tweaks: rename a parameter and a variable, to be more distinct
+      tweaks: rename a struct element, to be distinct
+      tweaks: rename a type, for more contrast
+      tweaks: rename a type, to make more sense
+      tweaks: rename a variable, reduce its scope, and use it consistently
+      tweaks: rename a variable, reshuffle declarations, and drop an assert
+      tweaks: rename a variable, to be shorter
+      tweaks: rename a variable, to better indicate it contains two characters
+      tweaks: rename a variable, to better suit its counterpart
+      tweaks: rename a variable, to fit a bit better
+      tweaks: rename a variable, to fit a little better
+      tweaks: rename a variable, to get out of the way of the next commit
+      tweaks: rename a variable, to match another with the same meaning
+      tweaks: rename a variable, to match the style of its brothers
+      tweaks: rename four elements of the holder struct, for more contrast
+      tweaks: rename some single-letter variables to the same significant word
+      tweaks: rename three variables, to get rid of a suffix or an underscore
+      tweaks: rename three variables, to use full words instead of abbrevs
+      tweaks: rename two functions, to be simpler
+      tweaks: rename two functions, to better describe what they do
+      tweaks: rename two functions, to get rid of the "mb" abbreviation
+      tweaks: rename two more functions, to be simpler too
+      tweaks: rename two parameters, away from single letters
+      tweaks: rename two parameters, for more contrast, and elide another
+      tweaks: rename two parameters, to differentiate them from function names
+      tweaks: rename two variables, and frob some comments
+      tweaks: rename two variables, and reshuffle their declarations
+      tweaks: rename two variables, away from a single letter
+      tweaks: rename two variables, for more contrast
+      tweaks: rename two variables, for more contrast with the partition stuff
+      tweaks: rename two variables, to be less cryptic
+      tweaks: rename two variables, to be unique
+      tweaks: rename two variables, to not be abbreviations
+      tweaks: reorder some code, to further optimize display_string() for ASCII
+      tweaks: reshuffle a bit of code, to be less intertwined
+      tweaks: reshuffle a couple of lines and adjust a few comments
+      tweaks: reshuffle a few lines, to be more straightforward
+      tweaks: reshuffle a few things, partly to make two chunks more alike
+      tweaks: reshuffle an assignment, to be able to return earlier
+      tweaks: reshuffle some closing and switching to a better place
+      tweaks: reshuffle some code to the one place that needs it
+      tweaks: reshuffle some lines and frob some comments
+      tweaks: reshuffle some lines, to group things more sensibly
+      tweaks: reshuffle some lines, to put the most likely candidate first
+      tweaks: reshuffle some lines, to reduce duplication
+      tweaks: reshuffle two #ifdefs, to avoid an unpaired brace
+      tweaks: reuse the install and restore functions for a signal handler
+      tweaks: set a boolean directly, instead of using a function call
+      tweaks: set a boolean directly, instead of using a function call
+      tweaks: sort three translator names better
+      tweaks: specifically refer to the manual of GNU grep for more regex info
+      tweaks: speed up the counting of characters in mbstrlen()
+      tweaks: squeeze excess spaces out of a line in situ
+      tweaks: step away one character from the current bracket, not one byte
+      tweaks: stop allocating and freeing a holder struct for every cut/paste
+      tweaks: stop checking for a NULL result from line_from_number()
+      tweaks: stop passing 'cutbuffer' and 'cutbottom' back and forth
+      tweaks: switch to the preceding buffer in a cheaper way (when in help)
+      tweaks: use a cheaper way to switch between buffers where possible
+      tweaks: use a more direct call when a single linestruct is deleted
+      tweaks: use a slightly faster function where appropriate
+      tweaks: use a symbol instead of zero to refer to standard input
+      tweaks: use FALSE for booleans instead of zero
+      tweaks: when OR'ing, put the most likely condition first
+      usage: make the --help output independent from the terminal's tab size
+      zapping: disjoin a zap command from earlier ones when the mark is set
+      zapping: use the 'keep_cutbuffer' logic to keep undo items apart
+
+Brand Huntsman (6):
+      files: block SIGWINCH while opening a FIFO for reading or writing
+      rcfile: compile the color regexes just once
+      rcfile: fully parse a syntax file only when needed
+      rcfile: store errors and display them when nano terminates
+      startup: prevent a crash when no applicable syntax is found
+      tweaks: remove an unneeded pre-processor '#else' clause
+
+
 Changes between v4.1 and v4.2:
 ------------------------------
 

IMPROVEMENTS

@@ -2,6 +2,7 @@ Improvements in GNU nano
 ========================
 
 Since 4.0:
+  - The ability to both read from and write to a FIFO.
   - Automatic hard-wrapping is no longer the default.
   - Addition of --guidestripe to draw a helpful vertical bar.
   - Meta-Up and Meta-Down scroll the screen linewise.

NEWS

@@ -1,3 +1,11 @@
+2019.06.18 - GNU nano 4.3 "Musa Kart"
+• The ability to read from and write to a FIFO has been regained.
+• Startup time is reduced by fully parsing a syntax only when needed.
+• Asking for help (^G) when using --operatingdir does not crash.
+• The reading of a huge or slow file can be stopped with ^C.
+• Cut, zap, and copy operations are undone separately when intermixed.
+• M-D reports the correct number of lines (zero for an empty buffer).
+
 2019.04.24 - GNU nano 4.2 "Tax the rich, pay the teachers"
 • The integrated spell checker does not crash when 'spell' is missing.
 • Option --breaklonglines works also when --ignorercfiles is used.

README

@@ -15,10 +15,10 @@ Overview
 
     Nano aimed to solve these problems by: 1) being truly free software
     by using the GPL, 2) emulating the functionality of Pico as closely
-    as is reasonable, and 3) include extra functionality by default.
+    as is reasonable, and 3) including extra functionality by default.
 
-    Nowadays, nano wants to be a generally useful editor, with default
-    settings that do not change the file contents automatically.
+    Nowadays, nano wants to be a generally useful editor with sensible
+    defaults (linewise scrolling, no automatic line breaking).
 
     The nano editor is an official GNU package.  For more information on
     GNU and the Free Software Foundation, please see https://www.gnu.org/.

THANKS

@@ -11,6 +11,7 @@ Mario Blättermann <mario.blaettermann@gmail.com>      German
 Ricardo Cárdenes Medina <ricardo@conisys.com>         Spanish
 Antonio Ceballos <aceballos@gmail.com>                Spanish
 Wei-Lun CHAO <chaoweilun@pcmail.com.tw>               Chinese (traditional)
+Seong-ho Cho <darkcircle.0426@gmail.com>              Korean
 Yuri Chornoivan <yurchor@ukr.net>                     Ukrainian
 Marco Colombo <magicdice@inwind.it>                   Italian
 Mihai Cristescu <mihai.cristescu@archlinux.info>      Romanian
@@ -22,22 +23,22 @@ Rafael Fontenelle <rffontenelle@gmail.com>            Brazilian Portuguese
 Pavel Fric <pavelfric@seznam.cz>                      Czech
 Jorge González <aloriel@gmail.com>                    Spanish
 Jean-Philippe Guérard <jean-philippe.guerard@laposte.net>  French
-Geir Helland <pjallabais@users.sourceforge.net>       Norwegian Bokmål
-Tedi Heriyanto <tedi_h@gmx.net>                       Indonesian
 Václav Haisman <V.Haisman@sh.cvut.cz>                 Czech
 Takeshi Hamasaki <hmatrjp@users.sourceforge.jp>       Japanese
+Geir Helland <pjallabais@users.sourceforge.net>       Norwegian Bokmål
+Tedi Heriyanto <tedi_h@gmx.net>                       Indonesian
 Kjetil Torgrim Homme <kjetilho@linpro.no>             Norwegian Nynorsk
 Szabolcs Horvath <horvaths@janus.gimsz.sulinet.hu>    Hungarian
 Jorma Karvonen <karvonen.jorma@gmail.com>             Finnish
-Mehmet Kececi  <mkececi@mehmetkececi.com>             Turkish
+Mehmet Kececi <mkececi@mehmetkececi.com>              Turkish
 Gabor Kelemen <kelemeng@gnome.hu>                     Hungarian
 Kalle Kivimaa <kalle.kivimaa@iki.fi>                  Finnish
 Eivind Kjørstad <ekj@vestdata.no>                     Norwegian Nynorsk
 Florian König <floki@bigfoot.com>                     German
 Klemen Košir <klemen913@gmail.com>                    Slovenian
 Wojciech Kotwica <wkotwica@post.pl>                   Polish
-Ask Hjorth Larsen <asklarsen@gmail.com>               Danish
 Clement Laforet <clem_laf@wanadoo.fr>                 French
+Ask Hjorth Larsen <asklarsen@gmail.com>               Danish
 LI Daobing <lidaobing@gmail.com>                      Chinese (simplified)
 Jordi Mallach <jordi@gnu.org>                         Catalan
 João Victor Duarte Martins <jvdm@sdf.lonestar.org>    Brazilian Portuguese

autogen.sh

@@ -2,7 +2,7 @@
 # Generate configure & friends for GIT users.
 
 gnulib_url="git://git.sv.gnu.org/gnulib.git"
-gnulib_hash="91584ed612fa26a505c8fc4c7f6fb19f7413795d"
+gnulib_hash="a1beabcb14cde661c36f7a3c7c17b5871704003e"
 
 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 https://www.gnu.org/licenses/.
 
-AC_INIT([GNU nano], [4.2], [nano-devel@gnu.org], [nano])
+AC_INIT([GNU nano], [4.3], [nano-devel@gnu.org], [nano])
 AC_CONFIG_SRCDIR([src/nano.c])
 AC_CANONICAL_HOST
 AM_INIT_AUTOMAKE([1.14])

doc/faq.html

@@ -85,7 +85,7 @@
 <h3><a name="1.3"></a>1.3. Why the name change from TIP?</h3>
 <blockquote><p>On January 10, 2000, TIP was officially renamed to nano because of a namespace conflict with another program called 'tip'. The original 'tip' program &quot;establishes a full duplex terminal connection to a remote host&quot;, and was included with many older Unix systems (and newer ones like Solaris). The conflict was not noticed at first because there is no 'tip' utility included with most GNU/Linux distributions (where nano was developed).</p></blockquote>
 <h3><a name="1.4"></a>1.4. What is the current version of nano?</h3>
-<blockquote><p>The current version of nano <i>should</i> be <b>4.2</b>.  Of course, you should always check the <a href="https://nano-editor.org/">nano homepage</a> to see what the latest and greatest version is.</p></blockquote>
+<blockquote><p>The current version of nano <i>should</i> be <b>4.3</b>.  Of course, you should always check the <a href="https://nano-editor.org/">nano homepage</a> to see what the latest and greatest version is.</p></blockquote>
 <h3><a name="1.5"></a>1.5. I want to read the man page without having to download the program!</h3>
 <blockquote><p>Jeez, demanding, aren't we? Okay, look <a href="https://nano-editor.org/dist/latest/nano.1.html">here</a>.</p></blockquote>
 <hr width="100%">

doc/nano.1

@@ -16,7 +16,7 @@
 .\"   Documentation License along with this program.  If not, see
 .\"   <https://www.gnu.org/licenses/>.
 .\"
-.TH NANO 1 "version 4.2" "April 2019"
+.TH NANO 1 "version 4.3" "June 2019"
 
 .SH NAME
 nano \- Nano's ANOther editor, inspired by Pico
@@ -27,8 +27,8 @@ nano \- Nano's ANOther editor, inspired by Pico
 
 .SH NOTICE
 Starting with version 4.0, \fBnano\fR no longer hard-wraps an overlong
-line by default, uses smooth scrolling by default, and by default makes
-use of the line below the title bar.
+line by default.  It further uses smooth scrolling by default, and by
+default includes the line below the title bar into the editing area.
 .sp
 If you want the old, Pico behavior back, you can use \fB\-\-breaklonglines\fR,
 \fB\-\-jumpyscrolling\fR, and \fB\-\-emptyline\fR (or \fB\-bje\fR for short).
@@ -121,7 +121,8 @@ properly, please report a bug.  Using this option disables \fBnano\fR's
 mouse support.
 .TP
 .BR \-L ", " \-\-nonewlines
-Don't automatically add a newline when a file does not end with one.
+Don't automatically add a newline when a text does not end with one.
+(This can cause you to save non-POSIX text files.)
 .TP
 .BR \-M ", " \-\-trimblanks
 Snip trailing whitespace from the wrapped line when automatic
@@ -141,7 +142,7 @@ and place it at that position again upon reopening such a file.
 .TP
 .BR "\-Q ""\fIregex\fB""" ", " "\-\-quotestr=""" \fIregex """
 Set the regular expression for matching the quoting part of a line.
-The default value is \fB"^([\ \\t]*([!#%:;>|}]|//|\-\-))+"\fP.
+The default value is \fB"^([\ \\t]*([!#%:;>|}]|//))+"\fP.
 (Note that \fB\\t\fP stands for an actual Tab.)
 This makes it possible to rejustify blocks of quoted text when composing
 email, and to rewrap blocks of line comments when writing source code.

doc/nano.texi

@@ -8,8 +8,8 @@
 
 @smallbook
 @set EDITION 0.5
-@set VERSION 4.2
-@set UPDATED April 2019
+@set VERSION 4.3
+@set UPDATED June 2019
 
 @dircategory Editors
 @direntry
@@ -23,7 +23,7 @@
 @titlepage
 @title GNU @command{nano}
 @subtitle a small and friendly text editor
-@subtitle version 4.2
+@subtitle version 4.3
 
 @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 4.2.
+This manual documents the GNU @command{nano} editor, version 4.3.
 
 @menu
 * Introduction::
@@ -97,8 +97,8 @@ as is reasonable while offering a superset of Pico's functionality.
 Pico differ.
 
 Starting with version 4.0, @command{nano} no longer hard-wraps an overlong
-line by default, uses smooth scrolling by default, and by default makes
-use of the line below the title bar.
+line by default.  It further uses smooth scrolling by default, and by
+default includes the line below the title bar into the editing area.
 
 If you want the old, Pico behavior back, you can use the
 following options: @option{--breaklonglines},
@@ -214,7 +214,8 @@ mouse support.
 
 @item -L
 @itemx --nonewlines
-Don't automatically add a newline when a file does not end with one.
+Don't automatically add a newline when a text does not end with one.
+(This can cause you to save non-POSIX text files.)
 
 @item -M
 @itemx --trimblanks
@@ -239,7 +240,7 @@ and place it at that position again upon reopening such a file.
 @item -Q "@var{regex}"
 @itemx --quotestr="@var{regex}"
 Set the regular expression for matching the quoting part of a line.
-The default value is @t{"^([@w{ }\t]*([!#%:;>|@}]|//|--))+"}.
+The default value is @t{"^([@w{ }\t]*([!#%:;>|@}]|//))+"}.
 (Note that @code{\t} stands for a literal Tab character.)
 This makes it possible to rejustify blocks of quoted text when composing
 email, and to rewrap blocks of line comments when writing source code.
@@ -689,10 +690,8 @@ take an argument are unset by default.  So using the @code{unset} command
 is only needed when wanting to override a setting of the system's nanorc
 file in your own nanorc.  Options that take an argument cannot be unset.
 
-Quotes inside string parameters don't have to be escaped with
-backslashes.  The last double quote in the string will be treated as its
-end.  For example, for the @code{brackets} option, @t{""')>]@}"} will match
-@code{"}, @code{'}, @code{)}, @code{>}, @code{]}, and @code{@}}.
+Quotes inside the @var{characters} parameters below should not be escaped.
+The last double quote on the line will be seen as the closing quote.
 
 @menu
 * Settings::
@@ -740,7 +739,7 @@ function tags, line numbers, and selected text.  This can be overridden by
 setting the options @code{titlecolor}, @code{statuscolor}, @code{keycolor},
 @code{functioncolor}, @code{numbercolor}, and @code{selectedcolor}.
 
-@item set brackets "@var{string}"
+@item set brackets "@var{characters}"
 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
@@ -765,6 +764,7 @@ Do not use the line below the title bar, leaving it entirely blank.
 
 @item set errorcolor @var{fgcolor},@var{bgcolor}
 Use this color combination for the status bar when an error message is displayed.
+The default value is @t{brightwhite,red}.
 @xref{@code{set functioncolor}} for valid color names.
 
 @item set fill @var{number}
@@ -807,7 +807,7 @@ Display line numbers to the left of the text area.
 @item set locking
 Enable vim-style lock-files for when editing files.
 
-@item set matchbrackets "@var{string}"
+@item set matchbrackets "@var{characters}"
 Set the opening and closing brackets that can be found by bracket
 searches.  This may not include blank characters.  The opening set must
 come before the closing set, and the two sets must be in the same order.
@@ -831,7 +831,8 @@ Don't convert files from DOS/Mac format.
 Don't display the help lists at the bottom of the screen.
 
 @item set nonewlines
-Don't automatically add a newline when a file does not end with one.
+Don't automatically add a newline when a text does not end with one.
+(This can cause you to save non-POSIX text files.)
 
 @item set nopauses
 Don't pause between warnings at startup.  This means that only
@@ -858,7 +859,7 @@ The cursor position is remembered for the 200 most-recently edited files.
 @item set preserve
 Preserve the XON and XOFF keys (@kbd{^Q} and @kbd{^S}).
 
-@item set punct "@var{string}"
+@item set punct "@var{characters}"
 Set the characters treated as closing punctuation when justifying
 paragraphs.  This may not include blank characters.  Only the
 specified closing punctuation, optionally followed by closing brackets
@@ -871,7 +872,7 @@ keystroke instead of 25.  Note that @option{constantshow} overrides this.
 
 @item set quotestr "@var{regex}"
 Set the regular expression for matching the quoting part of a line.
-The default value is @t{"^([@w{ }\t]*([!#%:;>|@}]|//|--))+"}.
+The default value is @t{"^([@w{ }\t]*([!#%:;>|@}]|//))+"}.
 (Note that @code{\t} stands for a literal Tab character.)
 This makes it possible to rejustify blocks of quoted text when composing
 email, and to rewrap blocks of line comments when writing source code.
@@ -888,7 +889,8 @@ and Delete work properly.  You should only use this option when on your
 system either Backspace acts like Delete or Delete acts like Backspace.
 
 @item set regexp
-Do extended regular expression searches by default.
+Do regular-expression searches by default.
+Regular expressions in @command{nano} are of the extended type (ERE).
 
 @item set selectedcolor @var{fgcolor},@var{bgcolor}
 Use this color combination for selected text.
@@ -957,7 +959,7 @@ This mode allows the user to open also other files for viewing,
 unless @option{--restricted} is given on the command line.
 
 @anchor{Whitespace}
-@item set whitespace "@var{string}"
+@item set whitespace "@var{characters}"
 Set the two characters used to indicate the presence of tabs and
 spaces.  They must be single-column characters.  The default pair
 for a UTF-8 locale is @t{"»·"}, and for other locales @t{">."}.
@@ -966,7 +968,7 @@ for a UTF-8 locale is @t{"»·"}, and for other locales @t{">."}.
 Detect word boundaries differently by treating punctuation
 characters as part of a word.
 
-@item set wordchars "@var{string}"
+@item set wordchars "@var{characters}"
 Specify which other characters (besides the normal alphanumeric ones)
 should be considered as parts of words.  This overrides the option
 @code{wordbounds}.
@@ -987,6 +989,20 @@ powerful enough to fully parse a file.  Nevertheless, regular
 expressions can do a lot and are easy to make, so they are a
 good fit for a small editor like @command{nano}.
 
+All regular expressions in @command{nano} are extended regular expressions
+(ERE).  This means that @code{.}, @code{?}, @code{*}, @code{+}, @code{^},
+@code{$}, and several other characters are special.
+The period @code{.} matches any single character,
+@code{?} means the preceding item is optional,
+@code{*} means the preceding item may be matched zero or more times,
+@code{+} means the preceding item must be matched one or more times,
+@code{^} matches the beginning of a line, and @code{$} the end,
+@code{\<} matches the start of a word, and @code{\>} the end,
+and @code{\s} matches a blank.
+It also means that lookahead and lookbehind are not possible.
+A complete explanation can be found in the manual of GNU grep:
+@code{info grep regular}.
+
 A separate syntax can be defined for each kind of file
 via the following commands in a nanorc file:
 

doc/nanorc.5

@@ -16,15 +16,15 @@
 .\"   Documentation License along with this program.  If not, see
 .\"   <https://www.gnu.org/licenses/>.
 .\"
-.TH NANORC 5 "version 4.2" "April 2019"
+.TH NANORC 5 "version 4.3" "June 2019"
 
 .SH NAME
 nanorc \- GNU nano's configuration file
 
 .SH NOTICE
 Starting with version 4.0, \fBnano\fR no longer hard-wraps an overlong
-line by default, uses smooth scrolling by default, and by default makes
-use of the line below the title bar.
+line by default.  It further uses smooth scrolling by default, and by
+default includes the line below the title bar into the editing area.
 .sp
 If you want the old, Pico behavior back, you can use \fBset breaklonglines\fR,
 \fBset jumpyscrolling\fR, and \fBset emptyline\fR.
@@ -52,11 +52,8 @@ command is only needed when wanting to override a setting of the system's
 \fInanorc\fR file in your own \fInanorc\fR.  Options that take an
 argument cannot be unset.
 .sp
-Below, the \fIstring\fR parameters need to be enclosed in double quotes.
-Quotes inside these string parameters don't have to be escaped with
-backslashes.  The last double quote in the string will be treated as its
-end.  For example, for the \fBbrackets\fP option, "\fB"')>]}\fP" will
-match \fB"\fP, \fB'\fP, \fB)\fP, \fB>\fP, \fB]\fP, and \fB}\fP.
+Quotes inside the \fIcharacters\fR  parameters below should not be escaped.
+The last double quote on the line will be seen as the closing quote.
 .sp
 The supported commands and arguments are:
 
@@ -94,7 +91,7 @@ function tags, line numbers, and selected text.  This can be overridden by
 setting the options \fBtitlecolor\fP, \fBstatuscolor\fP, \fBkeycolor\fP,
 \fBfunctioncolor\fP, \fBnumbercolor\fP, and \fBselectedcolor\fP.
 .TP
-.B set brackets "\fIstring\fP"
+.BI "set brackets """ characters """
 Set the characters treated as closing brackets when justifying
 paragraphs.  This may not include blank characters.  Only closing
 punctuation (see \fBset punct\fP), optionally followed by the specified
@@ -118,6 +115,7 @@ Do not use the line below the title bar, leaving it entirely blank.
 .TP
 .B set errorcolor \fIfgcolor\fR,\fIbgcolor\fR
 Use this color combination for the status bar when an error message is displayed.
+The default value is \fBbrightwhite,red\fR.
 See \fBset titlecolor\fR for valid color names.
 .TP
 .B set fill \fInumber\fR
@@ -125,7 +123,7 @@ Set the target width for justifying and automatic hard-wrapping at this
 \fInumber\fR of columns.  If the value is 0 or less, wrapping will occur
 at the width of the screen minus \fInumber\fR columns, allowing the wrap
 point to vary along with the width of the screen if the screen is resized.
-The default value is \-8.
+The default value is \fB\-8\fR.
 .TP
 .B set functioncolor \fIfgcolor\fR,\fIbgcolor\fR
 Specify the color combination to use for the function descriptions
@@ -154,7 +152,7 @@ Display line numbers to the left of the text area.
 .B set locking
 Enable vim-style lock-files for when editing files.
 .TP
-.B set matchbrackets "\fIstring\fP"
+.BI "set matchbrackets """ characters """
 Set the opening and closing brackets that can be found by bracket
 searches.  This may not include blank characters.  The opening set must
 come before the closing set, and the two sets must be in the same order.
@@ -181,7 +179,8 @@ 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 when a file does not end with one.
+Don't automatically add a newline when a text does not end with one.
+(This can cause you to save non-POSIX text files.)
 .TP
 .B set nopauses
 Don't pause between warnings at startup.  This means that only
@@ -208,7 +207,7 @@ The cursor position is remembered for the 200 most-recently edited files.
 .B set preserve
 Preserve the XON and XOFF keys (^Q and ^S).
 .TP
-.B set punct "\fIstring\fP"
+.BI "set punct """ characters """
 Set the characters treated as closing punctuation when justifying
 paragraphs.  This may not include blank characters.  Only the
 specfified closing punctuation, optionally followed by closing brackets
@@ -218,9 +217,9 @@ specfified closing punctuation, optionally followed by closing brackets
 Do quick status-bar blanking: status-bar messages will disappear after 1
 keystroke instead of 25.  The option \fBconstantshow\fR overrides this.
 .TP
-.B set quotestr "\fIregex\fP"
+.BI "set quotestr """ regex """
 Set the regular expression for matching the quoting part of a line.
-The default value is "\fB^([\ \\t]*([!#%:;>|}]|//|\-\-))+\fP".
+The default value is "\fB^([\ \\t]*([!#%:;>|}]|//))+\fP".
 (Note that \fB\\t\fR stands for an actual Tab character.)
 This makes it possible to rejustify blocks of quoted text when composing
 email, and to rewrap blocks of line comments when writing source code.
@@ -237,7 +236,8 @@ and Delete work properly.  You should only use this option when on your
 system either Backspace acts like Delete or Delete acts like Backspace.
 .TP
 .B set regexp
-Do extended regular expression searches by default.
+Do regular-expression searches by default.
+Regular expressions in \fBnano\fR are of the extended type (ERE).
 .TP
 .B set selectedcolor \fIfgcolor\fR,\fIbgcolor\fR
 Specify the color combination to use for selected text.
@@ -309,7 +309,7 @@ Disallow file modification: read-only mode.
 This mode allows the user to open also other files for viewing,
 unless \fB\-\-restricted\fR is given on the command line.
 .TP
-.B set whitespace "\fIstring\fP"
+.BI "set whitespace """ characters """
 Set the two characters used to indicate the presence of tabs and
 spaces.  They must be single-column characters.  The default pair
 for a UTF-8 locale is "\fB\[Fc]\[md]\fR", and for other locales "\fB>.\fR".
@@ -318,7 +318,7 @@ for a UTF-8 locale is "\fB\[Fc]\[md]\fR", and for other locales "\fB>.\fR".
 Detect word boundaries differently by treating punctuation
 characters as parts of words.
 .TP
-.B set wordchars \fIstring\fP
+.BI "set wordchars """ characters """
 Specify which other characters (besides the normal alphanumeric ones)
 should be considered as parts of words.  This overrides the option
 \fBwordbounds\fR.
@@ -335,6 +335,20 @@ powerful enough to fully parse a file.  Nevertheless, regular
 expressions can do a lot and are easy to make, so they are a
 good fit for a small editor like \fBnano\fR.
 .sp
+All regular expressions in \fBnano\fR are extended regular expressions (ERE).
+This means that \fB.\fR, \fB?\fR, \fB*\fR, \fB+\fR, \fB^\fR, \fB$\fR, and
+several other characters are special.
+The period \fB.\fR matches any single character,
+\fB?\fR means the preceding item is optional,
+\fB*\fR means the preceding item may be matched zero or more times,
+\fB+\fR means the preceding item must be matched one or more times,
+\fB^\fR matches the beginning of a line, and \fB$\fR the end,
+\fB\\<\fR matches the start of a word, and \fB\\>\fR the end,
+and \fB\\s\fR matches a blank.
+It also means that lookahead and lookbehind are not possible.
+A complete explanation can be found in the manual page of GNU grep:
+\fBman grep\fR.
+.sp
 For each kind of file a separate syntax can be defined
 via the following commands:
 .TP

doc/rnano.1

@@ -16,7 +16,7 @@
 .\"   Documentation License along with this program.  If not, see
 .\"   <https://www.gnu.org/licenses/>.
 .\"
-.TH RNANO 1 "version 4.2" "April 2019"
+.TH RNANO 1 "version 4.3" "June 2019"
 
 .SH NAME
 rnano \- a restricted nano

doc/sample.nanorc.in

@@ -8,10 +8,8 @@
 ## For the options that take parameters, the default value is given.
 ## Other options are unset by default.
 ##
-## Quotes inside string parameters don't have to be escaped with
-## backslashes.  The last double quote in the string will be treated as
-## its end.  For example, for the "brackets" option, ""')>]}" will match
-## ", ', ), >, ], and }.
+## Inside string parameters, quotes should not be escaped.  The last
+## double quote on the line will be seen as the closing quote.
 
 ## Make the 'nextword' function (Ctrl+Right) stop at word ends
 ## instead of at beginnings.
@@ -127,7 +125,7 @@
 
 ## The regular expression that matches quoting characters in email
 ## or line-comment introducers in source code.  The default is:
-# set quotestr "^([ 	]*([!#%:;>|}]|//|--))+"
+# set quotestr "^([ 	]*([!#%:;>|}]|//))+"
 
 ## Try to work around a mismatching terminfo terminal description.
 # set rawsequences
@@ -135,7 +133,8 @@
 ## Fix Backspace/Delete confusion problem.
 # set rebinddelete
 
-## Do extended regular expression searches by default.
+## Do regular-expression searches by default.
+## Regular expressions are of the extended type (ERE).
 # set regexp
 
 ## Put the cursor on the highlighted item in the file browser, and show
@@ -239,6 +238,8 @@
 ## yellow, magenta, cyan.  For foreground colors, you may use the
 ## prefix "bright" to get a stronger highlight.
 ##
+## All regexes (regular expressions) are of the extended type (ERE).
+##
 ## To use multi-line regexes, use the start="regex" end="regex"
 ## [start="regex" end="regex"...] format.
 ##
@@ -246,8 +247,6 @@
 ## color will use a transparent color.  If you don't want this, be sure
 ## to set the background color to black or white.
 ##
-## All regexes should be extended regular expressions.
-##
 ## If you wish, you may put your syntax definitions in separate files.
 ## You can make use of such files as follows:
 ##

roll-a-release.sh

@@ -1,6 +1,6 @@
 #!/bin/bash
 
-VERSION="4.2"
+VERSION="4.3"
 
 ./configure -C --enable-tiny &&  make &&  ./configure -C &&
 

src/browser.c

@@ -77,8 +77,6 @@ char *do_browser(char *path)
 		present_name = mallocstrcpy(present_name, filelist[selected]);
 	}
 
-	assert(path != NULL && path[strlen(path) - 1] == '/');
-
 	if (dir != NULL) {
 		/* Get the file list, and set longest and width in the process. */
 		read_the_list(path, dir);
@@ -223,11 +221,9 @@ char *do_browser(char *path)
 			selected = filelist_len - 1;
 		} else if (func == goto_dir_void) {
 			/* Ask for the directory to go to. */
-			int i = do_prompt(TRUE, FALSE, MGOTODIR, NULL, NULL,
-						/* TRANSLATORS: This is a prompt. */
-						browser_refresh, _("Go To Directory"));
-
-			if (i < 0) {
+			if (do_prompt(TRUE, FALSE, MGOTODIR, NULL, NULL,
+							/* TRANSLATORS: This is a prompt. */
+							browser_refresh, _("Go To Directory")) < 0) {
 				statusbar(_("Cancelled"));
 				continue;
 			}
@@ -305,13 +301,12 @@ char *do_browser(char *path)
 		} else if (func == (functionptrtype)implant) {
 			implant(first_sc_for(MBROWSER, func)->expansion);
 #endif
-		} else if (func == do_exit) {
-			/* Exit from the file browser. */
-			break;
 #ifndef NANO_TINY
 		} else if (kbinput == KEY_WINCH) {
-			;
+			;  /* Nothing to do. */
 #endif
+		} else if (func == do_exit) {
+			break;
 		} else
 			unbound_key(kbinput);
 
@@ -394,8 +389,6 @@ void read_the_list(const char *path, DIR *dir)
 	const struct dirent *nextdir;
 	size_t i = 0, path_len = strlen(path);
 
-	assert(path != NULL && path[strlen(path) - 1] == '/' && dir != NULL);
-
 	longest = 0;
 
 	/* Find the length of the longest filename in the current folder. */
@@ -445,8 +438,6 @@ void read_the_list(const char *path, DIR *dir)
 	 * filelist, so record it. */
 	filelist_len = i;
 
-	assert(filelist != NULL);
-
 	/* Sort the list of names. */
 	qsort(filelist, filelist_len, sizeof(char *), diralphasort);
 

src/chars.c

@@ -70,7 +70,7 @@ bool is_alpha_mbchar(const char *c)
 		wchar_t wc;
 
 		if (mbtowc(&wc, c, MAXCHARLEN) < 0)
-			return 0;
+			return FALSE;
 
 		return iswalpha(wc);
 	} else
@@ -86,7 +86,7 @@ bool is_alnum_mbchar(const char *c)
 		wchar_t wc;
 
 		if (mbtowc(&wc, c, MAXCHARLEN) < 0)
-			return 0;
+			return FALSE;
 
 		return iswalnum(wc);
 	} else
@@ -102,7 +102,7 @@ bool is_blank_mbchar(const char *c)
 		wchar_t wc;
 
 		if (mbtowc(&wc, c, MAXCHARLEN) < 0)
-			return 0;
+			return FALSE;
 
 		return iswblank(wc);
 	} else
@@ -139,7 +139,7 @@ bool is_punct_mbchar(const char *c)
 		wchar_t wc;
 
 		if (mbtowc(&wc, c, MAXCHARLEN) < 0)
-			return 0;
+			return FALSE;
 
 		return iswpunct(wc);
 	} else
@@ -200,36 +200,6 @@ char control_mbrep(const char *c, bool isdata)
 		return control_rep(*c);
 }
 
-/* Assess how many bytes the given (multibyte) character occupies.  Return -1
- * if the byte sequence is invalid, and return the number of bytes minus 8
- * when it encodes an invalid codepoint.  Also, in the second parameter,
- * return the number of columns that the character occupies. */
-int length_of_char(const char *c, int *width)
-{
-#ifdef ENABLE_UTF8
-	if (use_utf8) {
-		wchar_t wc;
-		int charlen = mbtowc(&wc, c, MAXCHARLEN);
-
-		/* If the sequence is invalid... */
-		if (charlen < 0)
-			return -1;
-
-		/* If the codepoint is invalid... */
-		if (!is_valid_unicode(wc))
-			return charlen - 8;
-		else {
-			*width = wcwidth(wc);
-			/* If the codepoint is unassigned, assume a width of one. */
-			if (*width < 0)
-				*width = 1;
-			return charlen;
-		}
-	} else
-#endif
-		return 1;
-}
-
 /* This function is equivalent to wcwidth() for multibyte characters. */
 int mbwidth(const char *c)
 {
@@ -280,6 +250,20 @@ char *make_mbchar(long chr, int *chr_mb_len)
 	return chr_mb;
 }
 
+/* Return the length (in bytes) of the character located at *pointer. */
+int char_length(const char *pointer)
+{
+#ifdef ENABLE_UTF8
+	/* If possibly a multibyte character, get its length; otherwise, it's 1. */
+	if ((signed char)*pointer < 0) {
+		int length = mblen(pointer, MAXCHARLEN);
+
+		return (length < 0 ? 1 : length);
+	} else
+#endif
+		return 1;
+}
+
 /* Parse a multibyte character from buf.  Return the number of bytes
  * used.  If chr isn't NULL, store the multibyte character in it.  If
  * col isn't NULL, add the character's width (in columns) to it. */
@@ -328,11 +312,11 @@ int parse_mbchar(const char *buf, char *chr, size_t *col)
 
 /* Return the index in buf of the beginning of the multibyte character
  * before the one at pos. */
-size_t move_mbleft(const char *buf, size_t pos)
+size_t step_left(const char *buf, size_t pos)
 {
 #ifdef ENABLE_UTF8
 	if (use_utf8) {
-		size_t before, char_len = 0;
+		size_t before, charlen = 0;
 
 		if (pos < 4)
 			before = 0;
@@ -355,11 +339,11 @@ size_t move_mbleft(const char *buf, size_t pos)
 		/* Move forward again until we reach the original character,
 		 * so we know the length of its preceding character. */
 		while (before < pos) {
-			char_len = parse_mbchar(buf + before, NULL, NULL);
-			before += char_len;
+			charlen = char_length(buf + before);
+			before += charlen;
 		}
 
-		return before - char_len;
+		return before - charlen;
 	} else
 #endif
 	return (pos == 0 ? 0 : pos - 1);
@@ -367,9 +351,9 @@ size_t move_mbleft(const char *buf, size_t pos)
 
 /* Return the index in buf of the beginning of the multibyte character
  * after the one at pos. */
-size_t move_mbright(const char *buf, size_t pos)
+size_t step_right(const char *buf, size_t pos)
 {
-	return pos + parse_mbchar(buf + pos, NULL, NULL);
+	return pos + char_length(buf + pos);
 }
 
 /* This function is equivalent to strcasecmp() for multibyte strings. */
@@ -402,8 +386,8 @@ int mbstrncasecmp(const char *s1, const char *s2, size_t n)
 					return difference;
 			}
 
-			s1 += move_mbright(s1, 0);
-			s2 += move_mbright(s2, 0);
+			s1 += char_length(s1);
+			s2 += char_length(s2);
 			n--;
 		}
 
@@ -424,13 +408,13 @@ char *mbstrcasestr(const char *haystack, const char *needle)
 			if (mbstrncasecmp(haystack, needle, needle_len) == 0)
 				return (char *)haystack;
 
-			haystack += move_mbright(haystack, 0);
+			haystack += char_length(haystack);
 		}
 
 		return NULL;
 	} else
 #endif
-		return (char *) strcasestr(haystack, needle);
+		return (char *)strcasestr(haystack, needle);
 }
 
 /* This function is equivalent to strstr(), except in that it scans the
@@ -496,7 +480,7 @@ char *mbrevstrcasestr(const char *haystack, const char *needle,
 			if (pointer == haystack)
 				return NULL;
 
-			pointer = haystack + move_mbleft(haystack, pointer - haystack);
+			pointer = haystack + step_left(haystack, pointer - haystack);
 		}
 	} else
 #endif
@@ -504,70 +488,61 @@ char *mbrevstrcasestr(const char *haystack, const char *needle,
 }
 
 /* Count the number of (multibyte) characters in the given string. */
-size_t mbstrlen(const char *s)
+size_t mbstrlen(const char *pointer)
 {
-	size_t maxlen = (size_t)-1;
+	size_t count = 0;
 
+	while (*pointer != '\0') {
 #ifdef ENABLE_UTF8
-	if (use_utf8) {
-		size_t n = 0;
+		if ((signed char)*pointer < 0) {
+			int length = mblen(pointer, MAXCHARLEN);
 
-		while (*s != '\0' && maxlen > 0) {
-			if ((signed char)*s < 0) {
-				int length = mblen(s, MAXCHARLEN);
-
-				s += (length < 0 ? 1 : length);
-			} else
-				s++;
-
-			maxlen--;
-			n++;
-		}
-
-		return n;
-	} else
+			pointer += (length < 0 ? 1 : length);
+		} else
 #endif
-		return strnlen(s, maxlen);
+			pointer++;
+
+		count++;
+	}
+
+	return count;
 }
 
 #if !defined(NANO_TINY) || defined(ENABLE_JUSTIFY)
 /* This function is equivalent to strchr() for multibyte strings. */
-char *mbstrchr(const char *s, const char *c)
+char *mbstrchr(const char *string, const char *chr)
 {
 #ifdef ENABLE_UTF8
 	if (use_utf8) {
-		bool bad_s_mb = FALSE, bad_c_mb = FALSE;
-		char symbol[MAXCHARLEN];
-		const char *q = s;
+		bool bad_s = FALSE, bad_c = FALSE;
 		wchar_t ws, wc;
 
-		if (mbtowc(&wc, c, MAXCHARLEN) < 0) {
-			wc = (unsigned char)*c;
-			bad_c_mb = TRUE;
+		if (mbtowc(&wc, chr, MAXCHARLEN) < 0) {
+			wc = (unsigned char)*chr;
+			bad_c = TRUE;
 		}
 
-		while (*s != '\0') {
-			int sym_len = parse_mbchar(s, symbol, NULL);
+		while (*string != '\0') {
+			int symlen = mbtowc(&ws, string, MAXCHARLEN);
 
-			if (mbtowc(&ws, symbol, sym_len) < 0) {
-				ws = (unsigned char)*s;
-				bad_s_mb = TRUE;
+			if (symlen < 0) {
+				ws = (unsigned char)*string;
+				bad_s = TRUE;
 			}
 
-			if (bad_s_mb == bad_c_mb && ws == wc)
+			if (ws == wc && bad_s == bad_c)
 				break;
 
-			s += sym_len;
-			q += sym_len;
+			string += symlen;
 		}
 
-		if (*s == '\0')
-			q = NULL;
+		if (*string == '\0')
+			return NULL;
 
-		return (char *)q;
+		return (char *)string;
 	} else
 #endif
-		return (char *) strchr(s, *c);
+		return strchr(string, *chr);
 }
 #endif /* !NANO_TINY || ENABLE_JUSTIFY */
 
@@ -580,7 +555,7 @@ char *mbstrpbrk(const char *string, const char *accept)
 		if (mbstrchr(accept, string) != NULL)
 			return (char *)string;
 
-		string += move_mbright(string, 0);
+		string += char_length(string);
 	}
 
 	return NULL;
@@ -593,7 +568,7 @@ char *mbrevstrpbrk(const char *head, const char *accept, const char *pointer)
 	if (*pointer == '\0') {
 		if (pointer == head)
 			return NULL;
-		pointer = head + move_mbleft(head, pointer - head);
+		pointer = head + step_left(head, pointer - head);
 	}
 
 	while (TRUE) {
@@ -604,7 +579,7 @@ char *mbrevstrpbrk(const char *head, const char *accept, const char *pointer)
 		if (pointer == head)
 			return NULL;
 
-		pointer = head + move_mbleft(head, pointer - head);
+		pointer = head + step_left(head, pointer - head);
 	}
 }
 #endif /* !NANO_TINY */

src/color.c

@@ -39,11 +39,34 @@
 #define A_BANDAID  A_NORMAL
 #endif
 
+/* Assign pair numbers for the colors in the given syntax, giving identical
+ * color pairs the same number. */
+void set_syntax_colorpairs(syntaxtype *sint)
+{
+	int new_number = NUMBER_OF_ELEMENTS + 1;
+	colortype *ink;
+
+	for (ink = sint->color; ink != NULL; ink = ink->next) {
+		const colortype *beforenow = sint->color;
+
+		while (beforenow != ink && (beforenow->fg != ink->fg ||
+									beforenow->bg != ink->bg))
+			beforenow = beforenow->next;
+
+		if (beforenow != ink)
+			ink->pairnum = beforenow->pairnum;
+		else
+			ink->pairnum = new_number++;
+
+		ink->attributes |= COLOR_PAIR(ink->pairnum) | A_BANDAID;
+	}
+}
+
 /* Initialize the colors for nano's interface, and assign pair numbers
- * for the colors in each syntax. */
+ * for the colors in each loaded syntax. */
 void set_colorpairs(void)
 {
-	const syntaxtype *sint;
+	syntaxtype *sint;
 	bool using_defaults = FALSE;
 	size_t i;
 
@@ -82,27 +105,10 @@ void set_colorpairs(void)
 		free(color_combo[i]);
 	}
 
-	/* For each syntax, go through its list of colors and assign each
-	 * its pair number, giving identical color pairs the same number. */
-	for (sint = syntaxes; sint != NULL; sint = sint->next) {
-		colortype *ink;
-		int new_number = NUMBER_OF_ELEMENTS + 1;
-
-		for (ink = sint->color; ink != NULL; ink = ink->next) {
-			const colortype *beforenow = sint->color;
-
-			while (beforenow != ink && (beforenow->fg != ink->fg ||
-										beforenow->bg != ink->bg))
-				beforenow = beforenow->next;
-
-			if (beforenow != ink)
-				ink->pairnum = beforenow->pairnum;
-			else
-				ink->pairnum = new_number++;
-
-			ink->attributes |= COLOR_PAIR(ink->pairnum) | A_BANDAID;
-		}
-	}
+	/* For each loaded syntax, assign pair numbers to color combinations. */
+	for (sint = syntaxes; sint != NULL; sint = sint->next)
+		if (sint->filename == NULL)
+			set_syntax_colorpairs(sint);
 }
 
 /* Initialize the color information. */
@@ -163,7 +169,6 @@ bool found_in_list(regexlisttype *head, const char *shibboleth)
 void color_update(void)
 {
 	syntaxtype *sint = NULL;
-	colortype *ink;
 
 	/* If the rcfiles were not read, or contained no syntaxes, get out. */
 	if (syntaxes == NULL)
@@ -267,22 +272,14 @@ void color_update(void)
 		}
 	}
 
+	/* When the syntax isn't loaded yet, parse it and initialize its colors. */
+	if (sint != NULL && sint->filename != NULL) {
+		parse_one_include(sint->filename, sint);
+		set_syntax_colorpairs(sint);
+	}
+
 	openfile->syntax = sint;
 	openfile->colorstrings = (sint == NULL ? NULL : sint->color);
-
-	/* If a syntax was found, compile its specified regexes (which have
-	 * already been checked for validity when they were read in). */
-	for (ink = openfile->colorstrings; ink != NULL; ink = ink->next) {
-		if (ink->start == NULL) {
-			ink->start = (regex_t *)nmalloc(sizeof(regex_t));
-			regcomp(ink->start, ink->start_regex, ink->rex_flags);
-		}
-
-		if (ink->end_regex != NULL && ink->end == NULL) {
-			ink->end = (regex_t *)nmalloc(sizeof(regex_t));
-			regcomp(ink->end, ink->end_regex, ink->rex_flags);
-		}
-	}
 }
 
 /* Determine whether the matches of multiline regexes are still the same,
@@ -334,12 +331,10 @@ void check_the_multis(linestruct *line)
 /* Allocate (for one line) the cache space for multiline color regexes. */
 void alloc_multidata_if_needed(linestruct *fileptr)
 {
-	int i;
-
 	if (fileptr->multidata == NULL) {
 		fileptr->multidata = (short *)nmalloc(openfile->syntax->nmultis * sizeof(short));
 
-		for (i = 0; i < openfile->syntax->nmultis; i++)
+		for (int i = 0; i < openfile->syntax->nmultis; i++)
 			fileptr->multidata[i] = -1;
 	}
 }
@@ -355,10 +350,6 @@ void precalc_multicolorinfo(void)
 	if (openfile->colorstrings == NULL || ISSET(NO_COLOR_SYNTAX))
 		return;
 
-#ifdef DEBUG
-	fprintf(stderr, "Precalculating the multiline color info...\n");
-#endif
-
 	for (ink = openfile->colorstrings; ink != NULL; ink = ink->next) {
 		/* If this is not a multi-line regex, skip it. */
 		if (ink->end == NULL)
@@ -380,14 +371,14 @@ void precalc_multicolorinfo(void)
 			/* When the line contains a start match, look for an end, and if
 			 * found, mark all the lines that are affected. */
 			while (regexec(ink->start, line->data + index, 1,
-						&startmatch, (index == 0) ? 0 : REG_NOTBOL) == 0) {
+							&startmatch, (index == 0) ? 0 : REG_NOTBOL) == 0) {
 				/* Begin looking for an end match after the start match. */
 				index += startmatch.rm_eo;
 
 				/* If there is an end match on this line, mark the line, but
 				 * continue looking for other starts after it. */
 				if (regexec(ink->end, line->data + index, 1,
-						&endmatch, (index == 0) ? 0 : REG_NOTBOL) == 0) {
+							&endmatch, (index == 0) ? 0 : REG_NOTBOL) == 0) {
 					line->multidata[ink->id] = CSTARTENDHERE;
 					index += endmatch.rm_eo;
 					/* If both start and end are mere anchors, step ahead. */
@@ -396,7 +387,7 @@ void precalc_multicolorinfo(void)
 						/* When at end-of-line, we're done. */
 						if (line->data[index] == '\0')
 							break;
-						index = move_mbright(line->data, index);
+						index = step_right(line->data, index);
 					}
 					continue;
 				}

src/cut.c

@@ -35,10 +35,8 @@ void do_deletion(undo_type action)
 
 	/* When in the middle of a line, delete the current character. */
 	if (openfile->current->data[openfile->current_x] != '\0') {
-		int char_len = parse_mbchar(openfile->current->data +
-										openfile->current_x, NULL, NULL);
-		size_t line_len = strlen(openfile->current->data +
-										openfile->current_x);
+		int charlen = char_length(openfile->current->data + openfile->current_x);
+		size_t line_len = strlen(openfile->current->data + openfile->current_x);
 #ifndef NANO_TINY
 		/* If the type of action changed or the cursor moved to a different
 		 * line, create a new undo item, otherwise update the existing item. */
@@ -53,13 +51,13 @@ void do_deletion(undo_type action)
 #endif
 		/* Move the remainder of the line "in", over the current character. */
 		charmove(&openfile->current->data[openfile->current_x],
-					&openfile->current->data[openfile->current_x + char_len],
-					line_len - char_len + 1);
+					&openfile->current->data[openfile->current_x + charlen],
+					line_len - charlen + 1);
 #ifndef NANO_TINY
 		/* Adjust the mark if it is after the cursor on the current line. */
 		if (openfile->mark == openfile->current &&
 								openfile->mark_x > openfile->current_x)
-			openfile->mark_x -= char_len;
+			openfile->mark_x -= charlen;
 #endif
 	/* Otherwise, when not at end of buffer, join this line with the next. */
 	} else if (openfile->current != openfile->filebot) {
@@ -91,7 +89,7 @@ void do_deletion(undo_type action)
 		}
 #endif
 		unlink_node(joining);
-		renumber(openfile->current);
+		renumber_from(openfile->current);
 
 		/* Two lines were joined, so we need to refresh the screen. */
 		refresh_needed = TRUE;
@@ -148,12 +146,10 @@ void chop_word(bool forward)
 	/* Remember the current cursor position. */
 	linestruct *is_current = openfile->current;
 	size_t is_current_x = openfile->current_x;
-
-	/* Remember where the cutbuffer is and then make it seem blank. */
+	/* Remember where the cutbuffer is, then make it seem blank. */
 	linestruct *is_cutbuffer = cutbuffer;
-	linestruct *is_cutbottom = cutbottom;
+
 	cutbuffer = NULL;
-	cutbottom = NULL;
 
 	/* Move the cursor to a word start, to the left or to the right.
 	 * If that word is on another line and the cursor was not already
@@ -186,12 +182,11 @@ void chop_word(bool forward)
 	openfile->current_x = is_current_x;
 
 	/* Now kill the marked region and a word is gone. */
-	do_cut_text_void();
+	cut_text();
 
 	/* Discard the cut word and restore the cutbuffer. */
 	free_lines(cutbuffer);
 	cutbuffer = is_cutbuffer;
-	cutbottom = is_cutbottom;
 }
 
 /* Delete a word leftward. */
@@ -203,6 +198,8 @@ void chop_previous_word(void)
 /* Delete a word rightward. */
 void chop_next_word(void)
 {
+	openfile->mark = NULL;
+
 	if (is_cuttable(openfile->current_x > 0))
 		chop_word(FORWARD);
 }
@@ -215,28 +212,15 @@ void cut_line(void)
 	 * head of this line to the head of the next line into the cutbuffer;
 	 * otherwise, move all of the text of this line into the cutbuffer. */
 	if (openfile->current != openfile->filebot)
-		extract_buffer(&cutbuffer, &cutbottom, openfile->current, 0,
-				openfile->current->next, 0);
+		extract(openfile->current, 0, openfile->current->next, 0);
 	else
-		extract_buffer(&cutbuffer, &cutbottom, openfile->current, 0,
+		extract(openfile->current, 0,
 				openfile->current, strlen(openfile->current->data));
+
 	openfile->placewewant = 0;
 }
 
 #ifndef NANO_TINY
-/* Move all marked text from the current buffer into the cutbuffer. */
-void cut_marked(bool *right_side_up)
-{
-	linestruct *top, *bot;
-	size_t top_x, bot_x;
-
-	mark_order((const linestruct **)&top, &top_x,
-				(const linestruct **)&bot, &bot_x, right_side_up);
-
-	extract_buffer(&cutbuffer, &cutbottom, top, top_x, bot, bot_x);
-	openfile->placewewant = xplustabs();
-}
-
 /* Move all text from the cursor position until the end of this line into
  * the cutbuffer.  But when already at the end of a line, then move this
  * "newline" to the cutbuffer. */
@@ -248,35 +232,48 @@ void cut_to_eol(void)
 	 * the cutbuffer.  Otherwise, when not at the end of the buffer,
 	 * move the line separation into the cutbuffer. */
 	if (openfile->current_x < data_len)
-		extract_buffer(&cutbuffer, &cutbottom, openfile->current,
-				openfile->current_x, openfile->current, data_len);
+		extract(openfile->current, openfile->current_x,
+				openfile->current, data_len);
 	else if (openfile->current != openfile->filebot) {
-		extract_buffer(&cutbuffer, &cutbottom, openfile->current,
-				openfile->current_x, openfile->current->next, 0);
+		extract(openfile->current, openfile->current_x,
+				openfile->current->next, 0);
 		openfile->placewewant = xplustabs();
 	}
 }
 
+/* Move all marked text from the current buffer into the cutbuffer. */
+void cut_marked(bool *right_side_up)
+{
+	linestruct *top, *bot;
+	size_t top_x, bot_x;
+
+	get_region((const linestruct **)&top, &top_x,
+				(const linestruct **)&bot, &bot_x, right_side_up);
+
+	extract(top, top_x, bot, bot_x);
+
+	openfile->placewewant = xplustabs();
+}
+
 /* Move all text from the cursor position to end-of-file into the cutbuffer. */
 void cut_to_eof(void)
 {
-	extract_buffer(&cutbuffer, &cutbottom,
-				openfile->current, openfile->current_x,
+	extract(openfile->current, openfile->current_x,
 				openfile->filebot, strlen(openfile->filebot->data));
 }
 #endif /* !NANO_TINY */
 
 /* Move text from the current buffer into the cutbuffer.  If
- * copy_text is TRUE, copy the text back into the buffer afterward.
- * If cut_till_eof is TRUE, move all text from the current cursor
+ * copying is TRUE, copy the text back into the buffer afterward.
+ * If until_eof is TRUE, move all text from the current cursor
  * position to the end of the file into the cutbuffer.  If append
  * is TRUE (when zapping), always append the cut to the cutbuffer. */
-void do_cut_text(bool copy_text, bool marked, bool cut_till_eof, bool append)
+void do_cut_text(bool copying, bool marked, bool until_eof, bool append)
 {
 #ifndef NANO_TINY
-	linestruct *cb_save = NULL;
+	linestruct *was_bottom = NULL;
 		/* The current end of the cutbuffer, before we add text to it. */
-	size_t cb_save_len = 0;
+	size_t botlen = 0;
 		/* The length of the string at the current end of the cutbuffer,
 		 * before we add text to it. */
 	bool using_magicline = !ISSET(NO_NEWLINES);
@@ -284,51 +281,52 @@ void do_cut_text(bool copy_text, bool marked, bool cut_till_eof, bool append)
 	bool right_side_up = TRUE;
 		/* There *is* no region, *or* it is marked forward. */
 #endif
+	static bool precedent = FALSE;
+		/* Whether the previous operation was a copying operation. */
 
 	/* If cuts were not continuous, or when cutting a region, clear the slate. */
-	if (!append && (!keep_cutbuffer || marked || cut_till_eof)) {
+	if ((!keep_cutbuffer || marked || until_eof || copying != precedent) &&
+				!append) {
 		free_lines(cutbuffer);
 		cutbuffer = NULL;
-		/* After a line cut, future line cuts should add to the cutbuffer. */
-		keep_cutbuffer = !marked && !cut_till_eof;
 	}
 
+	/* After a line operation, future ones should add to the cutbuffer. */
+	keep_cutbuffer = !marked && !until_eof;
+	precedent = copying;
+
 #ifndef NANO_TINY
-	if (copy_text) {
+	if (copying) {
 		/* If the cutbuffer isn't empty, remember where it currently ends. */
 		if (cutbuffer != NULL) {
-			cb_save = cutbottom;
-			cb_save_len = strlen(cutbottom->data);
+			was_bottom = cutbottom;
+			botlen = strlen(cutbottom->data);
 		}
 		/* Don't add a magic line when moving text to the cutbuffer. */
 		SET(NO_NEWLINES);
 	}
 
-	if (cut_till_eof) {
-		/* Move all text up to the end of the file into the cutbuffer. */
+	/* Now move the relevant piece of text into the cutbuffer. */
+	if (until_eof)
 		cut_to_eof();
-	} else if (openfile->mark) {
-		/* Move the marked text to the cutbuffer, and turn the mark off. */
+	else if (openfile->mark) {
 		cut_marked(&right_side_up);
 		openfile->mark = NULL;
 	} else if (ISSET(CUT_FROM_CURSOR))
-		/* Move all text up to the end of the line into the cutbuffer. */
 		cut_to_eol();
 	else
 #endif
-		/* Move the entire line into the cutbuffer. */
 		cut_line();
 
 #ifndef NANO_TINY
-	if (copy_text) {
-		/* Copy the text that is in the cutbuffer (starting at its saved end,
-		 * if there is one) back into the current buffer.  This effectively
-		 * uncuts the text we just cut. */
+	if (copying) {
+		/* Copy the text that was put into the cutbuffer back into the current
+		 * file buffer, so that in the end nothing has been deleted. */
 		if (cutbuffer != NULL) {
-			if (cb_save != NULL) {
-				cb_save->data += cb_save_len;
-				copy_from_buffer(cb_save);
-				cb_save->data -= cb_save_len;
+			if (was_bottom != NULL) {
+				was_bottom->data += botlen;
+				copy_from_buffer(was_bottom);
+				was_bottom->data -= botlen;
 			} else
 				copy_from_buffer(cutbuffer);
 
@@ -341,9 +339,9 @@ void do_cut_text(bool copy_text, bool marked, bool cut_till_eof, bool append)
 		if (using_magicline)
 			UNSET(NO_NEWLINES);
 	} else
-#endif /* !NANO_TINY */
+#endif
+		set_modified();
 
-	set_modified();
 	refresh_needed = TRUE;
 }
 
@@ -372,7 +370,7 @@ bool is_cuttable(bool test_cliff)
 }
 
 /* Move text from the current buffer into the cutbuffer. */
-void do_cut_text_void(void)
+void cut_text(void)
 {
 #ifndef NANO_TINY
 	if (!is_cuttable(ISSET(CUT_FROM_CURSOR) && openfile->mark == NULL))
@@ -380,11 +378,13 @@ void do_cut_text_void(void)
 
 	/* Only add a new undo item when the current item is not a CUT or when
 	 * the current cut is not contiguous with the previous cutting. */
-	if (openfile->last_action != CUT || openfile->current_undo == NULL ||
-			openfile->current_undo->mark_begin_lineno != openfile->current->lineno ||
-			!keep_cutbuffer)
+	if (openfile->last_action != CUT || !keep_cutbuffer) {
+		keep_cutbuffer = FALSE;
 		add_undo(CUT);
+	}
+
 	do_cut_text(FALSE, openfile->mark != NULL, FALSE, FALSE);
+
 	update_undo(CUT);
 #else
 	if (is_cuttable(FALSE))
@@ -396,9 +396,8 @@ void do_cut_text_void(void)
 /* Move text from the current buffer into the cutbuffer, and copy it
  * back into the buffer afterward.  If the mark is set or the cursor
  * was moved, blow away previous contents of the cutbuffer. */
-void do_copy_text(void)
+void copy_text(void)
 {
-	static linestruct *next_contiguous_line = NULL;
 	bool mark_is_set = (openfile->mark != NULL);
 
 	/* Remember the current viewport and cursor position. */
@@ -407,25 +406,26 @@ void do_copy_text(void)
 	ssize_t is_current_lineno = openfile->current->lineno;
 	size_t is_current_x = openfile->current_x;
 
-	if (mark_is_set || openfile->current != next_contiguous_line)
-		keep_cutbuffer = FALSE;
+	/* If there is nothing to copy, don't even try. */
+	if (openfile->current->next == NULL && openfile->current->data[0] == '\0')
+		return;
 
 	do_cut_text(TRUE, mark_is_set, FALSE, FALSE);
 
-	/* If the mark was set, blow away the cutbuffer on the next copy. */
-	next_contiguous_line = (mark_is_set ? NULL : openfile->current);
-
 	/* If the mark was set, restore the viewport and cursor position. */
 	if (mark_is_set) {
-		openfile->edittop = fsfromline(is_edittop_lineno);
+		openfile->edittop = line_from_number(is_edittop_lineno);
 		openfile->firstcolumn = is_firstcolumn;
-		openfile->current = fsfromline(is_current_lineno);
+		openfile->current = line_from_number(is_current_lineno);
 		openfile->current_x = is_current_x;
-	}
+	} else
+		focusing = FALSE;
+
+	openfile->last_action = OTHER;
 }
 
 /* Cut from the current cursor position to the end of the file. */
-void do_cut_till_eof(void)
+void cut_till_eof(void)
 {
 	if ((openfile->current == openfile->filebot && openfile->current->data[0] == '\0') ||
 				(!ISSET(NO_NEWLINES) && openfile->current->next == openfile->filebot &&
@@ -444,33 +444,28 @@ void zap_text(void)
 {
 	/* Remember the current cutbuffer so it can be restored after the zap. */
 	linestruct *was_cutbuffer = cutbuffer;
-	linestruct *was_cutbottom = cutbottom;
 
 	if (!is_cuttable(ISSET(CUT_FROM_CURSOR) && openfile->mark == NULL))
 		return;
 
 	/* Add a new undo item only when the current item is not a ZAP or when
 	 * the current zap is not contiguous with the previous zapping. */
-	if (openfile->last_action != ZAP || openfile->current_undo == NULL ||
-			openfile->current_undo->mark_begin_lineno != openfile->current->lineno ||
-			openfile->current_undo->xflags & (MARK_WAS_SET|WAS_MARKED_FORWARD))
+	if (openfile->last_action != ZAP || !keep_cutbuffer)
 		add_undo(ZAP);
 
 	/* Use the cutbuffer from the ZAP undo item, so the cut can be undone. */
 	cutbuffer = openfile->current_undo->cutbuffer;
-	cutbottom = openfile->current_undo->cutbottom;
 
 	do_cut_text(FALSE, openfile->mark != NULL, FALSE, TRUE);
 
 	update_undo(ZAP);
 
 	cutbuffer = was_cutbuffer;
-	cutbottom = was_cutbottom;
 }
 #endif /* !NANO_TINY */
 
 /* Copy text from the cutbuffer into the current buffer. */
-void do_uncut_text(void)
+void paste_text(void)
 {
 	ssize_t was_lineno = openfile->current->lineno;
 		/* The line number where we started the paste. */

src/files.c

@@ -88,11 +88,19 @@ void make_new_buffer(void)
 
 	openfile->filename = mallocstrcpy(NULL, "");
 
-	initialize_buffer_text();
+	openfile->filetop = make_new_node(NULL);
+	openfile->filetop->data = mallocstrcpy(NULL, "");
+	openfile->filebot = openfile->filetop;
 
+	openfile->current = openfile->filetop;
+	openfile->current_x = 0;
 	openfile->placewewant = 0;
 	openfile->current_y = 0;
 
+	openfile->edittop = openfile->filetop;
+	openfile->firstcolumn = 0;
+
+	openfile->totsize = 0;
 	openfile->modified = FALSE;
 #ifdef ENABLE_WRAPPING
 	openfile->spillage_line = NULL;
@@ -116,21 +124,6 @@ void make_new_buffer(void)
 #endif
 }
 
-/* Initialize the text and pointers of the current openfile struct. */
-void initialize_buffer_text(void)
-{
-	openfile->filetop = make_new_node(NULL);
-	openfile->filetop->data = mallocstrcpy(NULL, "");
-
-	openfile->filebot = openfile->filetop;
-	openfile->edittop = openfile->filetop;
-	openfile->current = openfile->filetop;
-
-	openfile->firstcolumn = 0;
-	openfile->current_x = 0;
-	openfile->totsize = 0;
-}
-
 /* Mark the current file as modified if it isn't already, and then
  * update the titlebar to display the file's new status. */
 void set_modified(void)
@@ -273,7 +266,7 @@ int write_lockfile(const char *lockfilename, const char *origfilename, bool modi
 		goto free_the_data;
 	}
 
-	openfile->lock_filename = (char *) lockfilename;
+	openfile->lock_filename = (char *)lockfilename;
 
 	free(lockdata);
 	return 1;
@@ -302,8 +295,8 @@ int delete_lockfile(const char *lockfilename)
  * creating the lockfile but we should continue to load the file. */
 int do_lockfile(const char *filename)
 {
-	char *namecopy = (char *) mallocstrcpy(NULL, filename);
-	char *secondcopy = (char *) mallocstrcpy(NULL, filename);
+	char *namecopy = mallocstrcpy(NULL, filename);
+	char *secondcopy = mallocstrcpy(NULL, filename);
 	size_t locknamesize = strlen(filename) + strlen(locking_prefix)
 				+ strlen(locking_suffix) + 3;
 	char *lockfilename = charalloc(locknamesize);
@@ -418,6 +411,7 @@ bool open_buffer(const char *filename, bool new_buffer)
 {
 	char *realname;
 		/* The filename after tilde expansion. */
+	struct stat fileinfo;
 	FILE *f;
 	int rc;
 		/* rc == -2 means that we have a new file.  -1 means that the
@@ -436,20 +430,25 @@ bool open_buffer(const char *filename, bool new_buffer)
 
 	realname = real_dir_from_tilde(filename);
 
-	/* When the specified filename is not empty, and the corresponding
-	 * file exists, verify that it is a normal file. */
-	if (*filename != '\0') {
-		struct stat fileinfo;
-
-		if (stat(realname, &fileinfo) == 0 && !(S_ISREG(fileinfo.st_mode) ||
-					(ISSET(NOREAD_MODE) && S_ISFIFO(fileinfo.st_mode)))) {
-			if (S_ISDIR(fileinfo.st_mode))
-				statusline(ALERT, _("\"%s\" is a directory"), realname);
-			else
-				statusline(ALERT, _("\"%s\" is not a normal file"), realname);
+	/* Don't try to open directories, character files, or block files. */
+	if (*filename != '\0' && stat(realname, &fileinfo) == 0) {
+		if (S_ISDIR(fileinfo.st_mode)) {
+			statusline(ALERT, _("\"%s\" is a directory"), realname);
 			free(realname);
 			return FALSE;
 		}
+		if (S_ISCHR(fileinfo.st_mode) || S_ISBLK(fileinfo.st_mode)) {
+			statusline(ALERT, _("\"%s\" is a device file"), realname);
+			free(realname);
+			return FALSE;
+		}
+#ifdef NANO_TINY
+		if (S_ISFIFO(fileinfo.st_mode)) {
+			statusline(ALERT, _("\"%s\" is a FIFO"), realname);
+			free(realname);
+			return FALSE;
+		}
+#endif
 	}
 
 	/* If we're going to load into a new buffer, first create the new
@@ -457,13 +456,14 @@ bool open_buffer(const char *filename, bool new_buffer)
 	if (new_buffer) {
 		make_new_buffer();
 
-		if (!inhelp && has_valid_path(realname)) {
+		if (has_valid_path(realname)) {
 #ifndef NANO_TINY
 			if (ISSET(LOCKING) && filename[0] != '\0') {
 				/* When not overriding an existing lock, discard the buffer. */
 				if (do_lockfile(realname) < 0) {
 #ifdef ENABLE_MULTIBUFFER
-					close_buffer();
+					if (openfile != openfile->next)
+						close_buffer();
 #endif
 					free(realname);
 					return FALSE;
@@ -476,12 +476,17 @@ bool open_buffer(const char *filename, bool new_buffer)
 	/* If the filename isn't blank, and we are not in NOREAD_MODE,
 	 * open the file.  Otherwise, treat it as a new file. */
 	rc = (filename[0] != '\0' && !ISSET(NOREAD_MODE)) ?
-				open_file(realname, new_buffer, inhelp, &f) : -2;
+						open_file(realname, new_buffer, &f) : -2;
 
 	/* If we have a non-new file, read it in.  Then, if the buffer has
 	 * no stat, update the stat, if applicable. */
 	if (rc > 0) {
+		install_handler_for_Ctrl_C();
+
 		read_file(f, rc, realname, !new_buffer);
+
+		restore_handler_for_Ctrl_C();
+
 #ifndef NANO_TINY
 		if (openfile->current_stat == NULL)
 			stat_with_alloc(realname, &openfile->current_stat);
@@ -508,90 +513,51 @@ bool open_buffer(const char *filename, bool new_buffer)
 }
 
 #ifdef ENABLE_SPELLER
-/* Open the specified file, and if that succeeds, blow away the text of
- * the current buffer and read the file contents into its place. */
-void replace_buffer(const char *filename)
+/* Open the specified file, and if that succeeds, remove the text of the marked
+ * region or of the entire buffer and read the file contents into its place. */
+bool replace_buffer(const char *filename, undo_type action, bool marked)
 {
-	FILE *f;
-	int descriptor;
 	linestruct *was_cutbuffer = cutbuffer;
+	int descriptor;
+	FILE *f;
 
-	/* Open the file quietly. */
-	descriptor = open_file(filename, FALSE, TRUE, &f);
+	descriptor = open_file(filename, FALSE, &f);
 
-	/* If opening failed, forget it. */
 	if (descriptor < 0)
-		return;
+		return FALSE;
 
 #ifndef NANO_TINY
 	add_undo(COUPLE_BEGIN);
 	openfile->undotop->strdata = mallocstrcpy(NULL, _("spelling correction"));
 #endif
 
-	/* Throw away the text of the file. */
+	/* When nothing is marked, start at the top of the buffer. */
+	if (!marked) {
+		openfile->current = openfile->filetop;
+		openfile->current_x = 0;
+	}
+
+	/* Throw away the marked region or the whole buffer. */
 	cutbuffer = NULL;
-	openfile->current = openfile->filetop;
-	openfile->current_x = 0;
 #ifndef NANO_TINY
-	add_undo(CUT_TO_EOF);
+	add_undo(action);
 #endif
-	do_cut_text(FALSE, FALSE, TRUE, FALSE);
+	do_cut_text(FALSE, marked, !marked, FALSE);
 #ifndef NANO_TINY
-	update_undo(CUT_TO_EOF);
+	update_undo(action);
 #endif
 	free_lines(cutbuffer);
 	cutbuffer = was_cutbuffer;
 
-	/* Insert the processed file into its place. */
+	/* Insert the spell-checked file into the cleared area. */
 	read_file(f, descriptor, filename, TRUE);
 
 #ifndef NANO_TINY
 	add_undo(COUPLE_END);
 	openfile->undotop->strdata = mallocstrcpy(NULL, _("spelling correction"));
 #endif
+	return TRUE;
 }
-
-#ifndef NANO_TINY
-/* Open the specified file, and if that succeeds, blow away the text of
- * the current buffer covered by the mark and read the file
- * contents into its place. */
-void replace_marked_buffer(const char *filename)
-{
-	FILE *f;
-	int descriptor;
-	bool using_magicline = !ISSET(NO_NEWLINES);
-	linestruct *was_cutbuffer = cutbuffer;
-
-	descriptor = open_file(filename, FALSE, TRUE, &f);
-
-	if (descriptor < 0)
-		return;
-
-	/* Don't add a magic line when replacing text in the buffer. */
-	SET(NO_NEWLINES);
-
-	add_undo(COUPLE_BEGIN);
-	openfile->undotop->strdata = mallocstrcpy(NULL, _("spelling correction"));
-
-	/* Throw away the text under the mark. */
-	cutbuffer = NULL;
-	add_undo(CUT);
-	do_cut_text(FALSE, TRUE, FALSE, FALSE);
-	update_undo(CUT);
-	free_lines(cutbuffer);
-	cutbuffer = was_cutbuffer;
-
-	/* Insert the processed file where the marked text was. */
-	read_file(f, descriptor, filename, TRUE);
-
-	/* Restore the magic-line behavior now that we're done fiddling. */
-	if (using_magicline)
-		UNSET(NO_NEWLINES);
-
-	add_undo(COUPLE_END);
-	openfile->undotop->strdata = mallocstrcpy(NULL, _("spelling correction"));
-}
-#endif /* !NANO_TINY */
 #endif /* ENABLE_SPELLER */
 
 /* Update the titlebar and the multiline cache to match the current buffer. */
@@ -633,19 +599,15 @@ void mention_name_and_linecount(void)
 						_("New Buffer") : tail(openfile->filename), count);
 }
 
-/* Switch to a neighbouring file buffer; to the next if to_next is TRUE;
- * otherwise, to the previous one. */
-void switch_to_adjacent_buffer(bool to_next)
+/* Update title bar and such after switching to another buffer.*/
+void redecorate_after_switch(void)
 {
-	/* If only one file buffer is open, say so and get out. */
+	/* If only one file buffer is open, there is nothing to update. */
 	if (openfile == openfile->next) {
 		statusbar(_("No more open file buffers"));
 		return;
 	}
 
-	/* Switch to the next or previous file buffer. */
-	openfile = to_next ? openfile->next : openfile->prev;
-
 #ifndef NANO_TINY
 	/* When not in softwrap mode, make sure firstcolumn is zero.  It might
 	 * be nonzero if we had softwrap mode on while in this buffer, and then
@@ -657,9 +619,6 @@ void switch_to_adjacent_buffer(bool to_next)
 	/* Update titlebar and multiline info to match the current buffer. */
 	prepare_for_display();
 
-	if (inhelp)
-		return;
-
 	/* Ensure that the main loop will redraw the help lines. */
 	currmenu = MMOST;
 
@@ -673,78 +632,46 @@ void switch_to_adjacent_buffer(bool to_next)
 /* Switch to the previous entry in the list of open files. */
 void switch_to_prev_buffer(void)
 {
-	switch_to_adjacent_buffer(BACKWARD);
+	openfile = openfile->prev;
+	redecorate_after_switch();
 }
 
 /* Switch to the next entry in the list of open files. */
 void switch_to_next_buffer(void)
 {
-	switch_to_adjacent_buffer(FORWARD);
+	openfile = openfile->next;
+	redecorate_after_switch();
 }
 
-/* Delete an entry from the circular list of open files, and switch to the
- * one after it.  Return FALSE if just one buffer is open, otherwise TRUE. */
-bool close_buffer(void)
+/* Remove the current buffer from the circular list of buffers. */
+void close_buffer(void)
 {
-	if (openfile == openfile->next)
-		return FALSE;
+	openfilestruct *orphan = openfile;
 
-#ifdef ENABLE_HISTORIES
-	if (ISSET(POSITIONLOG))
-		update_poshistory(openfile->filename,
-						openfile->current->lineno, xplustabs() + 1);
+	if (orphan == startfile)
+		startfile = startfile->next;
+
+	orphan->prev->next = orphan->next;
+	orphan->next->prev = orphan->prev;
+
+	free(orphan->filename);
+	free_lines(orphan->filetop);
+#ifndef NANO_TINY
+	free(orphan->current_stat);
+	free(orphan->lock_filename);
+	/* Free the undo stack. */
+	discard_until(NULL, orphan, TRUE);
 #endif
 
-	switch_to_next_buffer();
+	openfile = orphan->prev;
+	free(orphan);
 
-	/* Delete the old file buffer, and adjust the count in the top bar. */
-	unlink_opennode(openfile->prev);
-	if (!inhelp)
-		titlebar(NULL);
-
-	/* If now just one buffer remains open, show "Exit" in the help lines. */
+	/* When just one buffer remains open, show "Exit" in the help lines. */
 	if (openfile == openfile->next)
 		exitfunc->desc = exit_tag;
-
-	return TRUE;
 }
 #endif /* ENABLE_MULTIBUFFER */
 
-/* Do a quick permissions check by verifying whether the file is appendable.
- * Err on the side of permissiveness (reporting TRUE when it might be wrong)
- * to not fluster users editing on odd filesystems by printing incorrect
- * warnings. */
-int is_file_writable(const char *filename)
-{
-	char *full_filename;
-	struct stat fileinfo;
-	int fd;
-	FILE *f;
-	bool result = TRUE;
-
-	if (ISSET(VIEW_MODE))
-		return TRUE;
-
-	full_filename = get_full_path(filename);
-
-	/* If the absolute path is unusable, use the given relative one. */
-	if (full_filename == NULL || stat(full_filename, &fileinfo) == -1)
-		full_filename = mallocstrcpy(NULL, filename);
-
-	if ((fd = open(full_filename, O_WRONLY | O_CREAT | O_APPEND, S_IRUSR |
-				S_IWUSR | S_IRGRP | S_IWGRP | S_IROTH | S_IWOTH)) == -1)
-		result = FALSE;
-	else if ((f = fdopen(fd, "a")) == NULL) {
-		result = FALSE;
-		close(fd);
-	} else
-		fclose(f);
-
-	free(full_filename);
-
-	return result;
-}
-
 /* Encode any NUL bytes in the given line of text, which is of length buf_len,
  * and return a dynamically allocated copy of the resultant string. */
 char *encode_data(char *buf, size_t buf_len)
@@ -781,6 +708,8 @@ void read_file(FILE *f, int fd, const char *filename, bool undoable)
 	int input_int;
 		/* The current value we read from the file, whether an input
 		 * character or EOF. */
+	int errornumber;
+		/* The error code, in case an error occurred during reading. */
 	bool writable = TRUE;
 		/* Whether the file is writable (in case we care). */
 #ifndef NANO_TINY
@@ -810,8 +739,16 @@ void read_file(FILE *f, int fd, const char *filename, bool undoable)
 	 * of locking it for each single byte that we read from it. */
 	flockfile(f);
 
+	control_C_was_pressed = FALSE;
+
 	/* Read the entire file into the new buffer. */
 	while ((input_int = getc_unlocked(f)) != EOF) {
+
+		if (control_C_was_pressed) {
+			statusline(ALERT, _("Interrupted"));
+			break;
+		}
+
 		input = (char)input_int;
 
 		/* If it's a *nix file ("\n") or a DOS file ("\r\n"), and file
@@ -878,6 +815,8 @@ void read_file(FILE *f, int fd, const char *filename, bool undoable)
 #endif
 	}
 
+	errornumber = errno;
+
 	/* We are done with the file, unlock it. */
 	funlockfile(f);
 
@@ -885,13 +824,22 @@ void read_file(FILE *f, int fd, const char *filename, bool undoable)
 	block_sigwinch(FALSE);
 #endif
 
-	/* Perhaps this could use some better handling. */
-	if (ferror(f))
-		nperror(filename);
+	/* When reading from stdin, restore the terminal and reenter curses mode. */
+	if (isendwin()) {
+		if (!isatty(STANDARD_INPUT))
+			reconnect_and_store_state();
+		terminal_init();
+		doupdate();
+	}
+
+	/* If there was a real error during the reading, let the user know. */
+	if (ferror(f) && errornumber != EINTR && errornumber != 0)
+		statusline(ALERT, strerror(errornumber));
 	fclose(f);
+
 	if (fd > 0 && !undoable) {
 		close(fd);
-		writable = is_file_writable(filename);
+		writable = (ISSET(VIEW_MODE) || access(filename, W_OK) == 0);
 	}
 
 	/* If the file ended with newline, or it was entirely empty, make the
@@ -935,10 +883,6 @@ void read_file(FILE *f, int fd, const char *filename, bool undoable)
 	/* Set the desired x position at the end of what was inserted. */
 	openfile->placewewant = xplustabs();
 
-	/* If we've read a help file, don't give any feedback. */
-	if (inhelp)
-		return;
-
 	if (!writable)
 		statusline(ALERT, _("File '%s' is unwritable"), filename);
 #ifndef NANO_TINY
@@ -980,7 +924,7 @@ void read_file(FILE *f, int fd, const char *filename, bool undoable)
  * "New File" if newfie is TRUE, and say "File not found" otherwise.
  * Return -2 if we say "New File", -1 if the file isn't opened, and the
  * obtained fd otherwise.  *f is set to the opened file. */
-int open_file(const char *filename, bool newfie, bool quiet, FILE **f)
+int open_file(const char *filename, bool newfie, FILE **f)
 {
 	struct stat fileinfo, fileinfo2;
 	int fd;
@@ -994,8 +938,7 @@ int open_file(const char *filename, bool newfie, bool quiet, FILE **f)
 
 	if (stat(full_filename, &fileinfo) == -1) {
 		if (newfie) {
-			if (!quiet)
-				statusbar(_("New File"));
+			statusbar(_("New File"));
 			free(full_filename);
 			return -2;
 		}
@@ -1005,30 +948,37 @@ int open_file(const char *filename, bool newfie, bool quiet, FILE **f)
 		return -1;
 	}
 
-	/* Don't open directories, character files, or block files. */
-	if (S_ISDIR(fileinfo.st_mode) || S_ISCHR(fileinfo.st_mode) ||
-								S_ISBLK(fileinfo.st_mode)) {
-		statusline(ALERT, S_ISDIR(fileinfo.st_mode) ?
-						_("\"%s\" is a directory") :
-						_("\"%s\" is a device file"), filename);
-		free(full_filename);
-		return -1;
-	}
+#ifndef NANO_TINY
+	if (S_ISFIFO(fileinfo.st_mode))
+		statusbar(_("Reading from FIFO..."));
+
+	block_sigwinch(TRUE);
+	install_handler_for_Ctrl_C();
+#endif
 
 	/* Try opening the file. */
 	fd = open(full_filename, O_RDONLY);
 
-	if (fd == -1)
-		statusline(ALERT, _("Error reading %s: %s"), filename, strerror(errno));
-	else {
+#ifndef NANO_TINY
+	restore_handler_for_Ctrl_C();
+	block_sigwinch(FALSE);
+#endif
+
+	if (fd == -1) {
+		if (errno == EINTR || errno == 0)
+			statusline(ALERT, _("Interrupted"));
+		else
+			statusline(ALERT, _("Error reading %s: %s"), filename, strerror(errno));
+	} else {
 		/* The file is A-OK.  Associate a stream with it. */
 		*f = fdopen(fd, "rb");
 
 		if (*f == NULL) {
 			statusline(ALERT, _("Error reading %s: %s"), filename, strerror(errno));
 			close(fd);
-		} else if (!inhelp)
-			statusbar(_("Reading File"));
+			fd = -1;
+		} else
+			statusbar(_("Reading..."));
 	}
 
 	free(full_filename);
@@ -1076,7 +1026,7 @@ char *get_next_filename(const char *name, const char *suffix)
  * the MULTIBUFFER flag is set. */
 void do_insertfile(void)
 {
-	int i;
+	int response;
 	const char *msg;
 	char *given = mallocstrcpy(NULL, "");
 		/* The last answer the user typed at the statusbar prompt. */
@@ -1121,30 +1071,30 @@ void do_insertfile(void)
 
 		present_path = mallocstrcpy(present_path, "./");
 
-		i = do_prompt(TRUE, TRUE,
+		response = do_prompt(TRUE, TRUE,
 #ifndef NANO_TINY
-				execute ? MEXTCMD :
+							execute ? MEXTCMD :
 #endif
-				MINSERTFILE, given,
+							MINSERTFILE, given,
 #ifndef NANO_TINY
-				execute ? &execute_history :
+							execute ? &execute_history :
 #endif
-				NULL, edit_refresh, msg,
+							NULL, edit_refresh, msg,
 #ifdef ENABLE_OPERATINGDIR
-				operating_dir != NULL ? operating_dir :
+							operating_dir != NULL ? operating_dir :
 #endif
-				"./");
+							"./");
 
 		/* If we're in multibuffer mode and the filename or command is
 		 * blank, open a new buffer instead of canceling. */
-		if (i == -1 || (i == -2 && !ISSET(MULTIBUFFER))) {
+		if (response == -1 || (response == -2 && !ISSET(MULTIBUFFER))) {
 			statusbar(_("Cancelled"));
 			break;
 		} else {
 			ssize_t was_current_lineno = openfile->current->lineno;
 			size_t was_current_x = openfile->current_x;
 #if !defined(NANO_TINY) || defined(ENABLE_BROWSER) || defined(ENABLE_MULTIBUFFER)
-			functionptrtype func = func_from_key(&i);
+			functionptrtype func = func_from_key(&response);
 #endif
 			given = mallocstrcpy(given, answer);
 
@@ -1178,7 +1128,7 @@ void do_insertfile(void)
 
 				free(answer);
 				answer = chosen;
-				i = 0;
+				response = 0;
 			}
 #endif
 #ifndef NANO_TINY
@@ -1189,7 +1139,7 @@ void do_insertfile(void)
 			}
 #endif
 			/* If we don't have a file yet, go back to the prompt. */
-			if (i != 0 && (!ISSET(MULTIBUFFER) || i != -2))
+			if (response != 0 && (!ISSET(MULTIBUFFER) || response != -2))
 				continue;
 
 #ifndef NANO_TINY
@@ -1339,8 +1289,6 @@ char *get_full_path(const char *origpath)
 	/* If we didn't find one, then make sure the answer is in the format
 	 * "d_here/d_there". */
 	if (last_slash == NULL) {
-		assert(!path_only);
-
 		d_there_file = d_there;
 		d_there = d_here;
 	} else {
@@ -1559,8 +1507,6 @@ int copy_file(FILE *inn, FILE *out, bool close_out)
 	size_t charsread;
 	int (*flush_out_fnc)(FILE *) = (close_out) ? fclose : fflush;
 
-	assert(inn != NULL && out != NULL && inn != out);
-
 	do {
 		charsread = fread(buf, sizeof(char), BUFSIZ, inn);
 		if (charsread == 0 && ferror(inn)) {
@@ -1609,10 +1555,8 @@ bool write_file(const char *name, FILE *f_open, bool tmp,
 	mode_t original_umask = 0;
 		/* Our umask, from when nano started. */
 #ifndef NANO_TINY
-	bool realexists;
-		/* The result of stat().  TRUE if the file exists, FALSE
-		 * otherwise.  If name is a link that points nowhere, realexists
-		 * is FALSE. */
+	bool isactualfile = FALSE;
+		/* TRUE when the file is non-temporary and exists, FALSE otherwise. */
 #endif
 	struct stat st;
 		/* The status fields filled in by stat(). */
@@ -1646,21 +1590,20 @@ bool write_file(const char *name, FILE *f_open, bool tmp,
 
 #ifndef NANO_TINY
 	/* Check whether the file (at the end of the symlink) exists. */
-	realexists = (stat(realname, &st) != -1);
+	if (!tmp)
+		isactualfile = (stat(realname, &st) != -1);
 
-	/* If we haven't stat()d this file before (say, the user just
-	 * specified it interactively), stat and save the value now,
-	 * or else we will chase null pointers when we do modtime checks,
-	 * preserve file times, and so on, during backup. */
-	if (openfile->current_stat == NULL && !tmp && realexists)
+	/* If we haven't stat()d this file before (say, the user just specified
+	 * it interactively), stat and save the value now, or else we will chase
+	 * null pointers when we do modtime checks and such during backup. */
+	if (openfile->current_stat == NULL && isactualfile)
 		stat_with_alloc(realname, &openfile->current_stat);
 
-	/* We backup only if the backup toggle is set, the file isn't
-	 * temporary, and the file already exists.  Furthermore, if we
-	 * aren't appending, prepending, or writing a selection, we backup
-	 * only if the file has not been modified by someone else since nano
-	 * opened it. */
-	if (ISSET(BACKUP_FILE) && !tmp && realexists && openfile->current_stat &&
+	/* We back up only if the backup toggle is set, and the file exists and
+	 * isn't temporary.  Furthermore, if we aren't appending, prepending, or
+	 * writing a selection, we back up only if the file has not been modified
+	 * by someone else since nano opened it. */
+	if (ISSET(BACKUP_FILE) && isactualfile && openfile->current_stat &&
 				(method != OVERWRITE || openfile->mark ||
 				openfile->current_stat->st_mtime == st.st_mtime)) {
 		static struct timespec filetime[2];
@@ -1787,10 +1730,6 @@ bool write_file(const char *name, FILE *f_open, bool tmp,
 			goto cleanup_and_exit;
 		}
 
-#ifdef DEBUG
-		fprintf(stderr, "Backing up %s to %s\n", realname, backupname);
-#endif
-
 		/* Copy the file. */
 		if (copy_file(f, backup_file, FALSE) != 0) {
 			fclose(backup_file);
@@ -1813,7 +1752,7 @@ bool write_file(const char *name, FILE *f_open, bool tmp,
 		free(backupname);
 	}
 
-	skip_backup:
+  skip_backup:
 #endif /* !NANO_TINY */
 
 	if (f_open == NULL) {
@@ -1873,21 +1812,35 @@ bool write_file(const char *name, FILE *f_open, bool tmp,
 			goto cleanup_and_exit;
 		}
 	}
+
+	if (S_ISFIFO(st.st_mode))
+		statusbar(_("Writing to FIFO..."));
 #endif /* !NANO_TINY */
 
 	if (f_open == NULL) {
+#ifndef NANO_TINY
+		block_sigwinch(TRUE);
+		install_handler_for_Ctrl_C();
+#endif
 		/* Now open the file in place.  Use O_EXCL if tmp is TRUE.  This
 		 * is copied from joe, because wiggy says so *shrug*. */
 		fd = open(realname, O_WRONLY | O_CREAT | ((method == APPEND) ?
 				O_APPEND : (tmp ? O_EXCL : O_TRUNC)), S_IRUSR |
 				S_IWUSR | S_IRGRP | S_IWGRP | S_IROTH | S_IWOTH);
 
+#ifndef NANO_TINY
+		restore_handler_for_Ctrl_C();
+		block_sigwinch(FALSE);
+#endif
 		/* Set the umask back to the user's original value. */
 		umask(original_umask);
 
 		/* If we couldn't open the file, give up. */
 		if (fd == -1) {
-			statusline(ALERT, _("Error writing %s: %s"), realname,
+			if (errno == EINTR || errno == 0)
+				statusline(ALERT, _("Interrupted"));
+			else
+				statusline(ALERT, _("Error writing %s: %s"), realname,
 						strerror(errno));
 			if (tempname != NULL)
 				unlink(tempname);
@@ -1904,6 +1857,9 @@ bool write_file(const char *name, FILE *f_open, bool tmp,
 		}
 	}
 
+	if (!tmp)
+		statusbar(_("Writing..."));
+
 	while (fileptr != NULL) {
 		size_t data_len = strlen(fileptr->data), size;
 
@@ -2058,9 +2014,9 @@ bool write_marked_file(const char *name, FILE *f_open, bool tmp,
 	size_t top_x, bot_x;
 
 	/* Partition the buffer so that it contains only the marked text. */
-	mark_order((const linestruct **)&top, &top_x,
+	get_region((const linestruct **)&top, &top_x,
 				(const linestruct **)&bot, &bot_x, NULL);
-	filepart = partition_buffer(top, top_x, bot, bot_x);
+	partition_buffer(top, top_x, bot, bot_x);
 
 	/* If we are using a magic line, and the last line of the partition
 	 * isn't blank, then add a newline at the end of the buffer. */
@@ -2075,7 +2031,7 @@ bool write_marked_file(const char *name, FILE *f_open, bool tmp,
 		remove_magicline();
 
 	/* Unpartition the buffer so that it contains all the text again. */
-	unpartition_buffer(&filepart);
+	unpartition_buffer();
 
 	return retval;
 }
@@ -2463,8 +2419,6 @@ char **username_tab_completion(const char *buf, size_t *num_matches,
 	const struct passwd *userdata;
 #endif
 
-	assert(buf != NULL && num_matches != NULL && buf_len > 0);
-
 	*num_matches = 0;
 
 #ifdef HAVE_PWD_H
@@ -2529,8 +2483,6 @@ char **cwd_tab_completion(const char *buf, bool allow_files,
 		dirname = mallocstrcpy(NULL, present_path);
 	}
 
-	assert(dirname[strlen(dirname) - 1] == '/');
-
 	dir = opendir(dirname);
 
 	if (dir == NULL) {
@@ -2594,9 +2546,6 @@ char *input_tab(char *buf, bool allow_files, size_t *place,
 	size_t num_matches = 0, buf_len;
 	char **matches = NULL;
 
-	assert(buf != NULL && place != NULL && *place <= strlen(buf) &&
-				lastwastab != NULL && refresh_func != NULL && listed != NULL);
-
 	*listed = FALSE;
 
 	/* If the word starts with `~' and there is no slash in the word,
@@ -2653,14 +2602,9 @@ char *input_tab(char *buf, bool allow_files, size_t *place,
 		glued = charalloc(strlen(present_path) + strlen(mzero) + 1);
 		sprintf(glued, "%s%s", present_path, mzero);
 
-		assert(common_len >= *place);
-
-		if (num_matches == 1 && (is_dir(mzero) || is_dir(glued))) {
+		if (num_matches == 1 && (is_dir(mzero) || is_dir(glued)))
 			mzero[common_len++] = '/';
 
-			assert(common_len > *place);
-		}
-
 		if (num_matches > 1 && (common_len != *place || !*lastwastab))
 			beep();
 

src/global.c

@@ -31,10 +31,8 @@ volatile sig_atomic_t the_window_resized = FALSE;
 		/* Set to TRUE by the handler whenever a SIGWINCH occurs. */
 #endif
 
-#ifdef __linux__
-bool on_a_vt;
-		/* Whether we're running on a Linux VT or on something else. */
-#endif
+bool on_a_vt = FALSE;
+		/* Whether we're running on a Linux console (a VT). */
 
 bool meta_key;
 		/* Whether the current keystroke is a Meta key. */
@@ -46,6 +44,11 @@ bool focusing = TRUE;
 bool as_an_at = TRUE;
 		/* Whether a 0x0A byte should be shown as a ^@ instead of a ^J. */
 
+bool control_C_was_pressed = FALSE;
+		/* Whether Ctrl+C was pressed (when a keyboard interrupt is enabled). */
+
+bool started_curses = FALSE;
+
 bool suppress_cursorpos = FALSE;
 		/* Should we skip constant position display for current keystroke? */
 
@@ -123,8 +126,6 @@ linestruct *cutbottom = NULL;
 bool keep_cutbuffer = FALSE;
 		/* Whether to add to the cutbuffer instead of clearing it first. */
 
-partition *filepart = NULL;
-		/* The "partition" where we store a portion of the current file. */
 openfilestruct *openfile = NULL;
 		/* The list of all open file buffers. */
 #ifdef ENABLE_MULTIBUFFER
@@ -378,10 +379,6 @@ void add_to_funcs(void (*func)(void), int menus, const char *desc, const char *h
 	f->help = help;
 	f->blank_after = blank_after;
 #endif
-
-#ifdef DEBUG
-	fprintf(stderr, "Added func %ld (%s) for menus %x\n", (long)func, f->desc, menus);
-#endif
 }
 
 /* Add a key combo to the shortcut list. */
@@ -413,10 +410,6 @@ void add_to_sclist(int menus, const char *scstring, const int keycode,
 	assign_keyinfo(s, scstring, keycode);
 
 	tailsc = s;
-
-#ifdef DEBUG
-	fprintf(stderr, "Setting keycode to %d for shortcut \"%s\" in menus %x\n", s->keycode, scstring, s->menus);
-#endif
 }
 
 /* Return the first shortcut in the list of shortcuts that
@@ -429,9 +422,6 @@ const keystruct *first_sc_for(int menu, void (*func)(void))
 		if ((s->menus & menu) && s->func == func)
 			return s;
 
-#ifdef DEBUG
-	fprintf(stderr, "Whoops, returning null given func %ld in menu %x\n", (long)func, menu);
-#endif
 	return NULL;
 }
 
@@ -506,22 +496,6 @@ int keycode_from_string(const char *keystring)
 		return -1;
 }
 
-#ifdef DEBUG
-void print_sclist(void)
-{
-	keystruct *s;
-	const funcstruct *f;
-
-	for (s = sclist; s != NULL; s = s->next) {
-		f = sctofunc(s);
-		if (f)
-			fprintf(stderr, "Shortcut \"%s\", function: %s, menus %x\n", s->keystr, f->desc, f->menus);
-		else
-			fprintf(stderr, "Hmm, didn't find a func for \"%s\"\n", s->keystr);
-	}
-}
-#endif
-
 /* These two tags are used elsewhere too, so they are global. */
 /* TRANSLATORS: Try to keep the next two strings at most 10 characters. */
 const char *exit_tag = N_("Exit");
@@ -722,23 +696,20 @@ void shortcut_init(void)
 		N_("Write Out"), WITHORSANS(writeout_gist), TOGETHER, NOVIEW);
 
 #ifdef ENABLE_JUSTIFY
-	if (!ISSET(RESTRICTED)) {
-#else
-	/* If we can't replace Insert with Justify, show Insert anyway, to
-	 * keep the help items nicely paired also in restricted mode.  */
-	if (TRUE) {
+	/* In restricted mode, replace Insert with Justify, when possible;
+	 * otherwise, show Insert anyway, to keep the help items paired. */
+	if (!ISSET(RESTRICTED))
 #endif
 		add_to_funcs(do_insertfile_void, MMAIN,
 				N_("Read File"), WITHORSANS(readfile_gist), BLANKAFTER,
 				/* We allow inserting files in view mode if multibuffer mode
-				 * is switched on, so that we can view multiple files. */
+				 * is available, so that the user can view multiple files. */
 				CAN_OPEN_OTHER_BUFFER);
-	} else {
 #ifdef ENABLE_JUSTIFY
+	else
 		add_to_funcs(do_justify_void, MMAIN,
 				N_("Justify"), WITHORSANS(justify_gist), BLANKAFTER, NOVIEW);
 #endif
-	}
 
 #ifdef ENABLE_HELP
 	/* The description ("x") and blank_after (0) are irrelevant,
@@ -761,10 +732,10 @@ void shortcut_init(void)
 		N_("Refresh"), WITHORSANS(browserrefresh_gist), BLANKAFTER, VIEW);
 #endif
 
-	add_to_funcs(do_cut_text_void, MMAIN,
+	add_to_funcs(cut_text, MMAIN,
 		N_("Cut Text"), WITHORSANS(cut_gist), TOGETHER, NOVIEW);
 
-	add_to_funcs(do_uncut_text, MMAIN,
+	add_to_funcs(paste_text, MMAIN,
 		N_("Paste Text"), WITHORSANS(uncut_gist), BLANKAFTER, NOVIEW);
 
 	if (!ISSET(RESTRICTED)) {
@@ -797,7 +768,7 @@ void shortcut_init(void)
 
 	add_to_funcs(do_mark, MMAIN,
 		N_("Mark Text"), WITHORSANS(mark_gist), TOGETHER, VIEW);
-	add_to_funcs(do_copy_text, MMAIN,
+	add_to_funcs(copy_text, MMAIN,
 		N_("Copy Text"), WITHORSANS(copy_gist), BLANKAFTER, NOVIEW);
 #endif
 
@@ -952,7 +923,7 @@ void shortcut_init(void)
 		N_("Chop Left"), WITHORSANS(chopwordleft_gist), TOGETHER, NOVIEW);
 	add_to_funcs(chop_next_word, MMAIN,
 		N_("Chop Right"), WITHORSANS(chopwordright_gist), TOGETHER, NOVIEW);
-	add_to_funcs(do_cut_till_eof, MMAIN,
+	add_to_funcs(cut_till_eof, MMAIN,
 		N_("CutTillEnd"), WITHORSANS(cuttilleof_gist), BLANKAFTER, NOVIEW);
 #endif
 
@@ -1114,8 +1085,8 @@ void shortcut_init(void)
 	add_to_sclist(MMAIN|MHELP|MBROWSER, "^W", 0, do_search_forward, 0);
 	add_to_sclist(MMAIN, "^\\", 0, do_replace, 0);
 	add_to_sclist(MMAIN, "M-R", 0, do_replace, 0);
-	add_to_sclist(MMOST, "^K", 0, do_cut_text_void, 0);
-	add_to_sclist(MMOST, "^U", 0, do_uncut_text, 0);
+	add_to_sclist(MMOST, "^K", 0, cut_text, 0);
+	add_to_sclist(MMOST, "^U", 0, paste_text, 0);
 #ifdef ENABLE_JUSTIFY
 	add_to_sclist(MMAIN, "^J", 0, do_justify_void, 0);
 #endif
@@ -1146,8 +1117,8 @@ void shortcut_init(void)
 	add_to_sclist(MMAIN, "M-A", 0, do_mark, 0);
 	add_to_sclist(MMAIN, "^6", 0, do_mark, 0);
 	add_to_sclist(MMAIN, "^^", 0, do_mark, 0);
-	add_to_sclist(MMAIN, "M-6", 0, do_copy_text, 0);
-	add_to_sclist(MMAIN, "M-^", 0, do_copy_text, 0);
+	add_to_sclist(MMAIN, "M-6", 0, copy_text, 0);
+	add_to_sclist(MMAIN, "M-^", 0, copy_text, 0);
 	add_to_sclist(MMAIN, "M-}", 0, do_indent, 0);
 	add_to_sclist(MMAIN, "Tab", TAB_CODE, do_indent, 0);
 	add_to_sclist(MMAIN, "M-{", 0, do_unindent, 0);
@@ -1174,11 +1145,11 @@ void shortcut_init(void)
 		add_to_sclist(MMOST|MHELP|MBROWSER, "\xE2\x96\xb6", KEY_RIGHT, do_right, 0);
 		add_to_sclist(MSOME, "^\xE2\x97\x80", CONTROL_LEFT, do_prev_word_void, 0);
 		add_to_sclist(MSOME, "^\xE2\x96\xb6", CONTROL_RIGHT, do_next_word_void, 0);
-#ifndef NANO_TINY
-#ifdef ENABLE_MULTIBUFFER
-		add_to_sclist(MMAIN, "M-\xE2\x97\x80", ALT_LEFT, switch_to_prev_buffer, 0);
-		add_to_sclist(MMAIN, "M-\xE2\x96\xb6", ALT_RIGHT, switch_to_next_buffer, 0);
-#endif
+#if !defined(NANO_TINY) && defined(ENABLE_MULTIBUFFER)
+		if (!on_a_vt) {
+			add_to_sclist(MMAIN, "M-\xE2\x97\x80", ALT_LEFT, switch_to_prev_buffer, 0);
+			add_to_sclist(MMAIN, "M-\xE2\x96\xb6", ALT_RIGHT, switch_to_next_buffer, 0);
+		}
 #endif
 	} else
 #endif
@@ -1187,6 +1158,12 @@ void shortcut_init(void)
 		add_to_sclist(MMOST|MHELP|MBROWSER, "Right", KEY_RIGHT, do_right, 0);
 		add_to_sclist(MSOME, "^Left", CONTROL_LEFT, do_prev_word_void, 0);
 		add_to_sclist(MSOME, "^Right", CONTROL_RIGHT, do_next_word_void, 0);
+#ifdef ENABLE_MULTIBUFFER
+		if (!on_a_vt) {
+			add_to_sclist(MMAIN, "M-Left", ALT_LEFT, switch_to_prev_buffer, 0);
+			add_to_sclist(MMAIN, "M-Right", ALT_RIGHT, switch_to_next_buffer, 0);
+		}
+#endif
 	}
 #ifdef NANO_TINY
 	add_to_sclist(MMAIN, "M-B", 0, do_prev_word_void, 0);
@@ -1224,10 +1201,16 @@ 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
-#if !defined(NANO_TINY) && defined(ENABLE_UTF8)
+#ifndef NANO_TINY
+#ifdef ENABLE_UTF8
 	if (using_utf8()) {
 		add_to_sclist(MMAIN|MHELP, "M-\xE2\x96\xb2", ALT_UP, do_scroll_up, 0);
 		add_to_sclist(MMAIN|MHELP, "M-\xE2\x96\xbc", ALT_DOWN, do_scroll_down, 0);
+	} else
+#endif
+	{
+		add_to_sclist(MMAIN|MHELP, "M-Up", ALT_UP, do_scroll_up, 0);
+		add_to_sclist(MMAIN|MHELP, "M-Down", ALT_DOWN, do_scroll_down, 0);
 	}
 #endif
 #if !defined(NANO_TINY) || defined(ENABLE_HELP)
@@ -1244,7 +1227,7 @@ void shortcut_init(void)
 #endif
 	add_to_sclist(MMOST, "M-V", 0, do_verbatim_input, 0);
 #ifndef NANO_TINY
-	add_to_sclist(MMAIN, "M-T", 0, do_cut_till_eof, 0);
+	add_to_sclist(MMAIN, "M-T", 0, cut_till_eof, 0);
 	add_to_sclist(MMAIN, "M-D", 0, do_wordlinechar_count, 0);
 #endif
 #ifdef ENABLE_JUSTIFY
@@ -1383,26 +1366,12 @@ void shortcut_init(void)
 	add_to_sclist(MMAIN|MHELP|MBROWSER, "F6", 0, do_search_forward, 0);
 	add_to_sclist(MMAIN|MHELP|MBROWSER|MLINTER, "F7", 0, do_page_up, 0);
 	add_to_sclist(MMAIN|MHELP|MBROWSER|MLINTER, "F8", 0, do_page_down, 0);
-	add_to_sclist(MMOST, "F9", 0, do_cut_text_void, 0);
-	add_to_sclist(MMOST, "F10", 0, do_uncut_text, 0);
+	add_to_sclist(MMOST, "F9", 0, cut_text, 0);
+	add_to_sclist(MMOST, "F10", 0, paste_text, 0);
 	add_to_sclist(MMAIN, "F11", 0, do_cursorpos_void, 0);
 #ifdef ENABLE_SPELLER
 	add_to_sclist(MMAIN, "F12", 0, do_spell, 0);
 #endif
-
-#ifdef DEBUG
-	print_sclist();
-#endif
-}
-
-const funcstruct *sctofunc(const keystruct *s)
-{
-	funcstruct *f = allfuncs;
-
-	while (f != NULL && f->func != s->func)
-		f = f->next;
-
-	return f;
 }
 
 #ifndef NANO_TINY
@@ -1483,14 +1452,14 @@ keystruct *strtosc(const char *input)
 	else if (!strcasecmp(input, "replace"))
 		s->func = do_replace;
 	else if (!strcasecmp(input, "cut"))
-		s->func = do_cut_text_void;
+		s->func = cut_text;
 	else if (!strcasecmp(input, "paste"))
-		s->func = do_uncut_text;
+		s->func = paste_text;
 #ifndef NANO_TINY
 	else if (!strcasecmp(input, "cutrestoffile"))
-		s->func = do_cut_till_eof;
+		s->func = cut_till_eof;
 	else if (!strcasecmp(input, "copy"))
-		s->func = do_copy_text;
+		s->func = copy_text;
 	else if (!strcasecmp(input, "zap"))
 		s->func = zap_text;
 	else if (!strcasecmp(input, "mark"))

src/help.c

@@ -39,45 +39,42 @@ static char *end_of_intro = NULL;
 static size_t location;
 		/* The offset (in bytes) of the topleft of the shown help text. */
 
-char *tempfilename = NULL;
-		/* Name of the temporary file used for wrapping the help text. */
-
-/* Hard-wrap the help text, write it to the existing temporary file, and
- * read that file into a new buffer. */
-void wrap_the_help_text(bool redisplaying)
+/* Hard-wrap the concatenated help text, and write it into a new buffer. */
+void wrap_help_text_into_buffer()
 {
 	size_t sum = 0;
 	const char *ptr = start_of_body;
-	FILE *tempfile = fopen(tempfilename, "w+b");
 
-	/* If re-opening the temporary file failed, give up. */
-	if (tempfile == NULL) {
-		statusline(ALERT, _("Error writing temp file: %s"), strerror(errno));
-		return;
-	}
+	make_new_buffer();
 
-	/* Write the body of the help_text into the temporary file. */
+	/* Copy the help text into the just-created new buffer. */
 	while (*ptr != '\0') {
 		int length = help_line_len(ptr);
+		char *oneline = nmalloc(length + 1);
+
+		snprintf(oneline, length + 1, "%s", ptr);
+		free(openfile->current->data);
+		openfile->current->data = oneline;
 
-		fwrite(ptr, sizeof(char), length, tempfile);
 		ptr += length;
-
-		/* Hard-wrap the lines in the help text. */
 		if (*ptr != '\n')
-			fwrite("\n", sizeof(char), 1, tempfile);
-		else while (*ptr == '\n')
-			fwrite(ptr++, sizeof(char), 1, tempfile);
+			ptr--;
+
+		/* Create a new line, and then one more for each extra \n. */
+		do {
+			openfile->current->next = make_new_node(openfile->current);
+			openfile->current = openfile->current->next;
+			openfile->current->data = mallocstrcpy(NULL, "");
+		} while (*(++ptr) == '\n');
 	}
 
-	fclose(tempfile);
+	openfile->filebot = openfile->current;
+	openfile->current = openfile->filetop;
 
-	if (redisplaying)
-		close_buffer();
-
-	open_buffer(tempfilename, TRUE);
 	remove_magicline();
-
+#ifdef ENABLE_COLOR
+	color_update();
+#endif
 	prepare_for_display();
 
 	/* Move to the position in the file where we were before. */
@@ -112,20 +109,9 @@ void do_help(void)
 		/* A storage place for the current flag settings. */
 	linestruct *line;
 	int length;
-	FILE *fp;
 
 	blank_statusbar();
 
-	/* Get a temporary file for the help text.  If it fails, give up. */
-	tempfilename = safe_tempfile(&fp);
-	if (tempfilename == NULL) {
-		statusline(ALERT, _("Error writing temp file: %s"), strerror(errno));
-		free(saved_answer);
-		return;
-	}
-
-	fclose(fp);
-
 	/* Save the settings of all flags. */
 	memcpy(stash, flags, sizeof(flags));
 
@@ -175,7 +161,7 @@ void do_help(void)
 	while (*start_of_body == '\n')
 		start_of_body++;
 
-	wrap_the_help_text(FALSE);
+	wrap_help_text_into_buffer();
 	edit_refresh();
 
 	while (TRUE) {
@@ -210,19 +196,16 @@ void do_help(void)
 		} else if (func == (functionptrtype)implant) {
 			implant(first_sc_for(MHELP, func)->expansion);
 #endif
-#ifndef NANO_TINY
-		} else if (kbinput == KEY_WINCH) {
-			; /* Nothing to do. */
-#endif
 #ifdef ENABLE_MOUSE
 		} else if (kbinput == KEY_MOUSE) {
 			int dummy_row, dummy_col;
 			get_mouseinput(&dummy_row, &dummy_col, TRUE);
+#endif
+#ifndef NANO_TINY
+		} else if (kbinput == KEY_WINCH) {
+			;  /* Nothing to do. */
 #endif
 		} else if (func == do_exit) {
-			/* Exit from the help viewer. */
-			close_buffer();
-			curs_set(0);
 			break;
 		} else
 			unbound_key(kbinput);
@@ -240,6 +223,9 @@ void do_help(void)
 		}
 	}
 
+	/* Discard the help-text buffer. */
+	close_buffer();
+
 	/* Restore the settings of all flags. */
 	memcpy(flags, stash, sizeof(flags));
 
@@ -250,35 +236,33 @@ void do_help(void)
 	tabsize = was_tabsize;
 #ifdef ENABLE_COLOR
 	syntaxstr = was_syntax;
+	have_palette = FALSE;
 #endif
 
-	/* Switch back to the buffer we were invoked from. */
-	switch_to_prev_buffer();
+	free(title);
+	title = NULL;
+	free(answer);
+	answer = saved_answer;
+	free(help_text);
+	inhelp = FALSE;
+
+	curs_set(0);
+	refresh_needed = TRUE;
 
 	if (ISSET(NO_HELP)) {
 		currmenu = oldmenu;
 		window_init();
-	} else
+	} else {
+		wipe_statusbar();
 		bottombars(oldmenu);
-
-	free(title);
-	title = NULL;
-	inhelp = FALSE;
+	}
 
 #ifdef ENABLE_BROWSER
 	if (oldmenu == MBROWSER || oldmenu == MWHEREISFILE || oldmenu == MGOTODIR)
 		browser_refresh();
 	else
 #endif
-		total_refresh();
-
-	free(answer);
-	answer = saved_answer;
-
-	remove(tempfilename);
-	free(tempfilename);
-
-	free(help_text);
+		titlebar(NULL);
 }
 
 /* Allocate space for the help text for the current menu, and concatenate
@@ -464,22 +448,22 @@ void help_init(void)
 		allocsize += strlen(htx[2]);
 
 	/* Calculate the length of the shortcut help text.  Each entry has
-	 * one or two keys, which fill 16 columns, plus translated text,
+	 * one or two keys, which fill 17 cells, plus translated text,
 	 * plus one or two \n's. */
 	for (f = allfuncs; f != NULL; f = f->next)
 		if (f->menus & currmenu)
-			allocsize += (16 * MAXCHARLEN) + strlen(_(f->help)) + 2;
+			allocsize += strlen(_(f->help)) + 21;
 
 #ifndef NANO_TINY
 	/* If we're on the main list, we also count the toggle help text.
-	 * Each entry has "M-%c\t\t", five chars which fill 16 columns,
-	 * plus a space, plus translated text, plus one or two '\n's. */
+	 * Each entry has "M-%c\t\t ", six chars which fill 17 cells, plus
+	 * two translated texts, plus a space, plus one or two '\n's. */
 	if (currmenu == MMAIN) {
-		size_t endis_len = strlen(_("enable/disable"));
+		size_t onoff_len = strlen(_("enable/disable"));
 
 		for (s = sclist; s != NULL; s = s->next)
 			if (s->func == do_toggle_void)
-				allocsize += strlen(_(flagtostr(s->toggle))) + endis_len + 8;
+				allocsize += strlen(_(flagtostr(s->toggle))) + onoff_len + 9;
 	}
 #endif
 
@@ -493,40 +477,39 @@ void help_init(void)
 	if (htx[2] != NULL)
 		strcat(help_text, htx[2]);
 
-	ptr = help_text + strlen(help_text);
-
 	/* Remember this end-of-introduction, start-of-shortcuts. */
-	end_of_intro = ptr;
+	end_of_intro = help_text + strlen(help_text);
+	ptr = end_of_intro;
 
-	/* Now add our shortcut info. */
+	/* Now add the shortcuts and their descriptions. */
 	for (f = allfuncs; f != NULL; f = f->next) {
 		int tally = 0;
 
 		if ((f->menus & currmenu) == 0)
 			continue;
 
-		/* Let's simply show the first two shortcuts from the list. */
+		/* Show the first two shortcuts (if any) for each function. */
 		for (s = sclist; s != NULL; s = s->next) {
 			if ((s->menus & currmenu) && s->func == f->func) {
-				/* Make the first column narrower (6) than the second (10),
-				 * but allow it to spill into the second, for "M-Space". */
+				/* Make the first column 7 cells wide and the second 10. */
 				if (++tally == 1) {
-					sprintf(ptr, "%s               ", s->keystr);
+					sprintf(ptr, "%s                ", s->keystr);
 					/* Unicode arrows take three bytes instead of one. */
-					ptr += (strstr(s->keystr, "\xE2") != NULL ? 8 : 6);
+					ptr += (strstr(s->keystr, "\xE2") != NULL ? 9 : 7);
 				} else {
-					ptr += sprintf(ptr, "(%s)\t", s->keystr);
+					sprintf(ptr, "(%s)       ", s->keystr);
+					ptr += (strstr(s->keystr, "\xE2") != NULL ? 12 : 10);
 					break;
 				}
 			}
 		}
 
 		if (tally == 0)
-			ptr += sprintf(ptr, "\t\t");
+			ptr += sprintf(ptr, "\t\t ");
 		else if (tally == 1)
 			ptr += 10;
 
-		/* The shortcut's help text. */
+		/* The shortcut's description. */
 		ptr += sprintf(ptr, "%s\n", _(f->help));
 
 		if (f->blank_after)
@@ -547,7 +530,7 @@ void help_init(void)
 			counter++;
 			for (s = sclist; s != NULL; s = s->next)
 				if (s->toggle && s->ordinal == counter) {
-					ptr += sprintf(ptr, "%s\t\t%s %s\n", (s->menus == MMAIN ? s->keystr : ""),
+					ptr += sprintf(ptr, "%s\t\t %s %s\n", (s->menus == MMAIN ? s->keystr : ""),
 								_(flagtostr(s->toggle)), _("enable/disable"));
 					if (s->toggle == NO_COLOR_SYNTAX || s->toggle == TABS_TO_SPACES)
 						ptr += sprintf(ptr, "\n");
@@ -607,7 +590,7 @@ size_t help_line_len(const char *ptr)
 
 	/* Get the length of the entire line up to a null or a newline. */
 	while (*(ptr + length) != '\0' && *(ptr + length) != '\n')
-		length = move_mbright(ptr, length);
+		length = step_right(ptr, length);
 
 	/* If the entire line will just fit the screen, don't wrap it. */
 	if (wideness(ptr, length) <= wrapping_point + 1)

src/history.c

@@ -119,7 +119,7 @@ void update_history(linestruct **item, const char *text)
 			*htop = after;
 
 		unlink_node(thesame);
-		renumber(after);
+		renumber_from(after);
 	}
 
 	/* If the history is full, delete the oldest item (the one at the
@@ -129,7 +129,7 @@ void update_history(linestruct **item, const char *text)
 
 		*htop = (*htop)->next;
 		unlink_node(oldest);
-		renumber(*htop);
+		renumber_from(*htop);
 	}
 
 	/* Store the fresh string in the last item, then create a new item. */
@@ -528,7 +528,7 @@ void update_poshistory(char *filename, ssize_t lineno, ssize_t xpos)
 	poshiststruct *posptr, *theone, *posprev = NULL;
 	char *fullpath = get_full_path(filename);
 
-	if (fullpath == NULL || fullpath[strlen(fullpath) - 1] == '/' || inhelp) {
+	if (fullpath == NULL || fullpath[strlen(fullpath) - 1] == '/') {
 		free(fullpath);
 		return;
 	}

src/move.c

@@ -278,7 +278,7 @@ void do_prev_word(bool allow_punct)
 		}
 
 		/* Step back one character. */
-		openfile->current_x = move_mbleft(openfile->current->data,
+		openfile->current_x = step_left(openfile->current->data,
 												openfile->current_x);
 
 		if (is_word_mbchar(openfile->current->data + openfile->current_x,
@@ -296,7 +296,7 @@ void do_prev_word(bool allow_punct)
 
 	if (step_forward)
 		/* Move one character forward again to sit on the start of the word. */
-		openfile->current_x = move_mbright(openfile->current->data,
+		openfile->current_x = step_right(openfile->current->data,
 												openfile->current_x);
 }
 
@@ -324,7 +324,7 @@ bool do_next_word(bool after_ends, bool allow_punct)
 			seen_space = TRUE;
 		} else {
 			/* Step forward one character. */
-			openfile->current_x = move_mbright(openfile->current->data,
+			openfile->current_x = step_right(openfile->current->data,
 												openfile->current_x);
 		}
 
@@ -570,7 +570,7 @@ void do_left(void)
 	linestruct *was_current = openfile->current;
 
 	if (openfile->current_x > 0)
-		openfile->current_x = move_mbleft(openfile->current->data,
+		openfile->current_x = step_left(openfile->current->data,
 												openfile->current_x);
 	else if (openfile->current != openfile->filetop) {
 		openfile->current = openfile->current->prev;
@@ -586,7 +586,7 @@ void do_right(void)
 	linestruct *was_current = openfile->current;
 
 	if (openfile->current->data[openfile->current_x] != '\0')
-		openfile->current_x = move_mbright(openfile->current->data,
+		openfile->current_x = step_right(openfile->current->data,
 												openfile->current_x);
 	else if (openfile->current != openfile->filebot) {
 		openfile->current = openfile->current->next;

src/nano.h

@@ -113,14 +113,11 @@
 #define N_(string) gettext_noop(string)
 		/* Mark a string that will be sent to gettext() later. */
 
-#include <stddef.h>
-#include <stdlib.h>
-#include <sys/types.h>
-#include <sys/stat.h>
 #include <dirent.h>
 #include <regex.h>
 #include <signal.h>
-#include <assert.h>
+#include <stdlib.h>
+#include <sys/stat.h>
 
 /* If we aren't using an ncurses with mouse support, exclude any
  * mouse routines, as they are useless then. */
@@ -147,6 +144,8 @@
 #define BAD_COLOR -2
 #endif
 
+#define STANDARD_INPUT  0
+
 /* Enumeration types. */
 typedef enum {
 	NIX_FILE, DOS_FILE, MAC_FILE
@@ -188,21 +187,14 @@ typedef struct colortype {
 		/* This syntax's foreground color. */
 	short bg;
 		/* This syntax's background color. */
-	int pairnum;
-		/* The color pair number used for this foreground color and
-		 * background color. */
+	short pairnum;
+		/* The pair number for this foreground/background color combination. */
 	int attributes;
 		/* Pair number and brightness composed into ready-to-use attributes. */
-	int rex_flags;
-		/* The regex compilation flags (with or without REG_ICASE). */
-	char *start_regex;
-		/* The start (or all) of the regex string. */
 	regex_t *start;
-		/* The compiled start (or all) of the regex string. */
-	char *end_regex;
-		/* The end (if any) of the regex string. */
+		/* The compiled regular expression for 'start=', or the only one. */
 	regex_t *end;
-		/* The compiled end (if any) of the regex string. */
+		/* The compiled regular expression for 'end=', if any. */
 	struct colortype *next;
 		/* Next set of colors. */
 	int id;
@@ -216,9 +208,26 @@ typedef struct regexlisttype {
 		/* The next regex. */
 } regexlisttype;
 
+typedef struct augmentstruct {
+	char *filename;
+		/* The file where the syntax is extended. */
+	ssize_t lineno;
+		/* The number of the line of the extendsyntax command. */
+	char *data;
+		/* The text of the line. */
+	struct augmentstruct *next;
+		/* Next node. */
+} augmentstruct;
+
 typedef struct syntaxtype {
 	char *name;
 		/* The name of this syntax. */
+	char *filename;
+		/* File where the syntax is defined, or NULL if not an included file. */
+	size_t lineno;
+		/* The line number where the 'syntax' command was found. */
+	struct augmentstruct *augmentations;
+		/* List of extendsyntax commands to apply when loaded. */
 	regexlisttype *extensions;
 		/* The list of extensions that this syntax applies to. */
 	regexlisttype *headers;
@@ -285,24 +294,6 @@ typedef struct linestruct {
 #endif
 } linestruct;
 
-typedef struct partition {
-	linestruct *filetop;
-		/* The top line of this portion of the file. */
-	linestruct *top_prev;
-		/* The line before the top line of this portion of the file. */
-	char *top_data;
-		/* The text before the beginning of the top line of this portion
-		 * of the file. */
-	linestruct *filebot;
-		/* The bottom line of this portion of the file. */
-	linestruct *bot_next;
-		/* The line after the bottom line of this portion of the
-		 * file. */
-	char *bot_data;
-		/* The text after the end of the bottom line of this portion of
-		 * the file. */
-} partition;
-
 #ifndef NANO_TINY
 typedef struct undo_group {
 	ssize_t top_line;
@@ -330,12 +321,8 @@ typedef struct undo {
 		/* Some flag data we need. */
 	undo_group *grouping;
 		/* Undo info specific to groups of lines. */
-
-	/* Cut-specific stuff we need. */
 	linestruct *cutbuffer;
 		/* Copy of the cutbuffer. */
-	linestruct *cutbottom;
-		/* Copy of cutbottom. */
 	ssize_t mark_begin_lineno;
 		/* Mostly the line number of the current line; sometimes something else. */
 	size_t mark_begin_x;

src/prompt.c

@@ -150,8 +150,8 @@ int do_statusbar_input(bool *finished)
 		else if (ISSET(RESTRICTED) && currmenu == MWRITEFILE &&
 								openfile->filename[0] != '\0' &&
 								(shortcut->func == do_verbatim_input ||
-								shortcut->func == do_cut_text_void ||
-								shortcut->func == do_uncut_text ||
+								shortcut->func == cut_text ||
+								shortcut->func == paste_text ||
 								shortcut->func == do_delete ||
 								shortcut->func == do_backspace))
 			;
@@ -161,13 +161,13 @@ int do_statusbar_input(bool *finished)
 #endif
 		else if (shortcut->func == do_verbatim_input)
 			do_statusbar_verbatim_input();
-		else if (shortcut->func == do_cut_text_void)
+		else if (shortcut->func == cut_text)
 			do_statusbar_cut_text();
 		else if (shortcut->func == do_delete)
 			do_statusbar_delete();
 		else if (shortcut->func == do_backspace)
 			do_statusbar_backspace();
-		else if (shortcut->func == do_uncut_text) {
+		else if (shortcut->func == paste_text) {
 			if (cutbuffer != NULL)
 				do_statusbar_uncut_text();
 		} else {
@@ -190,7 +190,7 @@ void do_statusbar_output(int *the_input, size_t input_len,
 {
 	char *output = charalloc(input_len + 1);
 	char onechar[MAXCHARLEN];
-	size_t char_len, i, j = 0;
+	size_t charlen, i, j = 0;
 
 	/* Copy the typed stuff so it can be treated. */
 	for (i = 0; i < input_len; i++)
@@ -203,21 +203,21 @@ void do_statusbar_output(int *the_input, size_t input_len,
 			output[j] = '\n';
 
 		/* Interpret the next multibyte character. */
-		char_len = parse_mbchar(output + j, onechar, NULL);
+		charlen = parse_mbchar(output + j, onechar, NULL);
 
-		j += char_len;
+		j += charlen;
 
 		/* When filtering, skip any ASCII control character. */
-		if (filtering && is_ascii_cntrl_char(*(output + j - char_len)))
+		if (filtering && is_ascii_cntrl_char(*(output + j - charlen)))
 			continue;
 
 		/* Insert the typed character into the existing answer string. */
-		answer = charealloc(answer, strlen(answer) + char_len + 1);
-		charmove(answer + typing_x + char_len, answer + typing_x,
+		answer = charealloc(answer, strlen(answer) + charlen + 1);
+		charmove(answer + typing_x + charlen, answer + typing_x,
 								strlen(answer) - typing_x + 1);
-		strncpy(answer + typing_x, onechar, char_len);
+		strncpy(answer + typing_x, onechar, charlen);
 
-		typing_x += char_len;
+		typing_x += charlen;
 	}
 
 	free(output);
@@ -239,24 +239,24 @@ void do_statusbar_end(void)
 void do_statusbar_left(void)
 {
 	if (typing_x > 0)
-		typing_x = move_mbleft(answer, typing_x);
+		typing_x = step_left(answer, typing_x);
 }
 
 /* Move right one character. */
 void do_statusbar_right(void)
 {
 	if (answer[typing_x] != '\0')
-		typing_x = move_mbright(answer, typing_x);
+		typing_x = step_right(answer, typing_x);
 }
 
 /* Delete one character. */
 void do_statusbar_delete(void)
 {
 	if (answer[typing_x] != '\0') {
-		int char_len = parse_mbchar(answer + typing_x, NULL, NULL);
+		int charlen = char_length(answer + typing_x);
 
-		charmove(answer + typing_x, answer + typing_x + char_len,
-						strlen(answer) - typing_x - char_len + 1);
+		charmove(answer + typing_x, answer + typing_x + charlen,
+						strlen(answer) - typing_x - charlen + 1);
 	}
 }
 
@@ -264,7 +264,7 @@ void do_statusbar_delete(void)
 void do_statusbar_backspace(void)
 {
 	if (typing_x > 0) {
-		typing_x = move_mbleft(answer, typing_x);
+		typing_x = step_left(answer, typing_x);
 		do_statusbar_delete();
 	}
 }
@@ -288,7 +288,7 @@ void do_statusbar_next_word(void)
 	/* Move forward until we reach either the end or the start of a word,
 	 * depending on whether the AFTER_ENDS flag is set or not. */
 	while (answer[typing_x] != '\0') {
-		typing_x = move_mbright(answer, typing_x);
+		typing_x = step_right(answer, typing_x);
 
 		if (ISSET(AFTER_ENDS)) {
 			/* If this is a word character, continue; else it's a separator,
@@ -315,7 +315,7 @@ void do_statusbar_prev_word(void)
 
 	/* Move backward until we pass over the start of a word. */
 	while (typing_x != 0) {
-		typing_x = move_mbleft(answer, typing_x);
+		typing_x = step_left(answer, typing_x);
 
 		if (is_word_mbchar(answer + typing_x, FALSE))
 			seen_a_word = TRUE;
@@ -328,7 +328,7 @@ void do_statusbar_prev_word(void)
 
 	if (step_forward)
 		/* Move one character forward again to sit on the start of the word. */
-		typing_x = move_mbright(answer, typing_x);
+		typing_x = step_right(answer, typing_x);
 }
 #endif /* !NANO_TINY */
 
@@ -738,6 +738,12 @@ int do_yesno_prompt(bool all, const char *msg)
 			choice = 2;
 		else if (func_from_key(&kbinput) == do_cancel)
 			choice = -1;
+		/* Interpret ^N and ^Q as "No", to allow exiting in anger. */
+		else if (kbinput == '\x0E' || kbinput == '\x11')
+			choice = 0;
+		/* And interpret ^Y as "Yes". */
+		else if (kbinput == '\x19')
+			choice = 1;
 #ifdef ENABLE_MOUSE
 		else if (kbinput == KEY_MOUSE) {
 			int mouse_x, mouse_y;

src/proto.h

@@ -29,9 +29,7 @@
 extern volatile sig_atomic_t the_window_resized;
 #endif
 
-#ifdef __linux__
 extern bool on_a_vt;
-#endif
 
 extern bool meta_key;
 extern bool shift_held;
@@ -40,8 +38,12 @@ extern bool focusing;
 
 extern bool as_an_at;
 
+extern bool control_C_was_pressed;
+
 extern bool suppress_cursorpos;
 
+extern bool started_curses;
+
 extern message_type lastmessage;
 
 extern linestruct *pletion_line;
@@ -96,7 +98,6 @@ extern linestruct *cutbuffer;
 extern linestruct *cutbottom;
 extern bool keep_cutbuffer;
 
-extern partition *filepart;
 extern openfilestruct *openfile;
 #ifdef ENABLE_MULTIBUFFER
 extern openfilestruct *startfile;
@@ -209,12 +210,12 @@ bool is_ascii_cntrl_char(int c);
 bool is_cntrl_mbchar(const char *c);
 bool is_word_mbchar(const char *c, bool allow_punct);
 char control_mbrep(const char *c, bool isdata);
-int length_of_char(const char *c, int *width);
 int mbwidth(const char *c);
 char *make_mbchar(long chr, int *chr_mb_len);
+int char_length(const char *pointer);
 int parse_mbchar(const char *buf, char *chr, size_t *col);
-size_t move_mbleft(const char *buf, size_t pos);
-size_t move_mbright(const char *buf, size_t pos);
+size_t step_left(const char *buf, size_t pos);
+size_t step_right(const char *buf, size_t pos);
 int mbstrcasecmp(const char *s1, const char *s2);
 int mbstrncasecmp(const char *s1, const char *s2, size_t n);
 char *mbstrcasestr(const char *haystack, const char *needle);
@@ -254,35 +255,32 @@ void chop_previous_word(void);
 void chop_next_word(void);
 void cut_marked(bool *right_side_up);
 #endif
-void do_cut_text(bool copy_text, bool marked, bool cut_till_eof, bool append);
+void do_cut_text(bool copying, bool marked, bool until_eof, bool append);
 bool is_cuttable(bool test_cliff);
-void do_cut_text_void(void);
+void cut_text(void);
 #ifndef NANO_TINY
-void do_copy_text(void);
-void do_cut_till_eof(void);
+void copy_text(void);
+void cut_till_eof(void);
 void zap_text(void);
 #endif
-void do_uncut_text(void);
+void paste_text(void);
 
 /* Most functions in files.c. */
-void initialize_buffer_text(void);
+void make_new_buffer(void);
 void set_modified(void);
 bool open_buffer(const char *filename, bool new_buffer);
 #ifdef ENABLE_SPELLER
-void replace_buffer(const char *filename);
-#ifndef NANO_TINY
-void replace_marked_buffer(const char *filename);
-#endif
+bool replace_buffer(const char *filename, undo_type action, bool marked);
 #endif
 void prepare_for_display(void);
 #ifdef ENABLE_MULTIBUFFER
 void mention_name_and_linecount(void);
 void switch_to_prev_buffer(void);
 void switch_to_next_buffer(void);
-bool close_buffer(void);
+void close_buffer(void);
 #endif
 void read_file(FILE *f, int fd, const char *filename, bool undoable);
-int open_file(const char *filename, bool newfie, bool quiet, FILE **f);
+int open_file(const char *filename, bool newfie, FILE **f);
 char *get_next_filename(const char *name, const char *suffix);
 void do_insertfile_void(void);
 char *get_full_path(const char *origpath);
@@ -322,9 +320,7 @@ int the_code_for(void (*func)(void), int defaultval);
 functionptrtype func_from_key(int *kbinput);
 int keycode_from_string(const char *keystring);
 void assign_keyinfo(keystruct *s, const char *keystring, const int keycode);
-void print_sclist(void);
 void shortcut_init(void);
-const funcstruct *sctofunc(const keystruct *s);
 const char *flagtostr(int flag);
 #ifdef ENABLE_NANORC
 keystruct *strtosc(const char *input);
@@ -334,7 +330,7 @@ char *menu_to_name(int menu);
 
 /* All functions in help.c. */
 #ifdef ENABLE_HELP
-void wrap_the_help_text(bool redisplaying);
+void wrap_help_text_into_buffer();
 void do_help(void);
 void help_init(void);
 functionptrtype parse_help_input(int *kbinput);
@@ -397,18 +393,13 @@ void unlink_node(linestruct *fileptr);
 void delete_node(linestruct *fileptr);
 linestruct *copy_buffer(const linestruct *src);
 void free_lines(linestruct *src);
-void renumber(linestruct *line);
-partition *partition_buffer(linestruct *top, size_t top_x,
+void renumber_from(linestruct *line);
+void partition_buffer(linestruct *top, size_t top_x,
 		linestruct *bot, size_t bot_x);
-void unpartition_buffer(partition **p);
-void extract_buffer(linestruct **file_top, linestruct **file_bot,
-		linestruct *top, size_t top_x, linestruct *bot, size_t bot_x);
+void unpartition_buffer();
+void extract(linestruct *top, size_t top_x, linestruct *bot, size_t bot_x);
 void ingraft_buffer(linestruct *somebuffer);
 void copy_from_buffer(linestruct *somebuffer);
-#ifdef ENABLE_MULTIBUFFER
-void unlink_opennode(openfilestruct *fileptr);
-void delete_opennode(openfilestruct *fileptr);
-#endif
 void print_view_warning(void);
 void show_restricted_warning(void);
 #ifndef ENABLE_HELP
@@ -420,6 +411,9 @@ void emergency_save(const char *die_filename, struct stat *die_stat);
 void window_init(void);
 void do_exit(void);
 void close_and_go(void);
+void install_handler_for_Ctrl_C(void);
+void restore_handler_for_Ctrl_C(void);
+void reconnect_and_store_state(void);
 RETSIGTYPE handle_hupterm(int signal);
 #ifndef DEBUG
 RETSIGTYPE handle_crash(int signal);
@@ -433,8 +427,9 @@ void block_sigwinch(bool blockit);
 RETSIGTYPE handle_sigwinch(int signal);
 void regenerate_screen(void);
 void do_toggle(int flag);
-void enable_signals(void);
 #endif
+void disable_kb_interrupt(void);
+void enable_kb_interrupt(void);
 void disable_flow_control(void);
 void enable_flow_control(void);
 void terminal_init(void);
@@ -470,15 +465,17 @@ int do_yesno_prompt(bool all, const char *msg);
 
 /* Most functions in rcfile.c. */
 #ifdef ENABLE_NANORC
+void display_rcfile_errors();
 #ifdef ENABLE_COLOR
+void parse_one_include(char *file, syntaxtype *syntax);
 void grab_and_store(const char *kind, char *ptr, regexlisttype **storage);
+bool parse_syntax_commands(char *keyword, char *ptr);
 #endif
-void parse_rcfile(FILE *rcstream, bool syntax_only);
+void parse_rcfile(FILE *rcstream, bool just_syntax, bool intros_only);
 void do_rcfiles(void);
 #endif /* ENABLE_NANORC */
 
 /* Most functions in search.c. */
-void tidy_up_after_search(void);
 int findnextstr(const char *needle, bool whole_word_only, int modus,
 		size_t *match_len, bool skipone, const linestruct *begin, size_t begin_x);
 void do_search(void);
@@ -571,7 +568,6 @@ bool is_separate_word(size_t position, size_t length, const char *buf);
 #endif
 const char *strstrwrapper(const char *haystack, const char *needle,
 		const char *start);
-void nperror(const char *s);
 void *nmalloc(size_t howmuch);
 void *nrealloc(void *ptr, size_t howmuch);
 char *mallocstrncpy(char *dest, const char *src, size_t n);
@@ -587,13 +583,13 @@ void new_magicline(void);
 void remove_magicline(void);
 #endif
 #ifndef NANO_TINY
-void mark_order(const linestruct **top, size_t *top_x,
+void get_region(const linestruct **top, size_t *top_x,
 		const linestruct **bot, size_t *bot_x, bool *right_side_up);
 void get_range(const linestruct **top, const linestruct **bot);
 #endif
 size_t get_totsize(const linestruct *begin, const linestruct *end);
 #ifndef NANO_TINY
-linestruct *fsfromline(ssize_t lineno);
+linestruct *line_from_number(ssize_t lineno);
 #endif
 
 /* Most functions in winio.c. */

src/rcfile.c

@@ -3,6 +3,7 @@
  *                                                                        *
  *   Copyright (C) 2001-2011, 2013-2019 Free Software Foundation, Inc.    *
  *   Copyright (C) 2014 Mike Frysinger                                    *
+ *   Copyright (C) 2019 Brand Huntsman                                    *
  *   Copyright (C) 2014-2019 Benno Schulenberg                            *
  *                                                                        *
  *   GNU nano is free software: you can redistribute it and/or modify     *
@@ -140,30 +141,54 @@ static bool opensyntax = FALSE;
 		 * or when a new syntax command is seen, this bool becomes FALSE. */
 static syntaxtype *live_syntax;
 		/* The syntax that is currently being parsed. */
+static bool seen_color_command = FALSE;
+		/* Whether a syntax definition contains any color commands. */
 static colortype *lastcolor = NULL;
 		/* The end of the color list for the current syntax. */
 #endif
 
-/* Report an error in an rcfile, printing it to stderr. */
-void rcfile_error(const char *msg, ...)
+static linestruct *errors_head = NULL;
+static linestruct *errors_tail = NULL;
+		/* Beginning and end of a list of errors in rcfiles, if any. */
+
+/* Send the gathered error messages (if any) to the terminal. */
+void display_rcfile_errors()
 {
+	for (linestruct *error = errors_head; error != NULL; error = error->next)
+		fprintf(stderr, "%s\n", error->data);
+}
+
+#define MAXSIZE  (PATH_MAX + 200)
+
+/* Store the given error message in a linked list, to be printed upon exit. */
+void jot_error(const char *msg, ...)
+{
+	linestruct *error = make_new_node(errors_tail);
+	char textbuf[MAXSIZE];
+	int length = 0;
 	va_list ap;
 
+	if (errors_head == NULL)
+		errors_head = error;
+	else
+		errors_tail->next = error;
+	errors_tail = error;
+
 	if (rcfile_with_errors == NULL)
 		rcfile_with_errors = strdup(nanorc);
 
 	if (lineno > 0)
-		fprintf(stderr, _("Error in %s on line %zu: "), nanorc, lineno);
+		length = snprintf(textbuf, MAXSIZE, _("Error in %s on line %zu: "),
+											nanorc, lineno);
 
 	va_start(ap, msg);
-	vfprintf(stderr, _(msg), ap);
+	length += vsnprintf(textbuf + length, MAXSIZE - length, _(msg), ap);
 	va_end(ap);
 
-	fprintf(stderr, "\n");
+	error->data = nmalloc(length + 1);
+	sprintf(error->data, "%s", textbuf);
 }
-#endif /* ENABLE_NANORC */
 
-#if defined(ENABLE_NANORC) || defined(ENABLE_HISTORIES)
 /* Parse the next word from the string, null-terminate it, and return
  * a pointer to the first character after the null terminator.  The
  * returned pointer will point to '\0' if we hit the end of the line. */
@@ -183,9 +208,7 @@ char *parse_next_word(char *ptr)
 
 	return ptr;
 }
-#endif /* ENABLE_NANORC || ENABLE_HISTORIES */
 
-#ifdef ENABLE_NANORC
 /* Parse an argument, with optional quotes, after a keyword that takes
  * one.  If the next word starts with a ", we say that it ends with the
  * last " of the line.  Otherwise, we interpret it as usual, so that the
@@ -204,7 +227,7 @@ char *parse_argument(char *ptr)
 	}
 
 	if (last_quote == NULL) {
-		rcfile_error(N_("Argument '%s' has an unterminated \""), ptr_save);
+		jot_error(N_("Argument '%s' has an unterminated \""), ptr_save);
 		return NULL;
 	}
 
@@ -229,7 +252,7 @@ char *parse_next_regex(char *ptr)
 		ptr++;
 
 	if (*ptr == '\0') {
-		rcfile_error(N_("Regex strings must begin and end with a \" character"));
+		jot_error(N_("Regex strings must begin and end with a \" character"));
 		return NULL;
 	}
 
@@ -242,38 +265,41 @@ char *parse_next_regex(char *ptr)
 	return ptr;
 }
 
-/* Compile the regular expression regex to see if it's valid.  Return
- * TRUE if it is, and FALSE otherwise. */
-bool nregcomp(const char *regex, int compile_flags)
+/* Compile the given regular expression and store the result in packed (when
+ * this pointer is not NULL).  Return TRUE when the expression is valid. */
+bool compile(const char *expression, int rex_flags, regex_t **packed)
 {
-	regex_t preg;
-	int rc = regcomp(&preg, regex, compile_flags);
+	regex_t *compiled = nmalloc(sizeof(regex_t));
+	int outcome = regcomp(compiled, expression, rex_flags);
 
-	if (rc != 0) {
-		size_t len = regerror(rc, &preg, NULL, 0);
-		char *str = charalloc(len);
+	if (outcome != 0) {
+		size_t length = regerror(outcome, compiled, NULL, 0);
+		char *message = charalloc(length);
 
-		regerror(rc, &preg, str, len);
-		rcfile_error(N_("Bad regex \"%s\": %s"), regex, str);
-		free(str);
+		regerror(outcome, compiled, message, length);
+		jot_error(N_("Bad regex \"%s\": %s"), expression, message);
+		free(message);
 	}
 
-	regfree(&preg);
-	return (rc == 0);
+	if (packed == NULL || outcome != 0) {
+		regfree(compiled);
+		free(compiled);
+	} else
+		*packed = compiled;
+
+	return (outcome == 0);
 }
 
 /* Parse the next syntax name and its possible extension regexes from the
  * line at ptr, and add it to the global linked list of color syntaxes. */
-void parse_syntax(char *ptr)
+void begin_new_syntax(char *ptr)
 {
 	char *nameptr = ptr;
 
-	opensyntax = FALSE;
-
 	/* Check that the syntax name is not empty. */
 	if (*ptr == '\0' || (*ptr == '"' &&
 						(*(ptr + 1) == '\0' || *(ptr + 1) == '"'))) {
-		rcfile_error(N_("Missing syntax name"));
+		jot_error(N_("Missing syntax name"));
 		return;
 	}
 
@@ -281,7 +307,7 @@ void parse_syntax(char *ptr)
 
 	/* Check that quotes around the name are either paired or absent. */
 	if ((*nameptr == '\x22') ^ (nameptr[strlen(nameptr) - 1] == '\x22')) {
-		rcfile_error(N_("Unpaired quote in syntax name"));
+		jot_error(N_("Unpaired quote in syntax name"));
 		return;
 	}
 
@@ -293,13 +319,16 @@ void parse_syntax(char *ptr)
 
 	/* Redefining the "none" syntax is not allowed. */
 	if (strcmp(nameptr, "none") == 0) {
-		rcfile_error(N_("The \"none\" syntax is reserved"));
+		jot_error(N_("The \"none\" syntax is reserved"));
 		return;
 	}
 
 	/* Initialize a new syntax struct. */
 	live_syntax = (syntaxtype *)nmalloc(sizeof(syntaxtype));
 	live_syntax->name = mallocstrcpy(NULL, nameptr);
+	live_syntax->filename = strdup(nanorc);
+	live_syntax->lineno = lineno;
+	live_syntax->augmentations = NULL;
 	live_syntax->extensions = NULL;
 	live_syntax->headers = NULL;
 	live_syntax->magics = NULL;
@@ -308,7 +337,6 @@ void parse_syntax(char *ptr)
 	live_syntax->comment = mallocstrcpy(NULL, GENERAL_COMMENT_CHARACTER);
 #endif
 	live_syntax->color = NULL;
-	lastcolor = NULL;
 	live_syntax->nmultis = 0;
 
 	/* Hook the new syntax in at the top of the list. */
@@ -316,10 +344,11 @@ void parse_syntax(char *ptr)
 	syntaxes = live_syntax;
 
 	opensyntax = TRUE;
+	seen_color_command = FALSE;
 
 	/* The default syntax should have no associated extensions. */
 	if (strcmp(live_syntax->name, "default") == 0 && *ptr != '\0') {
-		rcfile_error(N_("The \"default\" syntax does not accept extensions"));
+		jot_error(N_("The \"default\" syntax does not accept extensions"));
 		return;
 	}
 
@@ -329,6 +358,17 @@ void parse_syntax(char *ptr)
 }
 #endif /* ENABLE_COLOR */
 
+/* Verify that a syntax definition contains at least one color command. */
+void check_for_nonempty_syntax(void)
+{
+#ifdef ENABLE_COLOR
+	if (opensyntax && !seen_color_command)
+		jot_error(N_("Syntax \"%s\" has no color commands"), live_syntax->name);
+
+	opensyntax = FALSE;
+#endif
+}
+
 /* Return TRUE when the given function is present in almost all menus. */
 bool is_universal(void (*func)(void))
 {
@@ -338,7 +378,7 @@ bool is_universal(void (*func)(void))
 		func == do_prev_word_void || func == do_next_word_void ||
 #endif
 		func == do_delete || func == do_backspace ||
-		func == do_cut_text_void || func == do_uncut_text ||
+		func == cut_text || func == paste_text ||
 		func == do_tab || func == do_enter || func == do_verbatim_input);
 }
 
@@ -350,8 +390,10 @@ void parse_binding(char *ptr, bool dobind)
 	int menu, mask = 0;
 	funcstruct *f;
 
+	check_for_nonempty_syntax();
+
 	if (*ptr == '\0') {
-		rcfile_error(N_("Missing key name"));
+		jot_error(N_("Missing key name"));
 		return;
 	}
 
@@ -360,7 +402,7 @@ void parse_binding(char *ptr, bool dobind)
 	keycopy = mallocstrcpy(NULL, keyptr);
 
 	if (strlen(keycopy) < 2) {
-		rcfile_error(N_("Key name is too short"));
+		jot_error(N_("Key name is too short"));
 		goto free_things;
 	}
 
@@ -371,7 +413,7 @@ void parse_binding(char *ptr, bool dobind)
 		if (strlen(keycopy) > 2)
 			keycopy[2] = toupper((unsigned char)keycopy[2]);
 		else {
-			rcfile_error(N_("Key name is too short"));
+			jot_error(N_("Key name is too short"));
 			goto free_things;
 		}
 	}
@@ -381,10 +423,10 @@ void parse_binding(char *ptr, bool dobind)
 	if (!strcasecmp(keycopy, "Ins") || !strcasecmp(keycopy, "Del"))
 		keycopy[1] = tolower((unsigned char)keycopy[1]);
 	else if (keycopy[0] != '^' && keycopy[0] != 'M' && keycopy[0] != 'F') {
-		rcfile_error(N_("Key name must begin with \"^\", \"M\", or \"F\""));
+		jot_error(N_("Key name must begin with \"^\", \"M\", or \"F\""));
 		goto free_things;
 	} else if (keycode_from_string(keycopy) < 0) {
-		rcfile_error(N_("Key name %s is invalid"), keycopy);
+		jot_error(N_("Key name %s is invalid"), keycopy);
 		goto free_things;
 	}
 
@@ -393,7 +435,7 @@ void parse_binding(char *ptr, bool dobind)
 		ptr = parse_argument(ptr);
 
 		if (funcptr[0] == '\0') {
-			rcfile_error(N_("Must specify a function to bind the key to"));
+			jot_error(N_("Must specify a function to bind the key to"));
 			goto free_things;
 		} else if (ptr == NULL)
 			goto free_things;
@@ -404,7 +446,8 @@ void parse_binding(char *ptr, bool dobind)
 
 	if (menuptr[0] == '\0') {
 		/* TRANSLATORS: Do not translate the word "all". */
-		rcfile_error(N_("Must specify a menu (or \"all\") in which to bind/unbind the key"));
+		jot_error(N_("Must specify a menu (or \"all\") "
+						"in which to bind/unbind the key"));
 		goto free_things;
 	}
 
@@ -422,14 +465,14 @@ void parse_binding(char *ptr, bool dobind)
 			newsc = strtosc(funcptr);
 
 		if (newsc == NULL) {
-			rcfile_error(N_("Cannot map name \"%s\" to a function"), funcptr);
+			jot_error(N_("Cannot map name \"%s\" to a function"), funcptr);
 			goto free_things;
 		}
 	}
 
 	menu = name_to_menu(menuptr);
 	if (menu < 1) {
-		rcfile_error(N_("Cannot map name \"%s\" to a menu"), menuptr);
+		jot_error(N_("Cannot map name \"%s\" to a menu"), menuptr);
 		goto free_things;
 	}
 
@@ -462,7 +505,7 @@ void parse_binding(char *ptr, bool dobind)
 
 	if (!menu) {
 		if (!ISSET(RESTRICTED) && !ISSET(VIEW_MODE))
-			rcfile_error(N_("Function '%s' does not exist in menu '%s'"),
+			jot_error(N_("Function '%s' does not exist in menu '%s'"),
 								funcptr, menuptr);
 		goto free_things;
 	}
@@ -473,7 +516,7 @@ void parse_binding(char *ptr, bool dobind)
 	/* Disallow rebinding ^[ and frequent escape-sequence starter "Esc [". */
 	if ((!newsc->meta && newsc->keycode == ESC_CODE) ||
 				(newsc->meta && newsc->keycode == '[')) {
-		rcfile_error(N_("Keystroke %s may not be rebound"), keycopy);
+		jot_error(N_("Keystroke %s may not be rebound"), keycopy);
   free_things:
 		free(keycopy);
 		free(newsc);
@@ -506,8 +549,8 @@ bool is_good_file(char *file)
 	/* 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") :
-										_("\"%s\" is a device file"), file);
+		jot_error(S_ISDIR(rcinfo.st_mode) ? N_("\"%s\" is a directory") :
+										N_("\"%s\" is a device file"), file);
 		return FALSE;
 	} else
 		return TRUE;
@@ -515,8 +558,9 @@ bool is_good_file(char *file)
 
 #ifdef ENABLE_COLOR
 /* Read and parse one included syntax file. */
-static void parse_one_include(char *file)
+void parse_one_include(char *file, syntaxtype *syntax)
 {
+	augmentstruct *extra;
 	FILE *rcstream;
 
 	/* Don't open directories, character files, or block files. */
@@ -527,7 +571,7 @@ static void parse_one_include(char *file)
 	rcstream = fopen(file, "rb");
 
 	if (rcstream == NULL) {
-		rcfile_error(_("Error reading %s: %s"), file, strerror(errno));
+		jot_error(N_("Error reading %s: %s"), file, strerror(errno));
 		return;
 	}
 
@@ -536,7 +580,36 @@ static void parse_one_include(char *file)
 	nanorc = file;
 	lineno = 0;
 
-	parse_rcfile(rcstream, TRUE);
+	/* If this is the first pass, parse only the prologue. */
+	if (syntax == NULL) {
+		parse_rcfile(rcstream, TRUE, TRUE);
+		return;
+	}
+
+	live_syntax = syntax;
+	lastcolor = NULL;
+
+	/* Fully parse the given syntax (as it is about to be used). */
+	parse_rcfile(rcstream, TRUE, FALSE);
+
+	extra = syntax->augmentations;
+
+	/* Apply any stored extendsyntax commands. */
+	while (extra != NULL) {
+		char *keyword = extra->data;
+		char *therest = parse_next_word(extra->data);
+
+		nanorc = extra->filename;
+		lineno = extra->lineno;
+
+		if (!parse_syntax_commands(keyword, therest))
+			jot_error(N_("Command \"%s\" not understood"), keyword);
+
+		extra = extra->next;
+	}
+
+	free(syntax->filename);
+	syntax->filename = NULL;
 }
 
 /* Expand globs in the passed name, and parse the resultant files. */
@@ -561,9 +634,9 @@ void parse_includes(char *ptr)
 	 * report an error if it's something other than zero matches. */
 	if (result == 0) {
 		for (size_t i = 0; i < files.gl_pathc; ++i)
-			parse_one_include(files.gl_pathv[i]);
+			parse_one_include(files.gl_pathv[i], NULL);
 	} else if (result != GLOB_NOMATCH)
-		rcfile_error(_("Error expanding %s: %s"), pattern, strerror(errno));
+		jot_error(N_("Error expanding %s: %s"), pattern, strerror(errno));
 
 	globfree(&files);
 	free(expanded);
@@ -603,7 +676,7 @@ short color_to_short(const char *colorname, bool *bright)
 	else if (strcasecmp(colorname, "normal") == 0)
 		return USE_THE_DEFAULT;
 
-	rcfile_error(N_("Color \"%s\" not understood"), colorname);
+	jot_error(N_("Color \"%s\" not understood"), colorname);
 	return BAD_COLOR;
 }
 
@@ -619,7 +692,7 @@ bool parse_color_names(char *combostr, short *fg, short *bg, int *attributes)
 	if (comma != NULL) {
 		*bg = color_to_short(comma + 1, &bright);
 		if (bright) {
-			rcfile_error(N_("A background color cannot be bright"));
+			jot_error(N_("A background color cannot be bright"));
 			return FALSE;
 		}
 		if (*bg == BAD_COLOR)
@@ -650,14 +723,8 @@ void parse_colors(char *ptr, int rex_flags)
 	int attributes;
 	char *item;
 
-	if (!opensyntax) {
-		rcfile_error(N_("A '%s' command requires a preceding 'syntax' command"),
-						"color");
-		return;
-	}
-
 	if (*ptr == '\0') {
-		rcfile_error(N_("Missing color name"));
+		jot_error(N_("Missing color name"));
 		return;
 	}
 
@@ -667,7 +734,7 @@ void parse_colors(char *ptr, int rex_flags)
 		return;
 
 	if (*ptr == '\0') {
-		rcfile_error(N_("Missing regex string after '%s' command"), "color");
+		jot_error(N_("Missing regex string after '%s' command"), "color");
 		return;
 	}
 
@@ -687,7 +754,7 @@ void parse_colors(char *ptr, int rex_flags)
 		}
 
 		if (*ptr != '"') {
-			rcfile_error(N_("Regex strings must begin and end with a \" character"));
+			jot_error(N_("Regex strings must begin and end with a \" character"));
 			ptr = parse_next_regex(ptr);
 			continue;
 		}
@@ -698,27 +765,21 @@ void parse_colors(char *ptr, int rex_flags)
 			break;
 
 		if (*item == '\0') {
-			rcfile_error(N_("Empty regex string"));
+			jot_error(N_("Empty regex string"));
 			goodstart = FALSE;
-		} else
-			goodstart = nregcomp(item, rex_flags);
-
-		/* If the starting regex is valid, initialize a new color struct,
-		 * and hook it in at the tail of the linked list. */
-		if (goodstart) {
+		} else {
 			newcolor = (colortype *)nmalloc(sizeof(colortype));
+			goodstart = compile(item, rex_flags, &newcolor->start);
+		}
 
+		/* If the start regex is valid, fill in the rest of the data, and
+		 * hook the new color struct in at the tail of the linked list. */
+		if (goodstart) {
 			newcolor->fg = fg;
 			newcolor->bg = bg;
 			newcolor->attributes = attributes;
-			newcolor->rex_flags = rex_flags;
 
-			newcolor->start_regex = mallocstrcpy(NULL, item);
-			newcolor->start = NULL;
-
-			newcolor->end_regex = NULL;
 			newcolor->end = NULL;
-
 			newcolor->next = NULL;
 
 			if (lastcolor == NULL)
@@ -727,19 +788,20 @@ void parse_colors(char *ptr, int rex_flags)
 				lastcolor->next = newcolor;
 
 			lastcolor = newcolor;
-		}
+		} else
+			free(newcolor);
 
 		if (!expectend)
 			continue;
 
 		if (ptr == NULL || strncasecmp(ptr, "end=", 4) != 0) {
-			rcfile_error(N_("\"start=\" requires a corresponding \"end=\""));
+			jot_error(N_("\"start=\" requires a corresponding \"end=\""));
 			return;
 		}
 
 		ptr += 4;
 		if (*ptr != '"') {
-			rcfile_error(N_("Regex strings must begin and end with a \" character"));
+			jot_error(N_("Regex strings must begin and end with a \" character"));
 			continue;
 		}
 
@@ -749,18 +811,16 @@ void parse_colors(char *ptr, int rex_flags)
 			break;
 
 		if (*item == '\0') {
-			rcfile_error(N_("Empty regex string"));
+			jot_error(N_("Empty regex string"));
 			continue;
 		}
 
-		/* If the start regex was invalid, skip past the end regex
-		 * to stay in sync. */
+		/* If the start regex was invalid, the end regex cannot be saved. */
 		if (!goodstart)
 			continue;
 
-		/* If it's valid, save the ending regex string. */
-		if (nregcomp(item, rex_flags))
-			newcolor->end_regex = mallocstrcpy(NULL, item);
+		/* Save the compiled ending regex (when it's valid). */
+		compile(item, rex_flags, &newcolor->end);
 
 		/* Lame way to skip another static counter. */
 		newcolor->id = live_syntax->nmultis;
@@ -790,20 +850,18 @@ void grab_and_store(const char *kind, char *ptr, regexlisttype **storage)
 	regexlisttype *lastthing;
 
 	if (!opensyntax) {
-		rcfile_error(
-				N_("A '%s' command requires a preceding 'syntax' command"), kind);
+		jot_error(N_("A '%s' command requires a preceding 'syntax' command"), kind);
 		return;
 	}
 
 	/* The default syntax doesn't take any file matching stuff. */
 	if (strcmp(live_syntax->name, "default") == 0 && *ptr != '\0') {
-		rcfile_error(
-				N_("The \"default\" syntax does not accept '%s' regexes"), kind);
+		jot_error(N_("The \"default\" syntax does not accept '%s' regexes"), kind);
 		return;
 	}
 
 	if (*ptr == '\0') {
-		rcfile_error(N_("Missing regex string after '%s' command"), kind);
+		jot_error(N_("Missing regex string after '%s' command"), kind);
 		return;
 	}
 
@@ -819,7 +877,7 @@ void grab_and_store(const char *kind, char *ptr, regexlisttype **storage)
 		regexlisttype *newthing;
 
 		if (*ptr != '"') {
-			rcfile_error(N_("Regex strings must begin and end with a \" character"));
+			jot_error(N_("Regex strings must begin and end with a \" character"));
 			return;
 		}
 
@@ -829,7 +887,7 @@ void grab_and_store(const char *kind, char *ptr, regexlisttype **storage)
 			return;
 
 		/* If the regex string is malformed, skip it. */
-		if (!nregcomp(regexstring, NANO_REG_EXTENDED | REG_NOSUB))
+		if (!compile(regexstring, NANO_REG_EXTENDED | REG_NOSUB, NULL))
 			continue;
 
 		/* Copy the regex into a struct, and hook this in at the end. */
@@ -849,14 +907,8 @@ void grab_and_store(const char *kind, char *ptr, regexlisttype **storage)
 /* Gather and store the string after a comment/linter command. */
 void pick_up_name(const char *kind, char *ptr, char **storage)
 {
-	if (!opensyntax) {
-		rcfile_error(
-				N_("A '%s' command requires a preceding 'syntax' command"), kind);
-		return;
-	}
-
 	if (*ptr == '\0') {
-		rcfile_error(N_("Missing argument after '%s'"), kind);
+		jot_error(N_("Missing argument after '%s'"), kind);
 		return;
 	}
 
@@ -866,7 +918,7 @@ void pick_up_name(const char *kind, char *ptr, char **storage)
 
 		while (*look != '"') {
 			if (--look == ptr) {
-				rcfile_error(N_("Argument of '%s' lacks closing \""), kind);
+				jot_error(N_("Argument of '%s' lacks closing \""), kind);
 				return;
 			}
 		}
@@ -877,6 +929,25 @@ void pick_up_name(const char *kind, char *ptr, char **storage)
 
 	*storage = mallocstrcpy(*storage, ptr);
 }
+
+/* Handle the four syntax-only commands. */
+bool parse_syntax_commands(char *keyword, char *ptr)
+{
+	if (strcasecmp(keyword, "color") == 0)
+		parse_colors(ptr, NANO_REG_EXTENDED);
+	else if (strcasecmp(keyword, "icolor") == 0)
+		parse_colors(ptr, NANO_REG_EXTENDED | REG_ICASE);
+	else if (strcasecmp(keyword, "comment") == 0) {
+#ifdef ENABLE_COMMENT
+		pick_up_name("comment", ptr, &live_syntax->comment);
+#endif
+	} else if (strcasecmp(keyword, "linter") == 0)
+		pick_up_name("linter", ptr, &live_syntax->linter);
+	else
+		return FALSE;
+
+	return TRUE;
+}
 #endif /* ENABLE_COLOR */
 
 /* Verify that the user has not unmapped every shortcut for a
@@ -908,25 +979,31 @@ static void check_vitals_mapped(void)
 }
 
 /* Parse the rcfile, once it has been opened successfully at rcstream,
- * and close it afterwards.  If syntax_only is TRUE, allow the file to
+ * and close it afterwards.  If just_syntax is TRUE, allow the file to
  * to contain only color syntax commands. */
-void parse_rcfile(FILE *rcstream, bool syntax_only)
+void parse_rcfile(FILE *rcstream, bool just_syntax, bool intros_only)
 {
-	char *buf = NULL;
+	char *buffer = NULL;
 	ssize_t len;
-	size_t n = 0;
+	size_t size = 0;
 
-	while ((len = getline(&buf, &n, rcstream)) > 0) {
+	while ((len = getline(&buffer, &size, rcstream)) > 0) {
 		char *ptr, *keyword, *option;
 		int set = 0;
 		size_t i;
 
-		/* Ignore the newline. */
-		if (buf[len - 1] == '\n')
-			buf[len - 1] = '\0';
-
 		lineno++;
-		ptr = buf;
+
+#ifdef ENABLE_COLOR
+		/* If doing a full parse, skip to after the 'syntax' command. */
+		if (just_syntax && !intros_only && lineno <= live_syntax->lineno)
+			continue;
+#endif
+		/* Strip the terminating newline, if any. */
+		if (buffer[len - 1] == '\n')
+			buffer[len - 1] = '\0';
+
+		ptr = buffer;
 		while (isblank((unsigned char)*ptr))
 			ptr++;
 
@@ -940,9 +1017,12 @@ void parse_rcfile(FILE *rcstream, bool syntax_only)
 
 #ifdef ENABLE_COLOR
 		/* Handle extending first... */
-		if (strcasecmp(keyword, "extendsyntax") == 0 && !syntax_only) {
-			syntaxtype *sint;
+		if (!just_syntax && strcasecmp(keyword, "extendsyntax") == 0) {
+			augmentstruct *newitem, *extra;
 			char *syntaxname = ptr;
+			syntaxtype *sint;
+
+			check_for_nonempty_syntax();
 
 			ptr = parse_next_word(ptr);
 
@@ -951,60 +1031,67 @@ void parse_rcfile(FILE *rcstream, bool syntax_only)
 					break;
 
 			if (sint == NULL) {
-				rcfile_error(N_("Could not find syntax \"%s\" to extend"),
-								syntaxname);
-				opensyntax = FALSE;
+				jot_error(N_("Could not find syntax \"%s\" to extend"), syntaxname);
 				continue;
 			}
 
-			live_syntax = sint;
-			opensyntax = TRUE;
+			newitem = nmalloc(sizeof(augmentstruct));;
 
-			/* Refind the tail of the color list for this syntax. */
-			lastcolor = sint->color;
-			if (lastcolor != NULL)
-				while (lastcolor->next != NULL)
-					lastcolor = lastcolor->next;
+			/* Store the content of an 'extendsyntax', for later parsing. */
+			newitem->filename = strdup(nanorc);
+			newitem->lineno = lineno;
+			newitem->data = strdup(ptr);
+			newitem->next = NULL;
 
-			keyword = ptr;
-			ptr = parse_next_word(ptr);
+			if (sint->augmentations != NULL) {
+				extra = sint->augmentations;
+				while (extra->next != NULL)
+					extra = extra->next;
+				extra->next = newitem;
+			} else
+				sint->augmentations = newitem;
+
+			continue;
 		}
 
 		/* Try to parse the keyword. */
 		if (strcasecmp(keyword, "syntax") == 0) {
-			if (opensyntax && lastcolor == NULL)
-				rcfile_error(N_("Syntax \"%s\" has no color commands"),
-								live_syntax->name);
-			parse_syntax(ptr);
-		}
-		else if (strcasecmp(keyword, "header") == 0)
-			grab_and_store("header", ptr, &live_syntax->headers);
-		else if (strcasecmp(keyword, "magic") == 0)
+			if (intros_only) {
+				check_for_nonempty_syntax();
+				begin_new_syntax(ptr);
+			} else
+				break;
+		} else if (strcasecmp(keyword, "header") == 0) {
+			if (intros_only)
+				grab_and_store("header", ptr, &live_syntax->headers);
+		} else if (strcasecmp(keyword, "magic") == 0) {
 #ifdef HAVE_LIBMAGIC
-			grab_and_store("magic", ptr, &live_syntax->magics);
-#else
-			;
+			if (intros_only)
+				grab_and_store("magic", ptr, &live_syntax->magics);
 #endif
-		else if (strcasecmp(keyword, "comment") == 0)
-#ifdef ENABLE_COMMENT
-			pick_up_name("comment", ptr, &live_syntax->comment);
-#else
-			;
-#endif
-		else if (strcasecmp(keyword, "color") == 0)
-			parse_colors(ptr, NANO_REG_EXTENDED);
-		else if (strcasecmp(keyword, "icolor") == 0)
-			parse_colors(ptr, NANO_REG_EXTENDED | REG_ICASE);
-		else if (strcasecmp(keyword, "linter") == 0)
-			pick_up_name("linter", ptr, &live_syntax->linter);
-		else if (syntax_only && (strcasecmp(keyword, "set") == 0 ||
+		} else if (just_syntax && (strcasecmp(keyword, "set") == 0 ||
 								strcasecmp(keyword, "unset") == 0 ||
 								strcasecmp(keyword, "bind") == 0 ||
 								strcasecmp(keyword, "unbind") == 0 ||
 								strcasecmp(keyword, "include") == 0 ||
-								strcasecmp(keyword, "extendsyntax") == 0))
-			rcfile_error(N_("Command \"%s\" not allowed in included file"),
-										keyword);
+								strcasecmp(keyword, "extendsyntax") == 0)) {
+			if (intros_only)
+				jot_error(N_("Command \"%s\" not allowed in included file"),
+									keyword);
+			else
+				break;
+		} else if (intros_only && (strcasecmp(keyword, "color") == 0 ||
+								strcasecmp(keyword, "icolor") == 0 ||
+								strcasecmp(keyword, "comment") == 0 ||
+								strcasecmp(keyword, "linter") == 0)) {
+			if (!opensyntax)
+				jot_error(N_("A '%s' command requires a preceding "
+									"'syntax' command"), keyword);
+			if (strcasestr("icolor", keyword))
+				seen_color_command = TRUE;
+			continue;
+		} else if (parse_syntax_commands(keyword, ptr))
+			;
 		else if (strcasecmp(keyword, "include") == 0)
 			parse_includes(ptr);
 		else
@@ -1017,56 +1104,50 @@ void parse_rcfile(FILE *rcstream, bool syntax_only)
 			parse_binding(ptr, TRUE);
 		else if (strcasecmp(keyword, "unbind") == 0)
 			parse_binding(ptr, FALSE);
-		else
-			rcfile_error(N_("Command \"%s\" not understood"), keyword);
-
-#ifdef ENABLE_COLOR
-		/* If a syntax was extended, it stops at the end of the command. */
-		if (live_syntax != syntaxes)
-			opensyntax = FALSE;
-#endif
+		else if (intros_only)
+			jot_error(N_("Command \"%s\" not understood"), keyword);
 
 		if (set == 0)
 			continue;
 
+		check_for_nonempty_syntax();
+
 		if (*ptr == '\0') {
-			rcfile_error(N_("Missing option"));
+			jot_error(N_("Missing option"));
 			continue;
 		}
 
 		option = ptr;
 		ptr = parse_next_word(ptr);
 
-		/* Find the just read name among the existing options. */
+		/* Find the just parsed option name among the existing names. */
 		for (i = 0; rcopts[i].name != NULL; i++) {
 			if (strcasecmp(option, rcopts[i].name) == 0)
 				break;
 		}
 
 		if (rcopts[i].name == NULL) {
-			rcfile_error(N_("Unknown option \"%s\""), option);
+			jot_error(N_("Unknown option \"%s\""), option);
 			continue;
 		}
 
-		/* First handle unsetting. */
-		if (set == -1) {
-			if (rcopts[i].flag != 0)
-				UNSET(rcopts[i].flag);
+		/* If the option has a flag, set it or unset it, as requested. */
+		if (rcopts[i].flag) {
+			if (set == 1)
+				SET(rcopts[i].flag);
 			else
-				rcfile_error(N_("Cannot unset option \"%s\""), rcopts[i].name);
+				UNSET(rcopts[i].flag);
 			continue;
 		}
 
-		/* If the option has a flag, it doesn't take an argument. */
-		if (rcopts[i].flag != 0) {
-			SET(rcopts[i].flag);
+		/* An option that takes an argument cannot be unset. */
+		if (set == -1) {
+			jot_error(N_("Cannot unset option \"%s\""), rcopts[i].name);
 			continue;
 		}
 
-		/* The option doesn't have a flag, so it takes an argument. */
 		if (*ptr == '\0') {
-			rcfile_error(N_("Option \"%s\" requires an argument"),
-								rcopts[i].name);
+			jot_error(N_("Option \"%s\" requires an argument"), rcopts[i].name);
 			continue;
 		}
 
@@ -1080,7 +1161,7 @@ void parse_rcfile(FILE *rcstream, bool syntax_only)
 #ifdef ENABLE_UTF8
 		/* When in a UTF-8 locale, ignore arguments with invalid sequences. */
 		if (using_utf8() && mbstowcs(NULL, option, 0) == (size_t)-1) {
-			rcfile_error(N_("Argument is not a valid multibyte string"));
+			jot_error(N_("Argument is not a valid multibyte string"));
 			continue;
 		}
 #endif
@@ -1111,8 +1192,7 @@ void parse_rcfile(FILE *rcstream, bool syntax_only)
 #ifdef ENABLED_WRAPORJUSTIFY
 		if (strcasecmp(rcopts[i].name, "fill") == 0) {
 			if (!parse_num(option, &fill)) {
-				rcfile_error(N_("Requested fill size \"%s\" is invalid"),
-								option);
+				jot_error(N_("Requested fill size \"%s\" is invalid"), option);
 				fill = -COLUMNS_FROM_EOL;
 			}
 			free(option);
@@ -1121,40 +1201,40 @@ void parse_rcfile(FILE *rcstream, bool syntax_only)
 #ifndef NANO_TINY
 		if (strcasecmp(rcopts[i].name, "guidestripe") == 0) {
 			if (!parse_num(option, &stripe_column) || stripe_column <= 0) {
-				rcfile_error(N_("Guide column \"%s\" is invalid"), option);
+				jot_error(N_("Guide column \"%s\" is invalid"), option);
 				stripe_column = 0;
 			}
 			free(option);
 		} else if (strcasecmp(rcopts[i].name, "matchbrackets") == 0) {
 			if (has_blank_char(option)) {
-				rcfile_error(N_("Non-blank characters required"));
+				jot_error(N_("Non-blank characters required"));
 				free(option);
 			} else if (mbstrlen(option) % 2 != 0) {
-				rcfile_error(N_("Even number of characters required"));
+				jot_error(N_("Even number of characters required"));
 				free(option);
 			} else
 				matchbrackets = option;
 		} else if (strcasecmp(rcopts[i].name, "whitespace") == 0) {
 			if (mbstrlen(option) != 2 || breadth(option) != 2) {
-				rcfile_error(N_("Two single-column characters required"));
+				jot_error(N_("Two single-column characters required"));
 				free(option);
 			} else {
 				whitespace = option;
-				whitelen[0] = parse_mbchar(whitespace, NULL, NULL);
-				whitelen[1] = parse_mbchar(whitespace + whitelen[0], NULL, NULL);
+				whitelen[0] = char_length(whitespace);
+				whitelen[1] = char_length(whitespace + whitelen[0]);
 			}
 		} else
 #endif
 #ifdef ENABLE_JUSTIFY
 		if (strcasecmp(rcopts[i].name, "punct") == 0) {
 			if (has_blank_char(option)) {
-				rcfile_error(N_("Non-blank characters required"));
+				jot_error(N_("Non-blank characters required"));
 				free(option);
 			} else
 				punct = option;
 		} else if (strcasecmp(rcopts[i].name, "brackets") == 0) {
 			if (has_blank_char(option)) {
-				rcfile_error(N_("Non-blank characters required"));
+				jot_error(N_("Non-blank characters required"));
 				free(option);
 			} else
 				brackets = option;
@@ -1177,24 +1257,18 @@ void parse_rcfile(FILE *rcstream, bool syntax_only)
 #endif
 		if (strcasecmp(rcopts[i].name, "tabsize") == 0) {
 			if (!parse_num(option, &tabsize) || tabsize <= 0) {
-				rcfile_error(N_("Requested tab size \"%s\" is invalid"),
-								option);
+				jot_error(N_("Requested tab size \"%s\" is invalid"), option);
 				tabsize = -1;
 			}
 			free(option);
 		}
 	}
 
-#ifdef ENABLE_COLOR
-	if (opensyntax && lastcolor == NULL)
-		rcfile_error(N_("Syntax \"%s\" has no color commands"),
-						live_syntax->name);
+	if (intros_only)
+		check_for_nonempty_syntax();
 
-	opensyntax = FALSE;
-#endif
-
-	free(buf);
 	fclose(rcstream);
+	free(buffer);
 	lineno = 0;
 
 	return;
@@ -1203,20 +1277,14 @@ void parse_rcfile(FILE *rcstream, bool syntax_only)
 /* Read and interpret one of the two nanorc files. */
 void parse_one_nanorc(void)
 {
-	FILE *rcstream;
-
-	/* Don't try to open directories nor devices. */
-	if (!is_good_file(nanorc))
-		return;
-
-	rcstream = fopen(nanorc, "rb");
+	FILE *rcstream = fopen(nanorc, "rb");
 
 	/* If opening the file succeeded, parse it.  Otherwise, only
 	 * complain if the file actually exists. */
 	if (rcstream != NULL)
-		parse_rcfile(rcstream, FALSE);
+		parse_rcfile(rcstream, FALSE, TRUE);
 	else if (errno != ENOENT)
-		rcfile_error(N_("Error reading %s: %s"), nanorc, strerror(errno));
+		jot_error(N_("Error reading %s: %s"), nanorc, strerror(errno));
 }
 
 bool have_nanorc(const char *path, char *name)
@@ -1235,36 +1303,25 @@ void do_rcfiles(void)
 {
 	const char *xdgconfdir;
 
-	/* First process the system-wide nanorc, if there is one. */
+	/* First process the system-wide nanorc, if it exists and is suitable. */
 	nanorc = mallocstrcpy(nanorc, SYSCONFDIR "/nanorc");
-	parse_one_nanorc();
+	if (is_good_file(nanorc))
+		parse_one_nanorc();
 
 	get_homedir();
 	xdgconfdir = getenv("XDG_CONFIG_HOME");
 
 	/* Now try the to find a nanorc file in the user's home directory or in
 	 * the XDG configuration directories, and process the first one found. */
-	if (have_nanorc(homedir, "/" HOME_RC_NAME))
-		parse_one_nanorc();
-	else if (have_nanorc(xdgconfdir, "/nano/" RCFILE_NAME))
-		parse_one_nanorc();
-	else if (have_nanorc(homedir, "/.config/nano/" RCFILE_NAME))
+	if (have_nanorc(homedir, "/" HOME_RC_NAME) ||
+				have_nanorc(xdgconfdir, "/nano/" RCFILE_NAME) ||
+				have_nanorc(homedir, "/.config/nano/" RCFILE_NAME))
 		parse_one_nanorc();
 	else if (homedir == NULL && xdgconfdir == NULL)
-		rcfile_error(N_("I can't find my home directory!  Wah!"));
+		jot_error(N_("I can't find my home directory!  Wah!"));
 
 	check_vitals_mapped();
 
-#ifdef __linux__
-	/* On a Linux console, don't start nano when there are rcfile errors,
-	 * because otherwise these error messages get wiped. */
-	if (on_a_vt && rcfile_with_errors) {
-		fprintf(stderr, _("If needed, use nano with the -I option "
-							"to adjust your nanorc settings.\n"));
-		exit(1);
-	}
-#endif
-
 	free(nanorc);
 }
 

src/search.c

@@ -22,9 +22,6 @@
 #include "proto.h"
 
 #include <string.h>
-#ifdef DEBUG
-#include <time.h>
-#endif
 
 static bool came_full_circle = FALSE;
 		/* Have we reached the starting line again while searching? */
@@ -96,15 +93,16 @@ void search_init(bool replacing, bool keep_the_answer)
 	while (TRUE) {
 		functionptrtype func;
 		/* Ask the user what to search for (or replace). */
-		int i = do_prompt(FALSE, FALSE,
+		int response = do_prompt(FALSE, FALSE,
 					inhelp ? MFINDINHELP : (replacing ? MREPLACE : MWHEREIS),
-					answer, &search_history,
+					answer, &search_history, edit_refresh,
 					/* TRANSLATORS: This is the main search prompt. */
-					edit_refresh, "%s%s%s%s%s%s", _("Search"),
-					/* TRANSLATORS: The next four modify the search prompt. */
+					"%s%s%s%s%s%s", _("Search"),
+					/* TRANSLATORS: The next five modify the search prompt. */
 					ISSET(CASE_SENSITIVE) ? _(" [Case Sensitive]") : "",
 					ISSET(USE_REGEXP) ? _(" [Regexp]") : "",
-					ISSET(BACKWARDS_SEARCH) ? _(" [Backwards]") : "", replacing ?
+					ISSET(BACKWARDS_SEARCH) ? _(" [Backwards]") : "",
+					replacing ?
 #ifndef NANO_TINY
 					openfile->mark ? _(" (to replace) in selection") :
 #endif
@@ -112,15 +110,13 @@ void search_init(bool replacing, bool keep_the_answer)
 
 		/* If the search was cancelled, or we have a blank answer and
 		 * nothing was searched for yet during this session, get out. */
-		if (i == -1 || (i == -2 && *last_search == '\0')) {
+		if (response == -1 || (response == -2 && *last_search == '\0')) {
 			statusbar(_("Cancelled"));
-			tidy_up_after_search();
-			free(thedefault);
-			return;
+			break;
 		}
 
 		/* If Enter was pressed, prepare to do a replace or a search. */
-		if (i == 0 || i == -2) {
+		if (response == 0 || response == -2) {
 			/* If an actual answer was typed, remember it. */
 			if (*answer != '\0') {
 				last_search = mallocstrcpy(last_search, answer);
@@ -139,38 +135,35 @@ void search_init(bool replacing, bool keep_the_answer)
 					go_looking();
 			}
 
-			tidy_up_after_search();
-			free(thedefault);
-			return;
+			break;
 		}
 
-		func = func_from_key(&i);
+		func = func_from_key(&response);
 
 		/* If we're here, one of the five toggles was pressed, or
 		 * a shortcut was executed. */
-		if (func == case_sens_void) {
+		if (func == case_sens_void)
 			TOGGLE(CASE_SENSITIVE);
-		} else if (func == backwards_void) {
+		else if (func == backwards_void)
 			TOGGLE(BACKWARDS_SEARCH);
-		} else if (func == regexp_void) {
+		else if (func == regexp_void)
 			TOGGLE(USE_REGEXP);
-		} else if (func == flip_replace) {
+		else if (func == flip_replace) {
 			if (ISSET(VIEW_MODE)) {
 				print_view_warning();
-				tidy_up_after_search();
-				free(thedefault);
-				return;
-			}
-			replacing = !replacing;
-		} else {
-			if (func == flip_goto)
-				do_gotolinecolumn(openfile->current->lineno,
-							openfile->placewewant + 1, TRUE, TRUE);
-			tidy_up_after_search();
-			free(thedefault);
-			return;
-		}
+				napms(600);
+			} else
+				replacing = !replacing;
+		} else if (func == flip_goto) {
+			do_gotolinecolumn(openfile->current->lineno,
+								openfile->placewewant + 1, TRUE, TRUE);
+			break;
+		} else
+			break;
 	}
+
+	tidy_up_after_search();
+	free(thedefault);
 }
 
 /* Look for needle, starting at (current, current_x).  begin is the line
@@ -230,10 +223,10 @@ int findnextstr(const char *needle, bool whole_word_only, int modus,
 		if (skipone) {
 			skipone = FALSE;
 			if (ISSET(BACKWARDS_SEARCH) && from != line->data) {
-				from = line->data + move_mbleft(line->data, from - line->data);
+				from = line->data + step_left(line->data, from - line->data);
 				found = strstrwrapper(line->data, needle, from);
 			} else if (!ISSET(BACKWARDS_SEARCH) && *from != '\0') {
-				from += move_mbright(from, 0);
+				from += char_length(from);
 				found = strstrwrapper(line->data, needle, from);
 			}
 		} else
@@ -248,7 +241,7 @@ int findnextstr(const char *needle, bool whole_word_only, int modus,
 			 * if it's not, continue looking in the rest of the line. */
 			if (whole_word_only && !is_separate_word(found - line->data,
 												found_len, line->data)) {
-				from = found + move_mbright(found, 0);
+				from = found + char_length(found);
 				continue;
 			}
 #endif
@@ -402,7 +395,10 @@ void go_looking(void)
 {
 	linestruct *was_current = openfile->current;
 	size_t was_current_x = openfile->current_x;
-#ifdef DEBUG
+
+//#define TIMEIT 12
+#ifdef TIMEIT
+#include <time.h>
 	clock_t start = clock();
 #endif
 
@@ -419,7 +415,7 @@ void go_looking(void)
 	else if (didfind == 0)
 		not_found_msg(last_search);
 
-#ifdef DEBUG
+#ifdef TIMEIT
 	statusline(HUSH, "Took: %.2f", (double)(clock() - start) / CLOCKS_PER_SEC);
 #endif
 
@@ -472,21 +468,20 @@ int replace_regexp(char *string, bool create)
 /* Return a copy of the current line with one needle replaced. */
 char *replace_line(const char *needle)
 {
-	char *copy;
+	size_t new_size = strlen(openfile->current->data) + 1;
 	size_t match_len;
-	size_t new_line_size = strlen(openfile->current->data) + 1;
+	char *copy;
 
 	/* First adjust the size of the new line for the change. */
 	if (ISSET(USE_REGEXP)) {
 		match_len = regmatches[0].rm_eo - regmatches[0].rm_so;
-		new_line_size += replace_regexp(NULL, FALSE) - match_len;
+		new_size += replace_regexp(NULL, FALSE) - match_len;
 	} else {
 		match_len = strlen(needle);
-		new_line_size += strlen(answer) - match_len;
+		new_size += strlen(answer) - match_len;
 	}
 
-	/* Create the buffer. */
-	copy = charalloc(new_line_size);
+	copy = charalloc(new_size);
 
 	/* Copy the head of the original line. */
 	strncpy(copy, openfile->current->data, openfile->current_x);
@@ -497,8 +492,6 @@ char *replace_line(const char *needle)
 	else
 		strcpy(copy + openfile->current_x, answer);
 
-	assert(openfile->current_x + match_len <= strlen(openfile->current->data));
-
 	/* Copy the tail of the original line. */
 	strcat(copy, openfile->current->data + openfile->current_x + match_len);
 
@@ -529,8 +522,8 @@ ssize_t do_replace_loop(const char *needle, bool whole_word_only,
 
 	/* If the mark is on, frame the region, and turn the mark off. */
 	if (openfile->mark) {
-		mark_order((const linestruct **)&top, &top_x,
-						(const linestruct **)&bot, &bot_x, &right_side_up);
+		get_region((const linestruct **)&top, &top_x,
+					(const linestruct **)&bot, &bot_x, &right_side_up);
 		openfile->mark = NULL;
 		modus = INREGION;
 
@@ -704,22 +697,22 @@ void ask_for_replacement(void)
 	linestruct *edittop_save, *begin;
 	size_t firstcolumn_save, begin_x;
 	ssize_t numreplaced;
-	int i = do_prompt(FALSE, FALSE, MREPLACEWITH, NULL, &replace_history,
-				/* TRANSLATORS: This is a prompt. */
-				edit_refresh, _("Replace with"));
+	int response = do_prompt(FALSE, FALSE, MREPLACEWITH, NULL,
+						/* TRANSLATORS: This is a prompt. */
+						&replace_history, edit_refresh, _("Replace with"));
 
 #ifdef ENABLE_HISTORIES
 	/* If the replace string is not "", add it to the replace history list. */
-	if (i == 0)
+	if (response == 0)
 		update_history(&replace_history, answer);
 #endif
 
 	/* When cancelled, or when a function was run, get out. */
-	if (i == -1 || i > 0) {
-		if (i == -1)
-			statusbar(_("Cancelled"));
+	if (response == -1) {
+		statusbar(_("Cancelled"));
+		return;
+	} else if (response > 0)
 		return;
-	}
 
 	/* Save where we are. */
 	edittop_save = openfile->edittop;
@@ -762,18 +755,18 @@ void do_gotolinecolumn(ssize_t line, ssize_t column, bool use_answer,
 {
 	if (interactive) {
 		/* Ask for the line and column. */
-		int i = do_prompt(FALSE, FALSE, MGOTOLINE,
-				use_answer ? answer : NULL, NULL,
-				/* TRANSLATORS: This is a prompt. */
-				edit_refresh, _("Enter line number, column number"));
+		int response = do_prompt(FALSE, FALSE, MGOTOLINE,
+						use_answer ? answer : NULL, NULL, edit_refresh,
+						/* TRANSLATORS: This is a prompt. */
+						_("Enter line number, column number"));
 
 		/* If the user cancelled or gave a blank answer, get out. */
-		if (i < 0) {
+		if (response < 0) {
 			statusbar(_("Cancelled"));
 			return;
 		}
 
-		if (func_from_key(&i) == flip_goto) {
+		if (func_from_key(&response) == flip_goto) {
 			UNSET(BACKWARDS_SEARCH);
 			/* Retain what the user typed so far and switch to searching. */
 			search_init(FALSE, TRUE);
@@ -781,7 +774,7 @@ void do_gotolinecolumn(ssize_t line, ssize_t column, bool use_answer,
 		}
 
 		/* If a function was executed, we're done here. */
-		if (i > 0)
+		if (response > 0)
 			return;
 
 		/* Try to extract one or two numbers from the user's response. */
@@ -858,36 +851,36 @@ void do_gotolinecolumn(ssize_t line, ssize_t column, bool use_answer,
 void do_gotolinecolumn_void(void)
 {
 	do_gotolinecolumn(openfile->current->lineno,
-		openfile->placewewant + 1, FALSE, TRUE);
+						openfile->placewewant + 1, FALSE, TRUE);
 }
 
 #ifndef NANO_TINY
 /* Search, starting from the current position, for any of the two characters
- * in bracket_set.  If reverse is TRUE, search backwards, otherwise forwards.
+ * in bracket_pair.  If reverse is TRUE, search backwards, otherwise forwards.
  * Return TRUE when one of the brackets was found, and FALSE otherwise. */
-bool find_bracket_match(bool reverse, const char *bracket_set)
+bool find_a_bracket(bool reverse, const char *bracket_pair)
 {
 	linestruct *line = openfile->current;
-	const char *pointer = line->data + openfile->current_x;
-	const char *found = NULL;
+	const char *pointer, *found;
 
 	/* Step away from the current bracket, either backwards or forwards. */
 	if (reverse) {
-		if (--pointer < line->data) {
+		if (openfile->current_x == 0) {
 			line = line->prev;
 			if (line == NULL)
 				return FALSE;
 			pointer = line->data + strlen(line->data);
-		}
+		} else
+			pointer = line->data + step_left(line->data, openfile->current_x);
 	} else
-		++pointer;
+		pointer = line->data + step_right(line->data, openfile->current_x);
 
 	/* Now seek for any of the two brackets, either backwards or forwards. */
 	while (TRUE) {
 		if (reverse)
-			found = mbrevstrpbrk(line->data, bracket_set, pointer);
+			found = mbrevstrpbrk(line->data, bracket_pair, pointer);
 		else
-			found = mbstrpbrk(pointer, bracket_set);
+			found = mbstrpbrk(pointer, bracket_pair);
 
 		if (found)
 			break;
@@ -928,7 +921,7 @@ void do_find_bracket(void)
 		/* The location in matchbrackets of the complementing bracket. */
 	int wanted_ch_len;
 		/* The length of wanted_ch in bytes. */
-	char bracket_set[MAXCHARLEN * 2 + 1];
+	char bracket_pair[MAXCHARLEN * 2 + 1];
 		/* The pair of characters in ch and wanted_ch. */
 	size_t halfway = 0;
 		/* The index in matchbrackets where the closing brackets start. */
@@ -948,7 +941,7 @@ void do_find_bracket(void)
 
 	/* Find the halfway point in matchbrackets, where the closing ones start. */
 	for (size_t i = 0; i < charcount; i++)
-		halfway += parse_mbchar(matchbrackets + halfway, NULL, NULL);
+		halfway += char_length(matchbrackets + halfway);
 
 	/* When on a closing bracket, we have to search backwards for a matching
 	 * opening bracket; otherwise, forward for a matching closing bracket. */
@@ -959,41 +952,36 @@ void do_find_bracket(void)
 	wanted_ch = ch;
 	while (charcount-- > 0) {
 		if (reverse)
-			wanted_ch = matchbrackets + move_mbleft(matchbrackets,
-								wanted_ch - matchbrackets);
+			wanted_ch = matchbrackets + step_left(matchbrackets,
+													wanted_ch - matchbrackets);
 		else
-			wanted_ch += move_mbright(wanted_ch, 0);
+			wanted_ch += char_length(wanted_ch);
 	}
 
-	ch_len = parse_mbchar(ch, NULL, NULL);
-	wanted_ch_len = parse_mbchar(wanted_ch, NULL, NULL);
+	ch_len = char_length(ch);
+	wanted_ch_len = char_length(wanted_ch);
 
-	/* Fill bracket_set in with the values of ch and wanted_ch. */
-	strncpy(bracket_set, ch, ch_len);
-	strncpy(bracket_set + ch_len, wanted_ch, wanted_ch_len);
-	bracket_set[ch_len + wanted_ch_len] = '\0';
+	/* Copy the two complementary brackets into a single string. */
+	strncpy(bracket_pair, ch, ch_len);
+	strncpy(bracket_pair + ch_len, wanted_ch, wanted_ch_len);
+	bracket_pair[ch_len + wanted_ch_len] = '\0';
 
-	while (TRUE) {
-		if (find_bracket_match(reverse, bracket_set)) {
-			/* If we found an identical bracket, increment balance.  If we
-			 * found a complementary bracket, decrement it. */
-			balance += (strncmp(openfile->current->data + openfile->current_x,
-								ch, ch_len) == 0) ? 1 : -1;
+	while (find_a_bracket(reverse, bracket_pair)) {
+		/* Increment/decrement balance for an identical/other bracket. */
+		balance += (strncmp(openfile->current->data + openfile->current_x,
+							ch, ch_len) == 0) ? 1 : -1;
 
-			/* If balance is zero, we've found a matching bracket.  Update
-			 * the screen and get out. */
-			if (balance == 0) {
-				edit_redraw(was_current, FLOWING);
-				break;
-			}
-		} else {
-			/* We didn't find either an opening or closing bracket.
-			 * Indicate this, restore where we were, and get out. */
-			statusbar(_("No matching bracket"));
-			openfile->current = was_current;
-			openfile->current_x = was_current_x;
-			break;
+		/* When balance reached zero, we've found the complementary bracket. */
+		if (balance == 0) {
+			edit_redraw(was_current, FLOWING);
+			return;
 		}
 	}
+
+	statusbar(_("No matching bracket"));
+
+	/* Restore the cursor position. */
+	openfile->current = was_current;
+	openfile->current_x = was_current_x;
 }
 #endif /* !NANO_TINY */

src/text.c

@@ -268,7 +268,7 @@ void do_unindent(void)
 void handle_indent_action(undo *u, bool undoing, bool add_indent)
 {
 	undo_group *group = u->grouping;
-	linestruct *line = fsfromline(group->top_line);
+	linestruct *line = line_from_number(group->top_line);
 
 	if (group->next != NULL)
 		statusline(ALERT, "Multiple groups -- please report a bug");
@@ -297,11 +297,11 @@ void handle_indent_action(undo *u, bool undoing, bool add_indent)
 }
 #endif /* !NANO_TINY */
 
-/* Test whether the string is empty or consists of only blanks. */
+/* Return TRUE when the given string is empty or consists of only blanks. */
 bool white_string(const char *s)
 {
 	while (*s != '\0' && (is_blank_mbchar(s) || *s == '\r'))
-		s += move_mbright(s, 0);
+		s += char_length(s);
 
 	return !*s;
 }
@@ -440,7 +440,7 @@ void handle_comment_action(undo *u, bool undoing, bool add_comment)
 		goto_line_posx(u->lineno, u->begin);
 
 	while (group) {
-		linestruct *f = fsfromline(group->top_line);
+		linestruct *f = line_from_number(group->top_line);
 
 		while (f && f->lineno <= group->bottom_line) {
 			comment_line(undoing ^ add_comment ?
@@ -490,7 +490,7 @@ void undo_cut(undo *u)
 /* Redo a cut, or undo an uncut. */
 void redo_cut(undo *u)
 {
-	linestruct *oldcutbuffer = cutbuffer, *oldcutbottom = cutbottom;
+	linestruct *oldcutbuffer = cutbuffer;
 
 	goto_line_posx(u->lineno, u->begin);
 
@@ -499,16 +499,14 @@ void redo_cut(undo *u)
 		return;
 
 	cutbuffer = NULL;
-	cutbottom = NULL;
 
-	openfile->mark = fsfromline(u->mark_begin_lineno);
+	openfile->mark = line_from_number(u->mark_begin_lineno);
 	openfile->mark_x = (u->xflags & WAS_WHOLE_LINE) ? 0 : u->mark_begin_x;
 
 	do_cut_text(FALSE, TRUE, FALSE, u->type == ZAP);
 
 	free_lines(cutbuffer);
 	cutbuffer = oldcutbuffer;
-	cutbottom = oldcutbottom;
 }
 
 /* Undo the last thing(s) we did. */
@@ -516,7 +514,7 @@ void do_undo(void)
 {
 	undo *u = openfile->current_undo;
 	linestruct *f = NULL, *t = NULL;
-	linestruct *oldcutbuffer, *oldcutbottom;
+	linestruct *oldcutbuffer;
 	char *data, *undidmsg = NULL;
 	size_t from_x, to_x;
 
@@ -525,11 +523,8 @@ void do_undo(void)
 		return;
 	}
 
-	if (u->type <= REPLACE) {
-		f = fsfromline(u->mark_begin_lineno);
-		if (f == NULL)
-			return;
-	}
+	if (u->type <= REPLACE)
+		f = line_from_number(u->mark_begin_lineno);
 
 	openfile->current_x = u->begin;
 	switch (u->type) {
@@ -554,7 +549,7 @@ void do_undo(void)
 								strlen(&u->strdata[from_x]) + 1);
 		strcat(f->data, &u->strdata[from_x]);
 		unlink_node(f->next);
-		renumber(f);
+		renumber_from(f);
 		goto_line_posx(u->lineno, to_x);
 		break;
 	case BACK:
@@ -584,7 +579,7 @@ void do_undo(void)
 		free(f->data);
 		f->data = data;
 		splice_node(f, t);
-		renumber(t);
+		renumber_from(t);
 		goto_line_posx(u->lineno, u->begin);
 		break;
 	case REPLACE:
@@ -622,18 +617,14 @@ void do_undo(void)
 	case INSERT:
 		undidmsg = _("insertion");
 		oldcutbuffer = cutbuffer;
-		oldcutbottom = cutbottom;
 		cutbuffer = NULL;
-		cutbottom = NULL;
-		openfile->mark = fsfromline(u->mark_begin_lineno);
+		openfile->mark = line_from_number(u->mark_begin_lineno);
 		openfile->mark_x = u->mark_begin_x;
 		goto_line_posx(u->lineno, u->begin);
 		cut_marked(NULL);
 		free_lines(u->cutbuffer);
 		u->cutbuffer = cutbuffer;
-		u->cutbottom = cutbottom;
 		cutbuffer = oldcutbuffer;
-		cutbottom = oldcutbottom;
 		break;
 	case COUPLE_BEGIN:
 		undidmsg = u->strdata;
@@ -701,11 +692,8 @@ void do_redo(void)
 	while (u->next != openfile->current_undo)
 		u = u->next;
 
-	if (u->type <= REPLACE) {
-		f = fsfromline(u->mark_begin_lineno);
-		if (f == NULL)
-			return;
-	}
+	if (u->type <= REPLACE)
+		f = line_from_number(u->mark_begin_lineno);
 
 	switch (u->type) {
 	case ADD:
@@ -729,7 +717,7 @@ void do_redo(void)
 		free(f->data);
 		f->data = data;
 		splice_node(f, shoveline);
-		renumber(shoveline);
+		renumber_from(shoveline);
 		goto_line_posx(u->lineno + 1, u->mark_begin_x);
 		break;
 	case BACK:
@@ -754,7 +742,7 @@ void do_redo(void)
 		f->data = charealloc(f->data, strlen(f->data) + strlen(u->strdata) + 1);
 		strcat(f->data, u->strdata);
 		unlink_node(f->next);
-		renumber(f);
+		renumber_from(f);
 		goto_line_posx(u->mark_begin_lineno, u->mark_begin_x);
 		break;
 	case REPLACE:
@@ -903,7 +891,7 @@ void do_enter(void)
 
 	/* Insert the newly created line after the current one and renumber. */
 	splice_node(openfile->current, newnode);
-	renumber(newnode);
+	renumber_from(newnode);
 
 	/* Put the cursor on the new line, after any automatic whitespace. */
 	openfile->current = newnode;
@@ -957,20 +945,18 @@ bool execute_command(const char *command)
 	const char *shellenv;
 	struct sigaction oldaction, newaction;
 		/* Original and temporary handlers for SIGINT. */
-	bool setup_failed = FALSE;
-		/* Whether setting up the temporary SIGINT handler failed. */
 
 	/* Create a pipe to read the command's output from, and, if needed,
 	 * a pipe to feed the command's input through. */
 	if (pipe(from_fd) == -1 || (should_pipe && pipe(to_fd) == -1)) {
-		statusbar(_("Could not create pipe"));
+		statusline(ALERT, _("Could not create pipe"));
 		return FALSE;
 	}
 
 	/* Check which shell to use.  If none is specified, use /bin/sh. */
 	shellenv = getenv("SHELL");
 	if (shellenv == NULL)
-		shellenv = (char *) "/bin/sh";
+		shellenv = (char *)"/bin/sh";
 
 	/* Fork a child process to run the command in. */
 	if ((pid_of_command = fork()) == 0) {
@@ -999,7 +985,7 @@ bool execute_command(const char *command)
 	close(from_fd[1]);
 
 	if (pid_of_command == -1) {
-		statusbar(_("Could not fork"));
+		statusline(ALERT, _("Could not fork"));
 		close(from_fd[0]);
 		return FALSE;
 	}
@@ -1013,7 +999,7 @@ bool execute_command(const char *command)
 
 #ifdef ENABLE_MULTIBUFFER
 		if (ISSET(MULTIBUFFER)) {
-			switch_to_prev_buffer();
+			openfile = openfile->prev;
 			if (openfile->mark)
 				do_cut_text(TRUE, TRUE, FALSE, FALSE);
 		} else
@@ -1042,7 +1028,7 @@ bool execute_command(const char *command)
 
 #ifdef ENABLE_MULTIBUFFER
 		if (ISSET(MULTIBUFFER))
-			switch_to_next_buffer();
+			openfile = openfile->next;
 #endif
 		free_lines(cutbuffer);
 		cutbuffer = was_cutbuffer;
@@ -1050,19 +1036,12 @@ bool execute_command(const char *command)
 
 	/* Re-enable interpretation of the special control keys so that we get
 	 * SIGINT when Ctrl-C is pressed. */
-	enable_signals();
+	enable_kb_interrupt();
 
-	/* Set things up so that Ctrl-C will terminate the forked process. */
-	if (sigaction(SIGINT, NULL, &newaction) == -1) {
-		setup_failed = TRUE;
-		nperror("sigaction");
-	} else {
-		newaction.sa_handler = cancel_the_command;
-		if (sigaction(SIGINT, &newaction, &oldaction) == -1) {
-			setup_failed = TRUE;
-			nperror("sigaction");
-		}
-	}
+	/* Set up a signal handler so that ^C will terminate the forked process. */
+	newaction.sa_handler = cancel_the_command;
+	newaction.sa_flags = 0;
+	sigaction(SIGINT, &newaction, &oldaction);
 
 	stream = fdopen(from_fd[0], "rb");
 	if (stream == NULL)
@@ -1076,14 +1055,12 @@ bool execute_command(const char *command)
 	}
 
 	/* Wait for the external command (and possibly data sender) to terminate. */
-	if (wait(NULL) == -1)
-		nperror("wait");
-	if (should_pipe && (wait(NULL) == -1))
-		nperror("wait");
+	wait(NULL);
+	if (should_pipe)
+		wait(NULL);
 
-	/* If it was changed, restore the handler for SIGINT. */
-	if (!setup_failed && sigaction(SIGINT, &oldaction, NULL) == -1)
-		nperror("sigaction");
+	/* Restore the original handler for SIGINT. */
+	sigaction(SIGINT, &oldaction, NULL);
 
 	/* Restore the terminal to its desired state, and disable
 	 * interpretation of the special control keys again. */
@@ -1141,7 +1118,6 @@ void add_undo(undo_type action)
 	u->type = action;
 	u->strdata = NULL;
 	u->cutbuffer = NULL;
-	u->cutbottom = NULL;
 	u->lineno = openfile->current->lineno;
 	u->begin = openfile->current_x;
 	u->mark_begin_lineno = openfile->current->lineno;
@@ -1187,12 +1163,12 @@ void add_undo(undo_type action)
 		 * else purposely fall into the line-joining code. */
 		if (openfile->current->data[openfile->current_x] != '\0') {
 			char *char_buf = charalloc(MAXCHARLEN + 1);
-			int char_len = parse_mbchar(&openfile->current->data[u->begin],
+			int charlen = parse_mbchar(&openfile->current->data[u->begin],
 												char_buf, NULL);
-			char_buf[char_len] = '\0';
+			char_buf[charlen] = '\0';
 			u->strdata = char_buf;
 			if (u->type == BACK)
-				u->mark_begin_x += char_len;
+				u->mark_begin_x += charlen;
 			break;
 		}
 	case JOIN:
@@ -1297,7 +1273,7 @@ void update_undo(undo_type action)
 {
 	undo *u = openfile->undotop;
 	char *char_buf;
-	int char_len;
+	int charlen;
 
 	if (u->type != action)
 		statusline(ALERT, "Mismatching undo type -- please report a bug");
@@ -1307,10 +1283,10 @@ void update_undo(undo_type action)
 	switch (u->type) {
 	case ADD:
 		char_buf = charalloc(MAXCHARLEN);
-		char_len = parse_mbchar(&openfile->current->data[u->mark_begin_x],
+		charlen = parse_mbchar(&openfile->current->data[u->mark_begin_x],
 								char_buf, NULL);
 		u->strdata = addstrings(u->strdata, u->strdata ? strlen(u->strdata) : 0,
-								char_buf, char_len);
+								char_buf, charlen);
 		u->mark_begin_lineno = openfile->current->lineno;
 		u->mark_begin_x = openfile->current_x;
 		break;
@@ -1321,15 +1297,15 @@ void update_undo(undo_type action)
 	case BACK:
 	case DEL:
 		char_buf = charalloc(MAXCHARLEN);
-		char_len = parse_mbchar(&openfile->current->data[openfile->current_x],
+		charlen = parse_mbchar(&openfile->current->data[openfile->current_x],
 								char_buf, NULL);
 		if (openfile->current_x == u->begin) {
 			/* They deleted more: add removed character after earlier stuff. */
-			u->strdata = addstrings(u->strdata, strlen(u->strdata), char_buf, char_len);
+			u->strdata = addstrings(u->strdata, strlen(u->strdata), char_buf, charlen);
 			u->mark_begin_x = openfile->current_x;
-		} else if (openfile->current_x == u->begin - char_len) {
+		} else if (openfile->current_x == u->begin - charlen) {
 			/* They backspaced further: add removed character before earlier. */
-			u->strdata = addstrings(char_buf, char_len, u->strdata, strlen(u->strdata));
+			u->strdata = addstrings(char_buf, charlen, u->strdata, strlen(u->strdata));
 			u->begin = openfile->current_x;
 		} else {
 			/* They deleted *elsewhere* on the line: start a new undo item. */
@@ -1362,34 +1338,37 @@ void update_undo(undo_type action)
 			u->cutbuffer = copy_buffer(cutbuffer);
 		}
 		if (u->xflags & MARK_WAS_SET) {
-			/* If the "marking" operation was from right-->left or
-			 * bottom-->top, then swap the mark points. */
-			if ((u->lineno == u->mark_begin_lineno && u->begin < u->mark_begin_x)
-						|| u->lineno < u->mark_begin_lineno) {
-				ssize_t line = u->lineno;
-				size_t x_loc = u->begin;
-
-				u->begin = u->mark_begin_x;
-				u->mark_begin_x = x_loc;
+			/* If the region was marked backwards, swap the end points. */
+			if (u->lineno < u->mark_begin_lineno ||
+						(u->lineno == u->mark_begin_lineno &&
+						u->begin < u->mark_begin_x)) {
+				ssize_t number = u->lineno;
+				size_t position = u->begin;
 
 				u->lineno = u->mark_begin_lineno;
-				u->mark_begin_lineno = line;
+				u->begin = u->mark_begin_x;
+
+				u->mark_begin_lineno = number;
+				u->mark_begin_x = position;
 			} else
 				u->xflags |= WAS_MARKED_FORWARD;
 		} else {
-			/* Compute the end of the cut for the undo, using our copy. */
-			u->cutbottom = u->cutbuffer;
-			while (u->cutbottom->next != NULL)
-				u->cutbottom = u->cutbottom->next;
-			u->lineno = u->mark_begin_lineno + u->cutbottom->lineno -
-										u->cutbuffer->lineno;
+			linestruct *bottomline = u->cutbuffer;
+			size_t count = 0;
+
+			/* Find the end of the cut for the undo/redo, using our copy. */
+			while (bottomline->next != NULL) {
+				bottomline = bottomline->next;
+				count++;
+			}
+			u->lineno = u->mark_begin_lineno + count;
 			if (ISSET(CUT_FROM_CURSOR) || u->type == CUT_TO_EOF) {
-				u->begin = strlen(u->cutbottom->data);
+				u->begin = strlen(bottomline->data);
 				if (u->lineno == u->mark_begin_lineno)
 					u->begin += u->mark_begin_x;
 			} else if (openfile->current == openfile->filebot &&
 						ISSET(NO_NEWLINES))
-				u->begin = strlen(u->cutbottom->data);
+				u->begin = strlen(bottomline->data);
 		}
 		break;
 	case INSERT:
@@ -1434,7 +1413,7 @@ bool do_wrap(void)
 		return FALSE;
 
 	/* Step forward to the character just after the blank. */
-	wrap_loc += move_mbright(line->data + wrap_loc, 0);
+	wrap_loc = step_right(line->data, wrap_loc);
 
 	/* When now at end-of-line, no need to wrap. */
 	if (line->data[wrap_loc] == '\0')
@@ -1461,7 +1440,7 @@ bool do_wrap(void)
 		openfile->current_x = line_len;
 
 		/* If the remainder doesn't end in a blank, add a space. */
-		if (!is_blank_mbchar(remainder + move_mbleft(remainder, rest_length))) {
+		if (!is_blank_mbchar(remainder + step_left(remainder, rest_length))) {
 #ifndef NANO_TINY
 			add_undo(ADD);
 #endif
@@ -1487,14 +1466,14 @@ bool do_wrap(void)
 
 	/* When requested, snip trailing blanks off the wrapped line. */
 	if (ISSET(TRIM_BLANKS)) {
-		size_t tail_x = move_mbleft(line->data, wrap_loc);
-		size_t typed_x = move_mbleft(line->data, cursor_x);
+		size_t tail_x = step_left(line->data, wrap_loc);
+		size_t typed_x = step_left(line->data, cursor_x);
 
 		while ((tail_x != typed_x || cursor_x >= wrap_loc) &&
 						is_blank_mbchar(line->data + tail_x)) {
 			openfile->current_x = tail_x;
 			do_delete();
-			tail_x = move_mbleft(line->data, tail_x);
+			tail_x = step_left(line->data, tail_x);
 		}
 	}
 
@@ -1533,7 +1512,7 @@ ssize_t break_line(const char *line, ssize_t goal, bool snap_at_nl)
 		/* The index of the character we are looking at. */
 	size_t column = 0;
 		/* The column position that corresponds with index. */
-	int char_len = 0;
+	int charlen = 0;
 		/* The length of the current character, in bytes. */
 
 	/* Find the last blank that does not overshoot the target column. */
@@ -1545,9 +1524,9 @@ ssize_t break_line(const char *line, ssize_t goal, bool snap_at_nl)
 				break;
 		}
 
-		char_len = parse_mbchar(line, NULL, &column);
-		line += char_len;
-		index += char_len;
+		charlen = parse_mbchar(line, NULL, &column);
+		line += charlen;
+		index += charlen;
 	}
 
 	/* If the whole line displays shorter than goal, we're done. */
@@ -1558,7 +1537,7 @@ ssize_t break_line(const char *line, ssize_t goal, bool snap_at_nl)
 	/* If we're wrapping a help text and no blank was found, or was
 	 * found only as the first character, force a line break. */
 	if (snap_at_nl && lastblank < 1)
-		return (index - char_len);
+		return (index - charlen);
 #endif
 
 	/* If no blank was found within the goal width, seek one after it. */
@@ -1569,9 +1548,9 @@ ssize_t break_line(const char *line, ssize_t goal, bool snap_at_nl)
 			else if (lastblank > 0)
 				return lastblank;
 
-			char_len = parse_mbchar(line, NULL, NULL);
-			line += char_len;
-			index += char_len;
+			charlen = char_length(line);
+			line += charlen;
+			index += charlen;
 		}
 
 		return -1;
@@ -1579,14 +1558,14 @@ ssize_t break_line(const char *line, ssize_t goal, bool snap_at_nl)
 
 	/* Move the pointer back to the last blank, and then step beyond it. */
 	line = line - index + lastblank;
-	char_len = parse_mbchar(line, NULL, NULL);
-	line += char_len;
+	charlen = char_length(line);
+	line += charlen;
 
 	/* Skip any consecutive blanks after the last blank. */
 	while (*line != '\0' && is_blank_mbchar(line)) {
-		lastblank += char_len;
-		char_len = parse_mbchar(line, NULL, NULL);
-		line += char_len;
+		lastblank += charlen;
+		charlen = char_length(line);
+		line += charlen;
 	}
 
 	return lastblank;
@@ -1617,90 +1596,65 @@ size_t indent_length(const char *line)
 #endif /* !NANO_TINY || ENABLE_JUSTIFY */
 
 #ifdef ENABLE_JUSTIFY
+/* Copy a character from one place to another. */
+void copy_character(char **from, char **to)
+{
+	int charlen = char_length(*from);
+
+	if (*from == *to) {
+		*from += charlen;
+		*to += charlen;
+	} else
+		while (--charlen >= 0)
+			*((*to)++) = *((*from)++);
+}
+
 /* In the given line, replace any series of blanks with a single space,
  * but keep two spaces (if there are two) after any closing punctuation,
  * and remove all blanks from the end of the line.  Leave the first skip
  * number of characters untreated. */
 void squeeze(linestruct *line, size_t skip)
 {
-	char *from, *to, *newdata;
-	size_t shrunk = 0;
-	int charlen;
-
-	newdata = charalloc(strlen(line->data) + 1);
-	strncpy(newdata, line->data, skip);
-	from = line->data + skip;
-	to = newdata + skip;
+	char *start = line->data + skip;
+	char *from = start, *to = start;
 
+	/* For each character, 1) when a blank, change it to a space, and pass over
+	 * all blanks after it; 2) if it is punctuation, copy it plus a possible
+	 * tailing bracket, and change at most two subsequent blanks to spaces, and
+	 * pass over all blanks after these; 3) leave anything else unchanged. */
 	while (*from != '\0') {
-		/* If this character is blank, change it to a space,
-		 * and pass over all blanks after it. */
 		if (is_blank_mbchar(from)) {
-			from += parse_mbchar(from, NULL, NULL);
+			from += char_length(from);
 			*(to++) = ' ';
 
-			while (*from != '\0' && is_blank_mbchar(from)) {
-				charlen = parse_mbchar(from, NULL, NULL);
-				from += charlen;
-				shrunk += charlen;
-			}
-		/* If this character is punctuation, then copy it plus a possible
-		 * bracket, and change at most two of subsequent blanks to spaces,
-		 * and pass over all blanks after these. */
+			while (*from != '\0' && is_blank_mbchar(from))
+				from += char_length(from);
 		} else if (mbstrchr(punct, from) != NULL) {
-			charlen = parse_mbchar(from, NULL, NULL);
+			copy_character(&from, &to);
 
-			while (charlen > 0) {
-				*(to++) = *(from++);
-				charlen--;
-			}
-
-			if (*from != '\0' && mbstrchr(brackets, from) != NULL) {
-				charlen = parse_mbchar(from, NULL, NULL);
-
-				while (charlen > 0) {
-					*(to++) = *(from++);
-					charlen--;
-				}
-			}
+			if (*from != '\0' && mbstrchr(brackets, from) != NULL)
+				copy_character(&from, &to);
 
 			if (*from != '\0' && is_blank_mbchar(from)) {
-				from += parse_mbchar(from, NULL, NULL);
+				from += char_length(from);
 				*(to++) = ' ';
 			}
 			if (*from != '\0' && is_blank_mbchar(from)) {
-				from += parse_mbchar(from, NULL, NULL);
+				from += char_length(from);
 				*(to++) = ' ';
 			}
 
-			while (*from != '\0' && is_blank_mbchar(from)) {
-				charlen = parse_mbchar(from, NULL, NULL);
-				from += charlen;
-				shrunk += charlen;
-			}
-		/* Leave unchanged anything that is neither blank nor punctuation. */
-		} else {
-			charlen = parse_mbchar(from, NULL, NULL);
-
-			while (charlen > 0) {
-				*(to++) = *(from++);
-				charlen--;
-			}
-		}
+			while (*from != '\0' && is_blank_mbchar(from))
+				from += char_length(from);
+		} else
+			copy_character(&from, &to);
 	}
 
 	/* If there are spaces at the end of the line, remove them. */
-	while (to > newdata + skip && *(to - 1) == ' ') {
+	while (to > start && *(to - 1) == ' ')
 		to--;
-		shrunk++;
-	}
 
-	if (shrunk > 0) {
-		*to = '\0';
-		free(line->data);
-		line->data = newdata;
-	} else
-		free(newdata);
+	*to = '\0';
 }
 
 /* Return the length of the quote part of the given line.  The "quote part"
@@ -1771,14 +1725,12 @@ bool inpar(const linestruct *const line)
 	return (line->data[quote_len + indent_len] != '\0');
 }
 
-/* Determine the beginning, length, and quoting of the first found paragraph.
- * Return TRUE if we found a paragraph, and FALSE otherwise.  Furthermore,
- * return in firstline the first line of the paragraph,
- * and in *parlen the length of the paragraph. */
+/* Find the first occurring paragraph in the forward direction.  Return TRUE
+ * when a paragraph was found, and FALSE otherwise.  Furthermore, return the
+ * first line and the length (number of lines) of the paragraph. */
 bool find_paragraph(linestruct **firstline, size_t *const parlen)
 {
 	linestruct *line = *firstline;
-		/* The line of the current paragraph we're searching in. */
 
 	/* When not currently in a paragraph, move forward to a line that is. */
 	while (!inpar(line) && line->next != NULL)
@@ -1786,22 +1738,22 @@ bool find_paragraph(linestruct **firstline, size_t *const parlen)
 
 	*firstline = line;
 
-	/* Move down to the last line of the paragraph. */
+	/* Move down to the last line of the paragraph (if any). */
 	do_para_end(&line);
 
 	/* When not in a paragraph now, there aren't any paragraphs left. */
 	if (!inpar(line))
 		return FALSE;
 
-	/* We found a paragraph; determine number of lines. */
+	/* We found a paragraph; determine its number of lines. */
 	*parlen = line->lineno - (*firstline)->lineno + 1;
 
 	return TRUE;
 }
 
-/* Tack all the lines of the paragraph (that starts at *line, and consists of
- * par_len lines) together, skipping
- * the quoting and indentation on all lines after the first. */
+/* Concatenate into a single line all the lines of the paragraph that starts at
+ * *line and consists of par_len lines, skipping the quoting and indentation on
+ * all lines after the first. */
 void concat_paragraph(linestruct **line, size_t par_len)
 {
 	while (par_len > 1) {
@@ -1926,8 +1878,6 @@ void do_justify(bool full_justify)
 		/* The bottom x-coordinate of the paragraph we justify. */
 	linestruct *was_cutbuffer = cutbuffer;
 		/* The old cutbuffer, so we can justify in the current cutbuffer. */
-	linestruct *was_cutbottom = cutbottom;
-		/* The old cutbottom, so we can justify in the current cutbuffer. */
 	linestruct *jusline;
 		/* The line that we're justifying in the current cutbuffer. */
 
@@ -1963,11 +1913,10 @@ void do_justify(bool full_justify)
 	if (openfile->mark) {
 		size_t quote_len;
 
-		mark_order((const linestruct **)&first_par_line, &top_x,
-						(const linestruct **)&last_par_line, &bot_x,
-						&right_side_up);
+		get_region((const linestruct **)&first_par_line, &top_x,
+					(const linestruct **)&last_par_line, &bot_x, &right_side_up);
 
-		/* Save the coordinates of the mark. */
+		/* Save the starting point of the marked region. */
 		was_top_lineno = first_par_line->lineno;
 		was_top_x = top_x;
 
@@ -2054,9 +2003,7 @@ void do_justify(bool full_justify)
 
 	/* Do the equivalent of a marked cut into an empty cutbuffer. */
 	cutbuffer = NULL;
-	cutbottom = NULL;
-	extract_buffer(&cutbuffer, &cutbottom, first_par_line, top_x,
-											last_par_line, bot_x);
+	extract(first_par_line, top_x, last_par_line, bot_x);
 #ifndef NANO_TINY
 	update_undo(CUT);
 
@@ -2107,8 +2054,6 @@ void do_justify(bool full_justify)
 		} else
 			rewrap_paragraph(&line, the_lead, lead_len);
 
-		cutbottom = line;
-
 		/* If the marked region started after the beginning of a line, insert
 		 * a new line before the new paragraph.  But if the region started in
 		 * the middle of the line's leading part, no new line is needed: just
@@ -2131,10 +2076,8 @@ void do_justify(bool full_justify)
 		 * portion, so it will become a full leading part when the justified
 		 * region is "pasted" back. */
 		if (bot_x > 0 && !ends_at_eol) {
-			cutbottom->next = make_new_node(cutbottom);
-			cutbottom->next->data = mallocstrcpy(NULL, the_lead +
-													needed_bot_extra);
-			cutbottom = cutbottom->next;
+			line->next = make_new_node(line);
+			line->next->data = mallocstrcpy(NULL, the_lead + needed_bot_extra);
 		}
 
 		free(the_lead);
@@ -2172,10 +2115,10 @@ void do_justify(bool full_justify)
 	/* If we justified marked text, restore mark or cursor position. */
 	if (openfile->mark) {
 		if (right_side_up) {
-			openfile->mark = fsfromline(was_top_lineno);
+			openfile->mark = line_from_number(was_top_lineno);
 			openfile->mark_x = was_top_x;
 		} else {
-			openfile->current = fsfromline(was_top_lineno);
+			openfile->current = line_from_number(was_top_lineno);
 			openfile->current_x = was_top_x;
 		}
 		update_undo(COUPLE_END);
@@ -2184,7 +2127,6 @@ void do_justify(bool full_justify)
 
 	/* We're done justifying.  Restore the old cutbuffer. */
 	cutbuffer = was_cutbuffer;
-	cutbottom = was_cutbottom;
 
 	/* Show what we justified on the status bar. */
 #ifndef NANO_TINY
@@ -2266,8 +2208,8 @@ bool fix_spello(const char *word)
 #ifndef NANO_TINY
 	/* If the mark is on, start at the beginning of the marked region. */
 	if (openfile->mark) {
-		mark_order((const linestruct **)&top, &top_x,
-						(const linestruct **)&bot, &bot_x, &right_side_up);
+		get_region((const linestruct **)&top, &top_x,
+					(const linestruct **)&bot, &bot_x, &right_side_up);
 		/* If the region is marked normally, swap the end points, so that
 		 * (current, current_x) (where searching starts) is at the top. */
 		if (right_side_up) {
@@ -2516,7 +2458,6 @@ const char *do_int_speller(const char *tempfile_name)
 		fix_spello(oneword);
 
 	free(misspellings);
-	tidy_up_after_search();
 	refresh_needed = TRUE;
 
 	/* Process the end of the three processes. */
@@ -2524,14 +2465,14 @@ const char *do_int_speller(const char *tempfile_name)
 	waitpid(pid_sort, &sort_status, 0);
 	waitpid(pid_uniq, &uniq_status, 0);
 
-	if (WIFEXITED(spell_status) == 0 || WEXITSTATUS(spell_status))
-		return _("Error invoking \"spell\"");
+	if (WIFEXITED(uniq_status) == 0 || WEXITSTATUS(uniq_status))
+		return _("Error invoking \"uniq\"");
 
 	if (WIFEXITED(sort_status) == 0 || WEXITSTATUS(sort_status))
 		return _("Error invoking \"sort -f\"");
 
-	if (WIFEXITED(uniq_status) == 0 || WEXITSTATUS(uniq_status))
-		return _("Error invoking \"uniq\"");
+	if (WIFEXITED(spell_status) == 0 || WEXITSTATUS(spell_status))
+		return _("Error invoking \"spell\"");
 
 	/* When all went okay. */
 	return NULL;
@@ -2556,6 +2497,7 @@ const char *do_alt_speller(char *tempfile_name)
 	size_t pww_save = openfile->placewewant;
 	ssize_t lineno_save = openfile->current->lineno;
 	bool was_at_eol = (openfile->current->data[openfile->current_x] == '\0');
+	bool replaced = FALSE;
 	struct stat spellfileinfo;
 	time_t timestamp;
 	pid_t pid_spell;
@@ -2589,11 +2531,9 @@ const char *do_alt_speller(char *tempfile_name)
 	wait(&alt_spell_status);
 	block_sigwinch(FALSE);
 
-	/* Reenter curses mode. */
-	doupdate();
-
-	/* Restore the terminal to its previous state. */
+	/* Set the desired terminal state again, and reenter curses mode. */
 	terminal_init();
+	doupdate();
 
 	if (!WIFEXITED(alt_spell_status) || WEXITSTATUS(alt_spell_status) != 0)
 		return invocation_error(alt_speller);
@@ -2606,35 +2546,33 @@ const char *do_alt_speller(char *tempfile_name)
 #ifndef NANO_TINY
 		/* Replace the marked text (or entire text) with the corrected text. */
 		if (openfile->mark) {
-			linestruct *top, *bot;
-			size_t top_x, bot_x;
-			bool right_side_up;
+			bool upright = (openfile->mark->lineno < openfile->current->lineno ||
+									(openfile->mark == openfile->current &&
+									openfile->mark_x < openfile->current_x));
 			ssize_t was_mark_lineno = openfile->mark->lineno;
 
-			mark_order((const linestruct **)&top, &top_x,
-							(const linestruct **)&bot, &bot_x, &right_side_up);
-
-			replace_marked_buffer(tempfile_name);
+			replaced = replace_buffer(tempfile_name, CUT, TRUE);
 
 			/* Adjust the end point of the marked region for any change in
 			 * length of the region's last line. */
-			if (right_side_up)
+			if (upright)
 				current_x_save = openfile->current_x;
 			else
 				openfile->mark_x = openfile->current_x;
 
 			/* Restore the mark. */
-			openfile->mark = fsfromline(was_mark_lineno);
+			openfile->mark = line_from_number(was_mark_lineno);
 		} else
 #endif
-			replace_buffer(tempfile_name);
+			replaced = replace_buffer(tempfile_name, CUT_TO_EOF, FALSE);
 
 		/* Go back to the old position. */
 		goto_line_posx(lineno_save, current_x_save);
 		if (was_at_eol || openfile->current_x > strlen(openfile->current->data))
 			openfile->current_x = strlen(openfile->current->data);
 #ifndef NANO_TINY
-		update_undo(COUPLE_END);
+		if (replaced)
+			update_undo(COUPLE_END);
 #endif
 		openfile->placewewant = pww_save;
 		adjust_viewport(STATIONARY);
@@ -2695,17 +2633,16 @@ void do_spell(void)
 	/* Restore the settings of the global flags. */
 	memcpy(flags, stash, sizeof(flags));
 
-	/* If the spell-checker printed any error messages onscreen, make
-	 * sure that they're cleared off. */
-	total_refresh();
+	/* Ensure the help lines will be redrawn and a selection is retained. */
+	currmenu = MMOST;
+	shift_held = TRUE;
 
 	if (result_msg != NULL) {
+		/* Avoid giving a failure reason of "Success". */
 		if (errno == 0)
-			/* Don't display an error message of "Success". */
-			statusline(ALERT, _("Spell checking failed: %s"), result_msg);
+			statusline(ALERT, result_msg);
 		else
-			statusline(ALERT, _("Spell checking failed: %s: %s"), result_msg,
-												strerror(errno));
+			statusline(ALERT, _("%s: %s"), result_msg, strerror(errno));
 	} else
 		statusbar(_("Finished checking spelling"));
 }
@@ -2754,7 +2691,7 @@ void do_linter(void)
 
 	/* Create a pipe up front. */
 	if (pipe(lint_fd) == -1) {
-		statusbar(_("Could not create pipe"));
+		statusline(ALERT, _("Could not create pipe"));
 		return;
 	}
 
@@ -2791,7 +2728,7 @@ void do_linter(void)
 	/* If the child process was not forked successfully... */
 	if (pid_lint < 0) {
 		close(lint_fd[0]);
-		statusbar(_("Could not fork"));
+		statusline(ALERT, _("Could not fork"));
 		return;
 	}
 
@@ -2800,7 +2737,7 @@ void do_linter(void)
 
 	if (pipesize < 1) {
 		close(lint_fd[0]);
-		statusbar(_("Could not get size of pipe buffer"));
+		statusline(ALERT, _("Could not get size of pipe buffer"));
 		return;
 	}
 
@@ -3061,21 +2998,19 @@ void do_linter(void)
  * multibyte characters instead of single-byte characters. */
 void do_wordlinechar_count(void)
 {
+	linestruct *was_current = openfile->current;
+	size_t was_x = openfile->current_x;
 	size_t words = 0, chars = 0;
-	ssize_t nlines = 0;
-	size_t current_x_save = openfile->current_x;
-	linestruct *current_save = openfile->current;
-	linestruct *was_mark = openfile->mark;
+	ssize_t lines = 0;
 	linestruct *top, *bot;
 	size_t top_x, bot_x;
 
 	/* If the mark is on, partition the buffer so that it
 	 * contains only the marked text, and turn the mark off. */
-	if (was_mark) {
-		mark_order((const linestruct **)&top, &top_x,
-						(const linestruct **)&bot, &bot_x, NULL);
-		filepart = partition_buffer(top, top_x, bot, bot_x);
-		openfile->mark = NULL;
+	if (openfile->mark) {
+		get_region((const linestruct **)&top, &top_x,
+					(const linestruct **)&bot, &bot_x, NULL);
+		partition_buffer(top, top_x, bot, bot_x);
 	}
 
 	/* Start at the top of the file. */
@@ -3092,28 +3027,24 @@ void do_wordlinechar_count(void)
 			words++;
 	}
 
-	/* Get the total line and character counts, as "wc -l"  and "wc -c"
-	 * do, but get the latter in multibyte characters. */
-	if (was_mark) {
-		nlines = openfile->filebot->lineno - openfile->filetop->lineno + 1;
-		chars = get_totsize(openfile->filetop, openfile->filebot);
+	/* Get the number of lines, similar to what "wc -l" gives. */
+	lines = openfile->filebot->lineno - openfile->filetop->lineno +
+					((openfile->filebot->data[0] == '\0') ? 0 : 1);
 
-		/* Unpartition the buffer so that it contains all the text
-		 * again, and turn the mark back on. */
-		unpartition_buffer(&filepart);
-		openfile->mark = was_mark;
-	} else {
-		nlines = openfile->filebot->lineno;
+	/* Get the number of multibyte characters, similar to "wc -c". */
+	if (openfile->mark) {
+		chars = get_totsize(openfile->filetop, openfile->filebot);
+		unpartition_buffer();
+	} else
 		chars = openfile->totsize;
-	}
 
 	/* Restore where we were. */
-	openfile->current = current_save;
-	openfile->current_x = current_x_save;
+	openfile->current = was_current;
+	openfile->current_x = was_x;
 
 	/* Display the total word, line, and character counts on the statusbar. */
-	statusline(HUSH, _("%sWords: %zu  Lines: %zd  Chars: %zu"), was_mark ?
-						_("In Selection:  ") : "", words, nlines, chars);
+	statusline(HUSH, _("%sWords: %zu  Lines: %zd  Chars: %zu"), openfile->mark ?
+						_("In Selection:  ") : "", words, lines, chars);
 }
 #endif /* !NANO_TINY */
 
@@ -3162,7 +3093,7 @@ char *copy_completion(char *text)
 
 	/* Find the end of the candidate word to get its length. */
 	while (is_word_mbchar(&text[length], FALSE))
-		length = move_mbright(text, length);
+		length = step_right(text, length);
 
 	/* Now copy this candidate to a new string. */
 	word = charalloc(length + 1);
@@ -3214,11 +3145,11 @@ void complete_a_word(void)
 	/* Find the start of the fragment that the user typed. */
 	start_of_shard = openfile->current_x;
 	while (start_of_shard > 0) {
-		size_t step_left = move_mbleft(openfile->current->data, start_of_shard);
+		size_t oneleft = step_left(openfile->current->data, start_of_shard);
 
-		if (!is_word_mbchar(&openfile->current->data[step_left], FALSE))
+		if (!is_word_mbchar(&openfile->current->data[oneleft], FALSE))
 			break;
-		start_of_shard = step_left;
+		start_of_shard = oneleft;
 	}
 
 	/* If there is no word fragment before the cursor, do nothing. */
@@ -3261,7 +3192,7 @@ void complete_a_word(void)
 
 			/* If the match is not a separate word, skip it. */
 			if (i > 0 && is_word_mbchar(&pletion_line->data[
-								move_mbleft(pletion_line->data, i)], FALSE))
+								step_left(pletion_line->data, i)], FALSE))
 				continue;
 
 			/* If this match is the shard itself, ignore it. */

src/utils.c

@@ -202,7 +202,7 @@ bool is_separate_word(size_t position, size_t length, const char *buf)
 	size_t word_end = position + length;
 
 	/* Get the characters before and after the word, if any. */
-	parse_mbchar(buf + move_mbleft(buf, position), before, NULL);
+	parse_mbchar(buf + step_left(buf, position), before, NULL);
 	parse_mbchar(buf + word_end, after, NULL);
 
 	/* If the word starts at the beginning of the line OR the character before
@@ -246,7 +246,7 @@ const char *strstrwrapper(const char *haystack, const char *needle,
 				/* If this is the last possible match, don't try to advance. */
 				if (last_find == ceiling)
 					break;
-				next_rung = move_mbright(haystack, last_find);
+				next_rung = step_right(haystack, last_find);
 				regmatches[0].rm_so = next_rung;
 				regmatches[0].rm_eo = far_end;
 				if (regexec(&search_regexp, haystack, 1, regmatches,
@@ -287,17 +287,6 @@ const char *strstrwrapper(const char *haystack, const char *needle,
 		return mbstrcasestr(start, needle);
 }
 
-/* This is a wrapper for the perror() function.  The wrapper temporarily
- * leaves curses mode, calls perror() (which writes to stderr), and then
- * reenters curses mode, updating the screen in the process.  Note that
- * nperror() causes the window to flicker once. */
-void nperror(const char *s)
-{
-	endwin();
-	perror(s);
-	doupdate();
-}
-
 /* This is a wrapper for the malloc() function that properly handles
  * things when we run out of memory. */
 void *nmalloc(size_t howmuch)
@@ -442,7 +431,7 @@ void remove_magicline(void)
 	if (openfile->filebot->data[0] == '\0' &&
 				openfile->filebot != openfile->filetop) {
 		openfile->filebot = openfile->filebot->prev;
-		free_lines(openfile->filebot->next);
+		delete_node(openfile->filebot->next);
 		openfile->filebot->next = NULL;
 		openfile->totsize--;
 	}
@@ -450,15 +439,15 @@ void remove_magicline(void)
 #endif
 
 #ifndef NANO_TINY
-/* Set (top, top_x) and (bot, bot_x) to the start and end "coordinates" of
- * the marked region.  If right_side_up isn't NULL, set it to TRUE when the
- * mark is at the top of the marked region, and to FALSE otherwise. */
-void mark_order(const linestruct **top, size_t *top_x,
-		const linestruct **bot, size_t *bot_x, bool *right_side_up)
+/* Return in (top, top_x) and (bot, bot_x) the start and end "coordinates"
+ * of the marked region.  If right_side_up isn't NULL, set it to TRUE when
+ * the mark is at the top of the marked region, and to FALSE otherwise. */
+void get_region(const linestruct **top, size_t *top_x,
+				const linestruct **bot, size_t *bot_x, bool *right_side_up)
 {
-	if ((openfile->current->lineno == openfile->mark->lineno &&
-				openfile->current_x > openfile->mark_x) ||
-				openfile->current->lineno > openfile->mark->lineno) {
+	if (openfile->mark->lineno < openfile->current->lineno ||
+				(openfile->mark == openfile->current &&
+				openfile->mark_x < openfile->current_x)) {
 		*top = openfile->mark;
 		*top_x = openfile->mark_x;
 		*bot = openfile->current;
@@ -486,7 +475,7 @@ void get_range(const linestruct **top, const linestruct **bot)
 	} else {
 		size_t top_x, bot_x;
 
-		mark_order(top, &top_x, bot, &bot_x, NULL);
+		get_region(top, &top_x, bot, &bot_x, NULL);
 
 		if (bot_x == 0 && *bot != *top && !also_the_last)
 			*bot = (*bot)->prev;
@@ -495,22 +484,19 @@ void get_range(const linestruct **top, const linestruct **bot)
 	}
 }
 
-/* Given a line number, return a pointer to the corresponding struct. */
-linestruct *fsfromline(ssize_t lineno)
+/* Return a pointer to the line that has the given line number. */
+linestruct *line_from_number(ssize_t number)
 {
-	linestruct *f = openfile->current;
+	linestruct *line = openfile->current;
 
-	if (lineno <= openfile->current->lineno)
-		while (f->lineno != lineno && f->prev != NULL)
-			f = f->prev;
+	if (line->lineno > number)
+		while (line->lineno != number)
+			line = line->prev;
 	else
-		while (f->lineno != lineno && f->next != NULL)
-			f = f->next;
+		while (line->lineno != number)
+			line = line->next;
 
-	if (f->lineno == lineno)
-		return f;
-	else
-		return NULL;
+	return line;
 }
 #endif /* !NANO_TINY */
 

src/winio.c

@@ -27,6 +27,9 @@
 #include <sys/ioctl.h>
 #endif
 #include <string.h>
+#ifdef ENABLE_UTF8
+#include <wchar.h>
+#endif
 
 #ifdef REVISION
 #define BRANDING REVISION
@@ -1903,7 +1906,7 @@ char *display_string(const char *buf, size_t column, size_t span,
 			if (start_col < column) {
 				converted[index++] = control_mbrep(buf, isdata);
 				column++;
-				buf += parse_mbchar(buf, NULL, NULL);
+				buf += char_length(buf);
 			}
 		}
 #ifdef ENABLE_UTF8
@@ -1916,21 +1919,30 @@ char *display_string(const char *buf, size_t column, size_t span,
 			/* Display the right half of a two-column character as ']'. */
 			converted[index++] = ']';
 			column++;
-			buf += parse_mbchar(buf, NULL, NULL);
+			buf += char_length(buf);
 		}
 #endif
 	}
 
-	while (*buf != '\0' && (column < beyond || mbwidth(buf) == 0)) {
-		int charlength, charwidth = 1;
+#ifdef ENABLE_UTF8
+#define ISO8859_CHAR  FALSE
+#else
+#define ISO8859_CHAR  ((unsigned char)*buf > 0x9F)
+#endif
 
+	while (*buf != '\0' && (column < beyond || mbwidth(buf) == 0)) {
+		/* A plain printable ASCII character is one byte, one column. */
+		if (((signed char)*buf > 0x20 && *buf != DEL_CODE) || ISO8859_CHAR) {
+			converted[index++] = *(buf++);
+			column++;
+			continue;
+		}
+
+		/* Show a space as a visible character, or as a space. */
 		if (*buf == ' ') {
-			/* Show a space as a visible character, or as a space. */
 #ifndef NANO_TINY
 			if (ISSET(WHITESPACE_DISPLAY)) {
-				int i = whitelen[0];
-
-				while (i < whitelen[0] + whitelen[1])
+				for (int i = whitelen[0]; i < whitelen[0] + whitelen[1];)
 					converted[index++] = whitespace[i++];
 			} else
 #endif
@@ -1938,15 +1950,15 @@ char *display_string(const char *buf, size_t column, size_t span,
 			column++;
 			buf++;
 			continue;
-		} else if (*buf == '\t') {
-			/* Show a tab as a visible character, or as as a space. */
+		}
+
+		/* Show a tab as a visible character plus spaces, or as just spaces. */
+		if (*buf == '\t') {
 #ifndef NANO_TINY
 			if (ISSET(WHITESPACE_DISPLAY) && (index > 0 || !isdata ||
 						!ISSET(SOFTWRAP) || column % tabsize == 0 ||
 						column == start_col)) {
-				int i = 0;
-
-				while (i < whitelen[0])
+				for (int i = 0; i < whitelen[0];)
 					converted[index++] = whitespace[i++];
 			} else
 #endif
@@ -1961,47 +1973,54 @@ char *display_string(const char *buf, size_t column, size_t span,
 			continue;
 		}
 
-		charlength = length_of_char(buf, &charwidth);
-
-		/* If buf contains a control character, represent it. */
+		/* Represent a control character with a leading caret. */
 		if (is_cntrl_mbchar(buf)) {
 			converted[index++] = '^';
 			converted[index++] = control_mbrep(buf, isdata);
+			buf += char_length(buf);
 			column += 2;
-			buf += charlength;
 			continue;
 		}
 
-		/* If buf contains a valid non-control character, simply copy it. */
-		if (charlength > 0) {
-			for (; charlength > 0; charlength--)
-				converted[index++] = *(buf++);
+#ifdef ENABLE_UTF8
+		int charlength, charwidth;
+		wchar_t wc;
+
+		/* Convert a multibyte character to a single code. */
+		charlength = mbtowc(&wc, buf, MAXCHARLEN);
+
+		/* Represent an invalid character with the Replacement Character. */
+		if (charlength < 0 || !is_valid_unicode(wc)) {
+			converted[index++] = '\xEF';
+			converted[index++] = '\xBF';
+			converted[index++] = '\xBD';
+			buf += (charlength > 0 ? charlength : 1);
+			column++;
+			continue;
+		}
+
+		/* For any valid character, just copy its bytes. */
+		for (; charlength > 0; charlength--)
+			converted[index++] = *(buf++);
+
+		/* Determine whether the character occupies one or two columns. */
+		charwidth = wcwidth(wc);
+
+		/* If the codepoint is unassigned, assume a width of one. */
+		column += (charwidth < 0 ? 1 : charwidth);
 
-			column += charwidth;
 #ifdef USING_OLD_NCURSES
-			if (charwidth > 1)
-				seen_wide = TRUE;
+		if (charwidth > 1)
+			seen_wide = TRUE;
 #endif
-			continue;
-		}
-
-		/* Represent an invalid starter byte with the Replacement Character. */
-		converted[index++] = '\xEF';
-		converted[index++] = '\xBF';
-		converted[index++] = '\xBD';
-		column++;
-		buf++;
-
-		/* For invalid codepoints, skip extra bytes. */
-		if (charlength < -1)
-			buf += charlength + 7;
+#endif /* ENABLE_UTF8 */
 	}
 
 	/* If there is more text than can be shown, make room for the ">". */
 	if (column > beyond || (*buf != '\0' && (isprompt ||
 					(isdata && !ISSET(SOFTWRAP))))) {
 		do {
-			index = move_mbleft(converted, index);
+			index = step_left(converted, index);
 		} while (mbwidth(converted + index) == 0);
 
 #ifdef ENABLE_UTF8
@@ -2211,16 +2230,15 @@ void statusline(message_type importance, const char *msg, ...)
 				(lastmessage == MILD && importance == HUSH))
 		return;
 
-	va_start(ap, msg);
-
-	/* Curses mode is turned off.  If we use wmove() now, it will muck
-	 * up the terminal settings.  So we just use vfprintf(). */
-	if (isendwin()) {
-		fprintf(stderr, "\n");
-		vfprintf(stderr, msg, ap);
-		va_end(ap);
+#ifndef NANO_TINY
+	/* Curses mode shouldn't be off when trying to write to the status bar. */
+	if (!started_curses || isendwin()) {
+		fprintf(stderr, "Out of curses -- please report a bug\n");
+		lastmessage = HUSH;
+		napms(1400);
 		return;
 	}
+#endif
 
 	/* If the ALERT status has been reset, reset the counter. */
 	if (lastmessage == HUSH)
@@ -2248,6 +2266,7 @@ void statusline(message_type importance, const char *msg, ...)
 
 	/* Construct the message out of all the arguments. */
 	compound = charalloc(MAXCHARLEN * (COLS + 1));
+	va_start(ap, msg);
 	vsnprintf(compound, MAXCHARLEN * (COLS + 1), msg, ap);
 	va_end(ap);
 	message = display_string(compound, 0, COLS, FALSE, FALSE);
@@ -2494,8 +2513,7 @@ void edit_draw(linestruct *fileptr, const char *converted,
 
 					/* If the match is of length zero, skip it. */
 					if (match.rm_so == match.rm_eo) {
-						index = move_mbright(fileptr->data,
-												index + match.rm_eo);
+						index = step_right(fileptr->data, index + match.rm_eo);
 						continue;
 					}
 
@@ -2517,8 +2535,7 @@ void edit_draw(linestruct *fileptr, const char *converted,
 					paintlen = actual_x(thetext, wideness(fileptr->data,
 										match.rm_eo) - from_col - start_col);
 
-					mvwaddnstr(edit, row, margin + start_col,
-												thetext, paintlen);
+					mvwaddnstr(edit, row, margin + start_col, thetext, paintlen);
 				}
 				goto tail_of_loop;
 			}
@@ -2581,7 +2598,7 @@ void edit_draw(linestruct *fileptr, const char *converted,
 								endmatch.rm_so == endmatch.rm_eo) {
 					if (start_line->data[index] == '\0')
 						break;
-					index = move_mbright(start_line->data, index);
+					index = step_right(start_line->data, index);
 				}
 				/* If there is no later start on this line, next step. */
 				if (regexec(varnish->start, start_line->data + index,
@@ -2663,7 +2680,7 @@ void edit_draw(linestruct *fileptr, const char *converted,
 								endmatch.rm_so == endmatch.rm_eo) {
 						if (fileptr->data[index] == '\0')
 							break;
-						index = move_mbright(fileptr->data, index);
+						index = step_right(fileptr->data, index);
 					}
 					continue;
 				}
@@ -2739,7 +2756,7 @@ void edit_draw(linestruct *fileptr, const char *converted,
 		int paintlen = -1;
 			/* The number of characters to paint.  Negative means "all". */
 
-		mark_order(&top, &top_x, &bot, &bot_x, NULL);
+		get_region(&top, &top_x, &bot, &bot_x, NULL);
 
 		if (top->lineno < fileptr->lineno || top_x < from_x)
 			top_x = from_x;
@@ -3375,9 +3392,10 @@ void total_refresh(void)
 	if (currmenu != MBROWSER && currmenu != MWHEREISFILE && currmenu != MGOTODIR)
 		titlebar(title);
 #ifdef ENABLE_HELP
-	if (inhelp)
-		wrap_the_help_text(TRUE);
-	else
+	if (inhelp) {
+		close_buffer();
+		wrap_help_text_into_buffer();
+	} else
 #endif
 	if (currmenu != MBROWSER && currmenu != MWHEREISFILE && currmenu != MGOTODIR)
 		edit_refresh();

syntax/po.nanorc

@@ -22,7 +22,7 @@ color yellow " (no-)?[-[:alpha:]]+-format(,|$)"
 color brightmagenta "%([1-9]\$)?[a-z]*"
 # Quotes and escaped characters.
 color yellow "\""
-color cyan "\\[abcefnrtv"\]"
+color cyan "\\([abcefnrtv"\]|x[0-9abcdefABCDEF]{2}|[0-7]{3})"
 # Reminders.
 color brightwhite,yellow "(FIXME|TODO|XXX)"
 # Obsolete strings.

syntax/python.nanorc

@@ -22,14 +22,15 @@ color brightcyan "\<(exec|print)([[:blank:]]|$)"
 # Special values.
 color brightmagenta "\<(False|None|True)\>"
 
-# Single-quoted strings.
-color brightgreen "'([^'\]|\\.)+'"
-color brightgreen ""([^"\]|\\.)+""
+# Mono-quoted strings.
+color brightgreen "'([^'\]|\\.)*'|'''"
+color brightgreen ""([^"\]|\\.)*"|""""
+color normal "'''|""""
 # Comments.
 color brightred "(^|[[:blank:]])#.*"
 # Triple-quoted strings.
 color brightgreen    start="'''([^'),]|$)" end="(^|[^(\])'''"
-color brightgreen start="\"\"\"([^"),]|$)" end="(^|[^(\])\"\"\""
+color brightgreen    start=""""([^"),]|$)" end="(^|[^(\])""""
 
 # Reminders.
 color brightwhite,yellow "(FIXME|TODO|XXX)"