diff options
| author | James McCoy <jamessan@jamessan.com> | 2016-11-15 21:50:12 -0500 |
|---|---|---|
| committer | James McCoy <jamessan@jamessan.com> | 2016-11-15 22:00:25 -0500 |
| commit | 49f73e527532729cacc5c2d3a1b167734fd14d93 (patch) | |
| tree | 12069174e60afb26c8f11b6db5dc851027c3cb29 /src | |
| parent | defa86b08ae93604ab9ce751842ceb11d48345e5 (diff) | |
| download | rneovim-49f73e527532729cacc5c2d3a1b167734fd14d93.tar.gz rneovim-49f73e527532729cacc5c2d3a1b167734fd14d93.tar.bz2 rneovim-49f73e527532729cacc5c2d3a1b167734fd14d93.zip | |
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
Diffstat (limited to 'src')
| -rw-r--r-- | src/nvim/eval.c | 3 | ||||
| -rw-r--r-- | src/nvim/eval.h | 1 | ||||
| -rw-r--r-- | src/nvim/version.c | 2 |
3 files changed, 5 insertions, 1 deletions
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 |