Making tiny nano again just a tiny bit tinier.

git-svn-id: svn://svn.savannah.gnu.org/nano/trunk/nano@4927 35c25a1d-7b9e-4130-9fde-d3aeb78583b8
master
Benno Schulenberg 2014-05-28 20:31:06 +00:00
parent ac193ec774
commit 8c5f504c75
2 changed files with 8 additions and 3 deletions

View File

@ -14,6 +14,7 @@
* src/browser (filesearch_init): Remove an unneeded format specifier. * src/browser (filesearch_init): Remove an unneeded format specifier.
* src/nano.c (usage): Add a translator comment for the --help output. * src/nano.c (usage): Add a translator comment for the --help output.
* src/global.c (shortcut_init): Elide four unneeded tags. * src/global.c (shortcut_init): Elide four unneeded tags.
* src/global.c (shortcut_init): Make tiny nano just a bit tinier.
2014-05-27 Chris Allegretta <chrisa@asty.org> 2014-05-27 Chris Allegretta <chrisa@asty.org>
* src/winio.c (edit_refresh): wredrawln() is not supported under * src/winio.c (edit_refresh): wredrawln() is not supported under

View File

@ -494,12 +494,12 @@ void shortcut_init(void)
#endif #endif
const char *refresh_tag = N_("Refresh"); const char *refresh_tag = N_("Refresh");
#ifndef DISABLE_HELP
#ifndef DISABLE_JUSTIFY #ifndef DISABLE_JUSTIFY
/* TRANSLATORS: The next long series of strings are shortcut descriptions; /* TRANSLATORS: The next long series of strings are shortcut descriptions;
* they are best kept shorter than 56 characters, but may be longer. */ * they are best kept shorter than 56 characters, but may be longer. */
const char *nano_justify_msg = N_("Justify the current paragraph"); const char *nano_justify_msg = N_("Justify the current paragraph");
#endif #endif
#ifndef DISABLE_HELP
const char *nano_cancel_msg = N_("Cancel the current function"); const char *nano_cancel_msg = N_("Cancel the current function");
const char *nano_help_msg = N_("Display this help text"); const char *nano_help_msg = N_("Display this help text");
const char *nano_exit_msg = const char *nano_exit_msg =
@ -1120,9 +1120,11 @@ void shortcut_init(void)
add_to_sclist(((MMOST & ~MMAIN & ~MBROWSER) | MYESNO), "^C", do_cancel, 0, FALSE); add_to_sclist(((MMOST & ~MMAIN & ~MBROWSER) | MYESNO), "^C", do_cancel, 0, FALSE);
add_to_sclist(MWHEREIS|MREPLACE, "M-C", case_sens_void, 0, FALSE); #ifndef NANO_TINY
add_to_sclist(MWHEREIS|MREPLACE, "M-R", regexp_void, 0, FALSE);
add_to_sclist(MWHEREIS|MREPLACE, "M-B", backwards_void, 0, FALSE); add_to_sclist(MWHEREIS|MREPLACE, "M-B", backwards_void, 0, FALSE);
add_to_sclist(MWHEREIS|MREPLACE, "M-C", case_sens_void, 0, FALSE);
#endif
add_to_sclist(MWHEREIS|MREPLACE, "M-R", regexp_void, 0, FALSE);
add_to_sclist(MWHEREIS, "^R", do_replace, 0, FALSE); add_to_sclist(MWHEREIS, "^R", do_replace, 0, FALSE);
add_to_sclist(MREPLACE, "^R", no_replace_void, 0, FALSE); add_to_sclist(MREPLACE, "^R", no_replace_void, 0, FALSE);
add_to_sclist(MWHEREIS|MREPLACE|MREPLACEWITH|MGOTOLINE, "^Y", do_first_line, 0, TRUE); add_to_sclist(MWHEREIS|MREPLACE|MREPLACEWITH|MGOTOLINE, "^Y", do_first_line, 0, TRUE);
@ -1159,7 +1161,9 @@ void shortcut_init(void)
add_to_sclist(MINSERTFILE|MEXTCMD, "^X", ext_cmd_void, 0, FALSE); add_to_sclist(MINSERTFILE|MEXTCMD, "^X", ext_cmd_void, 0, FALSE);
add_to_sclist(MINSERTFILE|MEXTCMD, "M-F", new_buffer_void, 0, FALSE); add_to_sclist(MINSERTFILE|MEXTCMD, "M-F", new_buffer_void, 0, FALSE);
add_to_sclist(MHELP|MBROWSER, "^C", do_exit, 0, TRUE); add_to_sclist(MHELP|MBROWSER, "^C", do_exit, 0, TRUE);
#ifndef DISABLE_HELP
add_to_sclist(MHELP, "^G", do_exit, 0, TRUE); add_to_sclist(MHELP, "^G", do_exit, 0, TRUE);
#endif
add_to_sclist(MMOST, "^I", do_tab, 0, TRUE); add_to_sclist(MMOST, "^I", do_tab, 0, TRUE);
add_to_sclist(MMOST, "^M", do_enter_void, 0, TRUE); add_to_sclist(MMOST, "^M", do_enter_void, 0, TRUE);
add_to_sclist(MMOST, "Enter", do_enter_void, 0, TRUE); add_to_sclist(MMOST, "Enter", do_enter_void, 0, TRUE);