ariadne
/
smol
2
1
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Correcting the description of 'justifytrim', adding it to the Info document, 

sorting it, and tweaking a wording.


git-svn-id: svn://svn.savannah.gnu.org/nano/trunk/nano@5682 35c25a1d-7b9e-4130-9fde-d3aeb78583b8
master
Benno Schulenberg 2016-02-26 09:04:54 +00:00
parent 162d534ff6
commit 2146942248
5 changed files with 11 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
ChangeLog
View File

@ -1,3 +1,8 @@
2016-02-26 Benno Schulenberg <bensberg@justemail.net>
* doc/man/nanorc.5, doc/texinfo/nano.texi, doc/syntax/nanorc.nanorc,
doc/nanorc.sample.in: Correct the description of 'justifytrim', add
it to the Info document, sort it, and tweak a wording.
GNU nano 2.5.3 - 2016.02.25 GNU nano 2.5.3 - 2016.02.25
2016-02-25 Benno Schulenberg <bensberg@justemail.net> 2016-02-25 Benno Schulenberg <bensberg@justemail.net>

2
doc/man/nanorc.5
View File

@ -112,7 +112,7 @@ Enable the use of \fB~/.nano/search_history\fP for saving and reading
search/replace strings. search/replace strings.
.TP .TP
.B set justifytrim .B set justifytrim
When justifying text, trailing newlines will automatically be removed. When justifying text, trailing whitespace will automatically be removed.
.TP .TP
.B set keycolor \fIfgcolor\fR,\fIbgcolor\fR .B set keycolor \fIfgcolor\fR,\fIbgcolor\fR
Specify the color combination to use for the shortcut key combos Specify the color combination to use for the shortcut key combos

2
doc/nanorc.sample.in
View File

@ -60,7 +60,7 @@
## Remember the used search/replace strings for the next session. ## Remember the used search/replace strings for the next session.
# set historylog # set historylog
## Have the justify command kill whitespace at the end of lines ## Make the justify command kill whitespace at the end of lines.
# set justifytrim # set justifytrim
## Enable vim-style lock-files. This is just to let a vim user know you ## Enable vim-style lock-files. This is just to let a vim user know you

2
doc/syntax/nanorc.nanorc
View File

@ -6,7 +6,7 @@ syntax "nanorc" "\.?nanorc$"
icolor brightred "^[[:space:]]*((un)?(bind|set)|include|syntax|header|magic|linter|i?color|extendsyntax).*$" icolor brightred "^[[:space:]]*((un)?(bind|set)|include|syntax|header|magic|linter|i?color|extendsyntax).*$"
# Keywords # Keywords
icolor brightgreen "^[[:space:]]*(set|unset)[[:space:]]+(allow_insecure_backup|autoindent|backup|backwards|boldtext|casesensitive|const(antshow)?|cut|fill|historylog|locking|morespace|mouse|multibuffer|noconvert|nohelp|nonewlines|nowrap|pos(ition)?log|preserve|quickblank|quiet|rebinddelete|rebindkeypad|regexp|smarthome|smooth|softwrap|suspend|tabsize|tabstospaces|tempfile|unix|view|wordbounds|justifytrim)\>" icolor brightgreen "^[[:space:]]*(set|unset)[[:space:]]+(allow_insecure_backup|autoindent|backup|backwards|boldtext|casesensitive|const(antshow)?|cut|fill|historylog|justifytrim|locking|morespace|mouse|multibuffer|noconvert|nohelp|nonewlines|nowrap|pos(ition)?log|preserve|quickblank|quiet|rebinddelete|rebindkeypad|regexp|smarthome|smooth|softwrap|suspend|tabsize|tabstospaces|tempfile|unix|view|wordbounds)\>"
icolor yellow "^[[:space:]]*set[[:space:]]+(functioncolor|keycolor|statuscolor|titlecolor)[[:space:]]+(bright)?(white|black|red|blue|green|yellow|magenta|cyan)?(,(white|black|red|blue|green|yellow|magenta|cyan))?\>" icolor yellow "^[[:space:]]*set[[:space:]]+(functioncolor|keycolor|statuscolor|titlecolor)[[:space:]]+(bright)?(white|black|red|blue|green|yellow|magenta|cyan)?(,(white|black|red|blue|green|yellow|magenta|cyan))?\>"
icolor brightgreen "^[[:space:]]*set[[:space:]]+(backupdir|brackets|functioncolor|keycolor|matchbrackets|operatingdir|punct|quotestr|speller|statuscolor|titlecolor|whitespace)[[:space:]]+" icolor brightgreen "^[[:space:]]*set[[:space:]]+(backupdir|brackets|functioncolor|keycolor|matchbrackets|operatingdir|punct|quotestr|speller|statuscolor|titlecolor|whitespace)[[:space:]]+"
icolor brightgreen "^[[:space:]]*bind[[:space:]]+((\^|M-)([[:alpha:]]|space|[]]|[0-9^_=+{}|;:'\",./<>\?-])|F([1-9]|1[0-6])|Ins|Del)[[:space:]]+[[:alpha:]]+[[:space:]]+(all|main|search|replace(2|with)?|gotoline|writeout|insert|ext(ernal)?cmd|help|spell|linter|browser|whereisfile|gotodir)([[:space:]]+#|[[:space:]]*$)" icolor brightgreen "^[[:space:]]*bind[[:space:]]+((\^|M-)([[:alpha:]]|space|[]]|[0-9^_=+{}|;:'\",./<>\?-])|F([1-9]|1[0-6])|Ins|Del)[[:space:]]+[[:alpha:]]+[[:space:]]+(all|main|search|replace(2|with)?|gotoline|writeout|insert|ext(ernal)?cmd|help|spell|linter|browser|whereisfile|gotodir)([[:space:]]+#|[[:space:]]*$)"

3
doc/texinfo/nano.texi
View File

@ -688,6 +688,9 @@ See @code{set titlecolor} for more details.
Enable the use of @file{~/.nano/search_history} for saving and reading Enable the use of @file{~/.nano/search_history} for saving and reading
search/replace strings. search/replace strings.
@item set justifytrim
When justifying text, trailing whitespace will automatically be removed.
@item set keycolor @var{fgcolor},@var{bgcolor} @item set keycolor @var{fgcolor},@var{bgcolor}
Specify the color combination to use for the shortcut key combos Specify the color combination to use for the shortcut key combos
in the two help lines at the bottom of the screen. in the two help lines at the bottom of the screen.