From c40cf0ad9089d9b8b61659b86fbbef06ec979f43 Mon Sep 17 00:00:00 2001 From: Benno Schulenberg Date: Tue, 22 Apr 2014 12:10:30 +0000 Subject: [PATCH] Deleting unneeded empty funcs; being in the list of shortcuts is enough. git-svn-id: svn://svn.savannah.gnu.org/nano/trunk/nano@4804 35c25a1d-7b9e-4130-9fde-d3aeb78583b8 --- ChangeLog | 2 ++ src/global.c | 26 ++++++-------------------- 2 files changed, 8 insertions(+), 20 deletions(-) diff --git a/ChangeLog b/ChangeLog index 0da3c5ee..7d6edfab 100644 --- a/ChangeLog +++ b/ChangeLog @@ -6,6 +6,8 @@ * src/global.c (shortcut_init): Elide several pointless constants. * src/global.c (shortcut_init): Elide more unneeded constants, and update some translator comments and shorten a few tags. + * src/global.c (shortcut_init): Delete unneeded empty funcs; being + in the list of shortcuts is enough. 2014-04-21 Benno Schulenberg * doc/syntax/nanorc.nanorc: There is no F0 key. diff --git a/src/global.c b/src/global.c index 0007d812..0ef34532 100644 --- a/src/global.c +++ b/src/global.c @@ -848,9 +848,6 @@ void shortcut_init(void) FALSE, VIEW); #endif - add_to_funcs(do_left, MMOST, "", "", FALSE, VIEW); - add_to_funcs(do_right, MMOST, "", "", FALSE, VIEW); - #ifndef NANO_TINY add_to_funcs(do_prev_word_void, MMAIN, N_("Prev Word"), IFSCHELP(nano_prevword_msg), FALSE, VIEW); @@ -866,7 +863,12 @@ void shortcut_init(void) add_to_funcs(do_home, MMAIN, N_("Home"), IFSCHELP(nano_home_msg), FALSE, VIEW); add_to_funcs(do_end, MMAIN, N_("End"), IFSCHELP(nano_end_msg), - FALSE, VIEW); +#ifndef NANO_TINY + FALSE, +#else + TRUE, +#endif + VIEW); #ifndef DISABLE_JUSTIFY add_to_funcs(do_para_begin_void, (MMAIN|MWHEREIS), N_("Beg of Par"), @@ -894,18 +896,13 @@ void shortcut_init(void) add_to_funcs(do_verbatim_input, MMAIN, N_("Verbatim"), IFSCHELP(nano_verbatim_msg), FALSE, NOVIEW); - add_to_funcs(do_verbatim_input, MWHEREIS|MREPLACE|MREPLACEWITH|MEXTCMD|MSPELL, - "", "", FALSE, NOVIEW); add_to_funcs(do_tab, MMAIN, N_("Tab"), IFSCHELP(nano_tab_msg), FALSE, NOVIEW); - add_to_funcs(do_tab, MMOST, "", "", FALSE, NOVIEW); add_to_funcs(do_enter_void, MMAIN, N_("Enter"), IFSCHELP(nano_enter_msg), FALSE, NOVIEW); - add_to_funcs(do_enter_void, MMOST, "", "", FALSE, NOVIEW); add_to_funcs(do_delete, MMAIN, N_("Delete"), IFSCHELP(nano_delete_msg), FALSE, NOVIEW); - add_to_funcs(do_delete, MMOST, "", "", FALSE, NOVIEW); add_to_funcs(do_backspace, MMAIN, N_("Backspace"), IFSCHELP(nano_backspace_msg), #ifndef NANO_TINY FALSE, @@ -914,22 +911,11 @@ void shortcut_init(void) #endif NOVIEW); - add_to_funcs(do_backspace, MMOST, "", "", -#ifndef NANO_TINY - FALSE, -#else - TRUE, -#endif - NOVIEW); - #ifndef NANO_TINY add_to_funcs(do_cut_till_end, MMAIN, N_("CutTillEnd"), IFSCHELP(nano_cut_till_end_msg), TRUE, NOVIEW); #endif - add_to_funcs(xon_complaint, MMAIN, "", "", FALSE, VIEW); - add_to_funcs(xoff_complaint, MMAIN, "", "", FALSE, VIEW); - #ifndef DISABLE_JUSTIFY add_to_funcs(do_full_justify, (MMAIN|MWHEREIS), N_("FullJstify"), IFSCHELP(nano_fulljustify_msg), FALSE, NOVIEW); -- 2.39.5