po: update translations and regenerate POT file and PO files

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

.gitignore

@@ -16,6 +16,7 @@ core
 /ABOUT-NLS
 /INSTALL
 /aclocal.m4
+/ar-lib
 /autom4te.cache
 /compile
 /config.cache
@@ -34,6 +35,47 @@ core
 /mkinstalldirs
 /stamp-h1
 
+# gettext m4 files.
+/m4/codeset.m4
+/m4/extern-inline.m4
+/m4/fcntl-o.m4
+/m4/gettext.m4
+/m4/glibc2.m4
+/m4/glibc21.m4
+/m4/iconv.m4
+/m4/intdiv0.m4
+/m4/intl.m4
+/m4/intldir.m4
+/m4/intlmacosx.m4
+/m4/intmax.m4
+/m4/inttypes-pri.m4
+/m4/inttypes_h.m4
+/m4/lcmessage.m4
+/m4/lib-ld.m4
+/m4/lib-link.m4
+/m4/lib-prefix.m4
+/m4/lock.m4
+/m4/longlong.m4
+/m4/nls.m4
+/m4/po.m4
+/m4/printf-posix.m4
+/m4/progtest.m4
+/m4/size_max.m4
+/m4/stdint_h.m4
+/m4/threadlib.m4
+/m4/uintmax_t.m4
+/m4/visibility.m4
+/m4/wchar_t.m4
+/m4/wint_t.m4
+/m4/xsize.m4
+
+# gnulib entries
+/gnulib/
+/lib/
+/m4/.gitignore
+/m4/gnulib-cache.m4
+/snippet/
+
 /nano.spec
 /src/nano
 /src/revision.h

AUTHORS

@@ -8,8 +8,8 @@ Chris Allegretta <chrisa@asty.org>
 David Lawrence Ramsey <pooka109@gmail.com>
 	* Former stable series maintainer.  Multiple buffer support,
 	  operating dir (-o) option, bug fixes for display routines,
-	  wrapping code, spelling fixes, const mode, parts of the
-	  UTF-8 support, and various other fixes.
+	  wrapping code, spelling fixes, constantshow mode, parts of
+	  UTF-8 support, softwrap overhaul, and various other fixes.
 
 Jordi Mallach <jordi@gnu.org>
 	* Debian package maintainer, fellow bug squasher.
@@ -39,7 +39,8 @@ Mike Frysinger <vapier@gentoo.org>
 	* Gentoo package maintainer.  Whitespace display mode,
 	  --enable-utf8/--disable-utf8 configure options for ncurses,
 	  many new color regexes and improvements to existing color
-	  regexes in syntax/*.nanorc, and miscellaneous bug fixes.
+	  regexes in syntax/*.nanorc, the move from svn to git, the
+	  conversion to gnulib, and miscellaneous bug fixes.
 
 Mark Majeres <mark@engine12.com>
 	* A functional undo/redo system, and coloring nano's interface.
@@ -56,6 +57,9 @@ Faissal Bensefia <faissaloo@gmail.com>
 Sumedh Pendurkar <sumedh.pendurkar@gmail.com>
 	* The word-completion feature.
 
+Rishabh Dave <rishabhddave@gmail.com>
+	* Searchable help.
+
 Benno Schulenberg <bensberg@justemail.net>
 	* An array of small bug fixes, the cut-word and block-jump
 	  routines, text selection by holding Shift, and some extra

ChangeLog

@@ -1,3 +1,804 @@
+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:
+----------------------------------
+
+Benno Schulenberg (34):
+      bindings: allow toggling a new buffer when multiple buffers are enabled
+      build: don't use a dummy dependency, as it breaks non-GNU makes
+      build: for Solaris, tell the linker where to find clock_gettime()
+      build: use backticks to avoid a warning during autoreconf
+      build: use the "force" mechanism to always run the revision rule
+      bump version numbers and add a news item for the 2.8.3 release
+      chars: optimize moving a character left in the non-UTF-8 case
+      chars: probe for a valid UTF-8 starter byte, instead of overstepping
+      chars: valid UTF-8 codes are at most 4 bytes long, so look only that far
+      display: keep the cursor put, also when toggling nohelp or morespace
+      files: don't ask "save anyway" when user orders to discard the buffer
+      history: don't save the cursor position for temporary help files
+      moving: limit the target column when it is beyond the last chunk
+      replacing: don't let placewewant influence the placement of the cursor
+      startup: don't call delwin() with NULL, to avoid crashing on Solaris
+      syntax: makefile: color comments only at start of line or after whitespace
+      syntax: nanohelp: color also ^6 as a shortcut keystroke
+      syntax: php: color also variable names, and color more reserved words
+      syntax: php: recognize also the .phtml and .php7 extensions
+      syntax: xml: recognize an XML file also by its first line
+      tweaks: add another warning for an impossible condition
+      tweaks: adjust whitespace and comments after the preceding change
+      tweaks: avoid an empty function call in tiny version with line numbers
+      tweaks: exclude from the tiny version five error-betraying messages
+      tweaks: exclude from the tiny version two messages that will never occur
+      tweaks: fix compilation with --enable-tiny ...-help and ...-multibuffer
+      tweaks: remove an old fault-catching message
+      tweaks: remove five dummy function definitions from the tiny version
+      tweaks: rename three empty functions, and reshuffle some others
+      tweaks: rewrap a couple of old items in NEWS, and fix an article
+      tweaks: swap a comparison, to be clearer
+      tweaks: transform the token DISABLE_BROWSER to ENABLE_BROWSER
+      tweaks: transform the token DISABLE_NANORC to ENABLE_NANORC
+      tweaks: transform the token DISABLE_TABCOMP to ENABLE_TABCOMP
+
+David Lawrence Ramsey (2):
+      display: ensure smooth scrolling when the edit window is resized
+      tweaks: fix several whitespace irregularities
+
+
+Changes between v2.8.1 and v2.8.2:
+----------------------------------
+
+Benno Schulenberg (64):
+      bindings: allow using <Backspace> to scroll back up in the help viewer
+      bindings: allow using '/' to start a search in the help viewer
+      bindings: show Home and End in browser help text, instead of M-| and M-?
+      browser: make ^End work properly by fixing a paste error
+      build: make --enable-help properly depend on --enable-multibuffer
+      bump version numbers and add a news item for the 2.8.2 release
+      display: initialize the colors only when starting to draw the content
+      display: push the titlebar to the screen as soon as it has been drawn
+      docs: add an item to the FAQ, about pasting from Windows to a remote nano
+      docs: harmonize the nanorc man page and Info document a bit
+      docs: in the FAQ, extend the answer to the pasting problem
+      docs: reword the main paragraph of the man page
+      docs: update the list of who authored what
+      gnulib: update to its current state in git
+      help: after a search, show the cursor only when something was found
+      help: allocate enough space for the descriptions, so we don't crash
+      help: don't crash when nano was started with --noread
+      help: don't cycle forward in the buffers when exiting from help
+      help: keep the same position also after M-\ or M-/ has been used
+      help: keep the text at the same position when the screen is resized
+      help: remove the final blank line, so <End> does the same as all <Down>
+      help: set tabsize to the default width while showing a help text
+      help: suppress nano's name and number to make it clearer this is help
+      help: use a dedicated syntax to color shortcuts in a help text
+      help: when searching, do it forward, without case, and without regexes
+      input: avoid crashing when resizing the window during verbatim input
+      options: allow -U (--quickblank) to be used in the tiny version
+      scrolling: don't bother to limit the number of lines to step back
+      startup: warn about a strange character size only in the UTF-8 case
+      syntax: nanohelp: change the hue of the keystrokes to match sample.nanorc
+      tweaks: add a warning for a condition that should never occur
+      tweaks: add three warnings for conditions that should never occur
+      tweaks: avoid an unused-variable warning
+      tweaks: be more precise about what --disable-extra does
+      tweaks: check for an empty needle in a central place
+      tweaks: complete the exclusion of backups and such from the tiny version
+      tweaks: condense two bits of code, and drop two asserts
+      tweaks: distinguish (in the comments) between buffers and linestructs
+      tweaks: drop a bunch of asserts
+      tweaks: elide a function that is used just once
+      tweaks: fix compilation with --enable-tiny --enable-color --enable-speller
+      tweaks: fix two typos
+      tweaks: remove a superfluous check
+      tweaks: remove a superfluous strlen() call from the reverse searches
+      tweaks: remove some superfluous placements of the cursor
+      tweaks: remove two superfluous calls of wnoutrefresh()
+      tweaks: rename a constant, to match the corresponding option
+      tweaks: rename a function, to be more accurate
+      tweaks: rename a function, to better suit what it does
+      tweaks: rename another function, to better describe what it does
+      tweaks: rename a parameter, to be more imperative
+      tweaks: rename a variable, use a faster comparison, and reshuffle a bit
+      tweaks: rename one variable again
+      tweaks: rename some more of these 'rev_start' variables
+      tweaks: rename three variables, elide another, and reshuffle some stuff
+      tweaks: rename two variables, because this 'rev_start' is irksome
+      tweaks: reshuffle a couple of lines to avoid a duplicate call
+      tweaks: reshuffle help-text initialization, to elide a save-and-restore
+      tweaks: reshuffle some more stuff, and rename two more variables
+      tweaks: swap the names of two variables, to make more sense
+      tweaks: transform the token DISABLE_MOUSE to ENABLE_MOUSE
+      tweaks: transform the token DISABLE_MULTIBUFFER to ENABLE_MULTIBUFFER
+      tweaks: use the logic from revstrstr() also in mbrevstrcasestr()
+      tweaks: use the logic from revstrstr() also in revstrcasestr()
+
+David Lawrence Ramsey (1):
+      docs: mention that also numbercolor overrides boldtext
+
+Rishabh Dave (1):
+      new feature: add a search facility to the help viewer
+
+
+Changes between v2.8.0 and v2.8.1:
+----------------------------------
+
+Benno Schulenberg (33):
+      bindings: make ^Home and ^End go to top and tail of buffer
+      bindings: make ^Up/^Down go to first/last row in the file browser
+      bindings: use arrows instead of words to designate the cursor keys
+      bump version numbers and add a news item for the 2.8.1 release
+      copyright: update the year in --version, and use the standard hyphen
+      copyright: update the years, use ranges, and explain this usage
+      display: check the correct character for being double-width
+      display: with softwrap, show the cursor where the eye expects it
+      docs: correct an answer to a question in the FAQ
+      docs: mention another difference with Pico in the Info document
+      docs: remove the self-referencing stuff and the changelog from the FAQ
+      docs: trim the TODO file a bit, and put the more important items first
+      editing: avoid creating blank lines when using autoindent
+      files: check also for write errors when prepending, not just read errors
+      gnulib: update to current state
+      linting: treat a tab as one "column", not eight
+      linting: when no is said to a file, remove all corresponding entries
+      moving: when determining where we are on the screen, use placewewant
+      tweaks: adjust a couple of comments
+      tweaks: again use memory on the stack instead of malloc() and free()
+      tweaks: close the backup file also when we skip making a backup
+      tweaks: delete a function that hasn't been used since 2005
+      tweaks: delete unnecessary function prototypes
+      tweaks: elide a variable and a pair of braces
+      tweaks: fix some inconsistencies in an old Changelog
+      tweaks: fix two typos in the NEWS file
+      tweaks: group ^D and ^H together in the help lines
+      tweaks: keep the help text aligned, also with the narrow arrows
+      tweaks: put M-A before ^6, to look better above M-6 in the help lines
+      tweaks: put unshifted shortcuts ^6 and M-6 first, instead of ^^ and M-^
+      tweaks: reduce the number of additions that actual_x() performs
+      tweaks: replace a function call or a macro with a hard number
+      tweaks: use memory on the stack instead of calling malloc() and free()
+
+David Lawrence Ramsey (5):
+      bindings: use arrows instead of words for search history too
+      display: show '<' and '>' placeholders for characters that get split
+      input: support escape sequences for ^Home and ^End
+      scrolling: properly compensate for the onscreen chunks
+      tweaks: avoid a compilation warning
+
+Kamil Dudka (1):
+      backup: prevent a symlink attack by operating on the file descriptor
+
+Mike Frysinger (2):
+      configure: fix up word boundary regex logic now that we have gnulib
+      configure: ignore the REG_ENHANCED test when we use gnulib
+
+
+Changes between v2.7.5 and v2.8.0:
+----------------------------------
+
+Benno Schulenberg (56):
+      bindings: accept "q" and "x" to exit from help viewer and file browser
+      bindings: group the three search-again shortcuts together
+      bump version numbers and add a news item for the 2.8.0 release
+      docs: mention some more differences with Pico in the Info document
+      files: drop the pointless "[from ./]" from the insert-file prompt
+      files: on second thought... keep the "[from ./]"
+      input: count a manually entered unicode as one character
+      moving: don't try to redraw lines that have gone outside the viewport
+      moving: /do/ redraw the prior line when the viewport hasn't changed
+      moving: the current chunk cannot be beyond the last chunk of a line
+      oops -- that's what you get when you don't test things before pushing
+      painting: don't try to start highlighting before column zero
+      screen: don't push the longer-line indicator ($) to the next row
+      spelling: keep the cursor at end-of-line if it was there
+      startup: add option 'nopauses' to disable pausing after a warning
+      tweaks: add a warning for a condition that should never occur
+      tweaks: avoid a few needless reallocations
+      tweaks: chuck some debugging stuff and some useless asserts
+      tweaks: condense some declarations by reshuffling
+      tweaks: correct some formatting irregularities in the FAQ
+      tweaks: don't loop over an initializer
+      tweaks: don't optimize for the wrong case
+      tweaks: don't turn the mark off before it's needed
+      tweaks: ehm... the warning is more important for the softwrap case
+      tweaks: elide an intermediate variable
+      tweaks: elide a small intermediate buffer
+      tweaks: elide a variable
+      tweaks: elide two variables, and condense some statements
+      tweaks: factor out a bit of common code
+      tweaks: fix compilation with --enable-tiny --enable-help
+      tweaks: frob a couple of comments
+      tweaks: frob some parentheses and other things, to be more consistent
+      tweaks: gettextize a forgotten error message
+      tweaks: make WhereIsNext available in browser in tiny version
+      tweaks: mark a message for translation
+      tweaks: optimize determining the number of columns that a text spans
+      tweaks: reduce the scope of five variables, and frob some comments
+      tweaks: remove a disabled warning, and adjust a translator hint
+      tweaks: rename and shorten a small helper function
+      tweaks: rename a variable and invert its logic
+      tweaks: rename a variable, drop a false assert, and reshuffle a bit
+      tweaks: rename three variables, to better distinguish bytes from columns
+      tweaks: rename two variables, to be more distinctive
+      tweaks: reshuffle some lines and adjust some comments
+      tweaks: reshuffle some more lines and improve four comments
+      tweaks: reshuffle some statements, to avoid double assignments
+      tweaks: reshuffle the bindings to group things more logically
+      tweaks: reshuffle three statements, and shorten a comment
+      tweaks: reshuffle two declarations for a more consistent order
+      tweaks: shorten a bit of logic
+      tweaks: simplify and correct a computation
+      tweaks: suggest a separate color scheme for root
+      tweaks: trim a displayable string in a more efficient manner
+      tweaks: use two extra variables to make it clearer what is being done
+      usage: don't mention +LINE,COLUMN as an option, because it isn't
+      wrapping: add the correct char length when skipping consecutive blanks
+
+David Lawrence Ramsey (52):
+      configure: don't check for the existence of iswspace() anymore
+      display: don't compensate for chunks before firstcolumn
+      display: don't draw more chunks than the screen can hold
+      display: limit an optimization to non-softwrap mode
+      display: make PageUp/PageDown use the correct beginning of the viewport
+      docs: update README.GIT for gnulib-related changes
+      files: revamp the insertion of a file, to be more like pasting text
+      moving: determine the correct leftedge when paging up/down too
+      replacing: fix spotlight() to highlight words properly in softwrap mode
+      softwrap: account for firstcolumn in reset_cursor()
+      softwrap: account for firstcolumn when checking for offscreen current
+      softwrap: account for firstcolumn when scrolling up a line
+      softwrap: account for softwrap in get_page_start()
+      softwrap: account for softwrapped chunks when adding text
+      softwrap: account for softwrap when checking whether current is offscreen
+      softwrap: add two chunk-iterator functions
+      softwrap: adjust firstcolumn when the window width changes
+      softwrap: count softwrapped chunks properly in do_gotolinecolumn()
+      softwrap: count softwrapped chunks properly in do_uncut_text()
+      softwrap: count softwrapped chunks properly in read_file()
+      softwrap: improve End's behavior with softwrapped chunks
+      softwrap: improve Home's behavior with softwrapped lines
+      softwrap: improve Left and Right's behavior with softwrapped chunks
+      softwrap: improve PageUp and PageDown's behavior with softwrapped chunks
+      softwrap: improve Up and Down's behavior with softwrapped chunks
+      softwrap: iterate through softwrapped chunks better in do_mouse()
+      softwrap: iterate through softwrapped chunks in adjust_viewport()
+      softwrap: iterate through softwrapped chunks in edit_scroll()
+      softwrap: move the updating of a softwrapped line to a new function
+      softwrap: prepare for a more flexible viewport
+      softwrap: remove and replace workarounds for firstcolumn
+      softwrap: save and restore firstcolumn when copying text
+      softwrap: save and restore firstcolumn when internally spell-fixing text
+      softwrap: save and restore firstcolumn when replacing text
+      softwrap: save firstcolumn when justifying, restore it when unjustifying
+      speller: fix replacing marked text in the alternate spell checker
+      syntax: nanorc: color also the option "linenumbers" as being valid
+      tweaks: add a parameter to do_home() and do_end()
+      tweaks: fix a comment typo
+      tweaks: mention nano's ability to read from standard input in usage()
+      tweaks: move comments outside of if blocks in break_line()
+      tweaks: prepare for improvements to do_home() and do_end()
+      tweaks: remove cluttering #ifdefs from break_line()
+      tweaks: rename need_horizontal_scroll() to line_needs_update()
+      tweaks: slightly optimize an allocation in display_string()
+      tweaks: stop converting text once we overshoot span columns
+      undo: fix undoing/redoing insertions, since they no longer do partitioning
+      usage: mention the -g/--showcursor option
+      weeding: remove ensure_line_is_visible()
+      weeding: remove maxlines and related code
+      weeding: remove partitioning and related stuff from do_insertfile()
+      weeding: remove partitioning and related stuff from do_justify()
+
+Hans-Bernhard Broeker (1):
+      tweaks: make sure calls to <ctype.h> functions/macros use "unsigned char"
+
+Mike Frysinger (19):
+      add an explicit test for set_escdelay()
+      add support for gnulib
+      assume getopt_long support is always available
+      assume regex.h support is always available
+      configure: require autoconf-2.69/automake-1.14
+      configure: require gettext-0.18.3, and drop our bundled m4 files
+      drop the getdelim/getline fallback functions
+      drop the glib fallback for snprintf/vsnprintf
+      drop the isblank/iswblank fallback functions
+      drop the wchar.h/wctype.h/stdarg.h checks
+      drop various str fallback functions
+      fix build on systems without pwd.h
+      handle builds on systems without termios.h
+      handle deficient signal systems
+      pull in the glob module from gnulib
+      pull in the lstat module from gnulib
+      pull in the nl_langinfo & wcwidth modules from gnulib
+      pull in the sys_wait module from gnulib
+      tweaks: disable gnulib's workaround for the globbing of broken symlinks
+
+
+Changes between v2.7.4 and v2.7.5:
+----------------------------------
+
+Benno Schulenberg (65):
+      bump version numbers and add a news item for the 2.7.5 release
+      files: leave out the confusing "[from ./]" when prompting for a command
+      general: stop the spell checker from crashing after the changes in search
+      justify: reduce the character count when trimming trailing spaces
+      painting: account for index maybe being zero after the preceding change
+      painting: advance only when both start /and/ end match are zero-length
+      painting: do not bluntly ignore zero-length start matches -- handle them
+      painting: do not let a match for 'end' overlap a match for 'start'
+      painting: don't look at the current multidata when coloring a line
+      painting: make use of the multidata of the preceding line
+      painting: mark an unpaired start match as CWOULDBE
+      painting: properly detect a change in start/end matches
+      painting: properly look for a new start match only after the end match
+      painting: stay within the line when skipping zero-length matches
+      painting: when skipping a zero-length match, skip a character, not a byte
+      rcfile: don't accept empty regexes for syntax coloring
+      replacing: compensate cursor position only for replacements /before/ it
+      replacing: detect when the whole region has already been covered
+      replacing: don't go outside of the selected region
+      replacing: ignore the first match when the user said no
+      replacing: start at the region's edge instead of one step before it
+      replacing: stop searching in a region when edge of buffer is reached
+      screen: don't compare a character index with a column position
+      screen: ehm... no, that was wrong: page_start /is/ a column position
+      search: begin from where we are, to be able to find the first \B
+      search: make the \b and \B anchors work correctly in both directions
+      spelling: correctly adjust the length of a single-line region
+      spelling: don't unnecessarily fiddle with the viewport
+      startup: report an error when the given line or column number is invalid
+      statusbar: display at most three consecutive alert messages
+      tweaks: adjust some comments, reshuffle a line, and use a while loop
+      tweaks: adjust two comments, to be more accurate
+      tweaks: adjust whitespace after preceding changes
+      tweaks: and rename another variable, to keep in style
+      tweaks: chuck some obscuring debugging stuff
+      tweaks: condense a comment, rename a variable, and use a while loop
+      tweaks: differentiate single-regex matches from paired-regex matches
+      tweaks: discard the now unused multidata-resetting routine
+      tweaks: elide a variable plus its corresponding dark logic
+      tweaks: fiddle with some wordings in the texinfo document
+      tweaks: free an option string also when it was invalid
+      tweaks: move a comment and rewrap a line
+      tweaks: normalize some paragraph formatting in the FAQ
+      tweaks: rearrange some code to separate softwrap and normal mode more
+      tweaks: rename a function, and drop an unneeded parameter
+      tweaks: rename a function, to show it refers to screen rows
+      tweaks: rename another variable, to be shorter
+      tweaks: rename a variable and condense an if
+      tweaks: rename a variable -- lines refers to buffer, rows to screen
+      tweaks: rename a variable, to be more general
+      tweaks: rename a variable, to be more general and match one elsewhere
+      tweaks: rename some variables, to better distinguish rows from lines
+      tweaks: rename some variables, to show they refer to screen rows
+      tweaks: rename two variables, and always pass a valid result back
+      tweaks: rename two variables, to avoid double negatives
+      tweaks: reshuffle an assignment and trim some comments
+      tweaks: reshuffle a test to a better place
+      tweaks: reshuffle three variables
+      tweaks: scrap a bunch of debugging lines -- they obscure the logic
+      tweaks: scrap some debugging stuff
+      tweaks: slightly speed up the change detection for multiline matches
+      tweaks: swap two blocks of code to reduce the number of #ifdefs
+      tweaks: update some copyright years
+      tweaks: use a cheaper way to detect an end-of-line
+      tweaks: use a subtraction instead of a counter
+
+David Lawrence Ramsey (16):
+      docs: mention the ability to read from stdin
+      screen: don't hide two-column characters at left edge in softwrap mode
+      tweaks: adjust and correct some comments
+      tweaks: always directly do a refresh when the margin changes
+      tweaks: do a comparison a bit differently in do_output() and do_deletion()
+      tweaks: fix compilation when configured with --enable-tiny
+      tweaks: improve comments and formatting in update_line()
+      tweaks: let update_line() return the correct value on error
+      tweaks: reduce duplicate code in new_magicline() and move_to_filestruct()
+      tweaks: rename a variable and adjust some types in edit_scroll()
+      tweaks: rename a variable in edit_redraw(), to make sense
+      tweaks: rename a variable in edit_scroll(), to make sense
+      tweaks: rename mouse_x & mouse_y to mouse_col & mouse_row in do_mouse()
+      tweaks: rename the functions for moving to and copying from a buffer
+      tweaks: rewrap two lines and fix two typos
+      tweaks: split the grafting code off from copy_from_buffer()
+
+Mike Frysinger (3):
+      syntax: c++: add override keyword
+      syntax: gentoo: flag mixed whitespace
+      syntax: gentoo: match .eblit files too
+
+
 Changes between v2.7.3 and v2.7.4:
 ----------------------------------
 

ChangeLog.1999-2006

@@ -5975,7 +5975,7 @@ GNU nano 1.1.8 - 2002.03.30
   do_insertfile()
 	- Handle cancel from ExtCmd properly. (David Benbennick)
   read_file()
-	- Abort if we read a file of 0 lines (num_lines == 0), fixes BUG #70.
+	- Abort if we read a file of 0 lines (num_lines == 0).  Fixes bug #70.
 	- Reverse tests to stop segfault on editing a new file of 0 lines.
 	  (David Benbennick)
 	- Change input var to one char instead of array. (David Benbennick)
@@ -6108,8 +6108,8 @@ GNU nano 1.1.7 - 2002.03.05
 	- Added Noconvert option to man page. (DLR)
 - nano.c:
   justify_format(), do_justify()
-        - Various fixes for starting blank spaces, spaces after
-          punctuation, & segfault with quoting strings. (David Benbennick)
+	- Various fixes for starting blank spaces, spaces after
+	  punctuation, & segfault with quoting strings. (David Benbennick)
   do_justify()
 	- Don't continue to justify string if it's indented more
 	  (quoting wise) than the beginning of the justification.
@@ -6139,8 +6139,8 @@ GNU nano 1.1.7 - 2002.03.05
 	- NANO_SMALL test was backwards. (Ken Tyler)
 - winio.c:
   strlenpt()
-        - Changed main function to strnlenpt() for new justify changes,
-          original function now just a stub.
+	- Changed main function to strnlenpt() for new justify changes,
+	  original function now just a stub.
 - nanorc.sample
 	- Mention unset in the sample nanorc.
 - po/ca.po, po/es.po:
@@ -6208,7 +6208,7 @@ nano-1.1.6 - 2002.01.25
 	- Temporarily unset REVERSE_SEARCH if it's set. (Rocco Corsi)
   do_suspend()
 	- Call tcsetattr() to restore the old terminal settings, so
-	  tcsh can use ^C after suspend for example (fixes BUG #68).
+	  tcsh can use ^C after suspend for example.  Fixes bug #68.
   do_wrap()
 	- Move "right" increment to part where new line is created,
 	  should change (fix?) some wrapping problems with autoindent.
@@ -6368,10 +6368,10 @@ nano-1.1.4 - 2001.12.11
 - nano.c:
   main()
 	- Add Esc-[-[IGL] keys for FreeBSD Console (PgUp,PgDn,Insert).
-        - Added better Hurd support for function keys (Alt-V,U,9,@,F).
+	- Added better Hurd support for function keys (Alt-V,U,9,@,F).
   signal_init()
-        - do SIG_IGN for the SIGTSTP sigaction regardless of whether
-          we have _POSIX_VDISABLE or not (more Hurd fixes)
+	- do SIG_IGN for the SIGTSTP sigaction regardless of whether
+	  we have _POSIX_VDISABLE or not (more Hurd fixes)
   help_init()
 	- Typo fixes and additions to the new help texts.
   do_curpos()
@@ -6487,10 +6487,10 @@ nano-1.1.2 - 2001.10.03
 	- Take control-space out of -tiny build, unneeded.
 - cut.c:
   cut_marked_segment()
-	- Add magic line when cutting a selection including filebot
-	  (discovered by DLR, fixed by DLR & Chris, fixes BUG #66).
+	- Add magic line when cutting a selection including filebot.
+	  Fixes bug #66. (discovered by DLR, fixed by DLR & Chris)
   do_cut_text()
-	- Don't recenter the line when cutting one line (DLR) (Bug #65).
+	- Don't recenter the line when cutting one line.  Fixes bug #65. (DLR)
 - faq.html:
 	- Notes about the Free Translation Project.
 	- Debian additions.
@@ -6681,14 +6681,14 @@ nano-1.1.0 - 2001.07.15
   add_to_cutbuffer()
 	- Remove useless statements. (Rocco)
   cut_marked_segment()
-	- Add bizarre copy of bot node, else *BSD goes ballistic (fixes
-          BUG #60).
+	- Add bizarre copy of bot node, else *BSD goes ballistic.  Fixes
+	  bug #60.
 	- Added 'destructive' argument.  Allows the selected text to be
 	  added to the cutbuffer without changing the contents of the
 	  file.  This allows writing selection to separate files.
   do_cut_text()
 	- If the line is empty when using -k and wasn't already added,
-	  create a dummy line and add it to the cutbuffer (fixes bug #61)
+	  create a dummy line and add it to the cutbuffer.  Fixes bug #61.
 	- Reset marked_cut if we blow away the cutbuffer.
 	- Moved the case of current == mark_beginbuf into cut_marked
 	  segment, so do_writeout could call it when writing selection to
@@ -6719,7 +6719,7 @@ nano-1.1.0 - 2001.07.15
 - move.c:
   page_up()
 	- Rewritten with a loop to make screen updates work when
-	  mark is set (fixes bug #59).
+	  mark is set.  Fixes bug #59.
   do_home(), do_end()
 	- Don't keep cutbuffer.
 - nano.1:
@@ -6756,7 +6756,7 @@ nano-1.1.0 - 2001.07.15
 	- Optimizations, remove "$" goes-to-last-line, less messages. (Rocco)
   do_replace()
 	- If we manage to make it in somehow with VIEW_MODE on, abort
-	  nicely (fixes BUG #59).
+	  nicely.  Fixes bug #59.
 - utils.c
   strcasestr()
 	- Replaced by mutt's mutt_stristr function, because the thought
@@ -6844,13 +6844,13 @@ nano-1.0.0 - 2001.03.22
 - move.c:
   page_down()
 	- Check for totlines < editwinrows in check for superfluous
-	  edit update (fixed BUG #57).
+	  edit update.  Fixes bug #57.
 - search.c:
   print_replaced()
 	- s/occurence/occurrence typos. (Jordi)
   search_init()
 	- If using Pico mode and regex and same answer is entered, use
-	  last_search string instead of answer (fixes BUG #56).
+	  last_search string instead of answer.  Fixes bug #56.
 - nano.texi:
 	- Meta-Z correction and grammar in --enable-tiny desc. (Neil Parks)
 
@@ -6868,7 +6868,7 @@ nano-0.9.99pre3 - 2001.02.19
 	- ALL_LINGUAS: added hu and ca.
 - cut.c:
   do_cut_text()
-	- marked text cut fixes (Rocco) (Fixes bug #54).
+	- Marked text cut fixes.  Fixes bug #54. (Rocco)
 - nano.c:
   do_delete()
 	- Added check for current->next == fileptr, as we have a magic
@@ -7016,7 +7016,7 @@ General -
 	  for now.
 	- Moved keypad() calls for PDCurses from main() to window_init()
 	  so the keypad continues to work after a Meta-X, for example.
-	  Fixed bug #51.
+	  Fixes bug #51.
 - faq.html:
 	- Fix typos and small mistakes. (Jordi)
 - files.c:
@@ -7038,7 +7038,7 @@ General -
 - move.c:
   page_down()
 	- Don't do an edit_update when there is only one page of text
-	  (fileage == edittop && filebot == editbot).  Fixes Bug #50.
+	  (fileage == edittop && filebot == editbot).  Fixes bug #50.
 - nano.c:
   main()
 	- Reorder the getopt options to be more or less alphabetical
@@ -7080,7 +7080,7 @@ General
 	  uncutting marked text at filebot. (Ryan Krebs)
 - files.c:
   read_file()
-	- If we encounter an error and insert is not set, run new_file().
+	- If we encounter an error and insert is not set, run new_file()
 	  (bug discovered by Ben Roberts).
   write_file()
 	- Change open call flags, basically copy joe's way of doing it so
@@ -7097,8 +7097,8 @@ General
 	  modify_control_key.  Removed #ifdef _POSIX_VDISABLE check
 	  around Control-S,Q,Z handlers because we need it now for
 	  the Alt-Alt-x code.
-	- Added --view option to getopt_long() call.  Bug discovered
-	  by Rocco Corsi.
+	- Added --view option to getopt_long() call (bug discovered by
+	  Rocco Corsi).
   help_init()
 	- Fix off by one error that was making ^G help in normal mode and
 	  ^_ in Pico mode not be displayed in the help (bug discovered by
@@ -7292,7 +7292,7 @@ nano 0.9.20 - 2000.11.18
 - nano.c:
   keypad_on()
 	- New function, toggles turning the keypad on and off in edit and
-	  bottomwin().  Added call to this in finish(), fixes bug #45.
+	  bottomwin().  Added call to this in finish().  Fixes bug #45.
 - search.c
   findnextstr()
 	- New arg for begin_x variable, basically a rewrite that
@@ -7359,7 +7359,7 @@ nano 0.9.18 - 2000.09.18
 - cut.c:
   do_cut_text()
 	- Don't immediately abort if we're on filebot and the marker is
-	  set (fixes bug #42).
+	  set.  Fixes bug #42.
 - files.c:
   open_file()
 	- Fix for bug #44. (Rocco Corsi)
@@ -7372,9 +7372,9 @@ nano 0.9.18 - 2000.09.18
 	  available, allows nano to work with cygwin.
 	- Added gettext calls to enable/disable strings. (Jordi)
 	- Revamped a great deal of the F-key and keypad key handling,
-	  because we not longer use keypad() (see below).
+	  because we no longer use keypad() (see below).
 	- Removed keypad() call because nano was not working with the
-	  keypad in many terms, which is very bad.
+	  keypad on many terminals, which is very bad.
 	- Made insert key call do_insertfile().
   do_toggle()
 	- Rewrote function to allow NOHELP toggle to work on systems
@@ -7450,7 +7450,7 @@ nano-0.9.17 - 2000.09.04
   findnextstr():
 	- Added reset for placewewant. (Ben Roberts)
 	- Fixed check for string that only occurs on the same line failing
-	  (discovered by Ken Tyler).
+	  (bug discovered by Ken Tyler).
 
 nano-0.9.16 - 2000.08.09
 - cut.c:
@@ -7481,7 +7481,7 @@ nano-0.9.15 - 2000.08.03
 	  with --with-slang or --without-slang
 - nano.c:
   splice_node()
-	- New function, abstracts linking in nodes.   Fixes bug #36.
+	- New function, abstracts linking in nodes.  Fixes bug #36.
   null_at()
 	- New function, nulls a string at a given index and realigns it.
   delete_buffer()
@@ -7555,7 +7555,7 @@ nano-0.9.13 - 2000.07.23
 	- More intelligent emergency-save filename selection. (Rob)
   do_spell():
 	- Changed exit semantics a bit so that aspell wouldn't get
-	  all screwy (bug discovered by Joshua Jensen.
+	  all screwy (bug discovered by Joshua Jensen).
 - files.c:
   read_file():
 	- Added init of buf variable, hopefully this will stop the
@@ -7606,8 +7606,8 @@ nano-0.9.12 - 2000.07.07
 	- Magic Line code in read_file (Rob)
 - nano.c:
 	- Removed dual alt_speller variables, oops! (Rocco Corsi)
-	- Removed unnecessary do_oldspell function. (Rocco Corsi).  Added
-	  SMALL_NANO #ifdef around actual spell function.
+	- Removed unnecessary do_oldspell function. (Rocco Corsi)
+	- Added SMALL_NANO #ifdef around actual spell function.
 	- Moved page_up() to move.c where is belongs.
 	- Corrected FIXME in do_enter with explanation. (Rob)
 	- Fixed FIXME in do_justify, resulted in creation of

IMPROVEMENTS

@@ -1,6 +1,22 @@
 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.
+
 Since 2.7.0:
   - The keystroke ^] to complete a fragment to an existing full word.
   - The ability to display line numbers in front of the text (M-#).

Makefile.am

@@ -1,6 +1,6 @@
 AUTOMAKE_OPTIONS = gnu no-dependencies
 
-SUBDIRS = doc m4 po src
+SUBDIRS = doc lib m4 po src
 
 if USE_COLOR
 SUBDIRS += syntax

NEWS

@@ -1,3 +1,106 @@
+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
+		searching, improves PHP syntax highlighting, and no longer
+		asks “save anyway?” when the user ^Q discards the buffer.
+
+2017.05.04 - GNU nano 2.8.2 "Krats" adds another new feature: it makes
+		the ^G help texts searchable with ^W.  Apart from that,
+		it fixes a crash when resizing the window in the middle
+		of verbatim input, avoids an unlikely crash when used
+		without UTF-8 support in some locales, avoids redrawing
+		the screen twice when switching between buffers while
+		line numbers are active, and works around a coloring
+		bug on musl.  Plus tweaks to the documentation; plus
+		translation updates for fifteen languages.
+
+2017.04.12 - GNU nano 2.8.1 "Ellert" fixes build failures on MacOS and
+		on musl, fixes scrolling problems in softwrap mode when
+		double-width characters on row boundaries are involved,
+		shows double-width characters as ">" and "<" when split
+		across two rows, moves the cursor more predictably (at
+		the cost of sometimes putting it on the second "half"
+		of a character), avoids creating lines that consist of
+		only blanks when using autoindent, makes ^Home and ^End
+		go to the start and end of the file (on terminals that
+		support those keystrokes), places the cursor better when
+		linting, lets the linter ask only once whether to open
+		an included file, and adds bindings for ^Up and ^Down
+		in the file browser.  Don't sit on your hands.
+
+2017.03.31 - GNU nano 2.8.0 "Axat" makes it easier to move around in
+		softwrapped lines: the Up and Down keys now step from
+		visual row to visual row instead of jumping between
+		logical lines, and the Home and End keys now move to
+		the start and end of a row, and only when already
+		there, then to the start and end of the logical line.
+		Furthermore, the screen can now scroll per row instead
+		of always per logical line.  On an entirely different
+		front: nano now makes use of gnulib, to make it build
+		on more platforms.  In short: there were many internal
+		changes, not many user-visible ones (apart from the
+		new softwrap navigation).  The conversion to gnulib
+		was done by Mike Frysinger, the softwrap overhaul by
+		David Ramsey.
+
+
+2017.02.23 - GNU nano 2.7.5 "Nijntje" can properly search and replace
+		the \B and \b regex anchors, correctly repaints things
+		when multiline regexes with identical start and end are
+		involved, fixes a crash with zero-length regex matches,
+		does replacements at the edges of a marked region right,
+		no longer hides double-width characters at the head of
+		softwrapped rows, displays at most three warnings at
+		startup, and documents the ability to read a file from
+		standard input.  Come tickle my ears.
+
 2017.01.10 - GNU nano 2.7.4 "Red dress" undoes deletions in an orderly
 		manner again (bug was introduced in previous version),
 		sets the preferred x position for vertical movements
@@ -25,8 +128,8 @@
 		related to using line numbers in softwrap mode, allows to
 		use the PageUp and PageDown keys together with Shift on
 		VTE-based terminals, stops the help lines from flickering
-		during interactive replacing, makes a "set fill" override
-		an earlier "set nowrap", properly restores the selected
+		during interactive replacing, makes a 'set fill' override
+		an earlier 'set nowrap', properly restores the selected
 		region after an external spell check, and improves a few
 		other tidbits.  If you should find any more bugs, please
 		run 'man nano | grep bugs' and report them there.
@@ -67,7 +170,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!
@@ -216,13 +319,12 @@
 		handling of --tempfile mode, and better handling of
 		command line arguments when also attempting to specify
 		+<line number>.  As always, please file any bugs you
-		find at the Savannah page for nano, at
-		https://savannah.gnu.org/bugs/index.php?42639 and
-		thanks for using nano.
+		find via https://savannah.gnu.org/bugs/?group=nano
+		and thanks for using nano.
 
-2014.06.02 - GNU nano 2.3.4 won't leave you high, won't leave you dry.  This
-		release contains only a small number of fixes, but in
-		particular allows nano to compile on non-UTF-8 curses
+2014.06.02 - GNU nano 2.3.4 won't leave you high, won't leave you dry.
+		This release contains only a small number of fixes, but
+		in particular allows nano to compile on non-UTF-8 curses
 		implementations (i.e. libncursesw).  Other small fixes to
 		the undo implementation and the default syntax config are
 		also included.  As always, Share and Enjoy!
@@ -231,7 +333,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
@@ -267,11 +369,11 @@
 		has been added on top of the existing file extension
 		and header support already available.  Secondly, cursor
 		position can be saved between editing sessions with
-		the -P or --poslog command-line flag, or via "set poslog"
+		the -P or --poslog command-line flag, or via 'set poslog'
 		in your .nanorc.  Also included are some fixes for
 		compilation with g++, and better handling of issues
 		writing the backup file, which should reduce the need
-		for the "set allow_insecure_backup" nanorc option.
+		for the 'set allow_insecure_backup' nanorc option.
 		Don't stop, get it get it, don't stop, get it get it.
 
 
@@ -291,7 +393,7 @@
 		being used out of crontab).  For very strange situations
 		(such as where you cannot change the permissions on the
 		file you're writing), there is a new rc file option
-		"allow_insecure_backup" to be even more permissive and
+		'allow_insecure_backup' to be even more permissive and
 		allow the write to proceed.  Also included are some
 		syntax highlighting updates, and that is about it.
 		Keep fighting the good fight children.
@@ -482,16 +584,16 @@
 		an internal error occurs in the undo code, and fixes for
 		various combinations of configure-time options and
 		compiler flags.  Also included is new support for
-		changing the rc file name at configure time, and
-		using GNU-style regexes for word-boundaries on systems
-		which do not support them natively, as well as the ever
-		popular translation updates.  Rock the tarball.
+		changing the rc file name at configure time, and using
+		GNU-style regexes for word-boundaries on systems which
+		do not support them natively, as well as the ever popular
+		translation updates.  Rock the tarball.
 
 2008.08.09 - GNU nano 2.1.4 "I told you so!" is released.  This release
 		includes fixes for several severe issues with the new
-		undo/redo code.  Also the behavior of writing
-		files when using backup mode has changed as well: if writing
-		the backup file fails, nano will not attempt to write the
+		undo/redo code.  Also the behavior of writing files when
+		using backup mode has changed as well: if writing the
+		backup file fails, nano will not attempt to write the
 		current file.  This should help folks who enjoy "extreme
 		text editing", i.e. editing files on file systems which
 		are likely to run out of space; see Savannah bug #24000.
@@ -515,7 +617,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
@@ -680,7 +782,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
@@ -1197,28 +1299,27 @@
 		Have fun with it.
 
 2001.03.22 - GNU Nano 1.0 is released!  The autoindent wrapping bug
-		has been fixed, as well as strange bug when using Pico
+		has been fixed, as well as a strange bug when using Pico
 		mode and regex search.  There have also been some minor
 		spelling and documentation updates.  As stated on the
 		website, there are currently no known bugs with nano,
 		but some will pop up eventually and they will be
 		addressed in subsequent releases.  We hope you enjoy
 		this first stable release of nano, and as always,
-		feedback is welcome! nano@nano-editor.org.
+		feedback is welcome!  <nano@nano-editor.org>
 
 
-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 changes have been made for GNU
-		compatibility (like 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 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 have also been fixed.  All in all, a
-		lot to see.
+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
+		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 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
+		have also been fixed.  All in all, a lot to see.
 
 2001.01.31 - Nano 0.9.99pre2 is released.  Not surprisingly, all that is
 		new is bugfixes, bugfixes, bugfixes.  There were a few
@@ -1227,7 +1328,7 @@
 		is now a preliminary (read: needs testing) fix for
 		resizing the editor in any mode other than normal edit
 		mode.  Other fixes include some more tab completion
-		segfaults, and an silly segfault that occurred when
+		segfaults, and a silly segfault that occurred when
 		successfully writing a file on the 2nd try (i.e. after
 		an initial write error).  Slowly but surely, on toward
 		1.0 we travel.
@@ -1542,7 +1643,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

@@ -65,5 +65,12 @@ Bug Reports
 
 Current Status
 
-	GNU nano has reached its seventh milestone, 2.6.x.  Since 2.5.0, it
-	is a "rolling" release: bug fixing and development go hand in hand.
+	Since version 2.5.0, GNU nano has abandoned the distinction between
+	a stable and a development branch: it is now on a "rolling" release
+	-- fixing bugs and adding new features go hand in hand.
+
+Copyright Years
+
+	When in any file of this package a copyright notice mentions a
+	year range (such as 1999-2011), it is a shorthand for a list of
+	all the years in that interval.

README.GIT

@@ -11,10 +11,10 @@ Prerequisites
 To successfully compile GNU nano from git, you'll need the following
 packages:
 
-- autoconf    (version >= 2.61)
-- automake    (version >= 1.7)
-- autopoint   (version >= 0.11.5)
-- gettext     (version >= 0.11.5)
+- autoconf    (version >= 2.69)
+- automake    (version >= 1.14)
+- autopoint   (version >= 0.18.3)
+- gettext     (version >= 0.18.3)
 - git         (version >= 2.7.4)
 - groff       (version >= 1.12)
 - pkg-config  (version >= 0.22)
@@ -24,8 +24,6 @@ packages:
 
 If you want UTF-8 support, you will also need libncursesw5-dev installed
 (version >= 5.7), or libslang2-dev (version >= 2.0) if you use --with-slang.
-If your system doesn't have 'snprintf' or 'vsnprintf' (which the configure
-script will check for), you will also need glib-2.x installed.
 
 These should all be available in your distro's package manager or software
 center, or otherwise on any GNU mirror.
@@ -95,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
 

TODO

@@ -1,31 +1,12 @@
 A list of desired features
 --------------------------
 
-Vague musings:
-- FriBidi support?
-- Make matching bracket searches sophisticated enough to skip over
-  brackets inside comments?
-- Allow indentation of marked text by spaces as well as tabs?
-- Allow indentation to add just enough columns to reach the nearest
-  multiple of tabsize, rather than always adding tabsize columns?
-- Allow conversion between different character sets.  Maybe use glib's
-  iconv() if the system's iconv() is inadequate, since we already use
-  glib's vsnprintf() if the system lacks vsnprintf()?
-- Allow setting marks (saved positions, not to be confused with the mark
-  set via Ctrl-^) at various lines and/or columns in the buffer, and
-  allow movement between them with a single keystroke?
-- Allow searching for and replacing newlines?
-  See also https://savannah.gnu.org/bugs/?47053.
-- New regression framework built on expect?
-- Add the ability to move to different lines of the screen with a single
-  keystroke, e.g. M-` (M-~) to go to the top line, M-& (M-7) to go to
-  the center line, and M-' (M-") to go to the last line?
-
 Somewhat urgent:
-- Allow text searches in the help viewer.
-  See https://savannah.gnu.org/bugs/?28994.
+- Make undo/redo work also for justifying and indenting.
 - Detect when text is being pasted, so that we can handle it faster.
   See https://savannah.gnu.org/bugs/?40060.
+- Allow to define and execute a macro: a stored sequence of keystrokes.
+  See https://savannah.gnu.org/bugs/?50314.
 - Allow color syntaxes to apply to more than just color, so that we can
   e.g. specify a different alternate spell checker depending on which
   file type we have open.
@@ -33,6 +14,20 @@ Somewhat urgent:
   the command's output -- that is: generalize the spell-check flow.
   See also https://savannah.gnu.org/bugs/?28993.
 
+Vague musings:
+- FriBidi support?
+- Allow setting marks (saved positions, not to be confused with the
+  mark set via Ctrl-^) at various lines and/or columns in the buffer,
+  and allow movement between them with a single keystroke?
+- Make matching bracket searches sophisticated enough to skip over
+  brackets inside comments?
+- Allow indentation of marked text by spaces as well as tabs?
+- Allow indentation to add just enough columns to reach the nearest
+  multiple of tabsize, rather than always adding tabsize columns?
+
+For version 2.8:
+- Allow text searches in the help viewer. [DONE]
+
 For version 2.4:
 - Handle window resizes better.  After we've resized, we should stay
   wherever we were before we resized, as Pico does. [DONE]
@@ -65,14 +60,13 @@ For version 2.0:
 
 For version 1.2:
 - Single-line scroll up/down? [DONE]
-- Color syntax highlighting? (Certainly seems like there's a demand for
-  it.) [DONE]
-- .nanorc [DONE]
+- Color syntax highlighting? (There seems to be a demand for it.) [DONE]
+- Support for a .nanorc file. [DONE]
 - Backup making (filename~)? [DONE]
 - Search/replace string history. [DONE]
 - Implement Pico's -j and -g flags, as they are pretty easy to do. [DONE]
 - Make mouse support work with clicking on the shortcuts (-m). [DONE]
-- Implement -o (chroot of sorts). [DONE]
+- Implement -o (--operatingdir, a chroot of sorts). [DONE]
 - Allow -r to take a negative argument, meaning right margin instead of
   left (allows resizing that way), formerly -W arg. [DONE]
 
@@ -83,7 +77,6 @@ For version 1.0:
 - Allow nano to be resized in X. [DONE]
 - On PageUp/Down, put the cursor on the first line (like Pico), not the
   center line. [DONE]
-- Rewrite edit_refresh, if at all possible. [DONE]
 - Implement justify function. [DONE]
 - Cut to end of line. [DONE]
 - Built-in speller command. [DONE]

autogen.sh

@@ -1,4 +1,48 @@
 #!/bin/sh
 # Generate configure & friends for GIT users.
 
+gnulib_url="git://git.sv.gnu.org/gnulib.git"
+gnulib_hash="7f2c4e91361c28b8a6744a8b47f1d8d847c61d55"
+
+modules="
+	futimens
+	getdelim
+	getline
+	getopt-gnu
+	glob
+	isblank
+	iswblank
+	lstat
+	nl_langinfo
+	regex
+	sigaction
+	snprintf-posix
+	stdarg
+	strcase
+	strcasestr-simple
+	strnlen
+	sys_wait
+	vsnprintf-posix
+	wchar
+	wctype-h
+	wcwidth
+"
+
+# Make sure the local gnulib git repo is up-to-date.
+if [ ! -d "gnulib" ]; then
+	git clone --depth=123 ${gnulib_url}
+fi
+cd gnulib >/dev/null || exit 1
+curr_hash=$(git log -1 --format=%H)
+if [ "${gnulib_hash}" != "${curr_hash}" ]; then
+	git pull
+	git checkout -f ${gnulib_hash}
+fi
+cd .. >/dev/null || exit 1
+
+rm -rf lib
+./gnulib/gnulib-tool \
+	--import \
+	${modules}
+
 autoreconf -f -i -s

configure.ac

@@ -1,7 +1,7 @@
 # Configuration for GNU nano - a small and user-friendly text editor
 #
-# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007,
-# 2008, 2009, 2010, 2011, 2013, 2014 Free Software Foundation, Inc.
+# Copyright (C) 1999-2011, 2013-2017 Free Software Foundation, Inc.
+# Copyright (C) 2014, 2017 Mike Frysinger
 #
 # GNU nano is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published
@@ -16,20 +16,30 @@
 # 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.7.4], [nano-devel@gnu.org], [nano])
+AC_INIT([GNU nano], [2.9.0], [nano-devel@gnu.org], [nano])
 AC_CONFIG_SRCDIR([src/nano.c])
 AC_CANONICAL_HOST
-AM_INIT_AUTOMAKE
+AM_INIT_AUTOMAKE([1.14])
 AC_CONFIG_HEADERS([config.h])
 
 dnl Make sure the ONCE macros are available.
 
-AC_PREREQ(2.61)
+AC_PREREQ([2.69])
+
+dnl Lie about gnulib features we don't use to speed up & shrink down.
+
+gl_cv_func_printf_directive_n=yes
+gl_cv_func_printf_infinite_long_double=yes
+gl_cv_func_printf_long_double=yes
+gl_cv_func_snprintf_directive_n=yes
+gl_cv_glob_lists_symlinks=yes
 
 dnl Checks for programs.
 
 AC_GNU_SOURCE
 AC_PROG_CC
+gl_EARLY
+gl_INIT
 AC_PROG_LN_S
 AC_ISC_POSIX
 AC_SYS_LARGEFILE
@@ -37,7 +47,7 @@ PKG_PROG_PKG_CONFIG
 
 dnl Internationalization macros.
 
-AM_GNU_GETTEXT_VERSION(0.11.5)
+AM_GNU_GETTEXT_VERSION([0.18.3])
 AM_GNU_GETTEXT([external], [need-ngettext])
 AM_CONDITIONAL(USE_NLS, test x$USE_NLS = xyes)
 
@@ -48,18 +58,32 @@ AC_DEFINE_DIR([PKGDATADIR], [pkgdatadir], [Where data are placed to.])
 
 dnl Checks for header files.
 
-AC_CHECK_HEADERS(getopt.h libintl.h limits.h regex.h sys/param.h wchar.h wctype.h stdarg.h)
+AC_CHECK_HEADERS(libintl.h limits.h pwd.h termios.h sys/param.h)
 
 dnl Checks for options.
 
 AC_ARG_ENABLE(browser,
-AS_HELP_STRING([--disable-browser], [Disable built-in file browser]))
-if test "x$enable_browser" = xno; then
-    AC_DEFINE(DISABLE_BROWSER, 1, [Define this to disable the built-in file browser.])
+AS_HELP_STRING([--disable-browser], [Disable the built-in file browser]))
+if test "x$enable_tiny" = xyes; then
+    if test "x$enable_browser" != xyes; then
+	enable_browser=no
+    fi
+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])
@@ -68,22 +92,13 @@ 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$ac_cv_header_regex_h != xyes; then
-	AC_MSG_ERROR([
-*** The header file regex.h was not found.  If you wish to have
-*** color support, this header file is required.  Please either
-*** install C libraries that include the regex.h file, or call
-*** the configure script with --disable-color.])
-    else
-	color_support=yes
-    fi
+if test "x$enable_color" != xno; then
+    AC_DEFINE(ENABLE_COLOR, 1, [Define this to have syntax highlighting.])
+    color_support=yes
 fi
 
 AC_ARG_ENABLE(comment,
-AS_HELP_STRING([--disable-comment], [Disable comment/uncomment functions]))
+AS_HELP_STRING([--disable-comment], [Disable the comment/uncomment function]))
 if test "x$enable_tiny" = xyes; then
     if test "x$enable_comment" = xyes; then
 	AC_MSG_ERROR([--enable-comment cannot work with --enable-tiny])
@@ -91,34 +106,64 @@ 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 extra features, currently only easter eggs]))
-if test "x$enable_extra" = xno; then
-    AC_DEFINE(DISABLE_EXTRA, 1, [Define this to disable extra stuff.])
+AS_HELP_STRING([--disable-extra], [Disable the Easter egg]))
+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,
-AS_HELP_STRING([--disable-help], [Disable help functions]))
-if test "x$enable_help" = xno; then
-    AC_DEFINE(DISABLE_HELP, 1, [Define this to disable the help text display.])
+AS_HELP_STRING([--disable-help], [Disable the built-in help texts]))
+if test "x$enable_tiny" = xyes; then
+    if test "x$enable_help" = xyes; then
+	if test "x$enable_multibuffer" != xyes; then
+	    AC_MSG_ERROR([--enable-help needs --enable-multibuffer to work])
+	fi
+    else
+	enable_help=no
+    fi
+fi
+if test "x$enable_multibuffer" = xno; then
+    if test "x$enable_help" = xyes; then
+	AC_MSG_ERROR([--enable-help cannot work with --disable-multibuffer])
+    else
+	# Disabling multibuffer silently disables the help texts.
+	enable_help=no
+    fi
+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 justify/unjustify functions]))
-if test "x$enable_justify" = xno; then
-    AC_DEFINE(DISABLE_JUSTIFY, 1, [Define this to disable the justify routines.])
+AS_HELP_STRING([--disable-justify], [Disable the justify/unjustify functions]))
+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,
@@ -131,52 +176,79 @@ 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,
-AS_HELP_STRING([--disable-mouse], [Disable mouse support (and -m flag)]))
-if test "x$enable_mouse" = xno; then
-    AC_DEFINE(DISABLE_MOUSE, 1, [Define this to disable the mouse support.])
+AS_HELP_STRING([--disable-mouse], [Disable mouse support]))
+if test "x$enable_tiny" = xyes; then
+    if test "x$enable_mouse" != xyes; then
+	enable_mouse=no
+    fi
+fi
+if test "x$enable_mouse" != xno; then
+    AC_DEFINE(ENABLE_MOUSE, 1, [Define this to enable mouse support.])
 fi
 
 AC_ARG_ENABLE(multibuffer,
 AS_HELP_STRING([--disable-multibuffer], [Disable multiple file buffers]))
-if test "x$enable_multibuffer" = xno; then
-    AC_DEFINE(DISABLE_MULTIBUFFER, 1, [Define this to disable multiple file buffers.])
+if test "x$enable_tiny" = xyes; then
+    if test "x$enable_multibuffer" != xyes; then
+	enable_multibuffer=no
+    fi
+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,
-AS_HELP_STRING([--disable-nanorc], [Disable use of .nanorc files]))
-if test "x$enable_nanorc" = xno; then
-    AC_DEFINE(DISABLE_NANORC, 1, [Define this to disable the use of .nanorc files.])
-else
+AS_HELP_STRING([--disable-nanorc], [Disable the use of .nanorc files]))
+if test "x$enable_tiny" = xyes; then
+    if test "x$enable_nanorc" != xyes; then
+	enable_nanorc=no
+    fi
+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 setting of operating directory (chroot of sorts)]))
-if test "x$enable_operatingdir" = xno; then
-    AC_DEFINE(DISABLE_OPERATINGDIR, 1, [Define this to disable the setting of the operating directory (chroot of sorts).])
+AS_HELP_STRING([--disable-operatingdir], [Disable the setting of an operating directory]))
+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 spell checker functions]))
-if test "x$enable_speller" = xno; then
-    AC_DEFINE(DISABLE_SPELLER, 1, [Define this to disable the spell checker functions.])
+AS_HELP_STRING([--disable-speller], [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,
-AS_HELP_STRING([--disable-tabcomp], [Disable tab completion functions]))
-if test "x$enable_tabcomp" = xno; then
-    AC_DEFINE(DISABLE_TABCOMP, 1, [Define this to disable the tab completion functions for filenames and search strings.])
+AS_HELP_STRING([--disable-tabcomp], [Disable the tab-completion functions]))
+if test "x$enable_tiny" = xyes; then
+    if test "x$enable_tabcomp" != xyes; then
+	enable_tabcomp=no
+    fi
+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,
-AS_HELP_STRING([--disable-wordcomp], [Disable the word completion function]))
+AS_HELP_STRING([--disable-wordcomp], [Disable the word-completion function]))
 if test "x$enable_tiny" = xyes; then
     if test "x$enable_wordcomp" = xyes; then
 	AC_MSG_ERROR([--enable-wordcomp cannot work with --enable-tiny])
@@ -184,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 wrapping of text (and -w flag)]))
-if test "x$enable_wrapping" = xno; then
-    AC_DEFINE(DISABLE_WRAPPING, 1, [Define this to disable all text wrapping.])
+AS_HELP_STRING([--disable-wrapping], [Disable all hard-wrapping of text]))
+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,
@@ -205,7 +280,7 @@ fi
 AC_ARG_ENABLE(debug,
 AS_HELP_STRING([--enable-debug], [Enable debugging (disabled by default)]))
 if test "x$enable_debug" = xyes; then
-    AC_DEFINE(DEBUG, 1, [Define this to enable debug messages and assert warnings.])
+    AC_DEFINE(DEBUG, 1, [Define this to enable debug messages and abortion on failing asserts.])
 else
     AC_DEFINE(NDEBUG, 1, [Shut up assert warnings :-)])
 fi
@@ -214,53 +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_browser" != xyes; then
-	AC_DEFINE(DISABLE_BROWSER, 1, [Define this to disable the built-in file browser.])
-    fi
-    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_help" != xyes; then
-	AC_DEFINE(DISABLE_HELP, 1, [Define this to disable the help text display.])
-    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_mouse" != xyes; then
-	AC_DEFINE(DISABLE_MOUSE, 1, [Define this to disable the mouse support.])
-    fi
-    if test "x$enable_multibuffer" != xyes; then
-	AC_DEFINE(DISABLE_MULTIBUFFER, 1, [Define this to disable multiple file buffers.])
-    fi
-    if test "x$enable_nanorc" != xyes; then
-	AC_DEFINE(DISABLE_NANORC, 1, [Define this to disable the use of .nanorc files.])
-    fi
-    if test "x$enable_operatingdir" != xyes; then
-	AC_DEFINE(DISABLE_OPERATINGDIR, 1, [Define this to disable the setting of the operating directory (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_tabcomp" != xyes; then
-	AC_DEFINE(DISABLE_TABCOMP, 1, [Define this to disable the tab completion functions for files and search strings.])
-    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)
@@ -467,30 +498,9 @@ int main(void)
 
 dnl Checks for functions.
 
-AC_CHECK_FUNCS(getdelim getline isblank strcasecmp strcasestr strncasecmp strnlen snprintf vsnprintf)
-
 if test "x$enable_utf8" != xno; then
-    AC_CHECK_FUNCS(iswalnum iswblank iswpunct iswspace nl_langinfo mblen mbstowcs mbtowc wctomb wcwidth)
+    AC_CHECK_FUNCS(iswalnum iswpunct mblen mbstowcs mbtowc wctomb)
 fi
-
-if test x$ac_cv_func_snprintf = xno; then
-    AM_PATH_GLIB_2_0(2.0.0,,
-	AC_MSG_ERROR([
-*** snprintf() not found.  GLIB 2.x not found either.
-*** You should install the GLIB 2.x library which can
-*** be found at http://ftp.gtk.org/.]),
-	glib)
-fi
-
-if test x$ac_cv_func_vsnprintf = xno; then
-    AM_PATH_GLIB_2_0(2.0.0,,
-	AC_MSG_ERROR([
-*** vsnprintf() not found.  GLIB 2.x not found either.
-*** You should install the GLIB 2.x library which can
-*** be found at http://ftp.gtk.org/.]),
-	glib)
-fi
-
 dnl Checks for typedefs, structures, and compiler characteristics.
 
 dnl Checks for available flags.
@@ -500,8 +510,6 @@ AX_CHECK_COMPILE_FLAG([-Wall], [CFLAGS="$CFLAGS -Wall"], [], [])
 dnl Checks for library functions.
 
 AC_TYPE_SIGNAL
-AC_FUNC_VPRINTF
-AC_CHECK_FUNCS(getopt_long)
 
 dnl Checks for libraries.
 
@@ -566,10 +574,13 @@ else
 fi
 
 AC_CHECK_LIB([$CURSES_LIB_NAME], [use_default_colors],
-	     [AC_DEFINE(HAVE_USE_DEFAULT_COLORS, 1, [Define this if your curses library has the use_default_colors() command.])],
+	     [AC_DEFINE(HAVE_USE_DEFAULT_COLORS, 1, [Define this if your curses library has the use_default_colors() function.])],
+	     [], [$CURSES_LIB])
+AC_CHECK_LIB([$CURSES_LIB_NAME], [set_escdelay],
+	     [AC_DEFINE(HAVE_SET_ESCDELAY, 1, [Define this if your curses library has the set_escdelay() function.])],
 	     [], [$CURSES_LIB])
 AC_CHECK_LIB([$CURSES_LIB_NAME], [key_defined],
-	     [AC_DEFINE(HAVE_KEY_DEFINED, 1, [Define this if your curses library has the key_defined() command.])],
+	     [AC_DEFINE(HAVE_KEY_DEFINED, 1, [Define this if your curses library has the key_defined() function.])],
 	     [], [$CURSES_LIB])
 
 dnl Parse any configure options.
@@ -578,25 +589,15 @@ LIBS="$LIBS $CURSES_LIB"
 
 AC_SUBST(CURSES_LIB)
 
-if test "x$GLIB_CFLAGS" != "x"; then
-    CFLAGS="$CFLAGS $GLIB_CFLAGS"
-fi
-if test "x$GLIB_LIBS" != "x"; then
-    LDFLAGS="$LDFLAGS $GLIB_LIBS"
-fi
-
 if test "x$enable_utf8" != xno && \
     test x$CURSES_LIB_WIDE = xyes && \
     test x$ac_cv_func_iswalnum = xyes && \
     test x$ac_cv_func_iswpunct = xyes && \
-    (test x$ac_cv_func_iswblank = xyes || test x$ac_cv_func_iswspace = xyes) && \
-    test x$ac_cv_func_nl_langinfo = xyes && \
     test x$ac_cv_func_mblen = xyes && \
     test x$ac_cv_func_mbstowcs = xyes && \
     test x$ac_cv_func_mbtowc = xyes && \
-    test x$ac_cv_func_wctomb = xyes && \
-    test x$ac_cv_func_wcwidth = xyes; then
-	AC_DEFINE(ENABLE_UTF8, 1, [Define this if your system has sufficient UTF-8 support (a wide curses library, iswalnum(), iswpunct(), iswblank() or iswspace(), nl_langinfo, mblen(), mbstowcs(), mbtowc(), wctomb(), and wcwidth()).])
+    test x$ac_cv_func_wctomb = xyes; then
+	AC_DEFINE(ENABLE_UTF8, 1, [Define this if your system has sufficient UTF-8 support.])
 else
     if test "x$enable_utf8" = xyes; then
 	AC_MSG_ERROR([
@@ -615,36 +616,43 @@ else
     fi
 fi
 
-AC_CACHE_CHECK([for enhanced regular expression flag], nano_cv_flag_reg_extended,
+AC_CACHE_CHECK([for enhanced regular expression flag], nano_cv_flag_reg_enhanced,
 	       [AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include <regex.h>]],
 						   [[
 						     #ifndef REG_ENHANCED
 						     error: No REG_ENHANCED support!
 						     #endif
 						   ]])],
-				  [nano_cv_flag_reg_extended="REG_EXTENDED | REG_ENHANCED"],
-				  [nano_cv_flag_reg_extended="REG_EXTENDED"])])
+				  [nano_cv_flag_reg_enhanced=yes],
+				  [nano_cv_flag_reg_enhanced=no])])
+dnl The bundled gnulib regex module doesn't support REG_ENHANCED.
+if test "$ac_use_included_regex" = "yes"; then
+    nano_cv_flag_reg_enhanced="no"
+fi
+if test "$nano_cv_flag_reg_enhanced" = "yes"; then
+    nano_reg_extended="REG_EXTENDED | REG_ENHANCED"
+else
+    nano_reg_extended="REG_EXTENDED"
+fi
 
-AC_DEFINE_UNQUOTED(NANO_REG_EXTENDED, $nano_cv_flag_reg_extended,
+AC_DEFINE_UNQUOTED(NANO_REG_EXTENDED, $nano_reg_extended,
 		   [Flag(s) to use to get the full range of extended regular expressions])
 
 # Check for word-boundary support (/< and />).
 AC_MSG_CHECKING([for GNU-style word boundary regex support])
 AC_ARG_WITH(wordbounds,
 AS_HELP_STRING([--with-wordbounds], [Use GNU-style word boundary delimiters]),
-	[ case "$with_wordbounds" in
-	    no)
-		AC_MSG_RESULT(no)
-		;;
-	    *)
-		AC_MSG_RESULT(yes)
-		# We explicitly don't check if the user forced the option, because
-		# this is needed for cross compilers and we can't test the target.
-		AC_DEFINE(GNU_WORDBOUNDS, 1, [Define this if the system supports GNU-style word boundaries in regexes.]) gnu_wordbounds=yes,
-		;;
-	  esac
-	], [
-	    AC_TRY_RUN([
+	[with_wordbounds=$withval], [with_wordbounds=auto])
+if test "$with_wordbounds" != "no"; then
+    dnl If we're using the bundled gnulib regex module, we know it's supported.
+    if test "$ac_use_included_regex" = "yes"; then
+        with_wordbounds="yes"
+    fi
+
+    dnl We explicitly don't check if the user forced the option, because
+    dnl this is needed for cross compilers and we can't test the target.
+    if test "$with_wordbounds" != "yes"; then
+        AC_TRY_RUN([
 #ifdef HAVE_SYS_TYPES_H
 #include <sys/types.h>
 #endif
@@ -655,18 +663,29 @@ int main(void)
     size_t nmatch;
     regmatch_t pmatch;
 
-    if (regcomp(&r, "\\\\>", $nano_cv_flag_reg_extended|REG_NOSUB))
+    if (regcomp(&r, "\\\\>", $nano_reg_extended|REG_NOSUB))
 	return 1;
     if (regexec(&r, "word boundary", nmatch, &pmatch, 0))
 	return 1;
     return 0;
 }],
-	    AC_MSG_RESULT(yes)
-	    AC_DEFINE(GNU_WORDBOUNDS, 1, [Define this if the system supports GNU-style word boundaries in regexes.]) gnu_wordbounds=yes,
-	    AC_MSG_RESULT(no),
-	    AC_MSG_WARN([*** Can't check for GNU-style word boundary support when cross-compiling])
-	)
-])
+        with_wordbounds="yes",
+        with_wordbounds="no",
+        with_wordbounds="cross")
+    fi
+fi
+case $with_wordbounds in
+yes)
+    AC_MSG_RESULT(yes)
+    AC_DEFINE(GNU_WORDBOUNDS, 1, [Define this if the system supports GNU-style word boundaries in regexes.])
+    ;;
+no)
+    AC_MSG_RESULT(no)
+    ;;
+cross)
+    AC_MSG_WARN([*** Can't check for GNU-style word boundary support when cross-compiling])
+    ;;
+esac
 
 if test x$color_support = xyes; then
 #    if test x$CURSES_LIB_NAME = xcurses; then
@@ -688,7 +707,7 @@ int main(void)
     int testcolor = COLOR_WHITE;
     return 0;
 }],
-	AC_DEFINE(NEED_XOPEN_SOURCE_EXTENDED, 1, [Define this if you need the _XOPEN_SOURCE_EXTENDED macro for color support])
+	AC_DEFINE(NEED_XOPEN_SOURCE_EXTENDED, 1, [Define this if you need the _XOPEN_SOURCE_EXTENDED macro for color support.])
 	AC_MSG_RESULT(yes),
 	AC_MSG_RESULT(not sure)
 	AC_MSG_WARN([*** Couldn't successfully compile basic color test with or without _XOPEN_SOURCE_EXTENDED])
@@ -706,7 +725,7 @@ int main(void)
     COLS = 25;
     return 0;
 }],
-AC_DEFINE(REDEFINING_MACROS_OK, 1, [Define this if you know your curses library allows LINES and COLS to be redefined to deal with a resizing bug])
+AC_DEFINE(REDEFINING_MACROS_OK, 1, [Define this if you know your curses library allows LINES and COLS to be redefined to deal with a resizing bug.])
 AC_MSG_RESULT(yes),
 AC_MSG_RESULT(no),
 AC_MSG_WARN([*** Can't check for macro redefinability when cross-compiling]))
@@ -747,6 +766,7 @@ AC_CONFIG_FILES([
 Makefile
 doc/Makefile
 doc/sample.nanorc
+lib/Makefile
 m4/Makefile
 po/Makefile.in
 src/Makefile

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

@@ -9,20 +9,21 @@
 <h1>The GNU nano editor FAQ</h1>
 <h2>Table of Contents</h2>
 <h2><a href="#1">1. General</a></h2>
-<blockquote><p><a href="#1.1">1.1 About this FAQ</a><br>
-  <a href="#1.2">1.2. How do I contribute to it?</a><br>
-  <a href="#1.3">1.3. What is GNU nano?</a><br>
-  <a href="#1.4">1.4. What is the history behind nano?</a><br>
-  <a href="#1.5">1.5. Why the name change from TIP?</a><br>
-  <a href="#1.6">1.6. What is the current version of nano?</a><br>
-  <a href="#1.7">1.7. I want to read the manpage without having to download the program!</a></p></blockquote>
+<blockquote><p>
+  <a href="#1.1">1.1. What is GNU nano?</a><br>
+  <a href="#1.2">1.2. What is the history behind nano?</a><br>
+  <a href="#1.3">1.3. Why the name change from TIP?</a><br>
+  <a href="#1.4">1.4. What is the current version of nano?</a><br>
+  <a href="#1.5">1.5. I want to read the manpage without having to download the program!</a></p></blockquote>
 <h2><a href="#2">2. Where to get GNU nano.</a></h2>
-<blockquote><p><a href="#2.1">2.1. FTP and WWW sites that carry nano.</a><br>
+<blockquote><p>
+  <a href="#2.1">2.1. FTP and WWW sites that carry nano.</a><br>
   <a href="#2.2">2.2. RedHat and derivatives (.rpm) packages.</a><br>
   <a href="#2.3">2.3. Debian (.deb) packages.</a><br>
   <a href="#2.4">2.4. By GIT (for the brave).</a></p></blockquote>
 <h2><a href="#3">3. Installation and Configuration</a></h2>
-<blockquote><p><a href="#3.1">3.1. How do I install the RPM or DEB package?</a><br>
+<blockquote><p>
+  <a href="#3.1">3.1. How do I install the RPM or DEB package?</a><br>
   <a href="#3.2">3.2. Compiling from source: WHAT THE HECK DO I DO NOW?</a><br>
   <a href="#3.3">3.3. Why does everything go into /usr/local?</a><br>
   <a href="#3.5">3.5. nano should automatically run strip on the binary when installing it!</a><br>
@@ -32,44 +33,44 @@
   <a href="#3.9a">3.9a. How do I make a .nanorc file that nano will read when I start it?</a><br>
   <a href="#3.9b">3.9b. How about in Win32?</a></p></blockquote>
 <h2><a href="#4">4. Running</a></h2>
-<blockquote><p><a href="#4.1">4.1. How do I open a file with a name beginning with '+' from the command line?</a><br>
+<blockquote><p>
+  <a href="#4.1">4.1. How do I open a file with a name beginning with '+' from the command line?</a><br>
   <a href="#4.2">4.2. Ack! My Backspace/Delete/Enter/Meta/double bucky key doesn't seem to work! What can I do?</a><br>
   <a href="#4.3">4.3. Ack! My numeric keypad's keys don't work properly when NumLock is off! What can I do?</a><br>
   <a href="#4.4">4.4. Ack! When I hold down a Meta key combination for a while, the character of the held key gets inserted now and then. What gives?</a><br>
-  <a href="#4.5">4.5. How do I type the F13-F16 keys shown in the help browser? My keyboard only has F1-F12!</a><br>
+  <a href="#4.5">4.5. How do I type the F13-F16 keys listed in the help viewer? My keyboard only has F1-F12!</a><br>
   <a href="#4.6">4.6. nano crashes when I type &lt;insert keystroke here&gt;!</a><br>
   <a href="#4.7">4.7. nano crashes when I resize my window. How can I fix that?</a><br>
-  <a href="#4.8">4.8. When I paste text into a document, each line gets indented further than the last. Why does nano do this, and how can I avoid it?</a><br>
+  <a href="#4.8a">4.8a. When I paste text into a document, each line gets indented further than the last. Why does nano do this, and how can I avoid it?</a><br>
+  <a href="#4.8b">4.8b. When I paste from Windows into a remote nano, nano rewraps the lines. What gives?<a><br>
   <a href="#4.9">4.9. I've compiled nano with color support, but I don't see any color when I run it!</a><br>
   <a href="#4.10">4.10. How do I make nano my default editor (in Pine, mutt, etc.)?</a><br>
   <a href="#4.11">4.11. How do I select text for or paste text from the clipboard in an X terminal when I'm running nano in one and nano's mouse support is turned on?</a><br>
   <a href="#4.12">4.12. On startup I get a message that says "Detected a legacy nano history file".  Now older nano versions can't find my search history!</a></p></blockquote>
 <h2><a href="#5">5. Internationalization</a></h2>
-<blockquote><p><a href="#5.1">5.1. There's no translation for my language!</a><br>
+<blockquote><p>
+  <a href="#5.1">5.1. There's no translation for my language!</a><br>
   <a href="#5.2">5.2. I don't like the translation for &lt;x&gt; in my language. How can I fix it?</a><br>
   <a href="#5.3">5.3. What is the status of Unicode support?</a></p></blockquote>
 <h2><a href="#6">6. Advocacy and Licensing</a></h2>
-<blockquote><p><a href="#6.1">6.1. Why should I use nano instead of Pico?</a><br>
+<blockquote><p>
+  <a href="#6.1">6.1. Why should I use nano instead of Pico?</a><br>
   <a href="#6.2">6.2. Why should I use Pico instead of nano?</a><br>
   <a href="#6.3">6.3. What is so bad about the older Pine license?</a><br>
   <a href="#6.4">6.4. Okay, well, what mail program should I use then?</a></p></blockquote>
 <h2><a href="#7">7. Miscellaneous</a></h2>
-<blockquote><p><a href="#7.1">7.1. nano-related mailing lists.</a><br>
-  <a href="#7.2">7.2. I want to send the development team a big load of cash (or just a thank you).</a><br>
-  <a href="#7.3">7.3. How do I submit a bug report or patch?</a><br>
+<blockquote><p>
+  <a href="#7.1">7.1. Where can I ask questions or send suggestions?</a><br>
+  <a href="#7.2">7.2. How do I submit a bug report or patch?</a><br>
+  <a href="#7.3">7.3. I want to send the development team a big load of cash (or just a thank you).</a><br>
   <a href="#7.4">7.4. How do I join the development team?</a><br>
   <a href="#7.5">7.5. Can I have write access to the GIT tree?</a></p></blockquote>
-<h2><a href="#8">8. ChangeLog</a></h2>
 <hr width="100%">
 
 <h1><a name="1"></a>1. General</h1>
-<h2><a name="1.1"></a>1.1 About this FAQ</h2>
-<blockquote><p>This FAQ was originally written and maintained by Chris Allegretta &lt;<a href="mailto:chrisa@asty.org">chrisa@asty.org</a>&gt;, who also happens to be the creator of nano. It was then maintained by David Lawrence Ramsey &lt;<a href="mailto:pooka109@gmail.com">pooka109@gmail.com</a>&gt;. Maybe someone else will volunteer to maintain this FAQ someday, who knows...</p></blockquote>
-<h2><a name="1.2"></a>1.2. How do I contribute to it?</h2>
-<blockquote><p>Your best bet is to send it to the nano email address, <a href="mailto:nano@nano-editor.org">nano@nano-editor.org</a> and if it is useful enough it will be included in future versions.</p></blockquote>
-<h2><a name="1.3"></a>1.3. What is GNU nano?</h2>
+<h2><a name="1.1"></a>1.1. What is GNU nano?</h2>
 <blockquote><p>GNU nano is designed to be a free replacement for the Pico text editor, part of the Pine email suite from <a href="http://www.washington.edu/pine/">The University of Washington</a>. It aims to &quot;emulate Pico as closely as possible and then include extra functionality&quot;.</p></blockquote>
-<h2><a name="1.4"></a>1.4. What is the history behind nano?</h2>
+<h2><a name="1.2"></a>1.2. What is the history behind nano?</h2>
 <blockquote><p>Funny you should ask!</p>
   <p><b>In the beginning...</b></p>
   <p>For years Pine was THE program used to read email on a Unix system. The Pico text editor is the portion of the program one would use to compose his or her mail messages. Many beginners to Unix flocked to Pico and Pine because of their well organized, easy to use interfaces. With the proliferation of GNU/Linux in the mid to late 90's, many University students became intimately familiar with the strengths (and weaknesses) of Pine and Pico.</p>
@@ -79,11 +80,11 @@
   <p>It was in late 1999 when Chris Allegretta (our hero) was yet again complaining to himself about the less-than-perfect license Pico was distributed under, the 1000 makefiles that came with it and how just a few small improvements could make it the Best Editor in the World (TM). Having been a convert from Slackware to Debian, he missed having a simple binary package that included Pine and Pico, and had grown tired of downloading them himself.</p>
   <p>Finally something snapped inside and Chris coded and hacked like a madman for many hours straight one weekend to make a (barely usable) Pico clone, at the time called TIP (Tip Isn't Pico). The program could not be invoked without a filename, could not save files, had no help text display, spell checker, and so forth. But over time it improved, and with the help of a few great coders it matured to the (hopefully) stable state it is in today.</p>
   <p>In February 2001, nano was declared an official GNU program by Richard Stallman. nano also reached its first production release on March 22, 2001.</p></blockquote>
-<h2><a name="1.5"></a>1.5. Why the name change from TIP?</h2>
+<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.6"></a>1.6. What is the current version of nano?</h2>
-<blockquote><p>The current version of nano <i>should</i> be <b>2.7.4</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.7"></a>1.7. I want to read the man page without having to download the program!</h2>
+<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.9.0</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%">
 
@@ -138,34 +139,36 @@
   <pre>
   <b>--disable-browser</b>       Disable the built-in file browser
   <b>--disable-color</b>         Disable color and syntax highlighting
-  <b>--disable-extra</b>         Disable extra features (currently only an easter egg)
-  <b>--disable-help</b>          Disable help functions
+  <b>--disable-comment</b>       Disable the comment/uncomment function
+  <b>--disable-extra</b>         Disable the easter egg
+  <b>--disable-help</b>          Disable the built-in help texts
   <b>--disable-histories</b>     Disable the saving of search strings and cursor positions
-  <b>--disable-justify</b>       Disable justify/unjustify functions
+  <b>--disable-justify</b>       Disable the justify/unjustify functions
   <b>--disable-libmagic</b>      Disable the use of libmagic for determining a file's syntax
+  <b>--disable-linenumbers</b>   Disable line numbering
   <b>--disable-mouse</b>         Disable mouse support
-  <b>--disable-multibuffer</b>   Disable having multiple file buffers open
+  <b>--disable-multibuffer</b>   Disable the opening of multiple file buffers
   <b>--disable-nanorc</b>        Disable the use of .nanorc files
   <b>--disable-operatingdir</b>  Disable the setting of an operating directory
-  <b>--disable-speller</b>       Disable spell checker functions
-  <b>--disable-tabcomp</b>       Disable tab completion functions
-  <b>--disable-wordcomp</b>      Disable the word completion function
+  <b>--disable-speller</b>       Disable the spell-checker functions
+  <b>--disable-tabcomp</b>       Disable the tab-completion functions
+  <b>--disable-wordcomp</b>      Disable the word-completion function
   <b>--disable-wrapping</b>      Disable all hard-wrapping of text</pre>
   <p>There's also the <b>--enable-tiny</b> option which disables everything above, as well as some larger chunks of the program (like the marker code that you use with Control-^ to select text). Also, if you know you aren't going to be using other languages, you can use <b>--disable-nls</b> to disable internationalization and save a few K to a few dozen K depending on whether you have locale support on your system. And finally, there's always good old <b>strip</b> to strip all debugging code and code that exists in libraries on your system.</p>
   <p>With <b>--disable-wrapping-as-root</b> you can disable any hard-wrapping by default when the user is root, useful to prevent accidentally changing long lines in system configuration files.</p>
 </blockquote>
 <h2><a name="3.7"></a>3.7. Tell me more about this multibuffer stuff!</h2>
-<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>, then insert the file as normal with <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>
+<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>
 <h2><a name="3.9b"></a>3.9b. How about in Win32?</h2>
 <blockquote><p>If you're using the official nano .zip file and have extracted all the files, you should take the file nano.rc and place it somewhere on your Win32 system (for example, if you have write permission to do so, at the top of C:\).  Then you must create an Environment variable called HOME which points to the directory where you put nano.rc.  In Windows XP, you can get to Environment variables by right-clicking "My Computer" either on the desktop or in the Start Menu, and selecting Properties.  This should bring up the System Properties panel.  Then click the Advanced Tab, and there should be a button called Environment Variables.  Click that to bring up the Environment Variables section. Now, under User Variables you should be able to click the New button, and make a new Variables Name called HOME, with the Variable Value of whatever path you copied nano.rc into (just the directory name; don't add nano.rc onto the end).</p>
-<p>We're still working on documentation for enabling syntax highlighting on Win32; please bear with us.</p>
-<p>Note that the nano.rc file must remain Unix-formatted in order for nano to understand it.  In other words, you should probably use only nano to edit its config file.  Other programs like Wordpad and Notepad will convert the file to DOS format when saving, and the latter does not even properly read Unix-formatted files to begin with.</p></blockquote>
+  <p>We're still working on documentation for enabling syntax highlighting on Win32; please bear with us.</p>
+  <p>Note that the nano.rc file must remain Unix-formatted in order for nano to understand it.  In other words, you should probably use only nano to edit its config file.  Other programs like Wordpad and Notepad will convert the file to DOS format when saving, and the latter does not even properly read Unix-formatted files to begin with.</p></blockquote>
 <hr width="100%">
 
 <h1><a name="4"></a>4. Running</h1>
@@ -183,17 +186,19 @@
 <h2><a name="4.3"></a>4.3. Ack! My numeric keypad's keys don't work properly when NumLock is off! What can I do?</h2>
 <blockquote><p>You can use the <b>-K</b> or <b>--rebindkeypad</b> option on the command line, or add the line <b>set rebindkeypad</b> to your .nanorc. However, nano's mouse support won't work properly if you do any of these things.</p></blockquote>
 <h2><a name="4.4"></a>4.4. Ack! When I hold down a Meta key combination for a while, the character of the held key gets inserted now and then. What gives?</h2>
-<blockquote><p>This is a bug in the terminal, not in nano. When a key is repeating faster than nano can process it, the keyboard buffer becomes full and starts dropping incoming keystrokes. Unfortunately, it doesn't just drop whole keystrokes; it can also drop parts of multibyte key combinations, resulting in nano's receiving a wrong key.</p></blockquote>
-<h2><a name="4.5"></a>4.5. How do I type the F13-F16 keys shown in the help browser? My keyboard only has F1-F12!</h2>
+<blockquote><p>This was a bug in how nano handled consecutive escape sequences. It should be fixed since version 2.6.0.</p></blockquote>
+<h2><a name="4.5"></a>4.5. How do I type the F13-F16 keys listed in the help viewer? My keyboard only has F1-F12!</h2>
 <blockquote><p>It depends on the terminal type you're using. On some terminals, such as the FreeBSD console, xterm, konsole, and gnome-terminal, Shift-F1 to Shift-F4 will generate F13 to F16. On other terminals, such as the Linux console, rxvt, and Eterm, Shift-F3 to Shift-F6 will generate F13 to F16.</p></blockquote>
 <h2><a name="4.6"></a>4.6. nano crashes when I type &lt;insert keystroke here&gt;!</h2>
 <blockquote><p>If you aren't trying some bizarre keystroke combination with some bizarre $TERM entry, chances are you have found a bug. You are welcome to submit it to the <a href="mailto:nano-devel@gnu.org">nano-devel</a> list or in the <a href="https://savannah.gnu.org/bugs/?group=nano">bug tracker</a> on Savannah.</p></blockquote>
 <h2><a name="4.7"></a>4.7. nano crashes when I resize my window. How can I fix that?</h2>
 <blockquote><p>Older versions of nano had this problem.  Please upgrade to version 2.7.0 or newer.</p></blockquote>
-<h2><a name="4.8"></a>4.8. When I paste text into a document, each line gets indented further than the last. Why does nano do this, and how can I avoid it?</h2>
+<h2><a name="4.8a"></a>4.8a. When I paste text into a document, each line gets indented further than the last. Why does nano do this, and how can I avoid it?</h2>
 <blockquote><p>You have the autoindent feature turned on. Hit Meta-I to turn it off, paste your text, and then hit Meta-I again to turn it back on.</p></blockquote>
+<h2><a name="4.8b"></a>4.8b. When I paste from Windows into a remote nano, nano rewraps the lines. What gives?</h2>
+<blockquote><p>When pasting from Windows, in some situations linefeeds are sent instead of carriage returns (Enters). And linefeeds are <b>^J</b>s, which make nano justify (rewrap) the current paragraph. To prevent these linefeeds from causing these unwanted justifications, add this line to your .nanorc on the remote Linux box: <b>unbind ^J main</b> or <b>bind ^J enter main</b>, depending on whether the paste contains CR + LF or only LF.</p></blockquote>
 <h2><a name="4.9"></a>4.9. I've compiled nano with color support, but I don't see any color when I run it!</h2>
-<blockquote><p>If you want nano to actually use color, you have to specify the color configurations you want it to use in your .nanorc. Several example configurations are in the <b>doc/syntax</b> subdirectory of the nano source, which are normally installed to <b>/usr/local/share/nano</b>. To enable all of them, uncomment the line <b># include "/usr/local/share/nano/*.nanorc"</b> in your nanorc. See also section <a href="#3.9a">3.9a</a>.</p></blockquote>
+<blockquote><p>If you want nano to actually use color, you have to specify the color configurations you want it to use in your .nanorc. Several example configurations are in the <b>syntax/</b> subdirectory of the nano source, which are normally installed to <b>/usr/local/share/nano/</b>. To enable all of them, uncomment the line <b># include "/usr/local/share/nano/*.nanorc"</b> in your nanorc. See also section <a href="#3.9a">3.9a</a>.</p></blockquote>
 <h2><a name="4.10"></a>4.10. How do I make nano my default editor (in Pine, mutt, etc.)?</h2>
 <blockquote><p>You need to make nano your $EDITOR. If you want this to be saved, you should put a line like this in your <b>.bashrc</b> if you use bash (or <b>.zshrc</b> if you believe in zsh):</p>
   <p><b>export EDITOR=/usr/local/bin/nano</b></p>
@@ -210,9 +215,9 @@
 <h2><a name="4.11"></a>4.11. How do I select text for or paste text from the clipboard in an X terminal when I'm running nano in one and nano's mouse support is turned on?</h2>
 <blockquote><p>Try holding down the Shift key and selecting or pasting the text as you normally would.</p></blockquote>
 <h2><a name="4.12"></a>4.12. On startup I get a message that says "Detected a legacy nano history file".  Now older nano versions can't find my search history!</h2>
-<blockquote><p>In nano 2.3.0, cursor-position history was introduced, and both history files now reside in a .nano subdirectory in your home directory.  A newer nano will move an existing search-history file to this new location so it can continue to be used.  This means that if you then try and use an earlier version of nano, it will be unable to see your current search history.  To fix this, run the following command:<br>
+<blockquote><p>In nano 2.3.0, cursor-position history was introduced, and both history files now reside in a .nano subdirectory in your home directory.  A newer nano will move an existing search-history file to this new location so it can continue to be used.  This means that if you then try and use an earlier version of nano, it will be unable to see your current search history.  To fix this, run the following command:</p>
   <p><b>ln -sf ~/.nano/search_history ~/.nano_history</b></p>
-</p><p>The "migration service" (moving the search-history file to its new location) will be deleted from nano in early 2018.</p></blockquote>
+  <p>The "migration service" (moving the search-history file to its new location) will be deleted from nano in early 2018.</p></blockquote>
 <hr width="100%">
 
 <h1><a name="5"></a>5. Internationalization</h1>
@@ -230,102 +235,32 @@
 <h2><a name="6.1"></a>6.1. Why should I use nano instead of Pico?</h2>
 <blockquote><p>There are many reasons to use nano instead of Pico. A more complete list can be found at the <a href="https://nano-editor.org/">nano homepage</a>.</p></blockquote>
 <h2><a name="6.2"></a>6.2. Why should I use Pico instead of nano?</h2>
-<blockquote><p>Again, check out the <a href="https://nano-editor.org/">nano homepage</a> for a good summary of reasons. It really is a matter of personal preference as to which editor you should use. If you're the type of person who likes using the original version of a program, then Pico is the editor for you. If you don't mind sacrificing mailer integration with Pine, and are looking for a few more features, as well as a 'better' license in terms of adding your own changes, nano is the way to go.</p><p>Note that the last of these no longer applies to the new version of Pine, <a href="http://www.washington.edu/alpine/">Alpine</a>, which is under the Apache License, version 2.0.</p></blockquote>
+<blockquote><p>Again, check out the <a href="https://nano-editor.org/">nano homepage</a> for a good summary of reasons. It really is a matter of personal preference as to which editor you should use. If you're the type of person who likes using the original version of a program, then Pico is the editor for you. If you don't mind sacrificing mailer integration with Pine, and are looking for a few more features, as well as a 'better' license in terms of adding your own changes, nano is the way to go.</p>
+<p>Note that the last of these no longer applies to the new version of Pine, <a href="http://www.washington.edu/alpine/">Alpine</a>, which is under the Apache License, version 2.0.</p></blockquote>
 <h2><a name="6.3"></a>6.3. What is so bad about the older Pine license?</h2>
 <blockquote><p>The U of W license for older versions of Pine and Pico is not considered truly Free Software according to both the Free Software Foundation and the <a href="http://www.debian.org/social_contract#guidelines">Debian Free Software Guidelines</a>. The main problem regards the limitations on distributing derived works: according to UW, you can distribute their software, and you can modify it, but you can not do both, i.e. distribute modified binaries.</p></blockquote>
 <h2><a name="6.4"></a>6.4. Okay, well, what mail program should I use then?</h2>
-<blockquote><p>If you are looking to use a Free Software program similar to Pine, and Emacs is not your thing, you should definitely take a look at <a href="http://www.mutt.org/">mutt</a>. It is a full-screen, console based mail program that actually has a lot more flexibility than Pine, but has a keymap included in the distribution that allows you to use the same keystrokes as Pine would to send and receive mail. It's also under the GNU General Public License, version 2.0.<P>
-Of course, due to the license change you can now use the <A HREF="http://www.washington.edu/alpine/">Alpine distribution</A> of PINE as it is now considered Free Software, but you would be sacrificing many of nano's features to do so.</p></blockquote>
+<blockquote><p>If you are looking to use a Free Software program similar to Pine, and Emacs is not your thing, you should definitely take a look at <a href="http://www.mutt.org/">mutt</a>. It is a full-screen, console based mail program that actually has a lot more flexibility than Pine, but has a keymap included in the distribution that allows you to use the same keystrokes as Pine would to send and receive mail. It's also under the GNU General Public License, version 2.0.</p>
+<p>Of course, due to the license change you can now use the <a href="http://www.washington.edu/alpine/">Alpine distribution</a> of PINE as it is now considered Free Software, but you would be sacrificing many of nano's features to do so.</p></blockquote>
 <hr width="100%">
 
 <h1><a name="7"></a>7. Miscellaneous</h1>
-<h2><a name="7.1"></a>7.1. nano-related mailing lists.</h2>
+<h2><a name="7.1"></a>7.1. Where can I ask questions or send suggestions?</h2>
 <blockquote><p>There are three mailing lists for nano hosted at <a href="http://savannah.gnu.org/">Savannah</a>: info-nano, help-nano and nano-devel. info-nano is a very low traffic list where new versions of nano are announced (surprise!). help-nano is for getting help with the editor without needing to hear all of the development issues surrounding it. nano-devel is a normally low, sometimes high traffic list for discussing the present and future development of nano. Here are links to where you can sign up for a given list:</p>
   <p>info-nano - <a href="http://mail.gnu.org/mailman/listinfo/info-nano/">http://mail.gnu.org/mailman/listinfo/info-nano/</a><br>
   help-nano - <a href="http://mail.gnu.org/mailman/listinfo/help-nano/">http://mail.gnu.org/mailman/listinfo/help-nano/</a><br>
   nano-devel - <a href="http://mail.gnu.org/mailman/listinfo/nano-devel/">http://mail.gnu.org/mailman/listinfo/nano-devel/</a></p></blockquote>
-<h2><a name="7.2"></a>7.2. I want to send the development team a big load of cash (or just a thank you).</h2>
-<blockquote><p>That's fine. Send it <a href="mailto:nano-devel@gnu.org">our way</a>! Better yet, fix a <a href="https://savannah.gnu.org/bugs/?group=nano">bug</a> in the program or implement a <a href="https://nano-editor.org/dist/latest/TODO">cool feature</a> and send us that instead (though cash is fine too).</p></blockquote>
-<h2><a name="7.3"></a>7.3. How do I submit a bug report or patch?</h2>
+<h2><a name="7.2"></a>7.3. How do I submit a bug report or patch?</h2>
 <blockquote>
-<p>The best place to submit bugs is to the <a href="https://savannah.gnu.org/bugs/?group=nano">Savannah bug tracker</a> as you can check whether the bug you are submitting has already been submitted.
-<p>Please submit patches for nano via the <a href="https://savannah.gnu.org/patch/?group=nano">Savannah project's patch manager</a> for the nano project.</p></blockquote>
+  <p>The best way to submit bugs is through the <a href="https://savannah.gnu.org/bugs/?group=nano">Savannah bug tracker</a>, as you can check whether the bug you are reporting has already been submitted, and it makes it easier for the maintainers to keep track of them.
+  <p>You can submit patches for nano via <a href="https://savannah.gnu.org/patch/?group=nano">Savannah's patch manager</a>.</p></blockquote>
+<h2><a name="7.3"></a>7.3. I want to send the development team a big load of cash (or just a thank you).</h2>
+<blockquote><p>That's fine. Send it <a href="mailto:nano-devel@gnu.org">our way</a>! Better yet, fix a <a href="https://savannah.gnu.org/bugs/?group=nano">bug</a> in the program or implement a <a href="https://nano-editor.org/dist/latest/TODO">cool feature</a> and send us that instead (though cash is fine too).</p></blockquote>
 <h2><a name="7.4"></a>7.4. How do I join the development team?</h2>
 <blockquote><p>The easiest way is to consistently send in good patches that add some needed functionality, fix a bug or two, and/or make the program more optimized/efficient. Then ask nicely and you will probably be added to the Savannah development list and be given write access after a while. There is a lot of responsibility that goes along with being a team member, so don't think it's just something to add to your resume.</p></blockquote>
 <h2><a name="7.5"></a>7.5. Can I have write access to the git tree?</h2>
 <blockquote><p>Re-read section <a href="#7.4">7.4</a> and you should know the answer.</p></blockquote>
 <hr width="100%">
 
-<h1><a name="8"></a>8. ChangeLog</h1>
-<blockquote><p>
-2017.01.09 - Delete some obsolete items and update a few others. (Benno)<br>
-2016.04.17 - Update docs to refer to GIT instead of subversion. (Mike)<br>
-2015.07.18 - More small fixes and updates. (Benno)<br>
-2014.04.24 - A bunch of small fixes and updates. (Benno)<br>
-2009.11.30 - Update various bits for nano 2.2.x. (DLR)<br>
-2009.11.18 - Typo fix. (j.mader@gmail.com)<br>
-2008.03.16 - Update docs to refer to subversion instead of CVS, add more words about Alpine, and refer to Savannah for bugs and patches. (Chris)<br>
-2007.12.21 - Update maintainer information. (DLR)<br>
-2007.12.09 - Add minor punctuation and wording fixes, and update various sections to account for Alpine. (DLR)<br>
-2007.08.26 - Update links to the Free Translation Project. (DLR)<br>
-2007.07.29 - Update RPM links for nano 2.0.x. (DLR)<br>
-2007.04.18 - Add a new section 4.14 to explain how autoindent affects pasted text. (John M. Gabriele, minor tweaks by DLR)<br>
-2007.04.04 - Update email address. (DLR)<br>
-2007.01.01 - Update section 4.1 to describe how to open files with names beginning with '+' at specified columns as well as lines. (DLR)<br>
-2006.11.25 - Add miscellaneous wording and capitalization fixes. (DLR)<br>
-2006.10.28 - Update various links for the 2.0 branch of nano. (DLR)<br>
-2006.10.06 - Update the question in section 4.13 to match the version of it in the answer section. (DLR)<br>
-2006.07.25 - Update section 5.3 again to not state &quot;the latest development version&quot; before 1.3.12, as it's no longer accurate. Also add some minor spacing fixes. (DLR)<br>
-2006.06.12 - Update section 5.3, due to the display fix for two-column Unicode characters. (DLR)<br>
-2006.06.05 - Add a new section 4.8, and move all section 4 entries after it down one number, to explain how to deal with glibc 2.2.3's crashes involving extended regular expressions. (DLR)<br>
-2006.06.04 - Add minor punctuation, wording, and typo fixes. (DLR)<br>
-2006.05.27 - Update section 3.8 to mention the new "Unicode Input" prompt, and how Unicode input only works when Unicode support is enabled. (DLR)<br>
-2006.05.12 - Remove section 4.4, and move all section 4 entries after it up one number, since it no longer applies. Meta-] and Meta-[ are no longer used to indent and unindent marked text, since they require that the bracket matching key change to Ctrl-], which is used as the telnet escape key (found by Chris). Also, make the link to the nano CVS page a bit more readable. (DLR)<br>
-2006.05.08 - Add a new section 4.5, and move all section 4 entries after it down one number, to explain a problem that can occur when holding down keys to generate Meta sequences. Also add a few more capitalization and wording fixes. (Benno Schulenberg, minor tweaks by DLR)<br>
-2006.05.01 - Add a new section 4.4, and move all section 4 entries after it down one number, to explain how to deal with problems typing Meta-[. Also add a few capitalization and wording fixes. (DLR)<br>
-2006.04.14 - Clarify section 1.4: help menu -> help text display. (DLR, suggested by Benno Schulenberg)<br>
-2006.03.16 - Update the Free Translation Project's address, change the character set to UTF-8, and remove broken links to contributed RedHat nano packages. (DLR)<br>
-2005.11.21 - Clarify section 5.3 to better explain how to enable Unicode support, and remove the mention of quirks, since they turned out to not be a nano problem. (Mike Frysinger and DLR)<br>
-2005.11.19 - Add a new section 5.3 to explain the status of nano's Unicode support. (Mike Frysinger, minor tweaks by DLR)<br>
-2005.08.27 - Update email address. (DLR)<br>
-2005.08.10 - Add a new section 4.3, and move all section 4 entries after it down one number, to explain how to deal with numeric keypad problems. (DLR)<br>
-2005.08.08 - Update section 3.8 to mention that verbatim input mode now takes a six-digit hexadecimal number. (DLR)<br>
-2005.07.04 - Update section 4.10 to mention that pasting from the X clipboard via the middle mouse button also works when the Shift key is used. (DLR)<br>
-2005.06.15 - Update description of --enable-extra, and add missing line breaks. (DLR)<br>
-2005.06.13 - Minor capitalization and wording fixes. (DLR)<br>
-2005.06.08 - Updated section 1.1 to mention the current maintainer. (DLR)<br>
-2005.03.09 - Added question about opening files with names beginning with '+'s, and added a few more miscellaneous cosmetic fixes. (DLR)<br>
-2005.01.03 - Removed now-inaccurate note about verbatim input's not working at prompts, and update its description to mention that it handles hexadecimal values now. (DLR)<br>
-2004.11.21 - Listed sh as an example of a Bourne shell. (DLR)<br>
-2004.11.05 - Fixed inaccuracy: Pico compatibility mode was made the default in nano 1.1.99pre1, not 1.2.2. Also added question about how to type F13-F16 on terminals lacking keys past F12 (suggested by Chris), question about how to select text for the clipboard in X terminals with nano's mouse support turned on (answer found by Joseph Birthisel), and misc. fixes and link updates. (DLR)<br>
-2004.04.07 - Removed NumLock glitch question, as it's no longer needed. (DLR)<br>
-2004.01.30 - Fixed inaccuracy: multibuffer mode was first in nano 1.1.0, not 1.1.12. (DLR)<br>
-2003.12.31 - Added question about the new verbatim input function, and a few minor fixes. Removed reference to &quot;set pico&quot; (DLR).<br>
-2003.07.02 - Added question about nano's not showing color when it's compiled with color support (DLR; suggested by Jordi).<br>
-2003.02.23 - Updated RPM links for nano 1.2.x (DLR).<br>
-2003.01.16 - Split section 4.5 into 4.5a and 4.5b for search string behavior. Added --enable-all docs.<br>
-2002.12.28 - More misc. fixes (David Benbennick, DLR).<br>
-2002.10.25 - Misc. fixes and link updates (DLR).<br>
-2002.09.10 - Another typo fix (DLR).<br>
-2002.05.15 - Typo fix (DLR).<br>
-2001.12.26 - Misc. fixes (Aaron S. Hawley, DLR).<br>
-2001.10.02 - Update for Free Translation Project.<br>
-2001.10.02 - Assorted fixes, Debian additions.<br>
-2001.06.30 - Silly typo fix.<br>
-2001.05.05 - Spelling fixes by David Lawrence Ramsey.<br>
-2001.05.02 - Misc fixes.<br>
-2001.03.26 - Typo fix in an URL.<br>
-2001.02.17 - Advocacy updates.<br>
-2001.02.15 - Added GNU notes for 0.9.99pre3.<br>
-2001.02.06 - Typo fixes.<br>
-2001.01.14 - Added note about NumLock glitch.<br>
-2001.01.10 - Linux -&gt; GNU/Linux.<br>
-2001.01.09 - Added &quot;making exe smaller&quot; section.<br>
-2000.12.19 - Typo and assorted error fixes.<br>
-2000.11.28 - Added blurb about make install-strip.<br>
-2000.11.19 - Changed Debian frozen to stable.<br>
-2000.11.18 - Previous string display (4.5).<br>
-2000.09.27 - Moved addresses to nano-editor.org.<br>
-2000.06.31 - Initial framework.</p></blockquote>
 </body>
 </html>

doc/nano.1

@@ -1,5 +1,4 @@
-.\" Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007,
-.\" 2009, 2010, 2013, 2014 Free Software Foundation, Inc.
+.\" Copyright (C) 1999-2011, 2013-2017 Free Software Foundation, Inc.
 .\"
 .\" This document is dual-licensed.  You may distribute and/or modify it
 .\" under the terms of either of the following licenses:
@@ -17,8 +16,7 @@
 .\"   Documentation License along with this program.  If not, see
 .\"   <http://www.gnu.org/licenses/>.
 .\"
-.TH NANO 1 "version 2.7.4" "January 2017"
-.\" Please adjust this date whenever revising the manpage.
+.TH NANO 1 "version 2.9.0" "November 2017"
 
 .SH NAME
 nano \- Nano's ANOther editor, an enhanced free Pico clone
@@ -28,11 +26,17 @@ nano \- Nano's ANOther editor, an enhanced free Pico clone
 .RI [ options "] [[+" line [, column "]]\ " file "]..."
 
 .SH DESCRIPTION
-\fBnano\fP is a small, free and friendly editor which aims to replace
-Pico, the default editor included in the non-free Pine package.  On
-top of copying Pico's look and feel, \fBnano\fP also implements some
-missing (or disabled by default) features in Pico, such as "search and
-replace" and "go to line and column number".
+\fBnano\fP is a small and friendly editor.  It copies the look and feel
+of Pico, but is free software, and implements several features that Pico
+lacks, such as: opening multiple files, scrolling per line, undo/redo,
+syntax coloring, line numbering, and soft-wrapping overlong lines.
+
+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.
+
+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
@@ -54,18 +58,13 @@ Since nano-2.7.0, text can also be selected by holding Shift and moving the
 cursor with the arrow keys.  Holding down the Alt key too will increase the
 stride.
 .PP
-The two lines at the bottom of the screen show the most important commands;
+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
 .TP
-.B +\fIline\fP,\fIcolumn\fP
-Places the cursor on line number \fIline\fP and at column number \fIcolumn\fP
-(at least one of which must be specified) on startup, instead of the
-default line 1, column 1.
-.TP
 .BR \-A ", " \-\-smarthome
 Make the Home key smarter.  When Home is pressed anywhere but at the
 very beginning of non-whitespace characters on a line, the cursor will
@@ -77,9 +76,9 @@ 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.
+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.
 .TP
 .BR \-D ", " \-\-boldtext
@@ -89,17 +88,17 @@ Use bold text instead of reverse video text.
 Convert typed tabs to spaces.
 .TP
 .BR \-F ", " \-\-multibuffer
-Enable multiple file buffers (if support for them has been compiled in).
+Read a file into a new buffer by default.
 .TP
 .BR \-G ", " \-\-locking
-Enable vim-style file locking when editing files.
+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
@@ -136,16 +135,17 @@ This restricted mode is also accessible by invoking \fBnano\fP
 with any name beginning with 'r' (e.g. "rnano").
 .TP
 .BR \-S ", " \-\-smooth
-Enable smooth scrolling.  Text will scroll line-by-line, instead of the
+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,12 +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.  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
@@ -182,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
@@ -203,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
@@ -212,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
@@ -238,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.
@@ -254,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
@@ -266,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.
 
@@ -288,18 +293,22 @@ 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.
 
 .SH HOMEPAGE
-https://nano-editor.org/
+\fIhttps://nano-editor.org/\fR
 
 .SH SEE ALSO
 .BR nanorc (5)

doc/nanorc.5

@@ -1,5 +1,4 @@
-.\" Copyright (C) 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011,
-.\" 2013, 2014, 2015 Free Software Foundation, Inc.
+.\" Copyright (C) 2003-2011, 2013-2017 Free Software Foundation, Inc.
 .\"
 .\" This document is dual-licensed.  You may distribute and/or modify it
 .\" under the terms of either of the following licenses:
@@ -17,8 +16,7 @@
 .\"   Documentation License along with this program.  If not, see
 .\"   <http://www.gnu.org/licenses/>.
 .\"
-.TH NANORC 5 "version 2.7.4" "January 2017"
-.\" Please adjust this date whenever revising the manpage.
+.TH NANORC 5 "version 2.9.0" "November 2017"
 
 .SH NAME
 nanorc \- GNU nano's configuration file
@@ -28,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
@@ -41,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.
@@ -58,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
@@ -67,17 +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,
-and selected text.  This can be overridden for the first three by setting
-the options \fBtitlecolor\fP, \fBstatuscolor\fP, and \fBkeycolor\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
@@ -151,8 +160,13 @@ Don't display the two help lines at the bottom of the screen.
 .B set nonewlines
 Don't automatically add a newline to the ends of files.
 .TP
+.B set nopauses
+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.
@@ -179,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
@@ -208,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.
@@ -230,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
@@ -247,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.
@@ -263,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
@@ -282,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 " ""\fIstr\fR"" [""\fIfileregex\fR"" ...]"
-Defines a syntax named \fIstr\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
-\fIstr\fP syntax until a new \fBsyntax\fR command is encountered.
+.BR syntax " ""\fIname\fR"" [""\fIfileregex\fR"" ...]"
+Start the definition of a syntax with this \fIname\fR.
+All subsequent \fBcolor\fR and other such commands
+will be added to this syntax, until a new \fBsyntax\fR
+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
@@ -342,32 +364,33 @@ foreground.  If your terminal supports transparency, not specifying a
 background.
 .TP
 .B icolor \fIfgcolor\fR,\fIbgcolor\fR """\fIregex\fR""" ...
-Same as above, except that the text matching is case insensitive.
+Same as above, except that the matching is case insensitive.
 .TP
-.BR color " \fIfgcolor\fR,\fIbgcolor\fR " start= """\fIsr\fR"" " end= """\fIer\fR""
+.BR color " \fIfgcolor\fR,\fIbgcolor\fR " start= """\fIfromrx\fR"" " end= """\fItorx\fR""
 Display all pieces of text whose start matches extended regular expression
-\fIsr\fP and whose end matches extended regular expression \fIer\fP with
+\fIfromrx\fP and whose end matches extended regular expression \fItorx\fP with
 foreground color \fIfgcolor\fP and background color \fIbgcolor\fP,
 at least one of which must be specified.  This means that, after an
-initial instance of \fIsr\fP, all text will be highlighted until the
-first instance of \fIer\fP.  This allows syntax highlighting to span
+initial instance of \fIfromrx\fP, all text until the first instance of
+\fItorx\fP will be colored.  This allows syntax highlighting to span
 multiple lines.
 .TP
-.BR icolor " \fIfgcolor\fR,\fIbgcolor\fR " start= """\fIsr\fR"" " end= """\fIer\fR""
-Same as above, except that the text matching is case insensitive.
+.BR icolor " \fIfgcolor\fR,\fIbgcolor\fR " start= """\fIfromrx\fR"" " end= """\fItorx\fR""
+Same as above, except that the matching is case insensitive.
 .TP
 .BR include " ""\fIsyntaxfile\fR"""
 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 " str directive " \fR[ "arg " \fR...]
-Extend the syntax previously defined as \fIstr\fP to include
-new information.  This allows you to add 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
+.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
+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:
 .TP
@@ -414,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.
@@ -536,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
@@ -580,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
@@ -641,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
@@ -661,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).
@@ -766,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.7.4" "January 2017"
-.\" Please adjust this date whenever revising the manpage.
+.TH RNANO 1 "version 2.9.0" "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,
@@ -95,6 +92,10 @@
 ## Don't display the helpful shortcut lists at the bottom of the screen.
 # set nohelp
 
+## Don't pause between warnings at startup.  Which means that only the
+## last one will be readable (when there are multiple ones).
+# set nopauses
+
 ## Don't add newlines to the ends of files.
 # set nonewlines
 
@@ -120,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.
@@ -159,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.
@@ -198,10 +199,18 @@
 ## Paint the interface elements of nano.
 ## These are examples; by default there are no colors.
 # set titlecolor brightwhite,blue
-# set numbercolor cyan
 # set statuscolor brightwhite,green
-# set keycolor green
-# set functioncolor yellow
+# 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
 
 
 ## Setup of syntax coloring.
@@ -252,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
 

m4/Makefile.am

@@ -1,5 +1,36 @@
-EXTRA_DIST = ac_define_dir.m4 codeset.m4 gettext.m4 glib-2.0.m4 \
-		glibc21.m4 iconv.m4 intdiv0.m4 inttypes_h.m4 \
-		inttypes.m4 inttypes-pri.m4 isc-posix.m4 lcmessage.m4 \
-		lib-ld.m4 lib-link.m4 lib-prefix.m4 progtest.m4 \
-		stdint_h.m4 uintmax_t.m4 ulonglong.m4
+EXTRA_DIST = \
+	ac_define_dir.m4 \
+	ax_check_compile_flag.m4 \
+	codeset.m4 \
+	extern-inline.m4 \
+	fcntl-o.m4 \
+	gettext.m4 \
+	glibc21.m4 \
+	glibc2.m4 \
+	gnulib-cache.m4 \
+	iconv.m4 \
+	intdiv0.m4 \
+	intldir.m4 \
+	intl.m4 \
+	intlmacosx.m4 \
+	intmax.m4 \
+	inttypes_h.m4 \
+	inttypes-pri.m4 \
+	lcmessage.m4 \
+	lib-ld.m4 \
+	lib-link.m4 \
+	lib-prefix.m4 \
+	lock.m4 \
+	longlong.m4 \
+	nls.m4 \
+	po.m4 \
+	printf-posix.m4 \
+	progtest.m4 \
+	size_max.m4 \
+	stdint_h.m4 \
+	threadlib.m4 \
+	uintmax_t.m4 \
+	visibility.m4 \
+	wchar_t.m4 \
+	wint_t.m4 \
+	xsize.m4

m4/codeset.m4

@@ -1,23 +0,0 @@
-# codeset.m4 serial AM1 (gettext-0.10.40)
-dnl Copyright (C) 2000-2002 Free Software Foundation, Inc.
-dnl This file is free software, distributed under the terms of the GNU
-dnl General Public License.  As a special exception to the GNU General
-dnl Public License, this file may be distributed as part of a program
-dnl that contains a configuration script generated by Autoconf, under
-dnl the same distribution terms as the rest of that program.
-
-dnl From Bruno Haible.
-
-AC_DEFUN([AM_LANGINFO_CODESET],
-[
-  AC_CACHE_CHECK([for nl_langinfo and CODESET], am_cv_langinfo_codeset,
-    [AC_TRY_LINK([#include <langinfo.h>],
-      [char* cs = nl_langinfo(CODESET);],
-      am_cv_langinfo_codeset=yes,
-      am_cv_langinfo_codeset=no)
-    ])
-  if test $am_cv_langinfo_codeset = yes; then
-    AC_DEFINE(HAVE_LANGINFO_CODESET, 1,
-      [Define if you have <langinfo.h> and nl_langinfo(CODESET).])
-  fi
-])

m4/gettext.m4

@@ -1,587 +0,0 @@
-# gettext.m4 serial 17 (gettext-0.11.5)
-dnl Copyright (C) 1995-2002 Free Software Foundation, Inc.
-dnl This file is free software, distributed under the terms of the GNU
-dnl General Public License.  As a special exception to the GNU General
-dnl Public License, this file may be distributed as part of a program
-dnl that contains a configuration script generated by Autoconf, under
-dnl the same distribution terms as the rest of that program.
-dnl
-dnl This file can can be used in projects which are not available under
-dnl the GNU General Public License or the GNU Library General Public
-dnl License but which still want to provide support for the GNU gettext
-dnl functionality.
-dnl Please note that the actual code of the GNU gettext library is covered
-dnl by the GNU Library General Public License, and the rest of the GNU
-dnl gettext package package is covered by the GNU General Public License.
-dnl They are *not* in the public domain.
-
-dnl Authors:
-dnl   Ulrich Drepper <drepper@cygnus.com>, 1995-2000.
-dnl   Bruno Haible <haible@clisp.cons.org>, 2000-2002.
-
-dnl Macro to add for using GNU gettext.
-
-dnl Usage: AM_GNU_GETTEXT([INTLSYMBOL], [NEEDSYMBOL], [INTLDIR]).
-dnl INTLSYMBOL can be one of 'external', 'no-libtool', 'use-libtool'. The
-dnl    default (if it is not specified or empty) is 'no-libtool'.
-dnl    INTLSYMBOL should be 'external' for packages with no intl directory,
-dnl    and 'no-libtool' or 'use-libtool' for packages with an intl directory.
-dnl    If INTLSYMBOL is 'use-libtool', then a libtool library
-dnl    $(top_builddir)/intl/libintl.la will be created (shared and/or static,
-dnl    depending on --{enable,disable}-{shared,static} and on the presence of
-dnl    AM-DISABLE-SHARED). If INTLSYMBOL is 'no-libtool', a static library
-dnl    $(top_builddir)/intl/libintl.a will be created.
-dnl If NEEDSYMBOL is specified and is 'need-ngettext', then GNU gettext
-dnl    implementations (in libc or libintl) without the ngettext() function
-dnl    will be ignored.  If NEEDSYMBOL is specified and is
-dnl    'need-formatstring-macros', then GNU gettext implementations that don't
-dnl    support the ISO C 99 <inttypes.h> formatstring macros will be ignored.
-dnl INTLDIR is used to find the intl libraries.  If empty,
-dnl    the value `$(top_builddir)/intl/' is used.
-dnl
-dnl The result of the configuration is one of three cases:
-dnl 1) GNU gettext, as included in the intl subdirectory, will be compiled
-dnl    and used.
-dnl    Catalog format: GNU --> install in $(datadir)
-dnl    Catalog extension: .mo after installation, .gmo in source tree
-dnl 2) GNU gettext has been found in the system's C library.
-dnl    Catalog format: GNU --> install in $(datadir)
-dnl    Catalog extension: .mo after installation, .gmo in source tree
-dnl 3) No internationalization, always use English msgid.
-dnl    Catalog format: none
-dnl    Catalog extension: none
-dnl If INTLSYMBOL is 'external', only cases 2 and 3 can occur.
-dnl The use of .gmo is historical (it was needed to avoid overwriting the
-dnl GNU format catalogs when building on a platform with an X/Open gettext),
-dnl but we keep it in order not to force irrelevant filename changes on the
-dnl maintainers.
-dnl
-AC_DEFUN([AM_GNU_GETTEXT],
-[
-  dnl Argument checking.
-  ifelse([$1], [], , [ifelse([$1], [external], , [ifelse([$1], [no-libtool], , [ifelse([$1], [use-libtool], ,
-    [errprint([ERROR: invalid first argument to AM_GNU_GETTEXT
-])])])])])
-  ifelse([$2], [], , [ifelse([$2], [need-ngettext], , [ifelse([$2], [need-formatstring-macros], ,
-    [errprint([ERROR: invalid second argument to AM_GNU_GETTEXT
-])])])])
-  define(gt_included_intl, ifelse([$1], [external], [no], [yes]))
-  define(gt_libtool_suffix_prefix, ifelse([$1], [use-libtool], [l], []))
-
-  AC_REQUIRE([AM_PO_SUBDIRS])dnl
-  ifelse(gt_included_intl, yes, [
-    AC_REQUIRE([AM_INTL_SUBDIR])dnl
-  ])
-
-  dnl Prerequisites of AC_LIB_LINKFLAGS_BODY.
-  AC_REQUIRE([AC_LIB_PREPARE_PREFIX])
-  AC_REQUIRE([AC_LIB_RPATH])
-
-  dnl Sometimes libintl requires libiconv, so first search for libiconv.
-  dnl Ideally we would do this search only after the
-  dnl      if test "$USE_NLS" = "yes"; then
-  dnl        if test "$gt_cv_func_gnugettext_libc" != "yes"; then
-  dnl tests. But if configure.in invokes AM_ICONV after AM_GNU_GETTEXT
-  dnl the configure script would need to contain the same shell code
-  dnl again, outside any 'if'. There are two solutions:
-  dnl - Invoke AM_ICONV_LINKFLAGS_BODY here, outside any 'if'.
-  dnl - Control the expansions in more detail using AC_PROVIDE_IFELSE.
-  dnl Since AC_PROVIDE_IFELSE is only in autoconf >= 2.52 and not
-  dnl documented, we avoid it.
-  ifelse(gt_included_intl, yes, , [
-    AC_REQUIRE([AM_ICONV_LINKFLAGS_BODY])
-  ])
-
-  AC_MSG_CHECKING([whether NLS is requested])
-  dnl Default is enabled NLS
-  AC_ARG_ENABLE(nls,
-    [  --disable-nls           do not use Native Language Support],
-    USE_NLS=$enableval, USE_NLS=yes)
-  AC_MSG_RESULT($USE_NLS)
-  AC_SUBST(USE_NLS)
-
-  ifelse(gt_included_intl, yes, [
-    BUILD_INCLUDED_LIBINTL=no
-    USE_INCLUDED_LIBINTL=no
-  ])
-  LIBINTL=
-  LTLIBINTL=
-  POSUB=
-
-  dnl If we use NLS figure out what method
-  if test "$USE_NLS" = "yes"; then
-    gt_use_preinstalled_gnugettext=no
-    ifelse(gt_included_intl, yes, [
-      AC_MSG_CHECKING([whether included gettext is requested])
-      AC_ARG_WITH(included-gettext,
-        [  --with-included-gettext use the GNU gettext library included here],
-        nls_cv_force_use_gnu_gettext=$withval,
-        nls_cv_force_use_gnu_gettext=no)
-      AC_MSG_RESULT($nls_cv_force_use_gnu_gettext)
-
-      nls_cv_use_gnu_gettext="$nls_cv_force_use_gnu_gettext"
-      if test "$nls_cv_force_use_gnu_gettext" != "yes"; then
-    ])
-        dnl User does not insist on using GNU NLS library.  Figure out what
-        dnl to use.  If GNU gettext is available we use this.  Else we have
-        dnl to fall back to GNU NLS library.
-
-        dnl Add a version number to the cache macros.
-        define([gt_api_version], ifelse([$2], [need-formatstring-macros], 3, ifelse([$2], [need-ngettext], 2, 1)))
-        define([gt_cv_func_gnugettext_libc], [gt_cv_func_gnugettext]gt_api_version[_libc])
-        define([gt_cv_func_gnugettext_libintl], [gt_cv_func_gnugettext]gt_api_version[_libintl])
-
-        AC_CACHE_CHECK([for GNU gettext in libc], gt_cv_func_gnugettext_libc,
-         [AC_TRY_LINK([#include <libintl.h>
-]ifelse([$2], [need-formatstring-macros],
-[#ifndef __GNU_GETTEXT_SUPPORTED_REVISION
-#define __GNU_GETTEXT_SUPPORTED_REVISION(major) ((major) == 0 ? 0 : -1)
-#endif
-changequote(,)dnl
-typedef int array [2 * (__GNU_GETTEXT_SUPPORTED_REVISION(0) >= 1) - 1];
-changequote([,])dnl
-], [])[extern int _nl_msg_cat_cntr;
-extern int *_nl_domain_bindings;],
-            [bindtextdomain ("", "");
-return (int) gettext ("")]ifelse([$2], [need-ngettext], [ + (int) ngettext ("", "", 0)], [])[ + _nl_msg_cat_cntr + *_nl_domain_bindings],
-            gt_cv_func_gnugettext_libc=yes,
-            gt_cv_func_gnugettext_libc=no)])
-
-        if test "$gt_cv_func_gnugettext_libc" != "yes"; then
-          dnl Sometimes libintl requires libiconv, so first search for libiconv.
-          ifelse(gt_included_intl, yes, , [
-            AM_ICONV_LINK
-          ])
-          dnl Search for libintl and define LIBINTL, LTLIBINTL and INCINTL
-          dnl accordingly. Don't use AC_LIB_LINKFLAGS_BODY([intl],[iconv])
-          dnl because that would add "-liconv" to LIBINTL and LTLIBINTL
-          dnl even if libiconv doesn't exist.
-          AC_LIB_LINKFLAGS_BODY([intl])
-          AC_CACHE_CHECK([for GNU gettext in libintl],
-            gt_cv_func_gnugettext_libintl,
-           [gt_save_CPPFLAGS="$CPPFLAGS"
-            CPPFLAGS="$CPPFLAGS $INCINTL"
-            gt_save_LIBS="$LIBS"
-            LIBS="$LIBS $LIBINTL"
-            dnl Now see whether libintl exists and does not depend on libiconv.
-            AC_TRY_LINK([#include <libintl.h>
-]ifelse([$2], [need-formatstring-macros],
-[#ifndef __GNU_GETTEXT_SUPPORTED_REVISION
-#define __GNU_GETTEXT_SUPPORTED_REVISION(major) ((major) == 0 ? 0 : -1)
-#endif
-changequote(,)dnl
-typedef int array [2 * (__GNU_GETTEXT_SUPPORTED_REVISION(0) >= 1) - 1];
-changequote([,])dnl
-], [])[extern int _nl_msg_cat_cntr;
-extern
-#ifdef __cplusplus
-"C"
-#endif
-const char *_nl_expand_alias ();],
-              [bindtextdomain ("", "");
-return (int) gettext ("")]ifelse([$2], [need-ngettext], [ + (int) ngettext ("", "", 0)], [])[ + _nl_msg_cat_cntr + *_nl_expand_alias (0)],
-              gt_cv_func_gnugettext_libintl=yes,
-              gt_cv_func_gnugettext_libintl=no)
-            dnl Now see whether libintl exists and depends on libiconv.
-            if test "$gt_cv_func_gnugettext_libintl" != yes && test -n "$LIBICONV"; then
-              LIBS="$LIBS $LIBICONV"
-              AC_TRY_LINK([#include <libintl.h>
-]ifelse([$2], [need-formatstring-macros],
-[#ifndef __GNU_GETTEXT_SUPPORTED_REVISION
-#define __GNU_GETTEXT_SUPPORTED_REVISION(major) ((major) == 0 ? 0 : -1)
-#endif
-changequote(,)dnl
-typedef int array [2 * (__GNU_GETTEXT_SUPPORTED_REVISION(0) >= 1) - 1];
-changequote([,])dnl
-], [])[extern int _nl_msg_cat_cntr;
-extern
-#ifdef __cplusplus
-"C"
-#endif
-const char *_nl_expand_alias ();],
-                [bindtextdomain ("", "");
-return (int) gettext ("")]ifelse([$2], [need-ngettext], [ + (int) ngettext ("", "", 0)], [])[ + _nl_msg_cat_cntr + *_nl_expand_alias (0)],
-               [LIBINTL="$LIBINTL $LIBICONV"
-                LTLIBINTL="$LTLIBINTL $LTLIBICONV"
-                gt_cv_func_gnugettext_libintl=yes
-               ])
-            fi
-            CPPFLAGS="$gt_save_CPPFLAGS"
-            LIBS="$gt_save_LIBS"])
-        fi
-
-        dnl If an already present or preinstalled GNU gettext() is found,
-        dnl use it.  But if this macro is used in GNU gettext, and GNU
-        dnl gettext is already preinstalled in libintl, we update this
-        dnl libintl.  (Cf. the install rule in intl/Makefile.in.)
-        if test "$gt_cv_func_gnugettext_libc" = "yes" \
-           || { test "$gt_cv_func_gnugettext_libintl" = "yes" \
-                && test "$PACKAGE" != gettext; }; then
-          gt_use_preinstalled_gnugettext=yes
-        else
-          dnl Reset the values set by searching for libintl.
-          LIBINTL=
-          LTLIBINTL=
-          INCINTL=
-        fi
-
-    ifelse(gt_included_intl, yes, [
-        if test "$gt_use_preinstalled_gnugettext" != "yes"; then
-          dnl GNU gettext is not found in the C library.
-          dnl Fall back on included GNU gettext library.
-          nls_cv_use_gnu_gettext=yes
-        fi
-      fi
-
-      if test "$nls_cv_use_gnu_gettext" = "yes"; then
-        dnl Mark actions used to generate GNU NLS library.
-        INTLOBJS="\$(GETTOBJS)"
-        BUILD_INCLUDED_LIBINTL=yes
-        USE_INCLUDED_LIBINTL=yes
-        LIBINTL="ifelse([$3],[],\${top_builddir}/intl,[$3])/libintl.[]gt_libtool_suffix_prefix[]a $LIBICONV"
-        LTLIBINTL="ifelse([$3],[],\${top_builddir}/intl,[$3])/libintl.[]gt_libtool_suffix_prefix[]a $LTLIBICONV"
-        LIBS=`echo " $LIBS " | sed -e 's/ -lintl / /' -e 's/^ //' -e 's/ $//'`
-      fi
-
-      if test "$gt_use_preinstalled_gnugettext" = "yes" \
-         || test "$nls_cv_use_gnu_gettext" = "yes"; then
-        dnl Mark actions to use GNU gettext tools.
-        CATOBJEXT=.gmo
-      fi
-    ])
-
-    if test "$gt_use_preinstalled_gnugettext" = "yes" \
-       || test "$nls_cv_use_gnu_gettext" = "yes"; then
-      AC_DEFINE(ENABLE_NLS, 1,
-        [Define to 1 if translation of program messages to the user's native language
-   is requested.])
-    else
-      USE_NLS=no
-    fi
-  fi
-
-  if test "$USE_NLS" = "yes"; then
-
-    if test "$gt_use_preinstalled_gnugettext" = "yes"; then
-      if test "$gt_cv_func_gnugettext_libintl" = "yes"; then
-        AC_MSG_CHECKING([how to link with libintl])
-        AC_MSG_RESULT([$LIBINTL])
-        AC_LIB_APPENDTOVAR([CPPFLAGS], [$INCINTL])
-      fi
-
-      dnl For backward compatibility. Some packages may be using this.
-      AC_DEFINE(HAVE_GETTEXT, 1,
-       [Define if the GNU gettext() function is already present or preinstalled.])
-      AC_DEFINE(HAVE_DCGETTEXT, 1,
-       [Define if the GNU dcgettext() function is already present or preinstalled.])
-    fi
-
-    dnl We need to process the po/ directory.
-    POSUB=po
-  fi
-
-  ifelse(gt_included_intl, yes, [
-    dnl If this is used in GNU gettext we have to set BUILD_INCLUDED_LIBINTL
-    dnl to 'yes' because some of the testsuite requires it.
-    if test "$PACKAGE" = gettext; then
-      BUILD_INCLUDED_LIBINTL=yes
-    fi
-
-    dnl Make all variables we use known to autoconf.
-    AC_SUBST(BUILD_INCLUDED_LIBINTL)
-    AC_SUBST(USE_INCLUDED_LIBINTL)
-    AC_SUBST(CATOBJEXT)
-    AC_SUBST(INTLOBJS)
-
-    dnl For backward compatibility. Some configure.ins may be using this.
-    nls_cv_header_intl=
-    nls_cv_header_libgt=
-
-    dnl For backward compatibility. Some Makefiles may be using this.
-    DATADIRNAME=share
-    AC_SUBST(DATADIRNAME)
-
-    dnl For backward compatibility. Some Makefiles may be using this.
-    INSTOBJEXT=.mo
-    AC_SUBST(INSTOBJEXT)
-
-    dnl For backward compatibility. Some Makefiles may be using this.
-    GENCAT=gencat
-    AC_SUBST(GENCAT)
-
-    dnl Enable libtool support if the surrounding package wishes it.
-    INTL_LIBTOOL_SUFFIX_PREFIX=gt_libtool_suffix_prefix
-    AC_SUBST(INTL_LIBTOOL_SUFFIX_PREFIX)
-  ])
-
-  dnl For backward compatibility. Some Makefiles may be using this.
-  INTLLIBS="$LIBINTL"
-  AC_SUBST(INTLLIBS)
-
-  dnl Make all documented variables known to autoconf.
-  AC_SUBST(LIBINTL)
-  AC_SUBST(LTLIBINTL)
-  AC_SUBST(POSUB)
-])
-
-
-dnl Checks for all prerequisites of the po subdirectory,
-dnl except for USE_NLS.
-AC_DEFUN([AM_PO_SUBDIRS],
-[
-  AC_REQUIRE([AC_PROG_MAKE_SET])dnl
-  AC_REQUIRE([AC_PROG_INSTALL])dnl
-  AC_REQUIRE([AM_MKINSTALLDIRS])dnl
-
-  dnl Perform the following tests also if --disable-nls has been given,
-  dnl because they are needed for "make dist" to work.
-
-  dnl Search for GNU msgfmt in the PATH.
-  dnl The first test excludes Solaris msgfmt and early GNU msgfmt versions.
-  dnl The second test excludes FreeBSD msgfmt.
-  AM_PATH_PROG_WITH_TEST(MSGFMT, msgfmt,
-    [$ac_dir/$ac_word --statistics /dev/null >/dev/null 2>&1 &&
-     (if $ac_dir/$ac_word --statistics /dev/null 2>&1 >/dev/null | grep usage >/dev/null; then exit 1; else exit 0; fi)],
-    :)
-  AC_PATH_PROG(GMSGFMT, gmsgfmt, $MSGFMT)
-
-  dnl Search for GNU xgettext 0.11 or newer in the PATH.
-  dnl The first test excludes Solaris xgettext and early GNU xgettext versions.
-  dnl The second test excludes FreeBSD xgettext.
-  AM_PATH_PROG_WITH_TEST(XGETTEXT, xgettext,
-    [$ac_dir/$ac_word --omit-header --copyright-holder= /dev/null >/dev/null 2>&1 &&
-     (if $ac_dir/$ac_word --omit-header --copyright-holder= /dev/null 2>&1 >/dev/null | grep usage >/dev/null; then exit 1; else exit 0; fi)],
-    :)
-  dnl Remove leftover from FreeBSD xgettext call.
-  rm -f messages.po
-
-  dnl Search for GNU msgmerge 0.11 or newer in the PATH.
-  AM_PATH_PROG_WITH_TEST(MSGMERGE, msgmerge,
-    [$ac_dir/$ac_word --update -q /dev/null /dev/null >/dev/null 2>&1], :)
-
-  dnl This could go away some day; the PATH_PROG_WITH_TEST already does it.
-  dnl Test whether we really found GNU msgfmt.
-  if test "$GMSGFMT" != ":"; then
-    dnl If it is no GNU msgfmt we define it as : so that the
-    dnl Makefiles still can work.
-    if $GMSGFMT --statistics /dev/null >/dev/null 2>&1 &&
-       (if $GMSGFMT --statistics /dev/null 2>&1 >/dev/null | grep usage >/dev/null; then exit 1; else exit 0; fi); then
-      : ;
-    else
-      GMSGFMT=`echo "$GMSGFMT" | sed -e 's,^.*/,,'`
-      AC_MSG_RESULT(
-        [found $GMSGFMT program is not GNU msgfmt; ignore it])
-      GMSGFMT=":"
-    fi
-  fi
-
-  dnl This could go away some day; the PATH_PROG_WITH_TEST already does it.
-  dnl Test whether we really found GNU xgettext.
-  if test "$XGETTEXT" != ":"; then
-    dnl If it is no GNU xgettext we define it as : so that the
-    dnl Makefiles still can work.
-    if $XGETTEXT --omit-header --copyright-holder= /dev/null >/dev/null 2>&1 &&
-       (if $XGETTEXT --omit-header --copyright-holder= /dev/null 2>&1 >/dev/null | grep usage >/dev/null; then exit 1; else exit 0; fi); then
-      : ;
-    else
-      AC_MSG_RESULT(
-        [found xgettext program is not GNU xgettext; ignore it])
-      XGETTEXT=":"
-    fi
-    dnl Remove leftover from FreeBSD xgettext call.
-    rm -f messages.po
-  fi
-
-  AC_OUTPUT_COMMANDS([
-    for ac_file in $CONFIG_FILES; do
-      # Support "outfile[:infile[:infile...]]"
-      case "$ac_file" in
-        *:*) ac_file=`echo "$ac_file"|sed 's%:.*%%'` ;;
-      esac
-      # PO directories have a Makefile.in generated from Makefile.in.in.
-      case "$ac_file" in */Makefile.in)
-        # Adjust a relative srcdir.
-        ac_dir=`echo "$ac_file"|sed 's%/[^/][^/]*$%%'`
-        ac_dir_suffix="/`echo "$ac_dir"|sed 's%^\./%%'`"
-        ac_dots=`echo "$ac_dir_suffix"|sed 's%/[^/]*%../%g'`
-        # In autoconf-2.13 it is called $ac_given_srcdir.
-        # In autoconf-2.50 it is called $srcdir.
-        test -n "$ac_given_srcdir" || ac_given_srcdir="$srcdir"
-        case "$ac_given_srcdir" in
-          .)  top_srcdir=`echo $ac_dots|sed 's%/$%%'` ;;
-          /*) top_srcdir="$ac_given_srcdir" ;;
-          *)  top_srcdir="$ac_dots$ac_given_srcdir" ;;
-        esac
-        if test -f "$ac_given_srcdir/$ac_dir/POTFILES.in"; then
-          rm -f "$ac_dir/POTFILES"
-          test -n "$as_me" && echo "$as_me: creating $ac_dir/POTFILES" || echo "creating $ac_dir/POTFILES"
-          cat "$ac_given_srcdir/$ac_dir/POTFILES.in" | sed -e "/^#/d" -e "/^[ 	]*\$/d" -e "s,.*,     $top_srcdir/& \\\\," | sed -e "\$s/\(.*\) \\\\/\1/" > "$ac_dir/POTFILES"
-          # ALL_LINGUAS, POFILES, GMOFILES, UPDATEPOFILES, DUMMYPOFILES depend
-          # on $ac_dir but don't depend on user-specified configuration
-          # parameters.
-          if test -f "$ac_given_srcdir/$ac_dir/LINGUAS"; then
-            # The LINGUAS file contains the set of available languages.
-            if test -n "$ALL_LINGUAS"; then
-              test -n "$as_me" && echo "$as_me: setting ALL_LINGUAS in configure.in is obsolete" || echo "setting ALL_LINGUAS in configure.in is obsolete"
-            fi
-            ALL_LINGUAS_=`sed -e "/^#/d" "$ac_given_srcdir/$ac_dir/LINGUAS"`
-            # Hide the ALL_LINGUAS assigment from automake.
-            eval 'ALL_LINGUAS''=$ALL_LINGUAS_'
-          fi
-          case "$ac_given_srcdir" in
-            .) srcdirpre= ;;
-            *) srcdirpre='$(srcdir)/' ;;
-          esac
-          POFILES=
-          GMOFILES=
-          UPDATEPOFILES=
-          DUMMYPOFILES=
-          for lang in $ALL_LINGUAS; do
-            POFILES="$POFILES $srcdirpre$lang.po"
-            GMOFILES="$GMOFILES $srcdirpre$lang.gmo"
-            UPDATEPOFILES="$UPDATEPOFILES $lang.po-update"
-            DUMMYPOFILES="$DUMMYPOFILES $lang.nop"
-          done
-          # CATALOGS depends on both $ac_dir and the user's LINGUAS
-          # environment variable.
-          INST_LINGUAS=
-          if test -n "$ALL_LINGUAS"; then
-            for presentlang in $ALL_LINGUAS; do
-              useit=no
-              if test "%UNSET%" != "$LINGUAS"; then
-                desiredlanguages="$LINGUAS"
-              else
-                desiredlanguages="$ALL_LINGUAS"
-              fi
-              for desiredlang in $desiredlanguages; do
-                # Use the presentlang catalog if desiredlang is
-                #   a. equal to presentlang, or
-                #   b. a variant of presentlang (because in this case,
-                #      presentlang can be used as a fallback for messages
-                #      which are not translated in the desiredlang catalog).
-                case "$desiredlang" in
-                  "$presentlang"*) useit=yes;;
-                esac
-              done
-              if test $useit = yes; then
-                INST_LINGUAS="$INST_LINGUAS $presentlang"
-              fi
-            done
-          fi
-          CATALOGS=
-          if test -n "$INST_LINGUAS"; then
-            for lang in $INST_LINGUAS; do
-              CATALOGS="$CATALOGS $lang.gmo"
-            done
-          fi
-          test -n "$as_me" && echo "$as_me: creating $ac_dir/Makefile" || echo "creating $ac_dir/Makefile"
-          sed -e "/^POTFILES =/r $ac_dir/POTFILES" -e "/^# Makevars/r $ac_given_srcdir/$ac_dir/Makevars" -e "s|@POFILES@|$POFILES|g" -e "s|@GMOFILES@|$GMOFILES|g" -e "s|@UPDATEPOFILES@|$UPDATEPOFILES|g" -e "s|@DUMMYPOFILES@|$DUMMYPOFILES|g" -e "s|@CATALOGS@|$CATALOGS|g" "$ac_dir/Makefile.in" > "$ac_dir/Makefile"
-          for f in "$ac_given_srcdir/$ac_dir"/Rules-*; do
-            if test -f "$f"; then
-              case "$f" in
-                *.orig | *.bak | *~) ;;
-                *) cat "$f" >> "$ac_dir/Makefile" ;;
-              esac
-            fi
-          done
-        fi
-        ;;
-      esac
-    done],
-   [# Capture the value of obsolete ALL_LINGUAS because we need it to compute
-    # POFILES, GMOFILES, UPDATEPOFILES, DUMMYPOFILES, CATALOGS. But hide it
-    # from automake.
-    eval 'ALL_LINGUAS''="$ALL_LINGUAS"'
-    # Capture the value of LINGUAS because we need it to compute CATALOGS.
-    LINGUAS="${LINGUAS-%UNSET%}"
-   ])
-])
-
-
-dnl Checks for all prerequisites of the intl subdirectory,
-dnl except for INTL_LIBTOOL_SUFFIX_PREFIX (and possibly LIBTOOL), INTLOBJS,
-dnl            USE_INCLUDED_LIBINTL, BUILD_INCLUDED_LIBINTL.
-AC_DEFUN([AM_INTL_SUBDIR],
-[
-  AC_REQUIRE([AC_PROG_INSTALL])dnl
-  AC_REQUIRE([AM_MKINSTALLDIRS])dnl
-  AC_REQUIRE([AC_PROG_CC])dnl
-  AC_REQUIRE([AC_CANONICAL_HOST])dnl
-  AC_REQUIRE([AC_PROG_RANLIB])dnl
-  AC_REQUIRE([AC_ISC_POSIX])dnl
-  AC_REQUIRE([AC_HEADER_STDC])dnl
-  AC_REQUIRE([AC_C_CONST])dnl
-  AC_REQUIRE([AC_C_INLINE])dnl
-  AC_REQUIRE([AC_TYPE_OFF_T])dnl
-  AC_REQUIRE([AC_TYPE_SIZE_T])dnl
-  AC_REQUIRE([AC_FUNC_ALLOCA])dnl
-  AC_REQUIRE([AC_FUNC_MMAP])dnl
-  AC_REQUIRE([jm_GLIBC21])dnl
-  AC_REQUIRE([gt_INTDIV0])dnl
-  AC_REQUIRE([jm_AC_TYPE_UINTMAX_T])dnl
-  AC_REQUIRE([gt_HEADER_INTTYPES_H])dnl
-  AC_REQUIRE([gt_INTTYPES_PRI])dnl
-
-  AC_CHECK_HEADERS([argz.h limits.h locale.h nl_types.h malloc.h stddef.h \
-stdlib.h string.h unistd.h sys/param.h])
-  AC_CHECK_FUNCS([feof_unlocked fgets_unlocked getc_unlocked getcwd getegid \
-geteuid getgid getuid mempcpy munmap putenv setenv setlocale stpcpy \
-strcasecmp strdup strtoul tsearch __argz_count __argz_stringify __argz_next])
-
-  AM_ICONV
-  AM_LANGINFO_CODESET
-  if test $ac_cv_header_locale_h = yes; then
-    AM_LC_MESSAGES
-  fi
-
-  dnl intl/plural.c is generated from intl/plural.y. It requires bison,
-  dnl because plural.y uses bison specific features. It requires at least
-  dnl bison-1.26 because earlier versions generate a plural.c that doesn't
-  dnl compile.
-  dnl bison is only needed for the maintainer (who touches plural.y). But in
-  dnl order to avoid separate Makefiles or --enable-maintainer-mode, we put
-  dnl the rule in general Makefile. Now, some people carelessly touch the
-  dnl files or have a broken "make" program, hence the plural.c rule will
-  dnl sometimes fire. To avoid an error, defines BISON to ":" if it is not
-  dnl present or too old.
-  AC_CHECK_PROGS([INTLBISON], [bison])
-  if test -z "$INTLBISON"; then
-    ac_verc_fail=yes
-  else
-    dnl Found it, now check the version.
-    AC_MSG_CHECKING([version of bison])
-changequote(<<,>>)dnl
-    ac_prog_version=`$INTLBISON --version 2>&1 | sed -n 's/^.*GNU Bison.* \([0-9]*\.[0-9.]*\).*$/\1/p'`
-    case $ac_prog_version in
-      '') ac_prog_version="v. ?.??, bad"; ac_verc_fail=yes;;
-      1.2[6-9]* | 1.[3-9][0-9]* | [2-9].*)
-changequote([,])dnl
-         ac_prog_version="$ac_prog_version, ok"; ac_verc_fail=no;;
-      *) ac_prog_version="$ac_prog_version, bad"; ac_verc_fail=yes;;
-    esac
-    AC_MSG_RESULT([$ac_prog_version])
-  fi
-  if test $ac_verc_fail = yes; then
-    INTLBISON=:
-  fi
-])
-
-
-AC_DEFUN([AM_MKINSTALLDIRS],
-[
-  dnl If the AC_CONFIG_AUX_DIR macro for autoconf is used we possibly
-  dnl find the mkinstalldirs script in another subdir but $(top_srcdir).
-  dnl Try to locate is.
-  MKINSTALLDIRS=
-  if test -n "$ac_aux_dir"; then
-    MKINSTALLDIRS="$ac_aux_dir/mkinstalldirs"
-  fi
-  if test -z "$MKINSTALLDIRS"; then
-    MKINSTALLDIRS="\$(top_srcdir)/mkinstalldirs"
-  fi
-  AC_SUBST(MKINSTALLDIRS)
-])
-
-
-dnl Usage: AM_GNU_GETTEXT_VERSION([gettext-version])
-AC_DEFUN([AM_GNU_GETTEXT_VERSION], [])

m4/glib-2.0.m4

@@ -1,215 +0,0 @@
-# Configure paths for GLIB
-# Owen Taylor     1997-2001
-
-dnl AM_PATH_GLIB_2_0([MINIMUM-VERSION, [ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND [, MODULES]]]])
-dnl Test for GLIB, and define GLIB_CFLAGS and GLIB_LIBS, if gmodule, gobject or 
-dnl gthread is specified in MODULES, pass to pkg-config
-dnl
-AC_DEFUN([AM_PATH_GLIB_2_0],
-[dnl 
-dnl Get the cflags and libraries from pkg-config
-dnl
-AC_ARG_ENABLE(glibtest, [  --disable-glibtest      do not try to compile and run a test GLIB program],
-		    , enable_glibtest=yes)
-
-  pkg_config_args=glib-2.0
-  for module in . $4
-  do
-      case "$module" in
-         gmodule) 
-             pkg_config_args="$pkg_config_args gmodule-2.0"
-         ;;
-         gmodule-no-export) 
-             pkg_config_args="$pkg_config_args gmodule-no-export-2.0"
-         ;;
-         gobject) 
-             pkg_config_args="$pkg_config_args gobject-2.0"
-         ;;
-         gthread) 
-             pkg_config_args="$pkg_config_args gthread-2.0"
-         ;;
-      esac
-  done
-
-  AC_PATH_PROG(PKG_CONFIG, pkg-config, no)
-
-  no_glib=""
-
-  if test x$PKG_CONFIG != xno ; then
-    if $PKG_CONFIG --atleast-pkgconfig-version 0.7 ; then
-      :
-    else
-      echo *** pkg-config too old; version 0.7 or better required.
-      no_glib=yes
-      PKG_CONFIG=no
-    fi
-  else
-    no_glib=yes
-  fi
-
-  min_glib_version=ifelse([$1], ,2.0.0,$1)
-  AC_MSG_CHECKING(for GLIB - version >= $min_glib_version)
-
-  if test x$PKG_CONFIG != xno ; then
-    ## don't try to run the test against uninstalled libtool libs
-    if $PKG_CONFIG --uninstalled $pkg_config_args; then
-	  echo "Will use uninstalled version of GLib found in PKG_CONFIG_PATH"
-	  enable_glibtest=no
-    fi
-
-    if $PKG_CONFIG --atleast-version $min_glib_version $pkg_config_args; then
-	  :
-    else
-	  no_glib=yes
-    fi
-  fi
-
-  if test x"$no_glib" = x ; then
-    GLIB_GENMARSHAL=`$PKG_CONFIG --variable=glib_genmarshal glib-2.0`
-    GOBJECT_QUERY=`$PKG_CONFIG --variable=gobject_query glib-2.0`
-    GLIB_MKENUMS=`$PKG_CONFIG --variable=glib_mkenums glib-2.0`
-
-    GLIB_CFLAGS=`$PKG_CONFIG --cflags $pkg_config_args`
-    GLIB_LIBS=`$PKG_CONFIG --libs $pkg_config_args`
-    glib_config_major_version=`$PKG_CONFIG --modversion glib-2.0 | \
-           sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\1/'`
-    glib_config_minor_version=`$PKG_CONFIG --modversion glib-2.0 | \
-           sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\2/'`
-    glib_config_micro_version=`$PKG_CONFIG --modversion glib-2.0 | \
-           sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\3/'`
-    if test "x$enable_glibtest" = "xyes" ; then
-      ac_save_CFLAGS="$CFLAGS"
-      ac_save_LIBS="$LIBS"
-      CFLAGS="$CFLAGS $GLIB_CFLAGS"
-      LIBS="$GLIB_LIBS $LIBS"
-dnl
-dnl Now check if the installed GLIB is sufficiently new. (Also sanity
-dnl checks the results of pkg-config to some extent)
-dnl
-      rm -f conf.glibtest
-      AC_TRY_RUN([
-#include <glib.h>
-#include <stdio.h>
-#include <stdlib.h>
-
-int 
-main ()
-{
-  int major, minor, micro;
-  char *tmp_version;
-
-  system ("touch conf.glibtest");
-
-  /* HP/UX 9 (%@#!) writes to sscanf strings */
-  tmp_version = g_strdup("$min_glib_version");
-  if (sscanf(tmp_version, "%d.%d.%d", &major, &minor, &micro) != 3) {
-     printf("%s, bad version string\n", "$min_glib_version");
-     exit(1);
-   }
-
-  if ((glib_major_version != $glib_config_major_version) ||
-      (glib_minor_version != $glib_config_minor_version) ||
-      (glib_micro_version != $glib_config_micro_version))
-    {
-      printf("\n*** 'pkg-config --modversion glib-2.0' returned %d.%d.%d, but GLIB (%d.%d.%d)\n", 
-             $glib_config_major_version, $glib_config_minor_version, $glib_config_micro_version,
-             glib_major_version, glib_minor_version, glib_micro_version);
-      printf ("*** was found! If pkg-config was correct, then it is best\n");
-      printf ("*** to remove the old version of GLib. You may also be able to fix the error\n");
-      printf("*** by modifying your LD_LIBRARY_PATH enviroment variable, or by editing\n");
-      printf("*** /etc/ld.so.conf. Make sure you have run ldconfig if that is\n");
-      printf("*** required on your system.\n");
-      printf("*** If pkg-config was wrong, set the environment variable PKG_CONFIG_PATH\n");
-      printf("*** to point to the correct configuration files\n");
-    } 
-  else if ((glib_major_version != GLIB_MAJOR_VERSION) ||
-	   (glib_minor_version != GLIB_MINOR_VERSION) ||
-           (glib_micro_version != GLIB_MICRO_VERSION))
-    {
-      printf("*** GLIB header files (version %d.%d.%d) do not match\n",
-	     GLIB_MAJOR_VERSION, GLIB_MINOR_VERSION, GLIB_MICRO_VERSION);
-      printf("*** library (version %d.%d.%d)\n",
-	     glib_major_version, glib_minor_version, glib_micro_version);
-    }
-  else
-    {
-      if ((glib_major_version > major) ||
-        ((glib_major_version == major) && (glib_minor_version > minor)) ||
-        ((glib_major_version == major) && (glib_minor_version == minor) && (glib_micro_version >= micro)))
-      {
-        return 0;
-       }
-     else
-      {
-        printf("\n*** An old version of GLIB (%d.%d.%d) was found.\n",
-               glib_major_version, glib_minor_version, glib_micro_version);
-        printf("*** You need a version of GLIB newer than %d.%d.%d. The latest version of\n",
-	       major, minor, micro);
-        printf("*** GLIB is always available from ftp://ftp.gtk.org.\n");
-        printf("***\n");
-        printf("*** If you have already installed a sufficiently new version, this error\n");
-        printf("*** probably means that the wrong copy of the pkg-config shell script is\n");
-        printf("*** being found. The easiest way to fix this is to remove the old version\n");
-        printf("*** of GLIB, but you can also set the PKG_CONFIG environment to point to the\n");
-        printf("*** correct copy of pkg-config. (In this case, you will have to\n");
-        printf("*** modify your LD_LIBRARY_PATH enviroment variable, or edit /etc/ld.so.conf\n");
-        printf("*** so that the correct libraries are found at run-time))\n");
-      }
-    }
-  return 1;
-}
-],, no_glib=yes,[echo $ac_n "cross compiling; assumed OK... $ac_c"])
-       CFLAGS="$ac_save_CFLAGS"
-       LIBS="$ac_save_LIBS"
-     fi
-  fi
-  if test "x$no_glib" = x ; then
-     AC_MSG_RESULT(yes (version $glib_config_major_version.$glib_config_minor_version.$glib_config_micro_version))
-     ifelse([$2], , :, [$2])     
-  else
-     AC_MSG_RESULT(no)
-     if test "$PKG_CONFIG" = "no" ; then
-       echo "*** A new enough version of pkg-config was not found."
-       echo "*** See http://www.freedesktop.org/software/pkgconfig/"
-     else
-       if test -f conf.glibtest ; then
-        :
-       else
-          echo "*** Could not run GLIB test program, checking why..."
-          ac_save_CFLAGS="$CFLAGS"
-          ac_save_LIBS="$LIBS"
-          CFLAGS="$CFLAGS $GLIB_CFLAGS"
-          LIBS="$LIBS $GLIB_LIBS"
-          AC_TRY_LINK([
-#include <glib.h>
-#include <stdio.h>
-],      [ return ((glib_major_version) || (glib_minor_version) || (glib_micro_version)); ],
-        [ echo "*** The test program compiled, but did not run. This usually means"
-          echo "*** that the run-time linker is not finding GLIB or finding the wrong"
-          echo "*** version of GLIB. If it is not finding GLIB, you'll need to set your"
-          echo "*** LD_LIBRARY_PATH environment variable, or edit /etc/ld.so.conf to point"
-          echo "*** to the installed location  Also, make sure you have run ldconfig if that"
-          echo "*** is required on your system"
-	  echo "***"
-          echo "*** If you have an old version installed, it is best to remove it, although"
-          echo "*** you may also be able to get things to work by modifying LD_LIBRARY_PATH" ],
-        [ echo "*** The test program failed to compile or link. See the file config.log for the"
-          echo "*** exact error that occured. This usually means GLIB is incorrectly installed."])
-          CFLAGS="$ac_save_CFLAGS"
-          LIBS="$ac_save_LIBS"
-       fi
-     fi
-     GLIB_CFLAGS=""
-     GLIB_LIBS=""
-     GLIB_GENMARSHAL=""
-     GOBJECT_QUERY=""
-     GLIB_MKENUMS=""
-     ifelse([$3], , :, [$3])
-  fi
-  AC_SUBST(GLIB_CFLAGS)
-  AC_SUBST(GLIB_LIBS)
-  AC_SUBST(GLIB_GENMARSHAL)
-  AC_SUBST(GOBJECT_QUERY)
-  AC_SUBST(GLIB_MKENUMS)
-  rm -f conf.glibtest
-])

m4/glibc21.m4

@@ -1,32 +0,0 @@
-# glibc21.m4 serial 2 (fileutils-4.1.3, gettext-0.10.40)
-dnl Copyright (C) 2000-2002 Free Software Foundation, Inc.
-dnl This file is free software, distributed under the terms of the GNU
-dnl General Public License.  As a special exception to the GNU General
-dnl Public License, this file may be distributed as part of a program
-dnl that contains a configuration script generated by Autoconf, under
-dnl the same distribution terms as the rest of that program.
-
-# Test for the GNU C Library, version 2.1 or newer.
-# From Bruno Haible.
-
-AC_DEFUN([jm_GLIBC21],
-  [
-    AC_CACHE_CHECK(whether we are using the GNU C Library 2.1 or newer,
-      ac_cv_gnu_library_2_1,
-      [AC_EGREP_CPP([Lucky GNU user],
-	[
-#include <features.h>
-#ifdef __GNU_LIBRARY__
- #if (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 1) || (__GLIBC__ > 2)
-  Lucky GNU user
- #endif
-#endif
-	],
-	ac_cv_gnu_library_2_1=yes,
-	ac_cv_gnu_library_2_1=no)
-      ]
-    )
-    AC_SUBST(GLIBC21)
-    GLIBC21="$ac_cv_gnu_library_2_1"
-  ]
-)

m4/iconv.m4

@@ -1,103 +0,0 @@
-# iconv.m4 serial AM4 (gettext-0.11.3)
-dnl Copyright (C) 2000-2002 Free Software Foundation, Inc.
-dnl This file is free software, distributed under the terms of the GNU
-dnl General Public License.  As a special exception to the GNU General
-dnl Public License, this file may be distributed as part of a program
-dnl that contains a configuration script generated by Autoconf, under
-dnl the same distribution terms as the rest of that program.
-
-dnl From Bruno Haible.
-
-AC_DEFUN([AM_ICONV_LINKFLAGS_BODY],
-[
-  dnl Prerequisites of AC_LIB_LINKFLAGS_BODY.
-  AC_REQUIRE([AC_LIB_PREPARE_PREFIX])
-  AC_REQUIRE([AC_LIB_RPATH])
-
-  dnl Search for libiconv and define LIBICONV, LTLIBICONV and INCICONV
-  dnl accordingly.
-  AC_LIB_LINKFLAGS_BODY([iconv])
-])
-
-AC_DEFUN([AM_ICONV_LINK],
-[
-  dnl Some systems have iconv in libc, some have it in libiconv (OSF/1 and
-  dnl those with the standalone portable GNU libiconv installed).
-
-  dnl Search for libiconv and define LIBICONV, LTLIBICONV and INCICONV
-  dnl accordingly.
-  AC_REQUIRE([AM_ICONV_LINKFLAGS_BODY])
-
-  dnl Add $INCICONV to CPPFLAGS before performing the following checks,
-  dnl because if the user has installed libiconv and not disabled its use
-  dnl via --without-libiconv-prefix, he wants to use it. The first
-  dnl AC_TRY_LINK will then fail, the second AC_TRY_LINK will succeed.
-  am_save_CPPFLAGS="$CPPFLAGS"
-  AC_LIB_APPENDTOVAR([CPPFLAGS], [$INCICONV])
-
-  AC_CACHE_CHECK(for iconv, am_cv_func_iconv, [
-    am_cv_func_iconv="no, consider installing GNU libiconv"
-    am_cv_lib_iconv=no
-    AC_TRY_LINK([#include <stdlib.h>
-#include <iconv.h>],
-      [iconv_t cd = iconv_open("","");
-       iconv(cd,NULL,NULL,NULL,NULL);
-       iconv_close(cd);],
-      am_cv_func_iconv=yes)
-    if test "$am_cv_func_iconv" != yes; then
-      am_save_LIBS="$LIBS"
-      LIBS="$LIBS $LIBICONV"
-      AC_TRY_LINK([#include <stdlib.h>
-#include <iconv.h>],
-        [iconv_t cd = iconv_open("","");
-         iconv(cd,NULL,NULL,NULL,NULL);
-         iconv_close(cd);],
-        am_cv_lib_iconv=yes
-        am_cv_func_iconv=yes)
-      LIBS="$am_save_LIBS"
-    fi
-  ])
-  if test "$am_cv_func_iconv" = yes; then
-    AC_DEFINE(HAVE_ICONV, 1, [Define if you have the iconv() function.])
-  fi
-  if test "$am_cv_lib_iconv" = yes; then
-    AC_MSG_CHECKING([how to link with libiconv])
-    AC_MSG_RESULT([$LIBICONV])
-  else
-    dnl If $LIBICONV didn't lead to a usable library, we don't need $INCICONV
-    dnl either.
-    CPPFLAGS="$am_save_CPPFLAGS"
-    LIBICONV=
-    LTLIBICONV=
-  fi
-  AC_SUBST(LIBICONV)
-  AC_SUBST(LTLIBICONV)
-])
-
-AC_DEFUN([AM_ICONV],
-[
-  AM_ICONV_LINK
-  if test "$am_cv_func_iconv" = yes; then
-    AC_MSG_CHECKING([for iconv declaration])
-    AC_CACHE_VAL(am_cv_proto_iconv, [
-      AC_TRY_COMPILE([
-#include <stdlib.h>
-#include <iconv.h>
-extern
-#ifdef __cplusplus
-"C"
-#endif
-#if defined(__STDC__) || defined(__cplusplus)
-size_t iconv (iconv_t cd, char * *inbuf, size_t *inbytesleft, char * *outbuf, size_t *outbytesleft);
-#else
-size_t iconv();
-#endif
-], [], am_cv_proto_iconv_arg1="", am_cv_proto_iconv_arg1="const")
-      am_cv_proto_iconv="extern size_t iconv (iconv_t cd, $am_cv_proto_iconv_arg1 char * *inbuf, size_t *inbytesleft, char * *outbuf, size_t *outbytesleft);"])
-    am_cv_proto_iconv=`echo "[$]am_cv_proto_iconv" | tr -s ' ' | sed -e 's/( /(/'`
-    AC_MSG_RESULT([$]{ac_t:-
-         }[$]am_cv_proto_iconv)
-    AC_DEFINE_UNQUOTED(ICONV_CONST, $am_cv_proto_iconv_arg1,
-      [Define as const if the declaration of iconv() needs const.])
-  fi
-])

m4/intdiv0.m4

@@ -1,72 +0,0 @@
-# intdiv0.m4 serial 1 (gettext-0.11.3)
-dnl Copyright (C) 2002 Free Software Foundation, Inc.
-dnl This file is free software, distributed under the terms of the GNU
-dnl General Public License.  As a special exception to the GNU General
-dnl Public License, this file may be distributed as part of a program
-dnl that contains a configuration script generated by Autoconf, under
-dnl the same distribution terms as the rest of that program.
-
-dnl From Bruno Haible.
-
-AC_DEFUN([gt_INTDIV0],
-[
-  AC_REQUIRE([AC_PROG_CC])dnl
-  AC_REQUIRE([AC_CANONICAL_HOST])dnl
-
-  AC_CACHE_CHECK([whether integer division by zero raises SIGFPE],
-    gt_cv_int_divbyzero_sigfpe,
-    [
-      AC_TRY_RUN([
-#include <stdlib.h>
-#include <signal.h>
-
-static void
-#ifdef __cplusplus
-sigfpe_handler (int sig)
-#else
-sigfpe_handler (sig) int sig;
-#endif
-{
-  /* Exit with code 0 if SIGFPE, with code 1 if any other signal.  */
-  exit (sig != SIGFPE);
-}
-
-int x = 1;
-int y = 0;
-int z;
-int nan;
-
-int main ()
-{
-  signal (SIGFPE, sigfpe_handler);
-/* IRIX and AIX (when "xlc -qcheck" is used) yield signal SIGTRAP.  */
-#if (defined (__sgi) || defined (_AIX)) && defined (SIGTRAP)
-  signal (SIGTRAP, sigfpe_handler);
-#endif
-/* Linux/SPARC yields signal SIGILL.  */
-#if defined (__sparc__) && defined (__linux__)
-  signal (SIGILL, sigfpe_handler);
-#endif
-
-  z = x / y;
-  nan = y / y;
-  exit (1);
-}
-], gt_cv_int_divbyzero_sigfpe=yes, gt_cv_int_divbyzero_sigfpe=no,
-        [
-          # Guess based on the CPU.
-          case "$host_cpu" in
-            alpha* | i[34567]86 | m68k | s390*)
-              gt_cv_int_divbyzero_sigfpe="guessing yes";;
-            *)
-              gt_cv_int_divbyzero_sigfpe="guessing no";;
-          esac
-        ])
-    ])
-  case "$gt_cv_int_divbyzero_sigfpe" in
-    *yes) value=1;;
-    *) value=0;;
-  esac
-  AC_DEFINE_UNQUOTED(INTDIV0_RAISES_SIGFPE, $value,
-    [Define if integer division by zero raises signal SIGFPE.])
-])

m4/inttypes-pri.m4

@@ -1,32 +0,0 @@
-# inttypes-pri.m4 serial 1 (gettext-0.11.4)
-dnl Copyright (C) 1997-2002 Free Software Foundation, Inc.
-dnl This file is free software, distributed under the terms of the GNU
-dnl General Public License.  As a special exception to the GNU General
-dnl Public License, this file may be distributed as part of a program
-dnl that contains a configuration script generated by Autoconf, under
-dnl the same distribution terms as the rest of that program.
-
-dnl From Bruno Haible.
-
-# Define PRI_MACROS_BROKEN if <inttypes.h> exists and defines the PRI*
-# macros to non-string values.  This is the case on AIX 4.3.3.
-
-AC_DEFUN([gt_INTTYPES_PRI],
-[
-  AC_REQUIRE([gt_HEADER_INTTYPES_H])
-  if test $gt_cv_header_inttypes_h = yes; then
-    AC_CACHE_CHECK([whether the inttypes.h PRIxNN macros are broken],
-      gt_cv_inttypes_pri_broken,
-      [
-        AC_TRY_COMPILE([#include <inttypes.h>
-#ifdef PRId32
-char *p = PRId32;
-#endif
-], [], gt_cv_inttypes_pri_broken=no, gt_cv_inttypes_pri_broken=yes)
-      ])
-  fi
-  if test "$gt_cv_inttypes_pri_broken" = yes; then
-    AC_DEFINE_UNQUOTED(PRI_MACROS_BROKEN, 1,
-      [Define if <inttypes.h> exists and defines unusable PRI* macros.])
-  fi
-])

m4/inttypes.m4

@@ -1,27 +0,0 @@
-# inttypes.m4 serial 1 (gettext-0.11.4)
-dnl Copyright (C) 1997-2002 Free Software Foundation, Inc.
-dnl This file is free software, distributed under the terms of the GNU
-dnl General Public License.  As a special exception to the GNU General
-dnl Public License, this file may be distributed as part of a program
-dnl that contains a configuration script generated by Autoconf, under
-dnl the same distribution terms as the rest of that program.
-
-dnl From Paul Eggert.
-
-# Define HAVE_INTTYPES_H if <inttypes.h> exists and doesn't clash with
-# <sys/types.h>.
-
-AC_DEFUN([gt_HEADER_INTTYPES_H],
-[
-  AC_CACHE_CHECK([for inttypes.h], gt_cv_header_inttypes_h,
-  [
-    AC_TRY_COMPILE(
-      [#include <sys/types.h>
-#include <inttypes.h>],
-      [], gt_cv_header_inttypes_h=yes, gt_cv_header_inttypes_h=no)
-  ])
-  if test $gt_cv_header_inttypes_h = yes; then
-    AC_DEFINE_UNQUOTED(HAVE_INTTYPES_H, 1,
-      [Define if <inttypes.h> exists and doesn't clash with <sys/types.h>.])
-  fi
-])

m4/inttypes_h.m4

@@ -1,28 +0,0 @@
-# inttypes_h.m4 serial 4 (gettext-0.11.4)
-dnl Copyright (C) 1997-2002 Free Software Foundation, Inc.
-dnl This file is free software, distributed under the terms of the GNU
-dnl General Public License.  As a special exception to the GNU General
-dnl Public License, this file may be distributed as part of a program
-dnl that contains a configuration script generated by Autoconf, under
-dnl the same distribution terms as the rest of that program.
-
-dnl From Paul Eggert.
-
-# Define HAVE_INTTYPES_H_WITH_UINTMAX if <inttypes.h> exists,
-# doesn't clash with <sys/types.h>, and declares uintmax_t.
-
-AC_DEFUN([jm_AC_HEADER_INTTYPES_H],
-[
-  AC_CACHE_CHECK([for inttypes.h], jm_ac_cv_header_inttypes_h,
-  [AC_TRY_COMPILE(
-    [#include <sys/types.h>
-#include <inttypes.h>],
-    [uintmax_t i = (uintmax_t) -1;],
-    jm_ac_cv_header_inttypes_h=yes,
-    jm_ac_cv_header_inttypes_h=no)])
-  if test $jm_ac_cv_header_inttypes_h = yes; then
-    AC_DEFINE_UNQUOTED(HAVE_INTTYPES_H_WITH_UINTMAX, 1,
-[Define if <inttypes.h> exists, doesn't clash with <sys/types.h>,
-   and declares uintmax_t. ])
-  fi
-])

m4/isc-posix.m4

@@ -1,26 +0,0 @@
-# isc-posix.m4 serial 2 (gettext-0.11.2)
-dnl Copyright (C) 1995-2002 Free Software Foundation, Inc.
-dnl This file is free software, distributed under the terms of the GNU
-dnl General Public License.  As a special exception to the GNU General
-dnl Public License, this file may be distributed as part of a program
-dnl that contains a configuration script generated by Autoconf, under
-dnl the same distribution terms as the rest of that program.
-
-# This file is not needed with autoconf-2.53 and newer.  Remove it in 2005.
-
-# This test replaces the one in autoconf.
-# Currently this macro should have the same name as the autoconf macro
-# because gettext's gettext.m4 (distributed in the automake package)
-# still uses it.  Otherwise, the use in gettext.m4 makes autoheader
-# give these diagnostics:
-#   configure.in:556: AC_TRY_COMPILE was called before AC_ISC_POSIX
-#   configure.in:556: AC_TRY_RUN was called before AC_ISC_POSIX
-
-undefine([AC_ISC_POSIX])
-
-AC_DEFUN([AC_ISC_POSIX],
-  [
-    dnl This test replaces the obsolescent AC_ISC_POSIX kludge.
-    AC_CHECK_LIB(cposix, strerror, [LIBS="$LIBS -lcposix"])
-  ]
-)

m4/lcmessage.m4

@@ -1,32 +0,0 @@
-# lcmessage.m4 serial 3 (gettext-0.11.3)
-dnl Copyright (C) 1995-2002 Free Software Foundation, Inc.
-dnl This file is free software, distributed under the terms of the GNU
-dnl General Public License.  As a special exception to the GNU General
-dnl Public License, this file may be distributed as part of a program
-dnl that contains a configuration script generated by Autoconf, under
-dnl the same distribution terms as the rest of that program.
-dnl
-dnl This file can can be used in projects which are not available under
-dnl the GNU General Public License or the GNU Library General Public
-dnl License but which still want to provide support for the GNU gettext
-dnl functionality.
-dnl Please note that the actual code of the GNU gettext library is covered
-dnl by the GNU Library General Public License, and the rest of the GNU
-dnl gettext package package is covered by the GNU General Public License.
-dnl They are *not* in the public domain.
-
-dnl Authors:
-dnl   Ulrich Drepper <drepper@cygnus.com>, 1995.
-
-# Check whether LC_MESSAGES is available in <locale.h>.
-
-AC_DEFUN([AM_LC_MESSAGES],
-[
-  AC_CACHE_CHECK([for LC_MESSAGES], am_cv_val_LC_MESSAGES,
-    [AC_TRY_LINK([#include <locale.h>], [return LC_MESSAGES],
-       am_cv_val_LC_MESSAGES=yes, am_cv_val_LC_MESSAGES=no)])
-  if test $am_cv_val_LC_MESSAGES = yes; then
-    AC_DEFINE(HAVE_LC_MESSAGES, 1,
-      [Define if your <locale.h> file defines LC_MESSAGES.])
-  fi
-])

m4/lib-ld.m4

@@ -1,97 +0,0 @@
-# lib-ld.m4 serial 1 (gettext-0.11)
-dnl Copyright (C) 1996-2002 Free Software Foundation, Inc.
-dnl This file is free software, distributed under the terms of the GNU
-dnl General Public License.  As a special exception to the GNU General
-dnl Public License, this file may be distributed as part of a program
-dnl that contains a configuration script generated by Autoconf, under
-dnl the same distribution terms as the rest of that program.
-
-dnl Subroutines of libtool.m4,
-dnl with replacements s/AC_/AC_LIB/ and s/lt_cv/acl_cv/ to avoid collision
-dnl with libtool.m4.
-
-dnl From libtool-1.4. Sets the variable with_gnu_ld to yes or no.
-AC_DEFUN([AC_LIB_PROG_LD_GNU],
-[AC_CACHE_CHECK([if the linker ($LD) is GNU ld], acl_cv_prog_gnu_ld,
-[# I'd rather use --version here, but apparently some GNU ld's only accept -v.
-if $LD -v 2>&1 </dev/null | egrep '(GNU|with BFD)' 1>&5; then
-  acl_cv_prog_gnu_ld=yes
-else
-  acl_cv_prog_gnu_ld=no
-fi])
-with_gnu_ld=$acl_cv_prog_gnu_ld
-])
-
-dnl From libtool-1.4. Sets the variable LD.
-AC_DEFUN([AC_LIB_PROG_LD],
-[AC_ARG_WITH(gnu-ld,
-[  --with-gnu-ld           assume the C compiler uses GNU ld [default=no]],
-test "$withval" = no || with_gnu_ld=yes, with_gnu_ld=no)
-AC_REQUIRE([AC_PROG_CC])dnl
-AC_REQUIRE([AC_CANONICAL_HOST])dnl
-ac_prog=ld
-if test "$GCC" = yes; then
-  # Check if gcc -print-prog-name=ld gives a path.
-  AC_MSG_CHECKING([for ld used by GCC])
-  case $host in
-  *-*-mingw*)
-    # gcc leaves a trailing carriage return which upsets mingw
-    ac_prog=`($CC -print-prog-name=ld) 2>&5 | tr -d '\015'` ;;
-  *)
-    ac_prog=`($CC -print-prog-name=ld) 2>&5` ;;
-  esac
-  case $ac_prog in
-    # Accept absolute paths.
-    [[\\/]* | [A-Za-z]:[\\/]*)]
-      [re_direlt='/[^/][^/]*/\.\./']
-      # Canonicalize the path of ld
-      ac_prog=`echo $ac_prog| sed 's%\\\\%/%g'`
-      while echo $ac_prog | grep "$re_direlt" > /dev/null 2>&1; do
-	ac_prog=`echo $ac_prog| sed "s%$re_direlt%/%"`
-      done
-      test -z "$LD" && LD="$ac_prog"
-      ;;
-  "")
-    # If it fails, then pretend we aren't using GCC.
-    ac_prog=ld
-    ;;
-  *)
-    # If it is relative, then search for the first ld in PATH.
-    with_gnu_ld=unknown
-    ;;
-  esac
-elif test "$with_gnu_ld" = yes; then
-  AC_MSG_CHECKING([for GNU ld])
-else
-  AC_MSG_CHECKING([for non-GNU ld])
-fi
-AC_CACHE_VAL(acl_cv_path_LD,
-[if test -z "$LD"; then
-  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS="${IFS}${PATH_SEPARATOR-:}"
-  for ac_dir in $PATH; do
-    test -z "$ac_dir" && ac_dir=.
-    if test -f "$ac_dir/$ac_prog" || test -f "$ac_dir/$ac_prog$ac_exeext"; then
-      acl_cv_path_LD="$ac_dir/$ac_prog"
-      # Check to see if the program is GNU ld.  I'd rather use --version,
-      # but apparently some GNU ld's only accept -v.
-      # Break only if it was the GNU/non-GNU ld that we prefer.
-      if "$acl_cv_path_LD" -v 2>&1 < /dev/null | egrep '(GNU|with BFD)' > /dev/null; then
-	test "$with_gnu_ld" != no && break
-      else
-	test "$with_gnu_ld" != yes && break
-      fi
-    fi
-  done
-  IFS="$ac_save_ifs"
-else
-  acl_cv_path_LD="$LD" # Let the user override the test with a path.
-fi])
-LD="$acl_cv_path_LD"
-if test -n "$LD"; then
-  AC_MSG_RESULT($LD)
-else
-  AC_MSG_RESULT(no)
-fi
-test -z "$LD" && AC_MSG_ERROR([no acceptable ld found in \$PATH])
-AC_LIB_PROG_LD_GNU
-])

m4/lib-link.m4

@@ -1,554 +0,0 @@
-# lib-link.m4 serial 3 (gettext-0.11.3)
-dnl Copyright (C) 2001-2002 Free Software Foundation, Inc.
-dnl This file is free software, distributed under the terms of the GNU
-dnl General Public License.  As a special exception to the GNU General
-dnl Public License, this file may be distributed as part of a program
-dnl that contains a configuration script generated by Autoconf, under
-dnl the same distribution terms as the rest of that program.
-
-dnl From Bruno Haible.
-
-dnl AC_LIB_LINKFLAGS(name [, dependencies]) searches for libname and
-dnl the libraries corresponding to explicit and implicit dependencies.
-dnl Sets and AC_SUBSTs the LIB${NAME} and LTLIB${NAME} variables and
-dnl augments the CPPFLAGS variable.
-AC_DEFUN([AC_LIB_LINKFLAGS],
-[
-  AC_REQUIRE([AC_LIB_PREPARE_PREFIX])
-  AC_REQUIRE([AC_LIB_RPATH])
-  define([Name],[translit([$1],[./-], [___])])
-  define([NAME],[translit([$1],[abcdefghijklmnopqrstuvwxyz./-],
-                               [ABCDEFGHIJKLMNOPQRSTUVWXYZ___])])
-  AC_CACHE_CHECK([how to link with lib[]$1], [ac_cv_lib[]Name[]_libs], [
-    AC_LIB_LINKFLAGS_BODY([$1], [$2])
-    ac_cv_lib[]Name[]_libs="$LIB[]NAME"
-    ac_cv_lib[]Name[]_ltlibs="$LTLIB[]NAME"
-    ac_cv_lib[]Name[]_cppflags="$INC[]NAME"
-  ])
-  LIB[]NAME="$ac_cv_lib[]Name[]_libs"
-  LTLIB[]NAME="$ac_cv_lib[]Name[]_ltlibs"
-  INC[]NAME="$ac_cv_lib[]Name[]_cppflags"
-  AC_LIB_APPENDTOVAR([CPPFLAGS], [$INC]NAME)
-  AC_SUBST([LIB]NAME)
-  AC_SUBST([LTLIB]NAME)
-  dnl Also set HAVE_LIB[]NAME so that AC_LIB_HAVE_LINKFLAGS can reuse the
-  dnl results of this search when this library appears as a dependency.
-  HAVE_LIB[]NAME=yes
-  undefine([Name])
-  undefine([NAME])
-])
-
-dnl AC_LIB_HAVE_LINKFLAGS(name, dependencies, includes, testcode)
-dnl searches for libname and the libraries corresponding to explicit and
-dnl implicit dependencies, together with the specified include files and
-dnl the ability to compile and link the specified testcode. If found, it
-dnl sets and AC_SUBSTs HAVE_LIB${NAME}=yes and the LIB${NAME} and
-dnl LTLIB${NAME} variables and augments the CPPFLAGS variable, and
-dnl #defines HAVE_LIB${NAME} to 1. Otherwise, it sets and AC_SUBSTs
-dnl HAVE_LIB${NAME}=no and LIB${NAME} and LTLIB${NAME} to empty.
-AC_DEFUN([AC_LIB_HAVE_LINKFLAGS],
-[
-  AC_REQUIRE([AC_LIB_PREPARE_PREFIX])
-  AC_REQUIRE([AC_LIB_RPATH])
-  define([Name],[translit([$1],[./-], [___])])
-  define([NAME],[translit([$1],[abcdefghijklmnopqrstuvwxyz./-],
-                               [ABCDEFGHIJKLMNOPQRSTUVWXYZ___])])
-
-  dnl Search for lib[]Name and define LIB[]NAME, LTLIB[]NAME and INC[]NAME
-  dnl accordingly.
-  AC_LIB_LINKFLAGS_BODY([$1], [$2])
-
-  dnl Add $INC[]NAME to CPPFLAGS before performing the following checks,
-  dnl because if the user has installed lib[]Name and not disabled its use
-  dnl via --without-lib[]Name-prefix, he wants to use it.
-  ac_save_CPPFLAGS="$CPPFLAGS"
-  AC_LIB_APPENDTOVAR([CPPFLAGS], [$INC]NAME)
-
-  AC_CACHE_CHECK([for lib[]$1], [ac_cv_lib[]Name], [
-    ac_save_LIBS="$LIBS"
-    LIBS="$LIBS $LIB[]NAME"
-    AC_TRY_LINK([$3], [$4], [ac_cv_lib[]Name=yes], [ac_cv_lib[]Name=no])
-    LIBS="$ac_save_LIBS"
-  ])
-  if test "$ac_cv_lib[]Name" = yes; then
-    HAVE_LIB[]NAME=yes
-    AC_DEFINE([HAVE_LIB]NAME, 1, [Define if you have the $1 library.])
-    AC_MSG_CHECKING([how to link with lib[]$1])
-    AC_MSG_RESULT([$LIB[]NAME])
-  else
-    HAVE_LIB[]NAME=no
-    dnl If $LIB[]NAME didn't lead to a usable library, we don't need
-    dnl $INC[]NAME either.
-    CPPFLAGS="$ac_save_CPPFLAGS"
-    LIB[]NAME=
-    LTLIB[]NAME=
-  fi
-  AC_SUBST([HAVE_LIB]NAME)
-  AC_SUBST([LIB]NAME)
-  AC_SUBST([LTLIB]NAME)
-  undefine([Name])
-  undefine([NAME])
-])
-
-dnl Determine the platform dependent parameters needed to use rpath:
-dnl libext, shlibext, hardcode_libdir_flag_spec, hardcode_libdir_separator,
-dnl hardcode_direct, hardcode_minus_L,
-dnl sys_lib_search_path_spec, sys_lib_dlsearch_path_spec.
-AC_DEFUN([AC_LIB_RPATH],
-[
-  AC_REQUIRE([AC_PROG_CC])                dnl we use $CC, $GCC, $LDFLAGS
-  AC_REQUIRE([AC_LIB_PROG_LD])            dnl we use $LD, $with_gnu_ld
-  AC_REQUIRE([AC_CANONICAL_HOST])         dnl we use $host
-  AC_REQUIRE([AC_CONFIG_AUX_DIR_DEFAULT]) dnl we use $ac_aux_dir
-  AC_CACHE_CHECK([for shared library run path origin], acl_cv_rpath, [
-    CC="$CC" GCC="$GCC" LDFLAGS="$LDFLAGS" LD="$LD" with_gnu_ld="$with_gnu_ld" \
-    ${CONFIG_SHELL-/bin/sh} "$ac_aux_dir/config.rpath" "$host" > conftest.sh
-    . ./conftest.sh
-    rm -f ./conftest.sh
-    acl_cv_rpath=done
-  ])
-  wl="$acl_cv_wl"
-  libext="$acl_cv_libext"
-  shlibext="$acl_cv_shlibext"
-  hardcode_libdir_flag_spec="$acl_cv_hardcode_libdir_flag_spec"
-  hardcode_libdir_separator="$acl_cv_hardcode_libdir_separator"
-  hardcode_direct="$acl_cv_hardcode_direct"
-  hardcode_minus_L="$acl_cv_hardcode_minus_L"
-  sys_lib_search_path_spec="$acl_cv_sys_lib_search_path_spec"
-  sys_lib_dlsearch_path_spec="$acl_cv_sys_lib_dlsearch_path_spec"
-  dnl Determine whether the user wants rpath handling at all.
-  AC_ARG_ENABLE(rpath,
-    [  --disable-rpath         do not hardcode runtime library paths],
-    :, enable_rpath=yes)
-])
-
-dnl AC_LIB_LINKFLAGS_BODY(name [, dependencies]) searches for libname and
-dnl the libraries corresponding to explicit and implicit dependencies.
-dnl Sets the LIB${NAME}, LTLIB${NAME} and INC${NAME} variables.
-AC_DEFUN([AC_LIB_LINKFLAGS_BODY],
-[
-  define([NAME],[translit([$1],[abcdefghijklmnopqrstuvwxyz./-],
-                               [ABCDEFGHIJKLMNOPQRSTUVWXYZ___])])
-  dnl By default, look in $includedir and $libdir.
-  use_additional=yes
-  AC_LIB_WITH_FINAL_PREFIX([
-    eval additional_includedir=\"$includedir\"
-    eval additional_libdir=\"$libdir\"
-  ])
-  AC_ARG_WITH([lib$1-prefix],
-[  --with-lib$1-prefix[=DIR]  search for lib$1 in DIR/include and DIR/lib
-  --without-lib$1-prefix     don't search for lib$1 in includedir and libdir],
-[
-    if test "X$withval" = "Xno"; then
-      use_additional=no
-    else
-      if test "X$withval" = "X"; then
-        AC_LIB_WITH_FINAL_PREFIX([
-          eval additional_includedir=\"$includedir\"
-          eval additional_libdir=\"$libdir\"
-        ])
-      else
-        additional_includedir="$withval/include"
-        additional_libdir="$withval/lib"
-      fi
-    fi
-])
-  dnl Search the library and its dependencies in $additional_libdir and
-  dnl $LDFLAGS. Using breadth-first-seach.
-  LIB[]NAME=
-  LTLIB[]NAME=
-  INC[]NAME=
-  rpathdirs=
-  ltrpathdirs=
-  names_already_handled=
-  names_next_round='$1 $2'
-  while test -n "$names_next_round"; do
-    names_this_round="$names_next_round"
-    names_next_round=
-    for name in $names_this_round; do
-      already_handled=
-      for n in $names_already_handled; do
-        if test "$n" = "$name"; then
-          already_handled=yes
-          break
-        fi
-      done
-      if test -z "$already_handled"; then
-        names_already_handled="$names_already_handled $name"
-        dnl See if it was already located by an earlier AC_LIB_LINKFLAGS
-        dnl or AC_LIB_HAVE_LINKFLAGS call.
-        uppername=`echo "$name" | sed -e 'y|abcdefghijklmnopqrstuvwxyz./-|ABCDEFGHIJKLMNOPQRSTUVWXYZ___|'`
-        eval value=\"\$HAVE_LIB$uppername\"
-        if test -n "$value"; then
-          if test "$value" = yes; then
-            eval value=\"\$LIB$uppername\"
-            test -z "$value" || LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }$value"
-            eval value=\"\$LTLIB$uppername\"
-            test -z "$value" || LTLIB[]NAME="${LTLIB[]NAME}${LTLIB[]NAME:+ }$value"
-          else
-            dnl An earlier call to AC_LIB_HAVE_LINKFLAGS has determined
-            dnl that this library doesn't exist. So just drop it.
-            :
-          fi
-        else
-          dnl Search the library lib$name in $additional_libdir and $LDFLAGS
-          dnl and the already constructed $LIBNAME/$LTLIBNAME.
-          found_dir=
-          found_la=
-          found_so=
-          found_a=
-          if test $use_additional = yes; then
-            if test -n "$shlibext" && test -f "$additional_libdir/lib$name.$shlibext"; then
-              found_dir="$additional_libdir"
-              found_so="$additional_libdir/lib$name.$shlibext"
-              if test -f "$additional_libdir/lib$name.la"; then
-                found_la="$additional_libdir/lib$name.la"
-              fi
-            else
-              if test -f "$additional_libdir/lib$name.$libext"; then
-                found_dir="$additional_libdir"
-                found_a="$additional_libdir/lib$name.$libext"
-                if test -f "$additional_libdir/lib$name.la"; then
-                  found_la="$additional_libdir/lib$name.la"
-                fi
-              fi
-            fi
-          fi
-          if test "X$found_dir" = "X"; then
-            for x in $LDFLAGS $LTLIB[]NAME; do
-              AC_LIB_WITH_FINAL_PREFIX([eval x=\"$x\"])
-              case "$x" in
-                -L*)
-                  dir=`echo "X$x" | sed -e 's/^X-L//'`
-                  if test -n "$shlibext" && test -f "$dir/lib$name.$shlibext"; then
-                    found_dir="$dir"
-                    found_so="$dir/lib$name.$shlibext"
-                    if test -f "$dir/lib$name.la"; then
-                      found_la="$dir/lib$name.la"
-                    fi
-                  else
-                    if test -f "$dir/lib$name.$libext"; then
-                      found_dir="$dir"
-                      found_a="$dir/lib$name.$libext"
-                      if test -f "$dir/lib$name.la"; then
-                        found_la="$dir/lib$name.la"
-                      fi
-                    fi
-                  fi
-                  ;;
-              esac
-              if test "X$found_dir" != "X"; then
-                break
-              fi
-            done
-          fi
-          if test "X$found_dir" != "X"; then
-            dnl Found the library.
-            LTLIB[]NAME="${LTLIB[]NAME}${LTLIB[]NAME:+ }-L$found_dir -l$name"
-            if test "X$found_so" != "X"; then
-              dnl Linking with a shared library. We attempt to hardcode its
-              dnl directory into the executable's runpath, unless it's the
-              dnl standard /usr/lib.
-              if test "$enable_rpath" = no || test "X$found_dir" = "X/usr/lib"; then
-                dnl No hardcoding is needed.
-                LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }$found_so"
-              else
-                dnl Use an explicit option to hardcode DIR into the resulting
-                dnl binary.
-                dnl Potentially add DIR to ltrpathdirs.
-                dnl The ltrpathdirs will be appended to $LTLIBNAME at the end.
-                haveit=
-                for x in $ltrpathdirs; do
-                  if test "X$x" = "X$found_dir"; then
-                    haveit=yes
-                    break
-                  fi
-                done
-                if test -z "$haveit"; then
-                  ltrpathdirs="$ltrpathdirs $found_dir"
-                fi
-                dnl The hardcoding into $LIBNAME is system dependent.
-                if test "$hardcode_direct" = yes; then
-                  dnl Using DIR/libNAME.so during linking hardcodes DIR into the
-                  dnl resulting binary.
-                  LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }$found_so"
-                else
-                  if test -n "$hardcode_libdir_flag_spec" && test "$hardcode_minus_L" = no; then
-                    dnl Use an explicit option to hardcode DIR into the resulting
-                    dnl binary.
-                    LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }$found_so"
-                    dnl Potentially add DIR to rpathdirs.
-                    dnl The rpathdirs will be appended to $LIBNAME at the end.
-                    haveit=
-                    for x in $rpathdirs; do
-                      if test "X$x" = "X$found_dir"; then
-                        haveit=yes
-                        break
-                      fi
-                    done
-                    if test -z "$haveit"; then
-                      rpathdirs="$rpathdirs $found_dir"
-                    fi
-                  else
-                    dnl Rely on "-L$found_dir".
-                    dnl But don't add it if it's already contained in the LDFLAGS
-                    dnl or the already constructed $LIBNAME
-                    haveit=
-                    for x in $LDFLAGS $LIB[]NAME; do
-                      AC_LIB_WITH_FINAL_PREFIX([eval x=\"$x\"])
-                      if test "X$x" = "X-L$found_dir"; then
-                        haveit=yes
-                        break
-                      fi
-                    done
-                    if test -z "$haveit"; then
-                      LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }-L$found_dir"
-                    fi
-                    if test "$hardcode_minus_L" != no; then
-                      dnl FIXME: Not sure whether we should use
-                      dnl "-L$found_dir -l$name" or "-L$found_dir $found_so"
-                      dnl here.
-                      LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }$found_so"
-                    else
-                      dnl We cannot use $hardcode_runpath_var and LD_RUN_PATH
-                      dnl here, because this doesn't fit in flags passed to the
-                      dnl compiler. So give up. No hardcoding. This affects only
-                      dnl very old systems.
-                      dnl FIXME: Not sure whether we should use
-                      dnl "-L$found_dir -l$name" or "-L$found_dir $found_so"
-                      dnl here.
-                      LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }-l$name"
-                    fi
-                  fi
-                fi
-              fi
-            else
-              if test "X$found_a" != "X"; then
-                dnl Linking with a static library.
-                LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }$found_a"
-              else
-                dnl We shouldn't come here, but anyway it's good to have a
-                dnl fallback.
-                LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }-L$found_dir -l$name"
-              fi
-            fi
-            dnl Assume the include files are nearby.
-            additional_includedir=
-            case "$found_dir" in
-              */lib | */lib/)
-                basedir=`echo "X$found_dir" | sed -e 's,^X,,' -e 's,/lib/*$,,'`
-                additional_includedir="$basedir/include"
-                ;;
-            esac
-            if test "X$additional_includedir" != "X"; then
-              dnl Potentially add $additional_includedir to $INCNAME.
-              dnl But don't add it
-              dnl   1. if it's the standard /usr/include,
-              dnl   2. if it's /usr/local/include and we are using GCC on Linux,
-              dnl   3. if it's already present in $CPPFLAGS or the already
-              dnl      constructed $INCNAME,
-              dnl   4. if it doesn't exist as a directory.
-              if test "X$additional_includedir" != "X/usr/include"; then
-                haveit=
-                if test "X$additional_includedir" = "X/usr/local/include"; then
-                  if test -n "$GCC"; then
-                    case $host_os in
-                      linux*) haveit=yes;;
-                    esac
-                  fi
-                fi
-                if test -z "$haveit"; then
-                  for x in $CPPFLAGS $INC[]NAME; do
-                    AC_LIB_WITH_FINAL_PREFIX([eval x=\"$x\"])
-                    if test "X$x" = "X-I$additional_includedir"; then
-                      haveit=yes
-                      break
-                    fi
-                  done
-                  if test -z "$haveit"; then
-                    if test -d "$additional_includedir"; then
-                      dnl Really add $additional_includedir to $INCNAME.
-                      INC[]NAME="${INC[]NAME}${INC[]NAME:+ }-I$additional_includedir"
-                    fi
-                  fi
-                fi
-              fi
-            fi
-            dnl Look for dependencies.
-            if test -n "$found_la"; then
-              dnl Read the .la file. It defines the variables
-              dnl dlname, library_names, old_library, dependency_libs, current,
-              dnl age, revision, installed, dlopen, dlpreopen, libdir.
-              save_libdir="$libdir"
-              case "$found_la" in
-                */* | *\\*) . "$found_la" ;;
-                *) . "./$found_la" ;;
-              esac
-              libdir="$save_libdir"
-              dnl We use only dependency_libs.
-              for dep in $dependency_libs; do
-                case "$dep" in
-                  -L*)
-                    additional_libdir=`echo "X$dep" | sed -e 's/^X-L//'`
-                    dnl Potentially add $additional_libdir to $LIBNAME and $LTLIBNAME.
-                    dnl But don't add it
-                    dnl   1. if it's the standard /usr/lib,
-                    dnl   2. if it's /usr/local/lib and we are using GCC on Linux,
-                    dnl   3. if it's already present in $LDFLAGS or the already
-                    dnl      constructed $LIBNAME,
-                    dnl   4. if it doesn't exist as a directory.
-                    if test "X$additional_libdir" != "X/usr/lib"; then
-                      haveit=
-                      if test "X$additional_libdir" = "X/usr/local/lib"; then
-                        if test -n "$GCC"; then
-                          case $host_os in
-                            linux*) haveit=yes;;
-                          esac
-                        fi
-                      fi
-                      if test -z "$haveit"; then
-                        haveit=
-                        for x in $LDFLAGS $LIB[]NAME; do
-                          AC_LIB_WITH_FINAL_PREFIX([eval x=\"$x\"])
-                          if test "X$x" = "X-L$additional_libdir"; then
-                            haveit=yes
-                            break
-                          fi
-                        done
-                        if test -z "$haveit"; then
-                          if test -d "$additional_libdir"; then
-                            dnl Really add $additional_libdir to $LIBNAME.
-                            LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }-L$additional_libdir"
-                          fi
-                        fi
-                        haveit=
-                        for x in $LDFLAGS $LTLIB[]NAME; do
-                          AC_LIB_WITH_FINAL_PREFIX([eval x=\"$x\"])
-                          if test "X$x" = "X-L$additional_libdir"; then
-                            haveit=yes
-                            break
-                          fi
-                        done
-                        if test -z "$haveit"; then
-                          if test -d "$additional_libdir"; then
-                            dnl Really add $additional_libdir to $LTLIBNAME.
-                            LTLIB[]NAME="${LTLIB[]NAME}${LTLIB[]NAME:+ }-L$additional_libdir"
-                          fi
-                        fi
-                      fi
-                    fi
-                    ;;
-                  -R*)
-                    dir=`echo "X$dep" | sed -e 's/^X-R//'`
-                    if test "$enable_rpath" != no; then
-                      dnl Potentially add DIR to rpathdirs.
-                      dnl The rpathdirs will be appended to $LIBNAME at the end.
-                      haveit=
-                      for x in $rpathdirs; do
-                        if test "X$x" = "X$dir"; then
-                          haveit=yes
-                          break
-                        fi
-                      done
-                      if test -z "$haveit"; then
-                        rpathdirs="$rpathdirs $dir"
-                      fi
-                      dnl Potentially add DIR to ltrpathdirs.
-                      dnl The ltrpathdirs will be appended to $LTLIBNAME at the end.
-                      haveit=
-                      for x in $ltrpathdirs; do
-                        if test "X$x" = "X$dir"; then
-                          haveit=yes
-                          break
-                        fi
-                      done
-                      if test -z "$haveit"; then
-                        ltrpathdirs="$ltrpathdirs $dir"
-                      fi
-                    fi
-                    ;;
-                  -l*)
-                    dnl Handle this in the next round.
-                    names_next_round="$names_next_round "`echo "X$dep" | sed -e 's/^X-l//'`
-                    ;;
-                  *.la)
-                    dnl Handle this in the next round. Throw away the .la's
-                    dnl directory; it is already contained in a preceding -L
-                    dnl option.
-                    names_next_round="$names_next_round "`echo "X$dep" | sed -e 's,^X.*/,,' -e 's,^lib,,' -e 's,\.la$,,'`
-                    ;;
-                  *)
-                    dnl Most likely an immediate library name.
-                    LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }$dep"
-                    LTLIB[]NAME="${LTLIB[]NAME}${LTLIB[]NAME:+ }$dep"
-                    ;;
-                esac
-              done
-            fi
-          else
-            dnl Didn't find the library; assume it is in the system directories
-            dnl known to the linker and runtime loader. (All the system
-            dnl directories known to the linker should also be known to the
-            dnl runtime loader, otherwise the system is severely misconfigured.)
-            LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }-l$name"
-            LTLIB[]NAME="${LTLIB[]NAME}${LTLIB[]NAME:+ }-l$name"
-          fi
-        fi
-      fi
-    done
-  done
-  if test "X$rpathdirs" != "X"; then
-    if test -n "$hardcode_libdir_separator"; then
-      dnl Weird platform: only the last -rpath option counts, the user must
-      dnl pass all path elements in one option. We can arrange that for a
-      dnl single library, but not when more than one $LIBNAMEs are used.
-      alldirs=
-      for found_dir in $rpathdirs; do
-        alldirs="${alldirs}${alldirs:+$hardcode_libdir_separator}$found_dir"
-      done
-      dnl Note: hardcode_libdir_flag_spec uses $libdir and $wl.
-      acl_save_libdir="$libdir"
-      libdir="$alldirs"
-      eval flag=\"$hardcode_libdir_flag_spec\"
-      libdir="$acl_save_libdir"
-      LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }$flag"
-    else
-      dnl The -rpath options are cumulative.
-      for found_dir in $rpathdirs; do
-        acl_save_libdir="$libdir"
-        libdir="$found_dir"
-        eval flag=\"$hardcode_libdir_flag_spec\"
-        libdir="$acl_save_libdir"
-        LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }$flag"
-      done
-    fi
-  fi
-  if test "X$ltrpathdirs" != "X"; then
-    dnl When using libtool, the option that works for both libraries and
-    dnl executables is -R. The -R options are cumulative.
-    for found_dir in $ltrpathdirs; do
-      LTLIB[]NAME="${LTLIB[]NAME}${LTLIB[]NAME:+ }-R$found_dir"
-    done
-  fi
-])
-
-dnl AC_LIB_APPENDTOVAR(VAR, CONTENTS) appends the elements of CONTENTS to VAR,
-dnl unless already present in VAR.
-dnl Works only for CPPFLAGS, not for LIB* variables because that sometimes
-dnl contains two or three consecutive elements that belong together.
-AC_DEFUN([AC_LIB_APPENDTOVAR],
-[
-  for element in [$2]; do
-    haveit=
-    for x in $[$1]; do
-      AC_LIB_WITH_FINAL_PREFIX([eval x=\"$x\"])
-      if test "X$x" = "X$element"; then
-        haveit=yes
-        break
-      fi
-    done
-    if test -z "$haveit"; then
-      [$1]="${[$1]}${[$1]:+ }$element"
-    fi
-  done
-])

m4/lib-prefix.m4

@@ -1,148 +0,0 @@
-# lib-prefix.m4 serial 1 (gettext-0.11)
-dnl Copyright (C) 2001-2002 Free Software Foundation, Inc.
-dnl This file is free software, distributed under the terms of the GNU
-dnl General Public License.  As a special exception to the GNU General
-dnl Public License, this file may be distributed as part of a program
-dnl that contains a configuration script generated by Autoconf, under
-dnl the same distribution terms as the rest of that program.
-
-dnl From Bruno Haible.
-
-dnl AC_LIB_PREFIX adds to the CPPFLAGS and LDFLAGS the flags that are needed
-dnl to access previously installed libraries. The basic assumption is that
-dnl a user will want packages to use other packages he previously installed
-dnl with the same --prefix option.
-dnl This macro is not needed if only AC_LIB_LINKFLAGS is used to locate
-dnl libraries, but is otherwise very convenient.
-AC_DEFUN([AC_LIB_PREFIX],
-[
-  AC_BEFORE([$0], [AC_LIB_LINKFLAGS])
-  AC_REQUIRE([AC_PROG_CC])
-  AC_REQUIRE([AC_CANONICAL_HOST])
-  AC_REQUIRE([AC_LIB_PREPARE_PREFIX])
-  dnl By default, look in $includedir and $libdir.
-  use_additional=yes
-  AC_LIB_WITH_FINAL_PREFIX([
-    eval additional_includedir=\"$includedir\"
-    eval additional_libdir=\"$libdir\"
-  ])
-  AC_ARG_WITH([lib-prefix],
-[  --with-lib-prefix[=DIR] search for libraries in DIR/include and DIR/lib
-  --without-lib-prefix    don't search for libraries in includedir and libdir],
-[
-    if test "X$withval" = "Xno"; then
-      use_additional=no
-    else
-      if test "X$withval" = "X"; then
-        AC_LIB_WITH_FINAL_PREFIX([
-          eval additional_includedir=\"$includedir\"
-          eval additional_libdir=\"$libdir\"
-        ])
-      else
-        additional_includedir="$withval/include"
-        additional_libdir="$withval/lib"
-      fi
-    fi
-])
-  if test $use_additional = yes; then
-    dnl Potentially add $additional_includedir to $CPPFLAGS.
-    dnl But don't add it
-    dnl   1. if it's the standard /usr/include,
-    dnl   2. if it's already present in $CPPFLAGS,
-    dnl   3. if it's /usr/local/include and we are using GCC on Linux,
-    dnl   4. if it doesn't exist as a directory.
-    if test "X$additional_includedir" != "X/usr/include"; then
-      haveit=
-      for x in $CPPFLAGS; do
-        AC_LIB_WITH_FINAL_PREFIX([eval x=\"$x\"])
-        if test "X$x" = "X-I$additional_includedir"; then
-          haveit=yes
-          break
-        fi
-      done
-      if test -z "$haveit"; then
-        if test "X$additional_includedir" = "X/usr/local/include"; then
-          if test -n "$GCC"; then
-            case $host_os in
-              linux*) haveit=yes;;
-            esac
-          fi
-        fi
-        if test -z "$haveit"; then
-          if test -d "$additional_includedir"; then
-            dnl Really add $additional_includedir to $CPPFLAGS.
-            CPPFLAGS="${CPPFLAGS}${CPPFLAGS:+ }-I$additional_includedir"
-          fi
-        fi
-      fi
-    fi
-    dnl Potentially add $additional_libdir to $LDFLAGS.
-    dnl But don't add it
-    dnl   1. if it's the standard /usr/lib,
-    dnl   2. if it's already present in $LDFLAGS,
-    dnl   3. if it's /usr/local/lib and we are using GCC on Linux,
-    dnl   4. if it doesn't exist as a directory.
-    if test "X$additional_libdir" != "X/usr/lib"; then
-      haveit=
-      for x in $LDFLAGS; do
-        AC_LIB_WITH_FINAL_PREFIX([eval x=\"$x\"])
-        if test "X$x" = "X-L$additional_libdir"; then
-          haveit=yes
-          break
-        fi
-      done
-      if test -z "$haveit"; then
-        if test "X$additional_libdir" = "X/usr/local/lib"; then
-          if test -n "$GCC"; then
-            case $host_os in
-              linux*) haveit=yes;;
-            esac
-          fi
-        fi
-        if test -z "$haveit"; then
-          if test -d "$additional_libdir"; then
-            dnl Really add $additional_libdir to $LDFLAGS.
-            LDFLAGS="${LDFLAGS}${LDFLAGS:+ }-L$additional_libdir"
-          fi
-        fi
-      fi
-    fi
-  fi
-])
-
-dnl AC_LIB_PREPARE_PREFIX creates variables acl_final_prefix,
-dnl acl_final_exec_prefix, containing the values to which $prefix and
-dnl $exec_prefix will expand at the end of the configure script.
-AC_DEFUN([AC_LIB_PREPARE_PREFIX],
-[
-  dnl Unfortunately, prefix and exec_prefix get only finally determined
-  dnl at the end of configure.
-  if test "X$prefix" = "XNONE"; then
-    acl_final_prefix="$ac_default_prefix"
-  else
-    acl_final_prefix="$prefix"
-  fi
-  if test "X$exec_prefix" = "XNONE"; then
-    acl_final_exec_prefix='${prefix}'
-  else
-    acl_final_exec_prefix="$exec_prefix"
-  fi
-  acl_save_prefix="$prefix"
-  prefix="$acl_final_prefix"
-  eval acl_final_exec_prefix=\"$acl_final_exec_prefix\"
-  prefix="$acl_save_prefix"
-])
-
-dnl AC_LIB_WITH_FINAL_PREFIX([statement]) evaluates statement, with the
-dnl variables prefix and exec_prefix bound to the values they will have
-dnl at the end of the configure script.
-AC_DEFUN([AC_LIB_WITH_FINAL_PREFIX],
-[
-  acl_save_prefix="$prefix"
-  prefix="$acl_final_prefix"
-  acl_save_exec_prefix="$exec_prefix"
-  exec_prefix="$acl_final_exec_prefix"
-  $1
-  exec_prefix="$acl_save_exec_prefix"
-  prefix="$acl_save_prefix"
-])

m4/progtest.m4

@@ -1,59 +0,0 @@
-# progtest.m4 serial 2 (gettext-0.10.40)
-dnl Copyright (C) 1996-2002 Free Software Foundation, Inc.
-dnl This file is free software, distributed under the terms of the GNU
-dnl General Public License.  As a special exception to the GNU General
-dnl Public License, this file may be distributed as part of a program
-dnl that contains a configuration script generated by Autoconf, under
-dnl the same distribution terms as the rest of that program.
-dnl
-dnl This file can can be used in projects which are not available under
-dnl the GNU General Public License or the GNU Library General Public
-dnl License but which still want to provide support for the GNU gettext
-dnl functionality.
-dnl Please note that the actual code of the GNU gettext library is covered
-dnl by the GNU Library General Public License, and the rest of the GNU
-dnl gettext package package is covered by the GNU General Public License.
-dnl They are *not* in the public domain.
-
-dnl Authors:
-dnl   Ulrich Drepper <drepper@cygnus.com>, 1996.
-
-# Search path for a program which passes the given test.
-
-dnl AM_PATH_PROG_WITH_TEST(VARIABLE, PROG-TO-CHECK-FOR,
-dnl   TEST-PERFORMED-ON-FOUND_PROGRAM [, VALUE-IF-NOT-FOUND [, PATH]])
-AC_DEFUN([AM_PATH_PROG_WITH_TEST],
-[# Extract the first word of "$2", so it can be a program name with args.
-set dummy $2; ac_word=[$]2
-AC_MSG_CHECKING([for $ac_word])
-AC_CACHE_VAL(ac_cv_path_$1,
-[case "[$]$1" in
-  /*)
-  ac_cv_path_$1="[$]$1" # Let the user override the test with a path.
-  ;;
-  *)
-  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS="${IFS}:"
-  for ac_dir in ifelse([$5], , $PATH, [$5]); do
-    test -z "$ac_dir" && ac_dir=.
-    if test -f $ac_dir/$ac_word; then
-      if [$3]; then
-	ac_cv_path_$1="$ac_dir/$ac_word"
-	break
-      fi
-    fi
-  done
-  IFS="$ac_save_ifs"
-dnl If no 4th arg is given, leave the cache variable unset,
-dnl so AC_PATH_PROGS will keep looking.
-ifelse([$4], , , [  test -z "[$]ac_cv_path_$1" && ac_cv_path_$1="$4"
-])dnl
-  ;;
-esac])dnl
-$1="$ac_cv_path_$1"
-if test ifelse([$4], , [-n "[$]$1"], ["[$]$1" != "$4"]); then
-  AC_MSG_RESULT([$]$1)
-else
-  AC_MSG_RESULT(no)
-fi
-AC_SUBST($1)dnl
-])

m4/stdint_h.m4

@@ -1,28 +0,0 @@
-# stdint_h.m4 serial 2 (gettext-0.11.4)
-dnl Copyright (C) 1997-2002 Free Software Foundation, Inc.
-dnl This file is free software, distributed under the terms of the GNU
-dnl General Public License.  As a special exception to the GNU General
-dnl Public License, this file may be distributed as part of a program
-dnl that contains a configuration script generated by Autoconf, under
-dnl the same distribution terms as the rest of that program.
-
-dnl From Paul Eggert.
-
-# Define HAVE_STDINT_H_WITH_UINTMAX if <stdint.h> exists,
-# doesn't clash with <sys/types.h>, and declares uintmax_t.
-
-AC_DEFUN([jm_AC_HEADER_STDINT_H],
-[
-  AC_CACHE_CHECK([for stdint.h], jm_ac_cv_header_stdint_h,
-  [AC_TRY_COMPILE(
-    [#include <sys/types.h>
-#include <stdint.h>],
-    [uintmax_t i = (uintmax_t) -1;],
-    jm_ac_cv_header_stdint_h=yes,
-    jm_ac_cv_header_stdint_h=no)])
-  if test $jm_ac_cv_header_stdint_h = yes; then
-    AC_DEFINE_UNQUOTED(HAVE_STDINT_H_WITH_UINTMAX, 1,
-[Define if <stdint.h> exists, doesn't clash with <sys/types.h>,
-   and declares uintmax_t. ])
-  fi
-])

m4/uintmax_t.m4

@@ -1,29 +0,0 @@
-# uintmax_t.m4 serial 6 (gettext-0.11)
-dnl Copyright (C) 1997-2002 Free Software Foundation, Inc.
-dnl This file is free software, distributed under the terms of the GNU
-dnl General Public License.  As a special exception to the GNU General
-dnl Public License, this file may be distributed as part of a program
-dnl that contains a configuration script generated by Autoconf, under
-dnl the same distribution terms as the rest of that program.
-
-dnl From Paul Eggert.
-
-AC_PREREQ(2.13)
-
-# Define uintmax_t to `unsigned long' or `unsigned long long'
-# if <inttypes.h> does not exist.
-
-AC_DEFUN([jm_AC_TYPE_UINTMAX_T],
-[
-  AC_REQUIRE([jm_AC_HEADER_INTTYPES_H])
-  AC_REQUIRE([jm_AC_HEADER_STDINT_H])
-  if test $jm_ac_cv_header_inttypes_h = no && test $jm_ac_cv_header_stdint_h = no; then
-    AC_REQUIRE([jm_AC_TYPE_UNSIGNED_LONG_LONG])
-    test $ac_cv_type_unsigned_long_long = yes \
-      && ac_type='unsigned long long' \
-      || ac_type='unsigned long'
-    AC_DEFINE_UNQUOTED(uintmax_t, $ac_type,
-  [Define to unsigned long or unsigned long long
-   if <inttypes.h> and <stdint.h> don't define.])
-  fi
-])

m4/ulonglong.m4

@@ -1,23 +0,0 @@
-# ulonglong.m4 serial 2 (fileutils-4.0.32, gettext-0.10.40)
-dnl Copyright (C) 1999-2002 Free Software Foundation, Inc.
-dnl This file is free software, distributed under the terms of the GNU
-dnl General Public License.  As a special exception to the GNU General
-dnl Public License, this file may be distributed as part of a program
-dnl that contains a configuration script generated by Autoconf, under
-dnl the same distribution terms as the rest of that program.
-
-dnl From Paul Eggert.
-
-AC_DEFUN([jm_AC_TYPE_UNSIGNED_LONG_LONG],
-[
-  AC_CACHE_CHECK([for unsigned long long], ac_cv_type_unsigned_long_long,
-  [AC_TRY_LINK([unsigned long long ull = 1; int i = 63;],
-    [unsigned long long ullmax = (unsigned long long) -1;
-     return ull << i | ull >> i | ullmax / ull | ullmax % ull;],
-    ac_cv_type_unsigned_long_long=yes,
-    ac_cv_type_unsigned_long_long=no)])
-  if test $ac_cv_type_unsigned_long_long = yes; then
-    AC_DEFINE(HAVE_UNSIGNED_LONG_LONG, 1,
-      [Define if you have the unsigned long long type.])
-  fi
-])

po/.gitignore

@@ -1,6 +1,7 @@
 /*.gmo
 
 /Makefile.in.in
+/Makevars.template
 /Rules-quot
 /boldquot.sed
 /en@boldquot.header
@@ -8,4 +9,6 @@
 /insert-header.sin
 /POTFILES
 /quot.sed
+/remove-potcdate.sed
 /remove-potcdate.sin
+/stamp-po

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

@@ -1,9 +1,10 @@
-AM_CPPFLAGS = -DLOCALEDIR=\"$(localedir)\" -DSYSCONFDIR=\"$(sysconfdir)\"
+AM_CPPFLAGS = -DLOCALEDIR=\"$(localedir)\" -DSYSCONFDIR=\"$(sysconfdir)\" \
+	-I$(top_builddir)/lib -I$(top_srcdir)/lib
 
 CLEANFILES = revision.h
 
 if BUILDING_FROM_GIT
-SOMETHING = "REVISION \"$(shell git describe --tags 2>/dev/null)\""
+SOMETHING = "REVISION \"`git describe --tags 2>/dev/null`\""
 else
 SOMETHING = "NOTHING \"from tarball\""
 endif
@@ -11,12 +12,13 @@ endif
 nano.o: revision.h
 winio.o: revision.h
 
-revision.h: update_revision
+# Always run the commands in this rule.  But update the target
+# only when the revision actually changed.
+revision.h: FORCE
 	@[ -f $@ ] || touch $@
 	@echo "#define $(SOMETHING)" | cmp -s $@ - || \
-	echo "#define $(SOMETHING)" > $@
-
-.PHONY: update_revision
+			echo "#define $(SOMETHING)" > $@
+FORCE:
 
 bin_PROGRAMS = 	nano
 nano_SOURCES =	browser.c \
@@ -26,6 +28,7 @@ nano_SOURCES =	browser.c \
 		files.c \
 		global.c \
 		help.c \
+		history.c \
 		move.c \
 		nano.c \
 		nano.h \
@@ -35,9 +38,10 @@ nano_SOURCES =	browser.c \
 		search.c \
 		text.c \
 		utils.c \
-		winio.c 
+		winio.c
 
-nano_LDADD = @GLIB_LIBS@ @LIBINTL@
+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

@@ -1,9 +1,8 @@
 /**************************************************************************
  *   browser.c  --  This file is part of GNU nano.                        *
  *                                                                        *
- *   Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009,  *
- *   2010, 2011, 2013, 2014, 2015 Free Software Foundation, Inc.          *
- *   Copyright (C) 2015, 2016 Benno Schulenberg                           *
+ *   Copyright (C) 2001-2011, 2013-2017 Free Software Foundation, Inc.    *
+ *   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    *
@@ -22,20 +21,19 @@
 
 #include "proto.h"
 
+#include <errno.h>
 #include <stdint.h>
-#include <stdio.h>
 #include <string.h>
 #include <unistd.h>
-#include <errno.h>
 
-#ifndef DISABLE_BROWSER
+#ifdef ENABLE_BROWSER
 
 static char **filelist = NULL;
 	/* The list of files to display in the file browser. */
 static size_t filelist_len = 0;
 	/* The number of files in the list. */
 static int width = 0;
-	/* The number of files that we can display per line. */
+	/* The number of files that we can display per screen row. */
 static int longest = 0;
 	/* The number of columns in the longest filename in the list. */
 static size_t selected = 0;
@@ -57,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. */
 
@@ -108,22 +103,20 @@ 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));
 
-#ifndef DISABLE_MOUSE
+#ifdef ENABLE_MOUSE
 	if (kbinput == KEY_MOUSE) {
 	    int mouse_x, mouse_y;
 
@@ -152,7 +145,7 @@ char *do_browser(char *path)
 
 	    continue;
 	}
-#endif /* !DISABLE_MOUSE */
+#endif /* ENABLE_MOUSE */
 
 	func = parse_browser_input(&kbinput);
 
@@ -163,7 +156,7 @@ char *do_browser(char *path)
 	    kbinput = KEY_WINCH;
 #endif
 	} else if (func == do_help_void) {
-#ifndef DISABLE_HELP
+#ifdef ENABLE_HELP
 	    do_help_void();
 #ifndef NANO_TINY
 	    /* The window dimensions might have changed, so act as if. */
@@ -172,32 +165,45 @@ 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--;
 	} else if (func == do_right) {
 	    if (selected < filelist_len - 1)
 		selected++;
-#ifndef NANO_TINY
 	} else if (func == do_prev_word_void) {
 	    selected -= (selected % width);
 	} else if (func == do_next_word_void) {
 	    selected += width - 1 - (selected % width);
 	    if (selected >= filelist_len)
 		selected = filelist_len - 1;
-#endif
 	} else if (func == do_up_void) {
 	    if (selected >= width)
 		selected -= width;
 	} else if (func == do_down_void) {
 	    if (selected + width <= filelist_len - 1)
 		selected += width;
+	} else if (func == do_prev_block) {
+	    selected = ((selected / (editwinrows * width)) *
+				editwinrows * width) + selected % width;
+	} else if (func == do_next_block) {
+	    selected = ((selected / (editwinrows * width)) *
+				editwinrows * width) + selected % width +
+				editwinrows * width - width;
+	    if (selected >= filelist_len)
+		selected = (filelist_len / width) * width + selected % width;
+	    if (selected >= filelist_len)
+		selected -= width;
 	} else if (func == do_page_up) {
 	    if (selected < width)
 		selected = 0;
@@ -219,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"));
 
@@ -240,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;
 	    }
@@ -271,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
@@ -297,7 +298,7 @@ char *do_browser(char *path)
 	    /* If we are moving up one level, remember where we came from, so
 	     * this directory can be highlighted and easily reentered. */
 	    if (strcmp(tail(filelist[selected]), "..") == 0)
-		present_name = striponedir(filelist[selected]);
+		present_name = strip_last_component(filelist[selected]);
 
 	    /* Try opening and reading the selected directory. */
 	    path = mallocstrcpy(path, filelist[selected]);
@@ -353,7 +354,7 @@ char *do_browse_from(const char *inpath)
      * at all.  If so, we'll just pass the current directory to
      * do_browser(). */
     if (stat(path, &st) == -1 || !S_ISDIR(st.st_mode)) {
-	path = free_and_assign(path, striponedir(path));
+	path = free_and_assign(path, strip_last_component(path));
 
 	if (stat(path, &st) == -1 || !S_ISDIR(st.st_mode)) {
 	    char * currentdir = charalloc(PATH_MAX + 1);
@@ -371,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
 
@@ -385,7 +386,7 @@ char *do_browse_from(const char *inpath)
  * set filelist_len to the number of files in that list, set longest to
  * the width in columns of the longest filename in that list (between 15
  * and COLS), and set width to the number of files that we can display
- * per line.  And sort the list too. */
+ * per screen row.  And sort the list too. */
 void read_the_list(const char *path, DIR *dir)
 {
     const struct dirent *nextdir;
@@ -467,6 +468,10 @@ functionptrtype parse_browser_input(int *kbinput)
 		return do_help_void;
 	    case 'E':
 	    case 'e':
+	    case 'Q':
+	    case 'q':
+	    case 'X':
+	    case 'x':
 		return do_exit;
 	    case 'G':
 	    case 'g':
@@ -476,21 +481,28 @@ functionptrtype parse_browser_input(int *kbinput)
 		return do_enter;
 	    case 'W':
 	    case 'w':
-		return do_search;
+	    case '/':
+		return do_search_forward;
+	    case 'N':
+#ifndef NANO_TINY
+		return do_findprevious;
+#endif
+	    case 'n':
+		return do_research;
 	}
     }
     return func_from_key(kbinput);
 }
 
-/* Set width to the number of files that we can display per line, if
- * necessary, and display the list of files. */
+/* Set width to the number of files that we can display per screen row,
+ * if necessary, and display the list of files. */
 void browser_refresh(void)
 {
     size_t i;
-    int line = 0, col = 0;
-	/* The current line and column while the list is getting displayed. */
-    int the_line = 0, the_column = 0;
-	/* The line and column of the selected item. */
+    int row = 0, col = 0;
+	/* The current row and column while the list is getting displayed. */
+    int the_row = 0, the_column = 0;
+	/* The row and column of the selected item. */
     char *info;
 	/* The additional information that we'll display about a file. */
 
@@ -501,7 +513,7 @@ void browser_refresh(void)
 
     i = selected - selected % (editwinrows * width);
 
-    for (; i < filelist_len && line < editwinrows; i++) {
+    for (; i < filelist_len && row < editwinrows; i++) {
 	struct stat st;
 	const char *thename = tail(filelist[i]);
 		/* The filename we display, minus the path. */
@@ -523,17 +535,17 @@ 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);
-	    the_line = line;
+	    wattron(edit, interface_color_pair[SELECTED_TEXT]);
+	    the_row = row;
 	    the_column = col;
 	}
 
-	blank_line(edit, line, col, longest);
+	blank_row(edit, row, col, longest);
 
 	/* If the name is too long, we display something like "...ename". */
 	if (dots)
-	    mvwaddstr(edit, line, col, "...");
-	mvwaddstr(edit, line, dots ? col + 3 : col, disp);
+	    mvwaddstr(edit, row, col, "...");
+	mvwaddstr(edit, row, dots ? col + 3 : col, disp);
 
 	free(disp);
 
@@ -587,32 +599,32 @@ void browser_refresh(void)
 	/* Make sure info takes up no more than infomaxlen columns. */
 	infolen = strlenpt(info);
 	if (infolen > infomaxlen) {
-	    null_at(&info, actual_x(info, infomaxlen));
+	    info[actual_x(info, infomaxlen)] = '\0';
 	    infolen = infomaxlen;
 	}
 
-	mvwaddstr(edit, line, col - infolen, info);
+	mvwaddstr(edit, row, col - infolen, info);
 
 	/* 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);
 
 	/* Add some space between the columns. */
 	col += 2;
 
-	/* If the next entry isn't going to fit on the current line,
-	 * move to the next line. */
+	/* If the next entry isn't going to fit on the current row,
+	 * move to the next row. */
 	if (col > COLS - longest) {
-	    line++;
+	    row++;
 	    col = 0;
 	}
     }
 
     /* If requested, put the cursor on the selected item and switch it on. */
     if (ISSET(SHOW_CURSOR)) {
-	wmove(edit, the_line, the_column);
+	wmove(edit, the_row, the_column);
 	curs_set(1);
     }
 
@@ -664,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. */
@@ -684,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. */
@@ -705,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. */
@@ -751,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. */
@@ -781,21 +796,17 @@ void do_last_file(void)
     selected = filelist_len - 1;
 }
 
-/* Strip one directory from the end of path, and return the stripped
- * path.  The returned string is dynamically allocated, and should be
- * freed. */
-char *striponedir(const char *path)
+/* Strip one element from the end of path, and return the stripped path.
+ * The returned string is dynamically allocated, and should be freed. */
+char *strip_last_component(const char *path)
 {
-    char *retval, *tmp;
+    char *copy = mallocstrcpy(NULL, path);
+    char *last_slash = strrchr(copy, '/');
 
-    retval = mallocstrcpy(NULL, path);
+    if (last_slash != NULL)
+	*last_slash = '\0';
 
-    tmp = strrchr(retval, '/');
-
-    if (tmp != NULL)
-	null_at(&retval, tmp - retval);
-
-    return retval;
+    return copy;
 }
 
-#endif /* !DISABLE_BROWSER */
+#endif /* ENABLE_BROWSER */

src/chars.c

@@ -1,9 +1,8 @@
 /**************************************************************************
  *   chars.c  --  This file is part of GNU nano.                          *
  *                                                                        *
- *   Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009,  *
- *   2010, 2011, 2013, 2014 Free Software Foundation, Inc.                *
- *   Copyright (C) 2016 Benno Schulenberg                                 *
+ *   Copyright (C) 2001-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    *
@@ -22,16 +21,12 @@
 
 #include "proto.h"
 
-#include <string.h>
 #include <ctype.h>
+#include <string.h>
 
 #ifdef ENABLE_UTF8
-#ifdef HAVE_WCHAR_H
 #include <wchar.h>
-#endif
-#ifdef HAVE_WCTYPE_H
 #include <wctype.h>
-#endif
 
 static bool use_utf8 = FALSE;
 	/* Whether we've enabled UTF-8 support. */
@@ -61,22 +56,6 @@ char *addstrings(char* str1, size_t len1, char* str2, size_t len2)
     return str1;
 }
 
-#ifndef HAVE_ISBLANK
-/* This function is equivalent to isblank(). */
-bool nisblank(int c)
-{
-    return isspace(c) && (c == '\t' || !is_cntrl_char(c));
-}
-#endif
-
-#if !defined(HAVE_ISWBLANK) && defined(ENABLE_UTF8)
-/* This function is equivalent to iswblank(). */
-bool niswblank(wchar_t wc)
-{
-    return iswspace(wc) && (wc == '\t' || !is_cntrl_wchar(wc));
-}
-#endif
-
 /* Return TRUE if the value of c is in byte range, and FALSE otherwise. */
 bool is_byte(int c)
 {
@@ -91,13 +70,11 @@ void mbtowc_reset(void)
 /* This function is equivalent to isalpha() for multibyte characters. */
 bool is_alpha_mbchar(const char *c)
 {
-    assert(c != NULL);
-
 #ifdef ENABLE_UTF8
     if (use_utf8) {
 	wchar_t wc;
 
-	if (mbtowc(&wc, c, MB_CUR_MAX) < 0) {
+	if (mbtowc(&wc, c, MAXCHARLEN) < 0) {
 	    mbtowc_reset();
 	    return 0;
 	}
@@ -111,13 +88,11 @@ bool is_alpha_mbchar(const char *c)
 /* This function is equivalent to isalnum() for multibyte characters. */
 bool is_alnum_mbchar(const char *c)
 {
-    assert(c != NULL);
-
 #ifdef ENABLE_UTF8
     if (use_utf8) {
 	wchar_t wc;
 
-	if (mbtowc(&wc, c, MB_CUR_MAX) < 0) {
+	if (mbtowc(&wc, c, MAXCHARLEN) < 0) {
 	    mbtowc_reset();
 	    return 0;
 	}
@@ -131,13 +106,11 @@ bool is_alnum_mbchar(const char *c)
 /* This function is equivalent to isblank() for multibyte characters. */
 bool is_blank_mbchar(const char *c)
 {
-    assert(c != NULL);
-
 #ifdef ENABLE_UTF8
     if (use_utf8) {
 	wchar_t wc;
 
-	if (mbtowc(&wc, c, MB_CUR_MAX) < 0) {
+	if (mbtowc(&wc, c, MAXCHARLEN) < 0) {
 	    mbtowc_reset();
 	    return 0;
 	}
@@ -179,13 +152,11 @@ bool is_cntrl_mbchar(const char *c)
 /* This function is equivalent to ispunct() for multibyte characters. */
 bool is_punct_mbchar(const char *c)
 {
-    assert(c != NULL);
-
 #ifdef ENABLE_UTF8
     if (use_utf8) {
 	wchar_t wc;
 
-	if (mbtowc(&wc, c, MB_CUR_MAX) < 0) {
+	if (mbtowc(&wc, c, MAXCHARLEN) < 0) {
 	    mbtowc_reset();
 	    return 0;
 	}
@@ -208,7 +179,7 @@ bool is_word_mbchar(const char *c, bool allow_punct)
 	return TRUE;
 
     if (word_chars != NULL && *word_chars != '\0') {
-	char symbol[mb_cur_max() + 1];
+	char symbol[MAXCHARLEN + 1];
 	int symlen = parse_mbchar(c, symbol, NULL);
 
 	symbol[symlen] = '\0';
@@ -255,12 +226,10 @@ char control_mbrep(const char *c, bool isdata)
  * return the number of columns that the character occupies. */
 int length_of_char(const char *c, int *width)
 {
-    assert(c != NULL);
-
 #ifdef ENABLE_UTF8
     if (use_utf8) {
 	wchar_t wc;
-	int charlen = mbtowc(&wc, c, MB_CUR_MAX);
+	int charlen = mbtowc(&wc, c, MAXCHARLEN);
 
 	/* If the sequence is invalid... */
 	if (charlen < 0) {
@@ -286,14 +255,12 @@ int length_of_char(const char *c, int *width)
 /* This function is equivalent to wcwidth() for multibyte characters. */
 int mbwidth(const char *c)
 {
-    assert(c != NULL);
-
 #ifdef ENABLE_UTF8
     if (use_utf8) {
 	wchar_t wc;
 	int width;
 
-	if (mbtowc(&wc, c, MB_CUR_MAX) < 0) {
+	if (mbtowc(&wc, c, MAXCHARLEN) < 0) {
 	    mbtowc_reset();
 	    return 1;
 	}
@@ -309,17 +276,6 @@ int mbwidth(const char *c)
 	return 1;
 }
 
-/* Return the maximum length (in bytes) of a character. */
-int mb_cur_max(void)
-{
-#ifdef ENABLE_UTF8
-    if (use_utf8)
-	return MB_CUR_MAX;
-    else
-#endif
-	return 1;
-}
-
 /* Convert the Unicode value in chr to a multibyte character, if possible.
  * If the conversion succeeds, return the (dynamically allocated) multibyte
  * character and its length.  Otherwise, return an undefined (dynamically
@@ -330,7 +286,7 @@ char *make_mbchar(long chr, int *chr_mb_len)
 
 #ifdef ENABLE_UTF8
     if (use_utf8) {
-	chr_mb = charalloc(MB_CUR_MAX);
+	chr_mb = charalloc(MAXCHARLEN);
 	*chr_mb_len = wctomb(chr_mb, (wchar_t)chr);
 
 	/* Reject invalid Unicode characters. */
@@ -353,14 +309,10 @@ char *make_mbchar(long chr, int *chr_mb_len)
  * col isn't NULL, add the character's width (in columns) to it. */
 int parse_mbchar(const char *buf, char *chr, size_t *col)
 {
-    int length;
-
-    assert(buf != NULL);
-
 #ifdef ENABLE_UTF8
     if (use_utf8) {
 	/* Get the number of bytes in the multibyte character. */
-	length = mblen(buf, MB_CUR_MAX);
+	int length = mblen(buf, MAXCHARLEN);
 
 	/* When the multibyte sequence is invalid, only take the first byte. */
 	if (length <= 0) {
@@ -390,12 +342,11 @@ int parse_mbchar(const char *buf, char *chr, size_t *col)
 	    } else
 		*col += mbwidth(buf);
 	}
+
+	return length;
     } else
 #endif
     {
-	/* A byte character is one byte long. */
-	length = 1;
-
 	/* When requested, store the byte character in chr. */
 	if (chr != NULL)
 	    *chr = *buf;
@@ -414,33 +365,48 @@ int parse_mbchar(const char *buf, char *chr, size_t *col)
 	    else
 		(*col)++;
 	}
-    }
 
-    return length;
+	return 1;
+    }
 }
 
 /* Return the index in buf of the beginning of the multibyte character
  * before the one at pos. */
 size_t move_mbleft(const char *buf, size_t pos)
 {
-    size_t before, char_len = 0;
+#ifdef ENABLE_UTF8
+    if (use_utf8) {
+	size_t before, char_len = 0;
 
-    assert(buf != NULL && pos <= strlen(buf));
+	if (pos < 4)
+	    before = 0;
+	else {
+	    const char *ptr = buf + pos;
 
-    /* There is no library function to move backward one multibyte
-     * character.  So we just start groping for one at the farthest
-     * possible point. */
-    if (mb_cur_max() > pos)
-	before = 0;
-    else
-	before = pos - mb_cur_max();
+	    /* Probe for a valid starter byte in the preceding four bytes. */
+	    if ((signed char)*(--ptr) > -65)
+		before = pos - 1;
+	    else if ((signed char)*(--ptr) > -65)
+		before = pos - 2;
+	    else if ((signed char)*(--ptr) > -65)
+		before = pos - 3;
+	    else if ((signed char)*(--ptr) > -65)
+		before = pos - 4;
+	    else
+		before = pos - 1;
+	}
 
-    while (before < pos) {
-	char_len = parse_mbchar(buf + before, NULL, NULL);
-	before += char_len;
-    }
+	/* Move forward again until we reach the original character,
+	 * so we know the length of its preceding character. */
+	while (before < pos) {
+	    char_len = parse_mbchar(buf + before, NULL, NULL);
+	    before += char_len;
+	}
 
-    return before - char_len;
+	return before - char_len;
+    } else
+#endif
+    return (pos == 0 ? 0 : pos - 1);
 }
 
 /* Return the index in buf of the beginning of the multibyte character
@@ -450,36 +416,12 @@ size_t move_mbright(const char *buf, size_t pos)
     return pos + parse_mbchar(buf + pos, NULL, NULL);
 }
 
-#ifndef HAVE_STRCASECMP
-/* This function is equivalent to strcasecmp(). */
-int nstrcasecmp(const char *s1, const char *s2)
-{
-    return strncasecmp(s1, s2, HIGHEST_POSITIVE);
-}
-#endif
-
 /* This function is equivalent to strcasecmp() for multibyte strings. */
 int mbstrcasecmp(const char *s1, const char *s2)
 {
     return mbstrncasecmp(s1, s2, HIGHEST_POSITIVE);
 }
 
-#ifndef HAVE_STRNCASECMP
-/* This function is equivalent to strncasecmp(). */
-int nstrncasecmp(const char *s1, const char *s2, size_t n)
-{
-    if (s1 == s2)
-	return 0;
-
-    for (; *s1 != '\0' && *s2 != '\0' && n > 0; s1++, s2++, n--) {
-	if (tolower(*s1) != tolower(*s2))
-	    break;
-    }
-
-    return (n > 0) ? tolower(*s1) - tolower(*s2) : 0;
-}
-#endif
-
 /* This function is equivalent to strncasecmp() for multibyte strings. */
 int mbstrncasecmp(const char *s1, const char *s2, size_t n)
 {
@@ -490,12 +432,12 @@ int mbstrncasecmp(const char *s1, const char *s2, size_t n)
 	while (*s1 != '\0' && *s2 != '\0' && n > 0) {
 	    bool bad1 = FALSE, bad2 = FALSE;
 
-	    if (mbtowc(&wc1, s1, MB_CUR_MAX) < 0) {
+	    if (mbtowc(&wc1, s1, MAXCHARLEN) < 0) {
 		mbtowc_reset();
 		bad1 = TRUE;
 	    }
 
-	    if (mbtowc(&wc2, s2, MB_CUR_MAX) < 0) {
+	    if (mbtowc(&wc2, s2, MAXCHARLEN) < 0) {
 		mbtowc_reset();
 		bad2 = TRUE;
 	    }
@@ -524,39 +466,12 @@ int mbstrncasecmp(const char *s1, const char *s2, size_t n)
 	return strncasecmp(s1, s2, n);
 }
 
-#ifndef HAVE_STRCASESTR
-/* This function is equivalent to strcasestr(). */
-char *nstrcasestr(const char *haystack, const char *needle)
-{
-    size_t needle_len;
-
-    if (*needle == '\0')
-	return (char *)haystack;
-
-    needle_len = strlen(needle);
-
-    while (*haystack != '\0') {
-	if (strncasecmp(haystack, needle, needle_len) == 0)
-	    return (char *)haystack;
-
-	haystack++;
-    }
-
-    return NULL;
-}
-#endif
-
 /* This function is equivalent to strcasestr() for multibyte strings. */
 char *mbstrcasestr(const char *haystack, const char *needle)
 {
 #ifdef ENABLE_UTF8
     if (use_utf8) {
-	size_t needle_len;
-
-	if (*needle == '\0')
-	    return (char *)haystack;
-
-	needle_len = mbstrlen(needle);
+	size_t needle_len = mbstrlen(needle);
 
 	while (*haystack != '\0') {
 	    if (mbstrncasecmp(haystack, needle, needle_len) == 0)
@@ -572,19 +487,13 @@ char *mbstrcasestr(const char *haystack, const char *needle)
 }
 
 /* This function is equivalent to strstr(), except in that it scans the
- * string in reverse, starting at rev_start. */
+ * string in reverse, starting at pointer. */
 char *revstrstr(const char *haystack, const char *needle,
 	const char *pointer)
 {
     size_t needle_len = strlen(needle);
     size_t tail_len = strlen(pointer);
 
-    if (needle_len == 0)
-	return (char *)pointer;
-
-    if (strlen(haystack) < needle_len)
-	return NULL;
-
     if (tail_len < needle_len)
 	pointer += tail_len - needle_len;
 
@@ -598,65 +507,53 @@ char *revstrstr(const char *haystack, const char *needle,
 }
 
 /* This function is equivalent to strcasestr(), except in that it scans
- * the string in reverse, starting at rev_start. */
-char *revstrcasestr(const char *haystack, const char *needle, const char
-	*rev_start)
+ * the string in reverse, starting at pointer. */
+char *revstrcasestr(const char *haystack, const char *needle,
+	const char *pointer)
 {
-    size_t rev_start_len, needle_len;
+    size_t needle_len = strlen(needle);
+    size_t tail_len = strlen(pointer);
 
-    if (*needle == '\0')
-	return (char *)rev_start;
+    if (tail_len < needle_len)
+	pointer += tail_len - needle_len;
 
-    needle_len = strlen(needle);
-
-    if (strlen(haystack) < needle_len)
-	return NULL;
-
-    rev_start_len = strlen(rev_start);
-
-    for (; rev_start >= haystack; rev_start--, rev_start_len++) {
-	if (rev_start_len >= needle_len && strncasecmp(rev_start,
-		needle, needle_len) == 0)
-	    return (char *)rev_start;
+    while (pointer >= haystack) {
+	if (strncasecmp(pointer, needle, needle_len) == 0)
+	    return (char *)pointer;
+	pointer--;
     }
 
     return NULL;
 }
 
 /* This function is equivalent to strcasestr() for multibyte strings,
- * except in that it scans the string in reverse, starting at rev_start. */
-char *mbrevstrcasestr(const char *haystack, const char *needle, const
-	char *rev_start)
+ * except in that it scans the string in reverse, starting at pointer. */
+char *mbrevstrcasestr(const char *haystack, const char *needle,
+	const char *pointer)
 {
 #ifdef ENABLE_UTF8
     if (use_utf8) {
-	size_t rev_start_len, needle_len;
+	size_t needle_len = mbstrlen(needle);
+	size_t tail_len = mbstrlen(pointer);
 
-	if (*needle == '\0')
-	    return (char *)rev_start;
+	if (tail_len < needle_len)
+	    pointer += tail_len - needle_len;
 
-	needle_len = mbstrlen(needle);
-
-	if (mbstrlen(haystack) < needle_len)
+	if (pointer < haystack)
 	    return NULL;
 
-	rev_start_len = mbstrlen(rev_start);
-
 	while (TRUE) {
-	    if (rev_start_len >= needle_len &&
-			mbstrncasecmp(rev_start, needle, needle_len) == 0)
-		return (char *)rev_start;
+	    if (mbstrncasecmp(pointer, needle, needle_len) == 0)
+		return (char *)pointer;
 
-	    /* If we've reached the head of the haystack, we found nothing. */
-	    if (rev_start == haystack)
+	    if (pointer == haystack)
 		return NULL;
 
-	    rev_start = haystack + move_mbleft(haystack, rev_start - haystack);
-	    rev_start_len++;
+	    pointer = haystack + move_mbleft(haystack, pointer - haystack);
 	}
     } else
 #endif
-	return revstrcasestr(haystack, needle, rev_start);
+	return revstrcasestr(haystack, needle, pointer);
 }
 
 /* This function is equivalent to strlen() for multibyte strings. */
@@ -665,19 +562,6 @@ size_t mbstrlen(const char *s)
     return mbstrnlen(s, (size_t)-1);
 }
 
-#ifndef HAVE_STRNLEN
-/* This function is equivalent to strnlen(). */
-size_t nstrnlen(const char *s, size_t maxlen)
-{
-    size_t n = 0;
-
-    for (; *s != '\0' && maxlen > 0; s++, maxlen--, n++)
-	;
-
-    return n;
-}
-#endif
-
 /* This function is equivalent to strnlen() for multibyte strings. */
 size_t mbstrnlen(const char *s, size_t maxlen)
 {
@@ -695,20 +579,18 @@ 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)
 {
-    assert(s != NULL && c != NULL);
-
 #ifdef ENABLE_UTF8
     if (use_utf8) {
 	bool bad_s_mb = FALSE, bad_c_mb = FALSE;
-	char symbol[MB_CUR_MAX];
+	char symbol[MAXCHARLEN];
 	const char *q = s;
 	wchar_t ws, wc;
 
-	if (mbtowc(&wc, c, MB_CUR_MAX) < 0) {
+	if (mbtowc(&wc, c, MAXCHARLEN) < 0) {
 	    mbtowc_reset();
 	    wc = (unsigned char)*c;
 	    bad_c_mb = TRUE;
@@ -738,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. */
@@ -757,65 +639,60 @@ char *mbstrpbrk(const char *s, const char *accept)
 	return (char *) strpbrk(s, accept);
 }
 
-/* This function is equivalent to strpbrk(), except in that it scans the
- * string in reverse, starting at rev_start. */
-char *revstrpbrk(const char *s, const char *accept, const char
-	*rev_start)
+/* Locate, in the string that starts at head, the first occurrence of any of
+ * the characters in the string accept, starting from pointer and searching
+ * backwards. */
+char *revstrpbrk(const char *head, const char *accept, const char *pointer)
 {
-    assert(s != NULL && accept != NULL && rev_start != NULL);
-
-    if (*rev_start == '\0') {
-	if (rev_start == s)
+    if (*pointer == '\0') {
+	if (pointer == head)
 	   return NULL;
-	rev_start--;
+	pointer--;
     }
 
-    for (; rev_start >= s; rev_start--) {
-	if (strchr(accept, *rev_start) != NULL)
-	    return (char *)rev_start;
+    while (pointer >= head) {
+	if (strchr(accept, *pointer) != NULL)
+	    return (char *)pointer;
+	pointer--;
     }
 
     return NULL;
 }
 
-/* This function is equivalent to strpbrk() for multibyte strings,
- * except in that it scans the string in reverse, starting at rev_start. */
-char *mbrevstrpbrk(const char *s, const char *accept, const char
-	*rev_start)
+/* The same as the preceding function but then for multibyte strings. */
+char *mbrevstrpbrk(const char *head, const char *accept, const char *pointer)
 {
-    assert(s != NULL && accept != NULL && rev_start != NULL);
-
 #ifdef ENABLE_UTF8
     if (use_utf8) {
-	if (*rev_start == '\0') {
-	    if (rev_start == s)
+	if (*pointer == '\0') {
+	    if (pointer == head)
 		return NULL;
-	    rev_start = s + move_mbleft(s, rev_start - s);
+	    pointer = head + move_mbleft(head, pointer - head);
 	}
 
 	while (TRUE) {
-	    if (mbstrchr(accept, rev_start) != NULL)
-		return (char *)rev_start;
+	    if (mbstrchr(accept, pointer) != NULL)
+		return (char *)pointer;
 
 	    /* If we've reached the head of the string, we found nothing. */
-	    if (rev_start == s)
+	    if (pointer == head)
 		return NULL;
 
-	    rev_start = s + move_mbleft(s, rev_start - s);
+	    pointer = head + move_mbleft(head, pointer - head);
 	}
     } else
 #endif
-	return revstrpbrk(s, accept, rev_start);
+	return revstrpbrk(head, accept, pointer);
 }
 #endif /* !NANO_TINY */
 
-#if !defined(DISABLE_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)
 {
     for (; *s != '\0'; s++) {
-	if (isblank(*s))
+	if (isblank((unsigned char)*s))
 	    return TRUE;
     }
 
@@ -828,7 +705,7 @@ bool has_blank_mbchars(const char *s)
 {
 #ifdef ENABLE_UTF8
     if (use_utf8) {
-	char symbol[MB_CUR_MAX];
+	char symbol[MAXCHARLEN];
 
 	for (; *s != '\0'; s += move_mbright(s, 0)) {
 	    parse_mbchar(s, symbol, NULL);
@@ -842,7 +719,7 @@ bool has_blank_mbchars(const char *s)
 #endif
 	return has_blank_chars(s);
 }
-#endif /* !DISABLE_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. */
@@ -855,7 +732,7 @@ bool is_valid_unicode(wchar_t wc)
 }
 #endif
 
-#ifndef DISABLE_NANORC
+#ifdef ENABLE_NANORC
 /* Check if the string s is a valid multibyte string.  Return TRUE if it
  * is, and FALSE otherwise. */
 bool is_valid_mbstring(const char *s)
@@ -867,4 +744,4 @@ bool is_valid_mbstring(const char *s)
 #endif
 	return TRUE;
 }
-#endif /* !DISABLE_NANORC */
+#endif /* ENABLE_NANORC */

src/color.c

@@ -1,9 +1,8 @@
 /**************************************************************************
  *   color.c  --  This file is part of GNU nano.                          *
  *                                                                        *
- *   Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009,  *
- *   2010, 2011, 2013, 2014, 2015 Free Software Foundation, Inc.          *
- *   Copyright (C) 2014, 2015, 2016 Benno Schulenberg                     *
+ *   Copyright (C) 2001-2011, 2013-2017 Free Software Foundation, Inc.    *
+ *   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,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. */
@@ -55,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
@@ -95,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);
 	}
     }
@@ -129,10 +134,9 @@ 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;
 }
 
 /* Try to match the given shibboleth string with one of the regexes in
@@ -177,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);
@@ -212,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;
@@ -224,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 |
@@ -245,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
 	    }
 	}
 
@@ -265,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;
@@ -290,53 +286,12 @@ void color_update(void)
     }
 }
 
-/* Reset the multiline coloring cache for one specific regex (given by
- * index) for lines that need reevaluation. */
-void reset_multis_for_id(filestruct *fileptr, int index)
-{
-    filestruct *row;
-
-    /* Reset the cache of earlier lines, as far back as needed. */
-    for (row = fileptr->prev; row != NULL; row = row->prev) {
-	alloc_multidata_if_needed(row);
-	if (row->multidata[index] == CNONE)
-	    break;
-	row->multidata[index] = -1;
-    }
-    for (; row != NULL; row = row->prev) {
-	alloc_multidata_if_needed(row);
-	if (row->multidata[index] != CNONE)
-	    break;
-	row->multidata[index] = -1;
-    }
-
-    /* Reset the cache of the current line. */
-    fileptr->multidata[index] = -1;
-
-    /* Reset the cache of later lines, as far ahead as needed. */
-    for (row = fileptr->next; row != NULL; row = row->next) {
-	alloc_multidata_if_needed(row);
-	if (row->multidata[index] == CNONE)
-	    break;
-	row->multidata[index] = -1;
-    }
-    for (; row != NULL; row = row->next) {
-	alloc_multidata_if_needed(row);
-	if (row->multidata[index] != CNONE)
-	    break;
-	row->multidata[index] = -1;
-    }
-
-    refresh_needed = TRUE;
-}
-
-/* Reset multi-line strings around the filestruct fileptr, trying to be
- * smart about stopping.  Bool force means: reset everything regardless,
- * useful when we don't know how much screen state has changed. */
-void reset_multis(filestruct *fileptr, bool force)
+/* Determine whether the matches of multiline regexes are still the same,
+ * and if not, schedule a screen refresh, so things will be repainted. */
+void check_the_multis(filestruct *line)
 {
     const colortype *ink;
-    int nobegin = 0, noend = 0;
+    bool astart, anend;
     regmatch_t startmatch, endmatch;
 
     /* If there is no syntax or no multiline regex, there is nothing to do. */
@@ -344,38 +299,34 @@ void reset_multis(filestruct *fileptr, bool force)
 	return;
 
     for (ink = openfile->colorstrings; ink != NULL; ink = ink->next) {
-	/* If it's not a multi-line regex, amscray. */
+	/* If it's not a multiline regex, skip. */
 	if (ink->end == NULL)
 	    continue;
 
-	alloc_multidata_if_needed(fileptr);
+	alloc_multidata_if_needed(line);
 
-	if (force == FALSE) {
-	    /* Check whether the multidata still matches the current situation. */
-	    nobegin = regexec(ink->start, fileptr->data, 1, &startmatch, 0);
-	    noend = regexec(ink->end, fileptr->data, 1, &endmatch, 0);
-	    if ((fileptr->multidata[ink->id] == CWHOLELINE ||
-			fileptr->multidata[ink->id] == CNONE) &&
-			nobegin && noend)
+	astart = (regexec(ink->start, line->data, 1, &startmatch, 0) == 0);
+	anend = (regexec(ink->end, line->data, 1, &endmatch, 0) == 0);
+
+	/* Check whether the multidata still matches the current situation. */
+	if (line->multidata[ink->id] == CNONE ||
+			line->multidata[ink->id] == CWHOLELINE) {
+	    if (!astart && !anend)
 		continue;
-	    else if (fileptr->multidata[ink->id] == CSTARTENDHERE &&
-			!nobegin && !noend && startmatch.rm_so < endmatch.rm_so)
+	} else if (line->multidata[ink->id] == CSTARTENDHERE) {
+	    if (astart && anend && startmatch.rm_so < endmatch.rm_so)
 		continue;
-	    else if (fileptr->multidata[ink->id] == CBEGINBEFORE &&
-			nobegin && !noend)
+	} else if (line->multidata[ink->id] == CBEGINBEFORE) {
+	    if (!astart && anend)
 		continue;
-	    else if (fileptr->multidata[ink->id] == CENDAFTER &&
-			!nobegin && noend)
+	} else if (line->multidata[ink->id] == CENDAFTER) {
+	    if (astart && !anend)
 		continue;
 	}
 
-	/* If we got here, things have changed. */
-	reset_multis_for_id(fileptr, ink->id);
-
-	/* If start and end are the same, push the resets further. */
-	if (force == FALSE && !nobegin && !noend &&
-				startmatch.rm_so == endmatch.rm_so)
-	    reset_multis_for_id(fileptr, ink->id);
+	/* There is a mismatch, so something changed: repaint. */
+	refresh_needed = TRUE;
+	return;
     }
 }
 
@@ -398,106 +349,88 @@ void precalc_multicolorinfo(void)
 {
     const colortype *ink;
     regmatch_t startmatch, endmatch;
-    filestruct *fileptr, *endptr;
+    filestruct *line, *tailline;
 
     if (openfile->colorstrings == NULL || ISSET(NO_COLOR_SYNTAX))
 	return;
 
 #ifdef DEBUG
-    fprintf(stderr, "Entering precalculation of multiline color info\n");
+    fprintf(stderr, "Precalculating the multiline color info...\n");
 #endif
 
     for (ink = openfile->colorstrings; ink != NULL; ink = ink->next) {
 	/* If this is not a multi-line regex, skip it. */
 	if (ink->end == NULL)
 	    continue;
-#ifdef DEBUG
-	fprintf(stderr, "Starting work on color id %d\n", ink->id);
-#endif
 
-	for (fileptr = openfile->fileage; fileptr != NULL; fileptr = fileptr->next) {
-	    int startx = 0, nostart = 0;
-#ifdef DEBUG
-	    fprintf(stderr, "working on lineno %ld... ", (long)fileptr->lineno);
-#endif
-	    alloc_multidata_if_needed(fileptr);
+	for (line = openfile->fileage; line != NULL; line = line->next) {
+	    int index = 0;
 
-	    while ((nostart = regexec(ink->start, &fileptr->data[startx], 1,
-			&startmatch, (startx == 0) ? 0 : REG_NOTBOL)) == 0) {
-		/* Look for an end, and start marking how many lines are
-		 * encompassed, which should speed up rendering later. */
-		startx += startmatch.rm_eo;
-#ifdef DEBUG
-		fprintf(stderr, "start found at pos %lu... ", (unsigned long)startx);
-#endif
-		/* Look first on this line for an end. */
-		if (regexec(ink->end, &fileptr->data[startx], 1,
-			&endmatch, (startx == 0) ? 0 : REG_NOTBOL) == 0) {
-		    startx += endmatch.rm_eo;
-		    /* Step ahead when both start and end are mere anchors. */
+	    alloc_multidata_if_needed(line);
+	    /* Assume nothing applies until proven otherwise below. */
+	    line->multidata[ink->id] = CNONE;
+
+	    /* For an unpaired start match, mark all remaining lines. */
+	    if (line->prev && line->prev->multidata[ink->id] == CWOULDBE) {
+		line->multidata[ink->id] = CWOULDBE;
+		continue;
+	    }
+
+	    /* When the line contains a start match, look for an end, and if
+	     * found, mark all the lines that are affected. */
+	    while (regexec(ink->start, line->data + index, 1,
+			&startmatch, (index == 0) ? 0 : REG_NOTBOL) == 0) {
+		/* Begin looking for an end match after the start match. */
+		index += startmatch.rm_eo;
+
+		/* If there is an end match on this line, mark the line, but
+		 * continue looking for other starts after it. */
+		if (regexec(ink->end, line->data + index, 1,
+			&endmatch, (index == 0) ? 0 : REG_NOTBOL) == 0) {
+		    line->multidata[ink->id] = CSTARTENDHERE;
+		    index += endmatch.rm_eo;
+		    /* If both start and end are mere anchors, step ahead. */
 		    if (startmatch.rm_so == startmatch.rm_eo &&
-				endmatch.rm_so == endmatch.rm_eo)
-			startx += 1;
-		    fileptr->multidata[ink->id] = CSTARTENDHERE;
-#ifdef DEBUG
-		    fprintf(stderr, "end found on this line\n");
-#endif
+				endmatch.rm_so == endmatch.rm_eo) {
+			/* When at end-of-line, we're done. */
+			if (line->data[index] == '\0')
+			    break;
+			index = move_mbright(line->data, index);
+		    }
 		    continue;
 		}
 
-		/* Nice, we didn't find the end regex on this line.  Let's start looking for it. */
-		for (endptr = fileptr->next; endptr != NULL; endptr = endptr->next) {
-#ifdef DEBUG
-		    fprintf(stderr, "\nadvancing to line %ld to find end... ", (long)endptr->lineno);
-#endif
-		    if (regexec(ink->end, endptr->data, 1, &endmatch, 0) == 0)
+		/* Look for an end match on later lines. */
+		tailline = line->next;
+
+		while (tailline != NULL) {
+		    if (regexec(ink->end, tailline->data, 1, &endmatch, 0) == 0)
 			break;
+		    tailline = tailline->next;
 		}
 
-		if (endptr == NULL) {
-#ifdef DEBUG
-		    fprintf(stderr, "no end found, breaking out\n");
-#endif
+		if (tailline == NULL) {
+		    line->multidata[ink->id] = CWOULDBE;
 		    break;
 		}
-#ifdef DEBUG
-		fprintf(stderr, "end found\n");
-#endif
+
 		/* We found it, we found it, la la la la la.  Mark all
 		 * the lines in between and the end properly. */
-		fileptr->multidata[ink->id] = CENDAFTER;
-#ifdef DEBUG
-		fprintf(stderr, "marking line %ld as CENDAFTER\n", (long)fileptr->lineno);
-#endif
-		for (fileptr = fileptr->next; fileptr != endptr; fileptr = fileptr->next) {
-		    alloc_multidata_if_needed(fileptr);
-		    fileptr->multidata[ink->id] = CWHOLELINE;
-#ifdef DEBUG
-		    fprintf(stderr, "marking intermediary line %ld as CWHOLELINE\n", (long)fileptr->lineno);
-#endif
+		line->multidata[ink->id] = CENDAFTER;
+
+		for (line = line->next; line != tailline; line = line->next) {
+		    alloc_multidata_if_needed(line);
+		    line->multidata[ink->id] = CWHOLELINE;
 		}
 
-		alloc_multidata_if_needed(endptr);
-		fileptr->multidata[ink->id] = CBEGINBEFORE;
-#ifdef DEBUG
-		fprintf(stderr, "marking line %ld as CBEGINBEFORE\n", (long)fileptr->lineno);
-#endif
-		/* Skip to the end point of the match. */
-		startx = endmatch.rm_eo;
-#ifdef DEBUG
-		fprintf(stderr, "jumping to line %ld pos %lu to continue\n", (long)fileptr->lineno, (unsigned long)startx);
-#endif
-	    }
+		alloc_multidata_if_needed(tailline);
+		tailline->multidata[ink->id] = CBEGINBEFORE;
 
-	    if (nostart && startx == 0) {
-#ifdef DEBUG
-		fprintf(stderr, "no match\n");
-#endif
-		fileptr->multidata[ink->id] = CNONE;
-		continue;
+		/* Begin looking for a new start after the end match. */
+		index = endmatch.rm_eo;
 	    }
 	}
     }
 }
 
-#endif /* !DISABLE_COLOR */
+#endif /* ENABLE_COLOR */

src/cut.c

@@ -1,8 +1,7 @@
 /**************************************************************************
  *   cut.c  --  This file is part of GNU nano.                            *
  *                                                                        *
- *   Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007,  *
- *   2008, 2009, 2010, 2011, 2013, 2014 Free Software Foundation, Inc.    *
+ *   Copyright (C) 1999-2011, 2013-2017 Free Software Foundation, Inc.    *
  *   Copyright (C) 2014 Mark Majeres                                      *
  *   Copyright (C) 2016 Benno Schulenberg                                 *
  *                                                                        *
@@ -24,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? */
@@ -49,10 +47,10 @@ inline bool keeping_cutbuffer(void)
 void cut_line(void)
 {
     if (openfile->current != openfile->filebot)
-	move_to_filestruct(&cutbuffer, &cutbottom, openfile->current, 0,
+	extract_buffer(&cutbuffer, &cutbottom, openfile->current, 0,
 		openfile->current->next, 0);
     else
-	move_to_filestruct(&cutbuffer, &cutbottom, openfile->current, 0,
+	extract_buffer(&cutbuffer, &cutbottom, openfile->current, 0,
 		openfile->current, strlen(openfile->current->data));
     openfile->placewewant = 0;
 }
@@ -68,7 +66,7 @@ void cut_marked(bool *right_side_up)
     mark_order((const filestruct **)&top, &top_x,
 		(const filestruct **)&bot, &bot_x, right_side_up);
 
-    move_to_filestruct(&cutbuffer, &cutbottom, top, top_x, bot, bot_x);
+    extract_buffer(&cutbuffer, &cutbottom, top, top_x, bot, bot_x);
     openfile->placewewant = xplustabs();
 }
 
@@ -86,14 +84,14 @@ void cut_to_eol(void)
 	/* If we're not at the end of the line, move all the text from
 	 * the current position up to it, not counting the newline at
 	 * the end, into the cutbuffer. */
-	move_to_filestruct(&cutbuffer, &cutbottom, openfile->current,
+	extract_buffer(&cutbuffer, &cutbottom, openfile->current,
 		openfile->current_x, openfile->current, data_len);
     else if (openfile->current != openfile->filebot) {
 	/* If we're at the end of the line, and it isn't the last line
 	 * of the file, move all the text from the current position up
 	 * to the beginning of the next line, i.e. the newline at the
 	 * end, into the cutbuffer. */
-	move_to_filestruct(&cutbuffer, &cutbottom, openfile->current,
+	extract_buffer(&cutbuffer, &cutbottom, openfile->current,
 		openfile->current_x, openfile->current->next, 0);
 	openfile->placewewant = xplustabs();
     }
@@ -103,14 +101,14 @@ void cut_to_eol(void)
  * file into the cutbuffer. */
 void cut_to_eof(void)
 {
-    move_to_filestruct(&cutbuffer, &cutbottom,
+    extract_buffer(&cutbuffer, &cutbottom,
 		openfile->current, openfile->current_x,
 		openfile->filebot, strlen(openfile->filebot->data));
 }
 #endif /* !NANO_TINY */
 
-/* Move text from the current filestruct into the cutbuffer.  If
- * copy_text is TRUE, copy the text back into the filestruct afterward.
+/* Move text from the current buffer into the cutbuffer.  If
+ * copy_text is TRUE, copy the text back into the buffer afterward.
  * If cut_till_eof is TRUE, move all text from the current cursor
  * position to the end of the file into the cutbuffer. */
 void do_cut_text(bool copy_text, bool cut_till_eof)
@@ -131,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;
     }
@@ -156,7 +151,7 @@ void do_cut_text(bool copy_text, bool cut_till_eof)
 	/* 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))
+    } else if (ISSET(CUT_FROM_CURSOR))
 	/* Move all text up to the end of the line into the cutbuffer. */
 	cut_to_eol();
     else
@@ -172,10 +167,10 @@ void do_cut_text(bool copy_text, bool cut_till_eof)
 	if (cutbuffer != NULL) {
 	    if (cb_save != NULL) {
 		cb_save->data += cb_save_len;
-		copy_from_filestruct(cb_save);
+		copy_from_buffer(cb_save);
 		cb_save->data -= cb_save_len;
 	    } else
-		copy_from_filestruct(cutbuffer);
+		copy_from_buffer(cutbuffer);
 
 	    /* If the copied region was marked forward, put the new desired
 	     * x position at its end; otherwise, leave it at its beginning. */
@@ -193,8 +188,8 @@ void do_cut_text(bool copy_text, bool cut_till_eof)
 
     refresh_needed = TRUE;
 
-#ifndef DISABLE_COLOR
-    reset_multis(openfile->current, FALSE);
+#ifdef ENABLE_COLOR
+    check_the_multis(openfile->current);
 #endif
 
 #ifdef DEBUG
@@ -202,7 +197,7 @@ void do_cut_text(bool copy_text, bool cut_till_eof)
 #endif
 }
 
-/* Move text from the current filestruct into the cutbuffer. */
+/* Move text from the current buffer into the cutbuffer. */
 void do_cut_text_void(void)
 {
 #ifndef NANO_TINY
@@ -215,16 +210,17 @@ void do_cut_text_void(void)
 }
 
 #ifndef NANO_TINY
-/* Move text from the current filestruct into the cutbuffer, and copy it
- * back into the filestruct afterward.  If the mark is set or the cursor
+/* Move text from the current buffer into the cutbuffer, and copy it
+ * back into the buffer afterward.  If the mark is set or the cursor
  * was moved, blow away previous contents of the cutbuffer. */
 void do_copy_text(void)
 {
     static struct filestruct *next_contiguous_line = NULL;
     bool mark_set = openfile->mark_set;
 
-    /* Remember the current view port and cursor position. */
+    /* Remember the current viewport and cursor position. */
     ssize_t is_edittop_lineno = openfile->edittop->lineno;
+    size_t is_firstcolumn = openfile->firstcolumn;
     ssize_t is_current_lineno = openfile->current->lineno;
     size_t is_current_x = openfile->current_x;
 
@@ -237,8 +233,9 @@ void do_copy_text(void)
     next_contiguous_line = (mark_set ? NULL : openfile->current);
 
     if (mark_set) {
-	/* Restore the view port and cursor position. */
+	/* Restore the viewport and cursor position. */
 	openfile->edittop = fsfromline(is_edittop_lineno);
+	openfile->firstcolumn = is_firstcolumn;
 	openfile->current = fsfromline(is_current_lineno);
 	openfile->current_x = is_current_x;
     }
@@ -247,16 +244,19 @@ 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 */
 
-/* Copy text from the cutbuffer into the current filestruct. */
+/* Copy text from the cutbuffer into the current buffer. */
 void do_uncut_text(void)
 {
     ssize_t was_lineno = openfile->current->lineno;
+	/* The line number where we started the paste. */
+    size_t was_leftedge = 0;
+	/* The leftedge where we started the paste. */
 
     /* If the cutbuffer is empty, there is nothing to do. */
     if (cutbuffer == NULL)
@@ -264,17 +264,21 @@ void do_uncut_text(void)
 
 #ifndef NANO_TINY
     add_undo(PASTE);
+
+    if (ISSET(SOFTWRAP))
+	was_leftedge = leftedge_for(xplustabs(), openfile->current);
 #endif
 
-    /* Add a copy of the text in the cutbuffer to the current filestruct
+    /* Add a copy of the text in the cutbuffer to the current buffer
      * at the current cursor position. */
-    copy_from_filestruct(cutbuffer);
+    copy_from_buffer(cutbuffer);
 
 #ifndef NANO_TINY
     update_undo(PASTE);
 #endif
 
-    if (openfile->current->lineno - was_lineno < editwinrows)
+    /* If we pasted less than a screenful, don't center the cursor. */
+    if (less_than_a_screenful(was_lineno, was_leftedge))
 	focusing = FALSE;
 
     /* Set the desired x position to where the pasted text ends. */
@@ -283,15 +287,10 @@ void do_uncut_text(void)
     /* Mark the file as modified. */
     set_modified();
 
-    /* Update the cursor position to account for the inserted lines. */
-    reset_cursor();
-
-    ensure_line_is_visible();
-
     refresh_needed = TRUE;
 
-#ifndef DISABLE_COLOR
-    reset_multis(openfile->current, FALSE);
+#ifdef ENABLE_COLOR
+    check_the_multis(openfile->current);
 #endif
 
 #ifdef DEBUG

src/help.c

@@ -1,9 +1,9 @@
 /**************************************************************************
  *   help.c  --  This file is part of GNU nano.                           *
  *                                                                        *
- *   Copyright (C) 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008,  *
- *   2009, 2010, 2011, 2013, 2014 Free Software Foundation, Inc.          *
- *   Copyright (C) 2014, 2015, 2016 Benno Schulenberg                     *
+ *   Copyright (C) 2000-2011, 2013-2017 Free Software Foundation, Inc.    *
+ *   Copyright (C) 2017 Rishabh Dave                                      *
+ *   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,168 +22,265 @@
 
 #include "proto.h"
 
-#include <stdio.h>
+#include <errno.h>
 #include <string.h>
-#include <ctype.h>
 
-#ifndef DISABLE_HELP
+#ifdef ENABLE_HELP
 
 static char *help_text = NULL;
 	/* The text displayed in the help window. */
 
+static const char *start_of_body = NULL;
+	/* The point in the help text just after the title. */
+
 static char *end_of_intro = NULL;
-	/* The point in the help text where the introductory paragraphs end
-	 * and the shortcut descriptions begin. */
+	/* The point in the help text where the shortcut descriptions begin. */
+
+static size_t location;
+	/* The offset (in bytes) of the topleft of the shown help text. */
+
+char *tempfilename = NULL;
+	/* Name of the temporary file used for wrapping the help text. */
+
+/* Hard-wrap the help text, write it to the existing temporary file, and
+ * read that file into a new buffer. */
+void wrap_the_help_text(bool redisplaying)
+{
+    int sum = 0;
+    const char *ptr = start_of_body;
+    FILE *tempfile = fopen(tempfilename, "w+b");
+
+    /* If re-opening the temporary file failed, give up. */
+    if (tempfile == NULL) {
+	statusline(ALERT, _("Error writing temp file: %s"), strerror(errno));
+	return;
+    }
+
+    /* Write the body of the help_text into the temporary file. */
+    while (*ptr != '\0') {
+	int length = help_line_len(ptr);
+
+	fwrite(ptr, sizeof(char), length, tempfile);
+	ptr += length;
+
+	/* Hard-wrap the lines in the help text. */
+	if (*ptr != '\n')
+	    fwrite("\n", sizeof(char), 1, tempfile);
+	else while (*ptr == '\n')
+	    fwrite(ptr++, sizeof(char), 1, tempfile);
+    }
+
+    fclose(tempfile);
+
+    if (redisplaying)
+	close_buffer();
+
+    open_buffer(tempfilename, FALSE);
+    remove_magicline();
+
+    prepare_for_display();
+
+    /* Move to the position in the file where we were before. */
+    while (TRUE) {
+	sum += strlen(openfile->current->data);
+	if (sum > location)
+	   break;
+	openfile->current = openfile->current->next;
+    }
+
+    openfile->edittop = openfile->current;
+}
 
 /* Our main help-viewer function. */
 void do_help(void)
 {
     int kbinput = ERR;
-    bool old_no_help = ISSET(NO_HELP);
-    size_t line = 0;
-	/* The line number in help_text of the first displayed help
-	 * line.  This variable is zero-based. */
-    size_t last_line = 0;
-	/* The line number in help_text of the last help line.  This
-	 * variable is zero-based. */
-    int oldmenu = currmenu;
-	/* The menu we were called from. */
-    const char *ptr;
-	/* The current line of the help text. */
-    size_t old_line = (size_t)-1;
-	/* The line we were on before the current line. */
     functionptrtype func;
 	/* The function of the key the user typed in. */
+    int oldmenu = currmenu;
+	/* The menu we were called from. */
+#ifdef ENABLE_LINENUMBERS
+    int was_margin = margin;
+#endif
+    ssize_t was_tabsize = tabsize;
+#ifdef ENABLE_COLOR
+    char *was_syntax = syntaxstr;
+#endif
+    char *saved_answer = (answer != NULL) ? strdup(answer) : NULL;
+	/* The current answer when the user invokes help at the prompt. */
+    unsigned stash[sizeof(flags) / sizeof(flags[0])];
+	/* A storage place for the current flag settings. */
+    filestruct *line;
+    int length;
+    FILE *fp;
 
-    /* Don't show a cursor in the help screen. */
-    curs_set(0);
-    blank_edit();
     blank_statusbar();
 
-    /* Set help_text as the string to display. */
-    help_init();
+    /* Get a temporary file for the help text.  If it fails, give up. */
+    tempfilename = safe_tempfile(&fp);
+    if (tempfilename == NULL) {
+	statusline(ALERT, _("Error writing temp file: %s"), strerror(errno));
+	free(saved_answer);
+	return;
+    }
 
-    assert(help_text != NULL);
+    fclose(fp);
 
-    if (ISSET(NO_HELP)) {
-	/* Make sure that the help screen's shortcut list will actually
-	 * be displayed. */
+    /* Save the settings of all flags. */
+    memcpy(stash, flags, sizeof(flags));
+
+    /* Ensure that the help screen's shortcut list can be displayed. */
+    if (ISSET(NO_HELP) && LINES > 4) {
 	UNSET(NO_HELP);
 	window_init();
     }
 
+    /* When searching, do it forward, case insensitive, and without regexes. */
+    UNSET(BACKWARDS_SEARCH);
+    UNSET(CASE_SENSITIVE);
+    UNSET(USE_REGEXP);
+
+    UNSET(WHITESPACE_DISPLAY);
+    UNSET(NOREAD_MODE);
+    SET(MULTIBUFFER);
+
+#ifdef ENABLE_LINENUMBERS
+    UNSET(LINE_NUMBERS);
+    margin = 0;
+#endif
+    tabsize = 8;
+#ifdef ENABLE_COLOR
+    syntaxstr = "nanohelp";
+#endif
+    curs_set(0);
+
+    /* Compose the help text from all the pieces. */
+    help_init();
+    inhelp = TRUE;
+    location = 0;
+    didfind = 0;
+
     bottombars(MHELP);
     wnoutrefresh(bottomwin);
 
+    /* Extract the title from the head of the help text. */
+    length = break_line(help_text, MAX_BUF_SIZE, TRUE);
+    title = charalloc(length * sizeof(char) + 1);
+    strncpy(title, help_text, length);
+    title[length] = '\0';
+
+    titlebar(title);
+
+    /* Skip over the title to point at the start of the body text. */
+    start_of_body = help_text + length;
+    while (*start_of_body == '\n')
+	start_of_body++;
+
+    wrap_the_help_text(FALSE);
+    edit_refresh();
+
     while (TRUE) {
-	size_t i;
-
-	ptr = help_text;
-
-	/* Find the line number of the last line of the help text. */
-	for (last_line = 0; *ptr != '\0'; last_line++) {
-	    ptr += help_line_len(ptr);
-	    if (*ptr == '\n')
-		ptr++;
-	}
-
-	if (last_line > 0)
-	    last_line--;
-
-	/* Redisplay if the text was scrolled or an invalid key was pressed. */
-	if (line != old_line || kbinput == ERR) {
-	    blank_edit();
-
-	    ptr = help_text;
-
-	    /* Advance in the text to the first line to be displayed. */
-	    for (i = 0; i < line; i++) {
-		ptr += help_line_len(ptr);
-		if (*ptr == '\n')
-		    ptr++;
-	    }
-
-	    /* Now display as many lines as the window will hold. */
-	    for (i = 0; i < editwinrows && *ptr != '\0'; i++) {
-		size_t j = help_line_len(ptr);
-
-		mvwaddnstr(edit, i, 0, ptr, j);
-		ptr += j;
-		if (*ptr == '\n')
-		    ptr++;
-	    }
-	}
-
-	wnoutrefresh(edit);
-
-	old_line = line;
-
 	lastmessage = HUSH;
+	focusing = TRUE;
 
-	kbinput = get_kbinput(edit);
-
-#ifndef NANO_TINY
-	if (kbinput == KEY_WINCH) {
-	    kbinput = ERR;
-	    continue;    /* Redraw the screen. */
-	}
-#endif
-
-#ifndef DISABLE_MOUSE
-	if (kbinput == KEY_MOUSE) {
-	    int mouse_x, mouse_y;
-	    get_mouseinput(&mouse_x, &mouse_y, TRUE);
-	    continue;    /* Redraw the screen. */
-	}
-#endif
+	/* Show the cursor when we searched and found something. */
+	kbinput = get_kbinput(edit, didfind == 1);
+	didfind = 0;
 
 	func = parse_help_input(&kbinput);
 
 	if (func == total_refresh) {
 	    total_redraw();
 	} else if (func == do_up_void) {
-	    if (line > 0)
-		line--;
+	    do_up(TRUE);
 	} else if (func == do_down_void) {
-	    if (line + (editwinrows - 1) < last_line)
-		line++;
+	    if (openfile->edittop->lineno + editwinrows - 1 <
+				openfile->filebot->lineno)
+		do_down(TRUE);
 	} else if (func == do_page_up) {
-	    if (line > editwinrows - 2)
-		line -= editwinrows - 2;
-	    else
-		line = 0;
+	    do_page_up();
 	} else if (func == do_page_down) {
-	    if (line + (editwinrows - 1) < last_line)
-		line += editwinrows - 2;
+	    do_page_down();
 	} else if (func == do_first_line) {
-	    line = 0;
+	    do_first_line();
 	} else if (func == do_last_line) {
-	    if (line + (editwinrows - 1) < last_line)
-		line = last_line - (editwinrows - 1);
+	    do_last_line();
+	} else if (func == do_search_forward) {
+	    do_search();
+	    bottombars(MHELP);
+	} else if (func == do_research) {
+	    do_research();
+#ifndef NANO_TINY
+	} else if (func == do_findprevious) {
+	    do_findprevious();
+	} else if (func == do_findnext) {
+	    do_findnext();
+	} else if (kbinput == KEY_WINCH) {
+	    ; /* Nothing to do. */
+#endif
+#ifdef ENABLE_MOUSE
+	} else if (kbinput == KEY_MOUSE) {
+	    int dummy_x, dummy_y;
+	    get_mouseinput(&dummy_x, &dummy_y, TRUE);
+#endif
 	} else if (func == do_exit) {
 	    /* Exit from the help viewer. */
+	    close_buffer();
+	    curs_set(0);
 	    break;
 	} else
 	    unbound_key(kbinput);
+
+	currmenu = MHELP;
+	edit_refresh();
+
+	location = 0;
+	line = openfile->fileage;
+
+	/* Count how far (in bytes) edittop is into the file. */
+	while (line != openfile->edittop) {
+	    location += strlen(line->data);
+	    line = line->next;
+	}
     }
 
-    if (old_no_help) {
-	blank_bottombars();
-	wnoutrefresh(bottomwin);
+    /* Restore the settings of all flags. */
+    memcpy(flags, stash, sizeof(flags));
+
+#ifdef ENABLE_LINENUMBERS
+    margin = was_margin;
+#endif
+    tabsize = was_tabsize;
+#ifdef ENABLE_COLOR
+    syntaxstr = was_syntax;
+#endif
+
+    /* Switch back to the buffer we were invoked from. */
+    switch_to_prev_buffer();
+
+    if (ISSET(NO_HELP)) {
 	currmenu = oldmenu;
-	SET(NO_HELP);
 	window_init();
     } else
 	bottombars(oldmenu);
 
-#ifndef DISABLE_BROWSER
+    free(title);
+    title = NULL;
+    inhelp = FALSE;
+
+#ifdef ENABLE_BROWSER
     if (oldmenu == MBROWSER || oldmenu == MWHEREISFILE || oldmenu == MGOTODIR)
 	browser_refresh();
     else
 #endif
-	edit_refresh();
+	total_refresh();
+
+    free(answer);
+    answer = saved_answer;
+
+    remove(tempfilename);
+    free(tempfilename);
 
-    /* We're exiting from the help screen. */
     free(help_text);
 }
 
@@ -200,12 +297,6 @@ void help_init(void)
     const subnfunc *f;
     const sc *s;
 
-#ifndef NANO_TINY
-    bool old_whitespace = ISSET(WHITESPACE_DISPLAY);
-
-    UNSET(WHITESPACE_DISPLAY);
-#endif
-
     /* First, set up the initial help text for the current function. */
     if (currmenu == MWHEREIS || currmenu == MREPLACE || currmenu == MREPLACEWITH) {
 	htx[0] = N_("Search Command Help Text\n\n "
@@ -259,7 +350,7 @@ void help_init(void)
 	htx[1] = NULL;
 	htx[2] = NULL;
     }
-#ifndef DISABLE_BROWSER
+#ifdef ENABLE_BROWSER
     else if (currmenu == MBROWSER) {
 	htx[0] = N_("File Browser Help Text\n\n "
 		"The file browser is used to visually browse the "
@@ -297,8 +388,8 @@ void help_init(void)
 	htx[1] = NULL;
 	htx[2] = NULL;
     }
-#endif /* !DISABLE_BROWSER */
-#ifndef DISABLE_SPELLER
+#endif /* ENABLE_BROWSER */
+#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 "
@@ -312,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 "
@@ -370,7 +461,7 @@ void help_init(void)
      * plus one or two \n's. */
     for (f = allfuncs; f != NULL; f = f->next)
 	if (f->menus & currmenu)
-	    allocsize += (16 * mb_cur_max()) + strlen(f->help) + 2;
+	    allocsize += (16 * MAXCHARLEN) + strlen(_(f->help)) + 2;
 
 #ifndef NANO_TINY
     /* If we're on the main list, we also count the toggle help text.
@@ -385,7 +476,7 @@ void help_init(void)
     }
 #endif
 
-    /* Allocate space for the help text. */
+    /* Allocate memory for the help text. */
     help_text = charalloc(allocsize + 1);
 
     /* Now add the text we want. */
@@ -418,9 +509,9 @@ void help_init(void)
 		/* Make the first column narrower (6) than the second (10),
 		 * but allow it to spill into the second, for "M-Space". */
 		if (scsfound == 1) {
-		    sprintf(ptr, "%s              ", s->keystr);
+		    sprintf(ptr, "%s               ", s->keystr);
 		    /* Unicode arrows take three bytes instead of one. */
-		    if (s->keystr[1] == '\xE2')
+		    if (strstr(s->keystr, "\xE2") != NULL)
 			ptr += 8;
 		    else
 			ptr += 6;
@@ -465,13 +556,10 @@ void help_init(void)
 		}
 	}
     }
-
-    if (old_whitespace)
-	SET(WHITESPACE_DISPLAY);
 #endif /* !NANO_TINY */
 
-    /* If all went well, we didn't overwrite the allocated space. */
-    assert(strlen(help_text) <= allocsize + 1);
+    if (strlen(help_text) > allocsize)
+	statusline(ALERT, "Help text spilled over -- please report a bug");
 }
 
 /* Return the function that is bound to the given key, accepting certain
@@ -484,8 +572,22 @@ functionptrtype parse_help_input(int *kbinput)
 		return do_page_down;
 	    case '-':
 		return do_page_up;
+	    case 'W':
+	    case 'w':
+	    case '/':
+		return do_search_forward;
+	    case 'N':
+#ifndef NANO_TINY
+		return do_findprevious;
+#endif
+	    case 'n':
+		return do_research;
 	    case 'E':
 	    case 'e':
+	    case 'Q':
+	    case 'q':
+	    case 'X':
+	    case 'x':
 		return do_exit;
 	}
     }
@@ -521,17 +623,17 @@ size_t help_line_len(const char *ptr)
 	return 0;
 }
 
-#endif /* !DISABLE_HELP */
+#endif /* ENABLE_HELP */
 
 /* Start the help viewer. */
 void do_help_void(void)
 {
-#ifndef DISABLE_HELP
+#ifdef ENABLE_HELP
     do_help();
 #else
     if (currmenu == MMAIN)
 	say_there_is_no_help();
     else
 	beep();
-#endif /* !DISABLE_HELP */
+#endif
 }

src/history.c

@@ -0,0 +1,612 @@
+/**************************************************************************
+ *   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 XDG_DATA_FALLBACK
+#define XDG_DATA_FALLBACK "/.local/share"
+#endif
+
+#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, XDG_DATA_FALLBACK "/nano/");
+
+    if (stat(statedir, &dirstat) == -1) {
+	if (mkdir(statedir, S_IRWXU | S_IRWXG | S_IRWXO) == -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);
+	}
+	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

@@ -1,9 +1,8 @@
 /**************************************************************************
  *   move.c  --  This file is part of GNU nano.                           *
  *                                                                        *
- *   Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007,  *
- *   2008, 2009, 2010, 2011, 2013, 2014 Free Software Foundation, Inc.    *
- *   Copyright (C) 2014, 2015, 2016 Benno Schulenberg                     *
+ *   Copyright (C) 1999-2011, 2013-2017 Free Software Foundation, Inc.    *
+ *   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    *
@@ -23,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)
@@ -44,126 +42,159 @@ void do_last_line(void)
 
     /* Set the last line of the screen as the target for the cursor. */
     openfile->current_y = editwinrows - 1;
-    ensure_line_is_visible();
 
     refresh_needed = TRUE;
     focusing = FALSE;
 }
 
-/* Move up one page. */
+/* Determine the actual current chunk and the target column. */
+void get_edge_and_target(size_t *leftedge, size_t *target_column)
+{
+#ifndef NANO_TINY
+    if (ISSET(SOFTWRAP)) {
+	size_t shim = editwincols * (1 + (tabsize / editwincols));
+
+	*leftedge = leftedge_for(xplustabs(), openfile->current);
+	*target_column = (openfile->placewewant + shim - *leftedge) % editwincols;
+    } else
+#endif
+    {
+	*leftedge = 0;
+	*target_column = openfile->placewewant;
+    }
+}
+
+/* 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)
 {
-    int i, mustmove, skipped = 0;
+    int mustmove = (editwinrows < 3) ? 1 : editwinrows - 2;
+    size_t leftedge, target_column;
 
-    /* If the cursor is less than a page away from the top of the file,
-     * put it at the beginning of the first line. */
-    if (openfile->current->lineno == 1 || (!ISSET(SOFTWRAP) &&
-		openfile->current->lineno <= editwinrows - 2)) {
+    /* If we're not in smooth scrolling mode, put the cursor at the
+     * beginning of the top line of the edit window, as Pico does. */
+    if (!ISSET(SMOOTH_SCROLL)) {
+	openfile->current = openfile->edittop;
+	leftedge = openfile->firstcolumn;
+	openfile->current_y = 0;
+	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. */
+    if (go_back_chunks(mustmove, &openfile->current, &leftedge) > 0) {
 	do_first_line();
 	return;
     }
 
-    /* If we're not in smooth scrolling mode, put the cursor at the
-     * beginning of the top line of the edit window, as Pico does. */
-    if (!ISSET(SMOOTH_SCROLL)) {
-	openfile->current = openfile->edittop;
-	openfile->placewewant = openfile->current_y = 0;
-    }
+    set_proper_index_and_pww(&leftedge, target_column, FALSE);
 
-    mustmove = (editwinrows < 3) ? 1 : editwinrows - 2;
-
-    for (i = mustmove; i - skipped > 0 && openfile->current != openfile->fileage; i--) {
-	openfile->current = openfile->current->prev;
-#ifndef NANO_TINY
-	if (ISSET(SOFTWRAP) && openfile->current) {
-	    skipped += strlenpt(openfile->current->data) / editwincols;
-#ifdef DEBUG
-	    fprintf(stderr, "paging up: i = %d, skipped = %d based on line %ld len %lu\n",
-			i, skipped, (long)openfile->current->lineno, (unsigned long)strlenpt(openfile->current->data));
-#endif
-	}
-#endif
-    }
-
-    openfile->current_x = actual_x(openfile->current->data,
-					openfile->placewewant);
-
-    /* Scroll the edit window up a page. */
+    /* Move the viewport so that the cursor stays immobile, if possible. */
     adjust_viewport(STATIONARY);
     refresh_needed = TRUE;
 }
 
-/* Move down one page. */
+/* Move down nearly one screenful. */
 void do_page_down(void)
 {
-    int i, mustmove;
+    int mustmove = (editwinrows < 3) ? 1 : editwinrows - 2;
+    size_t leftedge, target_column;
 
-    /* If the cursor is less than a page away from the bottom of the file,
-     * put it at the end of the last line. */
-    if (openfile->current->lineno + maxrows - 2 >= openfile->filebot->lineno) {
+    /* If we're not in smooth scrolling mode, put the cursor at the
+     * beginning of the top line of the edit window, as Pico does. */
+    if (!ISSET(SMOOTH_SCROLL)) {
+	openfile->current = openfile->edittop;
+	leftedge = openfile->firstcolumn;
+	openfile->current_y = 0;
+	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. */
+    if (go_forward_chunks(mustmove, &openfile->current, &leftedge) > 0) {
 	do_last_line();
 	return;
     }
 
-    /* If we're not in smooth scrolling mode, put the cursor at the
-     * beginning of the top line of the edit window, as Pico does. */
-    if (!ISSET(SMOOTH_SCROLL)) {
-	openfile->current = openfile->edittop;
-	openfile->placewewant = openfile->current_y = 0;
-    }
+    set_proper_index_and_pww(&leftedge, target_column, TRUE);
 
-    mustmove = (maxrows < 3) ? 1 : maxrows - 2;
-
-    for (i = mustmove; i > 0 && openfile->current != openfile->filebot; i--) {
-	openfile->current = openfile->current->next;
-#ifdef DEBUG
-	fprintf(stderr, "paging down: moving to line %lu\n", (unsigned long)openfile->current->lineno);
-#endif
-
-    }
-
-    openfile->current_x = actual_x(openfile->current->data,
-					openfile->placewewant);
-
-    /* Scroll the edit window down a page. */
+    /* Move the viewport so that the cursor stays immobile, if possible. */
     adjust_viewport(STATIONARY);
     refresh_needed = TRUE;
 }
 
-#ifndef DISABLE_JUSTIFY
-/* Move up to the beginning of the last beginning-of-paragraph line
- * before the current line.  If allow_update is TRUE, update the screen
- * afterwards. */
-void do_para_begin(bool allow_update)
+#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 (allow_update)
-	edit_redraw(was_current);
-}
-
-/* Move up to the beginning of the last beginning-of-paragraph line
- * before the current line, and update the screen afterwards. */
-void do_para_begin_void(void)
-{
-    do_para_begin(TRUE);
+    if (update_screen)
+	edit_redraw(was_current, CENTERING);
 }
 
 /* Move down to the beginning of the last line of the current paragraph.
  * Then move down one line farther if there is such a line, or to the
- * end of the current line if not.  If allow_update is TRUE, update the
+ * end of the current line if not.  If update_screen is TRUE, update the
  * screen afterwards.  A line is the last line of a paragraph if it is
  * in a paragraph, and the next line either is the beginning line of a
  * paragraph or isn't in a paragraph. */
-void do_para_end(bool allow_update)
+void do_para_end(bool update_screen)
 {
     filestruct *was_current = openfile->current;
 
@@ -183,20 +214,24 @@ void do_para_end(bool allow_update)
     } else
 	openfile->current_x = strlen(openfile->current->data);
 
-    if (allow_update)
-	edit_redraw(was_current);
+    if (update_screen)
+	edit_redraw(was_current, CENTERING);
 }
 
-/* Move down to the beginning of the last line of the current paragraph.
- * Then move down one line farther if there is such a line, or to the
- * end of the current line if not, and update the screen afterwards. */
+/* 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. */
 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;
@@ -215,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;
@@ -233,19 +268,16 @@ 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 allow_update is TRUE, update the
- * screen afterwards. */
-void do_prev_word(bool allow_punct, bool allow_update)
+/* 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;
     bool seen_a_word = FALSE, step_forward = FALSE;
 
-    assert(openfile->current != NULL && openfile->current->data != NULL);
-
     /* Move backward until we pass over the start of a word. */
     while (TRUE) {
 	/* If at the head of a line, move to the end of the preceding one. */
@@ -278,38 +310,25 @@ void do_prev_word(bool allow_punct, bool allow_update)
 	openfile->current_x = move_mbright(openfile->current->data,
 						openfile->current_x);
 
-    /* If allow_update is TRUE, update the screen. */
-    if (allow_update) {
-	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 allow_update is TRUE, update the
- * screen afterwards.  Return TRUE if we started on a word, and FALSE
- * otherwise. */
-bool do_next_word(bool allow_punct, bool allow_update)
+/* 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;
     bool started_on_word = is_word_mbchar(openfile->current->data +
 				openfile->current_x, allow_punct);
     bool seen_space = !started_on_word;
 
-    assert(openfile->current != NULL && openfile->current->data != NULL);
-
     /* Move forward until we reach the start of a word. */
     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;
@@ -330,16 +349,20 @@ bool do_next_word(bool allow_punct, bool allow_update)
 	    break;
     }
 
-    /* If allow_update is TRUE, update the screen. */
-    if (allow_update) {
-	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)
@@ -347,195 +370,190 @@ void do_next_word_void(void)
     do_next_word(ISSET(WORD_BOUNDS), TRUE);
 }
 
-/* Make sure that the current line, when it is partially scrolled off the
- * screen in softwrap mode, is scrolled fully into view. */
-void ensure_line_is_visible(void)
-{
-#ifndef NANO_TINY
-    if (ISSET(SOFTWRAP) && strlenpt(openfile->current->data) / editwincols +
-				openfile->current_y >= editwinrows) {
-	adjust_viewport(ISSET(SMOOTH_SCROLL) ? FLOWING : CENTERING);
-	refresh_needed = TRUE;
-    }
-#endif
-}
-
-/* Move to the beginning of the current line.  If the SMART_HOME flag is
- * set, move to the first non-whitespace character of the current line
- * if we aren't already there, or to the beginning of the current line
- * if we are. */
+/* Move to the beginning of the current line (or softwrapped chunk).
+ * 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 = xplustabs();
-
+    bool moved_off_chunk = TRUE;
 #ifndef NANO_TINY
+    bool moved = FALSE;
+    size_t leftedge = 0, leftedge_x = 0;
+
+    if (ISSET(SOFTWRAP)) {
+	leftedge = leftedge_for(was_column, openfile->current);
+	leftedge_x = proper_x(openfile->current, &leftedge, FALSE, leftedge,
+				NULL);
+    }
+
     if (ISSET(SMART_HOME)) {
-	size_t current_x_save = openfile->current_x;
+	size_t indent_x = indent_length(openfile->current->data);
 
-	openfile->current_x = indent_length(openfile->current->data);
+	if (openfile->current->data[indent_x] != '\0') {
+	    /* If we're exactly on the indent, move fully home.  Otherwise,
+	     * when not softwrapping or not after the first nonblank chunk,
+	     * move to the first nonblank character. */
+	    if (openfile->current_x == indent_x) {
+		openfile->current_x = 0;
+		moved = TRUE;
+	    } else if (!ISSET(SOFTWRAP) || leftedge_x <= indent_x) {
+		openfile->current_x = indent_x;
+		moved = TRUE;
+	    }
+	}
+    }
 
-	if (openfile->current_x == current_x_save ||
-		openfile->current->data[openfile->current_x] == '\0')
+    if (!moved && ISSET(SOFTWRAP)) {
+	/* If already at the left edge of the screen, move fully home.
+	 * Otherwise, move to the left edge. */
+	if (openfile->current_x == leftedge_x)
 	    openfile->current_x = 0;
-    } else
+	else {
+	    openfile->current_x = leftedge_x;
+	    openfile->placewewant = leftedge;
+	    moved_off_chunk = FALSE;
+	}
+    } else if (!moved)
 #endif
 	openfile->current_x = 0;
 
-    openfile->placewewant = xplustabs();
+    if (moved_off_chunk)
+	openfile->placewewant = xplustabs();
 
-    if (need_horizontal_scroll(was_column, openfile->placewewant))
+    /* 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)
+	edit_redraw(was_current, FLOWING);
+    else if (line_needs_update(was_column, openfile->placewewant))
 	update_line(openfile->current, openfile->current_x);
 }
 
-/* Move to the end of the current line. */
+/* Move to the end of the current line (or softwrapped chunk).
+ * 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 = xplustabs();
+    size_t line_len = strlen(openfile->current->data);
+    bool moved_off_chunk = TRUE;
 
-    openfile->current_x = strlen(openfile->current->data);
-    openfile->placewewant = xplustabs();
+#ifndef NANO_TINY
+    if (ISSET(SOFTWRAP)) {
+	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 (need_horizontal_scroll(was_column, openfile->placewewant))
+	/* 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)
+	    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;
+
+    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)
+	edit_redraw(was_current, FLOWING);
+    else if (line_needs_update(was_column, openfile->placewewant))
 	update_line(openfile->current, openfile->current_x);
-
-    ensure_line_is_visible();
 }
 
-/* If scroll_only is FALSE, move up one line.  If scroll_only is TRUE,
- * scroll up one line without scrolling the cursor. */
+/* 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)
 {
-    size_t was_column = xplustabs();
+    filestruct *was_current = openfile->current;
+    size_t leftedge, target_column;
 
-    /* If we're at the top of the file, or if scroll_only is TRUE and
-     * the top of the file is onscreen, get out. */
-    if (openfile->current == openfile->fileage ||
-		(scroll_only && openfile->edittop == openfile->fileage))
+    /* When just scrolling and the top of the file is onscreen, get out. */
+    if (scroll_only && openfile->edittop == openfile->fileage &&
+			openfile->firstcolumn == 0)
 	return;
 
-    assert(ISSET(SOFTWRAP) || openfile->current_y == openfile->current->lineno - openfile->edittop->lineno);
+    get_edge_and_target(&leftedge, &target_column);
 
-    /* Move the current line of the edit window up. */
-    openfile->current = openfile->current->prev;
-    openfile->current_x = actual_x(openfile->current->data,
-					openfile->placewewant);
+    /* If we can't move up one line or chunk, we're at top of file. */
+    if (go_back_chunks(1, &openfile->current, &leftedge) > 0)
+	return;
 
-    /* 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->next == openfile->edittop || scroll_only)
-	edit_scroll(UPWARD, (ISSET(SMOOTH_SCROLL) || scroll_only) ?
-				1 : editwinrows / 2 + 1);
+    set_proper_index_and_pww(&leftedge, target_column, FALSE);
 
-    /* If the lines weren't already redrawn, see if they need to be. */
-    if (openfile->current_y > 0) {
-	/* Redraw the prior line if it was horizontally scrolled. */
-	if (need_horizontal_scroll(was_column, 0))
-	    update_line(openfile->current->next, 0);
-	/* Redraw the current line if it needs to be horizontally scrolled. */
-	if (need_horizontal_scroll(0, xplustabs()))
-	    update_line(openfile->current, openfile->current_x);
-    }
+    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;
 }
 
-/* Move up one line. */
+/* Move the cursor to next line or chunk.  If scroll_only is TRUE, also
+ * scroll the screen one row, so the cursor stays in the same spot. */
+void do_down(bool scroll_only)
+{
+    filestruct *was_current = openfile->current;
+    size_t leftedge, target_column;
+
+    get_edge_and_target(&leftedge, &target_column);
+
+    /* If we can't move down one line or chunk, we're at bottom of file. */
+    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;
+}
+
+/* Move up one line or chunk. */
 void do_up_void(void)
 {
     do_up(FALSE);
 }
 
-/* If scroll_only is FALSE, move down one line.  If scroll_only is TRUE,
- * scroll down one line without scrolling the cursor. */
-void do_down(bool scroll_only)
-{
-#ifndef NANO_TINY
-    int amount = 0, enough;
-    filestruct *topline;
-#endif
-    size_t was_column = xplustabs();
-
-    /* If we're at the bottom of the file, get out. */
-    if (openfile->current == openfile->filebot)
-	return;
-
-    assert(ISSET(SOFTWRAP) || openfile->current_y ==
-		openfile->current->lineno - openfile->edittop->lineno);
-    assert(openfile->current->next != NULL);
-
-#ifndef NANO_TINY
-    if (ISSET(SOFTWRAP)) {
-	/* Compute the number of lines to scroll. */
-	amount = strlenpt(openfile->current->data) / editwincols -
-			xplustabs() / editwincols +
-			strlenpt(openfile->current->next->data) / editwincols +
-			openfile->current_y - editwinrows + 2;
-	topline = openfile->edittop;
-	/* Reduce the amount when there are overlong lines at the top. */
-	for (enough = 1; enough < amount; enough++) {
-	    amount -= strlenpt(topline->data) / editwincols;
-	    if (amount > 0)
-		topline = topline->next;
-	    if (amount < enough) {
-		amount = enough;
-		break;
-	    }
-	}
-    }
-#endif
-
-    /* Move to the next line in the file. */
-    openfile->current = openfile->current->next;
-    openfile->current_x = actual_x(openfile->current->data,
-					openfile->placewewant);
-
-    /* If scroll_only is FALSE and if we're on the last line of the
-     * edit window, scroll the edit window down one line if we're in
-     * smooth scrolling mode, or down half a page if we're not.  If
-     * scroll_only is TRUE, scroll the edit window down one line
-     * unconditionally. */
-#ifndef NANO_TINY
-    if (openfile->current_y == editwinrows - 1 || amount > 0 || scroll_only) {
-	if (amount < 1 || scroll_only)
-	    amount = 1;
-
-	edit_scroll(DOWNWARD, (ISSET(SMOOTH_SCROLL) || scroll_only) ?
-				amount : editwinrows / 2 + 1);
-
-	if (ISSET(SOFTWRAP)) {
-	    refresh_needed = TRUE;
-	    return;
-	}
-    }
-#else
-    if (openfile->current_y == editwinrows - 1)
-	edit_scroll(DOWNWARD, editwinrows / 2 + 1);
-#endif
-
-    /* If the lines weren't already redrawn, see if they need to be. */
-    if (openfile->current_y < editwinrows - 1) {
-	/* Redraw the prior line if it was horizontally scrolled. */
-	if (need_horizontal_scroll(was_column, 0))
-	    update_line(openfile->current->prev, 0);
-	/* Redraw the current line if it needs to be horizontally scrolled. */
-	if (need_horizontal_scroll(0, xplustabs()))
-	    update_line(openfile->current, openfile->current_x);
-    }
-}
-
-/* Move down one line. */
+/* Move down one line or chunk. */
 void do_down_void(void)
 {
     do_down(FALSE);
 }
 
 #ifndef NANO_TINY
-/* Scroll up one line without scrolling the cursor. */
+/* Scroll up one line or chunk without scrolling the cursor. */
 void do_scroll_up(void)
 {
     do_up(TRUE);
 }
 
-/* Scroll down one line without scrolling the cursor. */
+/* Scroll down one line or chunk without scrolling the cursor. */
 void do_scroll_down(void)
 {
     do_down(TRUE);
@@ -545,47 +563,31 @@ void do_scroll_down(void)
 /* Move left one character. */
 void do_left(void)
 {
-    size_t was_column = xplustabs();
+    filestruct *was_current = openfile->current;
 
     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();
+	openfile->current = openfile->current->prev;
 	openfile->current_x = strlen(openfile->current->data);
     }
 
-    openfile->placewewant = xplustabs();
-
-    if (need_horizontal_scroll(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();
-
-    assert(openfile->current_x <= strlen(openfile->current->data));
+    filestruct *was_current = openfile->current;
 
     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) {
+	openfile->current = openfile->current->next;
 	openfile->current_x = 0;
-#ifndef NANO_TINY
-	if (ISSET(SOFTWRAP))
-	    openfile->current_y -= strlenpt(openfile->current->data) / editwincols;
-#endif
     }
 
-    openfile->placewewant = xplustabs();
-
-    if (need_horizontal_scroll(was_column, openfile->placewewant))
-	update_line(openfile->current, openfile->current_x);
-
-    if (openfile->current_x == 0)
-	do_down_void();
-    else
-	ensure_line_is_visible();
+    edit_redraw(was_current, FLOWING);
 }

src/nano.h

@@ -1,9 +1,8 @@
 /**************************************************************************
  *   nano.h  --  This file is part of GNU nano.                           *
  *                                                                        *
- *   Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007,  *
- *   2008, 2009, 2010, 2011, 2013, 2014 Free Software Foundation, Inc.    *
- *   Copyright (C) 2014, 2015, 2016 Benno Schulenberg                     *
+ *   Copyright (C) 1999-2011, 2013-2017 Free Software Foundation, Inc.    *
+ *   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    *
@@ -49,10 +48,6 @@
 #include <sys/param.h>
 #endif
 
-#ifdef HAVE_STDARG_H
-#include <stdarg.h>
-#endif
-
 /* Suppress warnings for __attribute__((warn_unused_result)). */
 #define IGNORE_CALL_RESULT(call) do { if (call) {} } while(0)
 
@@ -70,6 +65,13 @@
 #define charmove(dest, src, n) memmove(dest, src, (n) * sizeof(char))
 #define charset(dest, src, n) memset(dest, src, (n) * sizeof(char))
 
+/* In UTF-8 a character is at most six bytes long. */
+#ifdef ENABLE_UTF8
+#define MAXCHARLEN 6
+#else
+#define MAXCHARLEN 1
+#endif
+
 /* Set a default value for PATH_MAX if there isn't one. */
 #ifndef PATH_MAX
 #define PATH_MAX 4096
@@ -116,56 +118,30 @@
 #include <sys/types.h>
 #include <sys/stat.h>
 #include <dirent.h>
-#ifdef HAVE_REGEX_H
 #include <regex.h>
-#endif
 #include <signal.h>
 #include <assert.h>
 
-/* If no vsnprintf(), use the version from glib 2.x. */
-#ifndef HAVE_VSNPRINTF
-#include <glib.h>
-#define vsnprintf g_vsnprintf
-#endif
-
-/* If no isblank(), iswblank(), strcasecmp(), strncasecmp(),
- * strcasestr(), strnlen(), getdelim(), or getline(), use the versions
- * we have. */
-#ifndef HAVE_ISBLANK
-#define isblank nisblank
-#endif
-#ifndef HAVE_ISWBLANK
-#define iswblank niswblank
-#endif
-#ifndef HAVE_STRCASECMP
-#define strcasecmp nstrcasecmp
-#endif
-#ifndef HAVE_STRNCASECMP
-#define strncasecmp nstrncasecmp
-#endif
-#ifndef HAVE_STRCASESTR
-#define strcasestr nstrcasestr
-#endif
-#ifndef HAVE_STRNLEN
-#define strnlen nstrnlen
-#endif
-#ifndef HAVE_GETDELIM
-#define getdelim ngetdelim
-#endif
-#ifndef HAVE_GETLINE
-#define getline ngetline
-#endif
-
-/* If we aren't using ncurses with mouse support, turn the mouse support
- * off, as it's useless then. */
+/* If we aren't using an ncurses with mouse support, exclude any
+ * mouse routines, as they are useless then. */
 #ifndef NCURSES_MOUSE_VERSION
-#define DISABLE_MOUSE 1
+#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
@@ -183,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. */
@@ -252,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;
@@ -288,7 +263,9 @@ typedef struct lintstruct {
 	/* Whole line engulfed by the regex, start < me, end > me. */
 #define CSTARTENDHERE	(1<<5)
 	/* Regex starts and ends within this line. */
-#endif /* !DISABLE_COLOR */
+#define CWOULDBE	(1<<6)
+	/* An unpaired start match on or before this line. */
+#endif /* ENABLE_COLOR */
 
 /* More structure types. */
 typedef struct filestruct {
@@ -300,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
@@ -330,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;
 
@@ -364,7 +343,7 @@ typedef struct undo {
 } undo;
 #endif /* !NANO_TINY */
 
-#ifndef DISABLE_HISTORIES
+#ifdef ENABLE_HISTORIES
 typedef struct poshiststruct {
     char *filename;
 	/* The file. */
@@ -389,6 +368,9 @@ typedef struct openfilestruct {
 	/* The current line for this file. */
     size_t totsize;
 	/* The file's total number of characters. */
+    size_t firstcolumn;
+	/* The starting column of the top line of the edit window.
+	 * When not in softwrap mode, it's always zero. */
     size_t current_x;
 	/* The file's x-coordinate position. */
     size_t placewewant;
@@ -419,7 +401,7 @@ typedef struct openfilestruct {
     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;
@@ -431,7 +413,7 @@ typedef struct openfilestruct {
 	/* The preceding open file, if any. */
 } openfilestruct;
 
-#ifndef DISABLE_NANORC
+#ifdef ENABLE_NANORC
 typedef struct rcoption {
     const char *name;
 	/* The name of the rcfile option. */
@@ -469,7 +451,7 @@ typedef struct subnfunc {
 	/* In what menus this function applies. */
     const char *desc;
 	/* The function's short description, for example "Where Is". */
-#ifndef DISABLE_HELP
+#ifdef ENABLE_HELP
     const char *help;
 	/* The help-screen text for this function. */
     bool blank_after;
@@ -496,6 +478,7 @@ enum
 {
     TITLE_BAR = 0,
     LINE_NUMBER,
+    SELECTED_TEXT,
     STATUS_BAR,
     KEY_COMBO,
     FUNCTION_TAG,
@@ -507,7 +490,7 @@ enum
 {
     DONTUSE,
     CASE_SENSITIVE,
-    CONST_UPDATE,
+    CONSTANT_SHOW,
     NO_HELP,
     SUSPEND,
     NO_WRAP,
@@ -516,7 +499,7 @@ enum
     USE_MOUSE,
     USE_REGEXP,
     TEMP_FILE,
-    CUT_TO_END,
+    CUT_FROM_CURSOR,
     BACKWARDS_SEARCH,
     MULTIBUFFER,
     SMOOTH_SCROLL,
@@ -545,7 +528,9 @@ enum
     MAKE_IT_UNIX,
     JUSTIFY_TRIM,
     SHOW_CURSOR,
-    LINE_NUMBERS
+    LINE_NUMBERS,
+    NO_PAUSES,
+    AT_BLANKS
 };
 
 /* Flags for the menus in which a given function should be present. */
@@ -564,9 +549,15 @@ enum
 #define MGOTODIR		(1<<12)
 #define MYESNO			(1<<13)
 #define MLINTER			(1<<14)
+#define MFINDINHELP		(1<<15)
 /* This is an abbreviation for all menus except Help and YesNo. */
 #define MMOST  (MMAIN|MWHEREIS|MREPLACE|MREPLACEWITH|MGOTOLINE|MWRITEFILE|MINSERTFILE|\
-		MEXTCMD|MBROWSER|MWHEREISFILE|MGOTODIR|MSPELL|MLINTER)
+		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
@@ -578,18 +569,35 @@ enum
 #define CONTROL_RIGHT 0x402
 #define CONTROL_UP 0x403
 #define CONTROL_DOWN 0x404
-#define SHIFT_CONTROL_LEFT 0x405
-#define SHIFT_CONTROL_RIGHT 0x406
-#define SHIFT_CONTROL_UP 0x407
-#define SHIFT_CONTROL_DOWN 0x408
-#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). */
@@ -613,6 +621,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

@@ -1,8 +1,7 @@
 /**************************************************************************
  *   prompt.c  --  This file is part of GNU nano.                         *
  *                                                                        *
- *   Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007,  *
- *   2008, 2009, 2010, 2011, 2013, 2014 Free Software Foundation, Inc.    *
+ *   Copyright (C) 1999-2011, 2013-2017 Free Software Foundation, Inc.    *
  *   Copyright (C) 2016 Benno Schulenberg                                 *
  *                                                                        *
  *   GNU nano is free software: you can redistribute it and/or modify     *
@@ -22,8 +21,6 @@
 
 #include "proto.h"
 
-#include <stdio.h>
-#include <stdarg.h>
 #include <string.h>
 
 static char *prompt = NULL;
@@ -51,19 +48,19 @@ 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)
 	return KEY_WINCH;
 #endif
 
-#ifndef DISABLE_MOUSE
+#ifdef ENABLE_MOUSE
     /* If we got a mouse click and it was on a shortcut, read in the
      * shortcut character. */
     if (input == KEY_MOUSE) {
 	if (do_statusbar_mouse() == 1)
-	    input = get_kbinput(bottomwin);
+	    input = get_kbinput(bottomwin, BLIND);
 	else
 	    return ERR;
     }
@@ -96,7 +93,7 @@ int do_statusbar_input(bool *ran_func, bool *finished)
 	    kbinput = (int *)nrealloc(kbinput, kbinput_len * sizeof(int));
 	    kbinput[kbinput_len - 1] = input;
 	}
-     }
+    }
 
     /* If we got a shortcut, or if there aren't any other keystrokes waiting
      * after the one we read in, we need to insert all the characters in the
@@ -138,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
@@ -165,7 +165,7 @@ int do_statusbar_input(bool *ran_func, bool *finished)
     return input;
 }
 
-#ifndef DISABLE_MOUSE
+#ifdef ENABLE_MOUSE
 /* Handle a mouse click on the statusbar prompt or the shortcut list. */
 int do_statusbar_mouse(void)
 {
@@ -197,7 +197,7 @@ void do_statusbar_output(int *the_input, size_t input_len,
 	bool filtering)
 {
     char *output = charalloc(input_len + 1);
-    char *char_buf = charalloc(mb_cur_max());
+    char onechar[MAXCHARLEN];
     int i, char_len;
 
     /* Copy the typed stuff so it can be treated. */
@@ -213,7 +213,7 @@ void do_statusbar_output(int *the_input, size_t input_len,
 	    output[i] = '\n';
 
 	/* Interpret the next multibyte character. */
-	char_len = parse_mbchar(output + i, char_buf, NULL);
+	char_len = parse_mbchar(output + i, onechar, NULL);
 
 	i += char_len;
 
@@ -225,12 +225,11 @@ void do_statusbar_output(int *the_input, size_t input_len,
 	answer = charealloc(answer, strlen(answer) + char_len + 1);
 	charmove(answer + statusbar_x + char_len, answer + statusbar_x,
 				strlen(answer) - statusbar_x + 1);
-	strncpy(answer + statusbar_x, char_buf, char_len);
+	strncpy(answer + statusbar_x, onechar, char_len);
 
 	statusbar_x += char_len;
     }
 
-    free(char_buf);
     free(output);
 
     update_the_statusbar();
@@ -293,10 +292,10 @@ 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;
 
-    null_at(&answer, statusbar_x);
+    answer[statusbar_x] = '\0';
 
     update_the_statusbar();
 }
@@ -365,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
@@ -385,35 +401,18 @@ void reinit_statusbar_x(void)
     statusbar_x = HIGHEST_POSITIVE;
 }
 
-/* Put the cursor in the answer at statusbar_x. */
-void reset_statusbar_cursor(void)
-{
-    size_t start_col = strlenpt(prompt) + 2;
-    size_t xpt = statusbar_xplustabs();
-
-    /* Work around a cursor-misplacement bug in VTEs. */
-    wmove(bottomwin, 0, 0);
-    wnoutrefresh(bottomwin);
-    doupdate();
-
-    wmove(bottomwin, 0, start_col + xpt -
-			get_statusbar_page_start(start_col, start_col + xpt));
-
-    wnoutrefresh(bottomwin);
-}
-
-/* Repaint the statusbar. */
+/* Redraw the promptbar and place the cursor at the right spot. */
 void update_the_statusbar(void)
 {
-    size_t base, the_page, end_page;
+    size_t base = strlenpt(prompt) + 2;
+    size_t the_page, end_page, column;
     char *expanded;
 
-    base = strlenpt(prompt) + 2;
     the_page = get_statusbar_page_start(base, base + strnlenpt(answer, statusbar_x));
     end_page = get_statusbar_page_start(base, base + strlenpt(answer) - 1);
 
+    /* Color the promptbar over its full width. */
     wattron(bottomwin, interface_color_pair[TITLE_BAR]);
-
     blank_statusbar();
 
     mvwaddstr(bottomwin, 0, 0, prompt);
@@ -428,56 +427,49 @@ void update_the_statusbar(void)
 
     wattroff(bottomwin, interface_color_pair[TITLE_BAR]);
 
-    reset_statusbar_cursor();
+    /* Work around a cursor-misplacement bug in VTEs. */
+    wmove(bottomwin, 0, 0);
+    wrefresh(bottomwin);
+
+    /* Place the cursor at statusbar_x in the answer. */
+    column = base + statusbar_xplustabs();
+    wmove(bottomwin, 0, column - get_statusbar_page_start(base, column));
+    wnoutrefresh(bottomwin);
 }
 
 /* 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;
     bool ran_func, finished;
     functionptrtype func;
-#ifndef DISABLE_TABCOMP
+#ifdef ENABLE_TABCOMP
     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;
 	/* The temporary string typed at the bottom of the history, if
 	 * any. */
-#ifndef DISABLE_TABCOMP
+#ifdef ENABLE_TABCOMP
     int last_kbinput = ERR;
 	/* The key we pressed before the current key. */
     size_t complete_len = 0;
 	/* 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();
 
-    /* Refresh edit window and statusbar before getting input. */
-    wnoutrefresh(edit);
-    wnoutrefresh(bottomwin);
-
     while (TRUE) {
-	/* Ensure the cursor is shown when waiting for input. */
-	curs_set(1);
-
 	kbinput = do_statusbar_input(&ran_func, &finished);
 
 #ifndef NANO_TINY
@@ -485,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;
@@ -497,12 +489,12 @@ functionptrtype acquire_an_answer(int *actual, bool allow_tabs,
 	if (func == do_cancel || func == do_enter)
 	    break;
 
-#ifndef DISABLE_TABCOMP
+#ifdef ENABLE_TABCOMP
 	if (func != do_tab)
 	    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);
@@ -518,8 +510,8 @@ functionptrtype acquire_an_answer(int *actual, bool allow_tabs,
 		answer = input_tab(answer, allow_files, &statusbar_x,
 					&tabbed, refresh_func, listed);
 	} else
-#endif /* !DISABLE_TABCOMP */
-#ifndef DISABLE_HISTORIES
+#endif /* ENABLE_TABCOMP */
+#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
@@ -565,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
@@ -582,12 +574,12 @@ functionptrtype acquire_an_answer(int *actual, bool allow_tabs,
 
 	update_the_statusbar();
 
-#if !defined(DISABLE_HISTORIES) && !defined(DISABLE_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);
@@ -612,18 +604,16 @@ 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;
     int retval;
     functionptrtype func = NULL;
     bool listed = FALSE;
-    /* Save a possible current statusbar x position. */
+    /* Save a possible current statusbar x position and prompt. */
     size_t was_statusbar_x = statusbar_x;
+    char *saved_prompt = prompt;
 
     bottombars(menu);
 
@@ -632,21 +622,17 @@ int do_prompt(bool allow_tabs, bool allow_files,
 #ifndef NANO_TINY
   redo_theprompt:
 #endif
-    prompt = charalloc((COLS * mb_cur_max()) + 1);
+    prompt = charalloc((COLS * MAXCHARLEN) + 1);
     va_start(ap, msg);
-    vsnprintf(prompt, COLS * mb_cur_max(), msg, ap);
+    vsnprintf(prompt, COLS * MAXCHARLEN, msg, ap);
     va_end(ap);
     /* Reserve five columns for colon plus angles plus answer, ":<aa>". */
-    null_at(&prompt, actual_x(prompt, (COLS < 5) ? 0 : COLS - 5));
+    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 = NULL;
+    prompt = saved_prompt;
 
 #ifndef NANO_TINY
     if (retval == KEY_WINCH)
@@ -668,11 +654,7 @@ int do_prompt(bool allow_tabs, bool allow_files,
     blank_statusbar();
     wnoutrefresh(bottomwin);
 
-#ifdef DEBUG
-    fprintf(stderr, "answer = \"%s\"\n", answer);
-#endif
-
-#ifndef DISABLE_TABCOMP
+#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. */
     if (listed)
@@ -691,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");
@@ -703,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)
@@ -718,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. */
@@ -741,19 +722,21 @@ 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;
-#ifndef DISABLE_MOUSE
+#ifdef ENABLE_MOUSE
 	else if (kbinput == KEY_MOUSE) {
 	    int mouse_x, mouse_y;
 	    /* We can click on the Yes/No/All shortcuts to select an answer. */
@@ -761,30 +744,16 @@ 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)
 		    response = -2;
 	    }
 	}
-#endif /* !DISABLE_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;
-	}
+#endif /* ENABLE_MOUSE */
     }
 
     free(message);

src/proto.h

@@ -1,8 +1,7 @@
 /**************************************************************************
  *   proto.h  --  This file is part of GNU nano.                          *
  *                                                                        *
- *   Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007,  *
- *   2008, 2009, 2010, 2011, 2013, 2014 Free Software Foundation, Inc.    *
+ *   Copyright (C) 1999-2011, 2013-2017 Free Software Foundation, Inc.    *
  *                                                                        *
  *   GNU nano is free software: you can redistribute it and/or modify     *
  *   it under the terms of the GNU General Public License as published    *
@@ -25,6 +24,7 @@
 #include "nano.h"
 
 /* All external variables.  See global.c for their descriptions. */
+
 #ifndef NANO_TINY
 extern volatile sig_atomic_t the_window_resized;
 #endif
@@ -43,26 +43,47 @@ extern bool as_an_at;
 extern int margin;
 extern int editwincols;
 
+#ifdef ENABLE_COLOR
+extern bool have_palette;
+#endif
+
+extern bool suppress_cursorpos;
+
 extern message_type lastmessage;
 
 extern filestruct *pletion_line;
 
+extern bool inhelp;
+extern char *title;
+
+extern bool more_than_one;
+
+extern int didfind;
+
 extern int controlleft;
 extern int controlright;
 extern int controlup;
 extern int controldown;
+extern int controlhome;
+extern int controlend;
 #ifndef NANO_TINY
 extern int shiftcontrolleft;
 extern int shiftcontrolright;
 extern int shiftcontrolup;
 extern int shiftcontroldown;
+extern int shiftcontrolhome;
+extern int shiftcontrolend;
+extern int altleft;
+extern int altright;
+extern int altup;
+extern int altdown;
 extern int shiftaltleft;
 extern int shiftaltright;
 extern int shiftaltup;
 extern int shiftaltdown;
 #endif
 
-#ifndef DISABLE_WRAPJUSTIFY
+#ifdef ENABLED_WRAPORJUSTIFY
 extern ssize_t fill;
 extern ssize_t wrap_at;
 #endif
@@ -76,12 +97,12 @@ extern WINDOW *topwin;
 extern WINDOW *edit;
 extern WINDOW *bottomwin;
 extern int editwinrows;
-extern int maxrows;
 
 extern filestruct *cutbuffer;
 extern filestruct *cutbottom;
 extern partition *filepart;
 extern openfilestruct *openfile;
+extern openfilestruct *firstfile;
 
 #ifndef NANO_TINY
 extern char *matchbrackets;
@@ -95,24 +116,18 @@ 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;
 extern char *quotestr;
-#ifdef HAVE_REGEX_H
 extern regex_t quotereg;
 extern int quoterc;
 extern char *quoteerr;
-#else
-extern size_t quotelen;
-#endif
-#endif /* !DISABLE_JUSTIFY */
+#endif /* !ENABLE_JUSTIFY */
 
 extern char *word_chars;
 
-extern bool nodelay_mode;
-
 extern char *answer;
 
 extern ssize_t tabsize;
@@ -122,16 +137,15 @@ 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;
 #endif
@@ -144,47 +158,46 @@ 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
 
-#ifdef HAVE_REGEX_H
 extern regex_t search_regexp;
 extern regmatch_t regmatches[10];
-#endif
 
 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);
 
-/* All functions in browser.c. */
-#ifndef DISABLE_BROWSER
-char *do_browser(char *path);
+/* Most functions in browser.c. */
+#ifdef ENABLE_BROWSER
 char *do_browse_from(const char *inpath);
 void read_the_list(const char *path, DIR *dir);
 functionptrtype parse_browser_input(int *kbinput);
 void browser_refresh(void);
 void browser_select_dirname(const char *needle);
-int filesearch_init(void);
-void findnextfile(const char *needle);
-void filesearch_abort(void);
 void do_filesearch(void);
-void do_fileresearch(void);
+void do_fileresearch(bool forwards);
 void do_first_file(void);
 void do_last_file(void);
-char *striponedir(const char *path);
+char *strip_last_component(const char *path);
 #endif
 
 /* Most functions in chars.c. */
@@ -193,92 +206,61 @@ void utf8_init(void);
 bool using_utf8(void);
 #endif
 char *addstrings(char* str1, size_t len1, char* str2, size_t len2);
-#ifndef HAVE_ISBLANK
-bool nisblank(int c);
-#endif
-#if !defined(HAVE_ISWBLANK) && defined(ENABLE_UTF8)
-bool niswblank(wchar_t wc);
-#endif
 bool is_byte(int c);
 bool is_alpha_mbchar(const char *c);
-bool is_alnum_mbchar(const char *c);
 bool is_blank_mbchar(const char *c);
 bool is_ascii_cntrl_char(int c);
-bool is_cntrl_char(int c);
 bool is_cntrl_mbchar(const char *c);
-bool is_punct_mbchar(const char *c);
 bool is_word_mbchar(const char *c, bool allow_punct);
-char control_rep(const signed char c);
 char control_mbrep(const char *c, bool isdata);
 int length_of_char(const char *c, int *width);
 int mbwidth(const char *c);
-int mb_cur_max(void);
 char *make_mbchar(long chr, int *chr_mb_len);
 int parse_mbchar(const char *buf, char *chr, size_t *col);
 size_t move_mbleft(const char *buf, size_t pos);
 size_t move_mbright(const char *buf, size_t pos);
-#ifndef HAVE_STRCASECMP
-int nstrcasecmp(const char *s1, const char *s2);
-#endif
 int mbstrcasecmp(const char *s1, const char *s2);
-#ifndef HAVE_STRNCASECMP
-int nstrncasecmp(const char *s1, const char *s2, size_t n);
-#endif
 int mbstrncasecmp(const char *s1, const char *s2, size_t n);
-#ifndef HAVE_STRCASESTR
-char *nstrcasestr(const char *haystack, const char *needle);
-#endif
 char *mbstrcasestr(const char *haystack, const char *needle);
 char *revstrstr(const char *haystack, const char *needle,
-	const char *pointer);
-char *revstrcasestr(const char *haystack, const char *needle, const char
-	*rev_start);
-char *mbrevstrcasestr(const char *haystack, const char *needle, const
-	char *rev_start);
+	const char *index);
+char *mbrevstrcasestr(const char *haystack, const char *needle,
+	const char *index);
 size_t mbstrlen(const char *s);
-#ifndef HAVE_STRNLEN
-size_t nstrnlen(const char *s, size_t maxlen);
-#endif
 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
 char *mbstrpbrk(const char *s, const char *accept);
-char *revstrpbrk(const char *s, const char *accept, const char
-	*rev_start);
-char *mbrevstrpbrk(const char *s, const char *accept, const char
-	*rev_start);
+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(DISABLE_NANORC) && (!defined(NANO_TINY) || !defined(DISABLE_JUSTIFY))
-bool has_blank_chars(const char *s);
+#if defined(ENABLE_NANORC) && (!defined(NANO_TINY) || defined(ENABLE_JUSTIFY))
 bool has_blank_mbchars(const char *s);
 #endif
 #ifdef ENABLE_UTF8
 bool is_valid_unicode(wchar_t wc);
 #endif
-#ifndef DISABLE_NANORC
+#ifdef ENABLE_NANORC
 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);
-void reset_multis(filestruct *fileptr, bool force);
+void check_the_multis(filestruct *line);
 void alloc_multidata_if_needed(filestruct *fileptr);
 void precalc_multicolorinfo(void);
 #endif
 
-/* All functions in cut.c. */
+/* Most functions in cut.c. */
 void cutbuffer_reset(void);
 bool keeping_cutbuffer(void);
-void cut_line(void);
 #ifndef NANO_TINY
 void cut_marked(bool *right_side_up);
-void cut_to_eol(void);
-void cut_to_eof(void);
 #endif
 void do_cut_text(bool copy_text, bool cut_till_eof);
 void do_cut_text_void(void);
@@ -289,83 +271,67 @@ void do_cut_till_eof(void);
 void do_uncut_text(void);
 
 /* Most functions in files.c. */
-void make_new_buffer(void);
 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,
+	filestruct *bot, size_t bot_x);
 #endif
-void display_buffer(void);
-#ifndef DISABLE_MULTIBUFFER
-void switch_to_prev_buffer_void(void);
-void switch_to_next_buffer_void(void);
+#endif
+void prepare_for_display(void);
+#ifdef ENABLE_MULTIBUFFER
+void switch_to_prev_buffer(void);
+void switch_to_next_buffer(void);
 bool close_buffer(void);
 #endif
-filestruct *read_line(char *buf, size_t buf_len, filestruct *prevnode);
-void read_file(FILE *f, int fd, const char *filename, bool undoable, bool checkwritable);
+void read_file(FILE *f, int fd, const char *filename, bool undoable,
+		bool checkwritable);
 int open_file(const char *filename, bool newfie, bool quiet, FILE **f);
 char *get_next_filename(const char *name, const char *suffix);
 void do_insertfile_void(void);
 char *get_full_path(const char *origpath);
-char *check_writable_directory(const char *path);
 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);
 int delete_lockfile(const char *lockfilename);
 int write_lockfile(const char *lockfilename, const char *origfilename, bool modified);
 #endif
-int copy_file(FILE *inn, FILE *out);
+int copy_file(FILE *inn, FILE *out, bool close_out);
 bool write_file(const char *name, FILE *f_open, bool tmp,
 	kind_of_writing_type method, bool nonamechange);
 #ifndef NANO_TINY
 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(DISABLE_TABCOMP) || !defined(DISABLE_BROWSER)
+#if defined(ENABLE_TABCOMP) || defined(ENABLE_BROWSER)
 int diralphasort(const void *va, const void *vb);
 void free_chararray(char **array, size_t len);
 #endif
-#ifndef DISABLE_TABCOMP
-bool is_dir(const char *buf);
-char **username_tab_completion(const char *buf, size_t *num_matches,
-	size_t buf_len);
-char **cwd_tab_completion(const char *buf, bool allow_files, size_t
-	*num_matches, size_t buf_len);
+#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
-char *histfilename(void);
-void load_history(void);
-bool writehist(FILE *hist, const filestruct *head);
-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
@@ -378,7 +344,8 @@ void thanks_for_all_the_fish(void);
 #endif
 
 /* All functions in help.c. */
-#ifndef DISABLE_HELP
+#ifdef ENABLE_HELP
+void wrap_the_help_text(bool redisplaying);
 void do_help(void);
 void help_init(void);
 functionptrtype parse_help_input(int *kbinput);
@@ -386,29 +353,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
-void do_para_begin(bool allow_update);
+#ifdef ENABLE_JUSTIFY
+void do_para_begin(bool update_screen);
+void do_para_end(bool update_screen);
 void do_para_begin_void(void);
-void do_para_end(bool allow_update);
 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 allow_update);
+void do_prev_word(bool allow_punct, bool update_screen);
+bool do_next_word(bool allow_punct, bool update_screen);
 void do_prev_word_void(void);
-bool do_next_word(bool allow_punct, bool allow_update);
 void do_next_word_void(void);
-void ensure_line_is_visible(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);
@@ -417,9 +403,8 @@ void do_scroll_down(void);
 void do_left(void);
 void do_right(void);
 
-/* All functions in nano.c. */
+/* Most functions in nano.c. */
 filestruct *make_new_node(filestruct *prevnode);
-filestruct *copy_node(const filestruct *src);
 void splice_node(filestruct *afterthis, filestruct *newnode);
 void unlink_node(filestruct *fileptr);
 void delete_node(filestruct *fileptr);
@@ -429,36 +414,24 @@ void renumber(filestruct *fileptr);
 partition *partition_filestruct(filestruct *top, size_t top_x,
 	filestruct *bot, size_t bot_x);
 void unpartition_filestruct(partition **p);
-void move_to_filestruct(filestruct **file_top, filestruct **file_bot,
+void extract_buffer(filestruct **file_top, filestruct **file_bot,
 	filestruct *top, size_t top_x, filestruct *bot, size_t bot_x);
-void copy_from_filestruct(filestruct *somebuffer);
+void ingraft_buffer(filestruct *somebuffer);
+void copy_from_buffer(filestruct *somebuffer);
 openfilestruct *make_new_opennode(void);
 void unlink_opennode(openfilestruct *fileptr);
 void delete_opennode(openfilestruct *fileptr);
 void print_view_warning(void);
 void show_restricted_warning(void);
-#ifdef DISABLE_HELP
+#ifndef ENABLE_HELP
 void say_there_is_no_help(void);
 #endif
 void finish(void);
 void die(const char *msg, ...);
 void die_save_file(const char *die_filename, struct stat *die_stat);
 void window_init(void);
-#ifndef DISABLE_MOUSE
-void disable_mouse_support(void);
-void enable_mouse_support(void);
-void mouse_init(void);
-#endif
-void print_opt_full(const char *shortflag
-#ifdef HAVE_GETOPT_LONG
-	, const char *longflag
-#endif
-	, const char *desc);
-void usage(void);
-void version(void);
 void do_exit(void);
 void close_and_go(void);
-void signal_init(void);
 RETSIGTYPE handle_hupterm(int signal);
 RETSIGTYPE do_suspend(int signal);
 RETSIGTYPE do_continue(int signal);
@@ -475,13 +448,13 @@ void enable_flow_control(void);
 void terminal_init(void);
 void unbound_key(int code);
 int do_input(bool allow_funcs);
-#ifndef DISABLE_MOUSE
+#ifdef ENABLE_MOUSE
 int do_mouse(void);
 #endif
 void do_output(char *output, size_t output_len, bool allow_cntrls);
 
 /* Most functions in prompt.c. */
-#ifndef DISABLE_MOUSE
+#ifdef ENABLE_MOUSE
 int do_statusbar_mouse(void);
 #endif
 void do_statusbar_output(int *the_input, size_t input_len,
@@ -493,6 +466,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);
@@ -501,50 +475,36 @@ void do_statusbar_verbatim_input(void);
 size_t statusbar_xplustabs(void);
 size_t get_statusbar_page_start(size_t start_col, size_t column);
 void reinit_statusbar_x(void);
-void reset_statusbar_cursor(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. */
-#if !defined(DISABLE_NANORC) || !defined(DISABLE_HISTORIES)
-char *parse_next_word(char *ptr);
-#endif
-#ifndef DISABLE_NANORC
-#ifndef DISABLE_COLOR
+#ifdef ENABLE_NANORC
+#ifdef ENABLE_COLOR
 bool parse_color_names(char *combostr, short *fg, short *bg, bool *bright);
 void grab_and_store(const char *kind, char *ptr, regexlisttype **storage);
 #endif
 void parse_rcfile(FILE *rcstream, bool syntax_only);
 void do_rcfiles(void);
-#endif /* !DISABLE_NANORC */
+#endif /* ENABLE_NANORC */
 
-/* All functions in search.c. */
-#ifdef HAVE_REGEX_H
-bool regexp_init(const char *regexp);
-void regexp_cleanup(void);
-#endif
+/* Most functions in search.c. */
 void not_found_msg(const char *str);
 void search_replace_abort(void);
-int search_init(bool replacing, bool use_answer);
-int findnextstr(const char *needle, bool whole_word_only, size_t *match_len,
-	const filestruct *begin, size_t begin_x);
+int findnextstr(const char *needle, bool whole_word_only, int modus,
+	size_t *match_len, bool skipone, const filestruct *begin, size_t begin_x);
 void do_search(void);
+void do_search_forward(void);
+void do_search_backward(void);
 #ifndef NANO_TINY
 void do_findprevious(void);
 void do_findnext(void);
 #endif
 void do_research(void);
 void go_looking(void);
-#ifdef HAVE_REGEX_H
-int replace_regexp(char *string, bool create);
-#endif
-char *replace_line(const char *needle);
 ssize_t do_replace_loop(const char *needle, bool whole_word_only,
 	const filestruct *real_current, size_t *real_current_x);
 void do_replace(void);
@@ -553,26 +513,10 @@ void do_gotolinecolumn(ssize_t line, ssize_t column, bool use_answer,
 	bool interactive);
 void do_gotolinecolumn_void(void);
 #ifndef NANO_TINY
-bool find_bracket_match(bool reverse, const char *bracket_set);
 void do_find_bracket(void);
-#ifndef DISABLE_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);
-filestruct *find_history(const filestruct *h_start, const filestruct
-	*h_end, const char *s, size_t len);
-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
 
-/* All functions in text.c. */
+/* Most functions in text.c. */
 #ifndef NANO_TINY
 void do_mark(void);
 #endif
@@ -584,8 +528,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);
@@ -601,47 +544,31 @@ RETSIGTYPE cancel_command(int signal);
 bool execute_command(const char *command);
 void discard_until(const undo *thisitem, openfilestruct *thefile);
 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(DISABLE_HELP) || !defined(DISABLE_WRAPJUSTIFY)
-ssize_t break_line(const char *line, ssize_t goal
-#ifndef DISABLE_HELP
-	, bool newln
+#if defined(ENABLE_HELP) || defined(ENABLED_WRAPORJUSTIFY)
+ssize_t break_line(const char *line, ssize_t goal, bool snap_at_nl);
 #endif
-	);
-#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);
-size_t quote_length(const char *line);
-bool quotes_match(const char *a_line, size_t a_quote, const char
-	*b_line);
-bool indents_match(const char *a_line, size_t a_indent, const char
-	*b_line, size_t b_indent);
 bool begpar(const filestruct *const foo);
 bool inpar(const filestruct *const foo);
-void backup_lines(filestruct *first_line, size_t par_len);
-bool find_paragraph(size_t *const quote, size_t *const par);
 void do_justify(bool full_justify);
 void do_justify_void(void);
 void do_full_justify(void);
 #endif
-#ifndef DISABLE_SPELLER
-bool do_int_spell_fix(const char *word);
-const char *do_int_speller(const char *tempfile_name);
-const char *do_alt_speller(char *tempfile_name);
+#ifdef ENABLE_SPELLER
 void do_spell(void);
 #endif
-#ifndef DISABLE_COLOR
+#ifdef ENABLE_COLOR
 void do_linter(void);
 void do_formatter(void);
 #endif
@@ -653,6 +580,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
@@ -662,18 +591,8 @@ 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(NANO_TINY) && !defined(DISABLE_NANORC)
-#ifndef HAVE_GETLINE
-ssize_t ngetline(char **lineptr, size_t *n, FILE *stream);
-#endif
-#ifndef HAVE_GETDELIM
-ssize_t ngetdelim(char **lineptr, size_t *n, int delim, FILE *stream);
-#endif
-#endif
-#ifdef HAVE_REGEX_H
 const char *fixbounds(const char *r);
-#endif
-#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,
@@ -686,12 +605,14 @@ 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);
-#ifndef NANO_TINY
+#if !defined(NANO_TINY) || defined(ENABLE_HELP)
 void remove_magicline(void);
+#endif
+#ifndef NANO_TINY
 void mark_order(const filestruct **top, size_t *top_x, const filestruct
 	**bot, size_t *bot_x, bool *right_side_up);
 #endif
@@ -705,83 +626,99 @@ 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_input(int *input, size_t input_len);
 void unget_kbinput(int kbinput, bool metakey);
-int *get_input(WINDOW *win, size_t input_len);
-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);
 int get_byte_kbinput(int kbinput);
-#ifdef ENABLE_UTF8
-long add_unicode_digit(int kbinput, long factor, long *uni);
-long get_unicode_kbinput(WINDOW *win, int kbinput);
-#endif
 int get_control_kbinput(int kbinput);
-void unparse_kbinput(char *output, size_t output_len);
 int *get_verbatim_kbinput(WINDOW *win, size_t *kbinput_len);
 int *parse_verbatim_kbinput(WINDOW *win, size_t *count);
-#ifndef DISABLE_MOUSE
+#ifdef ENABLE_MOUSE
 int get_mouseinput(int *mouse_x, int *mouse_y, bool allow_shortcuts);
 #endif
 const sc *get_shortcut(int *kbinput);
-void blank_line(WINDOW *win, int y, int x, int n);
-void blank_titlebar(void);
+void blank_row(WINDOW *win, int y, int x, int n);
 void blank_edit(void);
 void blank_statusbar(void);
 void blank_bottombars(void);
 void check_statusblank(void);
-char *display_string(const char *buf, size_t start_col, size_t span,
-	bool dollars);
+char *display_string(const char *buf, size_t column, size_t span, bool isdata);
 void titlebar(const char *path);
 extern void set_modified(void);
 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 reset_cursor(void);
+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);
-bool need_horizontal_scroll(const size_t old_column, const size_t new_column);
-void edit_scroll(scroll_dir direction, ssize_t nlines);
-void edit_redraw(filestruct *old_current);
+#ifndef NANO_TINY
+int update_softwrapped_line(filestruct *fileptr);
+#endif
+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(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
+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);
 void total_refresh(void);
 void display_main_list(void);
-void do_cursorpos(bool constant);
+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
 
-/* May as well throw these here, since they are just placeholders. */
+/* These are just name definitions. */
 void do_cancel(void);
 void case_sens_void(void);
 void regexp_void(void);
+void backwards_void(void);
+void flip_replace(void);
 void gototext_void(void);
+#ifdef ENABLE_BROWSER
 void to_files_void(void);
+void goto_dir_void(void);
+#endif
+#ifndef NANO_TINY
 void dos_format_void(void);
 void mac_format_void(void);
 void append_void(void);
 void prepend_void(void);
 void backup_file_void(void);
+void flip_execute(void);
+#endif
+#ifdef ENABLE_MULTIBUFFER
+void flip_newbuffer(void);
+#endif
 void discard_buffer(void);
-void new_buffer_void(void);
-void backwards_void(void);
-void goto_dir_void(void);
-void flip_replace_void(void);
-void flip_execute_void(void);
 
 #endif /* !PROTO_H */

src/rcfile.c

@@ -1,10 +1,9 @@
 /**************************************************************************
  *   rcfile.c  --  This file is part of GNU nano.                         *
  *                                                                        *
- *   Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009,  *
- *   2010, 2011, 2013, 2014 Free Software Foundation, Inc.                *
+ *   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    *
@@ -23,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>
 
-#ifndef DISABLE_NANORC
+#ifdef ENABLE_NANORC
 
 #ifndef RCFILE_NAME
-#define RCFILE_NAME ".nanorc"
+#define RCFILE_NAME "nanorc"
 #endif
 
 static const rcoption rcopts[] = {
@@ -42,47 +39,47 @@ static const rcoption rcopts[] = {
 #ifdef ENABLE_LINENUMBERS
     {"linenumbers", LINE_NUMBERS},
 #endif
-#ifndef DISABLE_JUSTIFY
+#ifdef ENABLE_JUSTIFY
     {"brackets", 0},
 #endif
-    {"const", CONST_UPDATE},  /* deprecated form, remove in 2018 */
-    {"constantshow", CONST_UPDATE},
-#ifndef DISABLE_WRAPJUSTIFY
+    {"const", CONSTANT_SHOW},  /* deprecated form, remove in 2018 */
+    {"constantshow", CONSTANT_SHOW},
+#ifdef ENABLED_WRAPORJUSTIFY
     {"fill", 0},
 #endif
-#ifndef DISABLE_HISTORIES
+#ifdef ENABLE_HISTORIES
     {"historylog", HISTORYLOG},
 #endif
     {"morespace", MORE_SPACE},
-#ifndef DISABLE_MOUSE
+#ifdef ENABLE_MOUSE
     {"mouse", USE_MOUSE},
 #endif
-#ifndef DISABLE_MULTIBUFFER
+#ifdef ENABLE_MULTIBUFFER
     {"multibuffer", MULTIBUFFER},
 #endif
     {"nohelp", NO_HELP},
     {"nonewlines", NO_NEWLINES},
-#ifndef DISABLE_WRAPPING
+    {"nopauses", NO_PAUSES},
+#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
+    {"quickblank", QUICK_BLANK},
     {"rebinddelete", REBIND_DELETE},
     {"rebindkeypad", REBIND_KEYPAD},
-#ifdef HAVE_REGEX_H
     {"regexp", USE_REGEXP},
-#endif
-#ifndef DISABLE_SPELLER
+#ifdef ENABLE_SPELLER
     {"speller", 0},
 #endif
     {"suspend", SUSPEND},
@@ -91,17 +88,18 @@ 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},
     {"noconvert", NO_CONVERT},
-    {"quickblank", QUICK_BLANK},
     {"quiet", QUIET},
     {"showcursor", SHOW_CURSOR},
     {"smarthome", SMART_HOME},
@@ -113,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},
@@ -123,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. */
@@ -139,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,15 +153,15 @@ void rcfile_error(const char *msg, ...)
 
     fprintf(stderr, "\n");
 }
-#endif /* !DISABLE_NANORC */
+#endif /* ENABLE_NANORC */
 
-#if !defined(DISABLE_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. */
 char *parse_next_word(char *ptr)
 {
-    while (!isblank(*ptr) && *ptr != '\0')
+    while (!isblank((unsigned char)*ptr) && *ptr != '\0')
 	ptr++;
 
     if (*ptr == '\0')
@@ -178,14 +170,14 @@ char *parse_next_word(char *ptr)
     /* Null-terminate and advance ptr. */
     *ptr++ = '\0';
 
-    while (isblank(*ptr))
+    while (isblank((unsigned char)*ptr))
 	ptr++;
 
     return ptr;
 }
-#endif /* !DISABLE_NANORC || !DISABLE_HISTORIES */
+#endif /* ENABLE_NANORC || ENABLE_HISTORIES */
 
-#ifndef DISABLE_NANORC
+#ifdef ENABLE_NANORC
 /* Parse an argument, with optional quotes, after a keyword that takes
  * one.  If the next word starts with a ", we say that it ends with the
  * last " of the line.  Otherwise, we interpret it as usual, so that the
@@ -217,12 +209,12 @@ char *parse_argument(char *ptr)
 	ptr = last_quote + 1;
     }
     if (ptr != NULL)
-	while (isblank(*ptr))
+	while (isblank((unsigned char)*ptr))
 	    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)
@@ -232,7 +224,7 @@ char *parse_next_regex(char *ptr)
     /* Continue until the end of line, or until a " followed by a
      * blank character or the end of line. */
     while (*ptr != '\0' && (*ptr != '"' ||
-		(*(ptr + 1) != '\0' && !isblank(*(ptr + 1)))))
+		(*(ptr + 1) != '\0' && !isblank((unsigned char)ptr[1]))))
 	ptr++;
 
     assert(*ptr == '"' || *ptr == '\0');
@@ -246,7 +238,7 @@ char *parse_next_regex(char *ptr)
     /* Null-terminate and advance ptr. */
     *ptr++ = '\0';
 
-    while (isblank(*ptr))
+    while (isblank((unsigned char)*ptr))
 	ptr++;
 
     return ptr;
@@ -317,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;
@@ -343,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 || 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;
@@ -385,36 +381,31 @@ 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. */
-    keycopy[0] = toupper(keycopy[0]);
-    keycopy[1] = toupper(keycopy[1]);
+    keycopy[0] = toupper((unsigned char)keycopy[0]);
+    keycopy[1] = toupper((unsigned char)keycopy[1]);
     if (keycopy[0] == 'M' && keycopy[1] == '-') {
 	if (strlen(keycopy) > 2)
-	    keycopy[2] = toupper(keycopy[2]);
+	    keycopy[2] = toupper((unsigned char)keycopy[2]);
 	else {
 	    rcfile_error(N_("Key name is too short"));
-	    goto free_copy;
+	    goto free_things;
 	}
     }
 
     /* Allow the codes for Insert and Delete to be rebound, but apart
      * from those two only Control, Meta and Function sequences. */
     if (!strcasecmp(keycopy, "Ins") || !strcasecmp(keycopy, "Del"))
-	keycopy[1] = tolower(keycopy[1]);
+	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) {
@@ -423,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;
 	}
     }
 
@@ -433,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;
@@ -481,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;
@@ -491,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) {
@@ -526,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))) {
@@ -545,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)
 {
@@ -609,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,9 +624,7 @@ void parse_colors(char *ptr, int rex_flags)
 {
     short fg, bg;
     bool bright = FALSE;
-    char *fgstr;
-
-    assert(ptr != NULL);
+    char *item;
 
     if (!opensyntax) {
 	rcfile_error(
@@ -664,9 +638,9 @@ void parse_colors(char *ptr, int rex_flags)
 	return;
     }
 
-    fgstr = ptr;
+    item = ptr;
     ptr = parse_next_word(ptr);
-    if (!parse_color_names(fgstr, &fg, &bg, &bright))
+    if (!parse_color_names(item, &fg, &bg, &bright))
 	return;
 
     if (*ptr == '\0') {
@@ -696,12 +670,16 @@ void parse_colors(char *ptr, int rex_flags)
 	    continue;
 	}
 
-	fgstr = ++ptr;
+	item = ++ptr;
 	ptr = parse_next_regex(ptr);
 	if (ptr == NULL)
 	    break;
 
-	goodstart = nregcomp(fgstr, rex_flags);
+	if (*item == '\0') {
+	    rcfile_error(N_("Empty regex string"));
+	    goodstart = FALSE;
+	} else
+	    goodstart = nregcomp(item, rex_flags);
 
 	/* If the starting regex is valid, initialize a new color struct,
 	 * and hook it in at the tail of the linked list. */
@@ -713,7 +691,7 @@ void parse_colors(char *ptr, int rex_flags)
 	    newcolor->bright = bright;
 	    newcolor->rex_flags = rex_flags;
 
-	    newcolor->start_regex = mallocstrcpy(NULL, fgstr);
+	    newcolor->start_regex = mallocstrcpy(NULL, item);
 	    newcolor->start = NULL;
 
 	    newcolor->end_regex = NULL;
@@ -721,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
@@ -746,19 +721,24 @@ void parse_colors(char *ptr, int rex_flags)
 	    continue;
 	}
 
-	fgstr = ++ptr;
+	item = ++ptr;
 	ptr = parse_next_regex(ptr);
 	if (ptr == NULL)
 	    break;
 
+	if (*item == '\0') {
+	    rcfile_error(N_("Empty regex string"));
+	    continue;
+	}
+
 	/* If the start regex was invalid, skip past the end regex
 	 * to stay in sync. */
 	if (!goodstart)
 	    continue;
 
 	/* If it's valid, save the ending regex string. */
-	if (nregcomp(fgstr, rex_flags))
-	    newcolor->end_regex = mallocstrcpy(NULL, fgstr);
+	if (nregcomp(item, rex_flags))
+	    newcolor->end_regex = mallocstrcpy(NULL, item);
 
 	/* Lame way to skip another static counter. */
 	newcolor->id = live_syntax->nmultis;
@@ -769,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
@@ -868,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);
@@ -880,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"). */
@@ -959,7 +919,7 @@ void parse_rcfile(FILE *rcstream, bool syntax_only)
 
 	lineno++;
 	ptr = buf;
-	while (isblank(*ptr))
+	while (isblank((unsigned char)*ptr))
 	    ptr++;
 
 	/* If we have a blank line or a comment, skip to the next
@@ -971,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;
@@ -1031,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
 	    ;
@@ -1042,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)
@@ -1054,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;
@@ -1123,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)
@@ -1136,21 +1098,20 @@ 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"),
 				option);
 		wrap_at = -CHARS_FROM_EOL;
-	    } else {
+	    } else
 		UNSET(NO_WRAP);
-		free(option);
-	    }
+	    free(option);
 	} else
 #endif
 #ifndef NANO_TINY
@@ -1174,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)) {
@@ -1201,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
@@ -1211,13 +1172,13 @@ void parse_rcfile(FILE *rcstream, bool syntax_only)
 		rcfile_error(N_("Requested tab size \"%s\" is invalid"),
 				option);
 		tabsize = -1;
-	    } else
-		free(option);
+	    }
+	    free(option);
 	} else
 	    assert(FALSE);
     }
 
-#ifndef DISABLE_COLOR
+#ifdef ENABLE_COLOR
     if (opensyntax && lastcolor == NULL)
 	rcfile_error(N_("Syntax \"%s\" has no color commands"),
 			live_syntax->name);
@@ -1244,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
@@ -1255,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. */
@@ -1271,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)) {
-	errors = FALSE;
-	fprintf(stderr, _("\nPress Enter to continue starting nano.\n"));
-	while (getchar() != '\n')
-	    ;
-    }
 }
 
-#endif /* !DISABLE_NANORC */
+#endif /* ENABLE_NANORC */

src/search.c

@@ -1,9 +1,8 @@
 /**************************************************************************
  *   search.c  --  This file is part of GNU nano.                         *
  *                                                                        *
- *   Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007,  *
- *   2008, 2009, 2010, 2011, 2013, 2014 Free Software Foundation, Inc.    *
- *   Copyright (C) 2015, 2016 Benno Schulenberg                           *
+ *   Copyright (C) 1999-2011, 2013-2017 Free Software Foundation, Inc.    *
+ *   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    *
@@ -23,23 +22,14 @@
 #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
-#ifdef HAVE_REGEX_H
 static bool regexp_compiled = FALSE;
 	/* Have we compiled any regular expressions? */
-static bool bow_anchored = FALSE;
-	/* Whether a regex starts with a beginning-of-word anchor. */
 
 /* Compile the given regular expression and store it in search_regexp.
  * Return TRUE if the expression is valid, and FALSE otherwise. */
@@ -62,10 +52,6 @@ bool regexp_init(const char *regexp)
 
     regexp_compiled = TRUE;
 
-    /* Remember whether the regex starts with a beginning-of-word anchor. */
-    bow_anchored = (strncmp(regexp, "\\<", 2) == 0 ||
-			strncmp(regexp, "\\b", 2) == 0);
-
     return TRUE;
 }
 
@@ -78,23 +64,15 @@ void regexp_cleanup(void)
 	regfree(&search_regexp);
     }
 }
-#endif
 
-/* 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);
 }
 
@@ -108,9 +86,7 @@ void search_replace_abort(void)
     if (openfile->mark_set)
 	refresh_needed = TRUE;
 #endif
-#ifdef HAVE_REGEX_H
     regexp_cleanup();
-#endif
 }
 
 /* Set up the system variables for a search or replace.  If use_answer
@@ -154,18 +130,13 @@ int search_init(bool replacing, bool use_answer)
 
     /* This is now one simple call.  It just does a lot. */
     i = do_prompt(FALSE, FALSE,
-		replacing ? MREPLACE : MWHEREIS, backupstring,
-#ifndef DISABLE_HISTORIES
-		&search_history,
-#endif
+		inhelp ? MFINDINHELP : (replacing ? MREPLACE : MWHEREIS),
+		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. */
 		ISSET(CASE_SENSITIVE) ? _(" [Case Sensitive]") : "",
-#ifdef HAVE_REGEX_H
-		ISSET(USE_REGEXP) ? _(" [Regexp]") :
-#endif
-		"",
+		ISSET(USE_REGEXP) ? _(" [Regexp]") : "",
 		ISSET(BACKWARDS_SEARCH) ? _(" [Backwards]") : "", replacing ?
 #ifndef NANO_TINY
 		/* TRANSLATORS: The next two modify the search prompt. */
@@ -191,15 +162,13 @@ 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
 	}
-#ifdef HAVE_REGEX_H
 	if (ISSET(USE_REGEXP) && !regexp_init(last_search))
 	    return -1;
 	else
-#endif
 	    return 0;	/* We have a valid string or regex. */
     }
 
@@ -213,15 +182,11 @@ int search_init(bool replacing, bool use_answer)
 	TOGGLE(BACKWARDS_SEARCH);
 	backupstring = mallocstrcpy(backupstring, answer);
 	return 1;
-    } else
-#ifdef HAVE_REGEX_H
-    if (func == regexp_void) {
+    } else if (func == regexp_void) {
 	TOGGLE(USE_REGEXP);
 	backupstring = mallocstrcpy(backupstring, answer);
 	return 1;
-    } else
-#endif
-    if (func == do_replace || func == flip_replace_void) {
+    } else if (func == flip_replace) {
 	backupstring = mallocstrcpy(backupstring, answer);
 	return -2;	/* Call the opposite search function. */
     } else if (func == do_gotolinecolumn_void) {
@@ -237,33 +202,26 @@ 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, size_t *match_len,
-	const filestruct *begin, size_t begin_x)
+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);
 	/* The length of a match -- will be recomputed for a regex. */
     int feedback = 0;
 	/* When bigger than zero, show and wipe the "Searching..." message. */
     filestruct *line = openfile->current;
-    const char *from = line->data, *found = NULL;
+	/* The line that we will search through now. */
+    const char *from = line->data + openfile->current_x;
+	/* The point in the line from where we start searching. */
+    const char *found = NULL;
+	/* A pointer to the location of the match, if any. */
     size_t found_x;
 	/* The x coordinate of a found occurrence. */
     time_t lastkbcheck = time(NULL);
+	/* The time we last looked at the keyboard. */
 
-    /* 'from' might end up 1 character before the start or after the end
-     * of the line.  This is fine because in that case strstrwrapper()
-     * will return immediately and say that no match was found, and
-     * 'from' will be properly set when the search continues on the
-     * previous or next line. */
-    if (ISSET(BACKWARDS_SEARCH)) {
-	if (openfile->current_x == 0)
-	    from += -1;
-	else
-	    from += move_mbleft(line->data, openfile->current_x);
-    } else
-	from += move_mbright(line->data, openfile->current_x);
-
-    enable_nodelay();
+    /* Set non-blocking input so that we can just peek for a Cancel. */
+    disable_waiting();
 
     if (begin == NULL)
 	came_full_circle = FALSE;
@@ -280,7 +238,7 @@ int findnextstr(const char *needle, bool whole_word_only, size_t *match_len,
 	    while (input) {
 		if (func_from_key(&input) == do_cancel) {
 		    statusbar(_("Cancelled"));
-		    disable_nodelay();
+		    enable_waiting();
 		    return -2;
 		}
 		input = parse_kbinput(NULL);
@@ -293,31 +251,29 @@ int findnextstr(const char *needle, bool whole_word_only, size_t *match_len,
 	}
 
 	/* Search for the needle in the current line. */
-	found = strstrwrapper(line->data, needle, from);
+	if (!skipone)
+	    found = strstrwrapper(line->data, needle, from);
+
+	/* Ignore the initial match at the starting position: continue
+	 * searching from the next character, or invalidate the match. */
+	if (skipone || (!whole_word_only && !came_full_circle &&
+				found == begin->data + begin_x)) {
+	    skipone = FALSE;
+	    if (ISSET(BACKWARDS_SEARCH) && from != line->data) {
+		from = line->data + move_mbleft(line->data, from - line->data);
+		continue;
+	    } else if (!ISSET(BACKWARDS_SEARCH) && *from != '\0') {
+		from += move_mbright(from, 0);
+		continue;
+	    }
+	    found = NULL;
+	}
 
 	if (found != NULL) {
-#ifdef HAVE_REGEX_H
 	    /* When doing a regex search, compute the length of the match. */
-	    if (ISSET(USE_REGEXP)) {
+	    if (ISSET(USE_REGEXP))
 		found_len = regmatches[0].rm_eo - regmatches[0].rm_so;
-
-		/* If the regex starts with a BOW anchor, check that the found
-		 * match actually is the start of a word.  If not, continue. */
-		if (bow_anchored && found != line->data) {
-		    size_t before = move_mbleft(line->data, found - line->data);
-
-		    /* If a word char is before the match, skip this match. */
-		    if (is_word_mbchar(line->data + before, FALSE)) {
-			if (ISSET(BACKWARDS_SEARCH))
-			    from = line->data + before;
-			else
-			    from = found + move_mbright(found, 0);
-			continue;
-		    }
-		}
-	    }
-#endif
-#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,
@@ -332,8 +288,7 @@ int findnextstr(const char *needle, bool whole_word_only, size_t *match_len,
 
 	/* 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;
 	}
 
@@ -343,23 +298,24 @@ int findnextstr(const char *needle, bool whole_word_only, size_t *match_len,
 	else
 	    line = line->next;
 
-	/* If we've reached the start or end of the buffer, wrap around. */
+	/* 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) {
-#ifndef DISABLE_SPELLER
-	    /* When we're spell-checking, end-of-buffer means we're done. */
-	    if (whole_word_only) {
-		disable_nodelay();
+	    if (whole_word_only || modus == INREGION) {
+		enable_waiting();
 		return 0;
 	    }
-#endif
+
 	    if (ISSET(BACKWARDS_SEARCH))
 		line = openfile->filebot;
 	    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. */
@@ -374,15 +330,12 @@ int findnextstr(const char *needle, bool whole_word_only, size_t *match_len,
 
     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;
@@ -392,8 +345,12 @@ int findnextstr(const char *needle, bool whole_word_only, size_t *match_len,
     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;
 }
@@ -414,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)
@@ -454,10 +416,8 @@ void do_research(void)
 	return;
     }
 
-#ifdef HAVE_REGEX_H
     if (ISSET(USE_REGEXP) && !regexp_init(last_search))
 	return;
-#endif
 
     /* Use the search-menu key bindings, to allow cancelling. */
     currmenu = MWHEREIS;
@@ -471,14 +431,13 @@ void go_looking(void)
 {
     filestruct *was_current = openfile->current;
     size_t was_current_x = openfile->current_x;
-    int didfind;
 #ifdef DEBUG
     clock_t start = clock();
 #endif
 
     came_full_circle = FALSE;
 
-    didfind = findnextstr(last_search, FALSE, NULL,
+    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
@@ -486,16 +445,17 @@ 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();
 }
 
-#ifdef HAVE_REGEX_H
 /* Calculate the size of the replacement text, taking possible
  * subexpressions \1 to \9 into account.  Return the replacement
  * text in the passed string only when create is TRUE. */
@@ -527,7 +487,7 @@ int replace_regexp(char *string, bool create)
 	     * subexpression match to the new line. */
 	    if (create) {
 		strncpy(string, openfile->current->data +
-			openfile->current_x + regmatches[num].rm_so, i);
+					regmatches[num].rm_so, i);
 		string += i;
 	    }
 	}
@@ -538,7 +498,6 @@ int replace_regexp(char *string, bool create)
 
     return replacement_size;
 }
-#endif /* HAVE_REGEX_H */
 
 /* Return a copy of the current line with one needle replaced. */
 char *replace_line(const char *needle)
@@ -548,17 +507,13 @@ char *replace_line(const char *needle)
     size_t new_line_size = strlen(openfile->current->data) + 1;
 
     /* First adjust the size of the new line for the change. */
-#ifdef HAVE_REGEX_H
     if (ISSET(USE_REGEXP)) {
 	match_len = regmatches[0].rm_eo - regmatches[0].rm_so;
 	new_line_size += replace_regexp(NULL, FALSE) - match_len;
     } else {
-#endif
 	match_len = strlen(needle);
 	new_line_size += strlen(answer) - match_len;
-#ifdef HAVE_REGEX_H
     }
-#endif
 
     /* Create the buffer. */
     copy = charalloc(new_line_size);
@@ -567,11 +522,9 @@ char *replace_line(const char *needle)
     strncpy(copy, openfile->current->data, openfile->current_x);
 
     /* Add the replacement text. */
-#ifdef HAVE_REGEX_H
     if (ISSET(USE_REGEXP))
 	replace_regexp(copy + openfile->current_x, TRUE);
     else
-#endif
 	strcpy(copy + openfile->current_x, answer);
 
     assert(openfile->current_x + match_len <= strlen(openfile->current->data));
@@ -594,24 +547,27 @@ ssize_t do_replace_loop(const char *needle, bool whole_word_only,
     ssize_t numreplaced = -1;
     size_t match_len;
     bool replaceall = FALSE;
+    bool skipone = FALSE;
+    int modus = REPLACING;
 #ifndef NANO_TINY
-    bool old_mark_set = openfile->mark_set;
     filestruct *top, *bot;
     size_t top_x, bot_x;
+    bool mark_was_set = openfile->mark_set;
     bool right_side_up = FALSE;
 	/* TRUE if (mark_begin, mark_begin_x) is the top of the mark,
 	 * FALSE if (current, current_x) is. */
 
     /* If the mark is on, frame the region, and turn the mark off. */
-    if (old_mark_set) {
+    if (mark_was_set) {
 	mark_order((const filestruct **)&top, &top_x,
 			(const filestruct **)&bot, &bot_x, &right_side_up);
 	openfile->mark_set = FALSE;
+	modus = INREGION;
 
 	/* Start either at the top or the bottom of the marked region. */
 	if (!ISSET(BACKWARDS_SEARCH)) {
 	    openfile->current = top;
-	    openfile->current_x = (top_x == 0 ? 0 : top_x - 1);
+	    openfile->current_x = top_x;
 	} else {
 	    openfile->current = bot;
 	    openfile->current_x = bot_x;
@@ -623,8 +579,8 @@ ssize_t do_replace_loop(const char *needle, bool whole_word_only,
 
     while (TRUE) {
 	int i = 0;
-	int result = findnextstr(needle, whole_word_only, &match_len,
-					real_current, *real_current_x);
+	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. */
 	if (result < 1) {
@@ -634,15 +590,14 @@ ssize_t do_replace_loop(const char *needle, bool whole_word_only,
 	}
 
 #ifndef NANO_TINY
-	if (old_mark_set) {
-	    /* When we've found an occurrence outside of the marked region,
-	     * stop the fanfare. */
-	    if (openfile->current->lineno > bot->lineno ||
-			openfile->current->lineno < top->lineno ||
-			(openfile->current == bot && openfile->current_x > bot_x) ||
-			(openfile->current == top && openfile->current_x < top_x))
-		break;
-	}
+	/* An occurrence outside of the marked region means we're done. */
+	if (mark_was_set && (openfile->current->lineno > bot->lineno ||
+				openfile->current->lineno < top->lineno ||
+				(openfile->current == bot &&
+				openfile->current_x + match_len > bot_x) ||
+				(openfile->current == top &&
+				openfile->current_x < top_x)))
+	    break;
 #endif
 
 	/* Indicate that we found the search string. */
@@ -650,30 +605,28 @@ 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;
 	    else if (i == 2)
 		replaceall = TRUE;
+
+	    /* When "No" or moving backwards, the search routine should
+	     * first move one character further before continuing. */
+	    skipone = (i == 0 || ISSET(BACKWARDS_SEARCH));
 	}
 
 	if (i == 1 || replaceall) {  /* Yes, replace it. */
@@ -690,7 +643,7 @@ 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 (old_mark_set && !right_side_up) {
+	    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)
@@ -703,10 +656,10 @@ ssize_t do_replace_loop(const char *needle, bool whole_word_only,
 
 	    /* If the mark was not on or it was before the cursor, then
 	     * adjust the cursor's x position for any text length changes. */
-	    if (!old_mark_set || right_side_up) {
+	    if (!mark_was_set || right_side_up) {
 #endif
 		if (openfile->current == real_current &&
-			openfile->current_x <= *real_current_x) {
+			openfile->current_x < *real_current_x) {
 		    if (*real_current_x < openfile->current_x + match_len)
 			*real_current_x = openfile->current_x + match_len;
 		    *real_current_x += length_change;
@@ -716,31 +669,22 @@ ssize_t do_replace_loop(const char *needle, bool whole_word_only,
 #endif
 	    }
 
-#ifdef HAVE_REGEX_H
 	    /* Don't find the same zero-length or BOL match again. */
 	    if (match_len == 0 || (*needle == '^' && ISSET(USE_REGEXP)))
-		match_len++;
-#endif
-	    /* Set the cursor at the last character of the replacement
-	     * text, so that searching will continue /after/ it.  Note
-	     * that current_x might be set to (size_t)-1 here. */
+		skipone = TRUE;
+
+	    /* When moving forward, put the cursor just after the replacement
+	     * text, so that searching will continue there. */
 	    if (!ISSET(BACKWARDS_SEARCH))
-		openfile->current_x += match_len + length_change - 1;
+		openfile->current_x += match_len + length_change;
 
 	    /* Update the file size, and put the changed line into place. */
 	    openfile->totsize += mbstrlen(copy) - mbstrlen(openfile->current->data);
 	    free(openfile->current->data);
 	    openfile->current->data = copy;
 
-#ifndef DISABLE_COLOR
-	    /* Reset the precalculated multiline-regex hints only when
-	     * the first replacement has been made. */
-	    if (numreplaced == 0)
-		reset_multis(openfile->current, TRUE);
-#endif
-
 	    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))
@@ -758,9 +702,13 @@ ssize_t do_replace_loop(const char *needle, bool whole_word_only,
 
     if (numreplaced == -1)
 	not_found_msg(needle);
+#ifdef ENABLE_COLOR
+    else if (numreplaced > 0)
+	refresh_needed = TRUE;
+#endif
 
 #ifndef NANO_TINY
-    if (old_mark_set)
+    if (mark_was_set)
 	openfile->mark_set = TRUE;
 #endif
 
@@ -776,7 +724,7 @@ ssize_t do_replace_loop(const char *needle, bool whole_word_only,
 void do_replace(void)
 {
     filestruct *edittop_save, *begin;
-    size_t begin_x;
+    size_t firstcolumn_save, begin_x;
     ssize_t numreplaced;
     int i;
 
@@ -797,14 +745,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);
@@ -820,6 +765,7 @@ void do_replace(void)
 
     /* Save where we are. */
     edittop_save = openfile->edittop;
+    firstcolumn_save = openfile->firstcolumn;
     begin = openfile->current;
     begin_x = openfile->current_x;
 
@@ -827,14 +773,14 @@ void do_replace(void)
 
     /* Restore where we were. */
     openfile->edittop = edittop_save;
+    openfile->firstcolumn = firstcolumn_save;
     openfile->current = begin;
     openfile->current_x = begin_x;
     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();
 }
@@ -863,10 +809,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"));
 
@@ -890,14 +833,14 @@ void do_gotolinecolumn(ssize_t line, ssize_t column, bool use_answer,
 
 	/* Try to extract one or two numbers from the user's response. */
 	if (!parse_line_column(answer, &line, &column)) {
-	    statusbar(_("Invalid line or column number"));
+	    statusline(ALERT, _("Invalid line or column number"));
 	    return;
 	}
     } else {
-	if (line < 1)
+	if (line == 0)
 	    line = openfile->current->lineno;
 
-	if (column < 1)
+	if (column == 0)
 	    column = openfile->placewewant + 1;
     }
 
@@ -922,18 +865,36 @@ void do_gotolinecolumn(ssize_t line, ssize_t column, bool use_answer,
     openfile->current_x = actual_x(openfile->current->data, column - 1);
     openfile->placewewant = column - 1;
 
+#ifndef NANO_TINY
+    if (ISSET(SOFTWRAP) && openfile->placewewant / editwincols >
+			strlenpt(openfile->current->data) / editwincols)
+	openfile->placewewant = strlenpt(openfile->current->data);
+#endif
+
     /* When the position was manually given, center the target line. */
-    if (interactive || ISSET(SOFTWRAP)) {
+    if (interactive) {
 	adjust_viewport(CENTERING);
 	refresh_needed = TRUE;
     } else {
+	int rows_from_tail;
+
+#ifndef NANO_TINY
+	if (ISSET(SOFTWRAP)) {
+	    filestruct *line = openfile->current;
+	    size_t leftedge = leftedge_for(xplustabs(), openfile->current);
+
+	    rows_from_tail = (editwinrows / 2) -
+			go_forward_chunks(editwinrows / 2, &line, &leftedge);
+	} else
+#endif
+	    rows_from_tail = openfile->filebot->lineno -
+				openfile->current->lineno;
+
 	/* If the target line is close to the tail of the file, put the last
-	 * line of the file on the bottom line of the screen; otherwise, just
+	 * line or chunk on the bottom line of the screen; otherwise, just
 	 * center the target line. */
-	if (openfile->filebot->lineno - openfile->current->lineno <
-							editwinrows / 2) {
-	    openfile->current_y = editwinrows - openfile->filebot->lineno +
-					openfile->current->lineno - 1;
+	if (rows_from_tail < editwinrows / 2 && ISSET(SMOOTH_SCROLL)) {
+	    openfile->current_y = editwinrows - 1 - rows_from_tail;
 	    adjust_viewport(STATIONARY);
 	} else
 	    adjust_viewport(CENTERING);
@@ -1020,7 +981,7 @@ void do_find_bracket(void)
 	 * the bracket at the current cursor position. */
     int wanted_ch_len;
 	/* The length of wanted_ch in bytes. */
-    char *bracket_set;
+    char bracket_set[MAXCHARLEN * 2 + 1];
 	/* The pair of characters in ch and wanted_ch. */
     size_t i;
 	/* Generic loop variable. */
@@ -1034,8 +995,6 @@ void do_find_bracket(void)
 	/* The initial bracket count. */
     bool reverse;
 	/* The direction we search. */
-    char *found_ch;
-	/* The character we find. */
 
     assert(mbstrlen(matchbrackets) % 2 == 0);
 
@@ -1083,26 +1042,21 @@ void do_find_bracket(void)
     wanted_ch_len = parse_mbchar(wanted_ch, NULL, NULL);
 
     /* Fill bracket_set in with the values of ch and wanted_ch. */
-    bracket_set = charalloc((mb_cur_max() * 2) + 1);
     strncpy(bracket_set, ch, ch_len);
     strncpy(bracket_set + ch_len, wanted_ch, wanted_ch_len);
-    null_at(&bracket_set, ch_len + wanted_ch_len);
-
-    found_ch = charalloc(mb_cur_max() + 1);
+    bracket_set[ch_len + wanted_ch_len] = '\0';
 
     while (TRUE) {
 	if (find_bracket_match(reverse, bracket_set)) {
 	    /* If we found an identical bracket, increment count.  If we
 	     * found a complementary bracket, decrement it. */
-	    parse_mbchar(openfile->current->data + openfile->current_x,
-			found_ch, NULL);
-	    count += (strncmp(found_ch, ch, ch_len) == 0) ? 1 : -1;
+	    count += (strncmp(openfile->current->data + openfile->current_x,
+				 ch, ch_len) == 0) ? 1 : -1;
 
 	    /* 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 {
@@ -1114,205 +1068,5 @@ void do_find_bracket(void)
 	    break;
 	}
     }
-
-    /* Clean up. */
-    free(bracket_set);
-    free(found_ch);
 }
 #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)
-{
-    ;
-}
-
-#ifndef DISABLE_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 /* !DISABLE_TABCOMP */
-#endif /* !DISABLE_HISTORIES */

src/utils.c

@@ -1,9 +1,8 @@
 /**************************************************************************
  *   utils.c  --  This file is part of GNU nano.                          *
  *                                                                        *
- *   Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007,  *
- *   2008, 2009, 2010, 2011, 2013, 2014 Free Software Foundation, Inc.    *
- *   Copyright (C) 2016 Benno Schulenberg                                 *
+ *   Copyright (C) 1999-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    *
@@ -22,12 +21,12 @@
 
 #include "proto.h"
 
-#include <string.h>
-#include <stdio.h>
-#include <unistd.h>
-#include <pwd.h>
-#include <ctype.h>
 #include <errno.h>
+#ifdef HAVE_PWD_H
+#include <pwd.h>
+#endif
+#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. */
@@ -36,6 +35,7 @@ void get_homedir(void)
     if (homedir == NULL) {
 	const char *homenv = getenv("HOME");
 
+#ifdef HAVE_PWD_H
 	/* When HOME isn't set, or when we're root, get the home directory
 	 * from the password file instead. */
 	if (homenv == NULL || geteuid() == 0) {
@@ -44,6 +44,7 @@ void get_homedir(void)
 	    if (userage != NULL)
 		homenv = userage->pw_dir;
 	}
+#endif
 
 	/* Only set homedir if some home directory could be determined,
 	 * otherwise keep homedir NULL. */
@@ -52,58 +53,77 @@ 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)
 {
     if (n < 100000) {
-        if (n < 1000) {
-            if (n < 100)
-                return 2;
-            else
-                return 3;
-        } else {
-            if (n < 10000)
-                return 4;
-            else
-                return 5;
-        }
+	if (n < 1000) {
+	    if (n < 100)
+		return 2;
+	    else
+		return 3;
+	} else {
+	    if (n < 10000)
+		return 4;
+	    else
+		return 5;
+	}
     } else {
-        if (n < 10000000) {
-            if (n < 1000000)
-                return 6;
-            else
-                return 7;
-        }
-        else {
-            if (n < 100000000)
-                return 8;
-            else
-                return 9;
-        }
+	if (n < 10000000) {
+	    if (n < 1000000)
+		return 6;
+	    else
+		return 7;
+	} else {
+	    if (n < 100000000)
+		return 8;
+	    else
+		return 9;
+	}
     }
 }
 #endif
 
-/* Read a ssize_t from str, and store it in *val (if val is not NULL).
- * On error, we return FALSE and don't change *val.  Otherwise, we
- * return TRUE. */
-bool parse_num(const char *str, ssize_t *val)
+/* Read an integer from str.  If it parses okay, store it in *result
+ * and return TRUE; otherwise, return FALSE. */
+bool parse_num(const char *str, ssize_t *result)
 {
     char *first_error;
-    ssize_t j;
+    ssize_t value;
 
-    /* The manual page for strtol() says this is required, and
-     * it looks like it is! */
+    /* The manual page for strtol() says this is required. */
     errno = 0;
 
-    j = (ssize_t)strtol(str, &first_error, 10);
+    value = (ssize_t)strtol(str, &first_error, 10);
 
     if (errno == ERANGE || *str == '\0' || *first_error != '\0')
 	return FALSE;
 
-    if (val != NULL)
-	*val = j;
+    *result = value;
 
     return TRUE;
 }
@@ -117,7 +137,7 @@ bool parse_line_column(const char *str, ssize_t *line, ssize_t *column)
     const char *comma;
 
     while (*str == ' ')
-       str++;
+	str++;
 
     comma = strpbrk(str, "m,. /;");
 
@@ -132,7 +152,7 @@ bool parse_line_column(const char *str, ssize_t *line, ssize_t *column)
     firstpart = mallocstrcpy(NULL, str);
     firstpart[comma - str] = '\0';
 
-    retval = parse_num(firstpart, line);
+    retval = parse_num(firstpart, line) && retval;
 
     free(firstpart);
 
@@ -173,94 +193,6 @@ void sunder(char *str)
     }
 }
 
-/* These functions, ngetline() (originally getline()) and ngetdelim()
- * (originally getdelim()), were adapted from GNU mailutils 0.5
- * (mailbox/getline.c).  Here is the notice from that file, after
- * converting to the GPL via LGPL clause 3, and with the Free Software
- * Foundation's address and the copyright years updated:
- *
- * GNU Mailutils -- a suite of utilities for electronic mail
- * Copyright (C) 1999, 2000, 2001, 2002, 2004, 2005, 2006, 2007
- * Free Software Foundation, Inc.
- *
- * This library 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.
- *
- * This library 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 library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301, USA. */
-
-#ifndef DISABLE_NANORC
-
-#ifndef HAVE_GETDELIM
-/* This function is equivalent to getdelim(). */
-ssize_t ngetdelim(char **lineptr, size_t *n, int delim, FILE *stream)
-{
-    size_t indx = 0;
-    int c;
-
-    /* Sanity checks. */
-    if (lineptr == NULL || n == NULL || stream == NULL ||
-	fileno(stream) == -1) {
-	errno = EINVAL;
-	return -1;
-    }
-
-    /* Allocate the line the first time. */
-    if (*lineptr == NULL) {
-	*n = MAX_BUF_SIZE;
-	*lineptr = charalloc(*n);
-    }
-
-    while ((c = getc(stream)) != EOF) {
-	/* Check if more memory is needed. */
-	if (indx >= *n) {
-	    *n += MAX_BUF_SIZE;
-	    *lineptr = charealloc(*lineptr, *n);
-	}
-
-	/* Put the result in the line. */
-	(*lineptr)[indx++] = (char)c;
-
-	/* Bail out. */
-	if (c == delim)
-	    break;
-    }
-
-    /* Make room for the null character. */
-    if (indx >= *n) {
-	*n += MAX_BUF_SIZE;
-	*lineptr = charealloc(*lineptr, *n);
-    }
-
-    /* Null-terminate the buffer. */
-    null_at(lineptr, indx++);
-    *n = indx;
-
-    /* The last line may not have the delimiter.  We have to return what
-     * we got, and the error will be seen on the next iteration. */
-    return (c == EOF && (indx - 1) == 0) ? -1 : indx - 1;
-}
-#endif
-
-#ifndef HAVE_GETLINE
-/* This function is equivalent to getline(). */
-ssize_t ngetline(char **lineptr, size_t *n, FILE *stream)
-{
-    return getdelim(lineptr, n, '\n', stream);
-}
-#endif
-#endif /* !DISABLE_NANORC */
-
-#ifdef HAVE_REGEX_H
 /* 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)
@@ -270,10 +202,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], "[[:");
@@ -285,25 +213,23 @@ 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;
 }
-#endif /* HAVE_REGEX_H */
 
-#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)
 {
-    char before[mb_cur_max()], after[mb_cur_max()];
+    char before[MAXCHARLEN], after[MAXCHARLEN];
     size_t word_end = position + length;
 
     /* Get the characters before and after the word, if any. */
@@ -316,50 +242,75 @@ 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 */
 
-/* If we are searching backwards, we will find the last match that
- * starts no later than start.  Otherwise we find the first match
- * starting no earlier than start.  If we are doing a regexp search, we
- * fill in the global variable regmatches with at most 9 subexpression
- * matches.  Also, all .rm_so elements are relative to the start of the
- * whole match, so regmatches[0].rm_so == 0. */
+/* 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
+ * than the given start; otherwise, we find the first match starting no earlier
+ * than start.  If we are doing a regexp search, and we find a match, we fill
+ * in the global variable regmatches with at most 9 subexpression matches. */
 const char *strstrwrapper(const char *haystack, const char *needle,
 	const char *start)
 {
-    /* start can be 1 character before the start or after the end of the
-     * line.  In either case, we just say no match was found. */
-    if ((start > haystack && *(start - 1) == '\0') || start < haystack)
-	return NULL;
+    if (*needle == '\0') {
+#ifndef NANO_TINY
+	statusline(ALERT, "Searching for nothing -- please report a bug");
+#endif
+	return (char *)start;
+    }
 
-#ifdef HAVE_REGEX_H
     if (ISSET(USE_REGEXP)) {
 	if (ISSET(BACKWARDS_SEARCH)) {
-	    if (regexec(&search_regexp, haystack, 1, regmatches, 0) == 0 &&
-			haystack + regmatches[0].rm_so <= start) {
-		const char *retval = haystack + regmatches[0].rm_so;
+	    size_t last_find, ceiling, far_end;
+	    size_t floor = 0, next_rung = 0;
+		/* The start of the search range, and the next start. */
 
-		/* Search forward until there are no more matches. */
-		while (regexec(&search_regexp, retval + 1, 1,
-			regmatches, REG_NOTBOL) == 0 &&
-			retval + regmatches[0].rm_so + 1 <= start)
-		    retval += regmatches[0].rm_so + 1;
-		/* Finally, put the subexpression matches in global
-		 * variable regmatches.  The REG_NOTBOL flag doesn't
-		 * matter now. */
-		regexec(&search_regexp, retval, 10, regmatches, 0);
-		return retval;
+	    if (regexec(&search_regexp, haystack, 1, regmatches, 0) != 0)
+		return NULL;
+
+	    far_end = strlen(haystack);
+	    ceiling = start - haystack;
+	    last_find = regmatches[0].rm_so;
+
+	    /* A result beyond the search range also means: no match. */
+	    if (last_find > ceiling)
+		return NULL;
+
+	    /* Move the start-of-range forward until there is no more match;
+	     * then the last match found is the first match backwards. */
+	    while (regmatches[0].rm_so <= ceiling) {
+		floor = next_rung;
+		last_find = regmatches[0].rm_so;
+		/* If this is the last possible match, don't try to advance. */
+		if (last_find == ceiling)
+		    break;
+		next_rung = move_mbright(haystack, last_find);
+		regmatches[0].rm_so = next_rung;
+		regmatches[0].rm_eo = far_end;
+		if (regexec(&search_regexp, haystack, 1, regmatches,
+					REG_STARTEND) != 0)
+		    break;
 	    }
-	} else if (regexec(&search_regexp, start, 10, regmatches,
-			(start > haystack) ? REG_NOTBOL : 0) == 0) {
-	    const char *retval = start + regmatches[0].rm_so;
 
-	    regexec(&search_regexp, retval, 10, regmatches, 0);
-	    return retval;
+	    /* Find the last match again, to get possible submatches. */
+	    regmatches[0].rm_so = floor;
+	    regmatches[0].rm_eo = far_end;
+	    if (regexec(&search_regexp, haystack, 10, regmatches,
+					REG_STARTEND) != 0)
+		return NULL;
+
+	    return haystack + regmatches[0].rm_so;
 	}
-	return NULL;
+
+	/* Do a forward regex search from the starting point. */
+	regmatches[0].rm_so = start - haystack;
+	regmatches[0].rm_eo = strlen(haystack);
+	if (regexec(&search_regexp, haystack, 10, regmatches,
+					REG_STARTEND) != 0)
+	    return NULL;
+	else
+	    return haystack + regmatches[0].rm_so;
     }
-#endif /* HAVE_REGEX_H */
     if (ISSET(CASE_SENSITIVE)) {
 	if (ISSET(BACKWARDS_SEARCH))
 	    return revstrstr(haystack, needle, start);
@@ -437,13 +388,14 @@ char *free_and_assign(char *dest, char *src)
     return src;
 }
 
-/* nano scrolls horizontally within a line in chunks.  Return the column
- * number of the first character displayed in the edit window when the
+/* When not in softwrap mode, nano scrolls horizontally within a line in
+ * chunks (a bit smaller than the chunks used in softwrapping).  Return the
+ * column number of the first character displayed in the edit window when the
  * cursor is at the given column.  Note that (0 <= column -
  * get_page_start(column) < COLS). */
 size_t get_page_start(size_t column)
 {
-    if (column == 0 || column < editwincols - 1)
+    if (column < editwincols - 1 || ISSET(SOFTWRAP) || column == 0)
 	return 0;
     else if (editwincols > 8)
 	return column - 7 - (column - 7) % (editwincols - 8);
@@ -462,10 +414,10 @@ size_t xplustabs(void)
  * not overshoot the given column. */
 size_t actual_x(const char *text, size_t column)
 {
-    size_t index = 0;
-	/* The index in text, returned. */
+    const char *start = text;
+	/* From where we start walking through the text. */
     size_t width = 0;
-	/* The screen display width to text[index], in columns. */
+	/* The current accumulated span, in columns. */
 
     while (*text != '\0') {
 	int charlen = parse_mbchar(text, NULL, &width);
@@ -473,11 +425,10 @@ size_t actual_x(const char *text, size_t column)
 	if (width > column)
 	    break;
 
-	index += charlen;
 	text += charlen;
     }
 
-    return index;
+    return (text - start);
 }
 
 /* A strnlen() with tabs and multicolumn characters factored in:
@@ -503,29 +454,27 @@ size_t strnlenpt(const char *text, size_t maxlen)
     return width;
 }
 
-/* A strlen() with tabs and multicolumn characters factored in:
- * how many columns wide is text? */
+/* Return the number of columns that the given text occupies. */
 size_t strlenpt(const char *text)
 {
-    return strnlenpt(text, (size_t)-1);
+    size_t span = 0;
+
+    while (*text != '\0')
+	text += parse_mbchar(text, NULL, &span);
+
+    return span;
 }
 
 /* Append a new magicline to filebot. */
 void new_magicline(void)
 {
-    openfile->filebot->next = (filestruct *)nmalloc(sizeof(filestruct));
+    openfile->filebot->next = make_new_node(openfile->filebot);
     openfile->filebot->next->data = mallocstrcpy(NULL, "");
-    openfile->filebot->next->prev = openfile->filebot;
-    openfile->filebot->next->next = NULL;
-    openfile->filebot->next->lineno = openfile->filebot->lineno + 1;
-#ifndef DISABLE_COLOR
-    openfile->filebot->next->multidata = NULL;
-#endif
     openfile->filebot = openfile->filebot->next;
     openfile->totsize++;
 }
 
-#ifndef NANO_TINY
+#if !defined(NANO_TINY) || defined(ENABLE_HELP)
 /* Remove the magicline from filebot, if there is one and it isn't the
  * only line in the file.  Assume that edittop and current are not at
  * filebot. */
@@ -539,7 +488,9 @@ void remove_magicline(void)
 	openfile->totsize--;
     }
 }
+#endif
 
+#ifndef NANO_TINY
 /* Set top_x and bot_x to the top and bottom x-coordinates of the mark,
  * respectively, based on the locations of top and bot.  If
  * right_side_up isn't NULL, set it to TRUE if the mark begins with
@@ -580,8 +531,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;
     }
 
@@ -608,7 +558,7 @@ size_t get_totsize(const filestruct *begin, const filestruct *end)
 }
 
 #ifdef DEBUG
-/* Dump the filestruct inptr to stderr. */
+/* Dump the given buffer to stderr. */
 void dump_filestruct(const filestruct *inptr)
 {
     if (inptr == openfile->fileage)
@@ -619,19 +569,18 @@ 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;
     }
 }
 
-/* Dump the current buffer's filestruct to stderr in reverse. */
+/* Dump the current buffer to stderr in reverse. */
 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/Makefile.am

@@ -22,6 +22,7 @@ pkgdata_DATA =	asm.nanorc \
 		man.nanorc \
 		mgp.nanorc \
 		mutt.nanorc \
+		nanohelp.nanorc \
 		nanorc.nanorc \
 		nftables.nanorc \
 		objc.nanorc \

syntax/c.nanorc

@@ -4,10 +4,14 @@ syntax "c" "\.(c(c|pp|xx|\+\+)?|C)$" "\.(h(h|pp|xx)?|H)$" "\.ii?$"
 magic "(ASCII|UTF-8 Unicode) C(\+\+)? program text"
 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|using|mutable|volatile|register|explicit)\>"
+color green "\<(class|namespace|template|public|protected|private|typename|this|friend|virtual|override|using|mutable|volatile|register|explicit)\>"
 color brightyellow "\<(for|if|while|do|else|case|default|switch)\>"
 color brightyellow "\<(try|throw|catch|operator|new|delete)\>"
 color magenta "\<(goto|continue|break|return)\>"

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/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)$"
+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,18 +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:
@@ -66,3 +70,5 @@ color brightmagenta "^[[:space:]]*(=|~|<|<=|>|>=)"
 color yellow "#.*$"
 ## Trailing space is bad!
 color ,green "[[:space:]]+$"
+## Mixed whitespace is also bad.
+color ,green " 	"

syntax/html.nanorc

@@ -5,7 +5,7 @@ magic "HTML document text"
 comment "<!--|-->"
 
 # Tags:
-color cyan start="<[[:alpha:]/!?]" end=">"
+color cyan "<[[:alpha:]/!?][^>]*>"
 # Bold, italic, and underlined:
 color brightmagenta "</?[biu]>"
 

syntax/makefile.nanorc

@@ -7,7 +7,7 @@ color red "[:=]"
 color magenta "\<(if|ifeq|else|endif)\>"
 color blue "\$+[{(][a-zA-Z0-9_-]+[})]"
 color brightblue "^[^ 	]+:"
-color green "#.*$"
+color green "(^|[[:space:]]+)#.*"
 
 ## Trailing whitespace.
 color ,green "[[:space:]]+$"