mirror of
https://github.com/vim/vim.git
synced 2025-09-23 03:43:49 -04:00
updated for version 7.3.098
Problem: Function that ignores error still causes called_emsg to be set. E.g. when expand() fails the status line is disabled. Solution: Move check for emsg_not_now() up. (James Vega)
This commit is contained in:
@@ -569,6 +569,10 @@ emsg(s)
|
||||
int severe;
|
||||
#endif
|
||||
|
||||
/* Skip this if not giving error messages at the moment. */
|
||||
if (emsg_not_now())
|
||||
return TRUE;
|
||||
|
||||
called_emsg = TRUE;
|
||||
ex_exitval = 1;
|
||||
|
||||
@@ -581,10 +585,6 @@ emsg(s)
|
||||
emsg_severe = FALSE;
|
||||
#endif
|
||||
|
||||
/* Skip this if not giving error messages at the moment. */
|
||||
if (emsg_not_now())
|
||||
return TRUE;
|
||||
|
||||
if (!emsg_off || vim_strchr(p_debug, 't') != NULL)
|
||||
{
|
||||
#ifdef FEAT_EVAL
|
||||
|
@@ -714,6 +714,8 @@ static char *(features[]) =
|
||||
|
||||
static int included_patches[] =
|
||||
{ /* Add new patch number below this line */
|
||||
/**/
|
||||
98,
|
||||
/**/
|
||||
97,
|
||||
/**/
|
||||
|
Reference in New Issue
Block a user