diff --git a/src/global.c b/src/global.c index 807a1e83..09cbf54f 100644 --- a/src/global.c +++ b/src/global.c @@ -1525,10 +1525,10 @@ sc *strtosc(const char *input) else if (!strcasecmp(input, "unindent")) s->func = do_unindent; else if (!strcasecmp(input, "chopwordleft") || - !strcasecmp(input, "cutwordleft")) /* Deprecated; remove in 2020. */ + !strcasecmp(input, "cutwordleft")) /* Deprecated; remove in 2021. */ s->func = chop_previous_word; else if (!strcasecmp(input, "chopwordright") || - !strcasecmp(input, "cutwordright")) /* Deprecated; remove in 2020. */ + !strcasecmp(input, "cutwordright")) /* Deprecated; remove in 2021. */ s->func = chop_next_word; else if (!strcasecmp(input, "findbracket")) s->func = do_find_bracket; diff --git a/src/rcfile.c b/src/rcfile.c index 027fb41e..1f1d29b7 100644 --- a/src/rcfile.c +++ b/src/rcfile.c @@ -58,7 +58,7 @@ static const rcoption rcopts[] = { #ifdef ENABLE_LINENUMBERS {"linenumbers", LINE_NUMBERS}, #endif - {"morespace", MORE_SPACE}, + {"morespace", MORE_SPACE}, /* Deprecated; remove in 2021. */ #ifdef ENABLE_MOUSE {"mouse", USE_MOUSE}, #endif @@ -66,10 +66,10 @@ static const rcoption rcopts[] = { {"multibuffer", MULTIBUFFER}, #endif {"nohelp", NO_HELP}, - {"nonewlines", NO_NEWLINES}, + {"nonewlines", NO_NEWLINES}, /* Deprecated; remove in 2021. */ {"nopauses", NO_PAUSES}, #ifdef ENABLE_WRAPPING - {"nowrap", NO_WRAP}, + {"nowrap", NO_WRAP}, /* Deprecated; remove in 2021. */ #endif #ifdef ENABLE_OPERATINGDIR {"operatingdir", 0}, @@ -108,7 +108,7 @@ static const rcoption rcopts[] = { {"noconvert", NO_CONVERT}, {"showcursor", SHOW_CURSOR}, {"smarthome", SMART_HOME}, - {"smooth", SMOOTH_SCROLL}, + {"smooth", SMOOTH_SCROLL}, /* Deprecated; remove in 2021. */ {"softwrap", SOFTWRAP}, {"tabstospaces", TABS_TO_SPACES}, {"trimblanks", TRIM_BLANKS},