aboutsummaryrefslogtreecommitdiff
path: root/src/nvim/ex_cmds.c
diff options
context:
space:
mode:
authorJustin M. Keyes <justinkz@gmail.com>2015-03-05 19:03:37 -0500
committerJustin M. Keyes <justinkz@gmail.com>2015-03-05 19:03:37 -0500
commita06186de41d4051c0fffbb936ae91238ee6c4169 (patch)
treeb0bb27feca64e5c1bff821225c642c42bd94122a /src/nvim/ex_cmds.c
parent0dd1ad0760ecdbfeef94da4ef33d71e66eab35b3 (diff)
parent117bf11e19bc0b23fb8baf79acc44ece9fcc8f2b (diff)
downloadrneovim-a06186de41d4051c0fffbb936ae91238ee6c4169.tar.gz
rneovim-a06186de41d4051c0fffbb936ae91238ee6c4169.tar.bz2
rneovim-a06186de41d4051c0fffbb936ae91238ee6c4169.zip
Merge #2011 'Macro cleanup'
Diffstat (limited to 'src/nvim/ex_cmds.c')
-rw-r--r--src/nvim/ex_cmds.c12
1 files changed, 3 insertions, 9 deletions
diff --git a/src/nvim/ex_cmds.c b/src/nvim/ex_cmds.c
index 3dde055c2a..afa397976b 100644
--- a/src/nvim/ex_cmds.c
+++ b/src/nvim/ex_cmds.c
@@ -3396,16 +3396,13 @@ int check_secure(void)
EMSG(_(e_curdir));
return TRUE;
}
-#ifdef HAVE_SANDBOX
- /*
- * In the sandbox more things are not allowed, including the things
- * disallowed in secure mode.
- */
+
+ // In the sandbox more things are not allowed, including the things
+ // disallowed in secure mode.
if (sandbox != 0) {
EMSG(_(e_sandbox));
return TRUE;
}
-#endif
return FALSE;
}
@@ -3952,9 +3949,6 @@ void do_sub(exarg_T *eap)
ui_cursor_goto(msg_row, msg_col);
RedrawingDisabled = temp;
-#ifdef USE_ON_FLY_SCROLL
- dont_scroll = FALSE; /* allow scrolling here */
-#endif
++no_mapping; /* don't map this key */
++allow_keys; /* allow special keys */
typed = plain_vgetc();