From f1e5872e6afec55eb3dcdee12f3e38f7bb28ee72 Mon Sep 17 00:00:00 2001 From: Benno Schulenberg Date: Sun, 19 Aug 2018 13:29:43 +0200 Subject: [PATCH] tweaks: reshuffle the order of the bindings, for help-line esthetics --- src/global.c | 25 ++++++++++++------------- 1 file changed, 12 insertions(+), 13 deletions(-) diff --git a/src/global.c b/src/global.c index 1186c0ad..c0cd02b9 100644 --- a/src/global.c +++ b/src/global.c @@ -1006,18 +1006,6 @@ void shortcut_init(void) add_to_funcs(backup_file_void, MWRITEFILE, N_("Backup File"), WITHORSANS(backup_gist), BLANKAFTER, NOVIEW); } - - /* Command execution is only available when not in restricted mode. */ - if (!ISSET(RESTRICTED)) { - add_to_funcs(flip_execute, MINSERTFILE, - N_("Execute Command"), WITHORSANS(execute_gist), TOGETHER, NOVIEW); - - add_to_funcs(flip_execute, MEXTCMD, - N_("Read File"), WITHORSANS(readfile_gist), TOGETHER, NOVIEW); - } - - add_to_funcs(flip_convert, MINSERTFILE, - N_("No Conversion"), WITHORSANS(convert_gist), TOGETHER, NOVIEW); #endif /* !NANO_TINY */ #ifdef ENABLE_MULTIBUFFER /* Multiple buffers are only available when not in restricted mode. */ @@ -1025,10 +1013,21 @@ void shortcut_init(void) add_to_funcs(flip_newbuffer, MINSERTFILE|MEXTCMD, N_("New Buffer"), WITHORSANS(newbuffer_gist), TOGETHER, NOVIEW); #endif + add_to_funcs(flip_convert, MINSERTFILE, + N_("No Conversion"), WITHORSANS(convert_gist), TOGETHER, NOVIEW); + #ifndef NANO_TINY - if (!ISSET(RESTRICTED)) + /* Command execution is only available when not in restricted mode. */ + if (!ISSET(RESTRICTED)) { + add_to_funcs(flip_execute, MINSERTFILE, + N_("Execute Command"), WITHORSANS(execute_gist), TOGETHER, NOVIEW); + add_to_funcs(flip_pipe, MEXTCMD, N_("Pipe Text"), WITHORSANS(pipe_gist), TOGETHER, NOVIEW); + + add_to_funcs(flip_execute, MEXTCMD, + N_("Read File"), WITHORSANS(readfile_gist), TOGETHER, NOVIEW); + } #endif #ifdef ENABLE_BROWSER /* The file browser is only available when not in restricted mode. */