From e66c7d0f8d3f45f08d123ea8e6d99d8c6276c17c Mon Sep 17 00:00:00 2001
From: Benno Schulenberg <bensberg@telfort.nl>
Date: Thu, 7 Jan 2021 14:24:27 +0100
Subject: [PATCH] tweaks: put the new options in a consistent order in the code

---
 src/nano.c | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/src/nano.c b/src/nano.c
index a6aa02ae..2ef4f0ee 100644
--- a/src/nano.c
+++ b/src/nano.c
@@ -1749,7 +1749,6 @@ int main(int argc, char **argv)
 		{"wordbounds", 0, NULL, 'W'},
 		{"wordchars", 1, NULL, 'X'},
 		{"zap", 0, NULL, 'Z'},
-		{"minibar", 0, NULL, '_'},
 		{"atblanks", 0, NULL, 'a'},
 		{"emptyline", 0, NULL, 'e'},
 		{"autoindent", 0, NULL, 'i'},
@@ -1759,8 +1758,9 @@ int main(int argc, char **argv)
 		{"indicator", 0, NULL, 'q'},
 		{"unix", 0, NULL, 'u'},
 		{"afterends", 0, NULL, 'y'},
-		{"stateflags", 0, NULL, '%'},
 		{"markmatch", 0, NULL, '^'},
+		{"stateflags", 0, NULL, '%'},
+		{"minibar", 0, NULL, '_'},
 #endif
 #ifdef HAVE_LIBMAGIC
 		{"magic", 0, NULL, '!'},
@@ -1815,7 +1815,7 @@ int main(int argc, char **argv)
 		SET(RESTRICTED);
 
 	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) {
 #ifndef NANO_TINY
 			case 'A':
@@ -1935,9 +1935,6 @@ int main(int argc, char **argv)
 			case 'Z':
 				SET(LET_THEM_ZAP);
 				break;
-			case '_':
-				SET(MINIBAR);
-				break;
 			case 'a':
 				SET(AT_BLANKS);
 				break;
@@ -2055,11 +2052,14 @@ int main(int argc, char **argv)
 				SET(SUSPENDABLE);
 				break;
 #ifndef NANO_TINY
+			case '^':
+				SET(MARK_MATCH);
+				break;
 			case '%':
 				SET(STATEFLAGS);
 				break;
-			case '^':
-				SET(MARK_MATCH);
+			case '_':
+				SET(MINIBAR);
 				break;
 #endif
 #ifdef HAVE_LIBMAGIC