po: update translations and regenerate POT file and PO files

bump version numbers and add a news item for 2.7.0
files: close a lockfile after reading it
2016-09-01 12:42:50 +02:00 · 2016-09-01 12:38:35 +02:00 · 2016-08-30 11:48:35 +02:00 · 2016-08-30 11:14:19 +02:00 · 2016-08-30 10:41:28 +02:00 · 2016-08-30 10:12:02 +02:00
65 changed files with 17082 additions and 16999 deletions
--- a/13
+++ b/13
@@ -1,9 +1,9 @@
 This file lists people who have made significant contributions to the
 nano editor.  Please see the ChangeLog for specific changes by author.
-------------------------------------------------------------------------
+----------------------------------------------------------------------

 Chris Allegretta <chrisa@asty.org>
-	* Original program author, former and current maintainer.
+	* Original program author and long-time maintainer.

 David Lawrence Ramsey <pooka109@gmail.com>
 	* Former stable series maintainer.  Multiple buffer support,
@@ -44,6 +44,13 @@ Mike Frysinger <vapier@gentoo.org>
 Mark Majeres <mark@engine12.com>
 	* A functional undo/redo system, and coloring nano's interface.

+Mahyar Abbaspour <mahyar.abaspour@gmail.com>
+	* Improved handling of SIGWINCH.
+
+Mike Scalora <mike@scalora.org>
+	* The comment/uncomment feature.
+
 Benno Schulenberg <bensberg@justemail.net>
-	* A bunch of small bug fixes, the cutword routines, some extra
+	* An array of small bug fixes, the cut-word and block-jump
+	  routines, text selection by holding Shift, and some extra
 	  key bindings.  Current maintainer.
--- a/5
+++ b/5
@@ -1,7 +1,8 @@
-Improvements in nano
-====================
+Improvements in GNU nano
+========================

 Since 2.6.0:
+  - Shift plus the cursor keys can be used for selecting text.
  - Ctrl+Arrow should now work also on a Linux virtual console.
  - Ctrl+Up and Ctrl+Down jump to previous or next block of text.
  - Feedback during Unicode Input (M-V followed by six digits).
--- a/8
+++ b/8
@@ -1,3 +1,11 @@
+2016.09.01 - GNU nano 2.7.0 "Suni" adds a new feature: allowing text to be
+		selected by holding Shift together with the cursor keys.
+		Besides that, nano now works also when run in very tiny
+		terminals (down to one line, one column), and improves
+		the handling of the prompt in cramped spaces.  Not much,
+		but it's time to get it out there.
+
+
 2016.08.10 - nano 2.6.3 "Marika" makes the Ctrl+Arrow keys work also on
 		a Linux virtual console, takes as verbatim only the very
 		first keystroke after M-V, removes any lock files that it
--- a/6
+++ b/6
@@ -1,5 +1,5 @@

-	nano - an enhanced clone of the Pico text editor
+	GNU nano - an enhanced clone of the Pico text editor.

 Overview

@@ -68,5 +68,5 @@ Mailing Lists and Bug Reports

 Current Status

-	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.
+	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.
--- a/README.GIT
+++ b/README.GIT
@@ -1,14 +1,14 @@
 INSTRUCTIONS TO COMPILE AND INSTALL NANO GIT VERSIONS
 =====================================================

-The latest version of nano is available via git, but building this needs a
-bit more care than the official stable and unstable tarballs.
+The latest version of GNU nano is available via git, but building this needs
+a bit more care than the official stable and unstable tarballs.


 Prerequisites
 -------------

-To successfully compile nano from the git repo, you'll need the following
+To successfully compile GNU nano from the git repo, you'll need the following
 packages:

 - autoconf    (version >= 2.61)
@@ -80,5 +80,26 @@ you'll need to run that "make install" command with root privileges.
 Problems?
 ---------

-Please submit any bugs in the git repository using the Savannah project's
-bug tracker (https://savannah.gnu.org/bugs/?group=nano).
+Please submit any bugs you find in the code in git via the bug tracker
+on Savannah (https://savannah.gnu.org/bugs/?group=nano).
+
+
+Contributing something
+----------------------
+
+If you have a fix for a bug, or the code for a new or improved feature,
+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:
+
+    $ git commit -as
+
+Then create a patch (or patches):
+
+    $ git format-patch master
+
+Send that patch (or patches) to <nano-devel@gnu.org>, as an attachment
+or with git send-email.
--- a/2
+++ b/2
@@ -1,4 +1,4 @@
-The following people have helped nano in some way or other.
+The following people have helped GNU nano in some way or another.
 If we missed you here, let us know!


--- a/configure.ac
+++ b/configure.ac
@@ -1,24 +1,22 @@
-# Configuration for nano - a small and user-friendly text editor
+# 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.
 #
-# 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, or (at your option) any
-# later version.
+# 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.
 #
-# 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.
+# 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 nano; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301,
-# USA.
+# along with this program.  If not, see http://www.gnu.org/licenses/.

-AC_INIT([nano], [2.6.3], [nano-devel@gnu.org], [nano])
+AC_INIT([GNU nano], [2.7.0], [nano-devel@gnu.org], [nano])
 AC_CONFIG_SRCDIR([src/nano.c])
 AC_CANONICAL_HOST
 AM_INIT_AUTOMAKE
--- a/doc/faq.html
+++ b/doc/faq.html
@@ -1,21 +1,21 @@
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
 <html>
 <head>
-  <title>The nano editor FAQ</title>
+  <title>The GNU nano editor FAQ</title>
  <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
 </head>
 <body text="#330000" bgcolor="#ffffff" link="#0000ef" vlink="#51188e" alink="#ff0000">
-<h1>The nano editor FAQ</h1>
+<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 nano?</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>
-<h2><a href="#2">2. Where to get nano.</a></h2>
+<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>
  <a href="#2.2">2.2. RedHat and derivatives (.rpm) packages.</a><br>
  <a href="#2.3">2.3. Debian (.deb) packages.</a><br>
@@ -69,8 +69,8 @@
 <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 nano?</h2>
-<blockquote><p>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 perhaps include extra functionality&quot;.</p></blockquote>
+<h2><a name="1.3"></a>1.3. 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 perhaps include extra functionality&quot;.</p></blockquote>
 <h2><a name="1.4"></a>1.4. What is the history behind nano?</h2>
 <blockquote><p>Funny you should ask!</p>
  <p><b>In the beginning...</b></p>
@@ -88,7 +88,7 @@
 <h2><a name="1.7"></a>1.7. 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/v2.6/nano.1.html">here</a>.</p></blockquote>
 <hr width="100%">
-<h1><a name="2"></a>2. Where to get nano.</h1>
+<h1><a name="2"></a>2. Where to get GNU nano.</h1>
 <h2><a name="2.1"></a>2.1. FTP and WWW sites that carry nano.</h2>
 <blockquote><p>The nano distribution can be downloaded at the following web sites:</p>
  <ul>
@@ -221,7 +221,7 @@
 <hr width="100%">
 <h1><a name="5"></a>5. Internationalization</h1>
 <h2><a name="5.1"></a>5.1. There's no translation for my language!</h2>
-<blockquote><p>In June 2001, nano entered the <a href="http://translationproject.org/html/welcome.html">Translation Project</a> and since then, translations should be managed from there.</p>
+<blockquote><p>In June 2001, GNU nano entered the <a href="http://translationproject.org/html/welcome.html">Translation Project</a> and since then, translations should be managed from there.</p>
  <p>If there isn't a translation for your language, you could ask <a href="http://translationproject.org/team/">your language team</a> to translate nano, or better still, join that team and do it yourself. Joining a team is easy. You just need to ask the team leader to add you, and then send a <a href="http://translationproject.org/disclaim.txt">translation disclaimer to the FSF</a> (this is necessary as nano is an official GNU package, but it does <b>not</b> mean that you transfer the rights of your work to the FSF, it's just so the FSF can legally manage them).</p>
  <p>In any case, translating nano is very easy. Just grab the latest <b>nano.pot</b> file listed on <a href="http://translationproject.org/domain/nano.html">nano's page</a> at the TP, and translate each <b>msgid</b> line into your native language on the <b>msgstr</b> line. When you're done, you should send it to the TP's central po repository.</p></blockquote>
 <h2><a name="5.2"></a>5.2. I don't like the translation for &lt;x&gt; in my language. How can I fix it?</h2>
--- a/doc/man/nano.1
+++ b/doc/man/nano.1
@@ -17,7 +17,7 @@
 .\"   Documentation License along with this program.  If not, see
 .\"   <http://www.gnu.org/licenses/>.
 .\"
-.TH NANO 1 "version 2.6.3" "August 2016"
+.TH NANO 1 "version 2.7.0" "September 2016"
 .\" Please adjust this date whenever revising the manpage.
 .\"

@@ -48,9 +48,13 @@ contents of the cutbuffer at the current cursor position.
 When a more precise piece of text needs to be cut or copied, one can mark
 its start with \fB^6\fR, move the cursor to its end (the marked text will be
 highlighted), and then use \fB^K\fR to cut it, or \fBM-6\fR to copy it to the
-cutbuffer. One can also save the marked text to a file with \fB^O\fR, or
+cutbuffer.  One can also save the marked text to a file with \fB^O\fR, or
 spell check it with \fB^T\fR.
 .PP
+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 built-in help (\fB^G\fR) lists all the available ones.
 The default key bindings can be changed via the .nanorc file -- see
--- a/doc/man/nanorc.5
+++ b/doc/man/nanorc.5
@@ -17,11 +17,11 @@
 .\"   Documentation License along with this program.  If not, see
 .\"   <http://www.gnu.org/licenses/>.
 .\"
-.TH NANORC 5 "version 2.6.3" "August 2016"
+.TH NANORC 5 "version 2.7.0" "September 2016"
 .\" Please adjust this date whenever revising the manpage.
 .\"
 .SH NAME
-nanorc \- nano's rcfile
+nanorc \- GNU nano's rcfile
 .SH DESCRIPTION
 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
--- a/doc/man/rnano.1
+++ b/doc/man/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.6.3" "August 2016"
+.TH RNANO 1 "version 2.7.0" "September 2016"
 .\" Please adjust this date whenever revising the manpage.
 .\"
 .SH NAME
--- a/doc/nanorc.sample.in
+++ b/doc/nanorc.sample.in
@@ -1,4 +1,4 @@
-## Sample initialization file for nano.
+## Sample initialization file for GNU nano.
 ##
 ## Please note that you must have configured nano with --enable-nanorc
 ## for this file to be read!  Also note that this file should not be in
--- a/doc/texinfo/nano.texi
+++ b/doc/texinfo/nano.texi
@@ -6,8 +6,8 @@

@smallbook
@set EDITION 0.4
-@set VERSION 2.6.3
-@set UPDATED August 2016
+@set VERSION 2.7.0
+@set UPDATED September 2016

@dircategory Editors
@direntry
@@ -19,16 +19,16 @@
@c end tex

@titlepage
-@title @code{nano}
+@title GNU @code{nano}
@subtitle a small and friendly text editor.
-@subtitle version 2.6.3
+@subtitle version 2.7.0

@author Chris Allegretta
@page

-This manual documents @code{nano}, a small and friendly text editor.
+This manual documents GNU @code{nano}, a small and friendly text editor.

-This manual is part of the @code{nano} distribution.@*
+This manual is part of the GNU @code{nano} distribution.@*
@sp 4
 Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007,
 2009, 2014, 2015 Free Software Foundation, Inc.
@@ -55,7 +55,7 @@ e-mail: @email{chrisa@@asty.org}@*
@node Top
@top

-This manual documents @code{nano}, a small and friendly text editor.
+This manual documents GNU @code{nano}, a small and friendly text editor.

@menu
 * Introduction::
@@ -74,7 +74,7 @@ This manual documents @code{nano}, a small and friendly text editor.
@node Introduction
@chapter Introduction

-@code{nano} is a small and friendly text editor.  Besides basic text
+GNU @code{nano} is a small and friendly text editor.  Besides basic text
 editing, @code{nano} offers many extra features, such as an interactive
 search-and-replace, undo/redo, syntax coloring, smooth scrolling,
 auto-indentation, go-to-line-and-column-number, feature toggles,
@@ -1491,7 +1491,7 @@ chances are you only want this feature when you're working on the nano source.

@item --disable-nls
 Disables Native Language support.  This will disable the use of any
-available @code{nano} translations.
+available GNU @code{nano} translations.

@item --disable-wrapping-as-root
 Disable hard-wrapping of overlong lines by default when @code{nano}
--- a/nano.spec.in
+++ b/nano.spec.in
@@ -18,7 +18,7 @@ Requires(post)	: info
 Requires(preun)	: info

 %description
-nano is a small and friendly text editor.  It aims to emulate the
+GNU nano is a small and friendly text editor.  It aims to emulate the
 Pico text editor while also offering several enhancements.

 %prep
--- a/po/bg.po
+++ b/po/bg.po
--- a/po/ca.po
+++ b/po/ca.po
--- a/po/cs.po
+++ b/po/cs.po
--- a/po/da.po
+++ b/po/da.po
--- a/po/de.po
+++ b/po/de.po
--- a/po/eo.po
+++ b/po/eo.po
--- a/po/es.po
+++ b/po/es.po
--- a/po/eu.po
+++ b/po/eu.po
--- a/po/fi.po
+++ b/po/fi.po
--- a/po/fr.po
+++ b/po/fr.po
--- a/po/ga.po
+++ b/po/ga.po
--- a/po/gl.po
+++ b/po/gl.po
--- a/po/hr.po
+++ b/po/hr.po
--- a/po/hu.po
+++ b/po/hu.po
--- a/po/id.po
+++ b/po/id.po
--- a/po/it.po
+++ b/po/it.po
--- a/po/ja.po
+++ b/po/ja.po
--- a/po/ms.po
+++ b/po/ms.po
--- a/po/nano.pot
+++ b/po/nano.pot
--- a/po/nb.po
+++ b/po/nb.po
--- a/po/nl.po
+++ b/po/nl.po
--- a/po/nn.po
+++ b/po/nn.po
--- a/po/pl.po
+++ b/po/pl.po
--- a/po/pt_BR.po
+++ b/po/pt_BR.po
--- a/po/ro.po
+++ b/po/ro.po
--- a/po/ru.po
+++ b/po/ru.po
--- a/po/sl.po
+++ b/po/sl.po
--- a/po/sr.po
+++ b/po/sr.po
--- a/po/sv.po
+++ b/po/sv.po
--- a/po/tr.po
+++ b/po/tr.po
--- a/po/uk.po
+++ b/po/uk.po
--- a/po/vi.po
+++ b/po/vi.po
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
--- a/po/zh_TW.po
+++ b/po/zh_TW.po
--- a/src/browser.c
+++ b/src/browser.c
@@ -1,23 +1,22 @@
 /**************************************************************************
- *   browser.c                                                            *
+ *   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                           *
 *                                                                        *
- *   This program 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, or (at your option)  *
- *   any later version.                                                   *
+ *   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.                               *
 *                                                                        *
- *   This program 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.                             *
+ *   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, write to the Free Software          *
- *   Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA            *
- *   02110-1301, USA.                                                     *
+ *   along with this program.  If not, see http://www.gnu.org/licenses/.  *
 *                                                                        *
 **************************************************************************/

@@ -681,13 +680,13 @@ int filesearch_init(void)
    /* This is now one simple call.  It just does a lot. */
    input = do_prompt(FALSE,
 #ifndef DISABLE_TABCOMP
-	TRUE,
+		TRUE,
 #endif
-	MWHEREISFILE, NULL,
+		MWHEREISFILE, NULL,
 #ifndef DISABLE_HISTORIES
-	&search_history,
+		&search_history,
 #endif
-	browser_refresh, "%s%s", _("Search"), buf);
+		browser_refresh, "%s%s", _("Search"), buf);

    /* Release buf now that we don't need it anymore. */
    free(buf);
--- a/src/chars.c
+++ b/src/chars.c
@@ -1,22 +1,22 @@
 /**************************************************************************
- *   chars.c                                                              *
+ *   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.                *
- *   This program 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, or (at your option)  *
- *   any later version.                                                   *
+ *   Copyright (C) 2016 Benno Schulenberg                                 *
 *                                                                        *
- *   This program 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.                             *
+ *   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, write to the Free Software          *
- *   Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA            *
- *   02110-1301, USA.                                                     *
+ *   along with this program.  If not, see http://www.gnu.org/licenses/.  *
 *                                                                        *
 **************************************************************************/

--- a/src/color.c
+++ b/src/color.c
@@ -1,22 +1,22 @@
 /**************************************************************************
- *   color.c                                                              *
+ *   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.          *
- *   This program 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, or (at your option)  *
- *   any later version.                                                   *
+ *   Copyright (C) 2014, 2015, 2016 Benno Schulenberg                     *
 *                                                                        *
- *   This program 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.                             *
+ *   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, write to the Free Software          *
- *   Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA            *
- *   02110-1301, USA.                                                     *
+ *   along with this program.  If not, see http://www.gnu.org/licenses/.  *
 *                                                                        *
 **************************************************************************/

--- a/src/cut.c
+++ b/src/cut.c
@@ -1,22 +1,23 @@
 /**************************************************************************
- *   cut.c                                                                *
+ *   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.    *
- *   This program 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, or (at your option)  *
- *   any later version.                                                   *
+ *   Copyright (C) 2014 Mark Majeres                                      *
+ *   Copyright (C) 2016 Benno Schulenberg                                 *
 *                                                                        *
- *   This program 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.                             *
+ *   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, write to the Free Software          *
- *   Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA            *
- *   02110-1301, USA.                                                     *
+ *   along with this program.  If not, see http://www.gnu.org/licenses/.  *
 *                                                                        *
 **************************************************************************/

--- a/src/files.c
+++ b/src/files.c
@@ -1,22 +1,22 @@
 /**************************************************************************
- *   files.c                                                              *
+ *   files.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.    *
- *   This program 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, or (at your option)  *
- *   any later version.                                                   *
+ *   Copyright (C) 2015, 2016 Benno Schulenberg                           *
 *                                                                        *
- *   This program 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.                             *
+ *   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, write to the Free Software          *
- *   Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA            *
- *   02110-1301, USA.                                                     *
+ *   along with this program.  If not, see http://www.gnu.org/licenses/.  *
 *                                                                        *
 **************************************************************************/

@@ -100,6 +100,7 @@ void make_new_buffer(void)
    openfile->mark_set = FALSE;
    openfile->mark_begin = NULL;
    openfile->mark_begin_x = 0;
+    openfile->kind_of_mark = SOFTMARK;

    openfile->fmt = NIX_FILE;

@@ -336,6 +337,8 @@ int do_lockfile(const char *filename)
 	    readtot += readamt;
 	} while (readamt > 0 && readtot < LOCKBUFSIZE);

+	close(lockfd);
+
 	if (readtot < 48) {
 	    statusline(MILD, _("Error reading lock file %s: "
 			"Not enough data read"), lockfilename);
@@ -836,7 +839,7 @@ void read_file(FILE *f, int fd, const char *filename, bool undoable, bool checkw
    if (len > 0) {
 #ifndef NANO_TINY
 	/* If file conversion isn't disabled and the last character in
-	 * this file is '\r', set format to Mac if we currently think
+	 * This file is '\r', set format to Mac if we currently think
 	 * the file is a *nix file, or to both DOS and Mac if we
 	 * currently think the file is a DOS file. */
 	if (buf[len - 1] == '\r' && !ISSET(NO_CONVERT) && format < 2)
@@ -1085,21 +1088,21 @@ void do_insertfile(
    while (TRUE) {
 #ifndef NANO_TINY
 	if (execute) {
-	    msg =
 #ifndef DISABLE_MULTIBUFFER
-		ISSET(MULTIBUFFER) ?
-		_("Command to execute in new buffer [from %s] ") :
+	    if (ISSET(MULTIBUFFER))
+		msg = _("Command to execute in new buffer [from %s] ");
+	    else
 #endif
-		_("Command to execute [from %s] ");
+		msg = _("Command to execute [from %s] ");
 	} else
 #endif /* NANO_TINY */
 	{
-	    msg =
 #ifndef DISABLE_MULTIBUFFER
-		ISSET(MULTIBUFFER) ?
-		_("File to insert into new buffer [from %s] ") :
+	    if (ISSET(MULTIBUFFER))
+		msg = _("File to insert into new buffer [from %s] ");
+	    else
 #endif
-		_("File to insert [from %s] ");
+		msg = _("File to insert [from %s] ");
 	}

 	present_path = mallocstrcpy(present_path, "./");
@@ -1117,8 +1120,8 @@ void do_insertfile(
 #endif
 		edit_refresh, msg,
 #ifndef DISABLE_OPERATINGDIR
-		operating_dir != NULL && strcmp(operating_dir,
-		".") != 0 ? operating_dir :
+		operating_dir != NULL && strcmp(operating_dir, ".") != 0 ?
+		operating_dir :
 #endif
 		"./");

--- a/src/global.c
+++ b/src/global.c
@@ -1,22 +1,22 @@
 /**************************************************************************
- *   global.c                                                             *
+ *   global.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.    *
- *   This program 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, or (at your option)  *
- *   any later version.                                                   *
+ *   Copyright (C) 2014, 2015, 2016 Benno Schulenberg                     *
 *                                                                        *
- *   This program 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.                             *
+ *   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, write to the Free Software          *
- *   Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA            *
- *   02110-1301, USA.                                                     *
+ *   along with this program.  If not, see http://www.gnu.org/licenses/.  *
 *                                                                        *
 **************************************************************************/

@@ -33,10 +33,15 @@ volatile sig_atomic_t sigwinch_counter = 0;
 	/* Is incremented by the handler whenever a SIGWINCH occurs. */
 #endif

+#if defined(__linux__) && !defined(NANO_TINY)
 bool console;
 	/* Whether we're running on a Linux VC (TRUE) or under X (FALSE). */
+#endif
+
 bool meta_key;
 	/* Whether the current keystroke is a Meta key. */
+bool shift_held;
+	/* Whether Shift was being held together with a movement key. */
 bool focusing = TRUE;
 	/* Whether an update of the edit window should center the cursor. */

@@ -44,10 +49,9 @@ message_type lastmessage = HUSH;
 	/* Messages of type HUSH should not overwrite type MILD nor ALERT. */

 #ifndef NANO_TINY
-int controlleft = CONTROL_LEFT;
-int controlright = CONTROL_RIGHT;
-int controlup = CONTROL_UP;
-int controldown = CONTROL_DOWN;
+int controlleft, controlright, controlup, controldown;
+int shiftcontrolleft, shiftcontrolright, shiftcontrolup, shiftcontroldown;
+int shiftaltleft, shiftaltright, shiftaltup, shiftaltdown;
 #endif

 #ifndef DISABLE_WRAPJUSTIFY
@@ -230,9 +234,9 @@ size_t length_of_list(int menu)
    size_t i = 0;

    for (f = allfuncs; f != NULL; f = f->next)
-	if ((f->menus & menu) != 0) {
+	if ((f->menus & menu) && first_sc_for(menu, f->scfunc) != NULL)
 	    i++;
-	}
+
    return i;
 }

--- a/src/help.c
+++ b/src/help.c
@@ -1,22 +1,22 @@
 /**************************************************************************
- *   help.c                                                               *
+ *   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.          *
- *   This program 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, or (at your option)  *
- *   any later version.                                                   *
+ *   Copyright (C) 2014, 2015, 2016 Benno Schulenberg                     *
 *                                                                        *
- *   This program 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.                             *
+ *   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, write to the Free Software          *
- *   Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA            *
- *   02110-1301, USA.                                                     *
+ *   along with this program.  If not, see http://www.gnu.org/licenses/.  *
 *                                                                        *
 **************************************************************************/

--- a/src/move.c
+++ b/src/move.c
@@ -1,22 +1,22 @@
 /**************************************************************************
- *   move.c                                                               *
+ *   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.    *
- *   This program 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, or (at your option)  *
- *   any later version.                                                   *
+ *   Copyright (C) 2014, 2015, 2016 Benno Schulenberg                     *
 *                                                                        *
- *   This program 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.                             *
+ *   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, write to the Free Software          *
- *   Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA            *
- *   02110-1301, USA.                                                     *
+ *   along with this program.  If not, see http://www.gnu.org/licenses/.  *
 *                                                                        *
 **************************************************************************/

@@ -50,15 +50,15 @@ void do_last_line(void)
 /* Move up one page. */
 void do_page_up(void)
 {
-    int i, skipped = 0;
+    int i, mustmove, skipped = 0;

    /* 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 || (
 #ifndef NANO_TINY
-	!ISSET(SOFTWRAP) &&
+		!ISSET(SOFTWRAP) &&
 #endif
-	openfile->current->lineno <= editwinrows - 2)) {
+		openfile->current->lineno <= editwinrows - 2)) {
 	do_first_line();
 	return;
    }
@@ -66,16 +66,16 @@ void do_page_up(void)
    /* 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. */
 #ifndef NANO_TINY
-    if (!ISSET(SMOOTH_SCROLL)) {
+    if (!ISSET(SMOOTH_SCROLL))
 #endif
+    {
 	openfile->current = openfile->edittop;
 	openfile->placewewant = openfile->current_y = 0;
-#ifndef NANO_TINY
    }
-#endif

-    for (i = editwinrows - 2; i - skipped > 0 && openfile->current !=
-	openfile->fileage; i--) {
+    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) {
@@ -93,7 +93,7 @@ void do_page_up(void)

 #ifdef DEBUG
    fprintf(stderr, "do_page_up: openfile->current->lineno = %lu, skipped = %d\n",
-	(unsigned long)openfile->current->lineno, skipped);
+			(unsigned long)openfile->current->lineno, skipped);
 #endif

    /* Scroll the edit window up a page. */
@@ -104,7 +104,7 @@ void do_page_up(void)
 /* Move down one page. */
 void do_page_down(void)
 {
-    int i;
+    int i, mustmove;

    /* If the cursor is less than a page away from the bottom of the file,
     * put it at the end of the last line. */
@@ -116,16 +116,16 @@ void do_page_down(void)
    /* 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. */
 #ifndef NANO_TINY
-    if (!ISSET(SMOOTH_SCROLL)) {
+    if (!ISSET(SMOOTH_SCROLL))
 #endif
+    {
 	openfile->current = openfile->edittop;
 	openfile->placewewant = openfile->current_y = 0;
-#ifndef NANO_TINY
    }
-#endif

-    for (i = maxrows - 2; i > 0 && openfile->current !=
-	openfile->filebot; i--) {
+    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, "do_page_down: moving to line %lu\n", (unsigned long)openfile->current->lineno);
--- a/src/nano.c
+++ b/src/nano.c
@@ -1,22 +1,22 @@
 /**************************************************************************
- *   nano.c                                                               *
+ *   nano.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.    *
- *   This program 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, or (at your option)  *
- *   any later version.                                                   *
+ *   Copyright (C) 2014, 2015, 2016 Benno Schulenberg                     *
 *                                                                        *
- *   This program 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.                             *
+ *   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, write to the Free Software          *
- *   Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA            *
- *   02110-1301, USA.                                                     *
+ *   along with this program.  If not, see http://www.gnu.org/licenses/.  *
 *                                                                        *
 **************************************************************************/

@@ -605,7 +605,7 @@ void die(const char *msg, ...)

 #ifndef NANO_TINY
    /* If the current buffer has a lockfile, remove it. */
-    if (ISSET(LOCKING) && openfile->lock_filename)
+    if (openfile && ISSET(LOCKING) && openfile->lock_filename)
 	delete_lockfile(openfile->lock_filename);
 #endif

@@ -686,37 +686,37 @@ void die_save_file(const char *die_filename, struct stat *die_stat)
    free(targetname);
 }

-#define TOP_ROWS    (ISSET(MORE_SPACE) ? 1 : 2)
-#define BOTTOM_ROWS    (ISSET(NO_HELP) ? 1 : 3)
-
 /* Initialize the three window portions nano uses. */
 void window_init(void)
 {
-    /* If the screen height is too small, get out. */
-    editwinrows = LINES - TOP_ROWS - BOTTOM_ROWS;
-    if (COLS < MIN_EDITOR_COLS || editwinrows < MIN_EDITOR_ROWS)
-	die(_("Window size is too small for nano...\n"));
+    /* First delete existing windows, in case of resizing. */
+    delwin(topwin);
+    topwin = NULL;
+    delwin(edit);
+    delwin(bottomwin);

-#ifndef DISABLE_WRAPJUSTIFY
-    /* Set up fill, based on the screen width. */
-    fill = wrap_at;
-    if (fill <= 0)
-	fill += COLS;
-    if (fill < 0)
-	fill = 0;
-#endif
+    /* If the terminal is very flat, don't set up a titlebar. */
+    if (LINES < 3) {
+	editwinrows = 1;
+	/* Set up two subwindows.  If the terminal is just one line,
+	 * edit window and statusbar window will cover each other. */
+	edit = newwin(1, COLS, 0, 0);
+	bottomwin = newwin(1, COLS, LINES - 1, 0);
+    } else {
+	int toprows = (ISSET(MORE_SPACE) ? 1 : (LINES < 6) ? 1 : 2);
+	int bottomrows = (ISSET(NO_HELP) ? 1 : (LINES < 5) ? 1 : 3);

-    if (topwin != NULL)
-	delwin(topwin);
-    if (edit != NULL)
-	delwin(edit);
-    if (bottomwin != NULL)
-	delwin(bottomwin);
+	editwinrows = LINES - toprows - bottomrows;

-    /* Set up the windows. */
-    topwin = newwin(TOP_ROWS, COLS, 0, 0);
-    edit = newwin(editwinrows, COLS, TOP_ROWS, 0);
-    bottomwin = newwin(BOTTOM_ROWS, COLS, TOP_ROWS + editwinrows, 0);
+	/* Set up the normal three subwindows. */
+	topwin = newwin(toprows, COLS, 0, 0);
+	edit = newwin(editwinrows, COLS, toprows, 0);
+	bottomwin = newwin(bottomrows, COLS, toprows + editwinrows, 0);
+    }
+
+    /* In case the terminal shrunk, make sure the status line is clear. */
+    blank_statusbar();
+    wnoutrefresh(bottomwin);

    /* Turn the keypad on for the windows, if necessary. */
    if (!ISSET(REBIND_KEYPAD)) {
@@ -724,6 +724,15 @@ void window_init(void)
 	keypad(edit, TRUE);
 	keypad(bottomwin, TRUE);
    }
+
+#ifndef DISABLE_WRAPJUSTIFY
+    /* Set up the wrapping point, accounting for screen width when negative. */
+    fill = wrap_at;
+    if (fill <= 0)
+	fill += COLS;
+    if (fill < 0)
+	fill = 0;
+#endif
 }

 #ifndef DISABLE_MOUSE
@@ -920,9 +929,9 @@ void usage(void)
 void version(void)
 {
 #ifdef REVISION
-    printf(" nano from git, %s\n", REVISION);
+    printf(" GNU nano from git, %s\n", REVISION);
 #else
-    printf(_(" nano, version %s\n"), VERSION);
+    printf(_(" GNU nano, version %s\n"), VERSION);
 #endif
    printf(" (C) 1999..2016 Free Software Foundation, Inc.\n");
    printf(_(" (C) 2014..%s the contributors to nano\n"), "2016");
@@ -1533,6 +1542,19 @@ void terminal_init(void)
 #endif
 }

+#if !defined(NANO_TINY) && defined(HAVE_KEY_DEFINED)
+/* Ask ncurses for a keycode, or assign a default one. */
+int get_keycode(const char *keyname, const int standard)
+{
+    const char *keyvalue = tigetstr(keyname);
+
+    if (keyvalue == 0 || keyvalue == (char *)-1)
+	return standard;
+    else
+	return key_defined(keyvalue);
+}
+#endif
+
 /* Say that an unbound key was struck, and if possible which one. */
 void unbound_key(int code)
 {
@@ -1602,87 +1624,110 @@ int do_input(bool allow_funcs)
 	}
    }

-    if (allow_funcs) {
-	/* If the keystroke isn't a shortcut nor a toggle, it's a normal text
-	 * character: add the character to the input buffer -- or display a
-	 * warning when we're in view mode. */
-	if (input != ERR && !have_shortcut) {
-	    if (ISSET(VIEW_MODE))
-		print_view_warning();
-	    else {
-		/* Store the byte, and leave room for a terminating zero. */
-		puddle = charealloc(puddle, depth + 2);
-		puddle[depth++] = (char)input;
-	    }
-	}
+    if (!allow_funcs)
+	return input;

-	/* If we got a shortcut or toggle, or if there aren't any other
-	 * characters waiting after the one we read in, we need to output
-	 * all available characters in the input puddle.  Note that this
-	 * puddle will be empty if we're in view mode. */
-	if (have_shortcut || get_key_buffer_len() == 0) {
+    /* If the keystroke isn't a shortcut nor a toggle, it's a normal text
+     * character: add the character to the input buffer -- or display a
+     * warning when we're in view mode. */
+     if (input != ERR && !have_shortcut) {
+	if (ISSET(VIEW_MODE))
+	    print_view_warning();
+	else {
+	    /* Store the byte, and leave room for a terminating zero. */
+	    puddle = charealloc(puddle, depth + 2);
+	    puddle[depth++] = (char)input;
+	}
+#ifndef NANO_TINY
+	if (openfile->mark_set && openfile->kind_of_mark == SOFTMARK) {
+	    openfile->mark_set = FALSE;
+	    refresh_needed = TRUE;
+	}
+#endif
+    }
+
+    /* If we got a shortcut or toggle, or if there aren't any other
+     * characters waiting after the one we read in, we need to output
+     * all available characters in the input puddle.  Note that this
+     * puddle will be empty if we're in view mode. */
+    if (have_shortcut || get_key_buffer_len() == 0) {
 #ifndef DISABLE_WRAPPING
-	    /* If we got a shortcut or toggle, and it's not the shortcut
-	     * for verbatim input, turn off prepending of wrapped text. */
-	    if (have_shortcut && s->scfunc != do_verbatim_input)
-		wrap_reset();
+	/* If we got a shortcut or toggle, and it's not the shortcut
+	 * for verbatim input, turn off prepending of wrapped text. */
+	if (have_shortcut && s->scfunc != do_verbatim_input)
+	    wrap_reset();
 #endif

-	    if (puddle != NULL) {
-		/* Insert all bytes in the input buffer into the edit buffer
-		 * at once, filtering out any low control codes. */
-		puddle[depth] = '\0';
-		do_output(puddle, depth, FALSE);
+	if (puddle != NULL) {
+	    /* Insert all bytes in the input buffer into the edit buffer
+	     * at once, filtering out any low control codes. */
+	    puddle[depth] = '\0';
+	    do_output(puddle, depth, FALSE);

-		/* Empty the input buffer. */
-		free(puddle);
-		puddle = NULL;
-		depth = 0;
-	    }
+	    /* Empty the input buffer. */
+	    free(puddle);
+	    puddle = NULL;
+	    depth = 0;
+	}
+    }
+
+    if (have_shortcut) {
+	const subnfunc *f = sctofunc(s);
+
+	if (ISSET(VIEW_MODE) && f && !f->viewok) {
+	    print_view_warning();
+	    return ERR;
 	}

-	if (have_shortcut) {
-	    const subnfunc *f = sctofunc(s);
-	    /* If the function associated with this shortcut is
-	     * cutting or copying text, remember this. */
-	    if (s->scfunc == do_cut_text_void
+	/* If the function associated with this shortcut is
+	 * cutting or copying text, remember this. */
+	if (s->scfunc == do_cut_text_void
 #ifndef NANO_TINY
 		|| s->scfunc == do_copy_text || s->scfunc == do_cut_till_eof
 #endif
 		)
-		preserve = TRUE;
+	    preserve = TRUE;

-	    if (s->scfunc == NULL) {
-		statusbar("Internal error: shortcut without function!");
-		return ERR;
-	    }
-	    if (ISSET(VIEW_MODE) && f && !f->viewok)
-		print_view_warning();
-	    else {
 #ifndef NANO_TINY
-		if (s->scfunc == do_toggle_void) {
-		    do_toggle(s->toggle);
-		    if (s->toggle != CUT_TO_END)
-			preserve = TRUE;
-		} else
+	if (s->scfunc == do_toggle_void) {
+	    do_toggle(s->toggle);
+	    if (s->toggle != CUT_TO_END)
+		preserve = TRUE;
+	} else
 #endif
-		{
-		    /* Execute the function of the shortcut. */
-		    s->scfunc();
-#ifndef DISABLE_COLOR
-		    if (f && !f->viewok)
-			reset_multis(openfile->current, FALSE);
-#endif
-		    if (refresh_needed) {
-#ifdef DEBUG
-			fprintf(stderr, "running edit_refresh() as refresh_needed is true\n");
-#endif
-			edit_refresh();
-			refresh_needed = FALSE;
-		    } else if (s->scfunc == do_delete || s->scfunc == do_backspace)
-			update_line(openfile->current, openfile->current_x);
-		}
+	{
+#ifndef NANO_TINY
+	    /* If Shifted movement occurs, set the mark. */
+	    if (shift_held && !openfile->mark_set) {
+		openfile->mark_set = TRUE;
+		openfile->mark_begin = openfile->current;
+		openfile->mark_begin_x = openfile->current_x;
+		openfile->kind_of_mark = SOFTMARK;
 	    }
+#endif
+	    /* Execute the function of the shortcut. */
+	    s->scfunc();
+#ifndef NANO_TINY
+	    /* If Shiftless movement occurred, discard a soft mark. */
+	    if (openfile->mark_set && !shift_held &&
+				openfile->kind_of_mark == SOFTMARK) {
+		openfile->mark_set = FALSE;
+		openfile->mark_begin = NULL;
+		refresh_needed = TRUE;
+	    }
+#endif
+#ifndef DISABLE_COLOR
+	    if (f && !f->viewok)
+		reset_multis(openfile->current, FALSE);
+#endif
+	    if (refresh_needed) {
+#ifdef DEBUG
+		fprintf(stderr, "running edit_refresh() as refresh_needed is true\n");
+#endif
+		edit_refresh();
+		refresh_needed = FALSE;
+	    } else if (s->scfunc == do_delete || s->scfunc == do_backspace)
+		update_line(openfile->current, openfile->current_x);
 	}
    }

@@ -2482,8 +2527,10 @@ int main(int argc, char **argv)
    /* Set up the terminal state. */
    terminal_init();

+#if defined(__linux__) && !defined(NANO_TINY)
    /* Check whether we're running on a Linux console. */
    console = (getenv("DISPLAY") == NULL);
+#endif

 #ifdef DEBUG
    fprintf(stderr, "Main: set up windows\n");
@@ -2511,20 +2558,21 @@ int main(int argc, char **argv)
 #endif

 #if !defined(NANO_TINY) && defined(HAVE_KEY_DEFINED)
-    const char *keyvalue;
    /* Ask ncurses for the key codes for Control+Left/Right/Up/Down. */
-    keyvalue = tigetstr("kLFT5");
-    if (keyvalue != 0 && keyvalue != (char *)-1)
-	controlleft = key_defined(keyvalue);
-    keyvalue = tigetstr("kRIT5");
-    if (keyvalue != 0 && keyvalue != (char *)-1)
-	controlright = key_defined(keyvalue);
-    keyvalue = tigetstr("kUP5");
-    if (keyvalue != 0 && keyvalue != (char *)-1)
-	controlup = key_defined(keyvalue);
-    keyvalue = tigetstr("kDN5");
-    if (keyvalue != 0 && keyvalue != (char *)-1)
-	controldown = key_defined(keyvalue);
+    controlleft = get_keycode("kLFT5", CONTROL_LEFT);
+    controlright = get_keycode("kRIT5", CONTROL_RIGHT);
+    controlup = get_keycode("kUP5", CONTROL_UP);
+    controldown = get_keycode("kDN5", CONTROL_DOWN);
+    /* Ask for the codes for Shift+Control+Left/Right/Up/Down. */
+    shiftcontrolleft = get_keycode("kLFT6", SHIFT_CONTROL_LEFT);
+    shiftcontrolright = get_keycode("kRIT6", SHIFT_CONTROL_RIGHT);
+    shiftcontrolup = get_keycode("kUP6", SHIFT_CONTROL_UP);
+    shiftcontroldown = get_keycode("kDN6", SHIFT_CONTROL_DOWN);
+    /* Ask for the codes for Shift+Alt+Left/Right/Up/Down. */
+    shiftaltleft = get_keycode("kLFT4", SHIFT_ALT_LEFT);
+    shiftaltright = get_keycode("kRIT4", SHIFT_ALT_RIGHT);
+    shiftaltup = get_keycode("kUP4", SHIFT_ALT_UP);
+    shiftaltdown = get_keycode("kDN4", SHIFT_ALT_DOWN);
 #endif

 #ifndef USE_SLANG
@@ -2544,6 +2592,7 @@ int main(int argc, char **argv)
 	optind++;
    }

+    /* If one of the arguments is a dash, read text from standard input. */
    if (optind < argc && !strcmp(argv[optind], "-")) {
 	stdin_pager();
 	set_modified();
@@ -2620,7 +2669,7 @@ int main(int argc, char **argv)
 #endif

 #ifdef DEBUG
-    fprintf(stderr, "Main: bottom win, top win and edit win\n");
+    fprintf(stderr, "Main: show buffer contents, and enter main loop\n");
 #endif

    display_buffer();
--- a/src/nano.h
+++ b/src/nano.h
@@ -1,22 +1,22 @@
 /**************************************************************************
- *   nano.h                                                               *
+ *   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.    *
- *   This program 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, or (at your option)  *
- *   any later version.                                                   *
+ *   Copyright (C) 2014, 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    *
+ *   by the Free Software Foundation, either version 3 of the License,    *
+ *   or (at your option) any later version.                               *
 *                                                                        *
- *   This program 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.                             *
+ *   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, write to the Free Software          *
- *   Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA            *
- *   02110-1301, USA.                                                     *
+ *   along with this program.  If not, see http://www.gnu.org/licenses/.  *
 *                                                                        *
 **************************************************************************/

@@ -179,6 +179,10 @@ typedef enum {
    OVERWRITE, APPEND, PREPEND
 } kind_of_writing_type;

+typedef enum {
+    SOFTMARK, HARDMARK
+} mark_type;
+
 typedef enum {
    UPWARD, DOWNWARD
 } scroll_dir;
@@ -402,6 +406,8 @@ typedef struct openfilestruct {
 	/* The file's line where the mark is, if any. */
    size_t mark_begin_x;
 	/* The file's mark's x-coordinate position, if any. */
+    mark_type kind_of_mark;
+	/* Whether this is a soft or a hard mark. */
    file_format fmt;
 	/* The file's format. */
    undo *undotop;
@@ -560,6 +566,18 @@ 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

 #ifndef NANO_TINY
 /* An imaginary key for when we get a SIGWINCH (window resize). */
@@ -576,11 +594,6 @@ enum
 /* The maximum number of entries displayed in the main shortcut list. */
 #define MAIN_VISIBLE (((COLS + 40) / 20) * 2)

-/* The minimum editor window columns and rows required for nano to work
- * correctly.  Don't make these smaller than 4 and 1. */
-#define MIN_EDITOR_COLS 4
-#define MIN_EDITOR_ROWS 1
-
 /* The default number of characters from the end of the line where
 * wrapping occurs. */
 #define CHARS_FROM_EOL 8
--- a/src/prompt.c
+++ b/src/prompt.c
@@ -1,22 +1,22 @@
 /**************************************************************************
- *   prompt.c                                                             *
+ *   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.    *
- *   This program 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, or (at your option)  *
- *   any later version.                                                   *
+ *   Copyright (C) 2016 Benno Schulenberg                                 *
 *                                                                        *
- *   This program 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.                             *
+ *   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, write to the Free Software          *
- *   Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA            *
- *   02110-1301, USA.                                                     *
+ *   along with this program.  If not, see http://www.gnu.org/licenses/.  *
 *                                                                        *
 **************************************************************************/

@@ -28,15 +28,12 @@

 static char *prompt = NULL;
 	/* The prompt string used for statusbar questions. */
-static size_t statusbar_x = (size_t)-1;
+static size_t statusbar_x = HIGHEST_POSITIVE;
 	/* The cursor position in answer. */
-static size_t statusbar_pww = (size_t)-1;
-	/* The place we want in answer. */

-/* Read in a character, interpret it as a shortcut or toggle if
- * necessary, and return it.
- * Set ran_func to TRUE if we ran a function associated with a
- * shortcut key, and set finished to TRUE if we're done after running
+/* Read in a keystroke, interpret it if it is a shortcut or toggle, and
+ * return it.  Set ran_func to TRUE if we ran a function associated with
+ * a shortcut key, and set finished to TRUE if we're done after running
 * or trying to run a function associated with a shortcut key.
 * refresh_func is the function we will call to refresh the edit window. */
 int do_statusbar_input(bool *ran_func, bool *finished,
@@ -70,7 +67,7 @@ int do_statusbar_input(bool *ran_func, bool *finished,
 	if (do_statusbar_mouse() == 1)
 	    input = get_kbinput(bottomwin);
 	else
-	    input = ERR;
+	    return ERR;
    }
 #endif

@@ -103,84 +100,81 @@ int do_statusbar_input(bool *ran_func, bool *finished,
 	}
     }

-    /* If we got a shortcut, or if there aren't any other characters
-     * waiting after the one we read in, we need to display all the
-     * characters in the input buffer if it isn't empty. */
-    if (have_shortcut || get_key_buffer_len() == 0) {
-	if (kbinput != NULL) {
-	    /* Display all the characters in the input buffer at
-	     * once, filtering out control characters. */
-	    do_statusbar_output(kbinput, kbinput_len, TRUE, NULL);
+    /* 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
+     * input buffer (if not empty) into the answer. */
+    if ((have_shortcut || get_key_buffer_len() == 0) && kbinput != NULL) {
+	/* Inject all characters in the input buffer at once, filtering out
+	 * control characters. */
+	do_statusbar_output(kbinput, kbinput_len, TRUE, NULL);

-	    /* Empty the input buffer. */
-	    kbinput_len = 0;
-	    free(kbinput);
-	    kbinput = NULL;
-	}
+	/* Empty the input buffer. */
+	kbinput_len = 0;
+	free(kbinput);
+	kbinput = NULL;
+    }

-	if (have_shortcut) {
-	    if (s->scfunc == do_tab || s->scfunc == do_enter)
-		;
-	    else if (s->scfunc == total_refresh) {
-		total_redraw();
-		refresh_func();
-	    } else if (s->scfunc == do_left)
-		do_statusbar_left();
-	    else if (s->scfunc == do_right)
-		do_statusbar_right();
+    if (have_shortcut) {
+	if (s->scfunc == do_tab || s->scfunc == do_enter)
+	    ;
+	else if (s->scfunc == total_refresh) {
+	    total_redraw();
+	    refresh_func();
+	} else if (s->scfunc == do_left)
+	    do_statusbar_left();
+	else if (s->scfunc == do_right)
+	    do_statusbar_right();
 #ifndef NANO_TINY
-	    else if (s->scfunc == do_prev_word_void)
-		do_statusbar_prev_word();
-	    else if (s->scfunc == do_next_word_void)
-		do_statusbar_next_word();
+	else if (s->scfunc == do_prev_word_void)
+	    do_statusbar_prev_word();
+	else if (s->scfunc == do_next_word_void)
+	    do_statusbar_next_word();
 #endif
-	    else if (s->scfunc == do_home)
-		do_statusbar_home();
-	    else if (s->scfunc == do_end)
-		do_statusbar_end();
-	    /* When in restricted mode at the "Write File" prompt and the
-	     * filename isn't blank, disallow any input and deletion. */
-	    else if (ISSET(RESTRICTED) && currmenu == MWRITEFILE &&
+	else if (s->scfunc == do_home)
+	    do_statusbar_home();
+	else if (s->scfunc == do_end)
+	    do_statusbar_end();
+	/* When in restricted mode at the "Write File" prompt and the
+	 * filename isn't blank, disallow any input and deletion. */
+	else if (ISSET(RESTRICTED) && currmenu == MWRITEFILE &&
 				openfile->filename[0] != '\0' &&
 				(s->scfunc == do_verbatim_input ||
 				s->scfunc == do_cut_text_void ||
 				s->scfunc == do_delete ||
 				s->scfunc == do_backspace))
-		;
-	    else if (s->scfunc == do_verbatim_input) {
-		bool got_newline = FALSE;
-			/* Whether we got a verbatim ^J. */
+	    ;
+	else if (s->scfunc == do_verbatim_input) {
+	    bool got_newline = FALSE;
+		/* Whether we got a verbatim ^J. */

-		do_statusbar_verbatim_input(&got_newline);
+	    do_statusbar_verbatim_input(&got_newline);

-		/* If we got a verbatim ^J, remove it from the input buffer,
-		 * fake a press of Enter, and indicate that we're done. */
-		if (got_newline) {
-		    get_input(NULL, 1);
-		    input = sc_seq_or(do_enter, 0);
-		    *finished = TRUE;
-		}
-	    } 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 {
-		/* 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 indicate
-		 * that we're done after running or trying to run their
-		 * associated functions. */
-		f = sctofunc(s);
-		if (s->scfunc != NULL) {
-		    *ran_func = TRUE;
-		    if (f && (!ISSET(VIEW_MODE) || f->viewok) &&
-				f->scfunc != do_gotolinecolumn_void)
-			f->scfunc();
-		}
+	    /* If we got a verbatim ^J, remove it from the input buffer,
+	     * fake a press of Enter, and indicate that we're done. */
+	    if (got_newline) {
+		get_input(NULL, 1);
+		input = sc_seq_or(do_enter, 0);
 		*finished = TRUE;
 	    }
+	} 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 {
+	    /* 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
+	     * running or trying to run their associated functions. */
+	    f = sctofunc(s);
+	    if (s->scfunc != NULL) {
+		*ran_func = TRUE;
+		if (f && (!ISSET(VIEW_MODE) || f->viewok) &&
+				f->scfunc != do_gotolinecolumn_void)
+		    f->scfunc();
+	    }
+	    *finished = TRUE;
 	}
    }

@@ -198,8 +192,6 @@ int do_statusbar_mouse(void)
    if (retval == 0 && wmouse_trafo(bottomwin, &mouse_y, &mouse_x, FALSE)) {
 	size_t start_col;

-	assert(prompt != NULL);
-
 	start_col = strlenpt(prompt) + 2;

 	/* Move to where the click occurred. */
@@ -207,7 +199,7 @@ int do_statusbar_mouse(void)
 	    statusbar_x = actual_x(answer,
 			get_statusbar_page_start(start_col, start_col +
 			statusbar_xplustabs()) + mouse_x - start_col);
-	    update_bar_if_needed();
+	    update_the_statusbar();
 	}
    }

@@ -225,8 +217,6 @@ void do_statusbar_output(int *the_input, size_t input_len,
    char *char_buf = charalloc(mb_cur_max());
    int i, char_len;

-    assert(answer != NULL);
-
    /* Copy the typed stuff so it can be treated. */
    for (i = 0; i < input_len; i++)
 	output[i] = (char)the_input[i];
@@ -257,8 +247,6 @@ void do_statusbar_output(int *the_input, size_t input_len,
 	if (filtering && is_ascii_cntrl_char(*(output + i - char_len)))
 	    continue;

-	assert(statusbar_x <= strlen(answer));
-
 	/* Insert the typed character into the existing answer string. */
 	answer = charealloc(answer, strlen(answer) + char_len + 1);
 	charmove(answer + statusbar_x + char_len, answer + statusbar_x,
@@ -271,23 +259,21 @@ void do_statusbar_output(int *the_input, size_t input_len,
    free(char_buf);
    free(output);

-    statusbar_pww = statusbar_xplustabs();
-
    update_the_statusbar();
 }

-/* Move to the beginning of the prompt text. */
+/* Move to the beginning of the answer. */
 void do_statusbar_home(void)
 {
    statusbar_x = 0;
-    update_bar_if_needed();
+    update_the_statusbar();
 }

-/* Move to the end of the prompt text. */
+/* Move to the end of the answer. */
 void do_statusbar_end(void)
 {
    statusbar_x = strlen(answer);
-    update_bar_if_needed();
+    update_the_statusbar();
 }

 /* Move left one character. */
@@ -295,16 +281,16 @@ void do_statusbar_left(void)
 {
    if (statusbar_x > 0) {
 	statusbar_x = move_mbleft(answer, statusbar_x);
-	update_bar_if_needed();
+	update_the_statusbar();
    }
 }

 /* Move right one character. */
 void do_statusbar_right(void)
 {
-    if (statusbar_x < strlen(answer)) {
+    if (answer[statusbar_x] != '\0') {
 	statusbar_x = move_mbright(answer, statusbar_x);
-	update_bar_if_needed();
+	update_the_statusbar();
    }
 }

@@ -320,13 +306,9 @@ void do_statusbar_backspace(void)
 /* Delete one character. */
 void do_statusbar_delete(void)
 {
-    statusbar_pww = statusbar_xplustabs();
-
    if (answer[statusbar_x] != '\0') {
 	int char_len = parse_mbchar(answer + statusbar_x, NULL, NULL);

-	assert(statusbar_x < strlen(answer));
-
 	charmove(answer + statusbar_x, answer + statusbar_x + char_len,
 			strlen(answer) - statusbar_x - char_len + 1);
 	align(&answer);
@@ -335,33 +317,23 @@ void do_statusbar_delete(void)
    }
 }

-/* Move text from the prompt into oblivion. */
+/* Zap some or all text from the answer. */
 void do_statusbar_cut_text(void)
 {
-    assert(answer != NULL);
-
-#ifndef NANO_TINY
-    if (ISSET(CUT_TO_END))
-	null_at(&answer, statusbar_x);
-    else
-#endif
-    {
-	null_at(&answer, 0);
+    if (!ISSET(CUT_TO_END))
 	statusbar_x = 0;
-	statusbar_pww = statusbar_xplustabs();
-    }
+
+    null_at(&answer, statusbar_x);

    update_the_statusbar();
 }

 #ifndef NANO_TINY
-/* Move to the next word in the prompt text. */
+/* Move to the next word in the answer. */
 void do_statusbar_next_word(void)
 {
    bool seen_space = !is_word_mbchar(answer + statusbar_x, FALSE);

-    assert(answer != NULL);
-
    /* Move forward until we reach the start of a word. */
    while (answer[statusbar_x] != '\0') {
 	statusbar_x = move_mbright(answer, statusbar_x);
@@ -374,16 +346,14 @@ void do_statusbar_next_word(void)
 	    break;
    }

-    update_bar_if_needed();
+    update_the_statusbar();
 }

-/* Move to the previous word in the prompt text. */
+/* Move to the previous word in the answer. */
 void do_statusbar_prev_word(void)
 {
    bool seen_a_word = FALSE, step_forward = FALSE;

-    assert(answer != NULL);
-
    /* Move backward until we pass over the start of a word. */
    while (statusbar_x != 0) {
 	statusbar_x = move_mbleft(answer, statusbar_x);
@@ -401,7 +371,7 @@ void do_statusbar_prev_word(void)
 	/* Move one character forward again to sit on the start of the word. */
 	statusbar_x = move_mbright(answer, statusbar_x);

-    update_bar_if_needed();
+    update_the_statusbar();
 }
 #endif /* !NANO_TINY */

@@ -420,95 +390,83 @@ void do_statusbar_verbatim_input(bool *got_newline)
    do_statusbar_output(kbinput, kbinput_len, FALSE, got_newline);
 }

-/* Return the placewewant associated with statusbar_x, i.e. the
- * zero-based column position of the cursor.  The value will be no
- * smaller than statusbar_x. */
+/* Return the zero-based column position of the cursor in the answer. */
 size_t statusbar_xplustabs(void)
 {
    return strnlenpt(answer, statusbar_x);
 }

-/* nano scrolls horizontally within a line in chunks.  This function
- * returns the column number of the first character displayed in the
- * statusbar prompt when the cursor is at the given column with the
- * prompt ending at start_col.  Note that (0 <= column -
- * get_statusbar_page_start(column) < COLS). */
-size_t get_statusbar_page_start(size_t start_col, size_t column)
+/* 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
+ * (0 <= column - get_statusbar_page_start(column) < COLS). */
+size_t get_statusbar_page_start(size_t base, size_t column)
 {
-    if (column == start_col || column < COLS - 1 || COLS == start_col + 1)
+    if (column == base || column < COLS - 1)
 	return 0;
+    else if (COLS > base + 2)
+	return column - base - 1 - (column - base - 1) % (COLS - base - 2);
    else
-	return column - start_col - (column - start_col) % (COLS -
-		start_col - 1);
+	return column - 2;
 }

-/* Reinitialize the cursor position in the status bar prompt. */
+/* Reinitialize the cursor position in the answer. */
 void reinit_statusbar_x(void)
 {
-    statusbar_x = (size_t)-1;
-    statusbar_pww = (size_t)-1;
+    statusbar_x = HIGHEST_POSITIVE;
 }

-/* Put the cursor in the statusbar prompt at statusbar_x. */
+/* 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));
+			get_statusbar_page_start(start_col, start_col + xpt));
+
+    wnoutrefresh(bottomwin);
 }

 /* Repaint the statusbar. */
 void update_the_statusbar(void)
 {
-    size_t start_col, index, page_start;
+    size_t base, the_page, end_page;
    char *expanded;

-    assert(prompt != NULL && statusbar_x <= strlen(answer));
-
-    start_col = strlenpt(prompt) + 2;
-    index = strnlenpt(answer, statusbar_x);
-    page_start = get_statusbar_page_start(start_col, start_col + index);
+    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);

    wattron(bottomwin, interface_color_pair[TITLE_BAR]);

    blank_statusbar();

-    mvwaddnstr(bottomwin, 0, 0, prompt, actual_x(prompt, COLS - 2));
+    mvwaddstr(bottomwin, 0, 0, prompt);
    waddch(bottomwin, ':');
-    waddch(bottomwin, (page_start == 0) ? ' ' : '$');
+    waddch(bottomwin, (the_page == 0) ? ' ' : '<');

-    expanded = display_string(answer, page_start, COLS - start_col - 1, FALSE);
+    expanded = display_string(answer, the_page, COLS - base - 1, FALSE);
    waddstr(bottomwin, expanded);
    free(expanded);

+    waddch(bottomwin, (the_page >= end_page) ? ' ' : '>');
+
    wattroff(bottomwin, interface_color_pair[TITLE_BAR]);

-    statusbar_pww = statusbar_xplustabs();
    reset_statusbar_cursor();
-    wnoutrefresh(bottomwin);
-}
-
-/* Update the statusbar line /if/ the placewewant changes page. */
-void update_bar_if_needed(void)
-{
-    size_t start_col = strlenpt(prompt) + 2;
-    size_t was_pww = statusbar_pww;
-
-    statusbar_pww = statusbar_xplustabs();
-
-    if (get_statusbar_page_start(start_col, start_col + statusbar_pww) !=
-		get_statusbar_page_start(start_col, start_col + was_pww))
-	update_the_statusbar();
 }

 /* Get a string of input at the statusbar prompt. */
-functionptrtype get_prompt_string(int *actual, bool allow_tabs,
+functionptrtype acquire_an_answer(int *actual, bool allow_tabs,
 #ifndef DISABLE_TABCOMP
 	bool allow_files, bool *listed,
 #endif
-	const char *curranswer,
 #ifndef DISABLE_HISTORIES
 	filestruct **history_list,
 #endif
@@ -536,15 +494,11 @@ functionptrtype get_prompt_string(int *actual, bool allow_tabs,
 #endif
 #endif /* !DISABLE_HISTORIES */

-    answer = mallocstrcpy(answer, curranswer);
-
-    if (statusbar_x > strlen(answer)) {
+    if (statusbar_x > strlen(answer))
 	statusbar_x = strlen(answer);
-	statusbar_pww = statusbar_xplustabs();
-    }

 #ifdef DEBUG
-    fprintf(stderr, "get_prompt_string: answer = \"%s\", statusbar_x = %lu\n", answer, (unsigned long) statusbar_x);
+    fprintf(stderr, "acquiring: answer = \"%s\", statusbar_x = %lu\n", answer, (unsigned long) statusbar_x);
 #endif

    update_the_statusbar();
@@ -553,25 +507,24 @@ functionptrtype get_prompt_string(int *actual, bool allow_tabs,
    wnoutrefresh(edit);
    wnoutrefresh(bottomwin);

-    /* If we're using restricted mode, we aren't allowed to change the
-     * name of the current file once it has one, because that would
-     * allow writing to files not specified on the command line.  In
-     * this case, disable all keys that would change the text if the
-     * filename isn't blank and we're at the "Write File" prompt. */
    while (TRUE) {
-	/* Ensure the cursor is on when waiting for input. */
+	/* Ensure the cursor is shown when waiting for input. */
 	curs_set(1);

 	kbinput = do_statusbar_input(&ran_func, &finished, refresh_func);
-	assert(statusbar_x <= strlen(answer));

 #ifndef NANO_TINY
+	/* If the window size changed, go reformat the prompt string. */
 	if (kbinput == KEY_WINCH) {
 	    refresh_func();
-	    update_the_statusbar();
-	    continue;
-	}
+	    *actual = KEY_WINCH;
+#ifndef DISABLE_HISTORIES
+	    free(magichistory);
 #endif
+	    return NULL;
+	}
+#endif /* !NANO_TINY */
+
 	func = func_from_key(&kbinput);

 	if (func == do_cancel || func == do_enter)
@@ -597,8 +550,6 @@ functionptrtype get_prompt_string(int *actual, bool allow_tabs,
 	    if (allow_tabs)
 		answer = input_tab(answer, allow_files, &statusbar_x,
 					&tabbed, refresh_func, listed);
-
-	    update_the_statusbar();
 	} else
 #endif /* !DISABLE_TABCOMP */
 #ifndef DISABLE_HISTORIES
@@ -616,8 +567,6 @@ functionptrtype get_prompt_string(int *actual, bool allow_tabs,
 		    statusbar_x = strlen(answer);
 		}

-		update_the_statusbar();
-
 		/* This key has a shortcut-list entry when it's used to
 		 * move to an older search, which means that finished has
 		 * been set to TRUE.  Set it back to FALSE here, so that
@@ -642,8 +591,6 @@ functionptrtype get_prompt_string(int *actual, bool allow_tabs,
 		    statusbar_x = strlen(answer);
 		}

-		update_the_statusbar();
-
 		/* This key has a shortcut-list entry when it's used to
 		 * move to a newer search, which means that finished has
 		 * been set to TRUE.  Set it back to FALSE here, so that
@@ -653,8 +600,6 @@ functionptrtype get_prompt_string(int *actual, bool allow_tabs,
 	} else
 #endif /* !DISABLE_HISTORIES */
 	if (func == do_help_void) {
-	    update_the_statusbar();
-
 	    /* This key has a shortcut-list entry when it's used to go to
 	     * the help browser or display a message indicating that help
 	     * is disabled, which means that finished has been set to TRUE.
@@ -668,11 +613,11 @@ functionptrtype get_prompt_string(int *actual, bool allow_tabs,
 	if (finished)
 	    break;

+	update_the_statusbar();
+
 #if !defined(DISABLE_HISTORIES) && !defined(DISABLE_TABCOMP)
 	last_kbinput = kbinput;
 #endif
-	reset_statusbar_cursor();
-	wnoutrefresh(bottomwin);
    }

 #ifndef DISABLE_HISTORIES
@@ -711,42 +656,48 @@ int do_prompt(bool allow_tabs,
 {
    va_list ap;
    int retval;
-    functionptrtype func;
+    functionptrtype func = NULL;
 #ifndef DISABLE_TABCOMP
    bool listed = FALSE;
 #endif
    /* Save a possible current statusbar x position. */
    size_t was_statusbar_x = statusbar_x;
-    size_t was_pww = statusbar_pww;
-
-    prompt = charalloc(((COLS - 4) * mb_cur_max()) + 1);

    bottombars(menu);

-    va_start(ap, msg);
-    vsnprintf(prompt, (COLS - 4) * mb_cur_max(), msg, ap);
-    va_end(ap);
-    null_at(&prompt, actual_x(prompt, COLS - 4));
+    answer = mallocstrcpy(answer, curranswer);

-    func = get_prompt_string(&retval, allow_tabs,
+#ifndef NANO_TINY
+  redo_theprompt:
+#endif
+    prompt = charalloc((COLS * mb_cur_max()) + 1);
+    va_start(ap, msg);
+    vsnprintf(prompt, COLS * mb_cur_max(), 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));
+
+    func = acquire_an_answer(&retval, allow_tabs,
 #ifndef DISABLE_TABCOMP
 			allow_files, &listed,
 #endif
-	curranswer,
 #ifndef DISABLE_HISTORIES
-	history_list,
+			history_list,
 #endif
-	refresh_func);
+			refresh_func);

    free(prompt);
    prompt = NULL;

+#ifndef NANO_TINY
+    if (retval == KEY_WINCH)
+	goto redo_theprompt;
+#endif
+
    /* If we're done with this prompt, restore the x position to what
     * it was at a possible previous prompt. */
-    if (func == do_cancel || func == do_enter) {
+    if (func == do_cancel || func == do_enter)
 	statusbar_x = was_statusbar_x;
-	statusbar_pww = was_pww;
-    }

    /* If we left the prompt via Cancel or Enter, set the return value
     * properly. */
--- a/src/proto.h
+++ b/src/proto.h
@@ -1,22 +1,21 @@
 /**************************************************************************
- *   proto.h                                                              *
+ *   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.    *
- *   This program 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, or (at your option)  *
- *   any later version.                                                   *
 *                                                                        *
- *   This program 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.                             *
+ *   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, write to the Free Software          *
- *   Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA            *
- *   02110-1301, USA.                                                     *
+ *   along with this program.  If not, see http://www.gnu.org/licenses/.  *
 *                                                                        *
 **************************************************************************/

@@ -30,8 +29,13 @@
 extern volatile sig_atomic_t sigwinch_counter;
 #endif

+#if defined(__linux__) && !defined(NANO_TINY)
 extern bool console;
+#endif
+
 extern bool meta_key;
+extern bool shift_held;
+
 extern bool focusing;

 extern message_type lastmessage;
@@ -41,6 +45,14 @@ extern int controlleft;
 extern int controlright;
 extern int controlup;
 extern int controldown;
+extern int shiftcontrolleft;
+extern int shiftcontrolright;
+extern int shiftcontrolup;
+extern int shiftcontroldown;
+extern int shiftaltleft;
+extern int shiftaltright;
+extern int shiftaltup;
+extern int shiftaltdown;
 #endif

 #ifndef DISABLE_WRAPJUSTIFY
@@ -514,16 +526,6 @@ 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);
-void update_bar_if_needed(void);
-functionptrtype get_prompt_string(int *value, bool allow_tabs,
-#ifndef DISABLE_TABCOMP
-	bool allow_files, bool *listed,
-#endif
-	const char *curranswer,
-#ifndef DISABLE_HISTORIES
-	filestruct **history_list,
-#endif
-	void (*refresh_func)(void));
 int do_prompt(bool allow_tabs,
 #ifndef DISABLE_TABCOMP
 	bool allow_files,
--- a/src/rcfile.c
+++ b/src/rcfile.c
@@ -1,22 +1,23 @@
 /**************************************************************************
- *   rcfile.c                                                             *
+ *   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.                *
- *   This program 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, or (at your option)  *
- *   any later version.                                                   *
+ *   Copyright (C) 2014 Mike Frysinger                                    *
+ *   Copyright (C) 2014, 2015, 2016 Benno Schulenberg                     *
 *                                                                        *
- *   This program 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.                             *
+ *   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, write to the Free Software          *
- *   Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA            *
- *   02110-1301, USA.                                                     *
+ *   along with this program.  If not, see http://www.gnu.org/licenses/.  *
 *                                                                        *
 **************************************************************************/

--- a/src/search.c
+++ b/src/search.c
@@ -1,22 +1,22 @@
 /**************************************************************************
- *   search.c                                                             *
+ *   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.    *
- *   This program 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, or (at your option)  *
- *   any later version.                                                   *
+ *   Copyright (C) 2015, 2016 Benno Schulenberg                           *
 *                                                                        *
- *   This program 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.                             *
+ *   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, write to the Free Software          *
- *   Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA            *
- *   02110-1301, USA.                                                     *
+ *   along with this program.  If not, see http://www.gnu.org/licenses/.  *
 *                                                                        *
 **************************************************************************/

@@ -155,32 +155,32 @@ int search_init(bool replacing, bool use_answer)
    /* This is now one simple call.  It just does a lot. */
    i = do_prompt(FALSE,
 #ifndef DISABLE_TABCOMP
-	TRUE,
+		TRUE,
 #endif
-	replacing ? MREPLACE : MWHEREIS, backupstring,
+		replacing ? MREPLACE : MWHEREIS, backupstring,
 #ifndef DISABLE_HISTORIES
-	&search_history,
+		&search_history,
 #endif
-	/* TRANSLATORS: This is the main search prompt. */
-	edit_refresh, "%s%s%s%s%s%s", _("Search"),
+		/* TRANSLATORS: This is the main search prompt. */
+		edit_refresh, "%s%s%s%s%s%s", _("Search"),
 #ifndef NANO_TINY
-	/* TRANSLATORS: The next three strings are modifiers of the search prompt. */
-	ISSET(CASE_SENSITIVE) ? _(" [Case Sensitive]") :
+		/* TRANSLATORS: The next three modify the search prompt. */
+		ISSET(CASE_SENSITIVE) ? _(" [Case Sensitive]") :
 #endif
-	"",
+		"",
 #ifdef HAVE_REGEX_H
-	ISSET(USE_REGEXP) ? _(" [Regexp]") :
+		ISSET(USE_REGEXP) ? _(" [Regexp]") :
 #endif
-	"",
+		"",
 #ifndef NANO_TINY
-	ISSET(BACKWARDS_SEARCH) ? _(" [Backwards]") :
+		ISSET(BACKWARDS_SEARCH) ? _(" [Backwards]") :
 #endif
-	"", replacing ?
+		"", replacing ?
 #ifndef NANO_TINY
-	/* TRANSLATORS: The next two strings are modifiers of the search prompt. */
-	openfile->mark_set ? _(" (to replace) in selection") :
+		/* TRANSLATORS: The next two modify the search prompt. */
+		openfile->mark_set ? _(" (to replace) in selection") :
 #endif
-	_(" (to replace)") : "", buf);
+		_(" (to replace)") : "", buf);

    /* Release buf now that we don't need it anymore. */
    free(buf);
@@ -834,14 +834,14 @@ void do_replace(void)

    i = do_prompt(FALSE,
 #ifndef DISABLE_TABCOMP
-	TRUE,
+		TRUE,
 #endif
-	MREPLACEWITH, NULL,
+		MREPLACEWITH, NULL,
 #ifndef DISABLE_HISTORIES
-	&replace_history,
+		&replace_history,
 #endif
-	/* TRANSLATORS: This is a prompt. */
-	edit_refresh, _("Replace with"));
+		/* TRANSLATORS: This is a prompt. */
+		edit_refresh, _("Replace with"));

 #ifndef DISABLE_HISTORIES
    /* If the replace string is not "", add it to the replace history list. */
--- a/src/text.c
+++ b/src/text.c
@@ -1,22 +1,24 @@
 /**************************************************************************
- *   text.c                                                               *
+ *   text.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.    *
- *   This program 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, or (at your option)  *
- *   any later version.                                                   *
+ *   Copyright (C) 2014, 2015 Mark Majeres                                *
+ *   Copyright (C) 2016 Mike Scalora                                      *
+ *   Copyright (C) 2015, 2016 Benno Schulenberg                           *
 *                                                                        *
- *   This program 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.                             *
+ *   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, write to the Free Software          *
- *   Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA            *
- *   02110-1301, USA.                                                     *
+ *   along with this program.  If not, see http://www.gnu.org/licenses/.  *
 *                                                                        *
 **************************************************************************/

@@ -49,16 +51,18 @@ static filestruct *jusbottom = NULL;
 void do_mark(void)
 {
    openfile->mark_set = !openfile->mark_set;
+
    if (openfile->mark_set) {
 	statusbar(_("Mark Set"));
 	openfile->mark_begin = openfile->current;
 	openfile->mark_begin_x = openfile->current_x;
+	openfile->kind_of_mark = HARDMARK;
    } else {
 	statusbar(_("Mark Unset"));
 	openfile->mark_begin = NULL;
 	openfile->mark_begin_x = 0;
-	edit_refresh();
    }
+    edit_refresh();
 }
 #endif /* !NANO_TINY */

@@ -2927,6 +2931,7 @@ const char *do_alt_speller(char *tempfile_name)
 {
    int alt_spell_status;
    size_t current_x_save = openfile->current_x;
+    size_t pww_save = openfile->placewewant;
    ssize_t current_y_save = openfile->current_y;
    ssize_t lineno_save = openfile->current->lineno;
    struct stat spellfileinfo;
@@ -3075,6 +3080,7 @@ const char *do_alt_speller(char *tempfile_name)
    /* Go back to the old position. */
    goto_line_posx(lineno_save, current_x_save);
    openfile->current_y = current_y_save;
+    openfile->placewewant = pww_save;
    edit_update(STATIONARY);

    /* Stat the temporary file again, and mark the buffer as modified only
--- a/src/utils.c
+++ b/src/utils.c
@@ -1,22 +1,22 @@
 /**************************************************************************
- *   utils.c                                                              *
+ *   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.    *
- *   This program 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, or (at your option)  *
- *   any later version.                                                   *
+ *   Copyright (C) 2016 Benno Schulenberg                                 *
 *                                                                        *
- *   This program 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.                             *
+ *   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, write to the Free Software          *
- *   Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA            *
- *   02110-1301, USA.                                                     *
+ *   along with this program.  If not, see http://www.gnu.org/licenses/.  *
 *                                                                        *
 **************************************************************************/

--- a/src/winio.c
+++ b/src/winio.c
@@ -1,29 +1,31 @@
 /**************************************************************************
- *   winio.c                                                              *
+ *   winio.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.    *
- *   This program 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, or (at your option)  *
- *   any later version.                                                   *
+ *   Copyright (C) 2014, 2015, 2016 Benno Schulenberg                     *
 *                                                                        *
- *   This program 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.                             *
+ *   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, write to the Free Software          *
- *   Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA            *
- *   02110-1301, USA.                                                     *
+ *   along with this program.  If not, see http://www.gnu.org/licenses/.  *
 *                                                                        *
 **************************************************************************/

 #include "proto.h"
 #include "revision.h"

+#if defined(__linux__) && !defined(NANO_TINY)
 #include <sys/ioctl.h>
+#endif

 #include <stdio.h>
 #include <stdarg.h>
@@ -303,11 +305,15 @@ int *get_input(WINDOW *win, size_t input_len)
 /* Read in a single keystroke, ignoring any that are invalid. */
 int get_kbinput(WINDOW *win)
 {
-    int kbinput;
+    int kbinput = ERR;

    /* Extract one keystroke from the input stream. */
-    while ((kbinput = parse_kbinput(win)) == ERR)
-	;
+#ifdef KEY_RESIZE
+    while (kbinput == ERR || kbinput == KEY_RESIZE)
+#else
+    while (kbinput == ERR)
+#endif
+	kbinput = parse_kbinput(win);

 #ifdef DEBUG
    fprintf(stderr, "after parsing:  kbinput = %d, meta_key = %s\n",
@@ -334,6 +340,7 @@ int parse_kbinput(WINDOW *win)
    int *kbinput, keycode, retval = ERR;

    meta_key = FALSE;
+    shift_held = FALSE;

    /* Read in a character. */
    kbinput = get_input(win, 1);
@@ -502,61 +509,125 @@ int parse_kbinput(WINDOW *win)
 	return sc_seq_or(do_prev_block, 0);
    else if (retval == controldown)
 	return sc_seq_or(do_next_block, 0);
+    else if (retval == shiftcontrolleft) {
+	shift_held = TRUE;
+	return sc_seq_or(do_prev_word_void, 0);
+    } else if (retval == shiftcontrolright) {
+	shift_held = TRUE;
+	return sc_seq_or(do_next_word_void, 0);
+    } else if (retval == shiftcontrolup) {
+	shift_held = TRUE;
+	return sc_seq_or(do_prev_block, 0);
+    } else if (retval == shiftcontroldown) {
+	shift_held = TRUE;
+	return sc_seq_or(do_next_block, 0);
+    } else if (retval == shiftaltleft) {
+	shift_held = TRUE;
+	return sc_seq_or(do_home, 0);
+    } else if (retval == shiftaltright) {
+	shift_held = TRUE;
+	return sc_seq_or(do_end, 0);
+    } else if (retval == shiftaltup) {
+	shift_held = TRUE;
+	return sc_seq_or(do_page_up, 0);
+    } else if (retval == shiftaltdown) {
+	shift_held = TRUE;
+	return sc_seq_or(do_page_down, 0);
+    }
 #endif

+#if defined(__linux__) && !defined(NANO_TINY)
    /* When not running under X, check for the bare arrow keys whether
-     * the Ctrl key is being held together with them. */
-    if (console && (retval == KEY_UP || retval == KEY_DOWN ||
-			retval == KEY_LEFT || retval == KEY_RIGHT)) {
-	unsigned char modifiers = 6;
+     * Shift/Ctrl/Alt are being held together with them. */
+    unsigned char modifiers = 6;

-	if (ioctl(0, TIOCLINUX, &modifiers) >= 0 && (modifiers & 0x04)) {
+    if (console && ioctl(0, TIOCLINUX, &modifiers) >= 0) {
+	if (modifiers & 0x01)
+	    shift_held =TRUE;
+
+	/* Is Ctrl being held? */
+	if (modifiers & 0x04) {
 	    if (retval == KEY_UP)
 		return sc_seq_or(do_prev_block, 0);
 	    else if (retval == KEY_DOWN)
 		return sc_seq_or(do_next_block, 0);
 	    else if (retval == KEY_LEFT)
 		return sc_seq_or(do_prev_word_void, 0);
-	    else
+	    else if (retval == KEY_RIGHT)
 		return sc_seq_or(do_next_word_void, 0);
 	}
+
+	/* Are both Shift and Alt being held? */
+	if ((modifiers & 0x09) == 0x09) {
+	    if (retval == KEY_UP)
+		return sc_seq_or(do_page_up, 0);
+	    else if (retval == KEY_DOWN)
+		return sc_seq_or(do_page_down, 0);
+	    else if (retval == KEY_LEFT)
+		return sc_seq_or(do_home, 0);
+	    else if (retval == KEY_RIGHT)
+		return sc_seq_or(do_end, 0);
+	}
    }
+#endif /* __linux__ && !NANO_TINY */

    switch (retval) {
 #ifdef KEY_SLEFT
 	/* Slang doesn't support KEY_SLEFT. */
 	case KEY_SLEFT:
+	    shift_held = TRUE;
 	    return sc_seq_or(do_left, keycode);
 #endif
 #ifdef KEY_SRIGHT
 	/* Slang doesn't support KEY_SRIGHT. */
 	case KEY_SRIGHT:
+	    shift_held = TRUE;
 	    return sc_seq_or(do_right, keycode);
 #endif
+#ifdef KEY_SR
 #ifdef KEY_SUP
 	/* ncurses and Slang don't support KEY_SUP. */
 	case KEY_SUP:
+#endif
+	case KEY_SR:	/* Scroll backward, on Xfce4-terminal. */
+	    shift_held = TRUE;
 	    return sc_seq_or(do_up_void, keycode);
 #endif
+#ifdef KEY_SF
 #ifdef KEY_SDOWN
 	/* ncurses and Slang don't support KEY_SDOWN. */
 	case KEY_SDOWN:
+#endif
+	case KEY_SF:	/* Scroll forward, on Xfce4-terminal. */
+	    shift_held = TRUE;
 	    return sc_seq_or(do_down_void, keycode);
 #endif
 #ifdef KEY_SHOME
 	/* HP-UX 10-11 and Slang don't support KEY_SHOME. */
 	case KEY_SHOME:
 #endif
+	case SHIFT_HOME:
+	    shift_held = TRUE;
 	case KEY_A1:	/* Home (7) on keypad with NumLock off. */
 	    return sc_seq_or(do_home, keycode);
 #ifdef KEY_SEND
 	/* HP-UX 10-11 and Slang don't support KEY_SEND. */
 	case KEY_SEND:
 #endif
+	case SHIFT_END:
+	    shift_held = TRUE;
 	case KEY_C1:	/* End (1) on keypad with NumLock off. */
 	    return sc_seq_or(do_end, keycode);
+#ifndef NANO_TINY
+	case SHIFT_PAGEUP:		/* Fake key, from Shift+Alt+Up. */
+	    shift_held = TRUE;
+#endif
 	case KEY_A3:	/* PageUp (9) on keypad with NumLock off. */
 	    return sc_seq_or(do_page_up, keycode);
+#ifndef NANO_TINY
+	case SHIFT_PAGEDOWN:	/* Fake key, from Shift+Alt+Down. */
+	    shift_held = TRUE;
+#endif
 	case KEY_C3:	/* PageDown (3) on keypad with NumLock off. */
 	    return sc_seq_or(do_page_down, keycode);
 #ifdef KEY_SDC
@@ -642,6 +713,7 @@ int convert_sequence(const int *seq, size_t seq_len)
 		    case 'B': /* Esc O 1 ; 2 B == Shift-Down on Terminal. */
 		    case 'C': /* Esc O 1 ; 2 C == Shift-Right on Terminal. */
 		    case 'D': /* Esc O 1 ; 2 D == Shift-Left on Terminal. */
+			shift_held = TRUE;
 			return arrow_from_abcd(seq[4]);
 		    case 'P': /* Esc O 1 ; 2 P == F13 on Terminal. */
 			return KEY_F(13);
@@ -847,9 +919,26 @@ int convert_sequence(const int *seq, size_t seq_len)
 		    case 'B': /* Esc [ 1 ; 2 B == Shift-Down on xterm. */
 		    case 'C': /* Esc [ 1 ; 2 C == Shift-Right on xterm. */
 		    case 'D': /* Esc [ 1 ; 2 D == Shift-Left on xterm. */
+			shift_held = TRUE;
 			return arrow_from_abcd(seq[4]);
 		}
 		break;
+#ifndef NANO_TINY
+	    case '4':
+		/* When the arrow keys are held together with Shift+Meta,
+		 * act as if they are Home/End/PgUp/PgDown with Shift. */
+		switch (seq[4]) {
+		    case 'A': /* Esc [ 1 ; 4 A == Shift-Alt-Up on xterm. */
+			return SHIFT_PAGEUP;
+		    case 'B': /* Esc [ 1 ; 4 B == Shift-Alt-Down on xterm. */
+			return SHIFT_PAGEDOWN;
+		    case 'C': /* Esc [ 1 ; 4 C == Shift-Alt-Right on xterm. */
+			return SHIFT_END;
+		    case 'D': /* Esc [ 1 ; 4 D == Shift-Alt-Left on xterm. */
+			return SHIFT_HOME;
+		}
+		break;
+#endif
 	    case '5':
 		switch (seq[4]) {
 		    case 'A': /* Esc [ 1 ; 5 A == Ctrl-Up on xterm. */
@@ -862,6 +951,20 @@ int convert_sequence(const int *seq, size_t seq_len)
 			return CONTROL_LEFT;
 		}
 		break;
+#ifndef NANO_TINY
+	    case '6':
+		switch (seq[4]) {
+		    case 'A': /* Esc [ 1 ; 6 A == Shift-Ctrl-Up on xterm. */
+			return shiftcontrolup;
+		    case 'B': /* Esc [ 1 ; 6 B == Shift-Ctrl-Down on xterm. */
+			return shiftcontroldown;
+		    case 'C': /* Esc [ 1 ; 6 C == Shift-Ctrl-Right on xterm. */
+			return shiftcontrolright;
+		    case 'D': /* Esc [ 1 ; 6 D == Shift-Ctrl-Left on xterm. */
+			return shiftcontrolleft;
+		}
+		break;
+#endif
 	}

 			} else if (seq_len > 2 && seq[2] == '~')
@@ -997,6 +1100,7 @@ int convert_sequence(const int *seq, size_t seq_len)
 		    case 'b': /* Esc [ b == Shift-Down on rxvt/Eterm. */
 		    case 'c': /* Esc [ c == Shift-Right on rxvt/Eterm. */
 		    case 'd': /* Esc [ d == Shift-Left on rxvt/Eterm. */
+			shift_held = TRUE;
 			return arrow_from_abcd(seq[1]);
 		    case '[':
 			if (seq_len > 2 ) {
@@ -1453,9 +1557,8 @@ int get_mouseinput(int *mouse_x, int *mouse_y, bool allow_shortcuts)
 		 * two, in the shortcut list in bottomwin. */
 	    int j;
 		/* The calculated index number of the clicked item. */
-	    size_t currslen;
-		/* The number of shortcuts in the current shortcut
-		 * list. */
+	    size_t number;
+		/* The number of available shortcuts in the current menu. */

 	    /* Translate the mouse event coordinates so that they're
 	     * relative to bottomwin. */
@@ -1472,38 +1575,32 @@ int get_mouseinput(int *mouse_x, int *mouse_y, bool allow_shortcuts)
 		return 0;
 	    }

-	    /* Get the shortcut lists' length. */
-	    if (currmenu == MMAIN)
-		currslen = MAIN_VISIBLE;
-	    else {
-		currslen = length_of_list(currmenu);
+	    /* Determine how many shortcuts are being shown. */
+	    number = length_of_list(currmenu);

-		/* We don't show any more shortcuts than the main list
-		 * does. */
-		if (currslen > MAIN_VISIBLE)
-		    currslen = MAIN_VISIBLE;
-	    }
+	    if (number > MAIN_VISIBLE)
+		number = MAIN_VISIBLE;

 	    /* Calculate the width of all of the shortcuts in the list
 	     * except for the last two, which are longer by (COLS % i)
 	     * columns so as to not waste space. */
-	    if (currslen < 2)
+	    if (number < 2)
 		i = COLS / (MAIN_VISIBLE / 2);
 	    else
-		i = COLS / ((currslen / 2) + (currslen % 2));
+		i = COLS / ((number / 2) + (number % 2));

 	    /* Calculate the one-based index in the shortcut list. */
 	    j = (*mouse_x / i) * 2 + *mouse_y;

 	    /* Adjust the index if we hit the last two wider ones. */
-	    if ((j > currslen) && (*mouse_x % i < COLS % i))
+	    if ((j > number) && (*mouse_x % i < COLS % i))
 		j -= 2;
 #ifdef DEBUG
 	    fprintf(stderr, "Calculated %i as index in shortcut list, currmenu = %x.\n", j, currmenu);
 #endif
 	    /* Ignore releases/clicks of the first mouse button beyond
 	     * the last shortcut. */
-	    if (j > currslen)
+	    if (j > number)
 		return 2;

 	    /* Go through the list of functions to determine which
@@ -1635,7 +1732,7 @@ void blank_statusbar(void)
 * portion of the window. */
 void blank_bottombars(void)
 {
-    if (!ISSET(NO_HELP)) {
+    if (!ISSET(NO_HELP) && LINES > 4) {
 	blank_line(bottomwin, 1, 0, COLS);
 	blank_line(bottomwin, 2, 0, COLS);
    }
@@ -1661,6 +1758,10 @@ void check_statusblank(void)
 	reset_cursor();
 	wnoutrefresh(edit);
    }
+
+    /* If the subwindows overlap, make sure to show the edit window now. */
+    if (LINES == 1)
+	edit_refresh();
 }

 /* Convert buf into a string that can be displayed on screen.  The
@@ -1836,6 +1937,10 @@ void titlebar(const char *path)
    char *fragment;
 	/* The tail part of the pathname when dottified. */

+    /* If the screen is too small, there is no titlebar. */
+    if (topwin == NULL)
+	return;
+
    assert(path != NULL || openfile->filename != NULL);

    wattron(topwin, interface_color_pair[TITLE_BAR]);
@@ -1944,8 +2049,9 @@ void statusbar(const char *msg)
 void statusline(message_type importance, const char *msg, ...)
 {
    va_list ap;
-    char *bar, *foo;
+    char *compound, *message;
    size_t start_x;
+    bool bracketed;
 #ifndef NANO_TINY
    bool old_whitespace = ISSET(WHITESPACE_DISPLAY);

@@ -1981,24 +2087,24 @@ void statusline(message_type importance, const char *msg, ...)

    blank_statusbar();

-    bar = charalloc(mb_cur_max() * (COLS - 3));
-    vsnprintf(bar, mb_cur_max() * (COLS - 3), msg, ap);
+    /* Construct the message out of all the arguments. */
+    compound = charalloc(mb_cur_max() * (COLS + 1));
+    vsnprintf(compound, mb_cur_max() * (COLS + 1), msg, ap);
    va_end(ap);
-    foo = display_string(bar, 0, COLS - 4, FALSE);
-    free(bar);
+    message = display_string(compound, 0, COLS, FALSE);
+    free(compound);

-#ifndef NANO_TINY
-    if (old_whitespace)
-	SET(WHITESPACE_DISPLAY);
-#endif
-    start_x = (COLS - strlenpt(foo) - 4) / 2;
+    start_x = (COLS - strlenpt(message)) / 2;
+    bracketed = (start_x > 1);

-    wmove(bottomwin, 0, start_x);
+    wmove(bottomwin, 0, (bracketed ? start_x - 2 : start_x));
    wattron(bottomwin, interface_color_pair[STATUS_BAR]);
-    waddstr(bottomwin, "[ ");
-    waddstr(bottomwin, foo);
-    free(foo);
-    waddstr(bottomwin, " ]");
+    if (bracketed)
+	waddstr(bottomwin, "[ ");
+    waddstr(bottomwin, message);
+    free(message);
+    if (bracketed)
+	waddstr(bottomwin, " ]");
    wattroff(bottomwin, interface_color_pair[STATUS_BAR]);

    /* Push the message to the screen straightaway. */
@@ -2007,10 +2113,12 @@ void statusline(message_type importance, const char *msg, ...)

    suppress_cursorpos = TRUE;

-    /* If we're doing quick statusbar blanking, blank it after just one
-     * keystroke.  Otherwise, blank it after twenty-six keystrokes, as
-     * Pico does. */
 #ifndef NANO_TINY
+    if (old_whitespace)
+	SET(WHITESPACE_DISPLAY);
+
+    /* If doing quick blanking, blank the statusbar after just one keystroke.
+     * Otherwise, blank it after twenty-six keystrokes, as Pico does. */
    if (ISSET(QUICK_BLANK))
 	statusblank = 1;
    else
@@ -2022,42 +2130,36 @@ void statusline(message_type importance, const char *msg, ...)
 * of the bottom portion of the window. */
 void bottombars(int menu)
 {
-    size_t i, colwidth, slen;
+    size_t number, itemwidth, i;
    subnfunc *f;
    const sc *s;

    /* Set the global variable to the given menu. */
    currmenu = menu;

-    if (ISSET(NO_HELP))
+    if (ISSET(NO_HELP) || LINES < 5)
 	return;

-    if (menu == MMAIN) {
-	slen = MAIN_VISIBLE;
+    /* Determine how many shortcuts there are to show. */
+    number = length_of_list(menu);

-	assert(slen <= length_of_list(menu));
-    } else {
-	slen = length_of_list(menu);
+    if (number > MAIN_VISIBLE)
+	number = MAIN_VISIBLE;

-	/* Don't show any more shortcuts than the main list does. */
-	if (slen > MAIN_VISIBLE)
-	    slen = MAIN_VISIBLE;
-    }
+    /* Compute the width of each keyname-plus-explanation pair. */
+    itemwidth = COLS / ((number / 2) + (number % 2));

-    /* There will be this many characters per column, except for the
-     * last two, which will be longer by (COLS % colwidth) columns so as
-     * to not waste space.  We need at least three columns to display
-     * anything properly. */
-    colwidth = COLS / ((slen / 2) + (slen % 2));
+    /* If there is no room, don't print anything. */
+    if (itemwidth == 0)
+	return;

    blank_bottombars();

 #ifdef DEBUG
-    fprintf(stderr, "In bottombars, and slen == \"%d\"\n", (int) slen);
+    fprintf(stderr, "In bottombars, number of items == \"%d\"\n", (int) number);
 #endif

-    for (f = allfuncs, i = 0; i < slen && f != NULL; f = f->next) {
-
+    for (f = allfuncs, i = 0; i < number && f != NULL; f = f->next) {
 #ifdef DEBUG
 	fprintf(stderr, "Checking menu items....");
 #endif
@@ -2074,11 +2176,12 @@ void bottombars(int menu)
 #endif
 	    continue;
 	}
-	wmove(bottomwin, 1 + i % 2, (i / 2) * colwidth);
+
+	wmove(bottomwin, 1 + i % 2, (i / 2) * itemwidth);
 #ifdef DEBUG
 	fprintf(stderr, "Calling onekey with keystr \"%s\" and desc \"%s\"\n", s->keystr, f->desc);
 #endif
-	onekey(s->keystr, _(f->desc), colwidth + (COLS % colwidth));
+	onekey(s->keystr, _(f->desc), itemwidth + (COLS % itemwidth));
 	i++;
    }
Author	SHA1	Message	Date
Benno Schulenberg	244de605a7	po: update translations and regenerate POT file and PO files	2016-09-01 12:42:50 +02:00
Benno Schulenberg	002652d263	bump version numbers and add a news item for 2.7.0	2016-09-01 12:38:35 +02:00
Benno Schulenberg	08b770d425	files: close a lockfile after reading it	2016-08-30 11:48:35 +02:00
Benno Schulenberg	2dffcf101f	tweaks: fix compilation with --disable-histories	2016-08-30 11:14:19 +02:00
Benno Schulenberg	96fbdfbc7d	input: unset a softmark whenever a character is typed	2016-08-30 10:41:28 +02:00
Benno Schulenberg	272a953889	tweaks: fix compilation when configured with --with-slang	2016-08-30 10:12:02 +02:00
Benno Schulenberg	db310ac9b6	input: ignore the resize "key", to prevent reporting an unbound key In the tiny version it would beep and report an unbound key for every window resize.	2016-08-30 09:40:51 +02:00
Benno Schulenberg	c11c688420	tweaks: fix compilation with --enable-tiny again	2016-08-30 09:36:49 +02:00
Benno Schulenberg	514cd9a099	update the license text to the preferred version Mentioning "GNU nano" instead of "This program" and referring to the website instead of to a postal address.	2016-08-29 21:27:16 +02:00
Benno Schulenberg	406e5242a3	update the copyright notices	2016-08-29 21:27:05 +02:00
Benno Schulenberg	c26f58e783	AUTHORS: add Mahyar Abbaspour and Mike Scalora for their contributions	2016-08-29 21:26:57 +02:00
Benno Schulenberg	5ad26f864a	tweaks: adjust indentation after previous change	2016-08-29 13:36:29 +02:00
Benno Schulenberg	e7f39bc248	tweaks: remove an unneeded check, reshuffle some things, add a comment Resetting the cutbuffer is irrelevant when 'allow_funcs' is false or when in view mode, so do_input() can just return in those cases.	2016-08-29 13:35:35 +02:00
Benno Schulenberg	0242d84218	tweaks: make a call in one place instead of in four different ones And remove a superfluous call.	2016-08-28 21:27:52 +02:00
Benno Schulenberg	7275e11c4f	tweaks: adjust some comments and remove needless asserts	2016-08-28 18:17:10 +02:00
Benno Schulenberg	77d140728d	tweaks: don't bother trimming the prompt again The prompt has already been trimmed in do_prompt() to fit into the available space.	2016-08-28 17:53:44 +02:00
Benno Schulenberg	4d2ada60f5	tweaks: don't bother avoiding unneeded rewrites of the promptbar Leave the optimization of actual screen writes to ncurses.	2016-08-28 17:37:25 +02:00
Benno Schulenberg	382c9d792d	new feature: allow text selection by holding Shift with the cursor keys Add the keycodes and routines to allow the user to forego setting the mark explicitly (with M-A / ^6) and instead quickly select a few words or lines by holding down Shift together with the movement keys. (Some combinations with Shift are swallowed by some terminal emulators. To work around some of those, the combinations Shift+Alt+Left/Right work as Shift+Home/End and Shift+Alt+Up/Down work as Shift+PageUp/PageDown.)	2016-08-28 11:29:28 +02:00
Benno Schulenberg	aeb49a8013	bottombar: only count help items that have a shortcut bound to them This avoids showing a ghost item in, for example, the WriteOut menu when not using --tempfile and the user does not bind 'discardbuffer'.	2016-08-27 12:22:59 +02:00
Benno Schulenberg	c05c914eee	tweaks: rename three variables	2016-08-27 12:10:18 +02:00
Benno Schulenberg	c19f0c732e	tweaks: simplify the determination of the number of shown help items	2016-08-27 12:06:08 +02:00
Benno Schulenberg	6ad3700a3d	prompt: mouse clicks that moved the cursor need no further processing This fixes https://savannah.gnu.org/bugs/?48917.	2016-08-27 12:00:08 +02:00
Benno Schulenberg	4f156aa6db	prompt: set up the prepared answer before allowing to change it This fixes https://savannah.gnu.org/bugs/?48916.	2016-08-27 11:59:57 +02:00
Benno Schulenberg	6142ef87b5	prompt: use angular brackets as continuation mark, as Pico does The $ sign looks too much like an S, and it "obscures" the answer by being so "massive". The < and > signs are lighter and work better.	2016-08-27 09:34:54 +02:00
Benno Schulenberg	da2fce90bd	tweaks: elide a variable and rename some others	2016-08-27 09:34:42 +02:00
Benno Schulenberg	1e3cffbbd6	prompt: show a trailing $ when the tail of the answer is offscreen This fixes https://savannah.gnu.org/bugs/?48894.	2016-08-26 21:42:23 +02:00
Benno Schulenberg	92c97c70d4	prompt: leave always at least the last character of the answer visible This fixes https://savannah.gnu.org/bugs/?48912.	2016-08-26 21:32:07 +02:00
Benno Schulenberg	b77b1391c3	tweaks: improve some indentation and reshuffle a few lines	2016-08-26 12:24:18 +02:00
Benno Schulenberg	7e0c4e5726	tweaks: rename a function and adjust indentation	2016-08-25 20:20:50 +02:00
Benno Schulenberg	50616148b0	prompt: recompose the statusbar text whenever the window size changes This fixes https://savannah.gnu.org/bugs/?48796.	2016-08-25 20:12:36 +02:00
Benno Schulenberg	3e40e5d4b5	docs: explain how to contribute code	2016-08-25 19:35:14 +02:00
Benno Schulenberg	2f9232a493	tweaks: adjust indentation after previous change	2016-08-25 11:45:38 +02:00
Benno Schulenberg	0d5fbfb91c	tweaks: reshuffle some things, and remove a misplaced comment	2016-08-25 11:45:34 +02:00
Benno Schulenberg	56147434f3	prompt: don't crash when the terminal is less than four columns wide This fixes https://savannah.gnu.org/bugs/?48792.	2016-08-25 11:45:13 +02:00
Benno Schulenberg	21cb01e543	tweaks: rename two variables, to make some sense And move a statement to a better place.	2016-08-25 11:45:05 +02:00
Benno Schulenberg	ea9aaee8c7	statusbar: leave out the brackets when the message is very long This also prevents the message from spilling into the help lines when the terminal is less than four columns wide. (Not that one can read anything then, but it looks better.)	2016-08-25 11:45:01 +02:00
Benno Schulenberg	c22cd03f18	prompt: work around a VTE bug by outdancing an ncurses optimization This fixes https://savannah.gnu.org/bugs/?48852.	2016-08-25 10:46:28 +02:00
Benno Schulenberg	bd1c5d7c63	moving: make PgUp and PgDown functional also in very flat terminals Even when the edit window consists of just one or two lines, the PageUp and PageDown functions (^Y and ^V) should continue to move the window. This fixes https://savannah.gnu.org/bugs/?48805.	2016-08-21 15:52:24 +02:00
Benno Schulenberg	00b293bf70	tweaks: adjust some braces and indentations	2016-08-21 15:39:00 +02:00
Benno Schulenberg	76a960d73d	screen: continue to function also in a terminal with very few lines This fixes https://savannah.gnu.org/bugs/?48787.	2016-08-17 10:13:22 +02:00
Benno Schulenberg	97eb0e515f	tweaks: reshuffle some stuff in a more logical order	2016-08-16 19:22:56 +02:00
Benno Schulenberg	68010d931a	startup: don't crash when dying early That is: don't try to look at open files when none are open yet.	2016-08-16 16:59:37 +02:00
Benno Schulenberg	c661506681	tweaks: use a separate function to ask ncurses for keycodes	2016-08-16 12:01:59 +02:00
Benno Schulenberg	0dd2a55284	screen: don't die when the window is narrower than four columns This fixes https://savannah.gnu.org/bugs/?48520.	2016-08-15 17:25:33 +02:00
Benno Schulenberg	49fc528d88	restore the GNU marker in nano's name	2016-08-14 21:42:37 +02:00
Benno Schulenberg	928a24c204	input: look at the modifier keys only when compiled on Linux This fixes https://savannah.gnu.org/bugs/?48751 reported by Andrew Ho. This also fixes compilation when configured with --enable-tiny.	2016-08-14 21:42:08 +02:00
Benno Schulenberg	d8031af030	screen: retain the placewewant also when using an alternate speller When using the default speller or the formatter, the placewewant is remembered. So it should be remembered too when the user specifies a different speller. (This behavior was inadvertently lost last year, in commit 82d737e.)	2016-08-12 20:02:04 +02:00