From a91bc04e041135ba62d97bdb5b8a23a8140cc5b8 Mon Sep 17 00:00:00 2001 From: Benno Schulenberg Date: Fri, 13 Mar 2020 15:58:56 +0100 Subject: [PATCH] docs: update the form of an option, --suspendable / 'set suspendable' --- doc/nano.1 | 4 ++-- doc/nano.texi | 3 ++- doc/nanorc.5 | 3 ++- doc/sample.nanorc.in | 5 +++-- syntax/nanorc.nanorc | 2 +- 5 files changed, 10 insertions(+), 7 deletions(-) diff --git a/doc/nano.1 b/doc/nano.1 index 4e99458e..b8fbbaa3 100644 --- a/doc/nano.1 +++ b/doc/nano.1 @@ -320,8 +320,8 @@ Don't show the two help lines at the bottom of the screen. .BR \-y ", " \-\-afterends Make Ctrl+Right stop at word ends instead of beginnings. .TP -.BR \-z ", " \-\-suspend -Enable the suspend ability. +.BR \-z ", " \-\-suspendable +Allow the user to suspend the editor (with \fB^Z\fR by default). .TP .BR \-$ ", " \-\-softwrap Enable 'soft wrapping'. This will make \fBnano\fP attempt to display the diff --git a/doc/nano.texi b/doc/nano.texi index 84861330..6c208e52 100644 --- a/doc/nano.texi +++ b/doc/nano.texi @@ -1518,7 +1518,8 @@ Toggles whether typed tabs will be converted to spaces. Toggles mouse support. @item suspendenable -Toggles whether the suspend shortcut (normally @kbd{^Z}) will suspend the editor. +Toggles whether the suspend keystroke (@kbd{^Z} by default) +will actually suspend the editor. @end table diff --git a/doc/nanorc.5 b/doc/nanorc.5 index d0388d2e..45d8e413 100644 --- a/doc/nanorc.5 +++ b/doc/nanorc.5 @@ -839,7 +839,8 @@ Toggles whether typed tabs will be converted to spaces. Toggles mouse support. .TP .B suspendenable -Toggles whether the suspend sequence (normally ^Z) will suspend the editor window. +Toggles whether the suspend keystroke (\fB^Z\fR by default) +will actually suspend the editor. .RE .TP diff --git a/doc/sample.nanorc.in b/doc/sample.nanorc.in index 1e00062a..3ddbbf9f 100644 --- a/doc/sample.nanorc.in +++ b/doc/sample.nanorc.in @@ -149,8 +149,9 @@ ## does not have a default value. # set speller "aspell -x -c" -## Allow nano to be suspended. -# set suspend +## Allow nano to be suspended (with ^Z by default). +# set suspendable +## (The old form of this option, 'set suspend', is deprecated.) ## Use this tab size instead of the default; it must be greater than 0. # set tabsize 8 diff --git a/syntax/nanorc.nanorc b/syntax/nanorc.nanorc index 02308fe7..ea982096 100644 --- a/syntax/nanorc.nanorc +++ b/syntax/nanorc.nanorc @@ -7,7 +7,7 @@ comment "#" color brightred ".*" # Keywords -color brightgreen "^[[:space:]]*(set|unset)[[:space:]]+(afterends|allow_insecure_backup|atblanks|autoindent|backup|backwards|boldtext|breaklonglines|casesensitive|constantshow|cutfromcursor|emptyline|finalnewline|historylog|jumpyscrolling|linenumbers|locking|morespace|mouse|multibuffer|noconvert|nohelp|nopauses|nonewlines|nowrap|positionlog|preserve|quickblank|quiet|rawsequences|rebinddelete|regexp|showcursor|smarthome|smooth|softwrap|suspend|tabstospaces|tempfile|trimblanks|unix|view|wordbounds|zap)\>" +color brightgreen "^[[:space:]]*(set|unset)[[:space:]]+(afterends|allow_insecure_backup|atblanks|autoindent|backup|backwards|boldtext|breaklonglines|casesensitive|constantshow|cutfromcursor|emptyline|finalnewline|historylog|jumpyscrolling|linenumbers|locking|morespace|mouse|multibuffer|noconvert|nohelp|nopauses|nonewlines|nowrap|positionlog|preserve|quickblank|quiet|rawsequences|rebinddelete|regexp|showcursor|smarthome|smooth|softwrap|suspendable|tabstospaces|tempfile|trimblanks|unix|view|wordbounds|zap)\>" color yellow "^[[:space:]]*set[[:space:]]+((error|function|key|number|selected|status|stripe|title)color)[[:space:]]+(bright)?(white|black|red|blue|green|yellow|magenta|cyan|normal)?(,(white|black|red|blue|green|yellow|magenta|cyan|normal))?\>" color brightgreen "^[[:space:]]*set[[:space:]]+(backupdir|brackets|errorcolor|functioncolor|keycolor|matchbrackets|numbercolor|operatingdir|punct|quotestr|selectedcolor|speller|statuscolor|stripecolor|titlecolor|whitespace|wordchars)[[:space:]]+" color brightgreen "^[[:space:]]*set[[:space:]]+(fill[[:space:]]+-?[[:digit:]]+|(guidestripe|tabsize)[[:space:]]+[1-9][0-9]*)\>"