commit edd0823d9679d66898297b94f0bba0fe565d4c93
parent 4ef4eb4f120b9da689172b1c7f41136a574c3102
Author: Benno Schulenberg <bensberg@telfort.nl>
Date: Fri, 8 Mar 2024 11:25:14 +0100
docs: mention that --modernbindings overrides --preserve
Diffstat:
2 files changed, 4 insertions(+), 0 deletions(-)
diff --git a/doc/nano.1 b/doc/nano.1
@@ -308,6 +308,7 @@ similar to a chroot.
.BR \-p ", " \-\-preserve
Preserve the XON and XOFF sequences (\fB^Q\fR and \fB^S\fR) so they
will be caught by the terminal.
+Note that option \fB\-/\fR (\fB\-\-modernbindings\fR) overrides this.
.TP
.BR \-q ", " \-\-indicator
Display a "scrollbar" on the righthand side of the edit window.
@@ -397,6 +398,7 @@ Furthermore, \fB^A\fR sets the mark,
\fB^R\fR makes replacements, \fB^D\fR searches previous,
\fB^P\fR shows the position, \fB^T\fR goes to a line,
\fB^W\fR writes out a file, and \fB^E\fR executes a command.
+Note that this overrides option \fB\-p\fR (\fB\-\-preserve\fR).
.SH TOGGLES
Several of the above options can be switched on and off also while
diff --git a/doc/nano.texi b/doc/nano.texi
@@ -648,6 +648,7 @@ similar to a chroot.
@itemx --preserve
Preserve the @kbd{^Q} (XON) and @kbd{^S} (XOFF) sequences so data being
sent to the editor can be stopped and started.
+Note that option @option{-/} (@option{--modernbindings}) overrides this.
@item -q
@itemx --indicator
@@ -767,6 +768,7 @@ Furthermore, @kbd{^A} sets the mark,
@kbd{^R} makes replacements, @kbd{^D} searches previous,
@kbd{^P} shows the position, @kbd{^T} goes to a line,
@kbd{^W} writes out a file, and @kbd{^E} executes a command.
+Note that this overrides option @option{-p} (@option{--preserve}).
@end table
