From 2926a36d91325650474ec92804d30ff916ca66ab Mon Sep 17 00:00:00 2001
From: erw7 <erw7.github@gmail.com>
Date: Wed, 28 Aug 2019 14:59:37 +0900
Subject: [squash] Fix errors when porting

---
 src/nvim/option.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'src')

diff --git a/src/nvim/option.c b/src/nvim/option.c
index 07d3561990..c7d2dcb602 100644
--- a/src/nvim/option.c
+++ b/src/nvim/option.c
@@ -3798,7 +3798,8 @@ static 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;
   const LastSet last_set = { .script_ctx =
-    { script_ctx.sc_sid, sourcing_lnum }, current_channel_id };
+    { script_ctx.sc_sid, script_ctx.sc_lnum + sourcing_lnum },
+    current_channel_id };
 
   // Remember where the option was set.  For local options need to do that
   // in the buffer or window structure.
-- 
cgit