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

Unabbreviating the long option --const to --constantshow. 

git-svn-id: svn://svn.savannah.gnu.org/nano/trunk/nano@5299 35c25a1d-7b9e-4130-9fde-d3aeb78583b8
master
Benno Schulenberg 2015-07-15 19:40:37 +00:00
parent 5e53c6ee9e
commit 79526151d5
8 changed files with 16 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
ChangeLog
View File

@ -1,3 +1,8 @@
2015-07-15 Benno Schulenberg <bensberg@justemail.net>
* src/nano.c, src/rcfile.c, doc/nanorc.sample.in, doc/man/nano.1,
doc/man/nanorc.5, doc/texinfo/nano.texi, doc/syntax/nanorc.nanorc:
Unabbreviate the long option --const to --constantshow.
2015-07-13 Benno Schulenberg <bensberg@justemail.net> 2015-07-13 Benno Schulenberg <bensberg@justemail.net>
* src/text.c (do_int_spell_fix, do_alt_speller): Remove an unneeded * src/text.c (do_int_spell_fix, do_alt_speller): Remove an unneeded
condition; 'added_magicline' can only be true when NO_NEWLINES isn't. condition; 'added_magicline' can only be true when NO_NEWLINES isn't.

2
doc/man/nano.1
View File

@ -157,7 +157,7 @@ characters as part of a word.
Specify the name of the syntax highlighting to use from among the ones Specify the name of the syntax highlighting to use from among the ones
defined in the \fInanorc\fP files. defined in the \fInanorc\fP files.
.TP .TP
.BR \-c ", " \-\-const .BR \-c ", " \-\-constantshow
Constantly show the cursor position. Note that this overrides \fB\-U\fP. Constantly show the cursor position. Note that this overrides \fB\-U\fP.
.TP .TP
.BR \-d ", " \-\-rebinddelete .BR \-d ", " \-\-rebinddelete

2
doc/man/nanorc.5
View File

@ -90,7 +90,7 @@ closing brackets, can end sentences. The default value is "\fB"')>]}\fP".
.B set casesensitive .B set casesensitive
Do case-sensitive searches by default. Do case-sensitive searches by default.
.TP .TP
.B set const .B set constantshow
Constantly display the cursor position in the status bar. Constantly display the cursor position in the status bar.
.TP .TP
.B set cut .B set cut

4
doc/nanorc.sample.in
View File

@ -45,8 +45,8 @@
# set casesensitive # set casesensitive
## Constantly display the cursor position in the statusbar. Note that ## Constantly display the cursor position in the statusbar. Note that
## this overrides "quickblank". ## this overrides "quickblank". (The old form, 'const', is deprecated.)
# set const # set constantshow
## Use cut-to-end-of-line by default. ## Use cut-to-end-of-line by default.
# set cut # set cut

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|cut|fill|historylog|locking|morespace|mouse|multibuffer|noconvert|nofollow|nohelp|nonewlines|nowrap|poslog|preserve|quickblank|quiet|rebinddelete|rebindkeypad|regexp|smarthome|smooth|softwrap|suspend|tabsize|tabstospaces|tempfile|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|nofollow|nohelp|nonewlines|nowrap|poslog|preserve|quickblank|quiet|rebinddelete|rebindkeypad|regexp|smarthome|smooth|softwrap|suspend|tabsize|tabstospaces|tempfile|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:]]*$" 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:]]*$"

4
doc/texinfo/nano.texi
View File

@ -242,7 +242,7 @@ Specify a specific syntax from the nanorc files to use for highlighting.
See @xref{Syntax Highlighting}, for more info. See @xref{Syntax Highlighting}, for more info.
@item -c @item -c
@itemx --const @itemx --constantshow
Constantly display the cursor position and line number on the statusbar. Constantly display the cursor position and line number on the statusbar.
Note that this overrides @option{-U}. Note that this overrides @option{-U}.
@ -641,7 +641,7 @@ closing brackets, can end sentences. The default value is
@item set casesensitive @item set casesensitive
Do case-sensitive searches by default. Do case-sensitive searches by default.
@item set const @item set constantshow
Constantly display the cursor position in the status bar. Constantly display the cursor position in the status bar.
@item set cut @item set cut

4
src/nano.c
View File

@ -897,7 +897,7 @@ void usage(void)
print_opt(_("-Y <str>"), _("--syntax=<str>"), print_opt(_("-Y <str>"), _("--syntax=<str>"),
N_("Syntax definition to use for coloring")); N_("Syntax definition to use for coloring"));
#endif #endif
print_opt("-c", "--const", N_("Constantly show cursor position")); print_opt("-c", "--constantshow", N_("Constantly show cursor position"));
print_opt("-d", "--rebinddelete", print_opt("-d", "--rebinddelete",
N_("Fix Backspace/Delete confusion problem")); N_("Fix Backspace/Delete confusion problem"));
print_opt("-h", "--help", N_("Show this help text")); print_opt("-h", "--help", N_("Show this help text"));
@ -2121,7 +2121,7 @@ int main(int argc, char **argv)
#ifndef DISABLE_COLOR #ifndef DISABLE_COLOR
{"syntax", 1, NULL, 'Y'}, {"syntax", 1, NULL, 'Y'},
#endif #endif
{"const", 0, NULL, 'c'}, {"constantshow", 0, NULL, 'c'},
{"rebinddelete", 0, NULL, 'd'}, {"rebinddelete", 0, NULL, 'd'},
{"help", 0, NULL, 'h'}, {"help", 0, NULL, 'h'},
{"nofollow", 0, NULL, 'l'}, {"nofollow", 0, NULL, 'l'},

3
src/rcfile.c
View File

@ -38,7 +38,8 @@ static const rcoption rcopts[] = {
#ifndef DISABLE_JUSTIFY #ifndef DISABLE_JUSTIFY
{"brackets", 0}, {"brackets", 0},
#endif #endif
{"const", CONST_UPDATE}, {"const", CONST_UPDATE}, /* deprecated form, remove in 2018 */
{"constantshow", CONST_UPDATE},
#ifndef DISABLE_WRAPJUSTIFY #ifndef DISABLE_WRAPJUSTIFY
{"fill", 0}, {"fill", 0},
#endif #endif