aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/nvim/buffer.c2
-rw-r--r--src/nvim/option.c5
2 files changed, 3 insertions, 4 deletions
diff --git a/src/nvim/buffer.c b/src/nvim/buffer.c
index d12ba14911..cdb226b94d 100644
--- a/src/nvim/buffer.c
+++ b/src/nvim/buffer.c
@@ -5116,7 +5116,7 @@ chk_modeline(
save_SID = current_SID;
current_SID = SID_MODELINE;
// Make sure no risky things are executed as a side effect.
- secure++;
+ secure = 1;
retval = do_set(s, OPT_MODELINE | OPT_LOCAL | flags);
diff --git a/src/nvim/option.c b/src/nvim/option.c
index b93f98f6c5..743f6c8311 100644
--- a/src/nvim/option.c
+++ b/src/nvim/option.c
@@ -1840,11 +1840,10 @@ int do_set(
// effects in secure mode. Also when the value was
// set with the P_INSECURE flag and is not
// completely replaced.
- if (secure
+ if ((opt_flags & OPT_MODELINE)
|| sandbox != 0
- || (opt_flags & OPT_MODELINE)
|| (!value_is_replaced && (*p & P_INSECURE))) {
- secure++;
+ secure = 1;
}
// Handle side effects, and set the global value