From 21469422484c7ff4436054fad01cd771a9270224 Mon Sep 17 00:00:00 2001
From: Benno Schulenberg <bensberg@justemail.net>
Date: Fri, 26 Feb 2016 09:04:54 +0000
Subject: [PATCH] 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
---
ChangeLog | 5 +++++
doc/man/nanorc.5 | 2 +-
doc/nanorc.sample.in | 2 +-
doc/syntax/nanorc.nanorc | 2 +-
doc/texinfo/nano.texi | 3 +++
5 files changed, 11 insertions(+), 3 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index de8875eb..5b16622b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -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
2016-02-25 Benno Schulenberg <bensberg@justemail.net>
diff --git a/doc/man/nanorc.5 b/doc/man/nanorc.5
index 1bc38004..ca319d30 100644
--- a/doc/man/nanorc.5
+++ b/doc/man/nanorc.5
@@ -112,7 +112,7 @@ Enable the use of \fB~/.nano/search_history\fP for saving and reading
search/replace strings.
.TP
.B set justifytrim
-When justifying text, trailing newlines will automatically be removed.
+When justifying text, trailing whitespace will automatically be removed.
.TP
.B set keycolor \fIfgcolor\fR,\fIbgcolor\fR
Specify the color combination to use for the shortcut key combos
diff --git a/doc/nanorc.sample.in b/doc/nanorc.sample.in
index cd8f32ee..48f62cc5 100644
--- a/doc/nanorc.sample.in
+++ b/doc/nanorc.sample.in
@@ -60,7 +60,7 @@
## Remember the used search/replace strings for the next session.
# 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
## Enable vim-style lock-files. This is just to let a vim user know you
diff --git a/doc/syntax/nanorc.nanorc b/doc/syntax/nanorc.nanorc
index 9618f6f6..e7307081 100644
--- a/doc/syntax/nanorc.nanorc
+++ b/doc/syntax/nanorc.nanorc
@@ -6,7 +6,7 @@ syntax "nanorc" "\.?nanorc$"
icolor brightred "^[[:space:]]*((un)?(bind|set)|include|syntax|header|magic|linter|i?color|extendsyntax).*$"
# 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 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:]]*$)"
diff --git a/doc/texinfo/nano.texi b/doc/texinfo/nano.texi
index 0f04ef24..3589f210 100644
--- a/doc/texinfo/nano.texi
+++ b/doc/texinfo/nano.texi
@@ -688,6 +688,9 @@ See @code{set titlecolor} for more details.
Enable the use of @file{~/.nano/search_history} for saving and reading
search/replace strings.
+@item set justifytrim
+When justifying text, trailing whitespace will automatically be removed.
+
@item set keycolor @var{fgcolor},@var{bgcolor}
Specify the color combination to use for the shortcut key combos
in the two help lines at the bottom of the screen.
--
2.39.5