Mercurial > vim

comparison src/edit.c @ 15146:7903dce131d4 v8.1.0583

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
patch 8.1.0583: using illogical name for get_dict_number()/get_dict_string() commit https://github.com/vim/vim/commit/8f66717a1f835b8194139d158c1e2df8b30c3ef3 Author: Bram Moolenaar <Bram@vim.org> Date: Fri Dec 14 15:38:31 2018 +0100 patch 8.1.0583: using illogical name for get_dict_number()/get_dict_string() Problem: Using illogical name for get_dict_number()/get_dict_string(). Solution: Rename to start with dict_.
author Bram Moolenaar <Bram@vim.org>
date Fri, 14 Dec 2018 15:45:06 +0100
parents 9df130fd5e0d
children de63593896b3
comparison
equal deleted inserted replaced
15145:14de49f92ace 15146:7903dce131d4
4341 int aempty = FALSE; 4341 int aempty = FALSE;
4342 char_u *(cptext[CPT_COUNT]); 4342 char_u *(cptext[CPT_COUNT]);
4343 4343
4344 if (tv->v_type == VAR_DICT && tv->vval.v_dict != NULL) 4344 if (tv->v_type == VAR_DICT && tv->vval.v_dict != NULL)
4345 { 4345 {
4346 word = get_dict_string(tv->vval.v_dict, (char_u *)"word", FALSE); 4346 word = dict_get_string(tv->vval.v_dict, (char_u *)"word", FALSE);
4347 cptext[CPT_ABBR] = get_dict_string(tv->vval.v_dict, 4347 cptext[CPT_ABBR] = dict_get_string(tv->vval.v_dict,
4348 (char_u *)"abbr", FALSE); 4348 (char_u *)"abbr", FALSE);
4349 cptext[CPT_MENU] = get_dict_string(tv->vval.v_dict, 4349 cptext[CPT_MENU] = dict_get_string(tv->vval.v_dict,
4350 (char_u *)"menu", FALSE); 4350 (char_u *)"menu", FALSE);
4351 cptext[CPT_KIND] = get_dict_string(tv->vval.v_dict, 4351 cptext[CPT_KIND] = dict_get_string(tv->vval.v_dict,
4352 (char_u *)"kind", FALSE); 4352 (char_u *)"kind", FALSE);
4353 cptext[CPT_INFO] = get_dict_string(tv->vval.v_dict, 4353 cptext[CPT_INFO] = dict_get_string(tv->vval.v_dict,
4354 (char_u *)"info", FALSE); 4354 (char_u *)"info", FALSE);
4355 cptext[CPT_USER_DATA] = get_dict_string(tv->vval.v_dict, 4355 cptext[CPT_USER_DATA] = dict_get_string(tv->vval.v_dict,
4356 (char_u *)"user_data", FALSE); 4356 (char_u *)"user_data", FALSE);
4357 if (get_dict_string(tv->vval.v_dict, (char_u *)"icase", FALSE) != NULL) 4357 if (dict_get_string(tv->vval.v_dict, (char_u *)"icase", FALSE) != NULL)
4358 icase = get_dict_number(tv->vval.v_dict, (char_u *)"icase"); 4358 icase = dict_get_number(tv->vval.v_dict, (char_u *)"icase");
4359 if (get_dict_string(tv->vval.v_dict, (char_u *)"dup", FALSE) != NULL) 4359 if (dict_get_string(tv->vval.v_dict, (char_u *)"dup", FALSE) != NULL)
4360 adup = get_dict_number(tv->vval.v_dict, (char_u *)"dup"); 4360 adup = dict_get_number(tv->vval.v_dict, (char_u *)"dup");
4361 if (get_dict_string(tv->vval.v_dict, (char_u *)"empty", FALSE) != NULL) 4361 if (dict_get_string(tv->vval.v_dict, (char_u *)"empty", FALSE) != NULL)
4362 aempty = get_dict_number(tv->vval.v_dict, (char_u *)"empty"); 4362 aempty = dict_get_number(tv->vval.v_dict, (char_u *)"empty");
4363 } 4363 }
4364 else 4364 else
4365 { 4365 {
4366 word = get_tv_string_chk(tv); 4366 word = get_tv_string_chk(tv);
4367 vim_memset(cptext, 0, sizeof(cptext)); 4367 vim_memset(cptext, 0, sizeof(cptext));