Commit 4da2434d authored by Benno Schulenberg's avatar Benno Schulenberg
Browse files

Improving order and grouping in the main help text and help lines.

git-svn-id: svn://svn.savannah.gnu.org/nano/trunk/nano@4823 35c25a1d-7b9e-4130-9fde-d3aeb78583b8
parent 61758e95
Showing with 17 additions and 20 deletions
+17 -20
...@@ -6,6 +6,8 @@ ...@@ -6,6 +6,8 @@
something. For the no-op compat flags the man page is the place. something. For the no-op compat flags the man page is the place.
* src/global.c (shortcut_init): In the help lines of Search/Replace * src/global.c (shortcut_init): In the help lines of Search/Replace
show the important toggles early on, and group them better. show the important toggles early on, and group them better.
* src/global.c (shortcut_init): Improve order and grouping in the
main help text and help lines.
2014-04-27 Mark Majeres <mark@engine12.com> 2014-04-27 Mark Majeres <mark@engine12.com>
* src/rcfile.c (parse_include): Plug two tiny memory leaks. * src/rcfile.c (parse_include): Plug two tiny memory leaks.
......
...@@ -534,8 +534,8 @@ void shortcut_init(void) ...@@ -534,8 +534,8 @@ void shortcut_init(void)
N_("Replace a string or a regular expression"); N_("Replace a string or a regular expression");
const char *nano_gotoline_msg = N_("Go to line and column number"); const char *nano_gotoline_msg = N_("Go to line and column number");
#ifndef NANO_TINY #ifndef NANO_TINY
const char *nano_mark_msg = N_("Mark text at the cursor position"); const char *nano_mark_msg = N_("Mark text starting from the cursor position");
const char *nano_whereis_next_msg = N_("Repeat last search"); const char *nano_whereis_next_msg = N_("Repeat the last search");
const char *nano_copy_msg = const char *nano_copy_msg =
N_("Copy the current line and store it in the cutbuffer"); N_("Copy the current line and store it in the cutbuffer");
const char *nano_indent_msg = N_("Indent the current line"); const char *nano_indent_msg = N_("Indent the current line");
...@@ -795,38 +795,36 @@ void shortcut_init(void) ...@@ -795,38 +795,36 @@ void shortcut_init(void)
N_("First Line"), IFSCHELP(nano_firstline_msg), FALSE, VIEW); N_("First Line"), IFSCHELP(nano_firstline_msg), FALSE, VIEW);
add_to_funcs(do_last_line, add_to_funcs(do_last_line,
(MMAIN|MHELP|MWHEREIS|MREPLACE|MREPLACEWITH|MGOTOLINE), (MMAIN|MHELP|MWHEREIS|MREPLACE|MREPLACEWITH|MGOTOLINE),
N_("Last Line"), IFSCHELP(nano_lastline_msg), TRUE, VIEW); N_("Last Line"), IFSCHELP(nano_lastline_msg), FALSE, VIEW);
add_to_funcs(do_gotolinecolumn_void, MMAIN, add_to_funcs(do_gotolinecolumn_void, MMAIN,
gotoline_tag, IFSCHELP(nano_gotoline_msg), FALSE, VIEW); gotoline_tag, IFSCHELP(nano_gotoline_msg), TRUE, VIEW);
#ifdef NANO_TINY #ifdef NANO_TINY
add_to_funcs(do_cursorpos_void, MMAIN, N_("Cur Pos"), IFSCHELP(nano_cursorpos_msg), add_to_funcs(do_cursorpos_void, MMAIN, N_("Cur Pos"), IFSCHELP(nano_cursorpos_msg),
FALSE, VIEW); FALSE, VIEW);
#endif #endif
add_to_funcs(do_replace, MMAIN, replace_tag, IFSCHELP(nano_replace_msg), add_to_funcs(do_replace, MMAIN, replace_tag,
#ifndef NANO_TINY IFSCHELP(nano_replace_msg), FALSE, NOVIEW);
FALSE,
#else
TRUE,
#endif
NOVIEW);
#ifndef NANO_TINY #ifndef NANO_TINY
add_to_funcs(do_research, MMAIN, whereis_next_tag,
IFSCHELP(nano_whereis_next_msg), FALSE, VIEW);
add_to_funcs(do_find_bracket, MMAIN, N_("To Bracket"),
IFSCHELP(nano_bracket_msg), FALSE, VIEW);
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, whereis_next_tag,
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"),
IFSCHELP(nano_copy_msg), FALSE, NOVIEW); IFSCHELP(nano_copy_msg), TRUE, NOVIEW);
add_to_funcs(do_indent_void, MMAIN, N_("Indent Text"), add_to_funcs(do_indent_void, MMAIN, N_("Indent Text"),
IFSCHELP(nano_indent_msg), FALSE, NOVIEW); IFSCHELP(nano_indent_msg), FALSE, NOVIEW);
add_to_funcs(do_unindent, MMAIN, N_("Unindent Text"), add_to_funcs(do_unindent, MMAIN, N_("Unindent Text"),
IFSCHELP(nano_unindent_msg), FALSE, NOVIEW); IFSCHELP(nano_unindent_msg), TRUE, NOVIEW);
if (ISSET(UNDOABLE)) { if (ISSET(UNDOABLE)) {
add_to_funcs(do_undo, MMAIN, N_("Undo"), add_to_funcs(do_undo, MMAIN, N_("Undo"),
...@@ -878,13 +876,10 @@ void shortcut_init(void) ...@@ -878,13 +876,10 @@ void shortcut_init(void)
#endif #endif
#ifndef NANO_TINY #ifndef NANO_TINY
add_to_funcs(do_find_bracket, MMAIN, N_("To Bracket"),
IFSCHELP(nano_bracket_msg), FALSE, VIEW);
add_to_funcs(do_scroll_up, MMAIN, N_("Scroll Up"), add_to_funcs(do_scroll_up, MMAIN, N_("Scroll Up"),
IFSCHELP(nano_scrollup_msg), FALSE, VIEW); IFSCHELP(nano_scrollup_msg), FALSE, VIEW);
add_to_funcs(do_scroll_down, MMAIN, N_("Scroll Down"), add_to_funcs(do_scroll_down, MMAIN, N_("Scroll Down"),
IFSCHELP(nano_scrolldown_msg), FALSE, VIEW); IFSCHELP(nano_scrolldown_msg), TRUE, VIEW);
#endif #endif
#ifndef DISABLE_MULTIBUFFER #ifndef DISABLE_MULTIBUFFER
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment