diff options
| author | Björn Linse <bjorn.linse@gmail.com> | 2016-08-25 19:16:03 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-08-25 19:16:03 +0200 |
| commit | 41a64586c7d16bd8bdec533717daeea3fa2f3107 (patch) | |
| tree | 4d8d844d79ae5da1efa8f8ca965fd9e80d76c764 /src/nvim/edit.c | |
| parent | 4d253b4df5cb19715007d1a2078841862704a057 (diff) | |
| parent | 6d8a509e510e257c98ae67ec702f51e0b5197f89 (diff) | |
| download | rneovim-41a64586c7d16bd8bdec533717daeea3fa2f3107.tar.gz rneovim-41a64586c7d16bd8bdec533717daeea3fa2f3107.tar.bz2 rneovim-41a64586c7d16bd8bdec533717daeea3fa2f3107.zip | |
Merge pull request #5232 from bfredl/dictchar_u
eval: remove char_u in get_dict_(string|number) key parameters
Diffstat (limited to 'src/nvim/edit.c')
| -rw-r--r-- | src/nvim/edit.c | 24 |
1 files changed, 9 insertions, 15 deletions
diff --git a/src/nvim/edit.c b/src/nvim/edit.c index 98ec9ae280..a71104cfb6 100644 --- a/src/nvim/edit.c +++ b/src/nvim/edit.c @@ -3530,21 +3530,15 @@ int ins_compl_add_tv(typval_T *tv, int dir) char_u *(cptext[CPT_COUNT]); if (tv->v_type == VAR_DICT && tv->vval.v_dict != NULL) { - word = get_dict_string(tv->vval.v_dict, (char_u *)"word", FALSE); - cptext[CPT_ABBR] = get_dict_string(tv->vval.v_dict, - (char_u *)"abbr", FALSE); - cptext[CPT_MENU] = get_dict_string(tv->vval.v_dict, - (char_u *)"menu", FALSE); - cptext[CPT_KIND] = get_dict_string(tv->vval.v_dict, - (char_u *)"kind", FALSE); - cptext[CPT_INFO] = get_dict_string(tv->vval.v_dict, - (char_u *)"info", FALSE); - if (get_dict_string(tv->vval.v_dict, (char_u *)"icase", FALSE) != NULL) - icase = get_dict_number(tv->vval.v_dict, (char_u *)"icase"); - if (get_dict_string(tv->vval.v_dict, (char_u *)"dup", FALSE) != NULL) - adup = get_dict_number(tv->vval.v_dict, (char_u *)"dup"); - if (get_dict_string(tv->vval.v_dict, (char_u *)"empty", FALSE) != NULL) - aempty = get_dict_number(tv->vval.v_dict, (char_u *)"empty"); + word = get_dict_string(tv->vval.v_dict, "word", false); + cptext[CPT_ABBR] = get_dict_string(tv->vval.v_dict, "abbr", false); + cptext[CPT_MENU] = get_dict_string(tv->vval.v_dict, "menu", false); + cptext[CPT_KIND] = get_dict_string(tv->vval.v_dict, "kind", false); + cptext[CPT_INFO] = get_dict_string(tv->vval.v_dict, "info", false); + + icase = get_dict_number(tv->vval.v_dict, "icase"); + adup = get_dict_number(tv->vval.v_dict, "dup"); + aempty = get_dict_number(tv->vval.v_dict, "empty"); } else { word = get_tv_string_chk(tv); memset(cptext, 0, sizeof(cptext)); |