Package: release.debian.org
Severity: normal
User: release.debian....@packages.debian.org
Usertags: unblock
Hi release team,
Nano's upstream has been focusing on fixing some crashers and hangs lately,
and as nano froze a while back, he was kind enough to backport all the fixes
he deems interesting for the buster release.
The following debdiff adds 7 patches (and renames the already existing one).
All patches are simple, some of them one liners.
If you can signal if this is OK for an upload now, I'll act accordingly ASAP.
unblock nano/3.2-3
-- System Information:
Debian Release: 10.0
APT prefers unstable-debug
APT policy: (500, 'unstable-debug'), (500, 'unstable'), (500, 'testing'), (1,
'experimental')
Architecture: amd64 (x86_64)
Foreign Architectures: i386
Kernel: Linux 4.19.0-5-amd64 (SMP w/4 CPU cores)
Kernel taint flags: TAINT_OOT_MODULE, TAINT_UNSIGNED_MODULE
Locale: LANG=ca_ES.UTF-8, LC_CTYPE=ca_ES.UTF-8 (charmap=UTF-8),
LANGUAGE=ca_ES:ca (charmap=UTF-8)
Shell: /bin/sh linked to /bin/dash
Init: systemd (via /run/systemd/system)
LSM: AppArmor: enabled
diff -Nru nano-3.2/debian/changelog nano-3.2/debian/changelog
--- nano-3.2/debian/changelog 2019-02-20 12:27:34.000000000 +0100
+++ nano-3.2/debian/changelog 2019-06-12 02:34:18.000000000 +0200
@@ -1,3 +1,11 @@
+nano (3.2-3) unstable; urgency=medium
+
+ * Add series of patches from Benno, to address several known crashes and
+ hangs, as well as a couple presentation issues.
+ * Add gbp.conf with debian branch pointing to buster.
+
+ -- Jordi Mallach <jo...@debian.org> Wed, 12 Jun 2019 02:34:18 +0200
+
nano (3.2-2) unstable; urgency=medium
* The "#JoAcuso" release.
diff -Nru nano-3.2/debian/gbp.conf nano-3.2/debian/gbp.conf
--- nano-3.2/debian/gbp.conf 1970-01-01 01:00:00.000000000 +0100
+++ nano-3.2/debian/gbp.conf 2019-06-12 02:33:34.000000000 +0200
@@ -0,0 +1,3 @@
+[DEFAULT]
+pristine-tar = True
+debian-branch = buster
diff -Nru
nano-3.2/debian/patches/0001-options-exit-on-a-bad-quoting-regex-instead-of-crash.patch
nano-3.2/debian/patches/0001-options-exit-on-a-bad-quoting-regex-instead-of-crash.patch
---
nano-3.2/debian/patches/0001-options-exit-on-a-bad-quoting-regex-instead-of-crash.patch
1970-01-01 01:00:00.000000000 +0100
+++
nano-3.2/debian/patches/0001-options-exit-on-a-bad-quoting-regex-instead-of-crash.patch
2019-06-12 02:26:08.000000000 +0200
@@ -0,0 +1,46 @@
+From d12fb86e18b826ef7f341c14b27acec4d137f191 Mon Sep 17 00:00:00 2001
+From: David Lawrence Ramsey <pooka...@gmail.com>
+Date: Mon, 10 Dec 2018 14:25:15 -0600
+Subject: [PATCH 1/8] options: exit on a bad quoting regex, instead of crashing
+ later
+
+The paragraph-jumping functions used the regex unverified...
+
+This fixes https://savannah.gnu.org/bugs/?55169.
+---
+ src/nano.c | 2 ++
+ src/text.c | 5 -----
+ 2 files changed, 2 insertions(+), 5 deletions(-)
+
+diff --git a/src/nano.c b/src/nano.c
+index e121722a..9825d457 100644
+--- a/src/nano.c
++++ b/src/nano.c
+@@ -2481,6 +2481,8 @@ int main(int argc, char **argv)
+
+ quoteerr = charalloc(size);
+ regerror(quoterc, "ereg, quoteerr, size);
++
++ die(_("Bad quoting regex \"%s\": %s\n"), quotestr, quoteerr);
+ }
+ #endif /* ENABLE_JUSTIFY */
+
+diff --git a/src/text.c b/src/text.c
+index abdd243d..70953379 100644
+--- a/src/text.c
++++ b/src/text.c
+@@ -2145,11 +2145,6 @@ bool find_paragraph(size_t *const quote, size_t *const
par)
+ filestruct *current_save;
+ /* The line at the beginning of the paragraph we search for. */
+
+- if (quoterc != 0) {
+- statusline(ALERT, _("Bad quote string %s: %s"), quotestr,
quoteerr);
+- return FALSE;
+- }
+-
+ /* If we're at the end of the last line of the file, it means that
+ * there aren't any paragraphs left, so get out. */
+ if (openfile->current == openfile->filebot && openfile->current_x ==
+--
+2.20.1
+
diff -Nru
nano-3.2/debian/patches/0002-history-use-an-unfreed-position_history-to-avoid-a-p.patch
nano-3.2/debian/patches/0002-history-use-an-unfreed-position_history-to-avoid-a-p.patch
---
nano-3.2/debian/patches/0002-history-use-an-unfreed-position_history-to-avoid-a-p.patch
1970-01-01 01:00:00.000000000 +0100
+++
nano-3.2/debian/patches/0002-history-use-an-unfreed-position_history-to-avoid-a-p.patch
2019-06-12 02:26:08.000000000 +0200
@@ -0,0 +1,45 @@
+From 2204d14c86f17f13ad1f23e62af80bff406425cb Mon Sep 17 00:00:00 2001
+From: Brand Huntsman <al...@qzx.com>
+Date: Wed, 27 Feb 2019 02:40:18 -0700
+Subject: [PATCH 2/8] history: use an unfreed 'position_history' to avoid a
+ possible crash
+
+The reload_positions_if_needed() routine can free the existing
+'position_history' and allocate a new one. Using the old one,
+from before the reload, could lead to a crash.
+
+This fixes https://savannah.gnu.org/bugs/?55792.
+Reported-by: Enrico Mioso <mrkiko...@gmail.com>
+
+Bug existed since the reloading of the position-history file was
+introduced, a year and a half ago, in commit bfc53f30.
+
+Signed-off-by: Brand Huntsman <al...@qzx.com>
+---
+ src/history.c | 3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+
+diff --git a/src/history.c b/src/history.c
+index b3530837..ca0b2d49 100644
+--- a/src/history.c
++++ b/src/history.c
+@@ -593,7 +593,7 @@ void update_poshistory(char *filename, ssize_t lineno,
ssize_t xpos)
+ * set line and column to the retrieved values. */
+ bool has_old_position(const char *file, ssize_t *line, ssize_t *column)
+ {
+- poshiststruct *posptr = position_history;
++ poshiststruct *posptr;
+ char *fullpath = get_full_path(file);
+
+ if (fullpath == NULL)
+@@ -601,6 +601,7 @@ bool has_old_position(const char *file, ssize_t *line,
ssize_t *column)
+
+ reload_positions_if_needed();
+
++ posptr = position_history;
+ while (posptr != NULL && strcmp(posptr->filename, fullpath) != 0)
+ posptr = posptr->next;
+
+--
+2.20.1
+
diff -Nru
nano-3.2/debian/patches/0003-speller-block-the-resizing-signal-again-during-an-ex.patch
nano-3.2/debian/patches/0003-speller-block-the-resizing-signal-again-during-an-ex.patch
---
nano-3.2/debian/patches/0003-speller-block-the-resizing-signal-again-during-an-ex.patch
1970-01-01 01:00:00.000000000 +0100
+++
nano-3.2/debian/patches/0003-speller-block-the-resizing-signal-again-during-an-ex.patch
2019-06-12 02:26:08.000000000 +0200
@@ -0,0 +1,84 @@
+From 28ba36c2dcebd0a4caef1c231673c86f372c0042 Mon Sep 17 00:00:00 2001
+From: Benno Schulenberg <bensb...@telfort.nl>
+Date: Wed, 27 Mar 2019 17:15:31 +0100
+Subject: [PATCH 3/8] speller: block the resizing signal again during an
+ external spell check
+
+Somehow a SIGWINCH pushes nano past the wait() in do_alt_speller(),
+even though the external spelling program hasn't finished.
+
+This fixes https://savannah.gnu.org/bugs/?56010
+by reverting commit 1f39f60b.
+
+Bug existed since version 3.2.
+---
+ src/nano.c | 11 +++++++++++
+ src/proto.h | 1 +
+ src/text.c | 10 ++++++++++
+ 3 files changed, 22 insertions(+)
+
+diff --git a/src/nano.c b/src/nano.c
+index 9825d457..ce5334ab 100644
+--- a/src/nano.c
++++ b/src/nano.c
+@@ -1359,6 +1359,17 @@ void regenerate_screen(void)
+ total_refresh();
+ }
+
++/* If allow is FALSE, block any SIGWINCH signal. If allow is TRUE,
++ * unblock SIGWINCH so any pending ones can be dealt with. */
++void allow_sigwinch(bool allow)
++{
++ sigset_t winch;
++
++ sigemptyset(&winch);
++ sigaddset(&winch, SIGWINCH);
++ sigprocmask(allow ? SIG_UNBLOCK : SIG_BLOCK, &winch, NULL);
++}
++
+ /* Handle the global toggle specified in flag. */
+ void do_toggle(int flag)
+ {
+diff --git a/src/proto.h b/src/proto.h
+index b6c50e58..ccf68c45 100644
+--- a/src/proto.h
++++ b/src/proto.h
+@@ -424,6 +424,7 @@ RETSIGTYPE do_continue(int signal);
+ #ifndef NANO_TINY
+ RETSIGTYPE handle_sigwinch(int signal);
+ void regenerate_screen(void);
++void allow_sigwinch(bool allow);
+ void do_toggle(int flag);
+ void enable_signals(void);
+ #endif
+diff --git a/src/text.c b/src/text.c
+index 70953379..7e1b0b4c 100644
+--- a/src/text.c
++++ b/src/text.c
+@@ -2883,6 +2883,11 @@ const char *do_alt_speller(char *tempfile_name)
+ } else if (pid_spell < 0)
+ return _("Could not fork");
+
++#ifndef NANO_TINY
++ /* Block SIGWINCHes so the spell checker doesn't get any. */
++ allow_sigwinch(FALSE);
++#endif
++
+ /* Wait for the alternate spell checker to finish. */
+ wait(&alt_spell_status);
+
+@@ -2937,6 +2942,11 @@ const char *do_alt_speller(char *tempfile_name)
+ adjust_viewport(STATIONARY);
+ }
+
++#ifndef NANO_TINY
++ /* Unblock SIGWINCHes again. */
++ allow_sigwinch(TRUE);
++#endif
++
+ return NULL;
+ }
+
+--
+2.20.1
+
diff -Nru
nano-3.2/debian/patches/0004-unindent-ensure-that-a-partial-line-gets-displayed-p.patch
nano-3.2/debian/patches/0004-unindent-ensure-that-a-partial-line-gets-displayed-p.patch
---
nano-3.2/debian/patches/0004-unindent-ensure-that-a-partial-line-gets-displayed-p.patch
1970-01-01 01:00:00.000000000 +0100
+++
nano-3.2/debian/patches/0004-unindent-ensure-that-a-partial-line-gets-displayed-p.patch
2019-06-12 02:26:08.000000000 +0200
@@ -0,0 +1,35 @@
+From 8faf9eb8e624e9a2d656249c9fcd5203df84d20c Mon Sep 17 00:00:00 2001
+From: Benno Schulenberg <bensb...@telfort.nl>
+Date: Fri, 12 Apr 2019 14:00:14 +0200
+Subject: [PATCH 4/8] unindent: ensure that a partial line gets displayed
+ properly afterwards
+
+When only the trailing chunk of a line is displayed on the top row of
+the screen, and the unindenting of this line leads to a reduction in
+the number of chunks, then the starting point of the viewport needs
+to be re-evaluated. For simplicity, do this always when something is
+unindented.
+
+This fixes https://savannah.gnu.org/bugs/?56102.
+Reported-by: Devin Hussey <husseyde...@gmail.com>
+
+Bug existed since around version 2.9.2.
+---
+ src/text.c | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/src/text.c b/src/text.c
+index 7e1b0b4c..683e6080 100644
+--- a/src/text.c
++++ b/src/text.c
+@@ -459,6 +459,7 @@ void do_unindent(void)
+ }
+
+ set_modified();
++ ensure_firstcolumn_is_aligned();
+ refresh_needed = TRUE;
+ shift_held = TRUE;
+ }
+--
+2.20.1
+
diff -Nru
nano-3.2/debian/patches/0005-help-don-t-check-for-confinement-when-opening-a-temp.patch
nano-3.2/debian/patches/0005-help-don-t-check-for-confinement-when-opening-a-temp.patch
---
nano-3.2/debian/patches/0005-help-don-t-check-for-confinement-when-opening-a-temp.patch
1970-01-01 01:00:00.000000000 +0100
+++
nano-3.2/debian/patches/0005-help-don-t-check-for-confinement-when-opening-a-temp.patch
2019-06-12 02:26:08.000000000 +0200
@@ -0,0 +1,31 @@
+From 9596e30f78ccbcc8294e0cee31bfbd8fdf2ee1af Mon Sep 17 00:00:00 2001
+From: Benno Schulenberg <bensb...@telfort.nl>
+Date: Thu, 23 May 2019 12:43:31 +0200
+Subject: [PATCH 5/8] help: don't check for confinement when opening a
+ temporary help-text file
+
+In other words: don't crash when typing ^G when --operatingdir was used.
+
+This fixes https://savannah.gnu.org/bugs/?56369.
+
+Bug existed since version 2.8.2.
+---
+ src/files.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/files.c b/src/files.c
+index bbdcd289..afdaeeb5 100644
+--- a/src/files.c
++++ b/src/files.c
+@@ -425,7 +425,7 @@ bool open_buffer(const char *filename, bool new_buffer)
+ as_an_at = FALSE;
+
+ #ifdef ENABLE_OPERATINGDIR
+- if (outside_of_confinement(filename, FALSE)) {
++ if (!inhelp && outside_of_confinement(filename, FALSE)) {
+ statusline(ALERT, _("Can't read file from outside of %s"),
+ operating_dir);
+ return FALSE;
+--
+2.20.1
+
diff -Nru
nano-3.2/debian/patches/0006-menus-don-t-show-S-and-Q-in-the-help-lines-in-the-ti.patch
nano-3.2/debian/patches/0006-menus-don-t-show-S-and-Q-in-the-help-lines-in-the-ti.patch
---
nano-3.2/debian/patches/0006-menus-don-t-show-S-and-Q-in-the-help-lines-in-the-ti.patch
1970-01-01 01:00:00.000000000 +0100
+++
nano-3.2/debian/patches/0006-menus-don-t-show-S-and-Q-in-the-help-lines-in-the-ti.patch
2019-06-12 02:26:08.000000000 +0200
@@ -0,0 +1,94 @@
+From d934da7072628e5ad97f97fc4c51ca99e3d8c323 Mon Sep 17 00:00:00 2001
+From: Benno Schulenberg <bensb...@telfort.nl>
+Date: Sun, 17 Feb 2019 21:02:29 +0100
+Subject: [PATCH 6/8] menus: don't show ^S and ^Q in the help lines in the tiny
+ version
+
+On small terminals (80 columns or so), ^S and ^Q would be in
+the last position of the help lines. But some terminals might
+intercept ^S and stop all output (until ^Q is pressed), which
+could be unexpected and frustrating. So, rearrange things for
+the tiny version so that ^S appears only on very wide terminals.
+
+Also, having two keystrokes for saving the current buffer
+(^O and ^S) in the two help lines is wasteful, more so as
+in the tiny version there are no ^G help texts.
+
+So, show the more useful M-Q and M-W instead.
+
+This addresses https://bugs.debian.org/915017.
+Reported-by: Steve McIntyre <st...@einval.com>
+---
+ src/global.c | 22 +++++++++++++++++-----
+ 1 file changed, 17 insertions(+), 5 deletions(-)
+
+diff --git a/src/global.c b/src/global.c
+index 611649d6..018b0d3e 100644
+--- a/src/global.c
++++ b/src/global.c
+@@ -835,10 +835,6 @@ void shortcut_init(void)
+ #ifndef NANO_TINY
+ add_to_funcs(do_find_bracket, MMAIN,
+ N_("To Bracket"), WITHORSANS(bracket_gist), BLANKAFTER, VIEW);
+-#else
+- /* Place this one here only in the tiny version; otherwise further
down. */
+- add_to_funcs(do_savefile, MMAIN,
+- N_("Save"), WITHORSANS(savefile_gist), BLANKAFTER, NOVIEW);
+ #endif
+
+ #ifdef ENABLE_BROWSER
+@@ -847,14 +843,28 @@ void shortcut_init(void)
+ add_to_funcs(do_search_backward, MBROWSER,
+ N_("Where Was"), WITHORSANS(browserwherewas_gist), TOGETHER,
VIEW);
+ #endif
++
++#ifndef NANO_TINY
+ add_to_funcs(do_search_backward, MMAIN|MHELP,
+ /* TRANSLATORS: This starts a backward search. */
+ N_("Where Was"), WITHORSANS(wherewas_gist), TOGETHER, VIEW);
++#endif
+ add_to_funcs(do_findprevious, MMAIN|MHELP|MBROWSER,
+ /* TRANSLATORS: This refers to searching the preceding
occurrence. */
+ N_("Previous"), WITHORSANS(findprev_gist), TOGETHER, VIEW);
++#ifndef NANO_TINY
+ add_to_funcs(do_findnext, MMAIN|MHELP|MBROWSER,
+ N_("Next"), WITHORSANS(findnext_gist), BLANKAFTER, VIEW);
++#else
++ /* In the tiny version, arrange things a bit differently, so that
++ * the useful M-W and M-Q are shown in the help lines. */
++ add_to_funcs(do_findnext, MMAIN|MHELP|MBROWSER,
++ N_("Next"), WITHORSANS(findnext_gist), TOGETHER, VIEW);
++ add_to_funcs(do_search_backward, MMAIN|MHELP,
++ N_("Where Was"), WITHORSANS(wherewas_gist), BLANKAFTER, VIEW);
++ add_to_funcs(total_refresh, MMAIN,
++ N_("Refresh"), WITHORSANS(refresh_gist), BLANKAFTER, VIEW);
++#endif
+
+ add_to_funcs(do_left, MMAIN,
+ /* TRANSLATORS: This means move the cursor one character back.
*/
+@@ -962,8 +972,10 @@ void shortcut_init(void)
+ add_to_funcs(do_verbatim_input, MMAIN,
+ N_("Verbatim"), WITHORSANS(verbatim_gist), BLANKAFTER, NOVIEW);
+
++#ifndef NANO_TINY
+ add_to_funcs(total_refresh, MMAIN,
+ N_("Refresh"), WITHORSANS(refresh_gist), TOGETHER, VIEW);
++#endif
+
+ add_to_funcs(do_suspend_void, MMAIN,
+ N_("Suspend"), WITHORSANS(suspend_gist), BLANKAFTER, VIEW);
+@@ -995,10 +1007,10 @@ void shortcut_init(void)
+ if (!ISSET(RESTRICTED))
+ add_to_funcs(do_linter, MMAIN,
+ N_("To Linter"), WITHORSANS(lint_gist),
BLANKAFTER, NOVIEW);
++#endif
+ #endif
+ add_to_funcs(do_savefile, MMAIN,
+ N_("Save"), WITHORSANS(savefile_gist), BLANKAFTER, NOVIEW);
+-#endif
+
+ #ifndef ENABLE_JUSTIFY
+ add_to_funcs(flip_goto, MWHEREIS,
+--
+2.20.1
+
diff -Nru
nano-3.2/debian/patches/0007-browser-show-the-G-item-again-in-the-help-lines.patch
nano-3.2/debian/patches/0007-browser-show-the-G-item-again-in-the-help-lines.patch
---
nano-3.2/debian/patches/0007-browser-show-the-G-item-again-in-the-help-lines.patch
1970-01-01 01:00:00.000000000 +0100
+++
nano-3.2/debian/patches/0007-browser-show-the-G-item-again-in-the-help-lines.patch
2019-06-12 02:26:08.000000000 +0200
@@ -0,0 +1,36 @@
+From 5e0ecc8f925368baa83ffa0147da26850f6ad285 Mon Sep 17 00:00:00 2001
+From: Benno Schulenberg <bensb...@telfort.nl>
+Date: Wed, 6 Feb 2019 16:27:27 +0100
+Subject: [PATCH 7/8] browser: show the ^G item again in the help lines
+
+Also, prune another statement as MMOST no longer includes MBROWSER.
+
+This fixes https://savannah.gnu.org/bugs/?55655.
+
+Bug existed since version 3.2, commit cc01bc3e.
+---
+ src/global.c | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/src/global.c b/src/global.c
+index 018b0d3e..7dd90647 100644
+--- a/src/global.c
++++ b/src/global.c
+@@ -702,12 +702,12 @@ void shortcut_init(void)
+
+ /* Start populating the different menus with functions. */
+
+- add_to_funcs(do_help_void, MMOST & ~MFINDINHELP,
++ add_to_funcs(do_help_void, (MMOST | MBROWSER) & ~MFINDINHELP,
+ /* TRANSLATORS: Try to keep the next ninety strings or so at
most 10
+ * characters. Some strings may be longer -- run nano and see.
*/
+ N_("Get Help"), WITHORSANS(help_gist), TOGETHER, VIEW);
+
+- add_to_funcs(do_cancel, ((MMOST & ~MMAIN & ~MBROWSER) | MYESNO),
++ add_to_funcs(do_cancel, ((MMOST & ~MMAIN) | MYESNO),
+ N_("Cancel"), WITHORSANS(cancel_gist), BLANKAFTER, VIEW);
+
+ add_to_funcs(do_exit, MMAIN,
+--
+2.20.1
+
diff -Nru
nano-3.2/debian/patches/0008-browser-don-t-show-a-mistaken-message-when-exiting-f.patch
nano-3.2/debian/patches/0008-browser-don-t-show-a-mistaken-message-when-exiting-f.patch
---
nano-3.2/debian/patches/0008-browser-don-t-show-a-mistaken-message-when-exiting-f.patch
1970-01-01 01:00:00.000000000 +0100
+++
nano-3.2/debian/patches/0008-browser-don-t-show-a-mistaken-message-when-exiting-f.patch
2019-06-12 02:26:08.000000000 +0200
@@ -0,0 +1,29 @@
+From 1cdb9c5e50e52b5c5628ee5275e7eb463e7ee2df Mon Sep 17 00:00:00 2001
+From: Benno Schulenberg <bensb...@telfort.nl>
+Date: Sat, 18 May 2019 19:58:18 +0200
+Subject: [PATCH 8/8] browser: don't show a mistaken message when exiting from
+ help viewer
+
+This fixes https://savannah.gnu.org/bugs/?56346.
+
+Bug existed since version 3.0, commit 8d6b205e.
+---
+ src/files.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/files.c b/src/files.c
+index afdaeeb5..2f1edd58 100644
+--- a/src/files.c
++++ b/src/files.c
+@@ -636,7 +636,7 @@ void mention_name_and_linecount(void)
+ void switch_to_adjacent_buffer(bool to_next)
+ {
+ /* If only one file buffer is open, say so and get out. */
+- if (openfile == openfile->next) {
++ if (openfile == openfile->next && !inhelp) {
+ statusbar(_("No more open file buffers"));
+ return;
+ }
+--
+2.20.1
+
diff -Nru nano-3.2/debian/patches/menus-dont-show-S-and-Q-in-help-lines.patch
nano-3.2/debian/patches/menus-dont-show-S-and-Q-in-help-lines.patch
--- nano-3.2/debian/patches/menus-dont-show-S-and-Q-in-help-lines.patch
2019-02-20 12:11:21.000000000 +0100
+++ nano-3.2/debian/patches/menus-dont-show-S-and-Q-in-help-lines.patch
1970-01-01 01:00:00.000000000 +0100
@@ -1,90 +0,0 @@
-From: Benno Schulenberg <bensb...@telfort.nl>
-To: nano-de...@gnu.org
-Date: Mon, 18 Feb 2019 08:32:46 +0100
-Subject: [Nano-devel] [PATCH] menus: don't show ^S and ^Q in the help lines
- in the tiny version
-
-On small terminals (80 columns or so), ^S and ^Q would be in
-the last position of the help lines. But some terminals might
-intercept ^S and stop all output (until ^Q is pressed), which
-could be unexpected and frustrating. So, rearrange things for
-the tiny version so that ^S appears only on very wide terminals.
-
-Also, having two keystrokes for saving the current buffer
-(^O and ^S) in the two help lines is wasteful, more so as
-in the tiny version there are no ^G help texts.
-
-So, show the more useful M-Q and M-W instead.
-
-This addresses https://bugs.debian.org/915017.
----
- src/global.c | 23 +++++++++++++++++------
- 1 file changed, 17 insertions(+), 6 deletions(-)
-
-Index: nano/src/global.c
-===================================================================
---- nano.orig/src/global.c
-+++ nano/src/global.c
-@@ -835,10 +835,6 @@ void shortcut_init(void)
- #ifndef NANO_TINY
- add_to_funcs(do_find_bracket, MMAIN,
- N_("To Bracket"), WITHORSANS(bracket_gist), BLANKAFTER, VIEW);
--#else
-- /* Place this one here only in the tiny version; otherwise further
down. */
-- add_to_funcs(do_savefile, MMAIN,
-- N_("Save"), WITHORSANS(savefile_gist), BLANKAFTER, NOVIEW);
- #endif
-
- #ifdef ENABLE_BROWSER
-@@ -847,15 +843,28 @@ void shortcut_init(void)
- add_to_funcs(do_search_backward, MBROWSER,
- N_("Where Was"), WITHORSANS(browserwherewas_gist), TOGETHER,
VIEW);
- #endif
-+
-+#ifndef NANO_TINY
- add_to_funcs(do_search_backward, MMAIN|MHELP,
- /* TRANSLATORS: This starts a backward search. */
- N_("Where Was"), WITHORSANS(wherewas_gist), TOGETHER, VIEW);
-+#endif
- add_to_funcs(do_findprevious, MMAIN|MHELP|MBROWSER,
- /* TRANSLATORS: This refers to searching the preceding
occurrence. */
- N_("Previous"), WITHORSANS(findprev_gist), TOGETHER, VIEW);
-+#ifndef NANO_TINY
- add_to_funcs(do_findnext, MMAIN|MHELP|MBROWSER,
- N_("Next"), WITHORSANS(findnext_gist), BLANKAFTER, VIEW);
--
-+#else
-+ /* In the tiny version, arrange things a bit differently, so that
-+ * the useful M-W and M-Q are shown in the help lines. */
-+ add_to_funcs(do_findnext, MMAIN|MHELP|MBROWSER,
-+ N_("Next"), WITHORSANS(findnext_gist), TOGETHER, VIEW);
-+ add_to_funcs(do_search_backward, MMAIN|MHELP,
-+ N_("Where Was"), WITHORSANS(wherewas_gist), BLANKAFTER, VIEW);
-+ add_to_funcs(total_refresh, MMAIN,
-+ N_("Refresh"), WITHORSANS(refresh_gist), BLANKAFTER, VIEW);
-+#endif
- add_to_funcs(do_left, MMAIN,
- /* TRANSLATORS: This means move the cursor one character back.
*/
- N_("Back"), WITHORSANS(back_gist), TOGETHER, VIEW);
-@@ -962,8 +971,10 @@ void shortcut_init(void)
- add_to_funcs(do_verbatim_input, MMAIN,
- N_("Verbatim"), WITHORSANS(verbatim_gist), BLANKAFTER, NOVIEW);
-
-+#ifndef NANO_TINY
- add_to_funcs(total_refresh, MMAIN,
- N_("Refresh"), WITHORSANS(refresh_gist), TOGETHER, VIEW);
-+#endif
-
- add_to_funcs(do_suspend_void, MMAIN,
- N_("Suspend"), WITHORSANS(suspend_gist), BLANKAFTER, VIEW);
-@@ -996,9 +1007,9 @@ void shortcut_init(void)
- add_to_funcs(do_linter, MMAIN,
- N_("To Linter"), WITHORSANS(lint_gist),
BLANKAFTER, NOVIEW);
- #endif
-+#endif
- add_to_funcs(do_savefile, MMAIN,
- N_("Save"), WITHORSANS(savefile_gist), BLANKAFTER, NOVIEW);
--#endif
-
- #ifndef ENABLE_JUSTIFY
- add_to_funcs(flip_goto, MWHEREIS,
diff -Nru nano-3.2/debian/patches/series nano-3.2/debian/patches/series
--- nano-3.2/debian/patches/series 2019-02-20 11:37:35.000000000 +0100
+++ nano-3.2/debian/patches/series 2019-06-12 02:26:23.000000000 +0200
@@ -1 +1,8 @@
-menus-dont-show-S-and-Q-in-help-lines.patch
+0001-options-exit-on-a-bad-quoting-regex-instead-of-crash.patch
+0002-history-use-an-unfreed-position_history-to-avoid-a-p.patch
+0003-speller-block-the-resizing-signal-again-during-an-ex.patch
+0004-unindent-ensure-that-a-partial-line-gets-displayed-p.patch
+0005-help-don-t-check-for-confinement-when-opening-a-temp.patch
+0006-menus-don-t-show-S-and-Q-in-the-help-lines-in-the-ti.patch
+0007-browser-show-the-G-item-again-in-the-help-lines.patch
+0008-browser-don-t-show-a-mistaken-message-when-exiting-f.patch
