nano

commit 85ddc718f83a9aa33a35894b3ec0ca262d420aeb
parent 6c86ee1a5b3930c3181e247c13f23c57e666e0ba
Author: Benno Schulenberg <bensberg@justemail.net>
Date:   Wed,  2 Jul 2014 19:57:23 +0000

Properly excluding the --quiet option when --disable-nanorc was given.


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

Diffstat:
M
ChangeLog
 | 
2
++
M
doc/texinfo/nano.texi
 | 
5
+++--
M
src/nano.c
 | 
6
++++++

3 files changed, 11 insertions(+), 2 deletions(-)
diff --git a/ChangeLog b/ChangeLog
@@ -9,6 +9,8 @@
 	* src/search.c (findnextstr): Replace a call of old wrapper
 	'getfuncfromkey()' with	a call of new 'func_from_key()'.
 	* src/winio.c (getfuncfromkey): Delete now unneeded wrapper.
+	* src/nano.c (usage, main), doc/texinfo/nano.texi: Properly
+	exclude the --quiet option when --disable-nanorc was given.
 
 2014-07-01  Benno Schulenberg  <bensberg@justemail.net>
 	* src/browser.c (do_browser), src/help.c (do_help): Make sure
diff --git a/doc/texinfo/nano.texi b/doc/texinfo/nano.texi
@@ -1322,8 +1322,9 @@ Disable support for reading the nanorc files at startup.  With such
 support, you can store custom settings in a system-wide and a per-user
 nanorc file rather than having to pass command-line options to get
 the desired behavior.  See @xref{Nanorc Files}, for more info.
-This also eliminates the -I command-line option, which inhibits the
-reading of these nanorcfiles.
+Disabling this also eliminates the -I and -q command-line options;
+the first inhibits the reading of nanorcfiles, and the second
+suppresses warnings about errors in those files.
 
 @item --disable-operatingdir
 Disable setting the operating directory.  This also eliminates the -o
diff --git a/src/nano.c b/src/nano.c
@@ -863,6 +863,8 @@ void usage(void)
 #ifndef DISABLE_HISTORIES
     print_opt("-H", "--historylog",
 	N_("Log & read search/replace string history"));
+#endif
+#ifndef DISABLE_NANORC
     print_opt("-I", "--ignorercfiles",
 	N_("Don't look at nanorc files"));
 #endif
@@ -924,8 +926,10 @@ void usage(void)
 #endif
     print_opt("-p", "--preserve",
 	N_("Preserve XON (^Q) and XOFF (^S) keys"));
+#ifndef DISABLE_NANORC
     print_opt("-q", "--quiet",
 	N_("Silently ignore startup issues like rc file errors"));
+#endif
 #ifndef DISABLE_WRAPJUSTIFY
     print_opt(_("-r <#cols>"), _("--fill=<#cols>"),
 	N_("Set hard-wrapping point at column #cols"));
@@ -2356,9 +2360,11 @@ int main(int argc, char **argv)
 	    case 'p':
 		SET(PRESERVE);
 		break;
+#ifndef DISABLE_NANORC
 	    case 'q':
 		SET(QUIET);
 		break;
+#endif
 #ifndef DISABLE_WRAPJUSTIFY
 	    case 'r':
 		if (!parse_num(optarg, &wrap_at)) {