diff --git a/ChangeLog b/ChangeLog
index 18916f74e18e9d51620e6a3706ec55546245aa72..b1b51aba114618e02902cf22877fb413d9b93b98 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,77 @@
+Changes between v2.9.2 and v2.9.3:
+----------------------------------
+
+Benno Schulenberg (65):
+ build: fix compilation when configured with --enable(tiny,color,nanorc}
+ build: fix compilation with --enable-tiny --enable-justify
+ build: let ./configure fail (not just warn) when curses.h is missing
+ bump version numbers and add a news item for the 2.9.3 release
+ copyright: update the years for the FSF
+ display: wipe the status bar when doing a total refresh
+ docs: remove the note about needing a recent ncurses for macros to work
+ docs: update the FAQ for the changed default location of history files
+ docs: update the TODO file to the current state of affairs
+ gnulib: update to its current upstream state
+ help: don't get stuck when there is an unwrappable piece of text
+ input: consume only the actual length of an escape sequence
+ input: fully reset state when a three-digit character code is cut short
+ input: make <Shift+Tab> do an unindent also on a Manjaro console
+ input: recognize escape sequences for <Shift+PageUp> and <Shift+PageDown>
+ input: recognize more escape sequences for <Shift+Home> and <Shift+End>
+ input: recognize the deviant keycode for <Ctrl+End> in urxvt
+ options: recognize -M and --trimblanks on the command line
+ painting: look for an end match only after a start match, if any
+ prompt: show whitespace only in the filename, not in the whole line
+ replacing: don't skip the first character of a backwards-marked region
+ search: suppress the occurrence at the cursor only when replacing
+ startup: allow a named pipe as file argument when --noread is used
+ startup: make an error message succinct and to the point
+ startup: move the initialization of colors, so any error gets printed
+ syntax: go: colorize only valid octal numbers
+ syntax: lua: do not color debug.setinfo as it doesn't exist
+ syntax: nanohelp: color also the Sh-Tab key combo
+ tweaks: change a 'do' to a 'while', and return early to elide an 'if'
+ tweaks: check for the type of terminal far earlier
+ tweaks: condense a condition and a comment, and reshuffle a line
+ tweaks: condense and rewrap some comments, and reindent two lines
+ tweaks: condense the conditional compilation of shortcut reassignments
+ tweaks: don't bother freeing the key buffer, just reallocate it
+ tweaks: don't bother to reallocate when the keybuffer size decreases
+ tweaks: drop a superfluous parameter, as it is always 1
+ tweaks: drop a useless assert, and don't abort over an unhandled option
+ tweaks: drop two unneeded initializations, and trim a comment
+ tweaks: elide a tiny intermediate buffer, and rename two variables
+ tweaks: exclude --trimblanks when no wrapping or justifying is configured
+ tweaks: fully include Savefile and Wherewas in the tiny version
+ tweaks: indenting text files with tabs is not a good idea
+ tweaks: mark the two blocks that have a deviant indentation
+ tweaks: move a bunch of comments to the lines that they refer to
+ tweaks: move two functions to their proper place, orderingwise
+ tweaks: remove a fragment of dead code
+ tweaks: remove a handful of redundant (because always true) asserts
+ tweaks: remove a superfluous case -- there can never be four digits
+ tweaks: remove a superfluous check, as we insert always one code
+ tweaks: rename a function, for aptness, and drop a superfluous check
+ tweaks: rename a function, to be more distinct
+ tweaks: rename a variable, and further condense some comments
+ tweaks: rename a variable, for more contrast
+ tweaks: rename a variable, to better fit its usage
+ tweaks: rename two variables, and swap their declaration order
+ tweaks: rename two variables, for preciseness and shortness
+ tweaks: reshuffle a couple of lines
+ tweaks: reshuffle a couple of lines, to make a bit more sense
+ tweaks: reshuffle some stuff, and avoid a memory leak
+ tweaks: reshuffle two condition series, to look better
+ tweaks: rewrap a bunch of lines in the NEWS file
+ tweaks: set a modifier in a single place, for conciseness
+ tweaks: swap the row and col parameters to a more consistent order
+ tweaks: transform a parameter, from a pointer to the value itself
+ wrapping: don't trim a blank character that the user just typed
+
+Brand Huntsman (1):
+ startup: parse interface colors when they are read, not when initialized
+
+
Changes between v2.9.1 and v2.9.2:
----------------------------------
diff --git a/NEWS b/NEWS
index bbe58f62f0909e7b97d644e0bf03f2c81b210604..9bd99bd1447bcfc54bc02cf4bb741e4b7f419847 100644
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,17 @@
+2018.01.29 - GNU nano 2.9.3 "Córdoba" fixes a segfault with trimblanks
+ that could occur when a typed space caused the word after
+ it to be pushed to the next line. It further makes macros
+ work also when your keyboard still emits escape sequences,
+ adds the options -M and --trimblanks for the command line,
+ recognizes key combos with Shift on a few more terminals,
+ no longer shows dots in certain prompt texts when visible
+ witespace is turned on, fixes two corner cases when doing
+ replacements in a marked region, allows to open a named
+ pipe again when using --noread, and accurately detects
+ a needed color change when a line contains a start match
+ but not a corresponding end match any more. Plus some
+ other small fry.
+
2018.01.02 - GNU nano 2.9.2 "Pussy Riot" correctly displays the Modified
state when undoing/redoing (also when the file was saved
somewhere midway), improves the undoing of an automatic
diff --git a/configure.ac b/configure.ac
index e0995fa7adc84524b0051322766a0db0c97ee2ad..5edf7ee02ec1f0630565161fcd1564f7cb78b8a1 100644
--- a/configure.ac
+++ b/configure.ac
@@ -16,7 +16,7 @@
# You should have received a copy of the GNU General Public License
# along with this program. If not, see http://www.gnu.org/licenses/.
-AC_INIT([GNU nano], [2.9.2], [nano-devel@gnu.org], [nano])
+AC_INIT([GNU nano], [2.9.3], [nano-devel@gnu.org], [nano])
AC_CONFIG_SRCDIR([src/nano.c])
AC_CANONICAL_HOST
AM_INIT_AUTOMAKE([1.14])
diff --git a/doc/faq.html b/doc/faq.html
index cba9d55238a84567864e6919722f0ea3dc20d2bb..d754a402bec58a325599ffae63ca597f534fd03f 100644
--- a/doc/faq.html
+++ b/doc/faq.html
@@ -83,7 +83,7 @@
<h2><a name="1.3"></a>1.3. Why the name change from TIP?</h2>
<blockquote><p>On January 10, 2000, TIP was officially renamed to nano because of a namespace conflict with another program called 'tip'. The original 'tip' program "establishes a full duplex terminal connection to a remote host", and was included with many older Unix systems (and newer ones like Solaris). The conflict was not noticed at first because there is no 'tip' utility included with most GNU/Linux distributions (where nano was developed).</p></blockquote>
<h2><a name="1.4"></a>1.4. What is the current version of nano?</h2>
-<blockquote><p>The current version of nano <i>should</i> be <b>2.9.2</b>. Of course, you should always check the <a href="https://nano-editor.org/">nano homepage</a> to see what the latest and greatest version is.</p></blockquote>
+<blockquote><p>The current version of nano <i>should</i> be <b>2.9.3</b>. Of course, you should always check the <a href="https://nano-editor.org/">nano homepage</a> to see what the latest and greatest version is.</p></blockquote>
<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%">
diff --git a/doc/nano.1 b/doc/nano.1
index e6d3055a1b9dedd3032cc9c7da3bf68e0ce0d8b0..b9de3f8ea1394539f8c5d887fa4e49d4294c12f8 100644
--- a/doc/nano.1
+++ b/doc/nano.1
@@ -16,7 +16,7 @@
.\" Documentation License along with this program. If not, see
.\" <http://www.gnu.org/licenses/>.
.\"
-.TH NANO 1 "version 2.9.2" "January 2018"
+.TH NANO 1 "version 2.9.3" "January 2018"
.SH NAME
nano \- Nano's ANOther editor, an enhanced free Pico clone
diff --git a/doc/nano.texi b/doc/nano.texi
index 3a80a86587e4d3780970711f767cea389a88fd85..66c63aa41a4127f69c26cc17862e9cba5b84c6c6 100644
--- a/doc/nano.texi
+++ b/doc/nano.texi
@@ -8,7 +8,7 @@
@smallbook
@set EDITION 0.5
-@set VERSION 2.9.2
+@set VERSION 2.9.3
@set UPDATED January 2018
@dircategory Editors
@@ -23,7 +23,7 @@
@titlepage
@title GNU @command{nano}
@subtitle a small and friendly text editor
-@subtitle version 2.9.2
+@subtitle version 2.9.3
@author Chris Allegretta
@page
@@ -63,7 +63,7 @@ e-mail: @email{chrisa@@asty.org}@*
@node Top
@top
-This manual documents the GNU @command{nano} editor, version 2.9.2.
+This manual documents the GNU @command{nano} editor, version 2.9.3.
@menu
* Introduction::
diff --git a/doc/nanorc.5 b/doc/nanorc.5
index a1a5cb32626f3176f98dca1b37f63311ea9ca252..578630a3840ef1615caa1bcbd53529b07aa5310b 100644
--- a/doc/nanorc.5
+++ b/doc/nanorc.5
@@ -16,7 +16,7 @@
.\" Documentation License along with this program. If not, see
.\" <http://www.gnu.org/licenses/>.
.\"
-.TH NANORC 5 "version 2.9.2" "January 2018"
+.TH NANORC 5 "version 2.9.3" "January 2018"
.SH NAME
nanorc \- GNU nano's configuration file
diff --git a/doc/rnano.1 b/doc/rnano.1
index 41b62a3c228be065cac2a1f71befd8682efc7bc5..e66d0434444dd2cf4da309b4e82696dfbaea2506 100644
--- a/doc/rnano.1
+++ b/doc/rnano.1
@@ -16,7 +16,7 @@
.\" Documentation License along with this program. If not, see
.\" <http://www.gnu.org/licenses/>.
.\"
-.TH RNANO 1 "version 2.9.2" "January 2018"
+.TH RNANO 1 "version 2.9.3" "January 2018"
.SH NAME
rnano \- a restricted nano