ariadne
/
smol
2
1
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

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 <steve@einval.com>
master
Benno Schulenberg 2019-02-17 21:02:29 +01:00
parent 0f9d60a386
commit 7fcf6e6068
1 changed files with 17 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
src/global.c
View File

@ -827,10 +827,6 @@ void shortcut_init(void)
#ifndef NANO_TINY #ifndef NANO_TINY
add_to_funcs(do_find_bracket, MMAIN, add_to_funcs(do_find_bracket, MMAIN,
N_("To Bracket"), WITHORSANS(bracket_gist), BLANKAFTER, VIEW); 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 #endif
#ifdef ENABLE_BROWSER #ifdef ENABLE_BROWSER
@ -839,14 +835,28 @@ void shortcut_init(void)
add_to_funcs(do_search_backward, MBROWSER, add_to_funcs(do_search_backward, MBROWSER,
N_("Where Was"), WITHORSANS(browserwherewas_gist), TOGETHER, VIEW); N_("Where Was"), WITHORSANS(browserwherewas_gist), TOGETHER, VIEW);
#endif #endif
#ifndef NANO_TINY
add_to_funcs(do_search_backward, MMAIN|MHELP, add_to_funcs(do_search_backward, MMAIN|MHELP,
/* TRANSLATORS: This starts a backward search. */ /* TRANSLATORS: This starts a backward search. */
N_("Where Was"), WITHORSANS(wherewas_gist), TOGETHER, VIEW); N_("Where Was"), WITHORSANS(wherewas_gist), TOGETHER, VIEW);
#endif
add_to_funcs(do_findprevious, MMAIN|MHELP|MBROWSER, add_to_funcs(do_findprevious, MMAIN|MHELP|MBROWSER,
/* TRANSLATORS: This refers to searching the preceding occurrence. */ /* TRANSLATORS: This refers to searching the preceding occurrence. */
N_("Previous"), WITHORSANS(findprev_gist), TOGETHER, VIEW); N_("Previous"), WITHORSANS(findprev_gist), TOGETHER, VIEW);
#ifndef NANO_TINY
add_to_funcs(do_findnext, MMAIN|MHELP|MBROWSER, add_to_funcs(do_findnext, MMAIN|MHELP|MBROWSER,
N_("Next"), WITHORSANS(findnext_gist), BLANKAFTER, VIEW); 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, add_to_funcs(do_left, MMAIN,
/* TRANSLATORS: This means move the cursor one character back. */ /* TRANSLATORS: This means move the cursor one character back. */
@ -954,8 +964,10 @@ void shortcut_init(void)
add_to_funcs(do_verbatim_input, MMAIN, add_to_funcs(do_verbatim_input, MMAIN,
N_("Verbatim"), WITHORSANS(verbatim_gist), BLANKAFTER, NOVIEW); N_("Verbatim"), WITHORSANS(verbatim_gist), BLANKAFTER, NOVIEW);
#ifndef NANO_TINY
add_to_funcs(total_refresh, MMAIN, add_to_funcs(total_refresh, MMAIN,
N_("Refresh"), WITHORSANS(refresh_gist), TOGETHER, VIEW); N_("Refresh"), WITHORSANS(refresh_gist), TOGETHER, VIEW);
#endif
add_to_funcs(do_suspend_void, MMAIN, add_to_funcs(do_suspend_void, MMAIN,
N_("Suspend"), WITHORSANS(suspend_gist), BLANKAFTER, VIEW); N_("Suspend"), WITHORSANS(suspend_gist), BLANKAFTER, VIEW);
@ -987,10 +999,10 @@ void shortcut_init(void)
if (!ISSET(RESTRICTED)) if (!ISSET(RESTRICTED))
add_to_funcs(do_linter, MMAIN, add_to_funcs(do_linter, MMAIN,
N_("To Linter"), WITHORSANS(lint_gist), BLANKAFTER, NOVIEW); N_("To Linter"), WITHORSANS(lint_gist), BLANKAFTER, NOVIEW);
#endif
#endif #endif
add_to_funcs(do_savefile, MMAIN, add_to_funcs(do_savefile, MMAIN,
N_("Save"), WITHORSANS(savefile_gist), BLANKAFTER, NOVIEW); N_("Save"), WITHORSANS(savefile_gist), BLANKAFTER, NOVIEW);
#endif
add_to_funcs(flip_goto, MGOTOLINE, add_to_funcs(flip_goto, MGOTOLINE,
N_("Go To Text"), WITHORSANS(whereis_gist), BLANKAFTER, VIEW); N_("Go To Text"), WITHORSANS(whereis_gist), BLANKAFTER, VIEW);