Mercurial > vim

comparison src/terminal.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 f3b4cd98944c
children aa877e0b7f62
comparison
equal deleted inserted replaced
15145:14de49f92ace 15146:7903dce131d4
3521 && opt_item->li_tv.vval.v_dict != NULL) 3521 && opt_item->li_tv.vval.v_dict != NULL)
3522 { 3522 {
3523 dict_T *dict = opt_item->li_tv.vval.v_dict; 3523 dict_T *dict = opt_item->li_tv.vval.v_dict;
3524 char_u *p; 3524 char_u *p;
3525 3525
3526 p = get_dict_string(dict, (char_u *)"ff", FALSE); 3526 p = dict_get_string(dict, (char_u *)"ff", FALSE);
3527 if (p == NULL) 3527 if (p == NULL)
3528 p = get_dict_string(dict, (char_u *)"fileformat", FALSE); 3528 p = dict_get_string(dict, (char_u *)"fileformat", FALSE);
3529 if (p != NULL) 3529 if (p != NULL)
3530 { 3530 {
3531 if (check_ff_value(p) == FAIL) 3531 if (check_ff_value(p) == FAIL)
3532 ch_log(NULL, "Invalid ff argument to drop: %s", p); 3532 ch_log(NULL, "Invalid ff argument to drop: %s", p);
3533 else 3533 else
3534 ea.force_ff = *p; 3534 ea.force_ff = *p;
3535 } 3535 }
3536 p = get_dict_string(dict, (char_u *)"enc", FALSE); 3536 p = dict_get_string(dict, (char_u *)"enc", FALSE);
3537 if (p == NULL) 3537 if (p == NULL)
3538 p = get_dict_string(dict, (char_u *)"encoding", FALSE); 3538 p = dict_get_string(dict, (char_u *)"encoding", FALSE);
3539 if (p != NULL) 3539 if (p != NULL)
3540 { 3540 {
3541 ea.cmd = alloc((int)STRLEN(p) + 12); 3541 ea.cmd = alloc((int)STRLEN(p) + 12);
3542 if (ea.cmd != NULL) 3542 if (ea.cmd != NULL)
3543 { 3543 {
3545 ea.force_enc = 11; 3545 ea.force_enc = 11;
3546 tofree = ea.cmd; 3546 tofree = ea.cmd;
3547 } 3547 }
3548 } 3548 }
3549 3549
3550 p = get_dict_string(dict, (char_u *)"bad", FALSE); 3550 p = dict_get_string(dict, (char_u *)"bad", FALSE);
3551 if (p != NULL) 3551 if (p != NULL)
3552 get_bad_opt(p, &ea); 3552 get_bad_opt(p, &ea);
3553 3553
3554 if (dict_find(dict, (char_u *)"bin", -1) != NULL) 3554 if (dict_find(dict, (char_u *)"bin", -1) != NULL)
3555 ea.force_bin = FORCE_BIN; 3555 ea.force_bin = FORCE_BIN;
3913 return; 3913 return;
3914 } 3914 }
3915 d = argvars[2].vval.v_dict; 3915 d = argvars[2].vval.v_dict;
3916 if (d != NULL) 3916 if (d != NULL)
3917 { 3917 {
3918 max_height = get_dict_number(d, (char_u *)"rows"); 3918 max_height = dict_get_number(d, (char_u *)"rows");
3919 max_width = get_dict_number(d, (char_u *)"columns"); 3919 max_width = dict_get_number(d, (char_u *)"columns");
3920 } 3920 }
3921 } 3921 }
3922 3922
3923 fname = get_tv_string_chk(&argvars[1]); 3923 fname = get_tv_string_chk(&argvars[1]);
3924 if (fname == NULL) 3924 if (fname == NULL)