From: Benno Schulenberg <bensberg@justemail.net>
Date: Tue, 28 Jul 2015 20:04:18 +0000 (+0000)
Subject: Dropping two superfluous checks for restricted mode, and
X-Git-Tag: v2.5.0~137
X-Git-Url: https://git.wh0rd.org/?a=commitdiff_plain;h=0b15c42a5c51f4413b597b8bd474f260784486a1;p=nano.git

Dropping two superfluous checks for restricted mode, and
two superfluous checks for the definition of a formatter.


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

diff --git a/ChangeLog b/ChangeLog
index 919bd71d..dfb8e991 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -2,6 +2,11 @@
 	* src/text.c (do_formatter), src/nano.c (allow_pending_sigwinch):
 	Reenable SIGWINCH-es also when invoking the formatter fails, and
 	correct some comments.
+	* src/text.c (do_linter, do_formatter): In restricted mode, no nanorc
+	files are read, so no linter or formatter will be defined, so these
+	routines will never be called.  Also, the formatter will only ever
+	be called when a syntax applies to the current file and this syntax
+	defines a formatter, so there is no need to check this again.
 
 2015-07-26  Benno Schulenberg  <bensberg@justemail.net>
 	* src/search.c (do_replace_loop): When doing regex replacements, find
diff --git a/src/text.c b/src/text.c
index 3713cbc1..810199ea 100644
--- a/src/text.c
+++ b/src/text.c
@@ -2908,11 +2908,6 @@ void do_linter(void)
 	return;
     }
 
-    if (ISSET(RESTRICTED)) {
-	nano_disabled_msg();
-	return;
-    }
-
     if (openfile->modified) {
 	int i = do_yesno_prompt(FALSE, _("Save modified buffer before linting?"));
 	if (i == -1) {
@@ -3223,18 +3218,6 @@ void do_formatter(void)
     static char **formatargs = NULL;
     char *finalstatus = NULL;
 
-   /* Check whether we're using syntax highlighting
-    * and the formatter option is set. */
-    if (openfile->syntax == NULL || openfile->syntax->formatter == NULL) {
-	statusbar(_("Error: no formatter defined"));
-	return;
-    }
-
-    if (ISSET(RESTRICTED)) {
-	nano_disabled_msg();
-	return;
-    }
-
     if (temp == NULL) {
 	statusbar(_("Error writing temp file: %s"), strerror(errno));
 	return;