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

git-svn-id: svn://svn.savannah.gnu.org/nano/trunk/nano@5299 35c25a1d-7b9e-4130-9fde-d3aeb78583b8

diff --git a/ChangeLog b/ChangeLog
index e462564c9de925ad6346027c0dafb6de3627122d..10a2550628027655e285ee7b9ca708eed5019441 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -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>
        * 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.

diff --git a/doc/man/nano.1 b/doc/man/nano.1
index e601e598aeada4ce348f21030273e7b0c71a101d..224a65bebbc5e6cf8832127e7b2c716cc1c416f4 100644 (file)
--- a/doc/man/nano.1
+++ b/doc/man/nano.1
@@ -157,7 +157,7 @@ characters as part of a word.
 Specify the name of the syntax highlighting to use from among the ones
 defined in the \fInanorc\fP files.
 .TP
-.BR \-c ", " \-\-const
+.BR \-c ", " \-\-constantshow
 Constantly show the cursor position.  Note that this overrides \fB\-U\fP.
 .TP
 .BR \-d ", " \-\-rebinddelete

diff --git a/doc/man/nanorc.5 b/doc/man/nanorc.5
index 843767b1590b56553e4131a6831da05aecb386b4..95233661487f4c464d92076a5696ef4892eee776 100644 (file)
--- a/doc/man/nanorc.5
+++ b/doc/man/nanorc.5
@@ -90,7 +90,7 @@ closing brackets, can end sentences.  The default value is "\fB"')>]}\fP".
 .B set casesensitive
 Do case-sensitive searches by default.
 .TP
-.B set const
+.B set constantshow
 Constantly display the cursor position in the status bar.
 .TP
 .B set cut

diff --git a/doc/nanorc.sample.in b/doc/nanorc.sample.in
index 911f2b91c49f59ca29a79d995be6e9b969876134..afaa70d459dffd9abb8f8f80125213322f154d2f 100644 (file)
--- a/doc/nanorc.sample.in
+++ b/doc/nanorc.sample.in
@@ -45,8 +45,8 @@
 # set casesensitive
 
 ## Constantly display the cursor position in the statusbar.  Note that
-## this overrides "quickblank".
-# set const
+## this overrides "quickblank".  (The old form, 'const', is deprecated.)
+# set constantshow
 
 ## Use cut-to-end-of-line by default.
 # set cut

diff --git a/doc/syntax/nanorc.nanorc b/doc/syntax/nanorc.nanorc
index 3cf0bee90fc74244bf8b00d66f32da0e6d77fe97..02e3f404f331bdb5a27bc1653d4b5bc5004d269f 100644 (file)
--- 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|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 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:]]*$"

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

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

diff --git a/src/rcfile.c b/src/rcfile.c
index d52e0a8c561e8d79708a3cf56735fd24a3ceba96..babbfad2cba5bf6f8941b864cb2ce6986449573b 100644 (file)
--- a/src/rcfile.c
+++ b/src/rcfile.c
@@ -38,7 +38,8 @@ static const rcoption rcopts[] = {
 #ifndef DISABLE_JUSTIFY
     {"brackets", 0},
 #endif
-    {"const", CONST_UPDATE},
+    {"const", CONST_UPDATE},  /* deprecated form, remove in 2018 */
+    {"constantshow", CONST_UPDATE},
 #ifndef DISABLE_WRAPJUSTIFY
     {"fill", 0},
 #endif