Patch 7.4.708
Problem: gettext() is called too often.
Solution: Do not call gettext() for messages until they are actually used.
(idea by Yasuhiro Matsumoto)
Files: src/eval.c
*** ../vim-7.4.707/src/eval.c 2015-04-16 22:51:16.681210896 +0200
--- src/eval.c 2015-04-21 16:39:30.342843216 +0200
***************
*** 802,812 ****
static void list_one_var __ARGS((dictitem_T *v, char_u *prefix, int *first));
static void list_one_var_a __ARGS((char_u *prefix, char_u *name, int type,
char_u *string, int *first));
static void set_var __ARGS((char_u *name, typval_T *varp, int copy));
! static int var_check_ro __ARGS((int flags, char_u *name));
! static int var_check_fixed __ARGS((int flags, char_u *name));
static int var_check_func_name __ARGS((char_u *name, int new_var));
static int valid_varname __ARGS((char_u *varname));
! static int tv_check_lock __ARGS((int lock, char_u *name));
static int item_copy __ARGS((typval_T *from, typval_T *to, int deep, int
copyID));
static char_u *find_option_end __ARGS((char_u **arg, int *opt_flags));
static char_u *trans_function_name __ARGS((char_u **pp, int skip, int flags,
funcdict_T *fd));
--- 802,812 ----
static void list_one_var __ARGS((dictitem_T *v, char_u *prefix, int *first));
static void list_one_var_a __ARGS((char_u *prefix, char_u *name, int type,
char_u *string, int *first));
static void set_var __ARGS((char_u *name, typval_T *varp, int copy));
! static int var_check_ro __ARGS((int flags, char_u *name, int use_gettext));
! static int var_check_fixed __ARGS((int flags, char_u *name, int use_gettext));
static int var_check_func_name __ARGS((char_u *name, int new_var));
static int valid_varname __ARGS((char_u *varname));
! static int tv_check_lock __ARGS((int lock, char_u *name, int use_gettext));
static int item_copy __ARGS((typval_T *from, typval_T *to, int deep, int
copyID));
static char_u *find_option_end __ARGS((char_u **arg, int *opt_flags));
static char_u *trans_function_name __ARGS((char_u **pp, int skip, int flags,
funcdict_T *fd));
***************
*** 2808,2814 ****
break;
}
/* existing variable, need to check if it can be changed */
! else if (var_check_ro(lp->ll_di->di_flags, name))
return NULL;
if (len == -1)
--- 2808,2814 ----
break;
}
/* existing variable, need to check if it can be changed */
! else if (var_check_ro(lp->ll_di->di_flags, name, FALSE))
return NULL;
if (len == -1)
***************
*** 2941,2947 ****
}
else if (tv_check_lock(lp->ll_newkey == NULL
? lp->ll_tv->v_lock
! : lp->ll_tv->vval.v_dict->dv_lock, lp->ll_name))
;
else if (lp->ll_range)
{
--- 2941,2947 ----
}
else if (tv_check_lock(lp->ll_newkey == NULL
? lp->ll_tv->v_lock
! : lp->ll_tv->vval.v_dict->dv_lock, lp->ll_name, FALSE))
;
else if (lp->ll_range)
{
***************
*** 2953,2959 ****
*/
for (ri = rettv->vval.v_list->lv_first; ri != NULL && ll_li != NULL; )
{
! if (tv_check_lock(ll_li->li_tv.v_lock, lp->ll_name))
return;
ri = ri->li_next;
if (ri == NULL || (!lp->ll_empty2 && lp->ll_n2 == ll_n1))
--- 2953,2959 ----
*/
for (ri = rettv->vval.v_list->lv_first; ri != NULL && ll_li != NULL; )
{
! if (tv_check_lock(ll_li->li_tv.v_lock, lp->ll_name, FALSE))
return;
ri = ri->li_next;
if (ri == NULL || (!lp->ll_empty2 && lp->ll_n2 == ll_n1))
***************
*** 3659,3667 ****
*name_end = cc;
}
else if ((lp->ll_list != NULL
! && tv_check_lock(lp->ll_list->lv_lock, lp->ll_name))
|| (lp->ll_dict != NULL
! && tv_check_lock(lp->ll_dict->dv_lock, lp->ll_name)))
return FAIL;
else if (lp->ll_range)
{
--- 3659,3667 ----
*name_end = cc;
}
else if ((lp->ll_list != NULL
! && tv_check_lock(lp->ll_list->lv_lock, lp->ll_name, FALSE))
|| (lp->ll_dict != NULL
! && tv_check_lock(lp->ll_dict->dv_lock, lp->ll_name, FALSE)))
return FAIL;
else if (lp->ll_range)
{
***************
*** 3672,3678 ****
while (ll_li != NULL && (lp->ll_empty2 || lp->ll_n2 >= ll_n1))
{
li = ll_li->li_next;
! if (tv_check_lock(ll_li->li_tv.v_lock, lp->ll_name))
return FAIL;
ll_li = li;
++ll_n1;
--- 3672,3678 ----
while (ll_li != NULL && (lp->ll_empty2 || lp->ll_n2 >= ll_n1))
{
li = ll_li->li_next;
! if (tv_check_lock(ll_li->li_tv.v_lock, lp->ll_name, FALSE))
return FAIL;
ll_li = li;
++ll_n1;
***************
*** 3732,3740 ****
if (!HASHITEM_EMPTY(hi))
{
di = HI2DI(hi);
! if (var_check_fixed(di->di_flags, name)
! || var_check_ro(di->di_flags, name)
! || tv_check_lock(d->dv_lock, name))
return FAIL;
delete_var(ht, hi);
return OK;
--- 3732,3740 ----
if (!HASHITEM_EMPTY(hi))
{
di = HI2DI(hi);
! if (var_check_fixed(di->di_flags, name, FALSE)
! || var_check_ro(di->di_flags, name, FALSE)
! || tv_check_lock(d->dv_lock, name, FALSE))
return FAIL;
delete_var(ht, hi);
return OK;
***************
*** 8937,8943 ****
if (argvars[0].v_type == VAR_LIST)
{
if ((l = argvars[0].vval.v_list) != NULL
! && !tv_check_lock(l->lv_lock, (char_u *)_("add() argument"))
&& list_append_tv(l, &argvars[1]) == OK)
copy_tv(&argvars[0], rettv);
}
--- 8937,8944 ----
if (argvars[0].v_type == VAR_LIST)
{
if ((l = argvars[0].vval.v_list) != NULL
! && !tv_check_lock(l->lv_lock,
! (char_u *)N_("add() argument"), TRUE)
&& list_append_tv(l, &argvars[1]) == OK)
copy_tv(&argvars[0], rettv);
}
***************
*** 10499,10505 ****
dictitem_T *di1;
hashitem_T *hi2;
int todo;
! char *arg_errmsg = N_("extend() argument");
todo = (int)d2->dv_hashtab.ht_used;
for (hi2 = d2->dv_hashtab.ht_array; todo > 0; ++hi2)
--- 10500,10506 ----
dictitem_T *di1;
hashitem_T *hi2;
int todo;
! char_u *arg_errmsg = (char_u *)N_("extend() argument");
todo = (int)d2->dv_hashtab.ht_used;
for (hi2 = d2->dv_hashtab.ht_array; todo > 0; ++hi2)
***************
*** 10534,10541 ****
}
else if (*action == 'f' && HI2DI(hi2) != di1)
{
! if (tv_check_lock(di1->di_tv.v_lock, (char_u *)_(arg_errmsg))
! || var_check_ro(di1->di_flags, (char_u *)_(arg_errmsg)))
break;
clear_tv(&di1->di_tv);
copy_tv(&HI2DI(hi2)->di_tv, &di1->di_tv);
--- 10535,10542 ----
}
else if (*action == 'f' && HI2DI(hi2) != di1)
{
! if (tv_check_lock(di1->di_tv.v_lock, arg_errmsg, TRUE)
! || var_check_ro(di1->di_flags, arg_errmsg, TRUE))
break;
clear_tv(&di1->di_tv);
copy_tv(&HI2DI(hi2)->di_tv, &di1->di_tv);
***************
*** 10553,10559 ****
typval_T *argvars;
typval_T *rettv;
{
! char *arg_errmsg = N_("extend() argument");
if (argvars[0].v_type == VAR_LIST && argvars[1].v_type == VAR_LIST)
{
--- 10554,10560 ----
typval_T *argvars;
typval_T *rettv;
{
! char_u *arg_errmsg = (char_u *)N_("extend() argument");
if (argvars[0].v_type == VAR_LIST && argvars[1].v_type == VAR_LIST)
{
***************
*** 10564,10570 ****
l1 = argvars[0].vval.v_list;
l2 = argvars[1].vval.v_list;
! if (l1 != NULL && !tv_check_lock(l1->lv_lock, (char_u *)_(arg_errmsg))
&& l2 != NULL)
{
if (argvars[2].v_type != VAR_UNKNOWN)
--- 10565,10571 ----
l1 = argvars[0].vval.v_list;
l2 = argvars[1].vval.v_list;
! if (l1 != NULL && !tv_check_lock(l1->lv_lock, arg_errmsg, TRUE)
&& l2 != NULL)
{
if (argvars[2].v_type != VAR_UNKNOWN)
***************
*** 10600,10606 ****
d1 = argvars[0].vval.v_dict;
d2 = argvars[1].vval.v_dict;
! if (d1 != NULL && !tv_check_lock(d1->dv_lock, (char_u *)_(arg_errmsg))
&& d2 != NULL)
{
/* Check the third argument. */
--- 10601,10607 ----
d1 = argvars[0].vval.v_dict;
d2 = argvars[1].vval.v_dict;
! if (d1 != NULL && !tv_check_lock(d1->dv_lock, arg_errmsg, TRUE)
&& d2 != NULL)
{
/* Check the third argument. */
***************
*** 10819,10825 ****
int rem;
int todo;
char_u *ermsg = (char_u *)(map ? "map()" : "filter()");
! char *arg_errmsg = (map ? N_("map() argument")
: N_("filter() argument"));
int save_did_emsg;
int idx = 0;
--- 10820,10826 ----
int rem;
int todo;
char_u *ermsg = (char_u *)(map ? "map()" : "filter()");
! char_u *arg_errmsg = (char_u *)(map ? N_("map() argument")
: N_("filter() argument"));
int save_did_emsg;
int idx = 0;
***************
*** 10827,10839 ****
if (argvars[0].v_type == VAR_LIST)
{
if ((l = argvars[0].vval.v_list) == NULL
! || (!map && tv_check_lock(l->lv_lock, (char_u *)_(arg_errmsg))))
return;
}
else if (argvars[0].v_type == VAR_DICT)
{
if ((d = argvars[0].vval.v_dict) == NULL
! || (!map && tv_check_lock(d->dv_lock, (char_u *)_(arg_errmsg))))
return;
}
else
--- 10828,10840 ----
if (argvars[0].v_type == VAR_LIST)
{
if ((l = argvars[0].vval.v_list) == NULL
! || (!map && tv_check_lock(l->lv_lock, arg_errmsg, TRUE)))
return;
}
else if (argvars[0].v_type == VAR_DICT)
{
if ((d = argvars[0].vval.v_dict) == NULL
! || (!map && tv_check_lock(d->dv_lock, arg_errmsg, TRUE)))
return;
}
else
***************
*** 10873,10882 ****
--todo;
di = HI2DI(hi);
if (map &&
! (tv_check_lock(di->di_tv.v_lock,
! (char_u *)_(arg_errmsg))
! || var_check_ro(di->di_flags,
! (char_u *)_(arg_errmsg))))
break;
vimvars[VV_KEY].vv_str = vim_strsave(di->di_key);
r = filter_map_one(&di->di_tv, expr, map, &rem);
--- 10874,10881 ----
--todo;
di = HI2DI(hi);
if (map &&
! (tv_check_lock(di->di_tv.v_lock, arg_errmsg, TRUE)
! || var_check_ro(di->di_flags, arg_errmsg, TRUE)))
break;
vimvars[VV_KEY].vv_str = vim_strsave(di->di_key);
r = filter_map_one(&di->di_tv, expr, map, &rem);
***************
*** 10885,10894 ****
break;
if (!map && rem)
{
! if (var_check_fixed(di->di_flags,
! (char_u *)_(arg_errmsg))
! || var_check_ro(di->di_flags,
! (char_u *)_(arg_errmsg)))
break;
dictitem_remove(d, di);
}
--- 10884,10891 ----
break;
if (!map && rem)
{
! if (var_check_fixed(di->di_flags, arg_errmsg, TRUE)
! || var_check_ro(di->di_flags, arg_errmsg, TRUE))
break;
dictitem_remove(d, di);
}
***************
*** 10902,10909 ****
for (li = l->lv_first; li != NULL; li = nli)
{
! if (map && tv_check_lock(li->li_tv.v_lock,
! (char_u *)_(arg_errmsg)))
break;
nli = li->li_next;
vimvars[VV_KEY].vv_nr = idx;
--- 10899,10905 ----
for (li = l->lv_first; li != NULL; li = nli)
{
! if (map && tv_check_lock(li->li_tv.v_lock, arg_errmsg, TRUE))
break;
nli = li->li_next;
vimvars[VV_KEY].vv_nr = idx;
***************
*** 13756,13762 ****
if (argvars[0].v_type != VAR_LIST)
EMSG2(_(e_listarg), "insert()");
else if ((l = argvars[0].vval.v_list) != NULL
! && !tv_check_lock(l->lv_lock, (char_u *)_("insert() argument")))
{
if (argvars[2].v_type != VAR_UNKNOWN)
before = get_tv_number_chk(&argvars[2], &error);
--- 13752,13758 ----
if (argvars[0].v_type != VAR_LIST)
EMSG2(_(e_listarg), "insert()");
else if ((l = argvars[0].vval.v_list) != NULL
! && !tv_check_lock(l->lv_lock, (char_u *)N_("insert() argument"),
TRUE))
{
if (argvars[2].v_type != VAR_UNKNOWN)
before = get_tv_number_chk(&argvars[2], &error);
***************
*** 15837,15850 ****
char_u *key;
dict_T *d;
dictitem_T *di;
! char *arg_errmsg = N_("remove() argument");
if (argvars[0].v_type == VAR_DICT)
{
if (argvars[2].v_type != VAR_UNKNOWN)
EMSG2(_(e_toomanyarg), "remove()");
else if ((d = argvars[0].vval.v_dict) != NULL
! && !tv_check_lock(d->dv_lock, (char_u *)_(arg_errmsg)))
{
key = get_tv_string_chk(&argvars[1]);
if (key != NULL)
--- 15833,15846 ----
char_u *key;
dict_T *d;
dictitem_T *di;
! char_u *arg_errmsg = (char_u *)N_("remove() argument");
if (argvars[0].v_type == VAR_DICT)
{
if (argvars[2].v_type != VAR_UNKNOWN)
EMSG2(_(e_toomanyarg), "remove()");
else if ((d = argvars[0].vval.v_dict) != NULL
! && !tv_check_lock(d->dv_lock, arg_errmsg, TRUE))
{
key = get_tv_string_chk(&argvars[1]);
if (key != NULL)
***************
*** 15852,15860 ****
di = dict_find(d, key, -1);
if (di == NULL)
EMSG2(_(e_dictkey), key);
! else if (!var_check_fixed(di->di_flags, (char_u *)_(arg_errmsg))
! && !var_check_ro(di->di_flags,
! (char_u *)_(arg_errmsg)))
{
*rettv = di->di_tv;
init_tv(&di->di_tv);
--- 15848,15855 ----
di = dict_find(d, key, -1);
if (di == NULL)
EMSG2(_(e_dictkey), key);
! else if (!var_check_fixed(di->di_flags, arg_errmsg, TRUE)
! && !var_check_ro(di->di_flags, arg_errmsg, TRUE))
{
*rettv = di->di_tv;
init_tv(&di->di_tv);
***************
*** 15866,15872 ****
else if (argvars[0].v_type != VAR_LIST)
EMSG2(_(e_listdictarg), "remove()");
else if ((l = argvars[0].vval.v_list) != NULL
! && !tv_check_lock(l->lv_lock, (char_u *)_(arg_errmsg)))
{
int error = FALSE;
--- 15861,15867 ----
else if (argvars[0].v_type != VAR_LIST)
EMSG2(_(e_listdictarg), "remove()");
else if ((l = argvars[0].vval.v_list) != NULL
! && !tv_check_lock(l->lv_lock, arg_errmsg, TRUE))
{
int error = FALSE;
***************
*** 16210,16216 ****
if (argvars[0].v_type != VAR_LIST)
EMSG2(_(e_listarg), "reverse()");
else if ((l = argvars[0].vval.v_list) != NULL
! && !tv_check_lock(l->lv_lock, (char_u *)_("reverse() argument")))
{
li = l->lv_last;
l->lv_first = l->lv_last = NULL;
--- 16205,16212 ----
if (argvars[0].v_type != VAR_LIST)
EMSG2(_(e_listarg), "reverse()");
else if ((l = argvars[0].vval.v_list) != NULL
! && !tv_check_lock(l->lv_lock,
! (char_u *)N_("reverse() argument"), TRUE))
{
li = l->lv_last;
l->lv_first = l->lv_last = NULL;
***************
*** 17744,17750 ****
{
l = argvars[0].vval.v_list;
if (l == NULL || tv_check_lock(l->lv_lock,
! (char_u *)(sort ? _("sort() argument") : _("uniq() argument"))))
return;
rettv->vval.v_list = l;
rettv->v_type = VAR_LIST;
--- 17740,17747 ----
{
l = argvars[0].vval.v_list;
if (l == NULL || tv_check_lock(l->lv_lock,
! (char_u *)(sort ? N_("sort() argument") : N_("uniq() argument")),
! TRUE))
return;
rettv->vval.v_list = l;
rettv->v_type = VAR_LIST;
***************
*** 21456,21463 ****
if (v != NULL)
{
/* existing variable, need to clear the value */
! if (var_check_ro(v->di_flags, name)
! || tv_check_lock(v->di_tv.v_lock, name))
return;
if (v->di_tv.v_type != tv->v_type
&& !((v->di_tv.v_type == VAR_STRING
--- 21453,21460 ----
if (v != NULL)
{
/* existing variable, need to clear the value */
! if (var_check_ro(v->di_flags, name, FALSE)
! || tv_check_lock(v->di_tv.v_lock, name, FALSE))
return;
if (v->di_tv.v_type != tv->v_type
&& !((v->di_tv.v_type == VAR_STRING
***************
*** 21555,21572 ****
* Also give an error message.
*/
static int
! var_check_ro(flags, name)
int flags;
char_u *name;
{
if (flags & DI_FLAGS_RO)
{
! EMSG2(_(e_readonlyvar), name);
return TRUE;
}
if ((flags & DI_FLAGS_RO_SBX) && sandbox)
{
! EMSG2(_(e_readonlysbx), name);
return TRUE;
}
return FALSE;
--- 21552,21570 ----
* Also give an error message.
*/
static int
! var_check_ro(flags, name, use_gettext)
int flags;
char_u *name;
+ int use_gettext;
{
if (flags & DI_FLAGS_RO)
{
! EMSG2(_(e_readonlyvar), use_gettext ? (char_u *)_(name) : name);
return TRUE;
}
if ((flags & DI_FLAGS_RO_SBX) && sandbox)
{
! EMSG2(_(e_readonlysbx), use_gettext ? (char_u *)_(name) : name);
return TRUE;
}
return FALSE;
***************
*** 21577,21589 ****
* Also give an error message.
*/
static int
! var_check_fixed(flags, name)
int flags;
char_u *name;
{
if (flags & DI_FLAGS_FIX)
{
! EMSG2(_("E795: Cannot delete variable %s"), name);
return TRUE;
}
return FALSE;
--- 21575,21589 ----
* Also give an error message.
*/
static int
! var_check_fixed(flags, name, use_gettext)
int flags;
char_u *name;
+ int use_gettext;
{
if (flags & DI_FLAGS_FIX)
{
! EMSG2(_("E795: Cannot delete variable %s"),
! use_gettext ? (char_u *)_(name) : name);
return TRUE;
}
return FALSE;
***************
*** 21641,21663 ****
/*
* Return TRUE if typeval "tv" is set to be locked (immutable).
! * Also give an error message, using "name".
*/
static int
! tv_check_lock(lock, name)
int lock;
char_u *name;
{
if (lock & VAR_LOCKED)
{
EMSG2(_("E741: Value is locked: %s"),
! name == NULL ? (char_u *)_("Unknown") : name);
return TRUE;
}
if (lock & VAR_FIXED)
{
EMSG2(_("E742: Cannot change value of %s"),
! name == NULL ? (char_u *)_("Unknown") : name);
return TRUE;
}
return FALSE;
--- 21641,21669 ----
/*
* Return TRUE if typeval "tv" is set to be locked (immutable).
! * Also give an error message, using "name" or _("name") when use_gettext is
! * TRUE.
*/
static int
! tv_check_lock(lock, name, use_gettext)
int lock;
char_u *name;
+ int use_gettext;
{
if (lock & VAR_LOCKED)
{
EMSG2(_("E741: Value is locked: %s"),
! name == NULL ? (char_u *)_("Unknown")
! : use_gettext ? (char_u *)_(name)
! : name);
return TRUE;
}
if (lock & VAR_FIXED)
{
EMSG2(_("E742: Cannot change value of %s"),
! name == NULL ? (char_u *)_("Unknown")
! : use_gettext ? (char_u *)_(name)
! : name);
return TRUE;
}
return FALSE;
***************
*** 22595,22605 ****
if (fudi.fd_di == NULL)
{
/* Can't add a function to a locked dictionary */
! if (tv_check_lock(fudi.fd_dict->dv_lock, eap->arg))
goto erret;
}
/* Can't change an existing function if it is locked */
! else if (tv_check_lock(fudi.fd_di->di_tv.v_lock, eap->arg))
goto erret;
/* Give the function a sequential number. Can only be used with a
--- 22601,22611 ----
if (fudi.fd_di == NULL)
{
/* Can't add a function to a locked dictionary */
! if (tv_check_lock(fudi.fd_dict->dv_lock, eap->arg, FALSE))
goto erret;
}
/* Can't change an existing function if it is locked */
! else if (tv_check_lock(fudi.fd_di->di_tv.v_lock, eap->arg, FALSE))
goto erret;
/* Give the function a sequential number. Can only be used with a
*** ../vim-7.4.707/src/version.c 2015-04-21 16:12:01.208114832 +0200
--- src/version.c 2015-04-21 16:45:02.195367727 +0200
***************
*** 743,744 ****
--- 743,746 ----
{ /* Add new patch number below this line */
+ /**/
+ 708,
/**/
--
CRONE: Who sent you?
ARTHUR: The Knights Who Say GNU!
CRONE: Aaaagh! (she looks around in rear) No! We have no licenses here.
"Monty Python and the Holy editor wars" PYTHON (MONTY) SOFTWARE LTD
/// Bram Moolenaar -- [email protected] -- http://www.Moolenaar.net \\\
/// sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\
\\\ an exciting new programming language -- http://www.Zimbu.org ///
\\\ help me help AIDS victims -- http://ICCF-Holland.org ///
--
--
You received this message from the "vim_dev" maillist.
Do not top-post! Type your reply below the text you are replying to.
For more information, visit http://www.vim.org/maillist.php
---
You received this message because you are subscribed to the Google Groups
"vim_dev" group.
To unsubscribe from this group and stop receiving emails from it, send an email
to [email protected].
For more options, visit https://groups.google.com/d/optout.
