kjournalprint: remove legacy option 'no-color'

diff --git a/doc/man/kjournalprint.8in b/doc/man/kjournalprint.8in
index 4924e2afa20bc81f9f641747a1f8d1719571e0e5..98bcdf8e469296223a618adefade8168c4fecea0 100644 (file)
--- a/doc/man/kjournalprint.8in
+++ b/doc/man/kjournalprint.8in
@@ -80,9 +80,6 @@ Debug mode brief output.
 \fB\-x\fP, \fB\-\-mono\fP
 Don\(aqt generate colorized output.
 .TP
-\fB\-n\fP, \fB\-\-no\-color\fP
-An alias for \fB\-x\fP\&. Use of this option is deprecated, it will be removed in the future.
-.TP
 \fB\-X\fP, \fB\-\-color\fP
 Force colorized output.
 .TP

diff --git a/doc/man_kjournalprint.rst b/doc/man_kjournalprint.rst
index 7cd7cc50cb7b332cf3bd43528a96d0aea8f7a1d0..3b2d024b74fdb5bcbfba3d93cb0c9777cc4956bb 100644 (file)
--- a/doc/man_kjournalprint.rst
+++ b/doc/man_kjournalprint.rst
@@ -57,9 +57,6 @@ Options
 **-x**, **--mono**
   Don't generate colorized output.
 
-**-n**, **--no-color**
-  An alias for **-x**. Use of this option is deprecated, it will be removed in the future.
-
 **-X**, **--color**
   Force colorized output.
 

diff --git a/src/utils/kjournalprint/main.c b/src/utils/kjournalprint/main.c
index a5c935b69bd84af768a9d6c803891edf5d8ea3d2..4ffab1a82c66e2abe894343476fcf668117eeb64 100644 (file)
--- a/src/utils/kjournalprint/main.c
+++ b/src/utils/kjournalprint/main.c
@@ -342,7 +342,6 @@ int main(int argc, char *argv[])
                { "zone-list", no_argument,       NULL, 'z' },
                { "check",     no_argument,       NULL, 'H' },
                { "debug",     no_argument,       NULL, 'd' },
-               { "no-color",  no_argument,       NULL, 'n' },
                { "mono",      no_argument,       NULL, 'x' },
                { "color",     no_argument,       NULL, 'X' },
                { "help",      no_argument,       NULL, 'h' },
@@ -354,7 +353,7 @@ int main(int argc, char *argv[])
        signal_init_std();
 
        int opt = 0;
-       while ((opt = getopt_long(argc, argv, "c:C:D:l:s:zHdnxXhV::", opts, NULL)) != -1) {
+       while ((opt = getopt_long(argc, argv, "c:C:D:l:s:zHdxXhV::", opts, NULL)) != -1) {
                switch (opt) {
                case 'c':
                        if (util_conf_init_file(optarg) != KNOT_EOK) {
@@ -393,7 +392,6 @@ int main(int argc, char *argv[])
                case 'd':
                        params.debug = true;
                        break;
-               case 'n':
                case 'x':
                        params.color = false;
                        break;