diff options
| author | zeertzjq <zeertzjq@outlook.com> | 2021-10-03 12:01:27 +0100 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2021-10-03 12:01:27 +0100 |
| commit | 27fef59dd1dd75f50c366f7f616ffa4451560452 (patch) | |
| tree | 4305ae44ba2687a9c20e3f69b5f56a5c0afab219 | |
| parent | 8b8c0ed657fabd88e610401ca8a12366f987db94 (diff) | |
patch 8.2.3465: cannot detect insert scroll modev8.2.3465
Problem: Cannot detect insert scroll mode.
Solution: Add "scroll" to complete_info(). (closes #8943)
| -rw-r--r-- | runtime/doc/eval.txt | 2 | ||||
| -rw-r--r-- | src/insexpand.c | 5 | ||||
| -rw-r--r-- | src/testdir/test_popup.vim | 4 | ||||
| -rw-r--r-- | src/version.c | 2 |
4 files changed, 11 insertions, 2 deletions
diff --git a/runtime/doc/eval.txt b/runtime/doc/eval.txt index 43aae40d4c..588f511553 100644 --- a/runtime/doc/eval.txt +++ b/runtime/doc/eval.txt @@ -3883,6 +3883,8 @@ complete_info([{what}]) *complete_info()* "" Not in completion mode "keyword" Keyword completion |i_CTRL-X_CTRL-N| "ctrl_x" Just pressed CTRL-X |i_CTRL-X| + "scroll" Scrolling with |i_CTRL-X_CTRL-E| or + |i_CTRL-X_CTRL-Y| "whole_line" Whole lines |i_CTRL-X_CTRL-L| "files" File names |i_CTRL-X_CTRL-F| "tags" Tags |i_CTRL-X_CTRL-]| diff --git a/src/insexpand.c b/src/insexpand.c index 0e363f7375..ee8263c8b8 100644 --- a/src/insexpand.c +++ b/src/insexpand.c @@ -68,7 +68,7 @@ static char *ctrl_x_msgs[] = static char *ctrl_x_mode_names[] = { "keyword", "ctrl_x", - "unknown", // CTRL_X_SCROLL + "scroll", "whole_line", "files", "tags", @@ -2539,7 +2539,8 @@ f_complete_check(typval_T *argvars UNUSED, typval_T *rettv) static char_u * ins_compl_mode(void) { - if (ctrl_x_mode == CTRL_X_NOT_DEFINED_YET || compl_started) + if (ctrl_x_mode == CTRL_X_NOT_DEFINED_YET || ctrl_x_mode == CTRL_X_SCROLL + || compl_started) return (char_u *)ctrl_x_mode_names[ctrl_x_mode & ~CTRL_X_WANT_IDENT]; return (char_u *)""; diff --git a/src/testdir/test_popup.vim b/src/testdir/test_popup.vim index 1d0a77c17c..0799df5480 100644 --- a/src/testdir/test_popup.vim +++ b/src/testdir/test_popup.vim @@ -990,6 +990,10 @@ func Test_popup_complete_info_01() \ ["\<C-X>", 'ctrl_x'], \ ["\<C-X>\<C-N>", 'keyword'], \ ["\<C-X>\<C-P>", 'keyword'], + \ ["\<C-X>\<C-E>", 'scroll'], + \ ["\<C-X>\<C-Y>", 'scroll'], + \ ["\<C-X>\<C-E>\<C-E>\<C-Y>", 'scroll'], + \ ["\<C-X>\<C-Y>\<C-E>\<C-Y>", 'scroll'], \ ["\<C-X>\<C-L>", 'whole_line'], \ ["\<C-X>\<C-F>", 'files'], \ ["\<C-X>\<C-]>", 'tags'], diff --git a/src/version.c b/src/version.c index 4e4f4fd158..79f88eb721 100644 --- a/src/version.c +++ b/src/version.c @@ -758,6 +758,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 3465, +/**/ 3464, /**/ 3463, |