nano

commit c26f901ba94f0a37265aaa13e06873fdf882ae66
parent a590645cde905c325b39ef0dbdf748871fad5567
Author: Benno Schulenberg <bensberg@telfort.nl>
Date:   Fri, 31 May 2024 12:45:18 +0200

options: remove the deprecated synonym -$ of -S/--softwrap

The old short option -$ has been deprecated for four years,
since version 5.0, commit 7d3aad40.

Diffstat:
M
doc/nano.1
 | 
1
-
M
doc/nano.texi
 | 
1
-
M
src/nano.c
 | 
3
+--

3 files changed, 1 insertion(+), 4 deletions(-)
diff --git a/doc/nano.1 b/doc/nano.1
@@ -201,7 +201,6 @@ with any name beginning with 'r' (e.g. "rnano").
 Display over multiple screen rows lines that exceed the screen's width.
 (You can make this soft-wrapping occur at whitespace instead of rudely at
 the screen's edge, by using also \fB\-\-atblanks\fR.)
-(The old short option, \fB\-$\fR, is deprecated.)
 .TP
 .BR \-T\ \fInumber ", " \-\-tabsize= \fInumber
 Set the size (width) of a tab to \fInumber\fP columns.  The value of
diff --git a/doc/nano.texi b/doc/nano.texi
@@ -518,7 +518,6 @@ any name beginning with @code{r} (e.g.@: @command{rnano}).
 Display over multiple screen rows lines that exceed the screen's width.
 (You can make this soft-wrapping occur at whitespace instead of rudely at
 the screen's edge, by using also @code{--atblanks}.)
-(The old short option, @code{-$}, is deprecated.)
 
 @item -T @var{number}
 @itemx --tabsize=@var{number}
diff --git a/src/nano.c b/src/nano.c
@@ -1878,7 +1878,7 @@ int main(int argc, char **argv)
 	else if (*(tail(argv[0])) == 'e')
 		SET(MODERN_BINDINGS);
 
-	while ((optchr = getopt_long(argc, argv, "ABC:DEFGHIJ:KLMNOPQ:RS$T:UVWX:Y:Z"
+	while ((optchr = getopt_long(argc, argv, "ABC:DEFGHIJ:KLMNOPQ:RST:UVWX:Y:Z"
 				"abcdef:ghijklmno:pqr:s:tuvwxyz!@%_0/", long_options, NULL)) > 0) {
 		switch (optchr) {
 #ifndef NANO_TINY
@@ -1965,7 +1965,6 @@ int main(int argc, char **argv)
 				break;
 #ifndef NANO_TINY
 			case 'S':
-			case '$':  /* Deprecated; remove in 2024. */
 				SET(SOFTWRAP);
 				break;
 			case 'T':