Backport r5326 from trunk.

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

diff --git a/ChangeLog b/ChangeLog
index 8daf8c51d3bea9848fda0f85493201689210f074..1fb3a69a7a7866d5b291c79b9d5eda04f4f91fda 100644 (file)
--- 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-26  Benno Schulenberg  <bensberg@justemail.net>
        * src/search.c (do_replace_loop): When doing regex replacements, find
         each zero-length match only once.  This fixes Savannah bug #45626.

diff --git a/src/text.c b/src/text.c
index 36cec500da58967362ef20d2deb3c902c85f42b0..2ff2f21e340b60f688a29b316f433a520f5647f8 100644 (file)
--- a/src/text.c
+++ b/src/text.c
@@ -2909,6 +2909,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;