From 644fa6537cfda6281f6ac6c837b9a08fa35fb516 Mon Sep 17 00:00:00 2001
From: KunMing Xie <qqzz014@gmail.com>
Date: Mon, 7 Aug 2017 05:04:50 +0800
Subject: vim-patch:8.0.0143 (#7120)

Problem:    Line number of current buffer in getbufinfo() is wrong.
Solution:   For the current buffer use the current line number. (Ken Takata)

https://github.com/vim/vim/commit/f845b87f2b3a45cbee160e28d7a3f50e54054809
---
 src/nvim/eval.c    | 3 ++-
 src/nvim/version.c | 2 +-
 2 files changed, 3 insertions(+), 2 deletions(-)

(limited to 'src')

diff --git a/src/nvim/eval.c b/src/nvim/eval.c
index 78c8dd02db..ef3a8cada1 100644
--- a/src/nvim/eval.c
+++ b/src/nvim/eval.c
@@ -9079,7 +9079,8 @@ static dict_T *get_buffer_info(buf_T *buf)
   tv_dict_add_nr(dict, S_LEN("bufnr"), buf->b_fnum);
   tv_dict_add_str(dict, S_LEN("name"),
                   buf->b_ffname != NULL ? (const char *)buf->b_ffname : "");
-  tv_dict_add_nr(dict, S_LEN("lnum"), buflist_findlnum(buf));
+  tv_dict_add_nr(dict, S_LEN("lnum"),
+                 buf == curbuf ? curwin->w_cursor.lnum : buflist_findlnum(buf));
   tv_dict_add_nr(dict, S_LEN("loaded"), buf->b_ml.ml_mfp != NULL);
   tv_dict_add_nr(dict, S_LEN("listed"), buf->b_p_bl);
   tv_dict_add_nr(dict, S_LEN("changed"), bufIsChanged(buf));
diff --git a/src/nvim/version.c b/src/nvim/version.c
index fd2f1fd212..aa7c613f3a 100644
--- a/src/nvim/version.c
+++ b/src/nvim/version.c
@@ -809,7 +809,7 @@ static const int included_patches[] = {
   146,
   // 145 NA
   // 144 NA
-  // 143,
+  143,
   // 142,
   // 141,
   // 140,
-- 
cgit