rexy712/nano-with-linefolding
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

rcfile: remove five obsolete or deprecated keywords

Browse Source
This commit is contained in:
Benno Schulenberg 2022-06-12 17:00:50 +02:00
parent 1de47610f4
commit 98f9518bf2
2 changed files with 4 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/nano.c
View File

@ -1736,13 +1736,11 @@ int main(int argc, char **argv)
{"speller", 1, NULL, 's'}, {"speller", 1, NULL, 's'},
#endif #endif
{"saveonexit", 0, NULL, 't'}, {"saveonexit", 0, NULL, 't'},
{"tempfile", 0, NULL, 't'}, /* Deprecated; remove in 2022. */
{"view", 0, NULL, 'v'}, {"view", 0, NULL, 'v'},
#ifdef ENABLE_WRAPPING #ifdef ENABLE_WRAPPING
{"nowrap", 0, NULL, 'w'}, {"nowrap", 0, NULL, 'w'},
#endif #endif
{"nohelp", 0, NULL, 'x'}, {"nohelp", 0, NULL, 'x'},
{"suspendable", 0, NULL, 'z'}, /* Obsolete; remove in 2022. */
#ifndef NANO_TINY #ifndef NANO_TINY
{"smarthome", 0, NULL, 'A'}, {"smarthome", 0, NULL, 'A'},
{"backup", 0, NULL, 'B'}, {"backup", 0, NULL, 'B'},

12
src/rcfile.c
View File

@ -90,9 +90,6 @@ static const rcoption rcopts[] = {
#ifdef ENABLE_SPELLER #ifdef ENABLE_SPELLER
{"speller", 0}, {"speller", 0},
#endif #endif
{"suspend", SUSPENDABLE}, /* Deprecated; remove in 2022. */
{"suspendable", SUSPENDABLE}, /* Obsolete; remove in 2022. */
{"tempfile", SAVE_ON_EXIT}, /* Deprecated; remove in 2022. */
#ifndef NANO_TINY #ifndef NANO_TINY
{"afterends", AFTER_ENDS}, {"afterends", AFTER_ENDS},
{"allow_insecure_backup", INSECURE_BACKUP}, {"allow_insecure_backup", INSECURE_BACKUP},
@ -157,15 +154,15 @@ static colortype *lastcolor = NULL;
/* The end of the color list for the current syntax. */ /* The end of the color list for the current syntax. */
#endif #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", char *menunames[NUMBER_OF_MENUS] = { "main", "search", "replace", "replacewith",
"yesno", "gotoline", "writeout", "insert", "yesno", "gotoline", "writeout", "insert",
"execute", "extcmd", "help", "spell", "linter", "execute", "help", "spell", "linter",
"browser", "whereisfile", "gotodir", "browser", "whereisfile", "gotodir",
"all" }; "all" };
int menusymbols[NUMBER_OF_MENUS] = { MMAIN, MWHEREIS, MREPLACE, MREPLACEWITH, int menusymbols[NUMBER_OF_MENUS] = { MMAIN, MWHEREIS, MREPLACE, MREPLACEWITH,
MYESNO, MGOTOLINE, MWRITEFILE, MINSERTFILE, MYESNO, MGOTOLINE, MWRITEFILE, MINSERTFILE,
MEXECUTE, MEXECUTE, MHELP, MSPELL, MLINTER, MEXECUTE, MHELP, MSPELL, MLINTER,
MBROWSER, MWHEREISFILE, MGOTODIR, MBROWSER, MWHEREISFILE, MGOTODIR,
MMOST|MBROWSER|MHELP|MYESNO }; MMOST|MBROWSER|MHELP|MYESNO };
#endif /* ENABLE_NANORC */ #endif /* ENABLE_NANORC */
@ -285,8 +282,7 @@ keystruct *strtosc(const char *input)
else if (!strcmp(input, "formatter")) else if (!strcmp(input, "formatter"))
s->func = do_formatter; s->func = do_formatter;
#endif #endif
else if (!strcmp(input, "location") || else if (!strcmp(input, "location"))
!strcmp(input, "curpos")) /* Deprecated; remove in 2022. */
s->func = report_cursor_position; s->func = report_cursor_position;
else if (!strcmp(input, "gotoline")) else if (!strcmp(input, "gotoline"))
s->func = do_gotolinecolumn; s->func = do_gotolinecolumn;