diff options
| author | zeertzjq <zeertzjq@outlook.com> | 2022-09-17 15:39:04 +0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-09-17 15:39:04 +0800 |
| commit | 18139a69bc048aebe592df7a633793bfb9cbea39 (patch) | |
| tree | d1ce807e719cdd78a9772c9c4f2c98002cc8d909 /src/nvim/option.c | |
| parent | 72e1041429565c3a592dedc36e8b3004a24cdcc4 (diff) | |
| download | rneovim-18139a69bc048aebe592df7a633793bfb9cbea39.tar.gz rneovim-18139a69bc048aebe592df7a633793bfb9cbea39.tar.bz2 rneovim-18139a69bc048aebe592df7a633793bfb9cbea39.zip | |
vim-patch:8.2.0690: line number of option set by modeline is wrong (#20228)
Problem: Line number of option set by modeline is wrong.
Solution: Do not double the line number. (Ozaki Kiichi, closes vim/vim#6035)
https://github.com/vim/vim/commit/5125874951669944a5f6a4163d6e5d437ae6321e
Diffstat (limited to 'src/nvim/option.c')
| -rw-r--r-- | src/nvim/option.c | 15 |
1 files changed, 8 insertions, 7 deletions
diff --git a/src/nvim/option.c b/src/nvim/option.c index 8ef06bcba8..a772b85826 100644 --- a/src/nvim/option.c +++ b/src/nvim/option.c @@ -1891,15 +1891,16 @@ void set_option_sctx_idx(int opt_idx, int opt_flags, sctx_T script_ctx) int both = (opt_flags & (OPT_LOCAL | OPT_GLOBAL)) == 0; int indir = (int)options[opt_idx].indir; nlua_set_sctx(&script_ctx); - const LastSet last_set = { - .script_ctx = { - script_ctx.sc_sid, - script_ctx.sc_seq, - script_ctx.sc_lnum + SOURCING_LNUM - }, - current_channel_id + LastSet last_set = { + .script_ctx = script_ctx, + .channel_id = current_channel_id, }; + // Modeline already has the line number set. + if (!(opt_flags & OPT_MODELINE)) { + last_set.script_ctx.sc_lnum += SOURCING_LNUM; + } + // Remember where the option was set. For local options need to do that // in the buffer or window structure. if (both || (opt_flags & OPT_GLOBAL) || (indir & (PV_BUF|PV_WIN)) == 0) { |