nano

commit 75b312ded1f1b7b3b33b36c7ab936e9c27e01d0d
parent e65b0ba6542b03a76fa6fecabdea56c04c2792b5
Author: Benno Schulenberg <bensberg@telfort.nl>
Date:   Sun, 27 Aug 2023 14:56:05 +0200

revert the previous commit -- forget about -? as a synonym for --help

An ambiguous option like --back or --word would cause nano to spew
the entire help text.  It should do the latter only when the user
explicitly requests it.

Diffstat:
M
doc/nano.1
 | 
2
+-
M
doc/nano.texi
 | 
1
-
M
doc/rnano.1
 | 
2
+-
M
src/nano.c
 | 
15
++++++---------

4 files changed, 8 insertions(+), 12 deletions(-)
diff --git a/doc/nano.1 b/doc/nano.1
@@ -250,7 +250,7 @@ Make the cursor visible in the file browser (putting it on the
 highlighted item) and in the help viewer.  Useful for braille users
 and people with poor vision.
 .TP
-.BR \-h ", " \-? ", " \-\-help
+.BR \-h ", " \-\-help
 Show a summary of the available command-line options and exit.
 .TP
 .BR \-i ", " \-\-autoindent
diff --git a/doc/nano.texi b/doc/nano.texi
@@ -574,7 +574,6 @@ highlighted item) and in the help viewer.  Useful for braille users
 and people with poor vision.
 
 @item -h
-@itemx -?
 @itemx --help
 Show a summary of command-line options and exit.
 
diff --git a/doc/rnano.1 b/doc/rnano.1
@@ -48,7 +48,7 @@ not allow appending or prepending to any file.
 
 .SH OPTIONS
 .TP
-.BR \-h ", " \-? ", " \-\-help
+.BR \-h ", " \-\-help
 Show the available command-line options and exit.
 .P
 For all existing options, see the \fBnano\fR(1) man page.
diff --git a/src/nano.c b/src/nano.c
@@ -607,7 +607,7 @@ void usage(void)
 #if defined(ENABLE_BROWSER) || defined(ENABLE_HELP)
 	print_opt("-g", "--showcursor", N_("Show cursor in file browser & help text"));
 #endif
-	print_opt("-h, -?", "--help", N_("Show this help text and exit"));
+	print_opt("-h", "--help", N_("Show this help text and exit"));
 #ifndef NANO_TINY
 	print_opt("-i", "--autoindent", N_("Automatically indent new lines"));
 	print_opt("-j", "--jumpyscrolling", N_("Scroll per half-screen, not per line"));
@@ -1849,7 +1849,7 @@ int main(int argc, char **argv)
 		SET(RESTRICTED);
 
 	while ((optchr = getopt_long(argc, argv, "ABC:DEFGHIJ:KLMNOPQ:RS$T:UVWX:Y:Z"
-				"abcdef:gh?ijklmno:pqr:s:tuvwxy!%_0", long_options, NULL)) != -1) {
+				"abcdef:ghijklmno:pqr:s:tuvwxy!%_0", long_options, NULL)) != -1) {
 		switch (optchr) {
 #ifndef NANO_TINY
 			case 'A':
@@ -1999,6 +1999,9 @@ int main(int argc, char **argv)
 				SET(SHOW_CURSOR);
 				break;
 #endif
+			case 'h':
+				usage();
+				exit(0);
 #ifndef NANO_TINY
 			case 'i':
 				SET(AUTOINDENT);
@@ -2095,13 +2098,7 @@ int main(int argc, char **argv)
 				SET(ZERO);
 				break;
 #endif
-			case 'h':
-			case '?':
-				/* If the option is valid, print the help text and exit. */
-				if (!optopt) {
-					usage();
-					exit(0);
-				}
+			default:
 				printf(_("Type '%s -h' for a list of available options.\n"), argv[0]);
 				exit(1);
 		}