From: Benno Schulenberg <bensberg@justemail.net>
Date: Wed, 29 Jul 2015 17:36:39 +0000 (+0000)
Subject: It is better to say that this function is disabled
X-Git-Tag: v2.5.0~136
X-Git-Url: https://git.wh0rd.org/?a=commitdiff_plain;h=e4294a211ef094b0830fe3591f8fb97444b76793;p=nano.git

It is better to say that this function is disabled
than that no linter has been defined.


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

diff --git a/ChangeLog b/ChangeLog
index dfb8e991..ff9cb82d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2015-07-29  Benno Schulenberg  <bensberg@justemail.net>
+	* src/text.c (do_linter): When the linter is called in restricted mode
+	(possible when nano was built with --disable-speller), it is better to
+	say that this function is disabled than that no linter was defined.
+
 2015-07-28  Benno Schulenberg  <bensberg@justemail.net>
 	* src/text.c (do_formatter), src/nano.c (allow_pending_sigwinch):
 	Reenable SIGWINCH-es also when invoking the formatter fails, and
diff --git a/src/text.c b/src/text.c
index 810199ea..7387efbe 100644
--- a/src/text.c
+++ b/src/text.c
@@ -2903,6 +2903,11 @@ void do_linter(void)
     char *convendptr = NULL;
     lintstruct *lints = NULL, *tmplint = NULL, *curlint = NULL;
 
+    if (ISSET(RESTRICTED)) {
+        nano_disabled_msg();
+        return;
+    }
+
     if (!openfile->syntax || !openfile->syntax->linter) {
 	statusbar(_("No linter defined for this type of file!"));
 	return;