[Nano-devel] [PATCH] options: remove the no-op -q/--quiet and 'set quiet'

[Benno Schulenberg]

---
 src/nano.c   | 7 +------
 src/nano.h   | 1 -
 src/rcfile.c | 1 -
 3 files changed, 1 insertion(+), 8 deletions(-)

diff --git a/src/nano.c b/src/nano.c
index e121722a..6fdae50e 100644
--- a/src/nano.c
+++ b/src/nano.c
@@ -1995,7 +1995,6 @@ int main(int argc, char **argv)
                {"operatingdir", 1, NULL, 'o'},
 #endif
                {"preserve", 0, NULL, 'p'},
-               {"quiet", 0, NULL, 'q'},
 #ifdef ENABLED_WRAPORJUSTIFY
                {"fill", 1, NULL, 'r'},
 #endif
@@ -2085,7 +2084,7 @@ int main(int argc, char **argv)
 
        while ((optchr =
                getopt_long(argc, argv,
-                               
"ABC:DEFGHIKLMNOPQ:RST:UVWX:Y:Zabcdefghijklmno:pqr:s:tuvwxyz$",
+                               
"ABC:DEFGHIKLMNOPQ:RST:UVWX:Y:Zabcdefghijklmno:pr:s:tuvwxyz$",
                                long_options, NULL)) != -1) {
                switch (optchr) {
 #ifndef NANO_TINY
@@ -2239,10 +2238,6 @@ int main(int argc, char **argv)
                        case 'p':
                                SET(PRESERVE);
                                break;
-#ifdef ENABLE_NANORC
-                       case 'q':  /* obsolete, ignored */
-                               break;
-#endif
 #ifdef ENABLED_WRAPORJUSTIFY
                        case 'r':
                                if (!parse_num(optarg, &wrap_at)) {
diff --git a/src/nano.h b/src/nano.h
index 04aa3150..50081493 100644
--- a/src/nano.h
+++ b/src/nano.h
@@ -529,7 +529,6 @@ enum
        WORD_BOUNDS,
        NO_NEWLINES,
        BOLD_TEXT,
-       QUIET,
        SOFTWRAP,
        POSITIONLOG,
        LOCKING,
diff --git a/src/rcfile.c b/src/rcfile.c
index fe6c90f7..e714e613 100644
--- a/src/rcfile.c
+++ b/src/rcfile.c
@@ -99,7 +99,6 @@ static const rcoption rcopts[] = {
        {"locking", LOCKING},
        {"matchbrackets", 0},
        {"noconvert", NO_CONVERT},
-       {"quiet", QUIET},
        {"showcursor", SHOW_CURSOR},
        {"smarthome", SMART_HOME},
        {"smooth", SMOOTH_SCROLL},
-- 
2.19.2