po: update translations and regenerate POT file and PO files

When some or all edits have been undone, and the user starts to make
new edits, the old part of the undo stack is discarded, but this does
not mean that the undo stack doesn't go back to the very beginning.

This really fixes https://savannah.gnu.org/bugs/?52504.

ChangeLog

@@ -1,3 +1,423 @@
+Changes between v2.9.0 and v2.9.1:
+----------------------------------
+
+Benno Schulenberg (20):
+      build: fix compilation with --disable-browser --disable-tabcomp
+      bump version numbers and add a news item for the 2.9.1 release
+      files: always update the stat info when the entire file is written
+      files: save the marked region only when we've prompted for a file name
+      gnulib: update to its current upstream state
+      history: create the path '~/.local/share/' when it is needed
+      history: make nano's state directory accessible for the user only
+      history: save the positions file also when a record was deleted
+      input: make the macro key discoverable by giving feedback when undefined
+      linting: switch the mark off when the linter starts
+      selecting: do not cancel the softmark when the cursor is not moved
+      selecting: let a justification cancel a softmark
+      syntax: adjust the magic strings for the changes since file-5.10
+      tweaks: adjust indentation after previous change
+      tweaks: elide the 'mark_set' boolean -- the 'mark' pointer is enough
+      tweaks: rename, rewrap, and reshuffle some stuff, and frob some comments
+      tweaks: reshuffle a couple of lines, and frob a comment or two
+      tweaks: reshuffle a couple of lines, to put similar things together
+      undo: clear the Modified state when the very first edit is undone
+      undo: discarding the stack does not always lose information
+
+
+Changes between v2.8.7 and v2.9.0:
+----------------------------------
+
+Benno Schulenberg (103):
+      bindings: don't allow calling help when searching in the help viewer
+      bindings: make ^Q and ^S do something useful by default
+      bindings: make the search function rebindable again in help and browser
+      bindings: make ^W start always a forward search (as there is ^Q now)
+      browser: place the cursor properly on the selected file when -g is used
+      build: let git ignore also the generated PDF file
+      bump version numbers and add a news item for the 2.9.0 release
+      copyright: update some years, and standardize on the dashed format
+      display: keep the cursor switched on when resizing the screen
+      display: rework the switching on and off of the cursor
+      display: stop the help viewer from turning on the multibuffer indicator
+      display: switch off the cursor early on during startup
+      docs: make it clearer that a Signed-off-by is wanted on patches
+      docs: mention that macros work correctly only on terminal emulators
+      docs: remove another remark about indenting lacking undo capability
+      docs: update references to the nanorc files for the XDG changes
+      files: avoid an abortion when excuting a command in a new buffer
+      gnulib: update to its current upstream state
+      help: don't fall back to other syntaxes if there is no nanohelp one
+      history: after loading the lists, mark them as unchanged
+      history: remove the migration service for the old searches file
+      input: recognize Option+Arrow keys on iTerm2 in "xterm mode"
+      moving: don't slither and slide over tabs when they are overlong
+      moving: prevent the cursor sticking on or skipping over overwide tabs
+      new feature: a bindable function that starts always a backward search
+      options: remove '--quiet' and 'set quiet', because they hide problems
+      options: retire 'set backwards' -- it's still recognized but a no-op
+      organization: move all history-related stuff to its own file
+      ouch: set the positions-file name also when using the legacy state dir
+      painting: evade an ncurses bug by adding the A_PROTECT attribute
+      search: suppress the "not found" message when replacements were made
+      search: suppress the "Search Wrapped" message when doing replacements
+      search: wipe reassuring feedback as soon as searching has finished
+      startup: don't ask the user to press Enter upon an rcfile error
+      startup: don't produce more than three consecutive beeps
+      startup: when an rcfile contains errors, report this on the status bar
+      syntax: default: use colors that are readable also on dark backgrounds
+      titlebar: don't reshow version when dropping back to a single buffer
+      titlebar: don't show nano's name and version when in the file browser
+      titlebar: drop the prefix "File: " from before the filename
+      tweaks: add a translator hint, and adjust two others
+      tweaks: adjust a comment, and condense a fragment of code
+      tweaks: adjust indentation and comments after the previous change
+      tweaks: adjust two comments, and correct and a few cosmetic mistakes
+      tweaks: avoid an unused-variable warning with --disable-nanorc
+      tweaks: change some mayday messages, to urge the user to report a bug
+      tweaks: change the arrows to triangles also for searching in file browser
+      tweaks: change the help-text arrows to triangles, to be more visible
+      tweaks: chuck a bunch of asserts -- they have lost their usefulness
+      tweaks: chuck an assert, and then condense the code and a comment
+      tweaks: constify the result strings of getenv(), as a reminder
+      tweaks: correct two minor things in the documentation
+      tweaks: discard another set of useless asserts
+      tweaks: discard some obsolete debugging stuff
+      tweaks: don't construct the positions-history filename time and again
+      tweaks: drop a bunch of outdated asserts
+      tweaks: drop the ineffective cgitrc -- sorting by "age" does not work
+      tweaks: elide a comment, and improve a couple of others
+      tweaks: elide an unneeded check
+      tweaks: elide an unneeded function now that stuff is grouped together
+      tweaks: elide a superfluous allocation
+      tweaks: elide two variables by using a pointer instead of an index
+      tweaks: fix compilation when configured with --disable-histories
+      tweaks: fix compilation when configured with --enable-tiny
+      tweaks: fix compilation with --enable-tiny --enable-histories
+      tweaks: frob a couple of comments
+      tweaks: frob some comments and rename a few variables and a function
+      tweaks: get rid of some cluttering conditional compilation
+      tweaks: improve some comments, and rename a variable for symmetry
+      tweaks: make the switching on and off of the cursor a bit more compact
+      tweaks: move a general function to the utils.c file
+      tweaks: reduce a bit of code duplication
+      tweaks: remove a comment from the docs that is no longer accurate
+      tweaks: remove another bit of conditional compilation
+      tweaks: remove a superfluous no-op function call
+      tweaks: remove a useless prefix from a hundred constants
+      tweaks: rename a function and swap its two parameters
+      tweaks: rename a function plus two parameters, to be more fitting
+      tweaks: rename a macro, to make a little more sense
+      tweaks: rename a variable, to avoid a possible confusion
+      tweaks: rename a variable, to make more sense
+      tweaks: rename one variable once more
+      tweaks: rename some constants, to follow the same underscoreless scheme
+      tweaks: rename three functions, to be shorter or clearer
+      tweaks: rename three variables, for more contrast
+      tweaks: rename two variables, for contrast, and frob some comments
+      tweaks: rename two variables, to be more indicative of what they do
+      tweaks: rename two variables, to make a little more sense
+      tweaks: reshuffle a bit of code and elide an unneeded variable
+      tweaks: reshuffle a couple of lines, and trim some comments
+      tweaks: reshuffle some code, and rename a variable
+      tweaks: reshuffle some code in order to elide a variable
+      tweaks: reshuffle some regexes, for order and compactness
+      tweaks: strip four unneeded checks
+      tweaks: transform the token DISABLE_COLOR to ENABLE_COLOR
+      tweaks: transform the token DISABLE_EXTRA to ENABLE_EXTRA
+      tweaks: transform the token DISABLE_HISTORIES to ENABLE_HISTORIES
+      tweaks: transform the token DISABLE_JUSTIFY to ENABLE_JUSTIFY
+      tweaks: transform the token DISABLE_OPERATINGDIR to ENABLE_OPERATINGDIR
+      tweaks: transform the token DISABLE_SPELLER to ENABLE_SPELLER
+      tweaks: transform the token DISABLE_WRAPJUSTIFY to ENABLED_WRAPORJUSTIFY
+      tweaks: transform the token DISABLE_WRAPPING to ENABLE_WRAPPING
+      tweaks: use mnemonic constants instead of TRUE and FALSE
+
+Brand Huntsman (3):
+      bindings: allow exiting from the help viewer with F1, like with ^G
+      history: prevent overwriting of positions between multiple instances
+      syntax: nanohelp: colorize Up, Down, Left and Right (when not in UTF-8)
+
+David Lawrence Ramsey (18):
+      build: add history.c to the list of files with translatable strings
+      display: don't cut off zero-width characters at the end of a chunk
+      docs: decribe the bindable functions 'recordmacro' and 'runmacro'
+      docs: document the more everyday names of three bindable functions
+      docs: remove man page reference to indent/unindent lacking undo/redo
+      files: don't change file format when inserting into an existing buffer
+      help: allow firstline and lastline to work at the search prompt
+      history: fix the check for an existing $HOME/.nano/ directory
+      moving: set the preferred column properly when doing a smart home
+      search: don't bother saving and restoring the search direction
+      search: trim a failed search string for width instead of length
+      softwrap: break before multi-column Unicode blanks when they overshoot
+      syntax: nanorc: properly color valid arguments of 'selectedcolor'
+      text: hook up indenting and unindenting to the undo/redo code
+      text: move the indenting of a single line into its own function
+      text: move the unindenting of a single line into its own function
+      tweaks: use printf's z modifier for most of the size_t/ssize_t types
+      undo: generalize update_comment_undo() into update_multiline_undo()
+
+Lion Yang (1):
+      input: ensure that standard input uses blocking mode
+
+Marco Diego Aurélio Mesquita (5):
+      general: do not free strings gotten from getenv(), to avoid a crash
+      history: remember the commands that were executed during this session
+      history: remember the list of executed commands across sessions
+      new feature: show current and total number of open buffers in title bar
+      new feature: the ability to record and play back a series of keystrokes
+
+Simon Ochsenreither (1):
+      startup: look for nanorc and history files also in the XDG directories
+
+Viorel Bota (1):
+      files: check for a changed disk file also for 'savefile' and --tempfile
+
+
+Changes between v2.8.6 and v2.8.7:
+----------------------------------
+
+Benno Schulenberg (54):
+      bindings: hard-bind Alt+Up and Alt+Down to findprevious and findnext
+      browser: correct the inverted search behavior for Alt+Up/Alt+Down
+      bump version numbers and add a news item for the 2.8.7 release
+      display: catch all cases where the cursor can be pushed offscreen
+      display: don't doubly show tabs that cross a chunk boundary
+      files: do not silently ignore an invalid backup directory, but die
+      files: don't close a file descriptor when opening failed  [coverity scan]
+      files: don't try to open a negative file descriptor  [coverity scan]
+      gnulib: update to its current upstream state
+      linting: don't try to put the cursor at a negative x position
+      linting: skip the introductory message produced by 'gcc -fshow-column'
+      mouse: one click of the wheel should move three lines, not three pages
+      moving: don't push x forward when backward movement lands on a split tab
+      moving: get <Up> unstuck when trying to pass over a sprawling tab
+      moving: improve retention of the target column somewhat
+      moving: the current chunk is always 0 when not in softwrap mode
+      moving: use the correct formula for pushing the index forward
+      rcfile: don't leak a shortcut when something goes wrong  [coverity scan]
+      softwrap: properly move up and down over tabs that are split over rows
+      syntax: c: give labels some color too
+      syntax: html: don't bother coloring tags that cross line boundaries
+      syntax: python: don't require a character after an opening triple quote
+      text: properly unindent lines that consist of only whitespace
+      tweaks: a comma does not end a sentence, and is not part of a variable
+      tweaks: adjust the indentation after the previous change
+      tweaks: adjust the indentation after the previous change
+      tweaks: adjust the indentation after the previous change
+      tweaks: allow enough space for the Y/N/A characters  [coverity scan]
+      tweaks: avoid trying to stat a file that might be NULL  [coverity scan]
+      tweaks: close a file also in the error path  [coverity scan]
+      tweaks: condense or improve some comments
+      tweaks: condense some logic, to elide a variable and a comment
+      tweaks: do not leak the indentation when all lines are empty
+      tweaks: don't close a descriptor when its stream has already been closed
+      tweaks: drop some debugging stuff
+      tweaks: drop some debugging stuff, and frob two comments
+      tweaks: elide an unneeded pointer
+      tweaks: elide the global variable 'full_operating_dir'
+      tweaks: fix compilation with --enable-{tiny,help,multibuffer}
+      tweaks: group all movement routines in corresponding pairs
+      tweaks: keep the const qualifier of the syntax name  [coverity scan]
+      tweaks: remove includes that appear to be superfluous
+      tweaks: rename a function, to let it make more sense
+      tweaks: rename a label, to better match its task
+      tweaks: renumber the special key codes, to be in sequence and grouped
+      tweaks: reshuffle code and frob comments, to reduce the number of lines
+      tweaks: reshuffle some code to harmonize two related functions
+      tweaks: reshuffle some declarations and trim a few comments
+      tweaks: restore an include that is necessary on some platforms
+      tweaks: show "where is next" in the help lines of the file browser
+      tweaks: simply set the proper scrolling mode, instead of imitating it
+      tweaks: snip a superfluous clearing of the bottom bars after help
+      tweaks: sort the includes, so it's a little easier to see what is there
+      tweaks: specify more directly in what manner to move the viewport
+
+David Lawrence Ramsey (23):
+      browser: allow backward/forward re-searches with Alt+Up/Alt+Down
+      display: constrain line numbers on softwrapped lines with sprawling tabs
+      display: do show the visible character for a tab when it starts a row
+      display: revamp how screen updates are done in the movement code
+      moving: redraw not just the new current line but also the prior one
+      small addition: allow customizing the color of selected text
+      softwrap: correctly move vertically through overwide tabs
+      softwrap: don't push a straddling tab to the next chunk
+      softwrap: improve left/right navigation across line boundaries
+      softwrap: make sure char_len is set when a tab is wider than a chunk
+      softwrap: properly update the viewport when adding text at firstcolumn
+      text: make indenting add to the beginning of the line
+      text: make unindenting remove from the beginning of the line
+      tweaks: adjust spacing and wording in sample.nanorc
+      tweaks: correct a comment typo and an indentation error
+      tweaks: harmonize some prototypes with their functions
+      tweaks: remove unneeded parentheses and blank line and braces
+      tweaks: replace a misplaced tab with a space
+      tweaks: set the target row for smooth scrolling more directly
+      tweaks: use charalloc() instead of (char *)nmalloc() * sizeof(char)
+      weeding: drop the forreal parameter from place_the_cursor()
+      weeding: remove redundant casts of nmalloc()
+      weeding: remove the unused be_clever parameter from do_home()/do_end()
+
+Rishabh Dave (1):
+      new feature: allow pasting at all input prompts
+
+Urja Rannikko (1):
+      bindings: hard-bind Alt+Left and Alt+Right to buffer switching
+
+
+Changes between v2.8.5 and v2.8.6:
+----------------------------------
+
+Benno Schulenberg (58):
+      build: for Solaris, tell the linker to use a threading lib
+      bump version numbers and add a news item for the 2.8.6 release
+      display: avoid a jumpy cursor by redrawing bottom bars only when needed
+      display: when back in the main loop, always redraw the help lines
+      display: wipe stale messages from the status bar straightaway
+      docs: add some more mark-up to the Info document
+      docs: be more precise about when a dash is given instead of a filename
+      docs: drop the cluttering Info-style links from the HTML manual
+      docs: improve cross references and mark-up in the Info document
+      docs: improve some spacing, especially of the synopsis in the PDF
+      docs: make the guillemot and the middle dot appear correctly in HTML
+      docs: move the descriptions of 'header' and 'magic' next to 'syntax'
+      docs: remove the mention of backslashes for the argument of 'comment'
+      docs: reword the explanation of the 'syntax' command
+      docs: use real cross references in the Info document
+      docs: use the @command and @option mark-up more consistently
+      files: don't bother counting rows when opening a fresh buffer
+      files: warn more conspicuously when the file on disk has changed
+      gnulib: update to its current state
+      input: recognize the Ctrl+Arrow key sequences from Haiku's Terminal
+      options: recognize -a and --atblanks on the command line
+      options: rename --cut to --cutfromcursor, to be clearer
+      pasting: restore the cap on the number of chunks to move backward
+      rcfile: don't require backslashing in the argument of 'comment'
+      screen: defeat a VTE/Konsole bug also for the case of --constantshow
+      screen: retain the same help-line tags when the window is resized
+      softwrap: when possible, go back a whole bunch of chunks at a time
+      startup: don't try parsing color names that were not specified
+      startup: in default mode, display the tail of the file as Pico does
+      suspension: prevent entering an invalid byte upon resume (with S-Lang)
+      syntax: gentoo: make it clearer that the file contains two syntaxes
+      syntax: man, groff: fix the string that introduces a comment
+      syntax: nanorc: don't color numeric arguments specially
+      syntax: nanorc: don't color the argument of 'linter' as if invalid
+      syntax: texinfo: cover also some special cases like @U, @OE and @TeX
+      tweaks: adjust an error message so it fits all possible cases
+      tweaks: avoid a clang warning about an expression being treated as NULL
+      tweaks: avoid a failure with black diamonds in a PDF
+      tweaks: avoid an unused-variable warning for the tiny version
+      tweaks: chuck some debugging stuff
+      tweaks: chuck two useless asserts, and elide a call to strncasecmp()
+      tweaks: correct two conditions for conditional compilation
+      tweaks: drop a bunch of useless asserts
+      tweaks: elide unneeded calls of get_last_chunk_leftedge()
+      tweaks: fix compilation with --enable-tiny
+      tweaks: move an include to the file that actually makes use of it
+      tweaks: put declarations always first, so it will compile on Haiku
+      tweaks: recognize the empty string as comment inhibitor, instead of NULL
+      tweaks: remove two superfluous includes
+      tweaks: rename a constant, to match the corresponding option
+      tweaks: rename another constant, to be more precise
+      tweaks: rename a variable, to have more contrast
+      tweaks: rename four functions, to be more distinct
+      tweaks: rename two variables, to make a little sense
+      tweaks: reshuffle some things to condense the code
+      tweaks: simplify the parsing of color combinations
+      tweaks: spell an option correctly in NEWS
+      tweaks: swap ^X and ^L in the help lines of the help viewer
+
+David Lawrence Ramsey (29):
+      display: when converting tabs, don't go beyond the screen width
+      docs: consistently describe the -U/-c and -r/-w overrides
+      docs: mention that boldtext can be overridden also for function tags
+      docs: mention the default values for comment and whitespace directives
+      moving: fix the cursor jumping back and forth with non-smooth paging
+      moving: make vertical movement account for varying chunk width
+      new feature: allow lines to be softwrapped at whitespace
+      replacing: make spotlight() account for varying chunk width
+      softwrap: add new functions for chunks of varying width
+      softwrap: don't flag EOL too early, nor break continuous text too early
+      softwrap: in do_mouse(), keep the cursor before a softwrap breakpoint
+      softwrap: make the changes to actually allow the chunk width to vary
+      softwrap: prepare for allowing the chunk width to vary
+      softwrap: remove unneeded caps on the number of chunks to move
+      syntax: nanorc: properly color a "fill" option with a negative value
+      text: adjust the comments in do_indent() and do_unindent()
+      text: make do_unindent() an exact copy of do_indent()
+      text: make sure commenting is disabled when comment "" was specified
+      text: normalize the indentation in do_indent() and do_unindent()
+      text: remove indent-related code from do_unindent()
+      text: remove the last usage of cols in do_indent() and do_unindent()
+      text: remove unindent-related code from do_indent()
+      text: remove unneeded references to cols from the indentation routines
+      text: update placewewant properly when indenting/unindenting
+      tweaks: correct a parameter type, and correct two empty initializations
+      tweaks: fix a typo in NEWS
+      tweaks: only compensate for a partially-offscreen line in softwrap mode
+      tweaks: remove unneeded braces, and mark empty parameter list as void
+      usage: a dash doesn't have to come first among the filenames
+
+
+Changes between v2.8.4 and v2.8.5:
+----------------------------------
+
+Benno Schulenberg (35):
+      bindings: in the tiny version exclude word jumping from the prompts
+      bump version numbers and add a news item for the 2.8.5 release
+      display: don't let a SIGCONT write anything to the screen
+      display: don't show the cursor while we are busy calculating its position
+      display: redraw title bar and edit window only when needed
+      display: show the cursor position also when searching took a while
+      docs: avoid a double "see" for cross references in the HTML manual
+      docs: spell "title bar" and "status bar" correctly
+      gnulib: update to its current state
+      input: give an appropriate message when there are too many errors
+      startup: allow negative line and column numbers on the command line
+      startup: allow positioning the cursor also when reading standard input
+      startup: always open with the file that was mentioned first
+      startup: don't crash when opening standard input would fail
+      startup: don't mark the buffer as modified when in view mode
+      startup: don't mark the buffer as modified when nothing was read
+      startup: don't try placing the cursor when reading standard input failed
+      startup: don't use position history when reading from standard input
+      suspension: fake a SIGWINCH when coming back out of the background
+      suspension: remove a duplicate setting of the HUP and TERM handler
+      syntax: default: allow leading whitespace before a hash comment
+      tweaks: adjust indentation after preceding changes
+      tweaks: avoid compiler warning about implicit type
+      tweaks: be consistent in the spelling of title bar and status bar
+      tweaks: don't bother calculating the position when we won't show it
+      tweaks: elide a function that should not be a separate one
+      tweaks: elide a variable
+      tweaks: frob a few comments, and elide and #ifndef
+      tweaks: reduce the scope of three variables, and rename them besides
+      tweaks: reduce the scope of two variables, and rename them too
+      tweaks: rename a function and a variable, to better match what they do
+      tweaks: rename a variable, and frob a couple of comments
+      tweaks: rename two functions and a variable, and invert its logic
+      tweaks: reshuffle some stuff, to put related things closer together
+      tweaks: unglobalize the nodelay_mode variable
+
+
+Changes between v2.8.3 and v2.8.4:
+----------------------------------
+
+Benno Schulenberg (11):
+      build: correct the inverted logic for the nanorc man page
+      bump version numbers and add a news item for the 2.8.4 release
+      gnulib: update to its current state
+      syntax: default: color also hash comments and email addresses
+      syntax: php: color "static" again as "function", like it used to be
+      tweaks: adjust the indentation after the preceding change
+      tweaks: avoid an unused-variable warning when using --disable-comment
+      tweaks: do actual screen refreshes in a single call, when possible
+      tweaks: remove the no-op x$disable tests
+      tweaks: reorder three items in the Info document
+      tweaks: reshuffle a few things to reduce duplication
+
+
 Changes between v2.8.2 and v2.8.3:
 ----------------------------------
 

IMPROVEMENTS

@@ -1,11 +1,21 @@
 Improvements in GNU nano
 ========================
 
+Since 2.9.0:
+  - The ability to record and replay a series of keystrokes (a macro).
+  - Assigned functions to ^S (save file) and ^Q (start backward search).
+  - Indenting and unindenting have been integrated into the undo system.
+  - Support for $XDG_CONFIG_HOME for the nanorc file, and $XDG_DATA_HOME
+    for the history files (of search strings and cursor positions).
+
 Since 2.8.0:
+  - Meta-Up/Meta-Down will search the previous/next occurrence.
+  - ^U pastes the first line of the cutbuffer at a prompt.
+  - Softwrapping can be done at whitespace (with --soft --atblanks).
   - The ^G help texts have become searchable (with ^W and M-W).
   - Ctrl+Home and Ctrl+End jump to start and end of file.
-  - In softwrap mode the cursor now moves per visual row instead of per
-    logical line, and the screen will scroll per row.
+  - In softwrap mode the cursor now moves per visual row instead of
+    per logical line, and the screen will scroll per row.
 
 Since 2.7.0:
   - The keystroke ^] to complete a fragment to an existing full word.

NEWS

@@ -1,3 +1,57 @@
+2017.11.27 - GNU nano 2.9.1 "Damyatta" fixes a bug where, when the mark
+		is on, ^S would overwrite the file with just the marked
+		region.  This release further clears the "Modified" flag
+		when all edits are undone, adds or updates some magic
+		strings, and does not forget when the cursor was last
+		at line 1, column 1.
+
+2017.11.18 - GNU nano 2.9.0 "Eta" introduces the ability to record and
+		replay keystrokes (M-: to start and stop recording, M-;
+		to play the macro back), makes ^Q and ^S do something
+		useful by default (^Q starts a backward search, and ^S
+		saves the current file), changes ^W to start always a
+		forward search, shows the number of open buffers (when
+		more than one) in the title bar, no longer asks to press
+		Enter when there are errors in an rc file, retires the
+		options '--quiet' and 'set quiet' and 'set backwards',
+		makes indenting and unindenting undoable, will look in
+		$XDG_CONFIG_HOME for a nanorc file and in $XDG_DATA_HOME
+		for the history files, adds a history stack for executed
+		commands (^R^X), does not overwrite the position-history
+		file of another nano, and fixes a score of tiny bugs.
+
+
+2017.08.27 - GNU nano 2.8.7 "Fragrance" fixes a lockup when tabs are
+		wider than the screen, makes indenting + unindenting
+		more predictable by retaining relative indentations,
+		allows pasting (^U) at a prompt, allows triple quotes
+		in Python to not be followed by a character, does not
+		scroll three pages on a roll of the mouse wheel, binds
+		Alt+Up and Alt+Down to findprevious and findnext, and
+		fixes some hard-to-describe issues with softwrapping
+		and boundary-crossing tabs.  Enjoy.
+
+2017.07.21 - GNU nano 2.8.6 "Kekulé" offers a new feature: the ability
+		to do softwrapping between words -- at whitespace --
+		instead of always at the edge of the screen.  This can
+		be activated with -a or --atblanks or 'set atblanks'
+		together with the softwrap option.  This release further
+		fixes a handful of rare display glitches, fixes a build
+		failure on AIX, harmonizes the quoting rules in the rc
+		files, and renames the option 'cut' to 'cutfromcursor'
+		(please update your nanorc files before 2020).
+
+2017.06.25 - GNU nano 2.8.5 "Farouche" avoids a crash when waking from
+		a suspension that was induced from the outside, allows
+		negative line and column numbers on the command line,
+		avoids some flickering when resizing the screen while
+		in the file browser, opens files in the order they were
+		mentioned on the command line, and does not pretend to
+		have woken from suspension when receiving a SIGCONT.
+
+2017.05.21 - GNU nano 2.8.4 "Our Version of Events" includes the nanorc
+		man page again.
+
 2017.05.18 - GNU nano 2.8.3 "Hirsch" fixes a misplacement of the spotlight
 		during interactive replacing, avoids build failures on AIX
 		and Solaris, fixes a crash on Solaris, speeds up backwards
@@ -123,7 +177,7 @@
 		input (M-V followed by a six-digit hexadecimal number which
 		must start with 0 or 10), avoids a crash when resizing the
 		window during Verbatim input, doesn't drop a keystroke after
-		having been suspended, and replaces the	beginning-of-line
+		having been suspended, and replaces the beginning-of-line
 		anchor (^) just once per line.  There are also several tiny
 		improvements in screen rendering and key handling.  Come get
 		your hair tousled!
@@ -286,7 +340,7 @@
 		many many improvements to the core system, including
 		substantial improvements to the undo/redo code, UTF-8
 		handling, the configure script, and display of shortcuts
-		on very wide terminals,  New features include the
+		on very wide terminals.  New features include the
 		ability to write to named pipes (--noread), as well as
 		linter support (see the nanorc man page for details).  Also
 		included are much improved syntax highlighting code, and
@@ -570,7 +624,7 @@
 		compiling on AIX, and a segfault when making the terminal
 		window too small.  Rest in Peace Tim and George!
 
-2008.04.01 - GNU nano 2.1.1 wont get fooled again.  This release contains
+2008.04.01 - GNU nano 2.1.1 won't get fooled again.  This release contains
 		fixes for the new user-rebindable keys (in particular
 		bracket match which was mis-bound), and various
 		problems with translations and configure-related
@@ -735,7 +789,7 @@
 		focuses mostly on bugfixes, which include better
 		handling of the cursor at the statusbar prompt, support
 		for certain combinations of Shift and keypad keys in
-		both normal and --rebind-keypad mode, a fix for a minor
+		both normal and --rebindkeypad mode, a fix for a minor
 		display problem after some searches, a real fix for a
 		long-standing segfault when displaying overly long
 		lines, and a real fix for nano's not hanging up properly
@@ -1263,12 +1317,12 @@
 
 
 2001.02.19 - Nano 0.9.99pre3 brings a lot of changes!  The most important
-		being that nano is now officially a GNU	program.  Some
+		being that nano is now officially a GNU program.  Some
 		changes have been made for GNU compatibility (like in the
 		default list of shortcuts: "^G Get Help" is now listed
 		and "^_ Goto Line" is not).  The Yes/No/All keys have
 		finally been internationalized also.  All in all, quite
-		a few changes, considering nano	is supposed to be in
+		a few changes, considering nano is supposed to be in
 		a code freeze.  But there are the usual helping of
 		bugfixes, a nasty bug when cutting text in -k mode and
 		some compatibility issues with older ncurses libraries
@@ -1596,7 +1650,7 @@
 
 2000.02.02 - Okay, I hate to go back on what I said in the last release,
 		but I may be changing jobs very soon.  I will release
-		version 0.8.2 as is (no i18n, no help menu (yet).  I
+		version 0.8.2 as is (no i18n, no help menu (yet)).  I
 		expect things to settle down by the end of next week,
 		and then I can try to start on the i18n support and help
 		menu; look for these new features in version 0.8.5 to

README.GIT

@@ -93,12 +93,15 @@ first create a branch off of master:
 
     $ git checkout -b somename
 
-Then change the code so it does what you want, and commit it, with in the
-commit message (after the one-line summary) a rationale for the change:
+Then change the code so it does what you want, and commit it together
+with your Sign-off:
 
     $ git commit -as
 
-Then create a patch (or patches):
+In the commit message (after the one-line summary) give a rationale
+for the change.  With your Signed-off-by you declare that the code is
+yours, or that you are free to reuse it, and that you submit it under
+the license that covers nano.  Then create a patch (or patches):
 
     $ git format-patch master
 

autogen.sh

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

configure.ac

@@ -16,7 +16,7 @@
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see http://www.gnu.org/licenses/.
 
-AC_INIT([GNU nano], [2.8.3], [nano-devel@gnu.org], [nano])
+AC_INIT([GNU nano], [2.9.1], [nano-devel@gnu.org], [nano])
 AC_CONFIG_SRCDIR([src/nano.c])
 AC_CANONICAL_HOST
 AM_INIT_AUTOMAKE([1.14])
@@ -69,14 +69,21 @@ if test "x$enable_tiny" = xyes; then
 	enable_browser=no
     fi
 fi
-if test "x$disable_browser" != xyes; then
-    if test "x$enable_browser" != xno; then
-	AC_DEFINE(ENABLE_BROWSER, 1, [Define this to enable the built-in file browser.])
-    fi
+if test "x$enable_browser" != xno; then
+    AC_DEFINE(ENABLE_BROWSER, 1, [Define this to enable the built-in file browser.])
 fi
 
 AC_ARG_ENABLE(color,
 AS_HELP_STRING([--disable-color], [Disable color and syntax highlighting]))
+if test "x$enable_tiny" = xyes; then
+    if test "x$enable_color" = xyes; then
+	if test "x$enable_nanorc" != xyes; then
+	    AC_MSG_ERROR([--enable-color needs --enable-nanorc to work])
+	fi
+    else
+	enable_color=no
+    fi
+fi
 if test "x$enable_nanorc" = xno; then
     if test "x$enable_color" = xyes; then
 	AC_MSG_ERROR([--enable-color cannot work with --disable-nanorc])
@@ -85,9 +92,8 @@ if test "x$enable_nanorc" = xno; then
 	enable_color=no
     fi
 fi
-if test "x$enable_color" = xno; then
-    AC_DEFINE(DISABLE_COLOR, 1, [Define this to disable syntax highlighting.])
-else
+if test "x$enable_color" != xno; then
+    AC_DEFINE(ENABLE_COLOR, 1, [Define this to have syntax highlighting.])
     color_support=yes
 fi
 
@@ -100,16 +106,19 @@ if test "x$enable_tiny" = xyes; then
 	enable_comment=no
     fi
 fi
-if test "x$disable_comment" != xyes; then
-    if test "x$enable_comment" != xno; then
-	AC_DEFINE(ENABLE_COMMENT, 1, [Define this to enable the comment/uncomment function.])
-    fi
+if test "x$enable_comment" != xno; then
+    AC_DEFINE(ENABLE_COMMENT, 1, [Define this to enable the comment/uncomment function.])
 fi
 
 AC_ARG_ENABLE(extra,
 AS_HELP_STRING([--disable-extra], [Disable the Easter egg]))
-if test "x$enable_extra" = xno; then
-    AC_DEFINE(DISABLE_EXTRA, 1, [Define this to disable extra stuff.])
+if test "x$enable_tiny" = xyes; then
+    if test "x$enable_extra" != xyes; then
+	enable_extra=no
+    fi
+fi
+if test "x$enable_extra" != xno; then
+    AC_DEFINE(ENABLE_EXTRA, 1, [Define this to have an Easter egg.])
 fi
 
 AC_ARG_ENABLE(help,
@@ -117,7 +126,7 @@ AS_HELP_STRING([--disable-help], [Disable the built-in help texts]))
 if test "x$enable_tiny" = xyes; then
     if test "x$enable_help" = xyes; then
 	if test "x$enable_multibuffer" != xyes; then
-	    AC_MSG_ERROR([--enable-help cannot work without --enable-multibuffer])
+	    AC_MSG_ERROR([--enable-help needs --enable-multibuffer to work])
 	fi
     else
 	enable_help=no
@@ -131,22 +140,30 @@ if test "x$enable_multibuffer" = xno; then
 	enable_help=no
     fi
 fi
-if test "x$disable_help" != xyes; then
-    if test "x$enable_help" != xno; then
-	AC_DEFINE(ENABLE_HELP, 1, [Define this to enable the Ctrl+G help texts.])
-    fi
+if test "x$enable_help" != xno; then
+    AC_DEFINE(ENABLE_HELP, 1, [Define this to enable the Ctrl+G help texts.])
 fi
 
 AC_ARG_ENABLE(histories,
 AS_HELP_STRING([--disable-histories], [Disable search and position histories]))
-if test "x$enable_histories" = xno; then
-    AC_DEFINE(DISABLE_HISTORIES, 1, [Define this to disable search and position histories.])
+if test "x$enable_tiny" = xyes; then
+    if test "x$enable_histories" != xyes; then
+	enable_histories=no
+    fi
+fi
+if test "x$enable_histories" != xno; then
+    AC_DEFINE(ENABLE_HISTORIES, 1, [Define this to have search and position histories.])
 fi
 
 AC_ARG_ENABLE(justify,
 AS_HELP_STRING([--disable-justify], [Disable the justify/unjustify functions]))
-if test "x$enable_justify" = xno; then
-    AC_DEFINE(DISABLE_JUSTIFY, 1, [Define this to disable the justify routines.])
+if test "x$enable_tiny" = xyes; then
+    if test "x$enable_justify" != xyes; then
+	enable_justify=no
+    fi
+fi
+if test "x$enable_justify" != xno; then
+    AC_DEFINE(ENABLE_JUSTIFY, 1, [Define this to have the routines for justifying.])
 fi
 
 AC_ARG_ENABLE(libmagic,
@@ -159,10 +176,8 @@ if test "x$enable_tiny" = xyes; then
 	enable_linenumbers=no
     fi
 fi
-if test "x$disable_linenumbers" != xyes; then
-    if test "x$enable_linenumbers" != xno; then
-	AC_DEFINE(ENABLE_LINENUMBERS, 1, [Define this to enable line numbering.])
-    fi
+if test "x$enable_linenumbers" != xno; then
+    AC_DEFINE(ENABLE_LINENUMBERS, 1, [Define this to enable line numbering.])
 fi
 
 AC_ARG_ENABLE(mouse,
@@ -172,10 +187,8 @@ if test "x$enable_tiny" = xyes; then
 	enable_mouse=no
     fi
 fi
-if test "x$disable_mouse" != xyes; then
-    if test "x$enable_mouse" != xno; then
-	AC_DEFINE(ENABLE_MOUSE, 1, [Define this to enable mouse support.])
-    fi
+if test "x$enable_mouse" != xno; then
+    AC_DEFINE(ENABLE_MOUSE, 1, [Define this to enable mouse support.])
 fi
 
 AC_ARG_ENABLE(multibuffer,
@@ -185,10 +198,8 @@ if test "x$enable_tiny" = xyes; then
 	enable_multibuffer=no
     fi
 fi
-if test "x$disable_multibuffer" != xyes; then
-    if test "x$enable_multibuffer" != xno; then
-	AC_DEFINE(ENABLE_MULTIBUFFER, 1, [Define this to enable multiple file buffers.])
-    fi
+if test "x$enable_multibuffer" != xno; then
+    AC_DEFINE(ENABLE_MULTIBUFFER, 1, [Define this to enable multiple file buffers.])
 fi
 
 AC_ARG_ENABLE(nanorc,
@@ -198,24 +209,31 @@ if test "x$enable_tiny" = xyes; then
 	enable_nanorc=no
     fi
 fi
-if test "x$disable_nanorc" != xyes; then
-    if test "x$enable_nanorc" != xno; then
-	AC_DEFINE(ENABLE_NANORC, 1, [Define this to enable the use of .nanorc files.])
-    else
-	nanorc_support=yes
-    fi
+if test "x$enable_nanorc" != xno; then
+    AC_DEFINE(ENABLE_NANORC, 1, [Define this to enable the use of .nanorc files.])
+    nanorc_support=yes
 fi
 
 AC_ARG_ENABLE(operatingdir,
 AS_HELP_STRING([--disable-operatingdir], [Disable the setting of an operating directory]))
-if test "x$enable_operatingdir" = xno; then
-    AC_DEFINE(DISABLE_OPERATINGDIR, 1, [Define this to disable the setting of an operating directory (a chroot of sorts).])
+if test "x$enable_tiny" = xyes; then
+    if test "x$enable_operatingdir" != xyes; then
+	enable_operatingdir=no
+    fi
+fi
+if test "x$enable_operatingdir" != xno; then
+    AC_DEFINE(ENABLE_OPERATINGDIR, 1, [Define this to allow setting an operating directory (a chroot of sorts).])
 fi
 
 AC_ARG_ENABLE(speller,
 AS_HELP_STRING([--disable-speller], [Disable the spell-checker functions]))
-if test "x$enable_speller" = xno; then
-    AC_DEFINE(DISABLE_SPELLER, 1, [Define this to disable the spell-checker functions.])
+if test "x$enable_tiny" = xyes; then
+    if test "x$enable_speller" != xyes; then
+	enable_speller=no
+    fi
+fi
+if test "x$enable_speller" != xno; then
+    AC_DEFINE(ENABLE_SPELLER, 1, [Define this to have the spell-checker functions.])
 fi
 
 AC_ARG_ENABLE(tabcomp,
@@ -225,10 +243,8 @@ if test "x$enable_tiny" = xyes; then
 	enable_tabcomp=no
     fi
 fi
-if test "x$disable_tabcomp" != xyes; then
-    if test "x$enable_tabcomp" != xno; then
-	AC_DEFINE(ENABLE_TABCOMP, 1, [Define this to have tab completion for filenames and search strings.])
-    fi
+if test "x$enable_tabcomp" != xno; then
+    AC_DEFINE(ENABLE_TABCOMP, 1, [Define this to have tab completion for filenames and search strings.])
 fi
 
 AC_ARG_ENABLE(wordcomp,
@@ -240,16 +256,19 @@ if test "x$enable_tiny" = xyes; then
 	enable_wordcomp=no
     fi
 fi
-if test "x$disable_wordcomp" != xyes; then
-    if test "x$enable_wordcomp" != xno; then
-	AC_DEFINE(ENABLE_WORDCOMPLETION, 1, [Define this to enable the word-completion function.])
-    fi
+if test "x$enable_wordcomp" != xno; then
+    AC_DEFINE(ENABLE_WORDCOMPLETION, 1, [Define this to enable the word-completion function.])
 fi
 
 AC_ARG_ENABLE(wrapping,
 AS_HELP_STRING([--disable-wrapping], [Disable all hard-wrapping of text]))
-if test "x$enable_wrapping" = xno; then
-    AC_DEFINE(DISABLE_WRAPPING, 1, [Define this to disable all hard text wrapping.])
+if test "x$enable_tiny" = xyes; then
+    if test "x$enable_wrapping" != xyes; then
+	enable_wrapping=no
+    fi
+fi
+if test "x$enable_wrapping" != xno; then
+    AC_DEFINE(ENABLE_WRAPPING, 1, [Define this to have hard text wrapping.])
 fi
 
 AC_ARG_ENABLE(wrapping-as-root,
@@ -270,35 +289,9 @@ AC_ARG_ENABLE(tiny,
 AS_HELP_STRING([--enable-tiny], [Disable features for the sake of size]))
 if test "x$enable_tiny" = xyes; then
     AC_DEFINE(NANO_TINY, 1, [Define this to make the nano executable as small as possible.])
-    if test "x$enable_color" != xyes; then
-	AC_DEFINE(DISABLE_COLOR, 1, [Define this to disable syntax highlighting.])
-	color_support=no
-    else
-	if test "x$enable_nanorc" != xyes; then
-	    AC_MSG_ERROR([--enable-color with --enable-tiny cannot work without --enable-nanorc])
-	fi
-    fi
-    if test "x$enable_extra" != xyes; then
-	AC_DEFINE(DISABLE_EXTRA, 1, [Define this to disable extra stuff.])
-    fi
-    if test "x$enable_histories" != xyes; then
-	AC_DEFINE(DISABLE_HISTORIES, 1, [Define this to disable search and position histories.])
-    fi
-    if test "x$enable_justify" != xyes; then
-	AC_DEFINE(DISABLE_JUSTIFY, 1, [Define this to disable the justify routines.])
-    fi
     if test "x$enable_libmagic" != xyes; then
 	enable_libmagic=no
     fi
-    if test "x$enable_operatingdir" != xyes; then
-	AC_DEFINE(DISABLE_OPERATINGDIR, 1, [Define this to disable the setting of an operating directory (a chroot of sorts).])
-    fi
-    if test "x$enable_speller" != xyes; then
-	AC_DEFINE(DISABLE_SPELLER, 1, [Define this to disable the spell-checker functions.])
-    fi
-    if test "x$enable_wrapping" != xyes; then
-	AC_DEFINE(DISABLE_WRAPPING, 1, [Define this to disable all text wrapping.])
-    fi
 fi
 
 AM_CONDITIONAL(USE_COLOR, test x$color_support = xyes)

doc/.gitignore

@@ -4,4 +4,5 @@ nanorc.5.html
 texinfo.tex
 nano.info
 nano.html
+nano.pdf
 sample.nanorc

doc/Makefile.am

@@ -28,6 +28,6 @@ info_TEXINFOS = nano.texi
 BUILT_SOURCES += nano.html
 dist_html_DATA += nano.html
 
-AM_MAKEINFOHTMLFLAGS = --no-split
+AM_MAKEINFOHTMLFLAGS = --no-split -c HEADERS=0
 
 EXTRA_DIST = $(BUILT_SOURCES) $(info_TEXINFOS)

doc/faq.html

@@ -83,7 +83,7 @@
 <h2><a name="1.3"></a>1.3. Why the name change from TIP?</h2>
 <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>
 <h2><a name="1.4"></a>1.4. What is the current version of nano?</h2>
-<blockquote><p>The current version of nano <i>should</i> be <b>2.8.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>
+<blockquote><p>The current version of nano <i>should</i> be <b>2.9.1</b>.  Of course, you should always check the <a href="https://nano-editor.org/">nano homepage</a> to see what the latest and greatest version is.</p></blockquote>
 <h2><a name="1.5"></a>1.5. I want to read the man page without having to download the program!</h2>
 <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%">
@@ -161,7 +161,7 @@
 <blockquote><p>To use multiple file buffers, you must not have configured nano with <b>--disable-multibuffer</b> nor with <b>--enable-tiny</b> (use <b>nano -V</b> to check the compilation options). Then when you want to insert a file into its own buffer instead of into the current file, just hit <b>Meta-F</b> after typing <b>^R</b>. If you always want files to be loaded into their own buffers, use the <b>--multibuffer</b> or <b>-F</b> flag when you invoke nano.</p>
   <p>You can move between the buffers you have open with the <b>Meta-&lt;</b> and <b>Meta-&gt;</b> keys, or more easily without holding Shift: <b>Meta-,</b> and <b>Meta-.</b> (clear as mud, right? =-). When you have more than one file buffer open, the ^X shortcut will say &quot;Close&quot;, instead of the normal &quot;Exit&quot; when only one buffer is open.</p></blockquote>
 <h2><a name="3.8"></a>3.8. Tell me more about this verbatim input stuff!</h2>
-<blockquote><p>When you want to insert a literal character into the file you're editing, such as a control character that nano usually treats as a command, first press <b>Meta-V</b> (if you're not at a prompt, you'll get the message &quot;Verbatim Input&quot; on the statusbar), then press the key(s) that generate the character you want.</p>
+<blockquote><p>When you want to insert a literal character into the file you're editing, such as a control character that nano usually treats as a command, first press <b>Meta-V</b> (if you're not at a prompt, you'll get the message &quot;Verbatim Input&quot; on the status bar), then press the key(s) that generate the character you want.</p>
   <p>Alternatively, if you've enabled Unicode support (see section <a href="#5.3">5.3</a>), you can press <b>Meta-V</b> and then type a six-digit hexadecimal code (from 000000 to 10FFFF, case-insensitive), and the character with the corresponding value will be inserted. The statubar will change to &quot;Unicode Input: ......&quot; when you do this.</p></blockquote>
 <h2><a name="3.9a"></a>3.9a. How do I make a .nanorc file that will be read when I start nano?</h2>
 <blockquote><p>It's not hard at all! But, your nano must <b>not</b> have been compiled with <b>--disable-nanorc</b>. Then simply copy the <b>sample.nanorc</b> that came with the nano source or your nano package (most likely in /usr/doc/nano) to .nanorc in your home directory. If you didn't get one, the syntax of the file is simple. Flags are turned on and off by using the words <b>set</b> and <b>unset</b> plus the long option name for the feature. For example, &quot;set nowrap&quot; or &quot;set smarthome&quot;.</p></blockquote>

doc/nano.1

@@ -16,8 +16,7 @@
 .\"   Documentation License along with this program.  If not, see
 .\"   <http://www.gnu.org/licenses/>.
 .\"
-.TH NANO 1 "version 2.8.3" "May 2017"
-.\" Please adjust this date whenever revising the manpage.
+.TH NANO 1 "version 2.9.1" "November 2017"
 
 .SH NAME
 nano \- Nano's ANOther editor, an enhanced free Pico clone
@@ -36,8 +35,8 @@ When giving a filename on the command line, the cursor can be put on a
 specific line by adding the line number with a plus sign (\fB+\fR) before
 the filename, and even in a specific column by adding it with a comma.
 
-If the first file specified is a dash (\fB\-\fR), \fBnano\fR will read
-data from standard input.
+As a special case: if instead of a filename a dash (\fB\-\fR) is given,
+\fBnano\fR will read data from standard input.
 
 .SH EDITING
 Entering text and moving around in a file is straightforward: typing the
@@ -61,7 +60,7 @@ stride.
 .PP
 The two lines at the bottom of the screen show some important commands;
 the built-in help (\fB^G\fR) lists all the available ones.
-The default key bindings can be changed via the .nanorc file -- see
+The default key bindings can be changed via a \fInanorc\fR file -- see
 .BR nanorc (5).
 
 .SH OPTIONS
@@ -77,7 +76,7 @@ line.
 When saving a file, back up the previous version of it, using the current
 filename suffixed with a tilde (\fB~\fP).
 .TP
-.BR \-C\ \fIdirectory\fR ", " \-\-backupdir= \fIdirectory
+.BR \-C\ \fIdirectory ", " \-\-backupdir= \fIdirectory
 Make and keep not just one backup file, but make and keep a uniquely
 numbered one every time a file is saved -- when backups are enabled (\fB\-B\fR).
 The uniquely numbered files are stored in the specified \fIdirectory\fR.
@@ -95,11 +94,11 @@ Read a file into a new buffer by default.
 Use vim-style file locking when editing files.
 .TP
 .BR \-H ", " \-\-historylog
-Log search and replace strings to \fI~/.nano/search_history\fP, so they can be
-retrieved in later sessions.
+Save the last hundred search strings and replacement strings and
+executed commands, so they can be easily reused in later sessions.
 .TP
 .BR \-I ", " \-\-ignorercfiles
-Don't look at the system's \fBnanorc\fP nor at \fB~/.nanorc\fP.
+Don't look at the system's \fInanorc\fR nor at the user's \fInanorc\fR.
 .TP
 .BR \-K ", " \-\-rebindkeypad
 Interpret the numeric keypad keys so that they all work properly.  You
@@ -113,14 +112,14 @@ Don't add newlines to the ends of files.
 Disable automatic conversion of files from DOS/Mac format.
 .TP
 .BR \-O ", " \-\-morespace
-Use the blank line below the titlebar as extra editing space.
+Use the blank line below the title bar as extra editing space.
 .TP
 .BR \-P ", " \-\-positionlog
 For the 200 most recent files, log the last position of the cursor,
 and place it at that position again upon reopening such a file.
 (The old form of this option, \fB\-\-poslog\fR, is deprecated.)
 .TP
-.BR "\-Q ""\fIcharacters\fB""" ", " "\-\-quotestr=""" \fIcharacters\fR """
+.BR "\-Q ""\fIcharacters\fB""" ", " "\-\-quotestr=""" \fIcharacters """
 Set the quoting string for justifying.  The default is
 \fB"^([\ \\t]*[#:>\\|}])+"\fP if extended regular expression support is
 available, or \fB">\ "\fP otherwise.  Note that \fB\\t\fP stands for a
@@ -139,13 +138,14 @@ with any name beginning with 'r' (e.g. "rnano").
 Use smooth scrolling: text will scroll line-by-line, instead of the
 usual chunk-by-chunk behavior.
 .TP
-.BR \-T\ \fInumber\fR ", " \-\-tabsize= \fInumber
+.BR \-T\ \fInumber ", " \-\-tabsize= \fInumber
 Set the size (width) of a tab to \fInumber\fP columns.  The value of
 \fInumber\fP must be greater than 0.  The default value is 8.
 .TP
 .BR \-U ", " \-\-quickblank
-Do quick statusbar blanking: statusbar messages will disappear after 1
-keystroke instead of 25.  Note that \fB\-c\fP overrides this.
+Do quick status-bar blanking: status-bar messages will disappear after 1
+keystroke instead of 25.  Note that option \fB\-c\fR (\fB\-\-constantshow\fR)
+overrides this.
 .TP
 .BR \-V ", " \-\-version
 Show the current version number and exit.
@@ -159,13 +159,17 @@ Specify which other characters (besides the normal alphanumeric ones)
 should be considered as part of a word.  This overrides option
 \fB\-W\fR (\fB\-\-wordbounds\fR).
 .TP
-.BR \-Y\ \fIname\fR ", " \-\-syntax= \fIname
+.BR \-Y\ \fIname ", " \-\-syntax= \fIname
 Specify the name of the syntax highlighting to use from among the ones
 defined in the \fInanorc\fP files.
 .TP
+.BR \-a ", " \-\-atblanks
+When doing soft line wrapping, wrap lines at whitespace
+instead of always at the edge of the screen.
+.TP
 .BR \-c ", " \-\-constantshow
-Constantly show the cursor position on the statusbar.
-Note that this overrides \fB\-U\fP.
+Constantly show the cursor position on the status bar.
+Note that this overrides option \fB\-U\fR (\fB\-\-quickblank\fR).
 .TP
 .BR \-d ", " \-\-rebinddelete
 Interpret the Delete key differently so that both Backspace and Delete
@@ -183,7 +187,7 @@ Show a summary of the available command-line options and exit.
 Indent new lines to the previous line's indentation.  Useful when
 editing source code.
 .TP
-.BR \-k ", " \-\-cut
+.BR \-k ", " \-\-cutfromcursor
 Make the 'Cut Text' command (normally \fB^K\fR) cut from the current cursor
 position to the end of the line, instead of cutting the entire line.
 .TP
@@ -204,7 +208,7 @@ and will write to the pipe when the user saves the "file".  This way
 \fBnano\fR can be used as an editor in combination with for instance
 \fBgpg\fR without having to write sensitive data to disk first.
 .TP
-.BR \-o\ \fIdirectory\fR ", " \-\-operatingdir= \fIdirectory
+.BR \-o\ \fIdirectory ", " \-\-operatingdir= \fIdirectory
 Set the operating directory.  This makes \fBnano\fP set up something
 similar to a chroot.
 .TP
@@ -213,17 +217,16 @@ Preserve the XON and XOFF sequences (^Q and ^S) so they will be caught
 by the terminal.
 .TP
 .BR \-q ", " \-\-quiet
-Do not report errors in the \fInanorc\fP files nor ask them to be
-acknowledged by pressing Enter at startup.
+Obsolete option.  Recognized but ignored.
 .TP
-.BR \-r\ \fInumber\fR ", " \-\-fill= \fInumber
+.BR \-r\ \fInumber ", " \-\-fill= \fInumber
 Hard-wrap lines at column \fInumber\fP.  If this value is 0 or less, wrapping
 will occur at the width of the screen less \fInumber\fP columns, allowing
 the wrap point to vary along with the width of the screen if the screen
 is resized.  The default value is \-8.  This option conflicts with
-\fB\-w\fR -- the last one given takes effect.
+\fB\-w\fR (\fB\-\-nowrap\fR) -- the last one given takes effect.
 .TP
-.BR \-s\ \fIprogram\fR ", " \-\-speller= \fIprogram
+.BR \-s\ \fIprogram ", " \-\-speller= \fIprogram
 Use this alternative spell checker command.
 .TP
 .BR \-t ", " \-\-tempfile
@@ -239,7 +242,7 @@ Just view the file and disallow editing: read-only mode.
 .TP
 .BR \-w ", " \-\-nowrap
 Disable the hard-wrapping of long lines.  This option conflicts with
-\fB\-r\fR -- the last one given takes effect.
+\fB\-r\fR (\fB\-\-fill\fR) -- the last one given takes effect.
 .TP
 .BR \-x ", " \-\-nohelp
 Don't show the two help lines at the bottom of the screen.
@@ -255,7 +258,7 @@ continuing it over multiple screen lines.  Since
 this option last when using other options (e.g.\& 'nano \-wS$') or pass it
 separately (e.g.\& 'nano \-wS \-$').
 .TP
-.BR \-a ", " \-b ", " \-e ", " \-f ", " \-j
+.BR \-b ", " \-e ", " \-f ", " \-j
 Ignored, for compatibility with Pico.
 
 .SH TOGGLES
@@ -267,9 +270,10 @@ hard-wrapping of long lines, \fBM\-$\fR toggles soft-wrapping,
 See at the end of the \fB^G\fR help text for a complete list.
 
 .SH INITIALIZATION FILE
-\fBnano\fP will read initialization files in the following order:
-the system's \fBnanorc\fP (if it exists), and then the user's
-\fB~/.nanorc\fP (if it exists).  Please see
+\fBnano\fR will read two configuration files: first the system's
+\fInanorc\fR (if it exists), and then the user's \fInanorc\fR (if it
+exists), either \fB~/.nanorc\fR or \fI$XDG_CONFIG_HOME\fB/nano/nanorc\fR
+or \fB~/.config/nano/nanorc\fR, whichever is encountered first.  See
 .BR nanorc (5)
 for more information on the possible contents of those files.
 
@@ -289,12 +293,16 @@ it unique.  In multibuffer mode, \fBnano\fP will write all the open
 buffers to their respective emergency files.
 
 .SH BUGS
-Justifications (\fB^J\fR) and reindentations (\fBM\-{\fR and \fBM\-}\fR)
+Justifications (\fB^J\fR)
 are not yet covered by the general undo system.  So after a justification
-that is not immediately undone, or after any reindentation, earlier edits
+that is not immediately undone, earlier edits
 cannot be undone any more.  The workaround is, of course, to exit without
 saving.
 .sp
+The recording and playback of keyboard macros works correctly only on a
+terminal emulator, not on a Linux console (VT), because the latter is a
+deficient terminal.  And it works only with recent versions of ncurses.
+.sp
 Please report any other bugs that you encounter via:
 .br
 \fIhttps://savannah.gnu.org/bugs/?group=nano\fR.

doc/nanorc.5

@@ -16,8 +16,7 @@
 .\"   Documentation License along with this program.  If not, see
 .\"   <http://www.gnu.org/licenses/>.
 .\"
-.TH NANORC 5 "version 2.8.3" "May 2017"
-.\" Please adjust this date whenever revising the manpage.
+.TH NANORC 5 "version 2.9.1" "November 2017"
 
 .SH NAME
 nanorc \- GNU nano's configuration file
@@ -27,7 +26,9 @@ The \fInanorc\fP file contains the default settings for \fBnano\fP, a
 small and friendly editor.  The file should be in Unix format, not in
 DOS or Mac format.  During startup, \fBnano\fP will first read the
 system-wide settings, from \fB/etc/nanorc\fP (the exact path might be
-different), and then the user-specific settings, from \fB~/.nanorc\fP.
+different on your system), and then the user-specific settings, either
+from \fB~/.nanorc\fR or from \fI$XDG_CONFIG_HOME\fB/nano/nanorc\fR
+or from \fB~/.config/nano/nanorc\fR, whichever is encountered first.
 
 .SH OPTIONS
 The configuration file accepts a series of \fBset\fP and \fBunset\fP
@@ -40,7 +41,7 @@ Options in \fInanorc\fP files take precedence over nano's defaults, and
 command-line options override \fInanorc\fP settings.  Also, options that
 do not take an argument are unset by default.  So using the \fBunset\fR
 command is only needed when wanting to override a setting of the system's
-\fInanorc\fR file in your own \fB~/.nanorc\fR.  Options that take an
+\fInanorc\fR file in your own \fInanorc\fR.  Options that take an
 argument cannot be unset.
 .PP
 Below, the \fIstring\fR parameters need to be enclosed in double quotes.
@@ -57,6 +58,10 @@ When backing up files, allow the backup to succeed even if its permissions
 can't be (re)set due to special OS considerations.  You should
 NOT enable this option unless you are sure you need it.
 .TP
+.B set atblanks
+When soft line wrapping is enabled, make it wrap lines at blank characters
+(tabs and spaces) instead of always at the edge of the screen.
+.TP
 .B set autoindent
 Use auto-indentation.
 .TP
@@ -66,18 +71,19 @@ the file's name.
 .TP
 .B set backupdir "\fIdirectory\fP"
 Make and keep not just one backup file, but make and keep a uniquely
-numbered one every time a file is saved --- when backups are enabled
+numbered one every time a file is saved -- when backups are enabled
 with \fBset backup\fR or \fB\-\-backup\fR or \fB\-B\fR.
 The uniquely numbered files are stored in the specified \fIdirectory\fR.
 .TP
 .B set backwards
-Do backwards searches by default.
+Obsolete option.  Recognized but ignored.  \fB^Q\fR is available to
+start a backward search.
 .TP
 .B set boldtext
-Use bold instead of reverse video for the titlebar, statusbar, key combos,
-line numbers, and selected text.  This can be overridden for the first four
-by setting the options \fBtitlecolor\fP, \fBstatuscolor\fP, \fBkeycolor\fP,
-and \fBnumbercolor\fP.
+Use bold instead of reverse video for the title bar, status bar, key combos,
+function tags, line numbers, and selected text.  This can be overridden by
+setting the options \fBtitlecolor\fP, \fBstatuscolor\fP, \fBkeycolor\fP,
+\fBfunctioncolor\fP, \fBnumbercolor\fP, and \fBselectedcolor\fP.
 .TP
 .B set brackets "\fIstring\fP"
 Set the characters treated as closing brackets when justifying
@@ -91,14 +97,17 @@ Do case-sensitive searches by default.
 .B set constantshow
 Constantly display the cursor position in the status bar.
 (The old form of this option, '\fBset const\fR', is deprecated.)
+This overrides the option \fBquickblank\fR.
 .TP
-.B set cut
-Use cut-to-end-of-line by default, instead of cutting the whole line.
+.B set cutfromcursor
+Use cut-from-cursor-to-end-of-line by default, instead of cutting the whole line.
+(The old form of this option, '\fBset cut\fR', is deprecated.)
 .TP
 .B set fill \fInumber\fR
 Hard-wrap lines at column number \fInumber\fR.  If \fInumber\fR is 0 or less,
 the maximum line length will be the screen width less \fInumber\fP columns.
-The default value is \fB\-8\fR.
+The default value is \fB\-8\fR.  This option conflicts with
+\fBnowrap\fR -- the last one given takes effect.
 .TP
 .B set functioncolor \fIfgcolor\fR,\fIbgcolor\fR
 Specify the color combination to use for the function descriptions
@@ -106,8 +115,8 @@ in the two help lines at the bottom of the screen.
 See \fBset titlecolor\fR for more details.
 .TP
 .B set historylog
-Enable the use of \fB~/.nano/search_history\fP for saving and reading
-search/replace strings.
+Save the last hundred search strings and replacement strings and
+executed commands, so they can be easily reused in later sessions.
 .TP
 .B set justifytrim
 When justifying text, trailing whitespace will automatically be removed.
@@ -130,7 +139,7 @@ come before the closing set, and the two sets must be in the same order.
 The default value is "\fB(<[{)>]}\fP".
 .TP
 .B set morespace
-Use the blank line below the titlebar as extra editing space.
+Use the blank line below the title bar as extra editing space.
 .TP
 .B set mouse
 Enable mouse support, if available for your system.  When enabled, mouse
@@ -156,7 +165,8 @@ Don't pause between warnings at startup.  This means that only
 the last one will be visible (when there are multiple ones).
 .TP
 .B set nowrap
-Don't hard-wrap text at all.
+Don't hard-wrap text at all.  This option conflicts with
+\fBfill\fR -- the last one given takes effect.
 .TP
 .B set numbercolor \fIfgcolor\fR,\fIbgcolor\fR
 Specify the color combination to use for line numbers.
@@ -183,13 +193,11 @@ specfified closing punctuation, optionally followed by closing brackets
 (see \fBbrackets\fP), can end sentences.  The default value is "\fB!.?\fP".
 .TP
 .B set quickblank
-Do quick statusbar blanking.  Statusbar messages will disappear after 1
-keystroke instead of 25.
+Do quick status-bar blanking: status-bar messages will disappear after 1
+keystroke instead of 25.  The option \fBconstantshow\fR overrides this.
 .TP
 .B set quiet
-\fBnano\fP will not report errors in the \fInanorc\fP file nor ask them
-to be acknowledged by pressing Enter at startup.  If this is used, it
-should be placed at the top of the file to be fully effective.
+Obsolete option.  Recognized but ignored.
 .TP
 .B set quotestr "\fIstring\fP"
 The email-quote string, used to justify email-quoted paragraphs.  This
@@ -212,6 +220,10 @@ won't work properly with this option enabled.
 .B set regexp
 Do extended regular expression searches by default.
 .TP
+.B set selectedcolor \fIfgcolor\fR,\fIbgcolor\fR
+Specify the color combination to use for selected text.
+See \fBset titlecolor\fR for more details.
+.TP
 .B set showcursor
 Put the cursor on the highlighted item in the file browser, to aid
 braille users.
@@ -234,7 +246,7 @@ Use spelling checker \fIspellprog\fP instead of the built-in one, which
 calls \fIspell\fP.
 .TP
 .B set statuscolor \fIfgcolor\fR,\fIbgcolor\fR
-Specify the color combination to use for the statusbar.
+Specify the color combination to use for the status bar.
 See \fBset titlecolor\fR for more details.
 .TP
 .B set suspend
@@ -251,7 +263,7 @@ Convert typed tabs to spaces.
 Save automatically on exit, don't prompt.
 .TP
 .B set titlecolor \fIfgcolor\fR,\fIbgcolor\fR
-Specify the color combination to use for the titlebar.
+Specify the color combination to use for the title bar.
 Valid names for the foreground and background colors are:
 .BR white ", " black ", " blue ", " green ", " red ", " cyan ", " yellow ",  and " magenta .
 The name of the foreground color may be prefixed with \fBbright\fR.
@@ -267,7 +279,8 @@ Disallow file modification.
 .TP
 .B set whitespace "\fIstring\fP"
 Set the two characters used to indicate the presence of tabs and
-spaces.  They must be single-column characters.
+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".
 .TP
 .B set wordbounds
 Detect word boundaries differently by treating punctuation
@@ -286,53 +299,58 @@ 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
-A separate syntax can be defined for each kind of file
+For each kind of file a separate syntax can be defined
 via the following commands:
 .TP
 .BR syntax " ""\fIname\fR"" [""\fIfileregex\fR"" ...]"
-Defines a syntax named \fIname\fP which can be activated via the
-.BR \-Y / \-\-syntax
-command-line option, or will be automatically activated if
-the current filename matches the extended regular expression
-\fIfileregex\fP.  All subsequent \fBcolor\fR, \fBicolor\fR,
-\fBheader\fR and other such statements will apply to this
-\fIname\fP syntax until a new \fBsyntax\fR command is encountered.
+Start the definition of a syntax with this \fIname\fR.
+All subsequent \fBcolor\fR and other such commands
+will be added to this syntax, until a new \fBsyntax\fR
+command is encountered.
 
-The \fBnone\fP syntax is reserved; specifying it on the command line is
-the same as not having a syntax at all.  The \fBdefault\fP syntax is
-special: it takes no \fIfileregex\fP, and applies to files that don't
-match any syntax's \fIfileregex\fP.
+When \fBnano\fR is run, this syntax will be automatically
+activated if the current filename matches the extended regular
+expression \fIfileregex\fR.  Or the syntax can be explicitly
+activated by using the \fB-Y\fR or \fB\-\-syntax\fR
+command-line option followed by the \fIname\fR.
+
+The syntax "\fBdefault\fP" is special: it takes no \fIfileregex\fR,
+and applies to files that don't match any syntax's regexes.
+The syntax "\fBnone\fP" is reserved; specifying it on the command line
+is the same as not having a syntax at all.
+.TP
+.BR header " ""\fIregex\fR"" " ...
+If from all defined syntaxes no \fIfileregex\fR matched, then compare
+this \fIregex\fR (or regexes) against the first line of the current file,
+to determine whether this syntax should be used for it.
+.TP
+.BR magic " ""\fIregex\fR"" " ...
+If no \fIfileregex\fR matched and no \fBheader\fR regex matched
+either, then compare this \fIregex\fR (or regexes) against the
+result of querying the \fBmagic\fP database about the current
+file, to determine whether this syntax should be used for it.
+(This functionality only works when \fBlibmagic\fP is installed on the
+system and will be silently ignored otherwise.)
 .TP
 .BI linter " program " \fR[ "arg " \fR...]
-Use the given \fIprogram\fR to run a syntax check on the current file
-(this overrides the speller function when defined).
+Use the given \fIprogram\fR to run a syntax check on the current file.
+(This overrides the speller function.)
 .TP
 .BI formatter " program " \fR[ "arg " \fR...]
-Use the given \fIprogram\fR to automatically reformat text.
-Useful in certain programming languages (e.g. Go).
+Use the given \fIprogram\fR to automatically reformat text --
+useful in a programming language like Go.
+(This overrides the speller and linter functions.)
 .TP
-.BR header " \fIregex\fR " ...
-Add one or more regexes which will
-be compared against the very first line of the file to be edited,
-to determine whether this syntax should be used for that file.
-.TP
-.BR magic " \fIregex\fR " ...
-Add one or more regexes which
-will be compared against the result of querying the \fBmagic\fP
-database about the file to be edited, to determine whether this
-syntax should be used for that file.  This
-functionality only works when \fBlibmagic\fP is installed on the
-system and will be silently ignored otherwise.
-.TP
-.BI comment " string"
-Use the given string for commenting and uncommenting lines.  A vertical bar or
-pipe character (|) designates bracket-style comments; for example, "/*|*/" for
+.BR comment " ""\fIstring\fR"""
+Use the given string for commenting and uncommenting lines.
+If the string contains a vertical bar or pipe character (\fB|\fR),
+this designates bracket-style comments; for example, "\fB/*|*/\fR" for
 CSS files.  The characters before the pipe are prepended to the line and the
 characters after the pipe are appended at the end of the line.  If no pipe
-character is present, the entire string is prepended; for example, "#" for
-Python files.  If empty double quotes are specified, the comment/uncomment
-function is disabled; for example, "" for JSON.  Double quotes or backslashes
-may be escaped with a backslash; for example, ".\\"" for man page source.
+character is present, the full string is prepended; for example, "\fB#\fR"
+for Python files.  If empty double quotes are specified, the comment/uncomment
+function is disabled; for example, "" for JSON.
+The default value is "\fB#\fP".
 .TP
 .B color \fIfgcolor\fR,\fIbgcolor\fR """\fIregex\fR""" ...
 Display all pieces of text that match
@@ -365,13 +383,13 @@ Read in self-contained color syntaxes from \fIsyntaxfile\fP.  Note that
 \fIsyntaxfile\fP may contain only the above commands, from \fBsyntax\fP
 to \fBicolor\fP.
 .TP
-.BI extendsyntax " name directive " \fR[ "arg " \fR...]
-Extend the syntax previously defined as \fIname\fP to include
-new information.  This allows adding a new \fBcolor\fP, \fBicolor\fP,
+.BI extendsyntax " name command " \fR[ "arg " \fR...]
+Extend the syntax previously defined as \fIname\fR with another
+\fIcommand\fR.  This allows adding a new \fBcolor\fP, \fBicolor\fP,
 \fBheader\fP, \fBmagic\fP, \fBcomment\fP, \fBlinter\fP, or \fBformatter\fP
-directive to an already defined syntax -- useful when you want to
+command to an already defined syntax -- useful when you want to
 slightly improve a syntax defined in one of the system-installed
-files (which are normally not writable).
+files (which normally are not writable).
 
 .SH REBINDING KEYS
 Key bindings can be changed via the following two commands:
@@ -419,15 +437,18 @@ Exits from the program (or from the help viewer or the file browser).
 Writes the current buffer to disk, asking for a name.
 .TP
 .B savefile
-Writes the current file to disk without prompting or warning.
+Writes the current file to disk without prompting.
 .TP
 .B insert
 Inserts a file into the current buffer (at the current cursor position),
 or into a new buffer when option \fBmultibuffer\fR is set.
 .TP
 .B whereis
-Searches for text in the current buffer -- or for filenames matching
-a string in the current list in the file browser.
+Starts a forward search for text in the current buffer -- or for filenames
+matching a string in the current list in the file browser.
+.TP
+.B wherewas
+Starts a backward search for text in the current buffer.
 .TP
 .B searchagain
 Repeats the last search command without prompting.
@@ -541,10 +562,10 @@ Moves the cursor to the beginning of the current or preceding block of text.
 .B nextblock
 Moves the cursor to the beginning of the next block of text.
 .TP
-.B prevpage
+.B pageup
 Goes up one screenful.
 .TP
-.B nextpage
+.B pagedown
 Goes down one screenful.
 .TP
 .B firstline
@@ -585,6 +606,13 @@ Deletes the character under the cursor.
 .B backspace
 Deletes the character before the cursor.
 .TP
+.B recordmacro
+Starts the recording of keystrokes -- the keystrokes are stored
+as a macro.  When already recording, the recording is stopped.
+.TP
+.B runmacro
+Replays the keystrokes of the last recorded macro.
+.TP
 .B undo
 Undoes the last performed text action (add text, delete text, etc).
 .TP
@@ -646,7 +674,7 @@ When about to write a file, discard the current buffer without saving.
 (This function is bound by default only when option \fB\-\-tempfile\fR
 is in effect.)
 .TP
-.B tofiles
+.B browser
 Starts the file browser, allowing to select a file from a list.
 .TP
 .B gotodir
@@ -666,7 +694,7 @@ Toggles the presence of the two-line list of key bindings at the bottom of the s
 Toggles the constant display of the current line, column, and character positions.
 .TP
 .B morespace
-Toggles the presence of the blank line which 'separates' the titlebar from the file text.
+Toggles the presence of the blank line that 'separates' the title bar from the file text.
 .TP
 .B smoothscroll
 Toggles smooth scrolling (when moving around with the arrow keys).
@@ -771,7 +799,7 @@ for \fBunbind\fR it means all menus where the specified \fIkey\fR exists.
 .B /etc/nanorc
 System-wide configuration file.
 .TP
-.B ~/.nanorc
+.BR ~/.nanorc " or " \fI$XDG_CONFIG_HOME\fB/nano/nanorc " or " ~/.config/nano/nanorc
 Per-user configuration file.
 
 .SH SEE ALSO

doc/rnano.1

@@ -16,8 +16,7 @@
 .\"   Documentation License along with this program.  If not, see
 .\"   <http://www.gnu.org/licenses/>.
 .\"
-.TH RNANO 1 "version 2.8.3" "May 2017"
-.\" Please adjust this date whenever revising the manpage.
+.TH RNANO 1 "version 2.9.1" "November 2017"
 
 .SH NAME
 rnano \- a restricted nano

doc/sample.nanorc.in

@@ -15,10 +15,9 @@
 ## its end.  For example, for the "brackets" option, ""')>]}" will match
 ## ", ', ), >, ], and }.
 
-## Silently ignore problems with unknown directives in the nanorc file.
-## Useful when your nanorc file might be read on systems with multiple
-## versions of nano installed (e.g. your home directory is on NFS).
-# set quiet
+## When soft line wrapping is enabled, make it wrap lines at blanks
+## (tabs and spaces) instead of always at the edge of the screen.
+# set atblanks
 
 ## Use auto-indentation.
 # set autoindent
@@ -29,9 +28,6 @@
 ## The directory to put unique backup files in.
 # set backupdir ""
 
-## Do backwards searches by default.
-# set backwards
-
 ## Use bold text instead of reverse video text.
 # set boldtext
 
@@ -44,13 +40,14 @@
 ## Do case-sensitive searches by default.
 # set casesensitive
 
-## Constantly display the cursor position in the statusbar.  Note that
+## Constantly display the cursor position in the status bar.  Note that
 ## this overrides "quickblank".
 # set constantshow
 ## (The old form, 'const', is deprecated.)
 
-## Use cut-to-end-of-line by default.
-# set cut
+## Use cut-from-cursor-to-end-of-line by default.
+# set cutfromcursor
+## (The old form, 'cut', is deprecated.)
 
 ## Set the line length for wrapping text and justifying paragraphs.
 ## If the value is 0 or less, the wrapping point will be the screen
@@ -67,7 +64,7 @@
 # set linenumbers
 
 ## Enable vim-style lock-files.  This is just to let a vim user know you
-## are editing a file [s]he is trying to edit and vice versa. There are
+## are editing a file [s]he is trying to edit and vice versa.  There are
 ## no plans to implement vim-style undo state in these files.
 # set locking
 
@@ -76,7 +73,7 @@
 ## come before the latter set, and both must be in the same order.
 # set matchbrackets "(<[{)>]}"
 
-## Use the blank line below the titlebar as extra editing space.
+## Use the blank line below the title bar as extra editing space.
 # set morespace
 
 ## Enable mouse support, if available for your system.  When enabled,
@@ -124,8 +121,8 @@
 ## sentences.
 # set punct "!.?"
 
-## Do quick statusbar blanking.  Statusbar messages will disappear after
-## 1 keystroke instead of 26.  Note that "const" overrides this.
+## Do quick status-bar blanking.  Status-bar messages will disappear after
+## 1 keystroke instead of 26.  Note that "constantshow" overrides this.
 # set quickblank
 
 ## The email-quote string, used to justify email-quoted paragraphs.
@@ -163,7 +160,7 @@
 # set softwrap
 
 ## Use this spelling checker instead of the internal one.  This option
-## does not properly have a default value.
+## does not have a default value.
 # set speller "aspell -x -c"
 
 ## Allow nano to be suspended.
@@ -203,12 +200,14 @@
 ## These are examples; by default there are no colors.
 # set titlecolor brightwhite,blue
 # set statuscolor brightwhite,green
+# set selectedcolor brightwhite,magenta
 # set numbercolor cyan
 # set keycolor cyan
 # set functioncolor green
 ## In root's .nanorc you might want to use:
 # set titlecolor brightwhite,red
 # set statuscolor brightwhite,red
+# set selectedcolor brightwhite,cyan
 # set numbercolor magenta
 # set keycolor brightmagenta
 # set functioncolor magenta
@@ -262,11 +261,8 @@
 ## Key bindings.
 ## See nanorc(5) (section REBINDING KEYS) for more details on this.
 ##
-## The following five functions are not bound to any key by default.
-## You may wish to choose different keys than the ones suggested here.
-# bind ^S savefile main
-# bind M-Q findprevious main
-# bind M-W findnext main
+## The following two functions are not bound to any key by default.
+## You may wish to choose other keys than the ones suggested here.
 # bind M-B cutwordleft main
 # bind M-N cutwordright main
 

po/POTFILES.in

@@ -5,6 +5,7 @@ src/color.c
 src/files.c
 src/global.c
 src/help.c
+src/history.c
 src/nano.c
 src/prompt.c
 src/rcfile.c

src/Makefile.am

@@ -28,6 +28,7 @@ nano_SOURCES =	browser.c \
 		files.c \
 		global.c \
 		help.c \
+		history.c \
 		move.c \
 		nano.c \
 		nano.h \
@@ -37,9 +38,10 @@ nano_SOURCES =	browser.c \
 		search.c \
 		text.c \
 		utils.c \
-		winio.c 
+		winio.c
 
-nano_LDADD = @LIBINTL@ $(top_builddir)/lib/libgnu.a $(LIB_CLOCK_GETTIME)
+nano_LDADD = @LIBINTL@ $(top_builddir)/lib/libgnu.a \
+		$(LIB_CLOCK_GETTIME) $(LIBTHREAD)
 
 install-exec-hook:
 	cd $(DESTDIR)$(bindir) && rm -f rnano && $(LN_S) nano rnano

src/browser.c

@@ -2,7 +2,7 @@
  *   browser.c  --  This file is part of GNU nano.                        *
  *                                                                        *
  *   Copyright (C) 2001-2011, 2013-2017 Free Software Foundation, Inc.    *
- *   Copyright (C) 2015, 2016 Benno Schulenberg                           *
+ *   Copyright (C) 2015-2016 Benno Schulenberg                            *
  *                                                                        *
  *   GNU nano is free software: you can redistribute it and/or modify     *
  *   it under the terms of the GNU General Public License as published    *
@@ -21,11 +21,10 @@
 
 #include "proto.h"
 
+#include <errno.h>
 #include <stdint.h>
-#include <stdio.h>
 #include <string.h>
 #include <unistd.h>
-#include <errno.h>
 
 #ifdef ENABLE_BROWSER
 
@@ -56,9 +55,6 @@ char *do_browser(char *path)
     DIR *dir;
 	/* The directory whose contents we are showing. */
 
-    /* Don't show a cursor in the file list. */
-    curs_set(0);
-
   read_directory_contents:
 	/* We come here when we refresh or select a new directory. */
 
@@ -107,20 +103,18 @@ char *do_browser(char *path)
     titlebar(path);
 
     while (TRUE) {
-	/* Make sure that the cursor is off. */
-	curs_set(0);
 	lastmessage = HUSH;
 
 	bottombars(MBROWSER);
 
 	/* Display (or redisplay) the file list if the list itself or
 	 * the selected file has changed. */
-	if (old_selected != selected)
+	if (old_selected != selected || ISSET(SHOW_CURSOR))
 	    browser_refresh();
 
 	old_selected = selected;
 
-	kbinput = get_kbinput(edit);
+	kbinput = get_kbinput(edit, ISSET(SHOW_CURSOR));
 
 #ifdef ENABLE_MOUSE
 	if (kbinput == KEY_MOUSE) {
@@ -171,12 +165,16 @@ char *do_browser(char *path)
 #else
 	    say_there_is_no_help();
 #endif
-	} else if (func == do_search) {
-	    /* Search for a filename. */
+	} else if (func == do_search_forward) {
 	    do_filesearch();
 	} else if (func == do_research) {
-	    /* Search for another filename. */
-	    do_fileresearch();
+	    do_fileresearch(TRUE);
+#ifndef NANO_TINY
+	} else if (func == do_findprevious) {
+	    do_fileresearch(FALSE);
+	} else if (func == do_findnext) {
+	    do_fileresearch(TRUE);
+#endif
 	} else if (func == do_left) {
 	    if (selected > 0)
 		selected--;
@@ -227,10 +225,7 @@ 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,
-#ifndef DISABLE_HISTORIES
-			NULL,
-#endif
+	    int i = do_prompt(TRUE, FALSE, MGOTODIR, NULL, NULL,
 			/* TRANSLATORS: This is a prompt. */
 			browser_refresh, _("Go To Directory"));
 
@@ -248,12 +243,11 @@ char *do_browser(char *path)
 		sprintf(path, "%s%s", present_path, answer);
 	    }
 
-#ifndef DISABLE_OPERATINGDIR
-	    if (check_operating_dir(path, FALSE)) {
+#ifdef ENABLE_OPERATINGDIR
+	    if (outside_of_confinement(path, FALSE)) {
 		/* TRANSLATORS: This refers to the confining effect of the
 		 * option --operatingdir, not of --restricted. */
-		statusline(ALERT, _("Can't go outside of %s"),
-				full_operating_dir);
+		statusline(ALERT, _("Can't go outside of %s"), operating_dir);
 		path = mallocstrcpy(path, present_path);
 		continue;
 	    }
@@ -279,13 +273,12 @@ char *do_browser(char *path)
 		continue;
 	    }
 
-#ifndef DISABLE_OPERATINGDIR
+#ifdef ENABLE_OPERATINGDIR
 	    /* Note: The selected file can be outside the operating
 	     * directory if it's ".." or if it's a symlink to a
 	     * directory outside the operating directory. */
-	    if (check_operating_dir(filelist[selected], FALSE)) {
-		statusline(ALERT, _("Can't go outside of %s"),
-				full_operating_dir);
+	    if (outside_of_confinement(filelist[selected], FALSE)) {
+		statusline(ALERT, _("Can't go outside of %s"), operating_dir);
 		continue;
 	    }
 #endif
@@ -379,10 +372,10 @@ char *do_browse_from(const char *inpath)
 	}
     }
 
-#ifndef DISABLE_OPERATINGDIR
+#ifdef ENABLE_OPERATINGDIR
     /* If the resulting path isn't in the operating directory, use
      * the operating directory instead. */
-    if (check_operating_dir(path, FALSE))
+    if (outside_of_confinement(path, FALSE))
 	path = mallocstrcpy(path, operating_dir);
 #endif
 
@@ -489,8 +482,11 @@ functionptrtype parse_browser_input(int *kbinput)
 	    case 'W':
 	    case 'w':
 	    case '/':
-		return do_search;
+		return do_search_forward;
 	    case 'N':
+#ifndef NANO_TINY
+		return do_findprevious;
+#endif
 	    case 'n':
 		return do_research;
 	}
@@ -539,7 +535,7 @@ void browser_refresh(void)
 	/* If this is the selected item, start its highlighting, and
 	 * remember its location to be able to place the cursor on it. */
 	if (i == selected) {
-	    wattron(edit, hilite_attribute);
+	    wattron(edit, interface_color_pair[SELECTED_TEXT]);
 	    the_row = row;
 	    the_column = col;
 	}
@@ -611,7 +607,7 @@ void browser_refresh(void)
 
 	/* If this is the selected item, finish its highlighting. */
 	if (i == selected)
-	    wattroff(edit, hilite_attribute);
+	    wattroff(edit, interface_color_pair[SELECTED_TEXT]);
 
 	free(info);
 
@@ -680,10 +676,7 @@ int filesearch_init(void)
 	buf = mallocstrcpy(NULL, "");
 
     /* This is now one simple call.  It just does a lot. */
-    input = do_prompt(FALSE, FALSE, MWHEREISFILE, NULL,
-#ifndef DISABLE_HISTORIES
-		&search_history,
-#endif
+    input = do_prompt(FALSE, FALSE, MWHEREISFILE, NULL, &search_history,
 		browser_refresh, "%s%s", _("Search"), buf);
 
     /* Release buf now that we don't need it anymore. */
@@ -700,8 +693,9 @@ int filesearch_init(void)
     return input;
 }
 
-/* Look for the given needle in the list of files. */
-void findnextfile(const char *needle)
+/* Look for the given needle in the list of files.  If forwards is TRUE,
+ * search forward in the list; otherwise, search backward. */
+void findfile(const char *needle, bool forwards)
 {
     size_t looking_at = selected;
 	/* The location in the file list of the filename we're looking at. */
@@ -721,12 +715,16 @@ void findnextfile(const char *needle)
     /* Step through each filename in the list until a match is found or
      * we've come back to the point where we started. */
     while (TRUE) {
-	/* Move to the next filename in the list, or back to the first. */
-	if (looking_at < filelist_len - 1)
-	    looking_at++;
-	else {
-	    looking_at = 0;
-	    statusbar(_("Search Wrapped"));
+	if (forwards) {
+	    if (looking_at++ == filelist_len - 1) {
+		looking_at = 0;
+		statusbar(_("Search Wrapped"));
+	    }
+	} else {
+	    if (looking_at-- == 0) {
+		looking_at = filelist_len - 1;
+		statusbar(_("Search Wrapped"));
+	    }
 	}
 
 	/* Get the bare filename, without the path. */
@@ -767,22 +765,23 @@ void do_filesearch(void)
     else
 	last_search = mallocstrcpy(last_search, answer);
 
-#ifndef DISABLE_HISTORIES
+#ifdef ENABLE_HISTORIES
     /* If answer is not empty, add the string to the search history list. */
     if (*answer != '\0')
 	update_history(&search_history, answer);
 #endif
 
-    findnextfile(answer);
+    findfile(answer, TRUE);
 }
 
-/* Search again for the last given filename, without prompting. */
-void do_fileresearch(void)
+/* Search again without prompting for the last given search string,
+ * either forwards or backwards. */
+void do_fileresearch(bool forwards)
 {
     if (*last_search == '\0')
 	statusbar(_("No current search pattern"));
     else
-	findnextfile(last_search);
+	findfile(last_search, forwards);
 }
 
 /* Select the first file in the list. */

src/chars.c

@@ -2,7 +2,7 @@
  *   chars.c  --  This file is part of GNU nano.                          *
  *                                                                        *
  *   Copyright (C) 2001-2011, 2013-2017 Free Software Foundation, Inc.    *
- *   Copyright (C) 2016 Benno Schulenberg                                 *
+ *   Copyright (C) 2016-2017 Benno Schulenberg                            *
  *                                                                        *
  *   GNU nano is free software: you can redistribute it and/or modify     *
  *   it under the terms of the GNU General Public License as published    *
@@ -21,8 +21,8 @@
 
 #include "proto.h"
 
-#include <string.h>
 #include <ctype.h>
+#include <string.h>
 
 #ifdef ENABLE_UTF8
 #include <wchar.h>
@@ -397,7 +397,7 @@ 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 the character. */
+	 * so we know the length of its preceding character. */
 	while (before < pos) {
 	    char_len = parse_mbchar(buf + before, NULL, NULL);
 	    before += char_len;
@@ -579,7 +579,7 @@ size_t mbstrnlen(const char *s, size_t maxlen)
 	return strnlen(s, maxlen);
 }
 
-#if !defined(NANO_TINY) || !defined(DISABLE_JUSTIFY)
+#if !defined(NANO_TINY) || defined(ENABLE_JUSTIFY)
 /* This function is equivalent to strchr() for multibyte strings. */
 char *mbstrchr(const char *s, const char *c)
 {
@@ -620,7 +620,7 @@ char *mbstrchr(const char *s, const char *c)
 #endif
 	return (char *) strchr(s, *c);
 }
-#endif /* !NANO_TINY || !DISABLE_JUSTIFY */
+#endif /* !NANO_TINY || ENABLE_JUSTIFY */
 
 #ifndef NANO_TINY
 /* This function is equivalent to strpbrk() for multibyte strings. */
@@ -686,7 +686,7 @@ char *mbrevstrpbrk(const char *head, const char *accept, const char *pointer)
 }
 #endif /* !NANO_TINY */
 
-#if defined(ENABLE_NANORC) && (!defined(NANO_TINY) || !defined(DISABLE_JUSTIFY))
+#if defined(ENABLE_NANORC) && (!defined(NANO_TINY) || defined(ENABLE_JUSTIFY))
 /* Return TRUE if the string s contains one or more blank characters,
  * and FALSE otherwise. */
 bool has_blank_chars(const char *s)
@@ -719,7 +719,7 @@ bool has_blank_mbchars(const char *s)
 #endif
 	return has_blank_chars(s);
 }
-#endif /* ENABLE_NANORC && (!NANO_TINY || !DISABLE_JUSTIFY) */
+#endif /* ENABLE_NANORC && (!NANO_TINY || ENABLE_JUSTIFY) */
 
 #ifdef ENABLE_UTF8
 /* Return TRUE if wc is valid Unicode, and FALSE otherwise. */

src/color.c

@@ -2,7 +2,7 @@
  *   color.c  --  This file is part of GNU nano.                          *
  *                                                                        *
  *   Copyright (C) 2001-2011, 2013-2017 Free Software Foundation, Inc.    *
- *   Copyright (C) 2014, 2015, 2016, 2017 Benno Schulenberg               *
+ *   Copyright (C) 2014-2017 Benno Schulenberg                            *
  *                                                                        *
  *   GNU nano is free software: you can redistribute it and/or modify     *
  *   it under the terms of the GNU General Public License as published    *
@@ -21,17 +21,23 @@
 
 #include "proto.h"
 
-#include <stdio.h>
-#include <string.h>
 #include <errno.h>
-#include <time.h>
-#include <unistd.h>
-
 #ifdef HAVE_MAGIC_H
 #include <magic.h>
 #endif
+#include <string.h>
+#include <unistd.h>
 
-#ifndef DISABLE_COLOR
+#ifdef ENABLE_COLOR
+
+/* For early versions of ncurses-6.0, use an additional A_PROTECT attribute
+ * for all colors, in order to work around an ncurses miscoloring bug. */
+#if defined(NCURSES_VERSION_MAJOR) && (NCURSES_VERSION_MAJOR == 6) && \
+	(NCURSES_VERSION_MINOR == 0) && (NCURSES_VERSION_PATCH < 20151017)
+#define A_BANDAID  A_PROTECT
+#else
+#define A_BANDAID  A_NORMAL
+#endif
 
 /* Initialize the colors for nano's interface, and assign pair numbers
  * for the colors in each syntax. */
@@ -54,17 +60,17 @@ void set_colorpairs(void)
     for (i = 0; i < NUMBER_OF_ELEMENTS; i++) {
 	bool bright = FALSE;
 
-	if (parse_color_names(specified_color_combo[i],
-			&foreground, &background, &bright)) {
+	if (specified_color_combo[i] != NULL &&
+			parse_color_names(specified_color_combo[i],
+				&foreground, &background, &bright)) {
 	    if (foreground == -1 && !using_defaults)
 		foreground = COLOR_WHITE;
 	    if (background == -1 && !using_defaults)
 		background = COLOR_BLACK;
 	    init_pair(i + 1, foreground, background);
-	    interface_color_pair[i] =
-			COLOR_PAIR(i + 1) | (bright ? A_BOLD : A_NORMAL);
-	}
-	else {
+	    interface_color_pair[i] = COLOR_PAIR(i + 1) | A_BANDAID |
+					(bright ? A_BOLD : A_NORMAL);
+	} else {
 	    if (i != FUNCTION_TAG)
 		interface_color_pair[i] = hilite_attribute;
 	    else
@@ -94,7 +100,7 @@ void set_colorpairs(void)
 	    else
 		ink->pairnum = new_number++;
 
-	    ink->attributes = COLOR_PAIR(ink->pairnum) |
+	    ink->attributes = COLOR_PAIR(ink->pairnum) | A_BANDAID |
 				(ink->bright ? A_BOLD : A_NORMAL);
 	}
     }
@@ -128,9 +134,6 @@ void color_init(void)
 	    background = COLOR_BLACK;
 
 	init_pair(ink->pairnum, foreground, background);
-#ifdef DEBUG
-	fprintf(stderr, "init_pair(): fg = %hd, bg = %hd\n", foreground, background);
-#endif
     }
 
     have_palette = TRUE;
@@ -178,13 +181,13 @@ void color_update(void)
 		break;
 	}
 
-	if (sint == NULL)
+	if (sint == NULL && !inhelp)
 	    statusline(ALERT, _("Unknown syntax name: %s"), syntaxstr);
     }
 
     /* If no syntax-override string was specified, or it didn't match,
      * try finding a syntax based on the filename (extension). */
-    if (sint == NULL) {
+    if (sint == NULL && !inhelp) {
 	char *reserved = charalloc(PATH_MAX + 1);
 	char *currentdir = getcwd(reserved, PATH_MAX + 1);
 	char *joinednames = charalloc(PATH_MAX + 1);
@@ -213,10 +216,7 @@ void color_update(void)
     }
 
     /* If the filename didn't match anything, try the first line. */
-    if (sint == NULL) {
-#ifdef DEBUG
-	fprintf(stderr, "No result from file extension, trying headerline...\n");
-#endif
+    if (sint == NULL && !inhelp) {
 	for (sint = syntaxes; sint != NULL; sint = sint->next) {
 	    if (found_in_list(sint->headers, openfile->fileage->data))
 		break;
@@ -225,13 +225,11 @@ void color_update(void)
 
 #ifdef HAVE_LIBMAGIC
     /* If we still don't have an answer, try using magic. */
-    if (sint == NULL) {
+    if (sint == NULL && !inhelp) {
 	struct stat fileinfo;
 	magic_t cookie = NULL;
 	const char *magicstring = NULL;
-#ifdef DEBUG
-	fprintf(stderr, "No result from headerline either, trying libmagic...\n");
-#endif
+
 	if (stat(openfile->filename, &fileinfo) == 0) {
 	    /* Open the magic database and get a diagnosis of the file. */
 	    cookie = magic_open(MAGIC_SYMLINK |
@@ -246,9 +244,6 @@ void color_update(void)
 		if (magicstring == NULL)
 		    statusline(ALERT, _("magic_file(%s) failed: %s"),
 				openfile->filename, magic_error(cookie));
-#ifdef DEBUG
-		fprintf(stderr, "Returned magic string is: %s\n", magicstring);
-#endif
 	    }
 	}
 
@@ -266,7 +261,7 @@ void color_update(void)
 #endif /* HAVE_LIBMAGIC */
 
     /* If nothing at all matched, see if there is a default syntax. */
-    if (sint == NULL) {
+    if (sint == NULL && !inhelp) {
 	for (sint = syntaxes; sint != NULL; sint = sint->next) {
 	    if (strcmp(sint->name, "default") == 0)
 		break;
@@ -438,4 +433,4 @@ void precalc_multicolorinfo(void)
     }
 }
 
-#endif /* !DISABLE_COLOR */
+#endif /* ENABLE_COLOR */

src/cut.c

@@ -23,7 +23,6 @@
 #include "proto.h"
 
 #include <string.h>
-#include <stdio.h>
 
 static bool keep_cutbuffer = FALSE;
 	/* Should we keep the contents of the cutbuffer? */
@@ -130,9 +129,6 @@ void do_cut_text(bool copy_text, bool cut_till_eof)
     if (!keep_cutbuffer) {
 	free_filestruct(cutbuffer);
 	cutbuffer = NULL;
-#ifdef DEBUG
-	fprintf(stderr, "Blew away cutbuffer =)\n");
-#endif
 	/* Indicate that future cuts should add to the cutbuffer. */
 	keep_cutbuffer = TRUE;
     }
@@ -151,11 +147,11 @@ void do_cut_text(bool copy_text, bool cut_till_eof)
     if (cut_till_eof) {
 	/* Move all text up to the end of the file into the cutbuffer. */
 	cut_to_eof();
-    } else if (openfile->mark_set) {
+    } else if (openfile->mark) {
 	/* Move the marked text to the cutbuffer, and turn the mark off. */
 	cut_marked(&right_side_up);
-	openfile->mark_set = FALSE;
-    } else if (ISSET(CUT_TO_END))
+	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
@@ -192,7 +188,7 @@ void do_cut_text(bool copy_text, bool cut_till_eof)
 
     refresh_needed = TRUE;
 
-#ifndef DISABLE_COLOR
+#ifdef ENABLE_COLOR
     check_the_multis(openfile->current);
 #endif
 
@@ -220,7 +216,7 @@ void do_cut_text_void(void)
 void do_copy_text(void)
 {
     static struct filestruct *next_contiguous_line = NULL;
-    bool mark_set = openfile->mark_set;
+    bool mark_is_set = (openfile->mark != NULL);
 
     /* Remember the current viewport and cursor position. */
     ssize_t is_edittop_lineno = openfile->edittop->lineno;
@@ -228,16 +224,16 @@ void do_copy_text(void)
     ssize_t is_current_lineno = openfile->current->lineno;
     size_t is_current_x = openfile->current_x;
 
-    if (mark_set || openfile->current != next_contiguous_line)
+    if (mark_is_set || openfile->current != next_contiguous_line)
 	cutbuffer_reset();
 
     do_cut_text(TRUE, FALSE);
 
     /* If the mark was set, blow away the cutbuffer on the next copy. */
-    next_contiguous_line = (mark_set ? NULL : openfile->current);
+    next_contiguous_line = (mark_is_set ? NULL : openfile->current);
 
-    if (mark_set) {
-	/* Restore the viewport and cursor position. */
+    /* If the mark was set, restore the viewport and cursor position. */
+    if (mark_is_set) {
 	openfile->edittop = fsfromline(is_edittop_lineno);
 	openfile->firstcolumn = is_firstcolumn;
 	openfile->current = fsfromline(is_current_lineno);
@@ -248,9 +244,9 @@ void do_copy_text(void)
 /* Cut from the current cursor position to the end of the file. */
 void do_cut_till_eof(void)
 {
-    add_undo(CUT_EOF);
+    add_undo(CUT_TO_EOF);
     do_cut_text(FALSE, TRUE);
-    update_undo(CUT_EOF);
+    update_undo(CUT_TO_EOF);
 }
 #endif /* !NANO_TINY */
 
@@ -270,7 +266,7 @@ void do_uncut_text(void)
     add_undo(PASTE);
 
     if (ISSET(SOFTWRAP))
-	was_leftedge = (xplustabs() / editwincols) * editwincols;
+	was_leftedge = leftedge_for(xplustabs(), openfile->current);
 #endif
 
     /* Add a copy of the text in the cutbuffer to the current buffer
@@ -291,12 +287,9 @@ void do_uncut_text(void)
     /* Mark the file as modified. */
     set_modified();
 
-    /* Update current_y to account for the inserted lines. */
-    place_the_cursor(TRUE);
-
     refresh_needed = TRUE;
 
-#ifndef DISABLE_COLOR
+#ifdef ENABLE_COLOR
     check_the_multis(openfile->current);
 #endif
 

src/help.c

@@ -22,10 +22,8 @@
 
 #include "proto.h"
 
-#include <stdio.h>
-#include <string.h>
-#include <ctype.h>
 #include <errno.h>
+#include <string.h>
 
 #ifdef ENABLE_HELP
 
@@ -105,7 +103,7 @@ void do_help(void)
     int was_margin = margin;
 #endif
     ssize_t was_tabsize = tabsize;
-#ifndef DISABLE_COLOR
+#ifdef ENABLE_COLOR
     char *was_syntax = syntaxstr;
 #endif
     char *saved_answer = (answer != NULL) ? strdup(answer) : NULL;
@@ -151,7 +149,7 @@ void do_help(void)
     margin = 0;
 #endif
     tabsize = 8;
-#ifndef DISABLE_COLOR
+#ifdef ENABLE_COLOR
     syntaxstr = "nanohelp";
 #endif
     curs_set(0);
@@ -160,6 +158,7 @@ void do_help(void)
     help_init();
     inhelp = TRUE;
     location = 0;
+    didfind = 0;
 
     bottombars(MHELP);
     wnoutrefresh(bottomwin);
@@ -183,9 +182,10 @@ void do_help(void)
     while (TRUE) {
 	lastmessage = HUSH;
 	focusing = TRUE;
-	didfind = 0;
 
-	kbinput = get_kbinput(edit);
+	/* Show the cursor when we searched and found something. */
+	kbinput = get_kbinput(edit, didfind == 1);
+	didfind = 0;
 
 	func = parse_help_input(&kbinput);
 
@@ -205,13 +205,16 @@ void do_help(void)
 	    do_first_line();
 	} else if (func == do_last_line) {
 	    do_last_line();
-	} else if (func == do_search) {
+	} else if (func == do_search_forward) {
 	    do_search();
 	    bottombars(MHELP);
 	} else if (func == do_research) {
 	    do_research();
-	    currmenu = MHELP;
 #ifndef NANO_TINY
+	} else if (func == do_findprevious) {
+	    do_findprevious();
+	} else if (func == do_findnext) {
+	    do_findnext();
 	} else if (kbinput == KEY_WINCH) {
 	    ; /* Nothing to do. */
 #endif
@@ -223,16 +226,12 @@ void do_help(void)
 	} else if (func == do_exit) {
 	    /* Exit from the help viewer. */
 	    close_buffer();
+	    curs_set(0);
 	    break;
 	} else
 	    unbound_key(kbinput);
 
-	/* If we searched and found something, let the cursor show it. */
-	if (didfind == 1)
-	    curs_set(1);
-	else
-	    curs_set(0);
-
+	currmenu = MHELP;
 	edit_refresh();
 
 	location = 0;
@@ -252,16 +251,14 @@ void do_help(void)
     margin = was_margin;
 #endif
     tabsize = was_tabsize;
-#ifndef DISABLE_COLOR
+#ifdef ENABLE_COLOR
     syntaxstr = was_syntax;
 #endif
 
     /* Switch back to the buffer we were invoked from. */
-    switch_to_prev_buffer_void();
+    switch_to_prev_buffer();
 
     if (ISSET(NO_HELP)) {
-	blank_bottombars();
-	wnoutrefresh(bottomwin);
 	currmenu = oldmenu;
 	window_init();
     } else
@@ -392,7 +389,7 @@ void help_init(void)
 	htx[2] = NULL;
     }
 #endif /* ENABLE_BROWSER */
-#ifndef DISABLE_SPELLER
+#ifdef ENABLE_SPELLER
     else if (currmenu == MSPELL) {
 	htx[0] = N_("Spell Check Help Text\n\n "
 		"The spell checker checks the spelling of all text in "
@@ -406,7 +403,7 @@ void help_init(void)
 	htx[1] = NULL;
 	htx[2] = NULL;
     }
-#endif /* !DISABLE_SPELLER */
+#endif /* ENABLE_SPELLER */
 #ifndef NANO_TINY
     else if (currmenu == MEXTCMD) {
 	htx[0] = N_("Execute Command Help Text\n\n "
@@ -514,7 +511,7 @@ void help_init(void)
 		if (scsfound == 1) {
 		    sprintf(ptr, "%s               ", s->keystr);
 		    /* Unicode arrows take three bytes instead of one. */
-		    if (s->keystr[0] == '\xE2' || s->keystr[1] == '\xE2')
+		    if (strstr(s->keystr, "\xE2") != NULL)
 			ptr += 8;
 		    else
 			ptr += 6;
@@ -578,8 +575,11 @@ functionptrtype parse_help_input(int *kbinput)
 	    case 'W':
 	    case 'w':
 	    case '/':
-		return do_search;
+		return do_search_forward;
 	    case 'N':
+#ifndef NANO_TINY
+		return do_findprevious;
+#endif
 	    case 'n':
 		return do_research;
 	    case 'E':

src/history.c

@@ -0,0 +1,616 @@
+/**************************************************************************
+ *   history.c  --  This file is part of GNU nano.                        *
+ *                                                                        *
+ *   Copyright (C) 2003-2011, 2013-2017 Free Software Foundation, Inc.    *
+ *   Copyright (C) 2016-2017 Benno Schulenberg                            *
+ *                                                                        *
+ *   GNU nano is free software: you can redistribute it and/or modify     *
+ *   it under the terms of the GNU General Public License as published    *
+ *   by the Free Software Foundation, either version 3 of the License,    *
+ *   or (at your option) any later version.                               *
+ *                                                                        *
+ *   GNU nano is distributed in the hope that it will be useful,          *
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty          *
+ *   of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.              *
+ *   See the GNU General Public License for more details.                 *
+ *                                                                        *
+ *   You should have received a copy of the GNU General Public License    *
+ *   along with this program.  If not, see http://www.gnu.org/licenses/.  *
+ *                                                                        *
+ **************************************************************************/
+
+#include "proto.h"
+
+#include <errno.h>
+#include <string.h>
+
+#ifdef ENABLE_HISTORIES
+
+#ifndef SEARCH_HISTORY
+#define SEARCH_HISTORY "search_history"
+#endif
+
+#ifndef POSITION_HISTORY
+#define POSITION_HISTORY "filepos_history"
+#endif
+
+static bool history_changed = FALSE;
+	/* Whether any of the history lists has changed. */
+static struct stat stat_of_positions_file;
+	/* The last-obtained stat information of the positions file. */
+static char *poshistname = NULL;
+	/* The name of the positions-history file. */
+
+/* Initialize the lists of historical search and replace strings
+ * and the list of historical executed commands. */
+void history_init(void)
+{
+    search_history = make_new_node(NULL);
+    search_history->data = mallocstrcpy(NULL, "");
+    searchtop = search_history;
+    searchbot = search_history;
+
+    replace_history = make_new_node(NULL);
+    replace_history->data = mallocstrcpy(NULL, "");
+    replacetop = replace_history;
+    replacebot = replace_history;
+
+    execute_history = make_new_node(NULL);
+    execute_history->data = mallocstrcpy(NULL, "");
+    executetop = execute_history;
+    executebot = execute_history;
+}
+
+/* Set the current position in the given history list to the bottom. */
+void history_reset(const filestruct *list)
+{
+    if (list == search_history)
+	search_history = searchbot;
+    else if (list == replace_history)
+	replace_history = replacebot;
+    else if (list == execute_history)
+	execute_history = executebot;
+}
+
+/* Return from the history list that starts at start and ends at end
+ * the first node that contains the first len characters of the given
+ * text, or NULL if there is no such node. */
+filestruct *find_history(const filestruct *start, const filestruct *end,
+	const char *text, size_t len)
+{
+    const filestruct *item;
+
+    for (item = start; item != end->prev && item != NULL; item = item->prev) {
+	if (strncmp(item->data, text, len) == 0)
+	    return (filestruct *)item;
+    }
+
+    return NULL;
+}
+
+/* Update a history list (the one in which item is the current position)
+ * with a fresh string text.  That is: add text, or move it to the end. */
+void update_history(filestruct **item, const char *text)
+{
+    filestruct **htop = NULL, **hbot = NULL, *thesame;
+
+    if (*item == search_history) {
+	htop = &searchtop;
+	hbot = &searchbot;
+    } else if (*item == replace_history) {
+	htop = &replacetop;
+	hbot = &replacebot;
+    } else if (*item == execute_history) {
+	htop = &executetop;
+	hbot = &executebot;
+    }
+
+    /* See if the string is already in the history. */
+    thesame = find_history(*hbot, *htop, text, HIGHEST_POSITIVE);
+
+    /* If an identical string was found, delete that item. */
+    if (thesame != NULL) {
+	filestruct *after = thesame->next;
+
+	/* If the string is at the head of the list, move the head. */
+	if (thesame == *htop)
+	    *htop = after;
+
+	unlink_node(thesame);
+	renumber(after);
+    }
+
+    /* If the history is full, delete the oldest item (the one at the
+     * head of the list), to make room for a new item at the end. */
+    if ((*hbot)->lineno == MAX_SEARCH_HISTORY + 1) {
+	filestruct *oldest = *htop;
+
+	*htop = (*htop)->next;
+	unlink_node(oldest);
+	renumber(*htop);
+    }
+
+    /* Store the fresh string in the last item, then create a new item. */
+    (*hbot)->data = mallocstrcpy((*hbot)->data, text);
+    splice_node(*hbot, make_new_node(*hbot));
+    *hbot = (*hbot)->next;
+    (*hbot)->data = mallocstrcpy(NULL, "");
+
+    /* Indicate that the history needs to be saved on exit. */
+    history_changed = TRUE;
+
+    /* Set the current position in the list to the bottom. */
+    *item = *hbot;
+}
+
+/* Move h to the string in the history list just before it, and return
+ * that string.  If there isn't one, don't move h and return NULL. */
+char *get_history_older(filestruct **h)
+{
+    if ((*h)->prev == NULL)
+	return NULL;
+
+    *h = (*h)->prev;
+
+    return (*h)->data;
+}
+
+/* Move h to the string in the history list just after it, and return
+ * that string.  If there isn't one, don't move h and return NULL. */
+char *get_history_newer(filestruct **h)
+{
+    if ((*h)->next == NULL)
+	return NULL;
+
+    *h = (*h)->next;
+
+    return (*h)->data;
+}
+
+/* More placeholders. */
+void get_history_newer_void(void)
+{
+    ;
+}
+void get_history_older_void(void)
+{
+    ;
+}
+
+#ifdef ENABLE_TABCOMP
+/* Move h to the next string that's a tab completion of the string s,
+ * looking at only the first len characters of s, and return that
+ * string.  If there isn't one, or if len is 0, don't move h and return
+ * s. */
+char *get_history_completion(filestruct **h, char *s, size_t len)
+{
+    if (len > 0) {
+	filestruct *htop = NULL, *hbot = NULL, *p;
+
+	if (*h == search_history) {
+	    htop = searchtop;
+	    hbot = searchbot;
+	} else if (*h == replace_history) {
+	    htop = replacetop;
+	    hbot = replacebot;
+	} else if (*h == execute_history) {
+	    htop = executetop;
+	    hbot = executebot;
+	}
+
+	/* Search the history list from the current position to the top
+	 * for a match of len characters.  Skip over an exact match. */
+	p = find_history((*h)->prev, htop, s, len);
+
+	while (p != NULL && strcmp(p->data, s) == 0)
+	    p = find_history(p->prev, htop, s, len);
+
+	if (p != NULL) {
+	    *h = p;
+	    return mallocstrcpy(s, (*h)->data);
+	}
+
+	/* Search the history list from the bottom to the current position
+	 * for a match of len characters.  Skip over an exact match. */
+	p = find_history(hbot, *h, s, len);
+
+	while (p != NULL && strcmp(p->data, s) == 0)
+	    p = find_history(p->prev, *h, s, len);
+
+	if (p != NULL) {
+	    *h = p;
+	    return mallocstrcpy(s, (*h)->data);
+	}
+    }
+
+    /* If we're here, we didn't find a match, we didn't find an inexact
+     * match, or len is 0.  Return s. */
+    return (char *)s;
+}
+#endif /* ENSABLE_TABCOMP */
+
+void history_error(const char *msg, ...)
+{
+    va_list ap;
+
+    va_start(ap, msg);
+    vfprintf(stderr, _(msg), ap);
+    va_end(ap);
+
+    fprintf(stderr, _("\nPress Enter to continue\n"));
+    while (getchar() != '\n')
+	;
+}
+
+/* Check whether we have or could make a directory for history files. */
+bool have_statedir(void)
+{
+    struct stat dirstat;
+    const char *xdgdatadir;
+
+    get_homedir();
+
+    if (homedir != NULL) {
+	statedir = concatenate(homedir, "/.nano/");
+
+	if (stat(statedir, &dirstat) == 0 && S_ISDIR(dirstat.st_mode)) {
+	    poshistname = concatenate(statedir, POSITION_HISTORY);
+	    return TRUE;
+	}
+    }
+
+    free(statedir);
+    xdgdatadir = getenv("XDG_DATA_HOME");
+
+    if (homedir == NULL && xdgdatadir == NULL)
+	return FALSE;
+
+    if (xdgdatadir != NULL)
+	statedir = concatenate(xdgdatadir, "/nano/");
+    else
+	statedir = concatenate(homedir, "/.local/share/nano/");
+
+    if (stat(statedir, &dirstat) == -1) {
+	if (xdgdatadir == NULL) {
+	    char *statepath = concatenate(homedir, "/.local");
+	    mkdir(statepath, S_IRWXU | S_IRWXG | S_IRWXO);
+	    free(statepath);
+	    statepath = concatenate(homedir, "/.local/share");
+	    mkdir(statepath, S_IRWXU);
+	    free(statepath);
+	}
+	if (mkdir(statedir, S_IRWXU) == -1) {
+	    history_error(N_("Unable to create directory %s: %s\n"
+				"It is required for saving/loading "
+				"search history or cursor positions.\n"),
+				statedir, strerror(errno));
+	    return FALSE;
+	}
+    } else if (!S_ISDIR(dirstat.st_mode)) {
+	history_error(N_("Path %s is not a directory and needs to be.\n"
+				"Nano will be unable to load or save "
+				"search history or cursor positions.\n"),
+				statedir);
+	return FALSE;
+    }
+
+    poshistname = concatenate(statedir, POSITION_HISTORY);
+    return TRUE;
+}
+
+/* Load the histories for Search and Replace and Execute Command. */
+void load_history(void)
+{
+    char *histname = concatenate(statedir, SEARCH_HISTORY);
+    FILE *hisfile = fopen(histname, "rb");
+
+    if (hisfile == NULL) {
+	if (errno != ENOENT) {
+	    /* When reading failed, don't save history when we quit. */
+	    UNSET(HISTORYLOG);
+	    history_error(N_("Error reading %s: %s"), histname,
+			strerror(errno));
+	}
+    } else {
+	/* Load the three history lists -- first search, then replace,
+	 * then execute -- from oldest entry to newest.  Between two
+	 * lists there is an empty line. */
+	filestruct **history = &search_history;
+	char *line = NULL;
+	size_t buf_len = 0;
+	ssize_t read;
+
+	while ((read = getline(&line, &buf_len, hisfile)) > 0) {
+	    line[--read] = '\0';
+	    if (read > 0) {
+		/* Encode any embedded NUL as 0x0A. */
+		unsunder(line, read);
+		update_history(history, line);
+	    } else if (history == &search_history)
+		history = &replace_history;
+	   else
+		history = &execute_history;
+	}
+
+	fclose(hisfile);
+	free(line);
+    }
+
+    /* After reading them in, set the status of the lists to "unchanged". */
+    history_changed = FALSE;
+
+    free(histname);
+}
+
+/* Write the lines of a history list, starting at head, from oldest to newest,
+ * to the given file.  Return TRUE if writing succeeded, and FALSE otherwise. */
+bool write_list(const filestruct *head, FILE *hisfile)
+{
+    const filestruct *item;
+
+    for (item = head; item != NULL; item = item->next) {
+	size_t length = strlen(item->data);
+
+	/* Decode 0x0A bytes as embedded NULs. */
+	sunder(item->data);
+
+	if (fwrite(item->data, sizeof(char), length, hisfile) < length)
+	    return FALSE;
+	if (putc('\n', hisfile) == EOF)
+	    return FALSE;
+    }
+
+    return TRUE;
+}
+
+/* Save the histories for Search and Replace and Execute Command. */
+void save_history(void)
+{
+    char *histname;
+    FILE *hisfile;
+
+    /* If the histories are unchanged, don't bother saving them. */
+    if (!history_changed)
+	return;
+
+    histname = concatenate(statedir, SEARCH_HISTORY);
+    hisfile = fopen(histname, "wb");
+
+    if (hisfile == NULL)
+	fprintf(stderr, _("Error writing %s: %s\n"), histname,
+			strerror(errno));
+    else {
+	/* Don't allow others to read or write the history file. */
+	chmod(histname, S_IRUSR | S_IWUSR);
+
+	if (!write_list(searchtop, hisfile) ||
+			!write_list(replacetop, hisfile) ||
+			!write_list(executetop, hisfile))
+	    fprintf(stderr, _("Error writing %s: %s\n"), histname,
+			strerror(errno));
+
+	fclose(hisfile);
+    }
+
+    free(histname);
+}
+
+/* Load the recorded cursor positions for files that were edited. */
+void load_poshistory(void)
+{
+    FILE *hisfile = fopen(poshistname, "rb");
+
+    if (hisfile == NULL) {
+	if (errno != ENOENT) {
+	    /* When reading failed, don't save history when we quit. */
+	    UNSET(POS_HISTORY);
+	    history_error(N_("Error reading %s: %s"), poshistname, strerror(errno));
+	}
+    } else {
+	char *line = NULL, *lineptr, *xptr;
+	size_t buf_len = 0;
+	ssize_t read, count = 0;
+	poshiststruct *record_ptr = NULL, *newrecord;
+
+	/* Read and parse each line, and store the extracted data. */
+	while ((read = getline(&line, &buf_len, hisfile)) > 5) {
+	    /* Decode nulls as embedded newlines. */
+	    unsunder(line, read);
+
+	    /* Find where the x index and line number are in the line. */
+	    xptr = revstrstr(line, " ", line + read - 3);
+	    if (xptr == NULL)
+		continue;
+	    lineptr = revstrstr(line, " ", xptr - 2);
+	    if (lineptr == NULL)
+		continue;
+
+	    /* Now separate the three elements of the line. */
+	    *(xptr++) = '\0';
+	    *(lineptr++) = '\0';
+
+	    /* Create a new position record. */
+	    newrecord = (poshiststruct *)nmalloc(sizeof(poshiststruct));
+	    newrecord->filename = mallocstrcpy(NULL, line);
+	    newrecord->lineno = atoi(lineptr);
+	    newrecord->xno = atoi(xptr);
+	    newrecord->next = NULL;
+
+	    /* Add the record to the list. */
+	    if (position_history == NULL)
+		position_history = newrecord;
+	    else
+		record_ptr->next = newrecord;
+
+	    record_ptr = newrecord;
+
+	    /* Impose a limit, so the file will not grow indefinitely. */
+	    if (++count > 200) {
+		poshiststruct *drop_record = position_history;
+
+		position_history = position_history->next;
+
+		free(drop_record->filename);
+		free(drop_record);
+	    }
+	}
+	fclose(hisfile);
+	free(line);
+
+	stat(poshistname, &stat_of_positions_file);
+    }
+}
+
+/* Save the recorded cursor positions for files that were edited. */
+void save_poshistory(void)
+{
+    poshiststruct *posptr;
+    FILE *hisfile = fopen(poshistname, "wb");
+
+    if (hisfile == NULL)
+	fprintf(stderr, _("Error writing %s: %s\n"), poshistname, strerror(errno));
+    else {
+	/* Don't allow others to read or write the history file. */
+	chmod(poshistname, S_IRUSR | S_IWUSR);
+
+	for (posptr = position_history; posptr != NULL; posptr = posptr->next) {
+	    char *path_and_place;
+	    size_t length;
+
+	    /* Assume 20 decimal positions each for line and column number,
+	     * plus two spaces, plus the line feed, plus the null byte. */
+	    path_and_place = charalloc(strlen(posptr->filename) + 44);
+	    sprintf(path_and_place, "%s %zd %zd\n",
+			posptr->filename, posptr->lineno, posptr->xno);
+	    length = strlen(path_and_place);
+
+	    /* Encode newlines in filenames as nulls. */
+	    sunder(path_and_place);
+	    /* Restore the terminating newline. */
+	    path_and_place[length - 1] = '\n';
+
+	    if (fwrite(path_and_place, sizeof(char), length, hisfile) < length)
+		fprintf(stderr, _("Error writing %s: %s\n"),
+					poshistname, strerror(errno));
+	    free(path_and_place);
+	}
+	fclose(hisfile);
+
+	stat(poshistname, &stat_of_positions_file);
+    }
+}
+
+/* Reload the position history file if it has been modified since last load. */
+void reload_positions_if_needed(void)
+{
+    struct stat newstat;
+
+    stat(poshistname, &newstat);
+
+    if (newstat.st_mtime != stat_of_positions_file.st_mtime) {
+	poshiststruct *ptr, *nextone;
+
+	for (ptr = position_history; ptr != NULL; ptr = nextone) {
+	    nextone = ptr->next;
+	    free(ptr->filename);
+	    free(ptr);
+	}
+	position_history = NULL;
+
+	load_poshistory();
+    }
+}
+
+/* Update the recorded last file positions, given a filename, a line
+ * and a column.  If no entry is found, add a new one at the end. */
+void update_poshistory(char *filename, ssize_t lineno, ssize_t xpos)
+{
+    poshiststruct *posptr, *theone, *posprev = NULL;
+    char *fullpath = get_full_path(filename);
+
+    if (fullpath == NULL || fullpath[strlen(fullpath) - 1] == '/' || inhelp) {
+	free(fullpath);
+	return;
+    }
+
+    reload_positions_if_needed();
+
+    /* Look for a matching filename in the list. */
+    for (posptr = position_history; posptr != NULL; posptr = posptr->next) {
+	if (!strcmp(posptr->filename, fullpath))
+	    break;
+	posprev = posptr;
+    }
+
+    /* Don't record files that have the default cursor position. */
+    if (lineno == 1 && xpos == 1) {
+	if (posptr != NULL) {
+	    if (posprev == NULL)
+		position_history = posptr->next;
+	    else
+		posprev->next = posptr->next;
+	    free(posptr->filename);
+	    free(posptr);
+	    save_poshistory();
+	}
+	free(fullpath);
+	return;
+    }
+
+    theone = posptr;
+
+    /* If we didn't find it, make a new node; otherwise, if we're
+     * not at the end, move the matching one to the end. */
+    if (theone == NULL) {
+	theone = (poshiststruct *)nmalloc(sizeof(poshiststruct));
+	theone->filename = mallocstrcpy(NULL, fullpath);
+	if (position_history == NULL)
+	    position_history = theone;
+	else
+	    posprev->next = theone;
+    } else if (posptr->next != NULL) {
+	if (posprev == NULL)
+	    position_history = posptr->next;
+	else
+	    posprev->next = posptr->next;
+	while (posptr->next != NULL)
+	    posptr = posptr->next;
+	posptr->next = theone;
+    }
+
+    /* Store the last cursor position. */
+    theone->lineno = lineno;
+    theone->xno = xpos;
+    theone->next = NULL;
+
+    free(fullpath);
+
+    save_poshistory();
+}
+
+/* Check whether the given file matches an existing entry in the recorded
+ * last file positions.  If not, return FALSE.  If yes, return TRUE and
+ * set line and column to the retrieved values. */
+bool has_old_position(const char *file, ssize_t *line, ssize_t *column)
+{
+    poshiststruct *posptr = position_history;
+    char *fullpath = get_full_path(file);
+
+    if (fullpath == NULL)
+	return FALSE;
+
+    reload_positions_if_needed();
+
+    while (posptr != NULL && strcmp(posptr->filename, fullpath) != 0)
+	posptr = posptr->next;
+
+    free(fullpath);
+
+    if (posptr == NULL)
+	return FALSE;
+
+    *line = posptr->lineno;
+    *column = posptr->xno;
+    return TRUE;
+}
+#endif /* ENABLE_HISTORIES */

src/move.c

@@ -2,7 +2,7 @@
  *   move.c  --  This file is part of GNU nano.                           *
  *                                                                        *
  *   Copyright (C) 1999-2011, 2013-2017 Free Software Foundation, Inc.    *
- *   Copyright (C) 2014, 2015, 2016 Benno Schulenberg                     *
+ *   Copyright (C) 2014-2017 Benno Schulenberg                            *
  *                                                                        *
  *   GNU nano is free software: you can redistribute it and/or modify     *
  *   it under the terms of the GNU General Public License as published    *
@@ -22,7 +22,6 @@
 #include "proto.h"
 
 #include <string.h>
-#include <ctype.h>
 
 /* Move to the first line of the file. */
 void do_first_line(void)
@@ -53,13 +52,10 @@ void get_edge_and_target(size_t *leftedge, size_t *target_column)
 {
 #ifndef NANO_TINY
     if (ISSET(SOFTWRAP)) {
-	size_t realspan = strlenpt(openfile->current->data);
+	size_t shim = editwincols * (1 + (tabsize / editwincols));
 
-	if (realspan > openfile->placewewant)
-	    realspan = openfile->placewewant;
-
-	*leftedge = (realspan / editwincols) * editwincols;
-	*target_column = openfile->placewewant % editwincols;
+	*leftedge = leftedge_for(xplustabs(), openfile->current);
+	*target_column = (openfile->placewewant + shim - *leftedge) % editwincols;
     } else
 #endif
     {
@@ -68,6 +64,51 @@ void get_edge_and_target(size_t *leftedge, size_t *target_column)
     }
 }
 
+/* Return the index in line->data that corresponds to the given column on the
+ * chunk that starts at the given leftedge.  If the target column has landed
+ * on a tab, prevent the cursor from falling back a row when moving forward,
+ * or from skipping a row when moving backward, by incrementing the index. */
+size_t proper_x(filestruct *line, size_t *leftedge, bool forward,
+		size_t column, bool *shifted)
+{
+    size_t index = actual_x(line->data, column);
+
+#ifndef NANO_TINY
+    if (ISSET(SOFTWRAP) && line->data[index] == '\t' &&
+		((forward && strnlenpt(line->data, index) < *leftedge) ||
+		(!forward && column / tabsize == (*leftedge - 1) / tabsize &&
+		column / tabsize < (*leftedge + editwincols - 1) / tabsize))) {
+	index++;
+
+	if (shifted != NULL)
+	    *shifted = TRUE;
+    }
+
+    if (ISSET(SOFTWRAP))
+	*leftedge = leftedge_for(strnlenpt(line->data, index), line);
+#endif
+
+    return index;
+}
+
+/* Adjust the values for current_x and placewewant in case we have landed in
+ * the middle of a tab that crosses a row boundary. */
+void set_proper_index_and_pww(size_t *leftedge, size_t target, bool forward)
+{
+    bool shifted = FALSE;
+    size_t was_edge = *leftedge;
+
+    openfile->current_x = proper_x(openfile->current, leftedge, forward,
+			actual_last_column(*leftedge, target), &shifted);
+
+    /* If the index was incremented, try going to the target column. */
+    if (shifted || *leftedge < was_edge)
+	openfile->current_x = proper_x(openfile->current, leftedge, forward,
+			actual_last_column(*leftedge, target), &shifted);
+
+    openfile->placewewant = *leftedge + target;
+}
+
 /* Move up nearly one screenful. */
 void do_page_up(void)
 {
@@ -78,11 +119,11 @@ void do_page_up(void)
      * beginning of the top line of the edit window, as Pico does. */
     if (!ISSET(SMOOTH_SCROLL)) {
 	openfile->current = openfile->edittop;
-	openfile->placewewant = openfile->firstcolumn;
+	leftedge = openfile->firstcolumn;
 	openfile->current_y = 0;
-    }
-
-    get_edge_and_target(&leftedge, &target_column);
+	target_column = 0;
+    } else
+	get_edge_and_target(&leftedge, &target_column);
 
     /* Move up the required number of lines or chunks.  If we can't, we're
      * at the top of the file, so put the cursor there and get out. */
@@ -91,9 +132,7 @@ void do_page_up(void)
 	return;
     }
 
-    openfile->placewewant = leftedge + target_column;
-    openfile->current_x = actual_x(openfile->current->data,
-					openfile->placewewant);
+    set_proper_index_and_pww(&leftedge, target_column, FALSE);
 
     /* Move the viewport so that the cursor stays immobile, if possible. */
     adjust_viewport(STATIONARY);
@@ -110,11 +149,11 @@ void do_page_down(void)
      * beginning of the top line of the edit window, as Pico does. */
     if (!ISSET(SMOOTH_SCROLL)) {
 	openfile->current = openfile->edittop;
-	openfile->placewewant = openfile->firstcolumn;
+	leftedge = openfile->firstcolumn;
 	openfile->current_y = 0;
-    }
-
-    get_edge_and_target(&leftedge, &target_column);
+	target_column = 0;
+    } else
+	get_edge_and_target(&leftedge, &target_column);
 
     /* Move down the required number of lines or chunks.  If we can't, we're
      * at the bottom of the file, so put the cursor there and get out. */
@@ -123,38 +162,30 @@ void do_page_down(void)
 	return;
     }
 
-    openfile->placewewant = leftedge + target_column;
-    openfile->current_x = actual_x(openfile->current->data,
-					openfile->placewewant);
+    set_proper_index_and_pww(&leftedge, target_column, TRUE);
 
     /* Move the viewport so that the cursor stays immobile, if possible. */
     adjust_viewport(STATIONARY);
     refresh_needed = TRUE;
 }
 
-#ifndef DISABLE_JUSTIFY
+#ifdef ENABLE_JUSTIFY
 /* Move to the beginning of the last beginning-of-paragraph line before the
  * current line.  If update_screen is TRUE, update the screen afterwards. */
 void do_para_begin(bool update_screen)
 {
     filestruct *was_current = openfile->current;
 
-    if (openfile->current != openfile->fileage) {
-	do
-	    openfile->current = openfile->current->prev;
-	while (!begpar(openfile->current));
-    }
+    if (openfile->current != openfile->fileage)
+	openfile->current = openfile->current->prev;
+
+    while (!begpar(openfile->current))
+	openfile->current = openfile->current->prev;
 
     openfile->current_x = 0;
 
     if (update_screen)
-	edit_redraw(was_current);
-}
-
-/* Move up to first start of a paragraph before the current line. */
-void do_para_begin_void(void)
-{
-    do_para_begin(TRUE);
+	edit_redraw(was_current, CENTERING);
 }
 
 /* Move down to the beginning of the last line of the current paragraph.
@@ -184,7 +215,13 @@ void do_para_end(bool update_screen)
 	openfile->current_x = strlen(openfile->current->data);
 
     if (update_screen)
-	edit_redraw(was_current);
+	edit_redraw(was_current, CENTERING);
+}
+
+/* Move up to first start of a paragraph before the current line. */
+void do_para_begin_void(void)
+{
+    do_para_begin(TRUE);
 }
 
 /* Move down to just after the first end of a paragraph. */
@@ -192,9 +229,9 @@ void do_para_end_void(void)
 {
     do_para_end(TRUE);
 }
-#endif /* !DISABLE_JUSTIFY */
+#endif /* ENABLE_JUSTIFY */
 
-/* Move to the preceding block of text in the file. */
+/* Move to the preceding block of text. */
 void do_prev_block(void)
 {
     filestruct *was_current = openfile->current;
@@ -213,10 +250,10 @@ void do_prev_block(void)
 	openfile->current = openfile->current->next;
 
     openfile->current_x = 0;
-    edit_redraw(was_current);
+    edit_redraw(was_current, CENTERING);
 }
 
-/* Move to the next block of text in the file. */
+/* Move to the next block of text. */
 void do_next_block(void)
 {
     filestruct *was_current = openfile->current;
@@ -231,12 +268,11 @@ void do_next_block(void)
     }
 
     openfile->current_x = 0;
-    edit_redraw(was_current);
+    edit_redraw(was_current, CENTERING);
 }
 
-/* Move to the previous word in the file.  If allow_punct is TRUE, treat
- * punctuation as part of a word.  If update_screen is TRUE, update the
- * screen afterwards. */
+/* Move to the previous word.  If allow_punct is TRUE, treat punctuation
+ * as part of a word.  When requested, update the screen afterwards. */
 void do_prev_word(bool allow_punct, bool update_screen)
 {
     filestruct *was_current = openfile->current;
@@ -274,23 +310,13 @@ void do_prev_word(bool allow_punct, bool update_screen)
 	openfile->current_x = move_mbright(openfile->current->data,
 						openfile->current_x);
 
-    if (update_screen) {
-	focusing = FALSE;
-	edit_redraw(was_current);
-    }
+    if (update_screen)
+	edit_redraw(was_current, FLOWING);
 }
 
-/* Move to the previous word in the file, treating punctuation as part of a
- * word if the WORD_BOUNDS flag is set, and update the screen afterwards. */
-void do_prev_word_void(void)
-{
-    do_prev_word(ISSET(WORD_BOUNDS), TRUE);
-}
-
-/* Move to the next word in the file.  If allow_punct is TRUE, treat
- * punctuation as part of a word.  If update_screen is TRUE, update the
- * screen afterwards.  Return TRUE if we started on a word, and FALSE
- * otherwise. */
+/* Move to the next word.  If allow_punct is TRUE, treat punctuation
+ * as part of a word.   When requested, update the screen afterwards.
+ * Return TRUE if we started on a word, and FALSE otherwise. */
 bool do_next_word(bool allow_punct, bool update_screen)
 {
     filestruct *was_current = openfile->current;
@@ -302,7 +328,7 @@ bool do_next_word(bool allow_punct, bool update_screen)
     while (TRUE) {
 	/* If at the end of a line, move to the beginning of the next one. */
 	if (openfile->current->data[openfile->current_x] == '\0') {
-	    /* If at the end of the file, stop. */
+	    /* When at end of file, stop. */
 	    if (openfile->current->next == NULL)
 		break;
 	    openfile->current = openfile->current->next;
@@ -323,15 +349,20 @@ bool do_next_word(bool allow_punct, bool update_screen)
 	    break;
     }
 
-    if (update_screen) {
-	focusing = FALSE;
-	edit_redraw(was_current);
-    }
+    if (update_screen)
+	edit_redraw(was_current, FLOWING);
 
     /* Return whether we started on a word. */
     return started_on_word;
 }
 
+/* Move to the previous word in the file, treating punctuation as part of a
+ * word if the WORD_BOUNDS flag is set, and update the screen afterwards. */
+void do_prev_word_void(void)
+{
+    do_prev_word(ISSET(WORD_BOUNDS), TRUE);
+}
+
 /* Move to the next word in the file, treating punctuation as part of a word
  * if the WORD_BOUNDS flag is set, and update the screen afterwards. */
 void do_next_word_void(void)
@@ -340,23 +371,24 @@ void do_next_word_void(void)
 }
 
 /* Move to the beginning of the current line (or softwrapped chunk).
- * If be_clever is TRUE, do a smart home when wanted and possible,
- * and do a dynamic home when in softwrap mode and it's possible.
- * If be_clever is FALSE, just do a simple home. */
-void do_home(bool be_clever)
+ * When enabled, do a smart home.  When softwrapping, go the beginning
+ * of the full line when already at the start of a chunk. */
+void do_home(void)
 {
     filestruct *was_current = openfile->current;
-    size_t was_column = openfile->placewewant;
+    size_t was_column = xplustabs();
     bool moved_off_chunk = TRUE;
 #ifndef NANO_TINY
     bool moved = FALSE;
-    size_t leftedge_x = 0;
+    size_t leftedge = 0, leftedge_x = 0;
 
-    if (ISSET(SOFTWRAP))
-	leftedge_x = actual_x(openfile->current->data,
-			(was_column / editwincols) * editwincols);
+    if (ISSET(SOFTWRAP)) {
+	leftedge = leftedge_for(was_column, openfile->current);
+	leftedge_x = proper_x(openfile->current, &leftedge, FALSE, leftedge,
+				NULL);
+    }
 
-    if (ISSET(SMART_HOME) && be_clever) {
+    if (ISSET(SMART_HOME)) {
 	size_t indent_x = indent_length(openfile->current->data);
 
 	if (openfile->current->data[indent_x] != '\0') {
@@ -376,11 +408,11 @@ void do_home(bool be_clever)
     if (!moved && ISSET(SOFTWRAP)) {
 	/* If already at the left edge of the screen, move fully home.
 	 * Otherwise, move to the left edge. */
-	if (was_column % editwincols == 0 && be_clever)
+	if (openfile->current_x == leftedge_x)
 	    openfile->current_x = 0;
 	else {
 	    openfile->current_x = leftedge_x;
-	    openfile->placewewant = (was_column / editwincols) * editwincols;
+	    openfile->placewewant = leftedge;
 	    moved_off_chunk = FALSE;
 	}
     } else if (!moved)
@@ -388,74 +420,72 @@ void do_home(bool be_clever)
 	openfile->current_x = 0;
 
     if (moved_off_chunk)
-	openfile->placewewant = 0;
+	openfile->placewewant = xplustabs();
 
     /* If we changed chunk, we might be offscreen.  Otherwise,
      * update current if the mark is on or we changed "page". */
-    if (ISSET(SOFTWRAP) && moved_off_chunk) {
-	focusing = FALSE;
-	edit_redraw(was_current);
-    } else if (line_needs_update(was_column, openfile->placewewant))
+    if (ISSET(SOFTWRAP) && moved_off_chunk)
+	edit_redraw(was_current, FLOWING);
+    else if (line_needs_update(was_column, openfile->placewewant))
 	update_line(openfile->current, openfile->current_x);
 }
 
-/* Do a (smart or dynamic) home. */
-void do_home_void(void)
-{
-    do_home(TRUE);
-}
-
 /* Move to the end of the current line (or softwrapped chunk).
- * If be_clever is TRUE, do a dynamic end when in softwrap mode and
- * it's possible.  If be_clever is FALSE, just do a simple end. */
-void do_end(bool be_clever)
+ * When softwrapping and alredy at the end of a chunk, go to the
+ * end of the full line. */
+void do_end(void)
 {
     filestruct *was_current = openfile->current;
-    size_t was_column = openfile->placewewant;
+    size_t was_column = xplustabs();
     size_t line_len = strlen(openfile->current->data);
     bool moved_off_chunk = TRUE;
 
 #ifndef NANO_TINY
     if (ISSET(SOFTWRAP)) {
-	size_t rightedge_x = actual_x(openfile->current->data,
-			((was_column / editwincols) * editwincols) +
-			(editwincols - 1));
+	bool last_chunk = FALSE;
+	size_t leftedge = leftedge_for(was_column, openfile->current);
+	size_t rightedge = get_softwrap_breakpoint(openfile->current->data,
+						leftedge, &last_chunk);
+	size_t rightedge_x;
+
+	/* If we're on the last chunk, we're already at the end of the line.
+	 * Otherwise, we're one column past the end of the line.  Shifting
+	 * backwards one column might put us in the middle of a multi-column
+	 * character, but actual_x() will fix that. */
+	if (!last_chunk)
+	    rightedge--;
+
+	rightedge_x = actual_x(openfile->current->data, rightedge);
 
 	/* If already at the right edge of the screen, move fully to
 	 * the end of the line.  Otherwise, move to the right edge. */
-	if (openfile->current_x == rightedge_x && be_clever)
+	if (openfile->current_x == rightedge_x)
 	    openfile->current_x = line_len;
 	else {
 	    openfile->current_x = rightedge_x;
+	    openfile->placewewant = rightedge;
 	    moved_off_chunk = FALSE;
 	}
     } else
 #endif
 	openfile->current_x = line_len;
 
-    openfile->placewewant = xplustabs();
+    if (moved_off_chunk)
+	openfile->placewewant = xplustabs();
 
     /* If we changed chunk, we might be offscreen.  Otherwise,
      * update current if the mark is on or we changed "page". */
-    if (ISSET(SOFTWRAP) && moved_off_chunk) {
-	focusing = FALSE;
-	edit_redraw(was_current);
-    } else if (line_needs_update(was_column, openfile->placewewant))
+    if (ISSET(SOFTWRAP) && moved_off_chunk)
+	edit_redraw(was_current, FLOWING);
+    else if (line_needs_update(was_column, openfile->placewewant))
 	update_line(openfile->current, openfile->current_x);
 }
 
-/* Do a (dynamic) end. */
-void do_end_void(void)
-{
-    do_end(TRUE);
-}
-
 /* Move the cursor to the preceding line or chunk.  If scroll_only is TRUE,
  * also scroll the screen one row, so the cursor stays in the same spot. */
 void do_up(bool scroll_only)
 {
     filestruct *was_current = openfile->current;
-    size_t was_column = xplustabs();
     size_t leftedge, target_column;
 
     /* When just scrolling and the top of the file is onscreen, get out. */
@@ -469,34 +499,15 @@ void do_up(bool scroll_only)
     if (go_back_chunks(1, &openfile->current, &leftedge) > 0)
 	return;
 
+    set_proper_index_and_pww(&leftedge, target_column, FALSE);
+
+    if (scroll_only)
+	edit_scroll(BACKWARD, 1);
+
+    edit_redraw(was_current, FLOWING);
+
+    /* <Up> should not change placewewant, so restore it. */
     openfile->placewewant = leftedge + target_column;
-    openfile->current_x = actual_x(openfile->current->data,
-					openfile->placewewant);
-
-    /* When the cursor was on the first line of the edit window (or when just
-     * scrolling without moving the cursor), scroll the edit window up -- one
-     * line if we're in smooth scrolling mode, and half a page otherwise. */
-    if (openfile->current_y == 0 || scroll_only)
-	edit_scroll(UPWARD, (ISSET(SMOOTH_SCROLL) || scroll_only) ?
-				1 : editwinrows / 2 + 1);
-
-    if (openfile->current_y > 0) {
-	/* Redraw the prior line if it's not offscreen, and it's not the same
-	 * line as the current one, and the line was horizontally scrolled. */
-	if ((!scroll_only || openfile->current_y < editwinrows - 1) &&
-			openfile->current != was_current &&
-			line_needs_update(was_column, 0))
-	    update_line(openfile->current->next, 0);
-	/* Redraw the current line if it needs to be horizontally scrolled. */
-	if (line_needs_update(0, xplustabs()))
-	    update_line(openfile->current, openfile->current_x);
-    }
-}
-
-/* Move up one line or chunk. */
-void do_up_void(void)
-{
-    do_up(FALSE);
 }
 
 /* Move the cursor to next line or chunk.  If scroll_only is TRUE, also
@@ -504,7 +515,6 @@ void do_up_void(void)
 void do_down(bool scroll_only)
 {
     filestruct *was_current = openfile->current;
-    size_t was_column = xplustabs();
     size_t leftedge, target_column;
 
     get_edge_and_target(&leftedge, &target_column);
@@ -513,28 +523,21 @@ void do_down(bool scroll_only)
     if (go_forward_chunks(1, &openfile->current, &leftedge) > 0)
 	return;
 
+    set_proper_index_and_pww(&leftedge, target_column, TRUE);
+
+    if (scroll_only)
+	edit_scroll(FORWARD, 1);
+
+    edit_redraw(was_current, FLOWING);
+
+    /* <Down> should not change placewewant, so restore it. */
     openfile->placewewant = leftedge + target_column;
-    openfile->current_x = actual_x(openfile->current->data,
-					openfile->placewewant);
+}
 
-    /* When the cursor was on the last line of the edit window (or when just
-     * scrolling without moving the cursor), scroll the edit window down -- one
-     * line if we're in smooth scrolling mode, and half a page otherwise. */
-    if (openfile->current_y == editwinrows - 1 || scroll_only)
-	edit_scroll(DOWNWARD, (ISSET(SMOOTH_SCROLL) || scroll_only) ?
-				1 : editwinrows / 2 + 1);
-
-    if (openfile->current_y < editwinrows - 1) {
-	/* Redraw the prior line if it's not offscreen, and it's not the same
-	 * line as the current one, and the line was horizontally scrolled. */
-	if ((!scroll_only || openfile->current_y > 0) &&
-			openfile->current != was_current &&
-			line_needs_update(was_column, 0))
-	    update_line(openfile->current->prev, 0);
-	/* Redraw the current line if it needs to be horizontally scrolled. */
-	if (line_needs_update(0, xplustabs()))
-	    update_line(openfile->current, openfile->current_x);
-    }
+/* Move up one line or chunk. */
+void do_up_void(void)
+{
+    do_up(FALSE);
 }
 
 /* Move down one line or chunk. */
@@ -560,71 +563,31 @@ void do_scroll_down(void)
 /* Move left one character. */
 void do_left(void)
 {
-    size_t was_column = xplustabs();
-#ifndef NANO_TINY
-    size_t was_chunk = (was_column / editwincols);
     filestruct *was_current = openfile->current;
-#endif
 
     if (openfile->current_x > 0)
 	openfile->current_x = move_mbleft(openfile->current->data,
 						openfile->current_x);
     else if (openfile->current != openfile->fileage) {
-	do_up_void();
-	do_end(FALSE);
-	return;
+	openfile->current = openfile->current->prev;
+	openfile->current_x = strlen(openfile->current->data);
     }
 
-    openfile->placewewant = xplustabs();
-
-#ifndef NANO_TINY
-    /* If we were on the first line of the edit window, and we changed chunk,
-     * we're now above the first line of the edit window, so scroll up. */
-    if (ISSET(SOFTWRAP) && openfile->current_y == 0 &&
-		openfile->current == was_current &&
-		openfile->placewewant / editwincols != was_chunk) {
-	edit_scroll(UPWARD, ISSET(SMOOTH_SCROLL) ? 1 : editwinrows / 2 + 1);
-	return;
-    }
-#endif
-
-    /* Update current if the mark is on or it has changed "page". */
-    if (line_needs_update(was_column, openfile->placewewant))
-	update_line(openfile->current, openfile->current_x);
+    edit_redraw(was_current, FLOWING);
 }
 
 /* Move right one character. */
 void do_right(void)
 {
-    size_t was_column = xplustabs();
-#ifndef NANO_TINY
-    size_t was_chunk = (was_column / editwincols);
     filestruct *was_current = openfile->current;
-#endif
 
     if (openfile->current->data[openfile->current_x] != '\0')
 	openfile->current_x = move_mbright(openfile->current->data,
 						openfile->current_x);
     else if (openfile->current != openfile->filebot) {
-	do_home(FALSE);
-	do_down_void();
-	return;
+	openfile->current = openfile->current->next;
+	openfile->current_x = 0;
     }
 
-    openfile->placewewant = xplustabs();
-
-#ifndef NANO_TINY
-    /* If we were on the last line of the edit window, and we changed chunk,
-     * we're now below the first line of the edit window, so scroll down. */
-    if (ISSET(SOFTWRAP) && openfile->current_y == editwinrows - 1 &&
-		openfile->current == was_current &&
-		openfile->placewewant / editwincols != was_chunk) {
-	edit_scroll(DOWNWARD, ISSET(SMOOTH_SCROLL) ? 1 : editwinrows / 2 + 1);
-	return;
-    }
-#endif
-
-    /* Update current if the mark is on or it has changed "page". */
-    if (line_needs_update(was_column, openfile->placewewant))
-	update_line(openfile->current, openfile->current_x);
+    edit_redraw(was_current, FLOWING);
 }

src/nano.h

@@ -2,7 +2,7 @@
  *   nano.h  --  This file is part of GNU nano.                           *
  *                                                                        *
  *   Copyright (C) 1999-2011, 2013-2017 Free Software Foundation, Inc.    *
- *   Copyright (C) 2014, 2015, 2016 Benno Schulenberg                     *
+ *   Copyright (C) 2014-2017 Benno Schulenberg                            *
  *                                                                        *
  *   GNU nano is free software: you can redistribute it and/or modify     *
  *   it under the terms of the GNU General Public License as published    *
@@ -48,8 +48,6 @@
 #include <sys/param.h>
 #endif
 
-#include <stdarg.h>
-
 /* Suppress warnings for __attribute__((warn_unused_result)). */
 #define IGNORE_CALL_RESULT(call) do { if (call) {} } while(0)
 
@@ -130,10 +128,20 @@
 #undef ENABLE_MOUSE
 #endif
 
-#if defined(DISABLE_WRAPPING) && defined(DISABLE_JUSTIFY)
-#define DISABLE_WRAPJUSTIFY 1
+#if defined(ENABLE_WRAPPING) || defined(ENABLE_JUSTIFY)
+#define ENABLED_WRAPORJUSTIFY 1
 #endif
 
+#define BACKWARD FALSE
+#define FORWARD TRUE
+
+#define BLIND FALSE
+#define VISIBLE TRUE
+
+#define JUSTFIND  0
+#define REPLACING 1
+#define INREGION  2
+
 /* Enumeration types. */
 typedef enum {
     NIX_FILE, DOS_FILE, MAC_FILE
@@ -151,27 +159,24 @@ typedef enum {
     SOFTMARK, HARDMARK
 } mark_type;
 
-typedef enum {
-    UPWARD, DOWNWARD
-} scroll_dir;
-
 typedef enum {
     CENTERING, FLOWING, STATIONARY
 } update_type;
 
 typedef enum {
-    ADD, DEL, BACK, CUT, CUT_EOF, REPLACE,
-#ifndef DISABLE_WRAPPING
+    ADD, DEL, BACK, CUT, CUT_TO_EOF, REPLACE,
+#ifdef ENABLE_WRAPPING
     SPLIT_BEGIN, SPLIT_END,
 #endif
-#ifndef DISABLE_COMMENT
+    INDENT, UNINDENT,
+#ifdef ENABLE_COMMENT
     COMMENT, UNCOMMENT, PREFLIGHT,
 #endif
     JOIN, PASTE, INSERT, ENTER, OTHER
 } undo_type;
 
 /* Structure types. */
-#ifndef DISABLE_COLOR
+#ifdef ENABLE_COLOR
 typedef struct colortype {
     short fg;
 	/* This syntax's foreground color. */
@@ -220,8 +225,10 @@ typedef struct syntaxtype {
 	/* The command with which to lint this type of file. */
     char *formatter;
         /* The formatting command (for programming languages mainly). */
+#ifdef ENABLE_COMMENT
     char *comment;
 	/* The line comment prefix (and postfix) for this type of file. */
+#endif
     colortype *color;
 	/* The colors and their regexes used in this syntax. */
     int nmultis;
@@ -258,7 +265,7 @@ typedef struct lintstruct {
 	/* Regex starts and ends within this line. */
 #define CWOULDBE	(1<<6)
 	/* An unpaired start match on or before this line. */
-#endif /* !DISABLE_COLOR */
+#endif /* ENABLE_COLOR */
 
 /* More structure types. */
 typedef struct filestruct {
@@ -270,7 +277,7 @@ typedef struct filestruct {
 	/* Next node. */
     struct filestruct *prev;
 	/* Previous node. */
-#ifndef DISABLE_COLOR
+#ifdef ENABLE_COLOR
     short *multidata;
 	/* Array of which multi-line regexes apply to this line. */
 #endif
@@ -300,6 +307,8 @@ typedef struct undo_group {
 	/* First line of group. */
     ssize_t bottom_line;
 	/* Last line of group. */
+    char **indentations;
+	/* String data used to restore the affected lines; one per line. */
     struct undo_group *next;
 } undo_group;
 
@@ -334,7 +343,7 @@ typedef struct undo {
 } undo;
 #endif /* !NANO_TINY */
 
-#ifndef DISABLE_HISTORIES
+#ifdef ENABLE_HISTORIES
 typedef struct poshiststruct {
     char *filename;
 	/* The file. */
@@ -373,26 +382,27 @@ typedef struct openfilestruct {
     struct stat *current_stat;
 	/* The file's current stat information. */
 #ifndef NANO_TINY
-    bool mark_set;
-	/* Whether the mark is on in this file. */
-    filestruct *mark_begin;
-	/* The file's line where the mark is, if any. */
-    size_t mark_begin_x;
-	/* The file's mark's x-coordinate position, if any. */
+    filestruct *mark;
+	/* The line in the file where the mark is set; NULL if not set. */
+    size_t mark_x;
+	/* The mark's x position in the above line. */
     mark_type kind_of_mark;
-	/* Whether this is a soft or a hard mark. */
+	/* Whether it is a soft (with Shift) or a hard mark. */
     file_format fmt;
-	/* The file's format. */
+	/* The file's format -- Unix or DOS or Mac or mixed. */
     undo *undotop;
 	/* The top of the undo list. */
     undo *current_undo;
 	/* The current (i.e. next) level of undo. */
     undo_type last_action;
 	/* The type of the last action the user performed. */
+    bool pristine;
+	/* Whether the undo stack still contains the first edit -- it won't
+	 * when a justification or spell check discarded the undo stack. */
     char *lock_filename;
 	/* The path of the lockfile, if we created one. */
 #endif
-#ifndef DISABLE_COLOR
+#ifdef ENABLE_COLOR
     syntaxtype *syntax;
 	/* The  syntax struct for this file, if any. */
     colortype *colorstrings;
@@ -469,6 +479,7 @@ enum
 {
     TITLE_BAR = 0,
     LINE_NUMBER,
+    SELECTED_TEXT,
     STATUS_BAR,
     KEY_COMBO,
     FUNCTION_TAG,
@@ -489,7 +500,7 @@ enum
     USE_MOUSE,
     USE_REGEXP,
     TEMP_FILE,
-    CUT_TO_END,
+    CUT_FROM_CURSOR,
     BACKWARDS_SEARCH,
     MULTIBUFFER,
     SMOOTH_SCROLL,
@@ -519,7 +530,8 @@ enum
     JUSTIFY_TRIM,
     SHOW_CURSOR,
     LINE_NUMBERS,
-    NO_PAUSES
+    NO_PAUSES,
+    AT_BLANKS
 };
 
 /* Flags for the menus in which a given function should be present. */
@@ -542,6 +554,11 @@ enum
 /* This is an abbreviation for all menus except Help and YesNo. */
 #define MMOST  (MMAIN|MWHEREIS|MREPLACE|MREPLACEWITH|MGOTOLINE|MWRITEFILE|MINSERTFILE|\
 		MEXTCMD|MBROWSER|MWHEREISFILE|MGOTODIR|MFINDINHELP|MSPELL|MLINTER)
+#ifndef NANO_TINY
+#define MSOME  MMOST
+#else
+#define MSOME  MMAIN|MBROWSER
+#endif
 
 /* Basic control codes. */
 #define TAB_CODE  0x09
@@ -553,22 +570,35 @@ enum
 #define CONTROL_RIGHT 0x402
 #define CONTROL_UP 0x403
 #define CONTROL_DOWN 0x404
-#define CONTROL_HOME 0x411
-#define CONTROL_END 0x412
-#define SHIFT_CONTROL_LEFT 0x405
-#define SHIFT_CONTROL_RIGHT 0x406
-#define SHIFT_CONTROL_UP 0x407
-#define SHIFT_CONTROL_DOWN 0x408
-#define SHIFT_CONTROL_HOME 0x413
-#define SHIFT_CONTROL_END 0x414
-#define SHIFT_ALT_LEFT 0x409
-#define SHIFT_ALT_RIGHT 0x40a
-#define SHIFT_ALT_UP 0x40b
-#define SHIFT_ALT_DOWN 0x40c
-#define SHIFT_PAGEUP 0x40d
-#define SHIFT_PAGEDOWN 0x40e
-#define SHIFT_HOME 0x40f
-#define SHIFT_END 0x410
+#define CONTROL_HOME 0x405
+#define CONTROL_END 0x406
+#define SHIFT_CONTROL_LEFT 0x411
+#define SHIFT_CONTROL_RIGHT 0x412
+#define SHIFT_CONTROL_UP 0x413
+#define SHIFT_CONTROL_DOWN 0x414
+#define SHIFT_CONTROL_HOME 0x415
+#define SHIFT_CONTROL_END 0x416
+#define ALT_LEFT 0x421
+#define ALT_RIGHT 0x422
+#define ALT_UP 0x423
+#define ALT_DOWN 0x424
+#define SHIFT_ALT_LEFT 0x431
+#define SHIFT_ALT_RIGHT 0x432
+#define SHIFT_ALT_UP 0x433
+#define SHIFT_ALT_DOWN 0x434
+#define SHIFT_HOME 0x455
+#define SHIFT_END 0x456
+#define SHIFT_PAGEUP 0x457
+#define SHIFT_PAGEDOWN 0x458
+
+#ifdef USE_SLANG
+#ifdef ENABLE_UTF8
+#define KEY_BAD 0xFF  /* Clipped error code. */
+#endif
+#define KEY_FLUSH 0x91  /* User-definable control code. */
+#else
+#define KEY_FLUSH KEY_F0  /* Nonexistent function key. */
+#endif
 
 #ifndef NANO_TINY
 /* An imaginary key for when we get a SIGWINCH (window resize). */
@@ -592,6 +622,9 @@ enum
 /* The default width of a tab in spaces. */
 #define WIDTH_OF_TAB 8
 
+/* The default comment character when a syntax does not specify any. */
+#define GENERAL_COMMENT_CHARACTER "#"
+
 /* The maximum number of search/replace history strings saved, not
  * counting the blank lines at their ends. */
 #define MAX_SEARCH_HISTORY 100

src/prompt.c

@@ -21,8 +21,6 @@
 
 #include "proto.h"
 
-#include <stdio.h>
-#include <stdarg.h>
 #include <string.h>
 
 static char *prompt = NULL;
@@ -50,7 +48,7 @@ int do_statusbar_input(bool *ran_func, bool *finished)
     *finished = FALSE;
 
     /* Read in a character. */
-    input = get_kbinput(bottomwin);
+    input = get_kbinput(bottomwin, VISIBLE);
 
 #ifndef NANO_TINY
     if (input == KEY_WINCH)
@@ -62,7 +60,7 @@ int do_statusbar_input(bool *ran_func, bool *finished)
      * shortcut character. */
     if (input == KEY_MOUSE) {
 	if (do_statusbar_mouse() == 1)
-	    input = get_kbinput(bottomwin);
+	    input = get_kbinput(bottomwin, BLIND);
 	else
 	    return ERR;
     }
@@ -124,9 +122,9 @@ int do_statusbar_input(bool *ran_func, bool *finished)
 	else if (s->scfunc == do_next_word_void)
 	    do_statusbar_next_word();
 #endif
-	else if (s->scfunc == do_home_void)
+	else if (s->scfunc == do_home)
 	    do_statusbar_home();
-	else if (s->scfunc == do_end_void)
+	else if (s->scfunc == do_end)
 	    do_statusbar_end();
 	/* When in restricted mode at the "Write File" prompt and the
 	 * filename isn't blank, disallow any input and deletion. */
@@ -137,15 +135,18 @@ int do_statusbar_input(bool *ran_func, bool *finished)
 				s->scfunc == do_delete ||
 				s->scfunc == do_backspace))
 	    ;
-	else if (s->scfunc == do_verbatim_input) {
+	else if (s->scfunc == do_verbatim_input)
 	    do_statusbar_verbatim_input();
-	} else if (s->scfunc == do_cut_text_void)
+	else if (s->scfunc == do_cut_text_void)
 	    do_statusbar_cut_text();
 	else if (s->scfunc == do_delete)
 	    do_statusbar_delete();
 	else if (s->scfunc == do_backspace)
 	    do_statusbar_backspace();
-	else {
+	else if (s->scfunc == do_uncut_text) {
+	    if (cutbuffer != NULL)
+		do_statusbar_uncut_text();
+	} else {
 	    /* Handle any other shortcut in the current menu, setting
 	     * ran_func to TRUE if we try to run their associated functions,
 	     * and setting finished to TRUE to indicatethat we're done after
@@ -291,7 +292,7 @@ void do_statusbar_delete(void)
 /* Zap some or all text from the answer. */
 void do_statusbar_cut_text(void)
 {
-    if (!ISSET(CUT_TO_END))
+    if (!ISSET(CUT_FROM_CURSOR))
 	statusbar_x = 0;
 
     answer[statusbar_x] = '\0';
@@ -363,6 +364,23 @@ size_t statusbar_xplustabs(void)
     return strnlenpt(answer, statusbar_x);
 }
 
+/* Paste the first line of the cutbuffer into the current answer. */
+void do_statusbar_uncut_text(void)
+{
+    size_t pastelen = strlen(cutbuffer->data);
+    char *fusion = charalloc(strlen(answer) + pastelen + 1);
+
+    /* Concatenate: the current answer before the cursor, the first line
+     * of the cutbuffer, plus the rest of the current answer. */
+    strncpy(fusion, answer, statusbar_x);
+    strncpy(fusion + statusbar_x, cutbuffer->data, pastelen);
+    strcpy(fusion + statusbar_x + pastelen, answer + statusbar_x);
+
+    free(answer);
+    answer = fusion;
+    statusbar_x += pastelen;
+}
+
 /* Return the column number of the first character of the answer that is
  * displayed in the statusbar when the cursor is at the given column,
  * with the available room for the answer starting at base.  Note that
@@ -411,8 +429,7 @@ void update_the_statusbar(void)
 
     /* Work around a cursor-misplacement bug in VTEs. */
     wmove(bottomwin, 0, 0);
-    wnoutrefresh(bottomwin);
-    doupdate();
+    wrefresh(bottomwin);
 
     /* Place the cursor at statusbar_x in the answer. */
     column = base + statusbar_xplustabs();
@@ -422,10 +439,7 @@ void update_the_statusbar(void)
 
 /* Get a string of input at the statusbar prompt. */
 functionptrtype acquire_an_answer(int *actual, bool allow_tabs,
-	bool allow_files, bool *listed,
-#ifndef DISABLE_HISTORIES
-	filestruct **history_list,
-#endif
+	bool allow_files, bool *listed, filestruct **history_list,
 	void (*refresh_func)(void))
 {
     int kbinput = ERR;
@@ -435,7 +449,7 @@ functionptrtype acquire_an_answer(int *actual, bool allow_tabs,
     bool tabbed = FALSE;
 	/* Whether we've pressed Tab. */
 #endif
-#ifndef DISABLE_HISTORIES
+#ifdef ENABLE_HISTORIES
     char *history = NULL;
 	/* The current history string. */
     char *magichistory = NULL;
@@ -448,21 +462,14 @@ functionptrtype acquire_an_answer(int *actual, bool allow_tabs,
 	/* The length of the original string that we're trying to
 	 * tab complete, if any. */
 #endif
-#endif /* !DISABLE_HISTORIES */
+#endif /* ENABLE_HISTORIES */
 
     if (statusbar_x > strlen(answer))
 	statusbar_x = strlen(answer);
 
-#ifdef DEBUG
-    fprintf(stderr, "acquiring: answer = \"%s\", statusbar_x = %lu\n", answer, (unsigned long) statusbar_x);
-#endif
-
     update_the_statusbar();
 
     while (TRUE) {
-	/* Ensure the cursor is shown when waiting for input. */
-	curs_set(1);
-
 	kbinput = do_statusbar_input(&ran_func, &finished);
 
 #ifndef NANO_TINY
@@ -470,7 +477,7 @@ functionptrtype acquire_an_answer(int *actual, bool allow_tabs,
 	if (kbinput == KEY_WINCH) {
 	    refresh_func();
 	    *actual = KEY_WINCH;
-#ifndef DISABLE_HISTORIES
+#ifdef ENABLE_HISTORIES
 	    free(magichistory);
 #endif
 	    return NULL;
@@ -487,7 +494,7 @@ functionptrtype acquire_an_answer(int *actual, bool allow_tabs,
 	    tabbed = FALSE;
 
 	if (func == do_tab) {
-#ifndef DISABLE_HISTORIES
+#ifdef ENABLE_HISTORIES
 	    if (history_list != NULL) {
 		if (last_kbinput != the_code_for(do_tab, TAB_CODE))
 		    complete_len = strlen(answer);
@@ -504,7 +511,7 @@ functionptrtype acquire_an_answer(int *actual, bool allow_tabs,
 					&tabbed, refresh_func, listed);
 	} else
 #endif /* ENABLE_TABCOMP */
-#ifndef DISABLE_HISTORIES
+#ifdef ENABLE_HISTORIES
 	if (func == get_history_older_void) {
 	    if (history_list != NULL) {
 		/* If we're scrolling up at the bottom of the history list
@@ -550,7 +557,7 @@ functionptrtype acquire_an_answer(int *actual, bool allow_tabs,
 		finished = FALSE;
 	    }
 	} else
-#endif /* !DISABLE_HISTORIES */
+#endif /* ENABLE_HISTORIES */
 	if (func == do_help_void) {
 	    /* This key has a shortcut-list entry when it's used to go to
 	     * the help browser or display a message indicating that help
@@ -567,12 +574,12 @@ functionptrtype acquire_an_answer(int *actual, bool allow_tabs,
 
 	update_the_statusbar();
 
-#if !defined(DISABLE_HISTORIES) && defined(ENABLE_TABCOMP)
+#if defined(ENABLE_HISTORIES) && defined(ENABLE_TABCOMP)
 	last_kbinput = kbinput;
 #endif
     }
 
-#ifndef DISABLE_HISTORIES
+#ifdef ENABLE_HISTORIES
     /* Set the current position in the history list to the bottom. */
     if (history_list != NULL) {
 	history_reset(*history_list);
@@ -597,10 +604,7 @@ functionptrtype acquire_an_answer(int *actual, bool allow_tabs,
  * interpreted.  The allow_files parameter indicates whether we should
  * allow all files (as opposed to just directories) to be tab completed. */
 int do_prompt(bool allow_tabs, bool allow_files,
-	int menu, const char *curranswer,
-#ifndef DISABLE_HISTORIES
-	filestruct **history_list,
-#endif
+	int menu, const char *curranswer, filestruct **history_list,
 	void (*refresh_func)(void), const char *msg, ...)
 {
     va_list ap;
@@ -626,11 +630,7 @@ int do_prompt(bool allow_tabs, bool allow_files,
     prompt[actual_x(prompt, (COLS < 5) ? 0 : COLS - 5)] = '\0';
 
     func = acquire_an_answer(&retval, allow_tabs, allow_files, &listed,
-#ifndef DISABLE_HISTORIES
-			history_list,
-#endif
-			refresh_func);
-
+				history_list, refresh_func);
     free(prompt);
     prompt = saved_prompt;
 
@@ -654,10 +654,6 @@ int do_prompt(bool allow_tabs, bool allow_files,
     blank_statusbar();
     wnoutrefresh(bottomwin);
 
-#ifdef DEBUG
-    fprintf(stderr, "answer = \"%s\"\n", answer);
-#endif
-
 #ifdef ENABLE_TABCOMP
     /* If we've done tab completion, there might still be a list of
      * filename matches on the edit window.  Clear them off. */
@@ -677,7 +673,7 @@ int do_yesno_prompt(bool all, const char *msg)
     char *message = display_string(msg, 0, COLS, FALSE);
 
     /* TRANSLATORS: For the next three strings, if possible, specify
-     * the single-byte shortcuts for both your language and English.
+     * the single-byte letters for both your language and English.
      * For example, in French: "OoYy", for both "Oui" and "Yes". */
     const char *yesstr = _("Yy");
     const char *nostr = _("Nn");
@@ -689,10 +685,9 @@ int do_yesno_prompt(bool all, const char *msg)
 
     while (response == -2) {
 	int kbinput;
-	functionptrtype func;
 
 	if (!ISSET(NO_HELP)) {
-	    char shortstr[3];
+	    char shortstr[MAXCHARLEN + 2];
 		/* Temporary string for (translated) " Y", " N" and " A". */
 
 	    if (COLS < 32)
@@ -704,20 +699,20 @@ int do_yesno_prompt(bool all, const char *msg)
 	    /* Now show the ones for "Yes", "No", "Cancel" and maybe "All". */
 	    sprintf(shortstr, " %c", yesstr[0]);
 	    wmove(bottomwin, 1, 0);
-	    onekey(shortstr, _("Yes"), width);
+	    post_one_key(shortstr, _("Yes"), width);
 
 	    if (all) {
 		shortstr[1] = allstr[0];
 		wmove(bottomwin, 1, width);
-		onekey(shortstr, _("All"), width);
+		post_one_key(shortstr, _("All"), width);
 	    }
 
 	    shortstr[1] = nostr[0];
 	    wmove(bottomwin, 2, 0);
-	    onekey(shortstr, _("No"), width);
+	    post_one_key(shortstr, _("No"), width);
 
 	    wmove(bottomwin, 2, width);
-	    onekey("^C", _("Cancel"), width);
+	    post_one_key("^C", _("Cancel"), width);
 	}
 
 	/* Color the statusbar over its full width and display the question. */
@@ -727,17 +722,19 @@ int do_yesno_prompt(bool all, const char *msg)
 	wattroff(bottomwin, interface_color_pair[TITLE_BAR]);
 
 	wnoutrefresh(bottomwin);
-
-	/* When not replacing, show the cursor. */
-	if (!all)
-	    curs_set(1);
-
 	currmenu = MYESNO;
-	kbinput = get_kbinput(bottomwin);
 
-	func = func_from_key(&kbinput);
+	/* When not replacing, show the cursor while waiting for a key. */
+	kbinput = get_kbinput(bottomwin, !all);
 
-	if (func == do_cancel)
+	/* See if the pressed key is in the Yes, No, or All strings. */
+	if (strchr(yesstr, kbinput) != NULL)
+	    response = 1;
+	else if (strchr(nostr, kbinput) != NULL)
+	    response = 0;
+	else if (all && strchr(allstr, kbinput) != NULL)
+	    response = 2;
+	else if (func_from_key(&kbinput) == do_cancel)
 	    response = -1;
 #ifdef ENABLE_MOUSE
 	else if (kbinput == KEY_MOUSE) {
@@ -747,14 +744,9 @@ int do_yesno_prompt(bool all, const char *msg)
 			wmouse_trafo(bottomwin, &mouse_y, &mouse_x, FALSE) &&
 			mouse_x < (width * 2) && mouse_y > 0) {
 		int x = mouse_x / width;
-			/* The x-coordinate among the Yes/No/All shortcuts. */
 		int y = mouse_y - 1;
-			/* The y-coordinate among the Yes/No/All shortcuts. */
 
-		assert(0 <= x && x <= 1 && 0 <= y && y <= 1);
-
-		/* x == 0 means they clicked Yes or No.
-		 * y == 0 means Yes or All. */
+		/* x == 0 means Yes or No, y == 0 means Yes or All. */
 		response = -2 * x * y + x - y + 1;
 
 		if (response == 2 && !all)
@@ -762,15 +754,6 @@ int do_yesno_prompt(bool all, const char *msg)
 	    }
 	}
 #endif /* ENABLE_MOUSE */
-	else {
-	    /* Look for the kbinput in the Yes, No (and All) strings. */
-	    if (strchr(yesstr, kbinput) != NULL)
-		response = 1;
-	    else if (strchr(nostr, kbinput) != NULL)
-		response = 0;
-	    else if (all && strchr(allstr, kbinput) != NULL)
-		response = 2;
-	}
     }
 
     free(message);

src/proto.h

@@ -43,9 +43,7 @@ extern bool as_an_at;
 extern int margin;
 extern int editwincols;
 
-#ifndef DISABLE_COLOR
-extern bool have_palette;
-#endif
+extern bool suppress_cursorpos;
 
 extern message_type lastmessage;
 
@@ -54,6 +52,8 @@ extern filestruct *pletion_line;
 extern bool inhelp;
 extern char *title;
 
+extern bool more_than_one;
+
 extern int didfind;
 
 extern int controlleft;
@@ -69,13 +69,17 @@ extern int shiftcontrolup;
 extern int shiftcontroldown;
 extern int shiftcontrolhome;
 extern int shiftcontrolend;
+extern int altleft;
+extern int altright;
+extern int altup;
+extern int altdown;
 extern int shiftaltleft;
 extern int shiftaltright;
 extern int shiftaltup;
 extern int shiftaltdown;
 #endif
 
-#ifndef DISABLE_WRAPJUSTIFY
+#ifdef ENABLED_WRAPORJUSTIFY
 extern ssize_t fill;
 extern ssize_t wrap_at;
 #endif
@@ -94,12 +98,10 @@ extern filestruct *cutbuffer;
 extern filestruct *cutbottom;
 extern partition *filepart;
 extern openfilestruct *openfile;
+extern openfilestruct *firstfile;
 
 #ifndef NANO_TINY
 extern char *matchbrackets;
-#endif
-
-#ifndef NANO_TINY
 extern char *whitespace;
 extern int whitespace_len[2];
 #endif
@@ -107,7 +109,7 @@ extern int whitespace_len[2];
 extern const char *exit_tag;
 extern const char *close_tag;
 extern const char *uncut_tag;
-#ifndef DISABLE_JUSTIFY
+#ifdef ENABLE_JUSTIFY
 extern const char *unjust_tag;
 extern char *punct;
 extern char *brackets;
@@ -115,12 +117,10 @@ extern char *quotestr;
 extern regex_t quotereg;
 extern int quoterc;
 extern char *quoteerr;
-#endif /* !DISABLE_JUSTIFY */
+#endif
 
 extern char *word_chars;
 
-extern bool nodelay_mode;
-
 extern char *answer;
 
 extern ssize_t tabsize;
@@ -130,18 +130,18 @@ extern char *backup_dir;
 extern const char *locking_prefix;
 extern const char *locking_suffix;
 #endif
-#ifndef DISABLE_OPERATINGDIR
+#ifdef ENABLE_OPERATINGDIR
 extern char *operating_dir;
-extern char *full_operating_dir;
 #endif
 
-#ifndef DISABLE_SPELLER
+#ifdef ENABLE_SPELLER
 extern char *alt_speller;
 #endif
 
-#ifndef DISABLE_COLOR
+#ifdef ENABLE_COLOR
 extern syntaxtype *syntaxes;
 extern char *syntaxstr;
+extern bool have_palette;
 #endif
 
 extern bool refresh_needed;
@@ -152,13 +152,16 @@ extern subnfunc *allfuncs;
 extern subnfunc *exitfunc;
 extern subnfunc *uncutfunc;
 
-#ifndef DISABLE_HISTORIES
 extern filestruct *search_history;
-extern filestruct *searchage;
-extern filestruct *searchbot;
 extern filestruct *replace_history;
-extern filestruct *replaceage;
+extern filestruct *execute_history;
+#ifdef ENABLE_HISTORIES
+extern filestruct *searchtop;
+extern filestruct *searchbot;
+extern filestruct *replacetop;
 extern filestruct *replacebot;
+extern filestruct *executetop;
+extern filestruct *executebot;
 extern poshiststruct *position_history;
 #endif
 
@@ -166,12 +169,14 @@ extern regex_t search_regexp;
 extern regmatch_t regmatches[10];
 
 extern int hilite_attribute;
-#ifndef DISABLE_COLOR
+#ifdef ENABLE_COLOR
 extern char* specified_color_combo[NUMBER_OF_ELEMENTS];
 #endif
 extern int interface_color_pair[NUMBER_OF_ELEMENTS];
 
 extern char *homedir;
+extern char *statedir;
+extern char *rcfile_with_errors;
 
 typedef void (*functionptrtype)(void);
 
@@ -183,7 +188,7 @@ functionptrtype parse_browser_input(int *kbinput);
 void browser_refresh(void);
 void browser_select_dirname(const char *needle);
 void do_filesearch(void);
-void do_fileresearch(void);
+void do_fileresearch(bool forwards);
 void do_first_file(void);
 void do_last_file(void);
 char *strip_last_component(const char *path);
@@ -217,7 +222,7 @@ char *mbrevstrcasestr(const char *haystack, const char *needle,
 	const char *index);
 size_t mbstrlen(const char *s);
 size_t mbstrnlen(const char *s, size_t maxlen);
-#if !defined(NANO_TINY) || !defined(DISABLE_JUSTIFY)
+#if !defined(NANO_TINY) || defined(ENABLE_JUSTIFY)
 char *mbstrchr(const char *s, const char *c);
 #endif
 #ifndef NANO_TINY
@@ -225,7 +230,7 @@ char *mbstrpbrk(const char *s, const char *accept);
 char *revstrpbrk(const char *head, const char *accept, const char *index);
 char *mbrevstrpbrk(const char *head, const char *accept, const char *index);
 #endif
-#if defined(ENABLE_NANORC) && (!defined(NANO_TINY) || !defined(DISABLE_JUSTIFY))
+#if defined(ENABLE_NANORC) && (!defined(NANO_TINY) || defined(ENABLE_JUSTIFY))
 bool has_blank_mbchars(const char *s);
 #endif
 #ifdef ENABLE_UTF8
@@ -236,7 +241,7 @@ bool is_valid_mbstring(const char *s);
 #endif
 
 /* Most functions in color.c. */
-#ifndef DISABLE_COLOR
+#ifdef ENABLE_COLOR
 void set_colorpairs(void);
 void color_init(void);
 void color_update(void);
@@ -262,7 +267,7 @@ void do_uncut_text(void);
 /* Most functions in files.c. */
 void initialize_buffer_text(void);
 bool open_buffer(const char *filename, bool undoable);
-#ifndef DISABLE_SPELLER
+#ifdef ENABLE_SPELLER
 void replace_buffer(const char *filename);
 #ifndef NANO_TINY
 void replace_marked_buffer(const char *filename, filestruct *top, size_t top_x,
@@ -271,8 +276,8 @@ void replace_marked_buffer(const char *filename, filestruct *top, size_t top_x,
 #endif
 void prepare_for_display(void);
 #ifdef ENABLE_MULTIBUFFER
-void switch_to_prev_buffer_void(void);
-void switch_to_next_buffer_void(void);
+void switch_to_prev_buffer(void);
+void switch_to_next_buffer(void);
 bool close_buffer(void);
 #endif
 void read_file(FILE *f, int fd, const char *filename, bool undoable,
@@ -282,9 +287,9 @@ char *get_next_filename(const char *name, const char *suffix);
 void do_insertfile_void(void);
 char *get_full_path(const char *origpath);
 char *safe_tempfile(FILE **f);
-#ifndef DISABLE_OPERATINGDIR
+#ifdef ENABLE_OPERATINGDIR
 void init_operating_dir(void);
-bool check_operating_dir(const char *currpath, bool allow_tabcomp);
+bool outside_of_confinement(const char *currpath, bool allow_tabcomp);
 #endif
 #ifndef NANO_TINY
 void init_backup_dir(void);
@@ -298,40 +303,28 @@ bool write_file(const char *name, FILE *f_open, bool tmp,
 bool write_marked_file(const char *name, FILE *f_open, bool tmp,
 	kind_of_writing_type method);
 #endif
-int do_writeout(bool exiting);
+int do_writeout(bool exiting, bool withprompt);
 void do_writeout_void(void);
-#ifndef NANO_TINY
 void do_savefile(void);
-#endif
 char *real_dir_from_tilde(const char *buf);
 #if defined(ENABLE_TABCOMP) || defined(ENABLE_BROWSER)
 int diralphasort(const void *va, const void *vb);
-void free_chararray(char **array, size_t len);
 #endif
 #ifdef ENABLE_TABCOMP
 char *input_tab(char *buf, bool allow_files, size_t *place,
 	bool *lastwastab, void (*refresh_func)(void), bool *listed);
 #endif
-const char *tail(const char *path);
-#ifndef DISABLE_HISTORIES
-void load_history(void);
-void save_history(void);
-int check_dotnano(void);
-void load_poshistory(void);
-void save_poshistory(void);
-void update_poshistory(char *filename, ssize_t lineno, ssize_t xpos);
-bool has_old_position(const char *file, ssize_t *line, ssize_t *column);
-#endif
 
 /* Some functions in global.c. */
 size_t length_of_list(int menu);
 const sc *first_sc_for(int menu, void (*func)(void));
 int the_code_for(void (*func)(void), int defaultval);
 functionptrtype func_from_key(int *kbinput);
+int keycode_from_string(const char *keystring);
 void assign_keyinfo(sc *s, const char *keystring, const int keycode);
 void print_sclist(void);
 void shortcut_init(void);
-#ifndef DISABLE_COLOR
+#ifdef ENABLE_COLOR
 void set_lint_or_format_shortcuts(void);
 void set_spell_shortcuts(void);
 #endif
@@ -353,30 +346,48 @@ size_t help_line_len(const char *ptr);
 #endif
 void do_help_void(void);
 
-/* All functions in move.c. */
+/* Most functions in history.c. */
+#ifdef ENABLE_HISTORIES
+void history_init(void);
+void history_reset(const filestruct *h);
+void update_history(filestruct **h, const char *s);
+char *get_history_older(filestruct **h);
+char *get_history_newer(filestruct **h);
+void get_history_older_void(void);
+void get_history_newer_void(void);
+#ifdef ENABLE_TABCOMP
+char *get_history_completion(filestruct **h, char *s, size_t len);
+#endif
+bool have_statedir(void);
+void load_history(void);
+void save_history(void);
+void load_poshistory(void);
+void update_poshistory(char *filename, ssize_t lineno, ssize_t xpos);
+bool has_old_position(const char *file, ssize_t *line, ssize_t *column);
+#endif
+
+/* Most functions in move.c. */
 void do_first_line(void);
 void do_last_line(void);
 void do_page_up(void);
 void do_page_down(void);
-#ifndef DISABLE_JUSTIFY
+#ifdef ENABLE_JUSTIFY
 void do_para_begin(bool update_screen);
-void do_para_begin_void(void);
 void do_para_end(bool update_screen);
+void do_para_begin_void(void);
 void do_para_end_void(void);
 #endif
 void do_prev_block(void);
 void do_next_block(void);
 void do_prev_word(bool allow_punct, bool update_screen);
-void do_prev_word_void(void);
 bool do_next_word(bool allow_punct, bool update_screen);
+void do_prev_word_void(void);
 void do_next_word_void(void);
-void do_home(bool be_clever);
-void do_home_void(void);
-void do_end(bool be_clever);
-void do_end_void(void);
+void do_home(void);
+void do_end(void);
 void do_up(bool scroll_only);
-void do_up_void(void);
 void do_down(bool scroll_only);
+void do_up_void(void);
 void do_down_void(void);
 #ifndef NANO_TINY
 void do_scroll_up(void);
@@ -448,6 +459,7 @@ void do_statusbar_right(void);
 void do_statusbar_backspace(void);
 void do_statusbar_delete(void);
 void do_statusbar_cut_text(void);
+void do_statusbar_uncut_text(void);
 #ifndef NANO_TINY
 void do_statusbar_prev_word(void);
 void do_statusbar_next_word(void);
@@ -458,16 +470,13 @@ size_t get_statusbar_page_start(size_t start_col, size_t column);
 void reinit_statusbar_x(void);
 void update_the_statusbar(void);
 int do_prompt(bool allow_tabs, bool allow_files,
-	int menu, const char *curranswer,
-#ifndef DISABLE_HISTORIES
-	filestruct **history_list,
-#endif
+	int menu, const char *curranswer, filestruct **history_list,
 	void (*refresh_func)(void), const char *msg, ...);
 int do_yesno_prompt(bool all, const char *msg);
 
 /* Most functions in rcfile.c. */
 #ifdef ENABLE_NANORC
-#ifndef DISABLE_COLOR
+#ifdef ENABLE_COLOR
 bool parse_color_names(char *combostr, short *fg, short *bg, bool *bright);
 void grab_and_store(const char *kind, char *ptr, regexlisttype **storage);
 #endif
@@ -478,9 +487,11 @@ void do_rcfiles(void);
 /* Most functions in search.c. */
 void not_found_msg(const char *str);
 void search_replace_abort(void);
-int findnextstr(const char *needle, bool whole_word_only, bool have_region,
+int findnextstr(const char *needle, bool whole_word_only, int modus,
 	size_t *match_len, bool skipone, const filestruct *begin, size_t begin_x);
 void do_search(void);
+void do_search_forward(void);
+void do_search_backward(void);
 #ifndef NANO_TINY
 void do_findprevious(void);
 void do_findnext(void);
@@ -496,19 +507,6 @@ void do_gotolinecolumn(ssize_t line, ssize_t column, bool use_answer,
 void do_gotolinecolumn_void(void);
 #ifndef NANO_TINY
 void do_find_bracket(void);
-#ifdef ENABLE_TABCOMP
-char *get_history_completion(filestruct **h, char *s, size_t len);
-#endif
-#endif
-#ifndef DISABLE_HISTORIES
-bool history_has_changed(void);
-void history_init(void);
-void history_reset(const filestruct *h);
-void update_history(filestruct **h, const char *s);
-char *get_history_older(filestruct **h);
-char *get_history_newer(filestruct **h);
-void get_history_older_void(void);
-void get_history_newer_void(void);
 #endif
 
 /* Most functions in text.c. */
@@ -523,8 +521,7 @@ void do_cut_next_word(void);
 #endif
 void do_tab(void);
 #ifndef NANO_TINY
-void do_indent(ssize_t cols);
-void do_indent_void(void);
+void do_indent(void);
 void do_unindent(void);
 #endif
 bool white_string(const char *s);
@@ -538,24 +535,22 @@ void do_enter(void);
 #ifndef NANO_TINY
 RETSIGTYPE cancel_command(int signal);
 bool execute_command(const char *command);
-void discard_until(const undo *thisitem, openfilestruct *thefile);
+void discard_until(const undo *thisitem, openfilestruct *thefile, bool keep);
 void add_undo(undo_type action);
-#ifndef DISABLE_COMMENT
-void update_comment_undo(ssize_t lineno);
-#endif
+void update_multiline_undo(ssize_t lineno, char *indentation);
 void update_undo(undo_type action);
 #endif /* !NANO_TINY */
-#ifndef DISABLE_WRAPPING
+#ifdef ENABLE_WRAPPING
 void wrap_reset(void);
 bool do_wrap(filestruct *line);
 #endif
-#if defined(ENABLE_HELP) || !defined(DISABLE_WRAPJUSTIFY)
+#if defined(ENABLE_HELP) || defined(ENABLED_WRAPORJUSTIFY)
 ssize_t break_line(const char *line, ssize_t goal, bool snap_at_nl);
 #endif
-#if !defined(NANO_TINY) || !defined(DISABLE_JUSTIFY)
+#if !defined(NANO_TINY) || defined(ENABLE_JUSTIFY)
 size_t indent_length(const char *line);
 #endif
-#ifndef DISABLE_JUSTIFY
+#ifdef ENABLE_JUSTIFY
 void justify_format(filestruct *paragraph, size_t skip);
 bool begpar(const filestruct *const foo);
 bool inpar(const filestruct *const foo);
@@ -563,10 +558,10 @@ void do_justify(bool full_justify);
 void do_justify_void(void);
 void do_full_justify(void);
 #endif
-#ifndef DISABLE_SPELLER
+#ifdef ENABLE_SPELLER
 void do_spell(void);
 #endif
-#ifndef DISABLE_COLOR
+#ifdef ENABLE_COLOR
 void do_linter(void);
 void do_formatter(void);
 #endif
@@ -578,6 +573,8 @@ void complete_a_word(void);
 
 /* All functions in utils.c. */
 void get_homedir(void);
+const char *tail(const char *path);
+char *concatenate(const char *path, const char *name);
 #ifdef ENABLE_LINENUMBERS
 int digits(ssize_t n);
 #endif
@@ -587,8 +584,11 @@ void snuggly_fit(char **str);
 void null_at(char **data, size_t index);
 void unsunder(char *str, size_t true_len);
 void sunder(char *str);
+#if !defined(ENABLE_TINY) || defined(ENABLE_TABCOMP) || defined(ENABLE_BROWSER)
+void free_chararray(char **array, size_t len);
+#endif
 const char *fixbounds(const char *r);
-#ifndef DISABLE_SPELLER
+#ifdef ENABLE_SPELLER
 bool is_separate_word(size_t position, size_t length, const char *buf);
 #endif
 const char *strstrwrapper(const char *haystack, const char *needle,
@@ -601,9 +601,9 @@ char *mallocstrcpy(char *dest, const char *src);
 char *free_and_assign(char *dest, char *src);
 size_t get_page_start(size_t column);
 size_t xplustabs(void);
-size_t actual_x(const char *s, size_t column);
-size_t strnlenpt(const char *s, size_t maxlen);
-size_t strlenpt(const char *s);
+size_t actual_x(const char *text, size_t column);
+size_t strnlenpt(const char *text, size_t maxlen);
+size_t strlenpt(const char *text);
 void new_magicline(void);
 #if !defined(NANO_TINY) || defined(ENABLE_HELP)
 void remove_magicline(void);
@@ -622,10 +622,12 @@ void dump_filestruct_reverse(void);
 #endif
 
 /* Most functions in winio.c. */
+void record_macro(void);
+void run_macro(void);
 void get_key_buffer(WINDOW *win);
 size_t get_key_buffer_len(void);
 void unget_kbinput(int kbinput, bool metakey);
-int get_kbinput(WINDOW *win);
+int get_kbinput(WINDOW *win, bool showcursor);
 int parse_kbinput(WINDOW *win);
 int arrow_from_abcd(int kbinput);
 int parse_escape_sequence(WINDOW *win, int kbinput);
@@ -649,8 +651,8 @@ void statusbar(const char *msg);
 void warn_and_shortly_pause(const char *msg);
 void statusline(message_type importance, const char *msg, ...);
 void bottombars(int menu);
-void onekey(const char *keystroke, const char *desc, int length);
-void place_the_cursor(bool forreal);
+void post_one_key(const char *keystroke, const char *tag, int width);
+void place_the_cursor(void);
 void edit_draw(filestruct *fileptr, const char *converted,
 	int line, size_t from_col);
 int update_line(filestruct *fileptr, size_t index);
@@ -661,11 +663,18 @@ bool line_needs_update(const size_t old_column, const size_t new_column);
 int go_back_chunks(int nrows, filestruct **line, size_t *leftedge);
 int go_forward_chunks(int nrows, filestruct **line, size_t *leftedge);
 bool less_than_a_screenful(size_t was_lineno, size_t was_leftedge);
-void edit_scroll(scroll_dir direction, int nrows);
+void edit_scroll(bool direction, int nrows);
 #ifndef NANO_TINY
+size_t get_softwrap_breakpoint(const char *text, size_t leftedge,
+				bool *end_of_line);
+size_t get_chunk_and_edge(size_t column, filestruct *line, size_t *leftedge);
+size_t chunk_for(size_t column, filestruct *line);
+size_t leftedge_for(size_t column, filestruct *line);
+size_t number_of_chunks_in(filestruct *line);
 void ensure_firstcolumn_is_aligned(void);
 #endif
-void edit_redraw(filestruct *old_current);
+size_t actual_last_column(size_t leftedge, size_t column);
+void edit_redraw(filestruct *old_current, update_type manner);
 void edit_refresh(void);
 void adjust_viewport(update_type location);
 void total_redraw(void);
@@ -673,13 +682,14 @@ void total_refresh(void);
 void display_main_list(void);
 void do_cursorpos(bool force);
 void do_cursorpos_void(void);
-void spotlight(bool active, const char *word);
-void xon_complaint(void);
-void xoff_complaint(void);
+void spotlight(bool active, size_t from_col, size_t to_col);
+#ifndef NANO_TINY
+void spotlight_softwrapped(bool active, size_t from_col, size_t to_col);
+#endif
 void do_suspend_void(void);
-void enable_nodelay(void);
-void disable_nodelay(void);
-#ifndef DISABLE_EXTRA
+void disable_waiting(void);
+void enable_waiting(void);
+#ifdef ENABLE_EXTRA
 void do_credits(void);
 #endif
 

src/rcfile.c

@@ -3,7 +3,7 @@
  *                                                                        *
  *   Copyright (C) 2001-2011, 2013-2017 Free Software Foundation, Inc.    *
  *   Copyright (C) 2014 Mike Frysinger                                    *
- *   Copyright (C) 2014, 2015, 2016 Benno Schulenberg                     *
+ *   Copyright (C) 2014-2017 Benno Schulenberg                            *
  *                                                                        *
  *   GNU nano is free software: you can redistribute it and/or modify     *
  *   it under the terms of the GNU General Public License as published    *
@@ -22,18 +22,16 @@
 
 #include "proto.h"
 
-#include <glob.h>
-#include <stdarg.h>
-#include <string.h>
-#include <stdio.h>
-#include <errno.h>
-#include <unistd.h>
 #include <ctype.h>
+#include <errno.h>
+#include <glob.h>
+#include <string.h>
+#include <unistd.h>
 
 #ifdef ENABLE_NANORC
 
 #ifndef RCFILE_NAME
-#define RCFILE_NAME ".nanorc"
+#define RCFILE_NAME "nanorc"
 #endif
 
 static const rcoption rcopts[] = {
@@ -41,15 +39,15 @@ static const rcoption rcopts[] = {
 #ifdef ENABLE_LINENUMBERS
     {"linenumbers", LINE_NUMBERS},
 #endif
-#ifndef DISABLE_JUSTIFY
+#ifdef ENABLE_JUSTIFY
     {"brackets", 0},
 #endif
     {"const", CONSTANT_SHOW},  /* deprecated form, remove in 2018 */
     {"constantshow", CONSTANT_SHOW},
-#ifndef DISABLE_WRAPJUSTIFY
+#ifdef ENABLED_WRAPORJUSTIFY
     {"fill", 0},
 #endif
-#ifndef DISABLE_HISTORIES
+#ifdef ENABLE_HISTORIES
     {"historylog", HISTORYLOG},
 #endif
     {"morespace", MORE_SPACE},
@@ -62,18 +60,18 @@ static const rcoption rcopts[] = {
     {"nohelp", NO_HELP},
     {"nonewlines", NO_NEWLINES},
     {"nopauses", NO_PAUSES},
-#ifndef DISABLE_WRAPPING
+#ifdef ENABLE_WRAPPING
     {"nowrap", NO_WRAP},
 #endif
-#ifndef DISABLE_OPERATINGDIR
+#ifdef ENABLE_OPERATINGDIR
     {"operatingdir", 0},
 #endif
-#ifndef DISABLE_HISTORIES
+#ifdef ENABLE_HISTORIES
     {"poslog", POS_HISTORY},  /* deprecated form, remove in 2018 */
     {"positionlog", POS_HISTORY},
 #endif
     {"preserve", PRESERVE},
-#ifndef DISABLE_JUSTIFY
+#ifdef ENABLE_JUSTIFY
     {"punct", 0},
     {"quotestr", 0},
 #endif
@@ -81,7 +79,7 @@ static const rcoption rcopts[] = {
     {"rebinddelete", REBIND_DELETE},
     {"rebindkeypad", REBIND_KEYPAD},
     {"regexp", USE_REGEXP},
-#ifndef DISABLE_SPELLER
+#ifdef ENABLE_SPELLER
     {"speller", 0},
 #endif
     {"suspend", SUSPEND},
@@ -90,12 +88,14 @@ static const rcoption rcopts[] = {
     {"view", VIEW_MODE},
 #ifndef NANO_TINY
     {"allow_insecure_backup", INSECURE_BACKUP},
+    {"atblanks", AT_BLANKS},
     {"autoindent", AUTOINDENT},
     {"backup", BACKUP_FILE},
     {"backupdir", 0},
     {"backwards", BACKWARDS_SEARCH},
     {"casesensitive", CASE_SENSITIVE},
-    {"cut", CUT_TO_END},
+    {"cut", CUT_FROM_CURSOR},  /* deprecated form, remove in 2020 */
+    {"cutfromcursor", CUT_FROM_CURSOR},
     {"justifytrim", JUSTIFY_TRIM},
     {"locking", LOCKING},
     {"matchbrackets", 0},
@@ -111,9 +111,10 @@ static const rcoption rcopts[] = {
     {"wordbounds", WORD_BOUNDS},
     {"wordchars", 0},
 #endif
-#ifndef DISABLE_COLOR
+#ifdef ENABLE_COLOR
     {"titlecolor", 0},
     {"numbercolor", 0},
+    {"selectedcolor", 0},
     {"statuscolor", 0},
     {"keycolor", 0},
     {"functioncolor", 0},
@@ -121,13 +122,11 @@ static const rcoption rcopts[] = {
     {NULL, 0}
 };
 
-static bool errors = FALSE;
-	/* Whether we got any errors while parsing an rcfile. */
 static size_t lineno = 0;
-	/* If we did, the line number where the last error occurred. */
+	/* The line number of the last encountered error. */
 static char *nanorc = NULL;
 	/* The path to the rcfile we're parsing. */
-#ifndef DISABLE_COLOR
+#ifdef ENABLE_COLOR
 static bool opensyntax = FALSE;
 	/* Whether we're allowed to add to the last syntax.  When a file ends,
 	 * or when a new syntax command is seen, this bool becomes FALSE. */
@@ -137,21 +136,16 @@ static colortype *lastcolor = NULL;
 	/* The end of the color list for the current syntax. */
 #endif
 
-/* We have an error in some part of the rcfile.  Print the error message
- * on stderr, and then make the user hit Enter to continue starting
- * nano. */
+/* Report an error in an rcfile, printing it to stderr. */
 void rcfile_error(const char *msg, ...)
 {
     va_list ap;
 
-    if (ISSET(QUIET))
-	return;
+    if (rcfile_with_errors == NULL)
+	rcfile_with_errors = strdup(nanorc);
 
-    fprintf(stderr, "\n");
-    if (lineno > 0) {
-	errors = TRUE;
+    if (lineno > 0)
 	fprintf(stderr, _("Error in %s on line %lu: "), nanorc, (unsigned long)lineno);
-    }
 
     va_start(ap, msg);
     vfprintf(stderr, _(msg), ap);
@@ -161,7 +155,7 @@ void rcfile_error(const char *msg, ...)
 }
 #endif /* ENABLE_NANORC */
 
-#if defined(ENABLE_NANORC) || !defined(DISABLE_HISTORIES)
+#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. */
@@ -181,7 +175,7 @@ char *parse_next_word(char *ptr)
 
     return ptr;
 }
-#endif /* ENABLE_NANORC || !DISABLE_HISTORIES */
+#endif /* ENABLE_NANORC || ENABLE_HISTORIES */
 
 #ifdef ENABLE_NANORC
 /* Parse an argument, with optional quotes, after a keyword that takes
@@ -220,7 +214,7 @@ char *parse_argument(char *ptr)
     return ptr;
 }
 
-#ifndef DISABLE_COLOR
+#ifdef ENABLE_COLOR
 /* Pass over the current regex string in the line starting at ptr,
  * null-terminate it, and return a pointer to the /next/ word. */
 char *parse_next_regex(char *ptr)
@@ -315,7 +309,9 @@ void parse_syntax(char *ptr)
     live_syntax->magics = NULL;
     live_syntax->linter = NULL;
     live_syntax->formatter = NULL;
-    live_syntax->comment = NULL;
+#ifdef ENABLE_COMMENT
+    live_syntax->comment = mallocstrcpy(NULL, GENERAL_COMMENT_CHARACTER);
+#endif
     live_syntax->color = NULL;
     lastcolor = NULL;
     live_syntax->nmultis = 0;
@@ -341,19 +337,21 @@ void parse_syntax(char *ptr)
     if (*ptr != '\0')
 	grab_and_store("extension", ptr, &live_syntax->extensions);
 }
-#endif /* !DISABLE_COLOR */
+#endif /* ENABLE_COLOR */
 
 /* Check whether the given executable function is "universal" (meaning
  * any horizontal movement or deletion) and thus is present in almost
  * all menus. */
-bool is_universal(void (*func))
+bool is_universal(void (*func)(void))
 {
     if (func == do_left || func == do_right ||
-	func == do_home_void || func == do_end_void ||
+	func == do_home || func == do_end ||
+#ifndef NANO_TINY
 	func == do_prev_word_void || func == do_next_word_void ||
-	func == do_verbatim_input || func == do_cut_text_void ||
+#endif
 	func == do_delete || func == do_backspace ||
-	func == do_tab || func == do_enter)
+	func == do_cut_text_void || func == do_uncut_text ||
+	func == do_tab || func == do_enter || func == do_verbatim_input)
 	return TRUE;
     else
 	return FALSE;
@@ -383,7 +381,7 @@ void parse_binding(char *ptr, bool dobind)
 
     if (strlen(keycopy) < 2) {
 	rcfile_error(N_("Key name is too short"));
-	goto free_copy;
+	goto free_things;
     }
 
     /* Uppercase only the first two or three characters of the key name. */
@@ -394,7 +392,7 @@ void parse_binding(char *ptr, bool dobind)
 	    keycopy[2] = toupper((unsigned char)keycopy[2]);
 	else {
 	    rcfile_error(N_("Key name is too short"));
-	    goto free_copy;
+	    goto free_things;
 	}
     }
 
@@ -404,15 +402,10 @@ void parse_binding(char *ptr, bool dobind)
 	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\""));
-	goto free_copy;
-    } else if ((keycopy[0] == 'M' && keycopy[1] != '-') ||
-		(keycopy[0] == '^' && ((keycopy[1] < 'A' || keycopy[1] > 'z') ||
-		keycopy[1] == '[' || keycopy[1] == '`' ||
-		(strlen(keycopy) > 2 && strcmp(keycopy, "^Space") != 0))) ||
-		(strlen(keycopy) > 3 && strcmp(keycopy, "^Space") != 0 &&
-		strcmp(keycopy, "M-Space") != 0)) {
+	goto free_things;
+    } else if (keycode_from_string(keycopy) < 0) {
 	rcfile_error(N_("Key name %s is invalid"), keycopy);
-	goto free_copy;
+	goto free_things;
     }
 
     if (dobind) {
@@ -421,7 +414,7 @@ void parse_binding(char *ptr, bool dobind)
 
 	if (funcptr[0] == '\0') {
 	    rcfile_error(N_("Must specify a function to bind the key to"));
-	    goto free_copy;
+	    goto free_things;
 	}
     }
 
@@ -431,31 +424,23 @@ 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"));
-	goto free_copy;
+	goto free_things;
     }
 
     if (dobind) {
 	newsc = strtosc(funcptr);
 	if (newsc == NULL) {
 	    rcfile_error(N_("Cannot map name \"%s\" to a function"), funcptr);
-	    goto free_copy;
+	    goto free_things;
 	}
     }
 
     menu = strtomenu(menuptr);
     if (menu < 1) {
 	rcfile_error(N_("Cannot map name \"%s\" to a menu"), menuptr);
-	goto free_copy;
+	goto free_things;
     }
 
-#ifdef DEBUG
-    if (dobind)
-	fprintf(stderr, "newsc address is now %ld, assigned func = %ld, menu = %x\n",
-	    (long)&newsc, (long)newsc->scfunc, menu);
-    else
-	fprintf(stderr, "unbinding \"%s\" from menu %x\n", keycopy, menu);
-#endif
-
     if (dobind) {
 	subnfunc *f;
 	int mask = 0;
@@ -479,8 +464,7 @@ void parse_binding(char *ptr, bool dobind)
 
 	if (!menu) {
 	    rcfile_error(N_("Function '%s' does not exist in menu '%s'"), funcptr, menuptr);
-	    free(newsc);
-	    goto free_copy;
+	    goto free_things;
 	}
 
 	newsc->menus = menu;
@@ -489,23 +473,14 @@ void parse_binding(char *ptr, bool dobind)
 	/* Do not allow rebinding a frequent escape-sequence starter: Esc [. */
 	if (newsc->meta && newsc->keycode == 91) {
 	    rcfile_error(N_("Sorry, keystroke \"%s\" may not be rebound"), newsc->keystr);
-	    free(newsc);
-	    goto free_copy;
+	    goto free_things;
 	}
-#ifdef DEBUG
-	fprintf(stderr, "s->keystr = \"%s\"\n", newsc->keystr);
-	fprintf(stderr, "s->keycode = \"%d\"\n", newsc->keycode);
-#endif
     }
 
     /* Now find and delete any existing same shortcut in the menu(s). */
     for (s = sclist; s != NULL; s = s->next) {
-	if ((s->menus & menu) && !strcmp(s->keystr, keycopy)) {
-#ifdef DEBUG
-	    fprintf(stderr, "deleting entry from among menus %x\n", s->menus);
-#endif
+	if ((s->menus & menu) && !strcmp(s->keystr, keycopy))
 	    s->menus &= ~menu;
-	}
     }
 
     if (dobind) {
@@ -524,15 +499,20 @@ void parse_binding(char *ptr, bool dobind)
 	return;
     }
 
-  free_copy:
+  free_things:
+    free(newsc);
     free(keycopy);
 }
 
-/* Verify that the given file is not a folder nor a device. */
+/* Verify that the given file exists, is not a folder nor a device. */
 bool is_good_file(char *file)
 {
     struct stat rcinfo;
 
+    /* First check that the file exists and is readable. */
+    if (access(file, R_OK) != 0)
+	return FALSE;
+
     /* If the thing exists, it may not be 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))) {
@@ -543,7 +523,7 @@ bool is_good_file(char *file)
 	return TRUE;
 }
 
-#ifndef DISABLE_COLOR
+#ifdef ENABLE_COLOR
 /* Read and parse one included syntax file. */
 static void parse_one_include(char *file)
 {
@@ -607,8 +587,6 @@ void parse_includes(char *ptr)
  * and set bright to TRUE if that color is bright. */
 short color_to_short(const char *colorname, bool *bright)
 {
-    assert(colorname != NULL && bright != NULL);
-
     if (strncasecmp(colorname, "bright", 6) == 0) {
 	*bright = TRUE;
 	colorname += 6;
@@ -648,8 +626,6 @@ void parse_colors(char *ptr, int rex_flags)
     bool bright = FALSE;
     char *item;
 
-    assert(ptr != NULL);
-
     if (!opensyntax) {
 	rcfile_error(
 		N_("A '%s' command requires a preceding 'syntax' command"),
@@ -723,9 +699,6 @@ void parse_colors(char *ptr, int rex_flags)
 
 	    newcolor->next = NULL;
 
-#ifdef DEBUG
-	    fprintf(stderr, "Adding an entry for fg %hd, bg %hd\n", fg, bg);
-#endif
 	    if (lastcolor == NULL)
 		live_syntax->color = newcolor;
 	    else
@@ -776,33 +749,22 @@ void parse_colors(char *ptr, int rex_flags)
 /* Parse the color name, or pair of color names, in combostr. */
 bool parse_color_names(char *combostr, short *fg, short *bg, bool *bright)
 {
-    bool no_fgcolor = FALSE;
+    char *comma = strchr(combostr, ',');
 
-    if (combostr == NULL)
-	return FALSE;
-
-    if (strchr(combostr, ',') != NULL) {
-	char *bgcolorname;
-	strtok(combostr, ",");
-	bgcolorname = strtok(NULL, ",");
-	if (bgcolorname == NULL) {
-	    /* If we have a background color without a foreground color,
-	     * parse it properly. */
-	    bgcolorname = combostr + 1;
-	    no_fgcolor = TRUE;
-	}
-	if (strncasecmp(bgcolorname, "bright", 6) == 0) {
-	    rcfile_error(N_("Background color \"%s\" cannot be bright"), bgcolorname);
+    if (comma != NULL) {
+	*bg = color_to_short(comma + 1, bright);
+	if (*bright) {
+	    rcfile_error(N_("A background color cannot be bright"));
 	    return FALSE;
 	}
-	*bg = color_to_short(bgcolorname, bright);
+	*comma = '\0';
     } else
 	*bg = -1;
 
-    if (!no_fgcolor) {
+    if (comma != combostr) {
 	*fg = color_to_short(combostr, bright);
 
-	/* Don't try to parse screwed-up foreground colors. */
+	/* If the specified foreground color is bad, ignore the regexes. */
 	if (*fg == -1)
 	    return FALSE;
     } else
@@ -875,7 +837,7 @@ void grab_and_store(const char *kind, char *ptr, regexlisttype **storage)
     }
 }
 
-/* Parse and store the name given after a linter/formatter command. */
+/* Gather and store the string after a comment/linter/formatter command. */
 void pick_up_name(const char *kind, char *ptr, char **storage)
 {
     assert(ptr != NULL);
@@ -887,37 +849,28 @@ void pick_up_name(const char *kind, char *ptr, char **storage)
     }
 
     if (*ptr == '\0') {
-	rcfile_error(N_("Missing command after '%s'"), kind);
+	rcfile_error(N_("Missing argument after '%s'"), kind);
 	return;
     }
 
-    free(*storage);
+    /* If the argument starts with a quote, find the terminating quote. */
+    if (*ptr == '"') {
+	char *look = ++ptr;
 
-    /* Allow unsetting the command by using an empty string. */
-    if (!strcmp(ptr, "\"\""))
-	*storage = NULL;
-    else if (*ptr == '"') {
-	*storage = mallocstrcpy(NULL, ++ptr);
-	char* q = *storage;
-	char* p = *storage;
-	/* Snip out the backslashes of escaped characters. */
-	while (*p != '"') {
-	    if (*p == '\0') {
+	look += strlen(ptr);
+
+	while (*look != '"') {
+	    if (--look < ptr) {
 		rcfile_error(N_("Argument of '%s' lacks closing \""), kind);
-		free(*storage);
-		*storage = NULL;
 		return;
-	    } else if (*p == '\\' && *(p + 1) != '\0') {
-		p++;
 	    }
-	    *q++ = *p++;
 	}
-	*q = '\0';
+	*look = '\0';
     }
-    else
-	*storage = mallocstrcpy(NULL, ptr);
+
+    *storage = mallocstrcpy(*storage, ptr);
 }
-#endif /* !DISABLE_COLOR */
+#endif /* ENABLE_COLOR */
 
 /* Verify that the user has not unmapped every shortcut for a
  * function that we consider 'vital' (such as "Exit"). */
@@ -978,7 +931,7 @@ void parse_rcfile(FILE *rcstream, bool syntax_only)
 	keyword = ptr;
 	ptr = parse_next_word(ptr);
 
-#ifndef DISABLE_COLOR
+#ifdef ENABLE_COLOR
 	/* Handle extending first... */
 	if (strcasecmp(keyword, "extendsyntax") == 0) {
 	    syntaxtype *sint;
@@ -1038,7 +991,7 @@ void parse_rcfile(FILE *rcstream, bool syntax_only)
 	else if (strcasecmp(keyword, "linter") == 0)
 	    pick_up_name("linter", ptr, &live_syntax->linter);
 	else if (strcasecmp(keyword, "formatter") == 0)
-#ifndef DISABLE_SPELLER
+#ifdef ENABLE_SPELLER
 	    pick_up_name("formatter", ptr, &live_syntax->formatter);
 #else
 	    ;
@@ -1049,7 +1002,7 @@ void parse_rcfile(FILE *rcstream, bool syntax_only)
 	else if (strcasecmp(keyword, "include") == 0)
 	    parse_includes(ptr);
 	else
-#endif /* !DISABLE_COLOR */
+#endif /* ENABLE_COLOR */
 	if (strcasecmp(keyword, "set") == 0)
 	    set = 1;
 	else if (strcasecmp(keyword, "unset") == 0)
@@ -1061,7 +1014,7 @@ void parse_rcfile(FILE *rcstream, bool syntax_only)
 	else
 	    rcfile_error(N_("Command \"%s\" not understood"), keyword);
 
-#ifndef DISABLE_COLOR
+#ifdef ENABLE_COLOR
 	/* If a syntax was extended, it stops at the end of the command. */
 	if (live_syntax != syntaxes)
 	    opensyntax = FALSE;
@@ -1130,11 +1083,13 @@ void parse_rcfile(FILE *rcstream, bool syntax_only)
 	    continue;
 	}
 
-#ifndef DISABLE_COLOR
+#ifdef ENABLE_COLOR
 	if (strcasecmp(rcopts[i].name, "titlecolor") == 0)
 	    specified_color_combo[TITLE_BAR] = option;
 	else if (strcasecmp(rcopts[i].name, "numbercolor") == 0)
 	    specified_color_combo[LINE_NUMBER] = option;
+	else if (strcasecmp(rcopts[i].name, "selectedcolor") == 0)
+	    specified_color_combo[SELECTED_TEXT] = option;
 	else if (strcasecmp(rcopts[i].name, "statuscolor") == 0)
 	    specified_color_combo[STATUS_BAR] = option;
 	else if (strcasecmp(rcopts[i].name, "keycolor") == 0)
@@ -1143,12 +1098,12 @@ void parse_rcfile(FILE *rcstream, bool syntax_only)
 	    specified_color_combo[FUNCTION_TAG] = option;
 	else
 #endif
-#ifndef DISABLE_OPERATINGDIR
+#ifdef ENABLE_OPERATINGDIR
 	if (strcasecmp(rcopts[i].name, "operatingdir") == 0)
 	    operating_dir = option;
 	else
 #endif
-#ifndef DISABLE_WRAPJUSTIFY
+#ifdef ENABLED_WRAPORJUSTIFY
 	if (strcasecmp(rcopts[i].name, "fill") == 0) {
 	    if (!parse_num(option, &wrap_at)) {
 		rcfile_error(N_("Requested fill size \"%s\" is invalid"),
@@ -1180,7 +1135,7 @@ void parse_rcfile(FILE *rcstream, bool syntax_only)
 	    }
 	} else
 #endif
-#ifndef DISABLE_JUSTIFY
+#ifdef ENABLE_JUSTIFY
 	if (strcasecmp(rcopts[i].name, "punct") == 0) {
 	    punct = option;
 	    if (has_blank_mbchars(punct)) {
@@ -1207,7 +1162,7 @@ void parse_rcfile(FILE *rcstream, bool syntax_only)
 	    word_chars = option;
 	else
 #endif
-#ifndef DISABLE_SPELLER
+#ifdef ENABLE_SPELLER
 	if (strcasecmp(rcopts[i].name, "speller") == 0)
 	    alt_speller = option;
 	else
@@ -1223,7 +1178,7 @@ void parse_rcfile(FILE *rcstream, bool syntax_only)
 	    assert(FALSE);
     }
 
-#ifndef DISABLE_COLOR
+#ifdef ENABLE_COLOR
     if (opensyntax && lastcolor == NULL)
 	rcfile_error(N_("Syntax \"%s\" has no color commands"),
 			live_syntax->name);
@@ -1250,7 +1205,6 @@ void parse_one_nanorc(void)
 #ifdef DEBUG
     fprintf(stderr, "Going to parse file \"%s\"\n", nanorc);
 #endif
-
     rcstream = fopen(nanorc, "rb");
 
     /* If opening the file succeeded, parse it.  Otherwise, only
@@ -1261,9 +1215,22 @@ void parse_one_nanorc(void)
 	rcfile_error(N_("Error reading %s: %s"), nanorc, strerror(errno));
 }
 
+bool have_nanorc(const char *path, char *name)
+{
+    if (path == NULL)
+	return FALSE;
+
+    free(nanorc);
+    nanorc = concatenate(path, name);
+
+    return is_good_file(nanorc);
+}
+
 /* First read the system-wide rcfile, then the user's rcfile. */
 void do_rcfiles(void)
 {
+    const char *xdgconfdir;
+
     nanorc = mallocstrcpy(nanorc, SYSCONFDIR "/nanorc");
 
     /* Process the system-wide nanorc. */
@@ -1277,27 +1244,22 @@ void do_rcfiles(void)
 #endif
 
     get_homedir();
+    xdgconfdir = getenv("XDG_CONFIG_HOME");
 
-    if (homedir == NULL)
-	rcfile_error(N_("I can't find my home directory!  Wah!"));
-    else {
-	nanorc = charealloc(nanorc, strlen(homedir) + strlen(RCFILE_NAME) + 2);
-	sprintf(nanorc, "%s/%s", homedir, RCFILE_NAME);
-
-	/* Process the current user's nanorc. */
+    /* Now try the to find a nanorc file in the user's home directory
+     * or in the XDG configuration directories. */
+    if (have_nanorc(homedir, "/." RCFILE_NAME))
 	parse_one_nanorc();
-    }
+    else if (have_nanorc(xdgconfdir, "/nano/" RCFILE_NAME))
+	parse_one_nanorc();
+    else if (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!"));
 
     check_vitals_mapped();
 
     free(nanorc);
-
-    if (errors && !ISSET(QUIET) && !ISSET(NO_PAUSES)) {
-	errors = FALSE;
-	fprintf(stderr, _("\nPress Enter to continue starting nano.\n"));
-	while (getchar() != '\n')
-	    ;
-    }
 }
 
 #endif /* ENABLE_NANORC */

src/search.c

@@ -2,7 +2,7 @@
  *   search.c  --  This file is part of GNU nano.                         *
  *                                                                        *
  *   Copyright (C) 1999-2011, 2013-2017 Free Software Foundation, Inc.    *
- *   Copyright (C) 2015, 2016, 2017 Benno Schulenberg                     *
+ *   Copyright (C) 2015-2017 Benno Schulenberg                            *
  *                                                                        *
  *   GNU nano is free software: you can redistribute it and/or modify     *
  *   it under the terms of the GNU General Public License as published    *
@@ -22,18 +22,12 @@
 #include "proto.h"
 
 #include <string.h>
-#include <stdio.h>
-#include <unistd.h>
-#include <ctype.h>
-#include <errno.h>
+#ifdef DEBUG
 #include <time.h>
+#endif
 
 static bool came_full_circle = FALSE;
 	/* Have we reached the starting line again while searching? */
-#ifndef DISABLE_HISTORIES
-static bool history_changed = FALSE;
-	/* Have any of the history lists changed? */
-#endif
 static bool regexp_compiled = FALSE;
 	/* Have we compiled any regular expressions? */
 
@@ -71,21 +65,14 @@ void regexp_cleanup(void)
     }
 }
 
-/* Indicate on the statusbar that the string at str was not found by the
- * last search. */
+/* Report on the status bar that the given string was not found. */
 void not_found_msg(const char *str)
 {
-    char *disp;
-    int numchars;
-
-    assert(str != NULL);
-
-    disp = display_string(str, 0, (COLS / 2) + 1, FALSE);
-    numchars = actual_x(disp, mbstrnlen(disp, COLS / 2));
+    char *disp = display_string(str, 0, (COLS / 2) + 1, FALSE);
+    size_t numchars = actual_x(disp, strnlenpt(disp, COLS / 2));
 
     statusline(HUSH, _("\"%.*s%s\" not found"), numchars, disp,
 		(disp[numchars] == '\0') ? "" : "...");
-
     free(disp);
 }
 
@@ -96,7 +83,7 @@ void not_found_msg(const char *str)
 void search_replace_abort(void)
 {
 #ifndef NANO_TINY
-    if (openfile->mark_set)
+    if (openfile->mark)
 	refresh_needed = TRUE;
 #endif
     regexp_cleanup();
@@ -144,10 +131,7 @@ int search_init(bool replacing, bool use_answer)
     /* This is now one simple call.  It just does a lot. */
     i = do_prompt(FALSE, FALSE,
 		inhelp ? MFINDINHELP : (replacing ? MREPLACE : MWHEREIS),
-		backupstring,
-#ifndef DISABLE_HISTORIES
-		&search_history,
-#endif
+		backupstring, &search_history,
 		/* TRANSLATORS: This is the main search prompt. */
 		edit_refresh, "%s%s%s%s%s%s", _("Search"),
 		/* TRANSLATORS: The next three modify the search prompt. */
@@ -156,7 +140,7 @@ int search_init(bool replacing, bool use_answer)
 		ISSET(BACKWARDS_SEARCH) ? _(" [Backwards]") : "", replacing ?
 #ifndef NANO_TINY
 		/* TRANSLATORS: The next two modify the search prompt. */
-		openfile->mark_set ? _(" (to replace) in selection") :
+		openfile->mark ? _(" (to replace) in selection") :
 #endif
 		_(" (to replace)") : "", buf);
 
@@ -178,7 +162,7 @@ int search_init(bool replacing, bool use_answer)
 	/* If an answer was given, remember it. */
 	if (*answer != '\0') {
 	    last_search = mallocstrcpy(last_search, answer);
-#ifndef DISABLE_HISTORIES
+#ifdef ENABLE_HISTORIES
 	    update_history(&search_history, answer);
 #endif
 	}
@@ -218,7 +202,7 @@ int search_init(bool replacing, bool use_answer)
  * where we first started searching, at column begin_x.  Return 1 when we
  * found something, 0 when nothing, and -2 on cancel.  When match_len is
  * not NULL, set it to the length of the found string, if any. */
-int findnextstr(const char *needle, bool whole_word_only, bool have_region,
+int findnextstr(const char *needle, bool whole_word_only, int modus,
 	size_t *match_len, bool skipone, const filestruct *begin, size_t begin_x)
 {
     size_t found_len = strlen(needle);
@@ -234,8 +218,10 @@ int findnextstr(const char *needle, bool whole_word_only, bool have_region,
     size_t found_x;
 	/* The x coordinate of a found occurrence. */
     time_t lastkbcheck = time(NULL);
+	/* The time we last looked at the keyboard. */
 
-    enable_nodelay();
+    /* Set non-blocking input so that we can just peek for a Cancel. */
+    disable_waiting();
 
     if (begin == NULL)
 	came_full_circle = FALSE;
@@ -252,7 +238,7 @@ int findnextstr(const char *needle, bool whole_word_only, bool have_region,
 	    while (input) {
 		if (func_from_key(&input) == do_cancel) {
 		    statusbar(_("Cancelled"));
-		    disable_nodelay();
+		    enable_waiting();
 		    return -2;
 		}
 		input = parse_kbinput(NULL);
@@ -287,7 +273,7 @@ int findnextstr(const char *needle, bool whole_word_only, bool have_region,
 	    /* When doing a regex search, compute the length of the match. */
 	    if (ISSET(USE_REGEXP))
 		found_len = regmatches[0].rm_eo - regmatches[0].rm_so;
-#ifndef DISABLE_SPELLER
+#ifdef ENABLE_SPELLER
 	    /* When we're spell checking, a match should be a separate word;
 	     * if it's not, continue looking in the rest of the line. */
 	    if (whole_word_only && !is_separate_word(found - line->data,
@@ -302,8 +288,7 @@ int findnextstr(const char *needle, bool whole_word_only, bool have_region,
 
 	/* If we're back at the beginning, then there is no needle. */
 	if (came_full_circle) {
-	    not_found_msg(needle);
-	    disable_nodelay();
+	    enable_waiting();
 	    return 0;
 	}
 
@@ -316,8 +301,8 @@ int findnextstr(const char *needle, bool whole_word_only, bool have_region,
 	/* If we've reached the start or end of the buffer, wrap around;
 	 * but stop when spell-checking or replacing in a region. */
 	if (line == NULL) {
-	    if (whole_word_only || have_region) {
-		disable_nodelay();
+	    if (whole_word_only || modus == INREGION) {
+		enable_waiting();
 		return 0;
 	    }
 
@@ -326,9 +311,11 @@ int findnextstr(const char *needle, bool whole_word_only, bool have_region,
 	    else
 		line = openfile->fileage;
 
-	    statusbar(_("Search Wrapped"));
-	    /* Delay the "Searching..." message for at least two seconds. */
-	    feedback = -2;
+	    if (modus == JUSTFIND) {
+		statusbar(_("Search Wrapped"));
+		/* Delay the "Searching..." message for at least two seconds. */
+		feedback = -2;
+	    }
 	}
 
 	/* If we've reached the original starting line, take note. */
@@ -343,15 +330,12 @@ int findnextstr(const char *needle, bool whole_word_only, bool have_region,
 
     found_x = found - line->data;
 
+    enable_waiting();
+
     /* Ensure that the found occurrence is not beyond the starting x. */
     if (came_full_circle && ((!ISSET(BACKWARDS_SEARCH) && found_x > begin_x) ||
-			(ISSET(BACKWARDS_SEARCH) && found_x < begin_x))) {
-	not_found_msg(needle);
-	disable_nodelay();
+			(ISSET(BACKWARDS_SEARCH) && found_x < begin_x)))
 	return 0;
-    }
-
-    disable_nodelay();
 
     /* Set the current position to point at what we found. */
     openfile->current = line;
@@ -361,8 +345,12 @@ int findnextstr(const char *needle, bool whole_word_only, bool have_region,
     if (match_len != NULL)
 	*match_len = found_len;
 
-    if (feedback > 0)
+    /* Wipe the "Searching..." message and unset the suppression flag. */
+    if (feedback > 0) {
 	blank_statusbar();
+	wrefresh(bottomwin);
+	suppress_cursorpos = FALSE;
+    }
 
     return 1;
 }
@@ -383,35 +371,40 @@ void do_search(void)
 	go_looking();
 }
 
+/* Search forward for a string. */
+void do_search_forward(void)
+{
+    UNSET(BACKWARDS_SEARCH);
+    do_search();
+}
+
+/* Search backwards for a string. */
+void do_search_backward(void)
+{
+    SET(BACKWARDS_SEARCH);
+    do_search();
+}
+
 #ifndef NANO_TINY
 /* Search in the backward direction for the next occurrence. */
 void do_findprevious(void)
 {
-    if ISSET(BACKWARDS_SEARCH)
-	do_research();
-    else {
-	SET(BACKWARDS_SEARCH);
-	do_research();
-	UNSET(BACKWARDS_SEARCH);
-    }
+    SET(BACKWARDS_SEARCH);
+    do_research();
 }
 
 /* Search in the forward direction for the next occurrence. */
 void do_findnext(void)
 {
-    if ISSET(BACKWARDS_SEARCH) {
-	UNSET(BACKWARDS_SEARCH);
-	do_research();
-	SET(BACKWARDS_SEARCH);
-    } else
-	do_research();
+    UNSET(BACKWARDS_SEARCH);
+    do_research();
 }
 #endif /* !NANO_TINY */
 
 /* Search for the last string without prompting. */
 void do_research(void)
 {
-#ifndef DISABLE_HISTORIES
+#ifdef ENABLE_HISTORIES
     /* If nothing was searched for yet during this run of nano, but
      * there is a search history, take the most recent item. */
     if (*last_search == '\0' && searchbot->prev != NULL)
@@ -444,7 +437,7 @@ void go_looking(void)
 
     came_full_circle = FALSE;
 
-    didfind = findnextstr(last_search, FALSE, FALSE, NULL, FALSE,
+    didfind = findnextstr(last_search, FALSE, JUSTFIND, NULL, FALSE,
 				openfile->current, openfile->current_x);
 
     /* If we found something, and we're back at the exact same spot
@@ -452,12 +445,14 @@ void go_looking(void)
     if (didfind == 1 && openfile->current == was_current &&
 		openfile->current_x == was_current_x)
 	statusbar(_("This is the only occurrence"));
+    else if (didfind == 0)
+	not_found_msg(last_search);
 
 #ifdef DEBUG
     statusline(HUSH, "Took: %.2f", (double)(clock() - start) / CLOCKS_PER_SEC);
 #endif
 
-    edit_redraw(was_current);
+    edit_redraw(was_current, CENTERING);
     search_replace_abort();
 }
 
@@ -553,21 +548,21 @@ ssize_t do_replace_loop(const char *needle, bool whole_word_only,
     size_t match_len;
     bool replaceall = FALSE;
     bool skipone = FALSE;
-    bool mark_was_set = FALSE;
+    int modus = REPLACING;
 #ifndef NANO_TINY
+    filestruct *was_mark = openfile->mark;
     filestruct *top, *bot;
     size_t top_x, bot_x;
     bool right_side_up = FALSE;
 	/* TRUE if (mark_begin, mark_begin_x) is the top of the mark,
 	 * FALSE if (current, current_x) is. */
 
-    mark_was_set = openfile->mark_set;
-
     /* If the mark is on, frame the region, and turn the mark off. */
-    if (mark_was_set) {
+    if (openfile->mark) {
 	mark_order((const filestruct **)&top, &top_x,
 			(const filestruct **)&bot, &bot_x, &right_side_up);
-	openfile->mark_set = FALSE;
+	openfile->mark = NULL;
+	modus = INREGION;
 
 	/* Start either at the top or the bottom of the marked region. */
 	if (!ISSET(BACKWARDS_SEARCH)) {
@@ -584,7 +579,7 @@ ssize_t do_replace_loop(const char *needle, bool whole_word_only,
 
     while (TRUE) {
 	int i = 0;
-	int result = findnextstr(needle, whole_word_only, mark_was_set,
+	int result = findnextstr(needle, whole_word_only, modus,
 			&match_len, skipone, real_current, *real_current_x);
 
 	/* If nothing more was found, or the user aborted, stop looping. */
@@ -596,7 +591,7 @@ ssize_t do_replace_loop(const char *needle, bool whole_word_only,
 
 #ifndef NANO_TINY
 	/* An occurrence outside of the marked region means we're done. */
-	if (mark_was_set && (openfile->current->lineno > bot->lineno ||
+	if (was_mark && (openfile->current->lineno > bot->lineno ||
 				openfile->current->lineno < top->lineno ||
 				(openfile->current == bot &&
 				openfile->current_x + match_len > bot_x) ||
@@ -610,25 +605,19 @@ ssize_t do_replace_loop(const char *needle, bool whole_word_only,
 	    numreplaced = 0;
 
 	if (!replaceall) {
-	    size_t xpt = xplustabs();
-	    char *exp_word = display_string(openfile->current->data,
-			xpt, strnlenpt(openfile->current->data,
-			openfile->current_x + match_len) - xpt, FALSE);
+	    size_t from_col = xplustabs();
+	    size_t to_col = strnlenpt(openfile->current->data,
+					openfile->current_x + match_len);
 
 	    /* Refresh the edit window, scrolling it if necessary. */
 	    edit_refresh();
 
-	    /* Don't show cursor, to not distract from highlighted match. */
-	    curs_set(0);
-
-	    spotlight(TRUE, exp_word);
+	    spotlight(TRUE, from_col, to_col);
 
 	    /* TRANSLATORS: This is a prompt. */
 	    i = do_yesno_prompt(TRUE, _("Replace this instance?"));
 
-	    spotlight(FALSE, exp_word);
-
-	    free(exp_word);
+	    spotlight(FALSE, from_col, to_col);
 
 	    if (i == -1)  /* The replacing was cancelled. */
 		break;
@@ -654,20 +643,20 @@ ssize_t do_replace_loop(const char *needle, bool whole_word_only,
 #ifndef NANO_TINY
 	    /* If the mark was on and it was located after the cursor,
 	     * then adjust its x position for any text length changes. */
-	    if (mark_was_set && !right_side_up) {
-		if (openfile->current == openfile->mark_begin &&
-			openfile->mark_begin_x > openfile->current_x) {
-		    if (openfile->mark_begin_x < openfile->current_x + match_len)
-			openfile->mark_begin_x = openfile->current_x;
+	    if (was_mark && !right_side_up) {
+		if (openfile->current == was_mark &&
+			openfile->mark_x > openfile->current_x) {
+		    if (openfile->mark_x < openfile->current_x + match_len)
+			openfile->mark_x = openfile->current_x;
 		    else
-			openfile->mark_begin_x += length_change;
-		    bot_x = openfile->mark_begin_x;
+			openfile->mark_x += length_change;
+		    bot_x = openfile->mark_x;
 		}
 	    }
 
 	    /* If the mark was not on or it was before the cursor, then
 	     * adjust the cursor's x position for any text length changes. */
-	    if (!mark_was_set || right_side_up) {
+	    if (!was_mark || right_side_up) {
 #endif
 		if (openfile->current == real_current &&
 			openfile->current_x < *real_current_x) {
@@ -695,7 +684,7 @@ ssize_t do_replace_loop(const char *needle, bool whole_word_only,
 	    openfile->current->data = copy;
 
 	    if (!replaceall) {
-#ifndef DISABLE_COLOR
+#ifdef ENABLE_COLOR
 		/* When doing syntax coloring, the replacement might require
 		 * a change of colors, so refresh the whole edit window. */
 		if (openfile->colorstrings != NULL && !ISSET(NO_COLOR_SYNTAX))
@@ -713,17 +702,15 @@ ssize_t do_replace_loop(const char *needle, bool whole_word_only,
 
     if (numreplaced == -1)
 	not_found_msg(needle);
-#ifndef DISABLE_COLOR
+#ifdef ENABLE_COLOR
     else if (numreplaced > 0)
 	refresh_needed = TRUE;
 #endif
-
 #ifndef NANO_TINY
-    if (mark_was_set)
-	openfile->mark_set = TRUE;
+    openfile->mark = was_mark;
 #endif
 
-    /* If the NO_NEWLINES flag isn't set, and text has been added to the
+    /* If "automatic newline" is enabled, and text has been added to the
      * magicline, make a new magicline. */
     if (!ISSET(NO_NEWLINES) && openfile->filebot->data[0] != '\0')
 	new_magicline();
@@ -756,14 +743,11 @@ void do_replace(void)
     if (i != 0)
 	return;
 
-    i = do_prompt(FALSE, FALSE, MREPLACEWITH, NULL,
-#ifndef DISABLE_HISTORIES
-		&replace_history,
-#endif
+    i = do_prompt(FALSE, FALSE, MREPLACEWITH, NULL, &replace_history,
 		/* TRANSLATORS: This is a prompt. */
 		edit_refresh, _("Replace with"));
 
-#ifndef DISABLE_HISTORIES
+#ifdef ENABLE_HISTORIES
     /* If the replace string is not "", add it to the replace history list. */
     if (i == 0)
 	update_history(&replace_history, answer);
@@ -793,9 +777,8 @@ void do_replace(void)
     refresh_needed = TRUE;
 
     if (numreplaced >= 0)
-	statusline(HUSH, P_("Replaced %lu occurrence",
-		"Replaced %lu occurrences", (unsigned long)numreplaced),
-		(unsigned long)numreplaced);
+	statusline(HUSH, P_("Replaced %zd occurrence",
+		"Replaced %zd occurrences", numreplaced), numreplaced);
 
     search_replace_abort();
 }
@@ -824,10 +807,7 @@ void do_gotolinecolumn(ssize_t line, ssize_t column, bool use_answer,
 
 	/* Ask for the line and column. */
 	int i = do_prompt(FALSE, FALSE, MGOTOLINE,
-		use_answer ? answer : NULL,
-#ifndef DISABLE_HISTORIES
-		NULL,
-#endif
+		use_answer ? answer : NULL, NULL,
 		/* TRANSLATORS: This is a prompt. */
 		edit_refresh, _("Enter line number, column number"));
 
@@ -855,10 +835,10 @@ void do_gotolinecolumn(ssize_t line, ssize_t column, bool use_answer,
 	    return;
 	}
     } else {
-	if (line < 1)
+	if (line == 0)
 	    line = openfile->current->lineno;
 
-	if (column < 1)
+	if (column == 0)
 	    column = openfile->placewewant + 1;
     }
 
@@ -899,7 +879,7 @@ void do_gotolinecolumn(ssize_t line, ssize_t column, bool use_answer,
 #ifndef NANO_TINY
 	if (ISSET(SOFTWRAP)) {
 	    filestruct *line = openfile->current;
-	    size_t leftedge = (xplustabs() / editwincols) * editwincols;
+	    size_t leftedge = leftedge_for(xplustabs(), openfile->current);
 
 	    rows_from_tail = (editwinrows / 2) -
 			go_forward_chunks(editwinrows / 2, &line, &leftedge);
@@ -911,7 +891,7 @@ void do_gotolinecolumn(ssize_t line, ssize_t column, bool use_answer,
 	/* If the target line is close to the tail of the file, put the last
 	 * line or chunk on the bottom line of the screen; otherwise, just
 	 * center the target line. */
-	if (rows_from_tail < editwinrows / 2) {
+	if (rows_from_tail < editwinrows / 2 && ISSET(SMOOTH_SCROLL)) {
 	    openfile->current_y = editwinrows - 1 - rows_from_tail;
 	    adjust_viewport(STATIONARY);
 	} else
@@ -1074,8 +1054,7 @@ void do_find_bracket(void)
 	    /* If count is zero, we've found a matching bracket.  Update
 	     * the screen and get out. */
 	    if (count == 0) {
-		focusing = FALSE;
-		edit_redraw(current_save);
+		edit_redraw(current_save, FLOWING);
 		break;
 	    }
 	} else {
@@ -1089,199 +1068,3 @@ void do_find_bracket(void)
     }
 }
 #endif /* !NANO_TINY */
-
-#ifndef DISABLE_HISTORIES
-/* Indicate whether any of the history lists have changed. */
-bool history_has_changed(void)
-{
-    return history_changed;
-}
-
-/* Initialize the search and replace history lists. */
-void history_init(void)
-{
-    search_history = make_new_node(NULL);
-    search_history->data = mallocstrcpy(NULL, "");
-    searchage = search_history;
-    searchbot = search_history;
-
-    replace_history = make_new_node(NULL);
-    replace_history->data = mallocstrcpy(NULL, "");
-    replaceage = replace_history;
-    replacebot = replace_history;
-}
-
-/* Set the current position in the history list h to the bottom. */
-void history_reset(const filestruct *h)
-{
-    if (h == search_history)
-	search_history = searchbot;
-    else if (h == replace_history)
-	replace_history = replacebot;
-}
-
-/* Return the first node containing the first len characters of the
- * string s in the history list, starting at h_start and ending at
- * h_end, or NULL if there isn't one. */
-filestruct *find_history(const filestruct *h_start, const filestruct
-	*h_end, const char *s, size_t len)
-{
-    const filestruct *p;
-
-    for (p = h_start; p != h_end->prev && p != NULL; p = p->prev) {
-	if (strncmp(s, p->data, len) == 0)
-	    return (filestruct *)p;
-    }
-
-    return NULL;
-}
-
-/* Update a history list (the one in which h is the current position)
- * with a fresh string s.  That is: add s, or move it to the end. */
-void update_history(filestruct **h, const char *s)
-{
-    filestruct **hage = NULL, **hbot = NULL, *thesame;
-
-    assert(h != NULL && s != NULL);
-
-    if (*h == search_history) {
-	hage = &searchage;
-	hbot = &searchbot;
-    } else if (*h == replace_history) {
-	hage = &replaceage;
-	hbot = &replacebot;
-    }
-
-    assert(hage != NULL && hbot != NULL);
-
-    /* See if the string is already in the history. */
-    thesame = find_history(*hbot, *hage, s, HIGHEST_POSITIVE);
-
-    /* If an identical string was found, delete that item. */
-    if (thesame != NULL) {
-	filestruct *after = thesame->next;
-
-	/* If the string is at the head of the list, move the head. */
-	if (thesame == *hage)
-	    *hage = after;
-
-	unlink_node(thesame);
-	renumber(after);
-    }
-
-    /* If the history is full, delete the oldest item (the one at the
-     * head of the list), to make room for a new item at the end. */
-    if ((*hbot)->lineno == MAX_SEARCH_HISTORY + 1) {
-	filestruct *oldest = *hage;
-
-	*hage = (*hage)->next;
-	unlink_node(oldest);
-	renumber(*hage);
-    }
-
-    /* Store the fresh string in the last item, then create a new item. */
-    (*hbot)->data = mallocstrcpy((*hbot)->data, s);
-    splice_node(*hbot, make_new_node(*hbot));
-    *hbot = (*hbot)->next;
-    (*hbot)->data = mallocstrcpy(NULL, "");
-
-    /* Indicate that the history needs to be saved on exit. */
-    history_changed = TRUE;
-
-    /* Set the current position in the list to the bottom. */
-    *h = *hbot;
-}
-
-/* Move h to the string in the history list just before it, and return
- * that string.  If there isn't one, don't move h and return NULL. */
-char *get_history_older(filestruct **h)
-{
-    assert(h != NULL);
-
-    if ((*h)->prev == NULL)
-	return NULL;
-
-    *h = (*h)->prev;
-
-    return (*h)->data;
-}
-
-/* Move h to the string in the history list just after it, and return
- * that string.  If there isn't one, don't move h and return NULL. */
-char *get_history_newer(filestruct **h)
-{
-    assert(h != NULL);
-
-    if ((*h)->next == NULL)
-	return NULL;
-
-    *h = (*h)->next;
-
-    return (*h)->data;
-}
-
-/* More placeholders. */
-void get_history_newer_void(void)
-{
-    ;
-}
-void get_history_older_void(void)
-{
-    ;
-}
-
-#ifdef ENABLE_TABCOMP
-/* Move h to the next string that's a tab completion of the string s,
- * looking at only the first len characters of s, and return that
- * string.  If there isn't one, or if len is 0, don't move h and return
- * s. */
-char *get_history_completion(filestruct **h, char *s, size_t len)
-{
-    assert(s != NULL);
-
-    if (len > 0) {
-	filestruct *hage = NULL, *hbot = NULL, *p;
-
-	assert(h != NULL);
-
-	if (*h == search_history) {
-	    hage = searchage;
-	    hbot = searchbot;
-	} else if (*h == replace_history) {
-	    hage = replaceage;
-	    hbot = replacebot;
-	}
-
-	assert(hage != NULL && hbot != NULL);
-
-	/* Search the history list from the current position to the top
-	 * for a match of len characters.  Skip over an exact match. */
-	p = find_history((*h)->prev, hage, s, len);
-
-	while (p != NULL && strcmp(p->data, s) == 0)
-	    p = find_history(p->prev, hage, s, len);
-
-	if (p != NULL) {
-	    *h = p;
-	    return mallocstrcpy(s, (*h)->data);
-	}
-
-	/* Search the history list from the bottom to the current position
-	 * for a match of len characters.  Skip over an exact match. */
-	p = find_history(hbot, *h, s, len);
-
-	while (p != NULL && strcmp(p->data, s) == 0)
-	    p = find_history(p->prev, *h, s, len);
-
-	if (p != NULL) {
-	    *h = p;
-	    return mallocstrcpy(s, (*h)->data);
-	}
-    }
-
-    /* If we're here, we didn't find a match, we didn't find an inexact
-     * match, or len is 0.  Return s. */
-    return (char *)s;
-}
-#endif /* ENSABLE_TABCOMP */
-#endif /* !DISABLE_HISTORIES */

src/utils.c

@@ -2,7 +2,7 @@
  *   utils.c  --  This file is part of GNU nano.                          *
  *                                                                        *
  *   Copyright (C) 1999-2011, 2013-2017 Free Software Foundation, Inc.    *
- *   Copyright (C) 2016 Benno Schulenberg                                 *
+ *   Copyright (C) 2016-2017 Benno Schulenberg                            *
  *                                                                        *
  *   GNU nano is free software: you can redistribute it and/or modify     *
  *   it under the terms of the GNU General Public License as published    *
@@ -21,14 +21,12 @@
 
 #include "proto.h"
 
-#include <string.h>
-#include <stdio.h>
-#include <unistd.h>
+#include <errno.h>
 #ifdef HAVE_PWD_H
 #include <pwd.h>
 #endif
-#include <ctype.h>
-#include <errno.h>
+#include <string.h>
+#include <unistd.h>
 
 /* Return the user's home directory.  We use $HOME, and if that fails,
  * we fall back on the home directory of the effective user ID. */
@@ -55,6 +53,29 @@ void get_homedir(void)
     }
 }
 
+/* Return the filename part of the given path. */
+const char *tail(const char *path)
+{
+    const char *slash = strrchr(path, '/');
+
+    if (slash == NULL)
+	return path;
+    else
+	return ++slash;
+}
+
+/* Return a copy of the two given strings, welded together. */
+char *concatenate(const char *path, const char *name)
+{
+    size_t pathlen = strlen(path);
+    char *joined = charalloc(pathlen + strlen(name) + 1);
+
+    strcpy(joined, path);
+    strcpy(joined + pathlen, name);
+
+    return joined;
+}
+
 #ifdef ENABLE_LINENUMBERS
 /* Return the number of digits that the given integer n takes up. */
 int digits(ssize_t n)
@@ -172,6 +193,20 @@ void sunder(char *str)
     }
 }
 
+#if !defined(ENABLE_TINY) || defined(ENABLE_TABCOMP) || defined(ENABLE_BROWSER)
+/* Free the memory of the given array, which should contain len elements. */
+void free_chararray(char **array, size_t len)
+{
+    if (array == NULL)
+	return;
+
+    while (len > 0)
+	free(array[--len]);
+
+    free(array);
+}
+#endif
+
 /* Fix the regex if we're on platforms which require an adjustment
  * from GNU-style to BSD-style word boundaries. */
 const char *fixbounds(const char *r)
@@ -181,10 +216,6 @@ const char *fixbounds(const char *r)
     char *r2 = charalloc(strlen(r) * 5);
     char *r3;
 
-#ifdef DEBUG
-    fprintf(stderr, "fixbounds(): Start string = \"%s\"\n", r);
-#endif
-
     for (i = 0; i < strlen(r); i++) {
 	if (r[i] != '\0' && r[i] == '\\' && (r[i + 1] == '>' || r[i + 1] == '<')) {
 	    strcpy(&r2[j], "[[:");
@@ -196,19 +227,18 @@ const char *fixbounds(const char *r)
 	    r2[j] = r[i];
 	j++;
     }
+
     r2[j] = '\0';
     r3 = mallocstrcpy(NULL, r2);
     free(r2);
-#ifdef DEBUG
-    fprintf(stderr, "fixbounds(): Ending string = \"%s\"\n", r3);
-#endif
+
     return (const char *) r3;
 #endif /* !GNU_WORDBOUNDS */
 
     return r;
 }
 
-#ifndef DISABLE_SPELLER
+#ifdef ENABLE_SPELLER
 /* Is the word starting at the given position in buf and of the given length
  * a separate word?  That is: is it not part of a longer word?*/
 bool is_separate_word(size_t position, size_t length, const char *buf)
@@ -226,7 +256,7 @@ bool is_separate_word(size_t position, size_t length, const char *buf)
     return ((position == 0 || !is_alpha_mbchar(before)) &&
 		(buf[word_end] == '\0' || !is_alpha_mbchar(after)));
 }
-#endif /* !DISABLE_SPELLER */
+#endif /* ENABLE_SPELLER */
 
 /* Return the position of the needle in the haystack, or NULL if not found.
  * When searching backwards, we will find the last match that starts no later
@@ -483,18 +513,18 @@ void remove_magicline(void)
 void mark_order(const filestruct **top, size_t *top_x, const filestruct
 	**bot, size_t *bot_x, bool *right_side_up)
 {
-    if ((openfile->current->lineno == openfile->mark_begin->lineno &&
-		openfile->current_x > openfile->mark_begin_x) ||
-		openfile->current->lineno > openfile->mark_begin->lineno) {
-	*top = openfile->mark_begin;
-	*top_x = openfile->mark_begin_x;
+    if ((openfile->current->lineno == openfile->mark->lineno &&
+		openfile->current_x > openfile->mark_x) ||
+		openfile->current->lineno > openfile->mark->lineno) {
+	*top = openfile->mark;
+	*top_x = openfile->mark_x;
 	*bot = openfile->current;
 	*bot_x = openfile->current_x;
 	if (right_side_up != NULL)
 	    *right_side_up = TRUE;
     } else {
-	*bot = openfile->mark_begin;
-	*bot_x = openfile->mark_begin_x;
+	*bot = openfile->mark;
+	*bot_x = openfile->mark_x;
 	*top = openfile->current;
 	*top_x = openfile->current_x;
 	if (right_side_up != NULL)
@@ -515,8 +545,7 @@ filestruct *fsfromline(ssize_t lineno)
 	    f = f->next;
 
     if (f->lineno != lineno) {
-	statusline(ALERT, _("Internal error: can't match line %ld.  "
-			"Please save your work."), (long)lineno);
+	statusline(ALERT, "Gone undo line -- please report a bug");
 	return NULL;
     }
 
@@ -554,7 +583,7 @@ void dump_filestruct(const filestruct *inptr)
 	fprintf(stderr, "Dumping a buffer to stderr...\n");
 
     while (inptr != NULL) {
-	fprintf(stderr, "(%ld) %s\n", (long)inptr->lineno, inptr->data);
+	fprintf(stderr, "(%zd) %s\n", inptr->lineno, inptr->data);
 	inptr = inptr->next;
     }
 }
@@ -565,8 +594,7 @@ void dump_filestruct_reverse(void)
     const filestruct *fileptr = openfile->filebot;
 
     while (fileptr != NULL) {
-	fprintf(stderr, "(%ld) %s\n", (long)fileptr->lineno,
-		fileptr->data);
+	fprintf(stderr, "(%zd) %s\n", fileptr->lineno, fileptr->data);
 	fileptr = fileptr->prev;
     }
 }

syntax/asm.nanorc

@@ -1,7 +1,7 @@
 ## Here is an example for assembler.
 
 syntax "asm" "\.(S|s|asm)$"
-magic "[Aa]ssembl(y|er)"
+magic "assembler source"
 comment "//"
 
 color red "\<[A-Z_]{2,}\>"

syntax/awk.nanorc

@@ -1,7 +1,7 @@
 ## Here is an example for awk.
 
 syntax "awk" "\.awk$"
-magic "awk.*script text"
+magic "awk script"
 comment "#"
 
 # Records.

syntax/c.nanorc

@@ -1,10 +1,14 @@
 ## Here is an example for C/C++.
 
 syntax "c" "\.(c(c|pp|xx|\+\+)?|C)$" "\.(h(h|pp|xx)?|H)$" "\.ii?$"
-magic "(ASCII|UTF-8 Unicode) C(\+\+)? program text"
+magic "^(C|C\+\+) (source|program)"
 comment "//"
 
+# Constants.
 color brightred "\<[A-Z_][0-9A-Z_]+\>"
+# Labels.
+color brightmagenta "^[[:space:]]*[A-Z_a-z]+:[[:space:]]*$"
+
 color green "\<(float|double|bool|char|int|short|long|sizeof|enum|void|auto|static|const|struct|union|typedef|extern|(un)?signed|inline)\>"
 color green "\<((s?size)|((u_?)?int(8|16|32|64|ptr)))_t\>"
 color green "\<(class|namespace|template|public|protected|private|typename|this|friend|virtual|override|using|mutable|volatile|register|explicit)\>"

syntax/default.nanorc

@@ -1,11 +1,17 @@
-## A default syntax, which is used
-## for files that do not match any other syntax.
+## An example of a default syntax.  The default syntax is used for
+## files that do not match any other syntax.
 
 syntax "default"
 comment "#"
 
+# Comments.
+color cyan "^[[:space:]]*#.*"
+
 # Spaces in front of tabs.
 color ,red " +	+"
 
 # Nano's name, including version.
 color brightred "(GNU )?nano [1-9]\.[0-9]\.[^[:space:][:punct:]]+"
+
+# Email addresses.
+color magenta "<[[:alnum:].%_+-]+@[[:alnum:].-]+\.[[:alpha:]]{2,}>"

syntax/elisp.nanorc

@@ -1,6 +1,7 @@
 ## Here is an example for Emacs Lisp.
 
 syntax "elisp" "\.el$"
+magic "Lisp/Scheme program"
 comment ";"
 
 # Basic functions/macros

syntax/gentoo.nanorc

@@ -1,19 +1,20 @@
-## Here is an example for Gentoo ebuilds/eclasses.
+## Here is an example for Gentoo ebuilds/eclasses,
+## and (further down) one for Portage control files.
 
 syntax "ebuild" "\.e(build|class|blit)$"
 comment "#"
 
-## All the standard portage functions
+## All the standard portage functions:
 color brightgreen "(^|\<default_)src_(unpack|prepare|configure|compile|install|test)\>"
 color brightgreen "^pkg_(config|nofetch|info|pretend|setup|(pre|post)(inst|rm))\>"
 color brightgreen "\<default(_pkg_nofetch|_src_(unpack|prepare|configure|compile|test))?\>"
-## Highlight bash related syntax
+## Bash-related syntax:
 color green "\<(break|case|continue|do|done|elif|else|esac|exit|fi|for|function|if|in|read|return|select|shift|then|time|until|while)\>"
 color green "\<(declare|eval|exec|export|let|local)\>"
 color green "[{}():;|`$<>!=&\\]" "(\]|\[)"
 color green "-[defhnrsuwxzL]\>"
 color green "-(eq|ne|gt|lt|ge|le)\>"
-## Highlight variables ... official portage ones in red, all others in bright red
+## Variables... official portage ones in red, all others in bright red:
 color brightred "\$[-0-9@*#?$!]" "\$[[:alpha:]_][[:alnum:]_]*"
 color brightred "\$\{[#!]?([-@*#?$!]|[0-9]+|[[:alpha:]_][[:alnum:]_]*)(\[([[:digit:]]|@)+\])?(([#%/]|:?[-=?+])[^}]*\}|\[|\})"
 color red "\<(EAPI|ARCH|HOMEPAGE|DESCRIPTION|IUSE|SRC_URI|LICENSE|SLOT|KEYWORDS|[HPR]?DEPEND|PROVIDE|PROPERTIES|REQUIRED_USE|RESTRICT|USERLAND)\>"
@@ -22,7 +23,7 @@ color red "\<(AS|C(PP|XX)?|LD)FLAGS\>" "\<C(HOST|TARGET|BUILD)\>" "\<(MERGE_TYPE
 color red "\<EBUILD_PHASE(_FUNC)?\>"
 color red "\<QA_((TEXTRELS|EXECSTACK|WX_LOAD)(_[a-zA-Z_0-9]+)?|DT_HASH|PRESTRIPPED)\>"
 color red "\<(PATCHES|(HTML_)?DOCS)\>" "\<WANT_(AUTO(CONF|MAKE)|LIBTOOL)\>" "\<AT_M4DIR\>"
-## Highlight portage commands
+## Portage commands:
 color magenta "\<(use(_(with|enable|if_iuse)|x)?|in_iuse)\> [!a-zA-Z0-9_+ -]*" "inherit.*"
 color brightblue "\<e(begin|end|conf|install|make|qmake4|ant|(qa)?warn|infon?|error|log|patch(_user)?|new(group|user))\>"
 color brightblue "\<e(pause|beep|mktemp|(cvs|svn)_clean|punt_cxx)\>" "\<e(aclocal|auto(reconf|header|conf|make)|libtoolize)\>"
@@ -35,20 +36,21 @@ color brightblue "\<prepall(docs|info|man|strip)?\>" "\<prep(info|lib|lib\.(so|a
 color brightblue "\<(doc|ins|exe)?into\>" "\<(f|games)(owners|perms)\>" "\<(exe|ins|dir)opts\>"
 color brightblue "\<tc-get(BUILD_)?(AR|AS|CC|CPP|CXX|LD|NM|OBJCOPY|PKG_CONFIG|RANLIB)\>"
 color brightblue "\<tc-(arch(-kernel)?|export|has-(tls|openmp))\>"
-## Highlight common commands used in ebuilds
+## Common commands used in ebuilds:
 color blue "\<(awk|cat|cd|chmod|chown|cp|echo|env|find|e?grep|ln|make|mkdir|mv|popd|printf|pushd|rm|rmdir|sed|set|tar|touch|unset|xargs)\>"
-## Highlight comments (doesnt work that well)
+## Comments (doesn't work that well):
 color yellow "(^|[[:space:]])#.*$"
-## Highlight strings (doesnt work that well)
+## Strings (doesn't work that well):
 color brightyellow ""(\\.|[^\"])*"" "'(\\.|[^'])*'"
 ## Trailing space is bad!
 color ,green "[[:space:]]+$"
 ## Mixed whitespace is also bad.
 color ,green " 	"
 
-## Here is an example for Portage control files.
-##
+
 syntax "/etc/portage" "\.(accept_keywords|env|keywords|mask|unmask|use)(/.+)?$"
+comment "#"
+
 ## Base text:
 color green "^.+$"
 ## Likely version and slot numbers:

syntax/guile.nanorc

@@ -2,7 +2,6 @@
 
 syntax "guile" "\.scm$"
 header "^#!.*guile"
-magic "guile"
 comment ";"
 
 # Basic scheme functions

syntax/html.nanorc

@@ -1,11 +1,11 @@
 ## Here is an example for HTML.
 
 syntax "html" "\.html?$"
-magic "HTML document text"
+magic "HTML document"
 comment "<!--|-->"
 
 # Tags:
-color cyan start="<[[:alpha:]/!?]" end=">"
+color cyan "<[[:alpha:]/!?][^>]*>"
 # Bold, italic, and underlined:
 color brightmagenta "</?[biu]>"
 

syntax/lua.nanorc

@@ -5,6 +5,7 @@
 ## Version: 2011-05-05
 
 syntax "lua" "\.lua$"
+magic "Lua script"
 comment "--"
 
 color brightwhite "\[\[.*\]\]"

syntax/makefile.nanorc

@@ -1,6 +1,7 @@
 ## Here is an example for Makefiles.
 
 syntax "makefile" "Makefile[^/]*$" "\.(make|mk)$"
+magic "makefile script"
 comment "#"
 
 color red "[:=]"

syntax/man.nanorc

@@ -1,7 +1,7 @@
 ## Here is an example for manpages.
 
 syntax "man" "\.[1-9]x?$"
-magic "troff or preprocessor input text"
+magic "troff or preprocessor input"
 comment ".\""
 
 color green "\.(SH|SS|TH) .*$"

syntax/nanohelp.nanorc

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

syntax/nanorc.nanorc

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

syntax/objc.nanorc

@@ -1,6 +1,7 @@
 ## Here is an example for C/C++/Obj-C.
 
 syntax "m" "\.m$"
+magic "Objective-C source"
 comment "//"
 
 # Stuffs,

syntax/ocaml.nanorc

@@ -1,6 +1,7 @@
 ## Syntax highlighting for OCaml.
 
 syntax "ocaml" "\.mli?$"
+magic "OCaml"
 comment "(*|*)"
 
 # Uid:

syntax/patch.nanorc

@@ -1,7 +1,7 @@
 ## Here is an example for patch files.
 
 syntax "patch" "\.(patch|diff|debdiff)$"
-magic "diff output text"
+magic "diff output"
 # There is no official support for comments in patch files.
 comment ""
 

syntax/perl.nanorc

@@ -2,7 +2,7 @@
 
 syntax "perl" "\.p[lm]$"
 header "^#!.*perl[-0-9._]*"
-magic "Perl script text"
+magic "Perl script"
 comment "#"
 
 color red "\<(accept|alarm|atan2|bin(d|mode)|c(aller|h(dir|mod|op|own|root)|lose(dir)?|onnect|os|rypt)|d(bm(close|open)|efined|elete|ie|o|ump)|e(ach|of|val|x(ec|ists|it|p))|f(cntl|ileno|lock|ork))\>" "\<(get(c|login|peername|pgrp|ppid|priority|pwnam|(host|net|proto|serv)byname|pwuid|grgid|(host|net)byaddr|protobynumber|servbyport)|([gs]et|end)(pw|gr|host|net|proto|serv)ent|getsock(name|opt)|gmtime|goto|grep|hex|index|int|ioctl|join)\>" "\<(keys|kill|last|length|link|listen|local(time)?|log|lstat|m|mkdir|msg(ctl|get|snd|rcv)|next|oct|open(dir)?|ord|pack|pipe|pop|printf?|push|q|qq|qx|rand|re(ad(dir|link)?|cv|do|name|quire|set|turn|verse|winddir)|rindex|rmdir|s|scalar|seek(dir)?)\>" "\<(se(lect|mctl|mget|mop|nd|tpgrp|tpriority|tsockopt)|shift|shm(ctl|get|read|write)|shutdown|sin|sleep|socket(pair)?|sort|spli(ce|t)|sprintf|sqrt|srand|stat|study|substr|symlink|sys(call|read|tem|write)|tell(dir)?|time|tr(y)?|truncate|umask)\>" "\<(un(def|link|pack|shift)|utime|values|vec|wait(pid)?|wantarray|warn|write)\>"

syntax/php.nanorc

@@ -1,7 +1,7 @@
 ## Here is an example for PHP.
 
 syntax "php" "\.ph(p[23457s~]?|tml)$"
-magic "PHP script text"
+magic "PHP script"
 comment "//"
 
 # PHP markings.
@@ -13,10 +13,10 @@ color white "\<[a-z_]*\("
 color cyan "\$[a-z_]+"
 
 # Types.
-color green "\<(array|bool|callable|const|float|global|int|object|static|string|var)\>"
+color green "\<(array|bool|callable|const|float|global|int|object|string|var)\>"
 
 # Directives and structure.
-color brightyellow "\<(abstract|as|class|clone|declare|enddeclare|extends|function|implements|include(_once)?|inst(ance|ead)of|interface|namespace|new|private|protected|public|require(_once)?|trait|use|yield)\>"
+color brightyellow "\<(abstract|as|class|clone|(end)?declare|extends|function|implements|include(_once)?|inst(ance|ead)of|interface|namespace|new|private|protected|public|require(_once)?|static|trait|use|yield)\>"
 color brightyellow "\<(case|catch|default|do|echo|else(if)?|end(for(each)?|if|switch|while)|final(ly)?|for(each)?|if|print|switch|throw|try|while)\>"
 # Operators.
 color brightyellow "\<(and|or|xor)\>"

syntax/postgresql.nanorc

@@ -1,7 +1,6 @@
 ## Here is an example for PostgreSQL.
 
 syntax "sql" "\.sql[2345s~]?$"
-magic "PostgreSQL script text"
 comment "-- "
 
 # Functions.

syntax/python.nanorc

@@ -2,6 +2,7 @@
 
 syntax "python" "\.py$"
 header "^#!.*python[-0-9._]*"
+magic "Python script"
 linter pyflakes
 comment "#"
 
@@ -17,8 +18,8 @@ color brightgreen ""([^"\]|\\.)+""
 # Comments.
 color brightred "(^|[[:blank:]])#.*$"
 # Triple-quoted strings.
-color brightgreen    start="'''[^'),]" end="(^|[^(\])'''"
-color brightgreen start="\"\"\"[^"),]" end="(^|[^(\])\"\"\""
+color brightgreen    start="'''([^'),]|$)" end="(^|[^(\])'''"
+color brightgreen start="\"\"\"([^"),]|$)" end="(^|[^(\])\"\"\""
 
 # Reminders.
 color ,yellow "(FIXME|TODO|XXX)"

syntax/ruby.nanorc

@@ -2,6 +2,7 @@
 
 syntax "ruby" "\.rb$"
 header "^#!.*ruby[-0-9._]*"
+magic "Ruby script"
 linter ruby -w -c
 comment "#"
 

syntax/sh.nanorc

@@ -2,7 +2,7 @@
 
 syntax "sh" "\.sh$"
 header "^#!.*((ba|da|k|pdk)?sh[-0-9_]*|openrc-run|runscript)"
-magic "(POSIX|Bourne.*) shell script text"
+magic "(POSIX|Bourne-Again) shell script.*text"
 linter dash -n
 comment "#"
 

syntax/tcl.nanorc

@@ -1,6 +1,7 @@
 ## Syntax highlighting for Tcl files.
 
 syntax "tcl" "\.tcl$"
+magic "Tcl(/Tk)? script"
 comment "#"
 
 # Standard Tcl [info commands]:

syntax/tex.nanorc

@@ -1,6 +1,7 @@
 ## Here is a short example for TeX files.
 
 syntax "tex" "\.tex$"
+magic "(La)?TeX document"
 linter chktex -v0 -q -I
 comment "%"
 

syntax/texinfo.nanorc

@@ -2,14 +2,14 @@
 
 syntax "texinfo" "\.texi$"
 header "^\\input texinfo"
-magic "Texinfo source text"
+magic "Texinfo source"
 comment "@c "
 
 # Command arguments, trailing and enclosed.
 color cyan "^@[a-z]+[[:space:]]+.*$"
-color brightmagenta "@[a-z]+\{[^}]*\}"
+color brightmagenta "@[a-zA-Z]+\{[^}]*\}"
 # Commands themselves.
-color yellow "@[a-z]+\{?" "\}"
+color yellow "@[a-zA-Z]+\{?" "\}"
 
 # Menu items.
 color brightred "^\*[[:space:]]+.*::.*$"

syntax/xml.nanorc

@@ -2,7 +2,7 @@
 
 syntax "xml" "\.([jrsx]html?|jnlp|mml|pom|rng|sgml?|svg|w[as]dl|wsdd|xjb|xml|xs(d|lt?)|xul)$"
 header "<\?xml.*version=.*\?>"
-magic "(XML|SGML) (sub)?document text"
+magic "(XML|SGML) (sub)?document"
 comment "<!--|-->"
 
 # The entire content of the tag: