commit 209531a7612e3af7c6b935e259074dafbda43b03
parent 2552307064594b2ce743d4aea369aecee9acf3f4
Author: Benno Schulenberg <bensberg@telfort.nl>
Date: Sun, 7 Apr 2019 09:40:35 +0200
docs: remove all mention of --finalnewline, and undefault --nonewlines
Diffstat:
4 files changed, 15 insertions(+), 46 deletions(-)
diff --git a/doc/nano.1 b/doc/nano.1
@@ -27,13 +27,11 @@ nano \- Nano's ANOther editor, inspired by Pico
.SH NOTICE
Starting with version 4.0, \fBnano\fR no longer hard-wraps an overlong
-line by default, and no longer automatically adds a newline at the end
-of the text if one is missing. Furthermore, it uses smooth scrolling
-by default and makes use of the line below the title bar.
+line by default, uses smooth scrolling by default, and by default makes
+use of the line below the title bar.
.sp
If you want the old, Pico behavior back, you can use \fB\-\-breaklonglines\fR,
-\fB\-\-finalnewline\fR, \fB\-\-jumpyscrolling\fR, and \fB\-\-emptyline\fR
-(or \fB\-bfje\fR for short).
+\fB\-\-jumpyscrolling\fR, and \fB\-\-emptyline\fR (or \fB\-bje\fR for short).
.SH DESCRIPTION
\fBnano\fP is a small and friendly editor. It copies the look and feel
@@ -124,7 +122,6 @@ mouse support.
.TP
.BR \-L ", " \-\-nonewlines
Don't automatically add a newline when a file does not end with one.
-(This is the default.)
.TP
.BR \-M ", " \-\-trimblanks
Snip trailing whitespace from the wrapped line when automatic
@@ -213,11 +210,6 @@ system either Backspace acts like Delete or Delete acts like Backspace.
.BR \-e ", " \-\-emptyline
Do not use the line below the title bar, leaving it entirely blank.
.TP
-.BR \-f ", " \-\-finalnewline
-If the buffer is not empty, ensure that it ends with a newline character.
-(This option is the opposite of \fB\-L\fR (\fB\-\-nonewlines\fR) --
-the last one given takes effect.)
-.TP
.BR \-g ", " \-\-showcursor
Make the cursor visible in the file browser (putting it on the
highlighted item) and in the help viewer. Useful for braille users
diff --git a/doc/nano.texi b/doc/nano.texi
@@ -97,14 +97,13 @@ 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, and no longer automatically adds a newline at the end
-of the text if one is missing. Furthermore, it uses smooth scrolling
-by default and makes use of the line below the title bar.
+line by default, uses smooth scrolling by default, and by default makes
+use of the line below the title bar.
If you want the old, Pico behavior back, you can use the
-following options: @option{--breaklonglines}, @option{--finalnewline},
+following options: @option{--breaklonglines},
@option{--jumpyscrolling}, and @option{--emptyline}
-(or @option{-bfje} for short).
+(or @option{-bje} for short).
Please report bugs via @url{https://savannah.gnu.org/bugs/?group=nano}.
@@ -216,7 +215,6 @@ mouse support.
@item -L
@itemx --nonewlines
Don't automatically add a newline when a file does not end with one.
-(This is the default.)
@item -M
@itemx --trimblanks
@@ -325,12 +323,6 @@ system either Backspace acts like Delete or Delete acts like Backspace.
@itemx --emptyline
Do not use the line below the title bar, leaving it entirely blank.
-@item -f
-@itemx --finalnewline
-If the buffer is not empty, ensure that it ends with a newline character.
-(This option is the opposite of @option{-L} (@option{--nonewlines}) ---
-the last one given takes effect.)
-
@item -g
@itemx --showcursor
Make the cursor visible in the file browser (putting it on the
@@ -776,9 +768,6 @@ Do not use the line below the title bar, leaving it entirely blank.
Use this color combination for the status bar when an error message is displayed.
@xref{@code{set functioncolor}} for valid color names.
-@item set finalnewline
-If the buffer is not empty, ensure that it ends with a newline character.
-
@item set fill @var{number}
Set the target width for justifying and automatic hard-wrapping at this
@var{number} of columns. If the value is 0 or less, wrapping will occur
@@ -843,8 +832,7 @@ Don't convert files from DOS/Mac format.
Don't display the help lists at the bottom of the screen.
@item set nonewlines
-Deprecated option since it has become the default setting.
-When needed, use @code{unset finalnewline} instead.
+Don't automatically add a newline when a file does not end with one.
@item set nopauses
Don't pause between warnings at startup. This means that only
@@ -1576,12 +1564,6 @@ switched on with the @option{--breaklonglines} option. With that option,
whereas Pico does it at screen width minus six columns. You can make
@command{nano} do as Pico by using @option{--fill=-6}.
-@item Magic Newline
-Pico ensures that any text always ends with a newline character.
-Nano does not do this by default: the user is left in full control
-of the formatting. You can get the automatic newline by using the
-@option{--finalnewline} option.
-
@item Scrolling
By default, @command{nano} will scroll just one line (instead of half
a screen) when the cursor is moved to a line that is just out of view.
diff --git a/doc/nanorc.5 b/doc/nanorc.5
@@ -23,12 +23,11 @@ nanorc \- GNU nano's configuration file
.SH NOTICE
Starting with version 4.0, \fBnano\fR no longer hard-wraps an overlong
-line by default, and no longer automatically adds a newline at the end
-of the text if one is missing. Furthermore, it uses smooth scrolling
-by default and makes use of the line below the title bar.
+line by default, uses smooth scrolling by default, and by default makes
+use of the line below the title bar.
.sp
If you want the old, Pico behavior back, you can use \fBset breaklonglines\fR,
-\fBset finalnewline\fR, \fBset jumpyscrolling\fR, and \fBset emptyline\fR.
+\fBset jumpyscrolling\fR, and \fBset emptyline\fR.
.SH DESCRIPTION
The \fInanorc\fP file contains the default settings for \fBnano\fP, a
@@ -121,9 +120,6 @@ Do not use the line below the title bar, leaving it entirely blank.
Use this color combination for the status bar when an error message is displayed.
See \fBset titlecolor\fR for valid color names.
.TP
-.B set finalnewline
-If the buffer is not empty, ensure that it ends with a newline character.
-.TP
.B set fill \fInumber\fR
Set the target width for justifying and automatic hard-wrapping at this
\fInumber\fR of columns. If the value is 0 or less, wrapping will occur
@@ -185,8 +181,7 @@ Don't convert files from DOS/Mac format.
Don't display the two help lines at the bottom of the screen.
.TP
.B set nonewlines
-Deprecated option since it has become the default setting.
-When needed, use \fBunset finalnewline\fR instead.
+Don't automatically add a newline when a file does not end with one.
.TP
.B set nopauses
Don't pause between warnings at startup. This means that only
diff --git a/doc/sample.nanorc.in b/doc/sample.nanorc.in
@@ -61,9 +61,6 @@
## less, the wrapping point will be the screen width minus this number.
# set fill -8
-## Ensure that a non-empty buffer ends with a newline character.
-# set finalnewline
-
## Remember the used search/replace strings for the next session.
# set historylog
@@ -99,6 +96,9 @@
## Don't display the helpful shortcut lists at the bottom of the screen.
# set nohelp
+## Don't automatically add a newline when a file does not end with one.
+# set nonewlines
+
## Don't pause between warnings at startup. Which means that only the
## last one will be readable (when there are multiple ones).
# set nopauses
