[PATCH 3/4] options: remove --markmatch and 'set markmatch', as the behavior is gone

[Benno Schulenberg]

---
 src/definitions.h    | 3 +--
 src/nano.c           | 7 +------
 src/rcfile.c         | 1 -
 syntax/nanorc.nanorc | 2 +-
 4 files changed, 3 insertions(+), 10 deletions(-)

diff --git a/src/definitions.h b/src/definitions.h
index 4bb0f0f5..f4d7774b 100644
--- a/src/definitions.h
+++ b/src/definitions.h
@@ -343,8 +343,7 @@ enum {
        BOOKSTYLE,
        STATEFLAGS,
        USE_MAGIC,
-       MINIBAR,
-       MARK_MATCH
+       MINIBAR
 };
 
 /* Structure types. */
diff --git a/src/nano.c b/src/nano.c
index 1df6736c..98134bb2 100644
--- a/src/nano.c
+++ b/src/nano.c
@@ -640,7 +640,6 @@ void usage(void)
        if (!ISSET(RESTRICTED))
                print_opt("-z", "--suspendable", N_("Enable suspension"));
 #ifndef NANO_TINY
-       print_opt("-^", "--markmatch", N_("Select the match of a search"));
        print_opt("-%", "--stateflags", N_("Show some states on the title 
bar"));
        print_opt("-_", "--minibar", N_("Show a feedback bar at the bottom"));
 #endif
@@ -1761,7 +1760,6 @@ int main(int argc, char **argv)
                {"indicator", 0, NULL, 'q'},
                {"unix", 0, NULL, 'u'},
                {"afterends", 0, NULL, 'y'},
-               {"markmatch", 0, NULL, '^'},
                {"stateflags", 0, NULL, '%'},
                {"minibar", 0, NULL, '_'},
 #endif
@@ -1818,7 +1816,7 @@ int main(int argc, char **argv)
                SET(RESTRICTED);
 
        while ((optchr = getopt_long(argc, argv, 
"ABC:DEFGHIJ:KLMNOPQ:RST:UVWX:Y:Z"
-                               "abcdef:ghijklmno:pqr:s:tuvwxyz$^%_!", 
long_options, NULL)) != -1) {
+                               "abcdef:ghijklmno:pqr:s:tuvwxyz$%_!", 
long_options, NULL)) != -1) {
                switch (optchr) {
 #ifndef NANO_TINY
                        case 'A':
@@ -2055,9 +2053,6 @@ int main(int argc, char **argv)
                                SET(SUSPENDABLE);
                                break;
 #ifndef NANO_TINY
-                       case '^':
-                               SET(MARK_MATCH);
-                               break;
                        case '%':
                                SET(STATEFLAGS);
                                break;
diff --git a/src/rcfile.c b/src/rcfile.c
index c1a71d1a..00af5462 100644
--- a/src/rcfile.c
+++ b/src/rcfile.c
@@ -109,7 +109,6 @@ static const rcoption rcopts[] = {
        {"indicator", INDICATOR},
        {"jumpyscrolling", JUMPY_SCROLLING},
        {"locking", LOCKING},
-       {"markmatch", MARK_MATCH},
        {"matchbrackets", 0},
        {"minibar", MINIBAR},
        {"noconvert", NO_CONVERT},
diff --git a/syntax/nanorc.nanorc b/syntax/nanorc.nanorc
index eb833182..b4864580 100644
--- a/syntax/nanorc.nanorc
+++ b/syntax/nanorc.nanorc
@@ -7,7 +7,7 @@ comment "#"
 color brightred ".*"
 
 # Keywords
-color brightgreen 
"^[[:space:]]*(set|unset)[[:space:]]+(afterends|allow_insecure_backup|atblanks|autoindent|backup|boldtext|bookstyle|breaklonglines|casesensitive|constantshow|cutfromcursor|emptyline|historylog|indicator|jumpyscrolling|linenumbers|locking|magic|markmatch|minibar|mouse|multibuffer|noconvert|nohelp|nonewlines|positionlog|preserve|quickblank|rawsequences|rebinddelete|regexp|saveonexit|showcursor|smarthome|softwrap|stateflags|suspendable|tabstospaces|trimblanks|unix|wordbounds|zap)\>"
+color brightgreen 
"^[[:space:]]*(set|unset)[[:space:]]+(afterends|allow_insecure_backup|atblanks|autoindent|backup|boldtext|bookstyle|breaklonglines|casesensitive|constantshow|cutfromcursor|emptyline|historylog|indicator|jumpyscrolling|linenumbers|locking|magic|minibar|mouse|multibuffer|noconvert|nohelp|nonewlines|positionlog|preserve|quickblank|rawsequences|rebinddelete|regexp|saveonexit|showcursor|smarthome|softwrap|stateflags|suspendable|tabstospaces|trimblanks|unix|wordbounds|zap)\>"
 color yellow 
"^[[:space:]]*set[[:space:]]+((error|function|key|number|prompt|scroller|selected|status|stripe|title)color)[[:space:]]+(bold,)?(italic,)?(bright|light)?(white|black|red|blue|green|yellow|magenta|cyan|normal|pink|purple|mauve|lagoon|mint|lime|peach|orange|latte)?(,(light)?(white|black|red|blue|green|yellow|magenta|cyan|normal|pink|purple|mauve|lagoon|mint|lime|peach|orange|latte))?\>"
 color brightgreen 
"^[[:space:]]*set[[:space:]]+(backupdir|brackets|errorcolor|functioncolor|keycolor|matchbrackets|numbercolor|operatingdir|promptcolor|punct|quotestr|scrollercolor|selectedcolor|speller|statuscolor|stripecolor|titlecolor|whitespace|wordchars)[[:space:]]+"
 color brightgreen 
"^[[:space:]]*set[[:space:]]+(fill[[:space:]]+-?[[:digit:]]+|(guidestripe|tabsize)[[:space:]]+[1-9][0-9]*)\>"
-- 
2.29.2