Mercurial > vim
changeset 8935:219d80fee92f v7.4.1753
commit https://github.com/vim/vim/commit/c020042083b9c0a4e932b562c3bef97c76328e18
Author: Bram Moolenaar <Bram@vim.org>
Date: Wed Apr 20 12:02:02 2016 +0200
patch 7.4.1753
Problem: "noinsert" in 'completeopt' is sometimes ignored.
Solution: Set the variables when the 'completeopt' was set. (Ozaki Kiichi)
| author | Christian Brabandt <cb@256bit.org> |
|---|---|
| date | Wed, 20 Apr 2016 12:15:05 +0200 |
| parents | 42c8599421e5 |
| children | bc20d67a4479 |
| files | src/edit.c src/option.c src/proto/edit.pro src/version.c |
| diffstat | 4 files changed, 20 insertions(+), 7 deletions(-) [+] |
line wrap: on
line diff
--- a/src/edit.c +++ b/src/edit.c @@ -2761,6 +2761,21 @@ ins_compl_make_cyclic(void) } /* + * Set variables that store noselect and noinsert behavior from the + * 'completeopt' value. + */ + void +completeopt_was_set() +{ + compl_no_insert = FALSE; + compl_no_select = FALSE; + if (strstr((char *)p_cot, "noselect") != NULL) + compl_no_select = TRUE; + if (strstr((char *)p_cot, "noinsert") != NULL) + compl_no_insert = TRUE; +} + +/* * Start completion for the complete() function. * "startcol" is where the matched text starts (1 is first column). * "list" is the list of matches. @@ -3675,13 +3690,6 @@ ins_compl_prep(int c) } - compl_no_insert = FALSE; - compl_no_select = FALSE; - if (strstr((char *)p_cot, "noselect") != NULL) - compl_no_select = TRUE; - if (strstr((char *)p_cot, "noinsert") != NULL) - compl_no_insert = TRUE; - if (ctrl_x_mode == CTRL_X_NOT_DEFINED_YET) { /*
--- a/src/option.c +++ b/src/option.c @@ -6951,6 +6951,8 @@ did_set_string_option( { if (check_opt_strings(p_cot, p_cot_values, TRUE) != OK) errmsg = e_invarg; + else + completeopt_was_set(); } #endif /* FEAT_INS_EXPAND */
--- a/src/proto/edit.pro +++ b/src/proto/edit.pro @@ -8,6 +8,7 @@ void truncate_spaces(char_u *line); void backspace_until_column(int col); int vim_is_ctrl_x_key(int c); int ins_compl_add_infercase(char_u *str, int len, int icase, char_u *fname, int dir, int flags); +void completeopt_was_set(void); void set_completion(colnr_T startcol, list_T *list); void ins_compl_show_pum(void); char_u *find_word_start(char_u *ptr);