mirrors/nano
1
0
Fork 0
mirror of git://git.sv.gnu.org/nano.git synced 2024-11-22 12:51:23 +03:00
Code Issues Packages Projects Releases Wiki Activity

options: stop recognizing the obsolete --morespace and --smooth

Browse Source 
They have been no-ops for a year.

Also remove their documentation entries.

(The nanorc options still remain -- to be removed next year.)
This commit is contained in:
Benno Schulenberg 2020-03-27 16:32:56 +01:00
parent ec457dc33a
commit aa70f3d95e
3 changed files with 2 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
doc/nano.1
View File

@ -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.

14
doc/nano.texi
View File

@ -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

14
src/nano.c
View File

@ -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);