ariadne
/
smol
2
1
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

tweaks: put the new options in a consistent order in the code

master
Benno Schulenberg 2021-01-07 14:24:27 +01:00
parent 7b9567719c
commit e66c7d0f8d
1 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/nano.c
View File

@ -1749,7 +1749,6 @@ int main(int argc, char **argv)
{"wordbounds", 0, NULL, 'W'}, {"wordbounds", 0, NULL, 'W'},
{"wordchars", 1, NULL, 'X'}, {"wordchars", 1, NULL, 'X'},
{"zap", 0, NULL, 'Z'}, {"zap", 0, NULL, 'Z'},
{"minibar", 0, NULL, '_'},
{"atblanks", 0, NULL, 'a'}, {"atblanks", 0, NULL, 'a'},
{"emptyline", 0, NULL, 'e'}, {"emptyline", 0, NULL, 'e'},
{"autoindent", 0, NULL, 'i'}, {"autoindent", 0, NULL, 'i'},
@ -1759,8 +1758,9 @@ int main(int argc, char **argv)
{"indicator", 0, NULL, 'q'}, {"indicator", 0, NULL, 'q'},
{"unix", 0, NULL, 'u'}, {"unix", 0, NULL, 'u'},
{"afterends", 0, NULL, 'y'}, {"afterends", 0, NULL, 'y'},
{"stateflags", 0, NULL, '%'},
{"markmatch", 0, NULL, '^'}, {"markmatch", 0, NULL, '^'},
{"stateflags", 0, NULL, '%'},
{"minibar", 0, NULL, '_'},
#endif #endif
#ifdef HAVE_LIBMAGIC #ifdef HAVE_LIBMAGIC
{"magic", 0, NULL, '!'}, {"magic", 0, NULL, '!'},
@ -1815,7 +1815,7 @@ int main(int argc, char **argv)
SET(RESTRICTED); SET(RESTRICTED);
while ((optchr = getopt_long(argc, argv, "ABC:DEFGHIJ:KLMNOPQ:RST:UVWX:Y:Z" while ((optchr = getopt_long(argc, argv, "ABC:DEFGHIJ:KLMNOPQ:RST:UVWX:Y:Z"
"abcdef:ghijklmno:pqr:s:tuvwxyz$%^_!", long_options, NULL)) != -1) { "abcdef:ghijklmno:pqr:s:tuvwxyz$^%_!", long_options, NULL)) != -1) {
switch (optchr) { switch (optchr) {
#ifndef NANO_TINY #ifndef NANO_TINY
case 'A': case 'A':
@ -1935,9 +1935,6 @@ int main(int argc, char **argv)
case 'Z': case 'Z':
SET(LET_THEM_ZAP); SET(LET_THEM_ZAP);
break; break;
case '_':
SET(MINIBAR);
break;
case 'a': case 'a':
SET(AT_BLANKS); SET(AT_BLANKS);
break; break;
@ -2055,11 +2052,14 @@ int main(int argc, char **argv)
SET(SUSPENDABLE); SET(SUSPENDABLE);
break; break;
#ifndef NANO_TINY #ifndef NANO_TINY
case '^':
SET(MARK_MATCH);
break;
case '%': case '%':
SET(STATEFLAGS); SET(STATEFLAGS);
break; break;
case '^': case '_':
SET(MARK_MATCH); SET(MINIBAR);
break; break;
#endif #endif
#ifdef HAVE_LIBMAGIC #ifdef HAVE_LIBMAGIC