diff options
author | Bram Moolenaar <Bram@vim.org> | 2019-08-04 17:59:49 +0200 |
---|---|---|
committer | Bram Moolenaar <Bram@vim.org> | 2019-08-04 17:59:49 +0200 |
commit | b8350abef0abbdca99bf08e821a8ba0ade37abed (patch) | |
tree | b0ffdec14e604a51b513f967c66b426981cce34a | |
parent | a74e4946de074d2916e3d6004f7fa1810d12dda9 (diff) |
patch 8.1.1810: popup_getoptions() is missing an entry for "mapping"v8.1.1810
Problem: Popup_getoptions() is missing an entry for "mapping".
Solution: Add the entry.
-rw-r--r-- | src/popupwin.c | 1 | ||||
-rw-r--r-- | src/testdir/test_popupwin.vim | 1 | ||||
-rw-r--r-- | src/version.c | 2 |
3 files changed, 4 insertions, 0 deletions
diff --git a/src/popupwin.c b/src/popupwin.c index f2297f52e2..ca75181426 100644 --- a/src/popupwin.c +++ b/src/popupwin.c @@ -2319,6 +2319,7 @@ f_popup_getoptions(typval_T *argvars, typval_T *rettv) dict_add_string(dict, "title", wp->w_popup_title); dict_add_number(dict, "wrap", wp->w_p_wrap); dict_add_number(dict, "drag", (wp->w_popup_flags & POPF_DRAG) != 0); + dict_add_number(dict, "mapping", (wp->w_popup_flags & POPF_MAPPING) != 0); dict_add_number(dict, "resize", (wp->w_popup_flags & POPF_RESIZE) != 0); dict_add_number(dict, "cursorline", (wp->w_popup_flags & POPF_CURSORLINE) != 0); diff --git a/src/testdir/test_popupwin.vim b/src/testdir/test_popupwin.vim index e5d16314bc..5a841e30ae 100644 --- a/src/testdir/test_popupwin.vim +++ b/src/testdir/test_popupwin.vim @@ -946,6 +946,7 @@ func Test_popup_getoptions() call assert_equal(21, res.maxheight) call assert_equal(100, res.zindex) call assert_equal(1, res.fixed) + call assert_equal(1, res.mapping) if has('timers') call assert_equal(5000, res.time) endif diff --git a/src/version.c b/src/version.c index 83c11abc68..690448299a 100644 --- a/src/version.c +++ b/src/version.c @@ -774,6 +774,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 1810, +/**/ 1809, /**/ 1808, |