From 0dec394303332fe12fb969b26370d0d362b9c034 Mon Sep 17 00:00:00 2001 From: Chris Allegretta Date: Mon, 22 Feb 2016 15:23:57 +0000 Subject: [PATCH] Make that kill_spaces_on_justify, add hilighting. git-svn-id: svn://svn.savannah.gnu.org/nano/trunk/nano@5665 35c25a1d-7b9e-4130-9fde-d3aeb78583b8 --- ChangeLog | 2 +- doc/syntax/nanorc.nanorc | 2 +- src/rcfile.c | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/ChangeLog b/ChangeLog index 8d674cdc..1de943ce 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,6 +1,6 @@ 2016-02-22 Chris Allegretta * Add ability to kill the trailing spaces when justifying - code. New nanorc option kill_spaces_on_wrap, we'll see + code. New nanorc option kill_spaces_on_justify, we'll see whether this warrants a command line flahg or not. 2016-02-22 Benno Schulenberg diff --git a/doc/syntax/nanorc.nanorc b/doc/syntax/nanorc.nanorc index 4a18ce4a..589ed383 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)\>" +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|kill_spaces_on_justify)\>" 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/src/rcfile.c b/src/rcfile.c index 6b20b9bc..5e3963ba 100644 --- a/src/rcfile.c +++ b/src/rcfile.c @@ -90,7 +90,7 @@ static const rcoption rcopts[] = { {"backwards", BACKWARDS_SEARCH}, {"casesensitive", CASE_SENSITIVE}, {"cut", CUT_TO_END}, - {"kill_spaces_on_wrap", KILL_TRAILING_SPACES}, + {"kill_spaces_on_justify", KILL_TRAILING_SPACES}, {"locking", LOCKING}, {"matchbrackets", 0}, {"noconvert", NO_CONVERT}, -- 2.39.5