commit efbf7b6ef3ccd1fa46eda44d5f828f6e8e92cd19
parent 5885e34b23717e95c15f00bcf6b04a19f7f37eec
Author: Benno Schulenberg <bensberg@justemail.net>
Date: Wed, 29 Jul 2015 20:21:45 +0000
Making the four toggles that don't have any effect in restricted mode
say that they're disabled.
git-svn-id: svn://svn.savannah.gnu.org/nano/trunk/nano@5328 35c25a1d-7b9e-4130-9fde-d3aeb78583b8
Diffstat:
2 files changed, 8 insertions(+), 0 deletions(-)
diff --git a/ChangeLog b/ChangeLog
@@ -4,6 +4,8 @@
say that this function is disabled than that no linter was defined.
* src/nano.c (usage): When asking for --help in restricted mode, don't
show options that don't have any effect.
+ * src/nano.c (do_toggle): Make the four toggles that don't have any
+ effect in restricted mode say that they're disabled.
2015-07-28 Benno Schulenberg <bensberg@justemail.net>
* src/text.c (do_formatter), src/nano.c (allow_pending_sigwinch):
diff --git a/src/nano.c b/src/nano.c
@@ -1426,6 +1426,12 @@ void do_toggle(int flag)
{
bool enabled;
+ if (ISSET(RESTRICTED) && (flag == SUSPEND || flag == MULTIBUFFER ||
+ flag == BACKUP_FILE || flag == NO_COLOR_SYNTAX)) {
+ nano_disabled_msg();
+ return;
+ }
+
TOGGLE(flag);
switch (flag) {