From: Benno Schulenberg Date: Wed, 23 Apr 2014 20:37:32 +0000 (+0000) Subject: Putting the two wrapping toggles together X-Git-Tag: v2.3.3~118 X-Git-Url: https://git.wh0rd.org/?a=commitdiff_plain;h=9df767288c8adc3daf9e40d33423b8122c525e59;p=nano.git Putting the two wrapping toggles together and increasing their contrast a bit. git-svn-id: svn://svn.savannah.gnu.org/nano/trunk/nano@4812 35c25a1d-7b9e-4130-9fde-d3aeb78583b8 --- diff --git a/ChangeLog b/ChangeLog index 79213cd1..4ae235ec 100644 --- a/ChangeLog +++ b/ChangeLog @@ -11,6 +11,8 @@ one in the list -- just like the function name implies. This will make a user-defined shortcut appear in the two bottomlines without having to unbind the existing one first -- better feedback. + * src/global.c(shortcut_init, flagtostr, strtosc): Put the two + wrapping toggles together and increase the contrast a bit. 2014-04-22 Benno Schulenberg * src/global.c (shortcut_init): Put the movement keys in the diff --git a/src/global.c b/src/global.c index 7493895d..ee5cce2e 100644 --- a/src/global.c +++ b/src/global.c @@ -1129,11 +1129,11 @@ void shortcut_init(void) add_to_sclist(MMAIN, "M-S", do_toggle_void, SMOOTH_SCROLL, TRUE); add_to_sclist(MMAIN, "M-P", do_toggle_void, WHITESPACE_DISPLAY, TRUE); add_to_sclist(MMAIN, "M-Y", do_toggle_void, NO_COLOR_SYNTAX, TRUE); - add_to_sclist(MMAIN, "M-$", do_toggle_void, SOFTWRAP, TRUE); add_to_sclist(MMAIN, "M-H", do_toggle_void, SMART_HOME, TRUE); add_to_sclist(MMAIN, "M-I", do_toggle_void, AUTOINDENT, TRUE); add_to_sclist(MMAIN, "M-K", do_toggle_void, CUT_TO_END, TRUE); add_to_sclist(MMAIN, "M-L", do_toggle_void, NO_WRAP, TRUE); + add_to_sclist(MMAIN, "M-$", do_toggle_void, SOFTWRAP, TRUE); add_to_sclist(MMAIN, "M-Q", do_toggle_void, TABS_TO_SPACES, TRUE); add_to_sclist(MMAIN, "M-B", do_toggle_void, BACKUP_FILE, TRUE); add_to_sclist(MMAIN, "M-F", do_toggle_void, MULTIBUFFER, TRUE); @@ -1215,8 +1215,6 @@ const char *flagtostr(int flag) return N_("Whitespace display"); case NO_COLOR_SYNTAX: return N_("Color syntax highlighting"); - case SOFTWRAP: - return N_("Soft line wrapping"); case SMART_HOME: return N_("Smart home key"); case AUTOINDENT: @@ -1224,7 +1222,9 @@ const char *flagtostr(int flag) case CUT_TO_END: return N_("Cut to end"); case NO_WRAP: - return N_("Long line wrapping"); + return N_("Hard wrapping of overlong lines"); + case SOFTWRAP: + return N_("Soft wrapping of overlong lines"); case TABS_TO_SPACES: return N_("Conversion of typed tabs to spaces"); case BACKUP_FILE: @@ -1363,10 +1363,6 @@ sc *strtosc(char *input) s->scfunc = do_toggle_void; s->execute = FALSE; s->toggle = NO_COLOR_SYNTAX; - } else if (!strcasecmp(input, "softwrap")) { - s->scfunc = do_toggle_void; - s->execute = FALSE; - s->toggle = SOFTWRAP; } else if (!strcasecmp(input, "smarthome")) { s->scfunc = do_toggle_void; s->execute = FALSE; @@ -1383,6 +1379,10 @@ sc *strtosc(char *input) s->scfunc = do_toggle_void; s->execute = FALSE; s->toggle = NO_WRAP; + } else if (!strcasecmp(input, "softwrap")) { + s->scfunc = do_toggle_void; + s->execute = FALSE; + s->toggle = SOFTWRAP; } else if (!strcasecmp(input, "tabstospaces")) { s->scfunc = do_toggle_void; s->execute = FALSE;