diff options
| author | Bram Moolenaar <Bram@vim.org> | 2021-01-29 21:47:24 +0100 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2021-01-29 21:47:24 +0100 |
| commit | 3eb6bd9c2b36dcce471bfb543c8d5488f1dc17a4 (patch) | |
| tree | 2752a07b909b085c3a23eb3810155254e1e0b546 /src/insexpand.c | |
| parent | 28976e2accf11591c60e8a658a9e03544f0408b2 (diff) | |
patch 8.2.2427: can still switch windows for 'completefunc'v8.2.2427
Problem: Can still switch windows for 'completefunc'.
Solution: Also disallow switching windows for other completions.
Diffstat (limited to 'src/insexpand.c')
| -rw-r--r-- | src/insexpand.c | 21 |
1 files changed, 2 insertions, 19 deletions
diff --git a/src/insexpand.c b/src/insexpand.c index 66507f0436..8d76c686f5 100644 --- a/src/insexpand.c +++ b/src/insexpand.c @@ -121,7 +121,6 @@ struct compl_S static char e_hitend[] = N_("Hit end of paragraph"); # ifdef FEAT_COMPL_FUNC -static char e_complwin[] = N_("E839: Completion function changed window"); static char e_compldel[] = N_("E840: Completion function deleted text"); # endif @@ -2199,8 +2198,6 @@ expand_by_function( typval_T args[3]; char_u *funcname; pos_T pos; - win_T *curwin_save; - buf_T *curbuf_save; typval_T rettv; int save_State = State; @@ -2216,8 +2213,6 @@ expand_by_function( args[2].v_type = VAR_UNKNOWN; pos = curwin->w_cursor; - curwin_save = curwin; - curbuf_save = curbuf; // Lock the text to avoid weird things from happening. Also disallow // switching to another window, it should not be needed and may end up in // Insert mode in another buffer. @@ -2246,11 +2241,6 @@ expand_by_function( } --textwinlock; - if (curwin_save != curwin || curbuf_save != curbuf) - { - emsg(_(e_complwin)); - goto theend; - } curwin->w_cursor = pos; // restore the cursor position validate_cursor(); if (!EQUAL_POS(curwin->w_cursor, pos)) @@ -3843,8 +3833,6 @@ ins_complete(int c, int enable_pum) int col; char_u *funcname; pos_T pos; - win_T *curwin_save; - buf_T *curbuf_save; int save_State = State; // Call 'completefunc' or 'omnifunc' and get pattern length as a @@ -3866,16 +3854,11 @@ ins_complete(int c, int enable_pum) args[1].vval.v_string = (char_u *)""; args[2].v_type = VAR_UNKNOWN; pos = curwin->w_cursor; - curwin_save = curwin; - curbuf_save = curbuf; + ++textwinlock; col = call_func_retnr(funcname, 2, args); + --textwinlock; State = save_State; - if (curwin_save != curwin || curbuf_save != curbuf) - { - emsg(_(e_complwin)); - return FAIL; - } curwin->w_cursor = pos; // restore the cursor position validate_cursor(); if (!EQUAL_POS(curwin->w_cursor, pos)) |