From aa70f3d95e8f4f7138388f5b8c0f8c77809c6035 Mon Sep 17 00:00:00 2001
From: Benno Schulenberg <bensberg@telfort.nl>
Date: Fri, 27 Mar 2020 16:32:56 +0100
Subject: [PATCH] options: stop recognizing the obsolete --morespace and
 --smooth

They have been no-ops for a year.

Also remove their documentation entries.

(The nanorc options still remain -- to be removed next year.)
---
 doc/nano.1    | 10 ----------
 doc/nano.texi | 14 +-------------
 src/nano.c    | 14 +-------------
 3 files changed, 2 insertions(+), 36 deletions(-)

diff --git a/doc/nano.1 b/doc/nano.1
index 1d1b49d1..9b0e0dc0 100644
--- a/doc/nano.1
+++ b/doc/nano.1
@@ -155,11 +155,6 @@ hard-wrapping occurs or when text is justified.
 .BR \-N ", " \-\-noconvert
 Disable automatic conversion of files from DOS/Mac format.
 .TP
-.BR \-O ", " \-\-morespace
-Obsolete and ignored option, since the line below the title bar is included
-into the editing space by default.  If you prefer to keep this line blank,
-use \fB\-e\fR or \fB\-\-emptyline\fR.
-.TP
 .BR \-P ", " \-\-positionlog
 For the 200 most recent files, log the last position of the cursor,
 and place it at that position again upon reopening such a file.
@@ -180,11 +175,6 @@ different name if it already has one; and don't make backup files.
 Restricted mode can also be activated by invoking \fBnano\fP
 with any name beginning with 'r' (e.g. "rnano").
 .TP
-.BR \-S ", " \-\-smooth
-Obsolete and ignored option, since smooth scrolling has become the default.
-If you prefer the chunk-by-chunk scrolling behavior,
-use \fB\-j\fR or \fB\-\-jumpyscrolling\fR.
-.TP
 .BR \-T\ \fInumber ", " \-\-tabsize= \fInumber
 Set the size (width) of a tab to \fInumber\fP columns.  The value of
 \fInumber\fP must be greater than 0.  The default value is 8.
diff --git a/doc/nano.texi b/doc/nano.texi
index 868744e6..16fb4277 100644
--- a/doc/nano.texi
+++ b/doc/nano.texi
@@ -97,7 +97,7 @@ as is reasonable while offering a superset of Pico's functionality.
 Pico differ.
 
 Starting with version 4.0, @command{nano} no longer hard-wraps an overlong
-line by default.  It further uses smooth scrolling by default, and by
+line by default.  It further uses linewise scrolling by default, and by
 default includes the line below the title bar into the editing area.
 
 If you want the old, Pico behavior back, you can use the
@@ -239,12 +239,6 @@ hard-wrapping occurs or when text is justified.
 @itemx --noconvert
 Disable automatic conversion of files from DOS/Mac format.
 
-@item -O
-@itemx --morespace
-Obsolete and ignored option, since the line below the title bar is included
-into the editing space by default.  If you prefer to keep this line blank,
-use @option{-e} or @option{--emptyline}.
-
 @item -P
 @itemx --positionlog
 For the 200 most recent files, log the last position of the cursor,
@@ -268,12 +262,6 @@ name if it already has one; and don't make backup files.
 Restricted mode can also be activated by invoking @command{nano} with
 any name beginning with @code{r} (e.g.@: @command{rnano}).
 
-@item -S
-@itemx --smooth
-Obsolete and ignored option, since smooth scrolling has become the default.
-If you prefer the chunk-by-chunk scrolling behavior,
-use @option{-j} or @option{--jumpyscrolling}.
-
 @item -T @var{number}
 @itemx --tabsize=@var{number}
 Set the displayed tab length to @var{number} columns.  The value of
diff --git a/src/nano.c b/src/nano.c
index 86307021..e98a6221 100644
--- a/src/nano.c
+++ b/src/nano.c
@@ -1816,9 +1816,7 @@ int main(int argc, char **argv)
 		{"guidestripe", 1, NULL, 'J'},
 		{"nonewlines", 0, NULL, 'L'},
 		{"noconvert", 0, NULL, 'N'},
-		{"morespace", 0, NULL, 'O'},
 		{"positionlog", 0, NULL, 'P'},
-		{"smooth", 0, NULL, 'S'},
 		{"wordbounds", 0, NULL, 'W'},
 		{"wordchars", 1, NULL, 'X'},
 		{"zap", 0, NULL, 'Z'},
@@ -1883,7 +1881,7 @@ int main(int argc, char **argv)
 	if (*(tail(argv[0])) == 'r')
 		SET(RESTRICTED);
 
-	while ((optchr = getopt_long(argc, argv, "ABC:DEFGHIJ:KLMNOPQ:RST:UVWX:Y:Z"
+	while ((optchr = getopt_long(argc, argv, "ABC:DEFGHIJ:KLMNPQ:RT:UVWX:Y:Z"
 				"abcdef:ghijklmno:pr:s:tuvwxyz$", long_options, NULL)) != -1) {
 		switch (optchr) {
 #ifndef NANO_TINY
@@ -1951,10 +1949,6 @@ int main(int argc, char **argv)
 			case 'N':
 				SET(NO_CONVERT);
 				break;
-			case 'O':
-				fprintf(stderr, N_("Option %s is ignored; it is the default\n"),
-										"morespace");
-				break;
 #endif
 #ifdef ENABLE_HISTORIES
 			case 'P':
@@ -1969,12 +1963,6 @@ int main(int argc, char **argv)
 			case 'R':
 				SET(RESTRICTED);
 				break;
-#ifndef NANO_TINY
-			case 'S':
-				fprintf(stderr, N_("Option %s is ignored; it is the default\n"),
-										"smooth");
-				break;
-#endif
 			case 'T':
 				if (!parse_num(optarg, &tabsize) || tabsize <= 0) {
 					fprintf(stderr, _("Requested tab size \"%s\" is invalid"), optarg);