diff options
| author | Jan Edmund Lazo <jan.lazo@mail.utoronto.ca> | 2021-09-17 09:39:36 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-09-17 09:39:36 -0400 |
| commit | 1ec3d37192194d6961621f17fc5a185356586339 (patch) | |
| tree | f8d5b2a694bcccbce4aae1284abea9ec86eb7c90 /src/nvim/buffer.c | |
| parent | 5f144efefa66c9694123b679bab52992279a6015 (diff) | |
| parent | f46341fa43075443241fe641905656c74a9523ee (diff) | |
| download | rneovim-1ec3d37192194d6961621f17fc5a185356586339.tar.gz rneovim-1ec3d37192194d6961621f17fc5a185356586339.tar.bz2 rneovim-1ec3d37192194d6961621f17fc5a185356586339.zip | |
Merge pull request #15580 from seandewar/vim-8.2.3378
vim-patch:8.2.{3378,3379,3384,3386,3398,3400}
Diffstat (limited to 'src/nvim/buffer.c')
| -rw-r--r-- | src/nvim/buffer.c | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/src/nvim/buffer.c b/src/nvim/buffer.c index 81f8b9073e..55db72aa16 100644 --- a/src/nvim/buffer.c +++ b/src/nvim/buffer.c @@ -5261,15 +5261,16 @@ void do_modelines(int flags) } entered++; - for (lnum = 1; lnum <= curbuf->b_ml.ml_line_count && lnum <= nmlines; - lnum++) { + for (lnum = 1; curbuf->b_p_ml && lnum <= curbuf->b_ml.ml_line_count + && lnum <= nmlines; lnum++) { if (chk_modeline(lnum, flags) == FAIL) { nmlines = 0; } } - for (lnum = curbuf->b_ml.ml_line_count; lnum > 0 && lnum > nmlines - && lnum > curbuf->b_ml.ml_line_count - nmlines; lnum--) { + for (lnum = curbuf->b_ml.ml_line_count; curbuf->b_p_ml && lnum > 0 + && lnum > nmlines && lnum > curbuf->b_ml.ml_line_count - nmlines; + lnum--) { if (chk_modeline(lnum, flags) == FAIL) { nmlines = 0; } |