Grouping related commands into the same column of the help lines.

git-svn-id: svn://svn.savannah.gnu.org/nano/trunk/nano@4613 35c25a1d-7b9e-4130-9fde-d3aeb78583b8
master
Benno Schulenberg 2014-02-26 20:37:40 +00:00
parent b3306b22f5
commit cae7aea88d
2 changed files with 16 additions and 7 deletions

View File

@ -1,3 +1,9 @@
2014-02-26 Benno Schulenberg <bensberg@justemail.net>
* src/global.c (shortcut_init) - Put PageUp and PageDown
and also WhereIs and WhereIsNext together in the help lines
of the file browser, and WriteOut and Readfile in the help
lines of the main window -- related stuff in one column.
2014-02-26 Konstantin Abakumov <abakumov@Savannah> (tiny change) 2014-02-26 Konstantin Abakumov <abakumov@Savannah> (tiny change)
* doc/syntax/python.nanorc - Slightly improve the regexes for * doc/syntax/python.nanorc - Slightly improve the regexes for
multiline strings in Python, reducing spillage. multiline strings in Python, reducing spillage.

View File

@ -771,12 +771,6 @@ void shortcut_init(bool unjustify)
add_to_funcs(do_writeout_void, MMAIN, N_("WriteOut"), add_to_funcs(do_writeout_void, MMAIN, N_("WriteOut"),
IFSCHELP(nano_writeout_msg), FALSE, NOVIEW); IFSCHELP(nano_writeout_msg), FALSE, NOVIEW);
#ifndef DISABLE_JUSTIFY
/* TRANSLATORS: Try to keep this at most 10 characters. */
add_to_funcs(do_justify_void, MMAIN, N_("Justify"),
nano_justify_msg, TRUE, NOVIEW);
#endif
/* We allow inserting files in view mode if multibuffers are /* We allow inserting files in view mode if multibuffers are
* available, so that we can view multiple files. If we're using * available, so that we can view multiple files. If we're using
* restricted mode, inserting files is disabled, since it allows * restricted mode, inserting files is disabled, since it allows
@ -795,6 +789,15 @@ void shortcut_init(bool unjustify)
add_to_funcs(do_search, MMAIN|MBROWSER, whereis_msg, add_to_funcs(do_search, MMAIN|MBROWSER, whereis_msg,
IFSCHELP(nano_whereis_msg), FALSE, VIEW); IFSCHELP(nano_whereis_msg), FALSE, VIEW);
add_to_funcs(do_research, MBROWSER, whereis_next_msg,
IFSCHELP(nano_whereis_next_msg), TRUE, VIEW);
#ifndef DISABLE_JUSTIFY
/* TRANSLATORS: Try to keep this at most 10 characters. */
add_to_funcs(do_justify_void, MMAIN, N_("Justify"),
nano_justify_msg, TRUE, NOVIEW);
#endif
add_to_funcs(do_page_up, MMAIN|MHELP|MBROWSER, add_to_funcs(do_page_up, MMAIN|MHELP|MBROWSER,
prev_page_msg, IFSCHELP(nano_prevpage_msg), FALSE, VIEW); prev_page_msg, IFSCHELP(nano_prevpage_msg), FALSE, VIEW);
add_to_funcs(do_page_down, MMAIN|MHELP|MBROWSER, add_to_funcs(do_page_down, MMAIN|MHELP|MBROWSER,
@ -869,7 +872,7 @@ void shortcut_init(bool unjustify)
add_to_funcs(do_mark, MMAIN, N_("Mark Text"), add_to_funcs(do_mark, MMAIN, N_("Mark Text"),
IFSCHELP(nano_mark_msg), FALSE, VIEW); IFSCHELP(nano_mark_msg), FALSE, VIEW);
add_to_funcs(do_research, (MMAIN|MBROWSER), whereis_next_msg, add_to_funcs(do_research, MMAIN, whereis_next_msg,
IFSCHELP(nano_whereis_next_msg), TRUE, VIEW); IFSCHELP(nano_whereis_next_msg), TRUE, VIEW);
add_to_funcs(do_copy_text, MMAIN, N_("Copy Text"), add_to_funcs(do_copy_text, MMAIN, N_("Copy Text"),