mirrors/neovim
1
0
Fork 0
mirror of https://github.com/neovim/neovim.git synced 2025-09-14 23:38:17 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge #10869 'vim-patch:8.1.{0309,0362,0365,0515,1946}'

Browse Source
This commit is contained in:
Justin M. Keyes
2019-09-05 14:10:32 -07:00
parent 096212d52c d3f1eb3024
commit 8b06231612
31 changed files with 770 additions and 280 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/nvim/buffer.c
View File

@@ -5064,7 +5064,6 @@ chk_modeline(
int retval = OK;
char_u *save_sourcing_name;
linenr_T save_sourcing_lnum;
scid_T save_SID;
prev = -1;
for (s = ml_get(lnum); *s != NUL; s++) {
@@ -5152,15 +5151,17 @@ chk_modeline(
if (*s != NUL) { // skip over an empty "::"
const int secure_save = secure;
save_SID = current_SID;
current_SID = SID_MODELINE;
const sctx_T save_current_sctx = current_sctx;
current_sctx.sc_sid = SID_MODELINE;
current_sctx.sc_seq = 0;
current_sctx.sc_lnum = 0;
// Make sure no risky things are executed as a side effect.
secure = 1;
retval = do_set(s, OPT_MODELINE | OPT_LOCAL | flags);
secure = secure_save;
current_SID = save_SID;
current_sctx = save_current_sctx;
if (retval == FAIL) { // stop if error found
break;
}