From defa86b08ae93604ab9ce751842ceb11d48345e5 Mon Sep 17 00:00:00 2001
From: James McCoy <jamessan@jamessan.com>
Date: Tue, 15 Nov 2016 21:43:38 -0500
Subject: vim-patch:7.4.1892

Problem:    balloon eval only gets the window number, not the ID.
Solution:   Add v:beval_winid.

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

(limited to 'src')

diff --git a/src/nvim/eval.c b/src/nvim/eval.c
index 39df4cd024..dfc604cb5f 100644
--- a/src/nvim/eval.c
+++ b/src/nvim/eval.c
@@ -354,6 +354,7 @@ static struct vimvar {
   VV(VV_FCS_CHOICE,     "fcs_choice",       VAR_STRING, 0),
   VV(VV_BEVAL_BUFNR,    "beval_bufnr",      VAR_NUMBER, VV_RO),
   VV(VV_BEVAL_WINNR,    "beval_winnr",      VAR_NUMBER, VV_RO),
+  VV(VV_BEVAL_WINID,    "beval_winid",      VAR_NUMBER, VV_RO),
   VV(VV_BEVAL_LNUM,     "beval_lnum",       VAR_NUMBER, VV_RO),
   VV(VV_BEVAL_COL,      "beval_col",        VAR_NUMBER, VV_RO),
   VV(VV_BEVAL_TEXT,     "beval_text",       VAR_STRING, VV_RO),
diff --git a/src/nvim/eval.h b/src/nvim/eval.h
index 1ab908deb5..422520a2ad 100644
--- a/src/nvim/eval.h
+++ b/src/nvim/eval.h
@@ -94,6 +94,7 @@ typedef enum {
     VV_FCS_CHOICE,
     VV_BEVAL_BUFNR,
     VV_BEVAL_WINNR,
+    VV_BEVAL_WINID,
     VV_BEVAL_LNUM,
     VV_BEVAL_COL,
     VV_BEVAL_TEXT,
diff --git a/src/nvim/version.c b/src/nvim/version.c
index 08eff53d1e..80beed3245 100644
--- a/src/nvim/version.c
+++ b/src/nvim/version.c
@@ -550,7 +550,7 @@ static int included_patches[] = {
   1895,
   // 1894 NA
   1893,
-  // 1892 NA
+  1892,
   // 1891 NA
   // 1890 NA
   // 1889,
-- 
cgit 


From 49f73e527532729cacc5c2d3a1b167734fd14d93 Mon Sep 17 00:00:00 2001
From: James McCoy <jamessan@jamessan.com>
Date: Tue, 15 Nov 2016 21:50:12 -0500
Subject: vim-patch:7.4.1894

Problem:    Cannot get the window ID for a mouse click.
Solution:   Add v:mouse_winid.

https://github.com/vim/vim/commit/511972d810ea490955161ff5097ec2f57919ceaf
---
 src/nvim/eval.c    | 3 +++
 src/nvim/eval.h    | 1 +
 src/nvim/version.c | 2 +-
 3 files changed, 5 insertions(+), 1 deletion(-)

(limited to 'src')

diff --git a/src/nvim/eval.c b/src/nvim/eval.c
index dfc604cb5f..9d0d3f24b6 100644
--- a/src/nvim/eval.c
+++ b/src/nvim/eval.c
@@ -364,6 +364,7 @@ static struct vimvar {
   VV(VV_SWAPCOMMAND,    "swapcommand",      VAR_STRING, VV_RO),
   VV(VV_CHAR,           "char",             VAR_STRING, 0),
   VV(VV_MOUSE_WIN,      "mouse_win",        VAR_NUMBER, 0),
+  VV(VV_MOUSE_WINID,    "mouse_winid",      VAR_NUMBER, 0),
   VV(VV_MOUSE_LNUM,     "mouse_lnum",       VAR_NUMBER, 0),
   VV(VV_MOUSE_COL,      "mouse_col",        VAR_NUMBER, 0),
   VV(VV_OP,             "operator",         VAR_STRING, VV_RO),
@@ -9567,6 +9568,7 @@ static void f_getchar(typval_T *argvars, typval_T *rettv, FunPtr fptr)
   --allow_keys;
 
   vimvars[VV_MOUSE_WIN].vv_nr = 0;
+  vimvars[VV_MOUSE_WINID].vv_nr = 0;
   vimvars[VV_MOUSE_LNUM].vv_nr = 0;
   vimvars[VV_MOUSE_COL].vv_nr = 0;
 
@@ -9609,6 +9611,7 @@ static void f_getchar(typval_T *argvars, typval_T *rettv, FunPtr fptr)
         for (wp = firstwin; wp != win; wp = wp->w_next)
           ++winnr;
         vimvars[VV_MOUSE_WIN].vv_nr = winnr;
+        vimvars[VV_MOUSE_WINID].vv_nr = wp->handle;
         vimvars[VV_MOUSE_LNUM].vv_nr = lnum;
         vimvars[VV_MOUSE_COL].vv_nr = col + 1;
       }
diff --git a/src/nvim/eval.h b/src/nvim/eval.h
index 422520a2ad..1061840816 100644
--- a/src/nvim/eval.h
+++ b/src/nvim/eval.h
@@ -104,6 +104,7 @@ typedef enum {
     VV_SWAPCOMMAND,
     VV_CHAR,
     VV_MOUSE_WIN,
+    VV_MOUSE_WINID,
     VV_MOUSE_LNUM,
     VV_MOUSE_COL,
     VV_OP,
diff --git a/src/nvim/version.c b/src/nvim/version.c
index 80beed3245..7721e9dc8c 100644
--- a/src/nvim/version.c
+++ b/src/nvim/version.c
@@ -548,7 +548,7 @@ static int included_patches[] = {
   // 1897,
   1896,
   1895,
-  // 1894 NA
+  1894,
   1893,
   1892,
   // 1891 NA
-- 
cgit