diff --git a/src/nano.c b/src/nano.c index 81334784..f179d8ba 100644 --- a/src/nano.c +++ b/src/nano.c @@ -1736,13 +1736,11 @@ int main(int argc, char **argv) {"speller", 1, NULL, 's'}, #endif {"saveonexit", 0, NULL, 't'}, - {"tempfile", 0, NULL, 't'}, /* Deprecated; remove in 2022. */ {"view", 0, NULL, 'v'}, #ifdef ENABLE_WRAPPING {"nowrap", 0, NULL, 'w'}, #endif {"nohelp", 0, NULL, 'x'}, - {"suspendable", 0, NULL, 'z'}, /* Obsolete; remove in 2022. */ #ifndef NANO_TINY {"smarthome", 0, NULL, 'A'}, {"backup", 0, NULL, 'B'}, diff --git a/src/rcfile.c b/src/rcfile.c index 049a2886..88a71c78 100644 --- a/src/rcfile.c +++ b/src/rcfile.c @@ -90,9 +90,6 @@ static const rcoption rcopts[] = { #ifdef ENABLE_SPELLER {"speller", 0}, #endif - {"suspend", SUSPENDABLE}, /* Deprecated; remove in 2022. */ - {"suspendable", SUSPENDABLE}, /* Obsolete; remove in 2022. */ - {"tempfile", SAVE_ON_EXIT}, /* Deprecated; remove in 2022. */ #ifndef NANO_TINY {"afterends", AFTER_ENDS}, {"allow_insecure_backup", INSECURE_BACKUP}, @@ -157,15 +154,15 @@ static colortype *lastcolor = NULL; /* The end of the color list for the current syntax. */ #endif -#define NUMBER_OF_MENUS 17 /* Remove the deprecated 'extcmd' in 2022. */ +#define NUMBER_OF_MENUS 16 char *menunames[NUMBER_OF_MENUS] = { "main", "search", "replace", "replacewith", "yesno", "gotoline", "writeout", "insert", - "execute", "extcmd", "help", "spell", "linter", + "execute", "help", "spell", "linter", "browser", "whereisfile", "gotodir", "all" }; int menusymbols[NUMBER_OF_MENUS] = { MMAIN, MWHEREIS, MREPLACE, MREPLACEWITH, MYESNO, MGOTOLINE, MWRITEFILE, MINSERTFILE, - MEXECUTE, MEXECUTE, MHELP, MSPELL, MLINTER, + MEXECUTE, MHELP, MSPELL, MLINTER, MBROWSER, MWHEREISFILE, MGOTODIR, MMOST|MBROWSER|MHELP|MYESNO }; #endif /* ENABLE_NANORC */ @@ -285,8 +282,7 @@ keystruct *strtosc(const char *input) else if (!strcmp(input, "formatter")) s->func = do_formatter; #endif - else if (!strcmp(input, "location") || - !strcmp(input, "curpos")) /* Deprecated; remove in 2022. */ + else if (!strcmp(input, "location")) s->func = report_cursor_position; else if (!strcmp(input, "gotoline")) s->func = do_gotolinecolumn;