Mercurial > vim

diff src/option.c @ 20269:246101db63a4 v8.2.0690

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
patch 8.2.0690: line number of option set by modeline is wrong Commit: https://github.com/vim/vim/commit/5125874951669944a5f6a4163d6e5d437ae6321e Author: Bram Moolenaar <Bram@vim.org> Date: Sun May 3 17:19:33 2020 +0200 patch 8.2.0690: line number of option set by modeline is wrong Problem: Line number of option set by modeline is wrong. Solution: Do not double the line number. (Ozaki Kiichi, closes https://github.com/vim/vim/issues/6035)
author Bram Moolenaar <Bram@vim.org>
date Sun, 03 May 2020 17:30:03 +0200
parents 918245588b50
children c2570baa2e4c
line wrap: on
line diff
--- a/src/option.c
+++ b/src/option.c
@@ -2460,7 +2460,9 @@ set_option_sctx_idx(int opt_idx, int opt
     int		indir = (int)options[opt_idx].indir;
     sctx_T	new_script_ctx = script_ctx;
 
-    new_script_ctx.sc_lnum += SOURCING_LNUM;
+    // Modeline already has the line number set.
+    if (!(opt_flags & OPT_MODELINE))
+	new_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.