aniani/vim
0
0
Fork 1
mirror of https://github.com/vim/vim.git synced 2025-09-23 03:43:49 -04:00
Code Activity

updated for version 7.3.098

Browse Source 
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:
Bram Moolenaar
2011-01-04 19:25:50 +01:00
parent 6d0efdaab5
commit fd0e75683f
2 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/message.c
View File

@@ -569,6 +569,10 @@ emsg(s)
int severe; int severe;
#endif #endif
/* Skip this if not giving error messages at the moment. */
if (emsg_not_now())
return TRUE;
called_emsg = TRUE; called_emsg = TRUE;
ex_exitval = 1; ex_exitval = 1;
@@ -581,10 +585,6 @@ emsg(s)
emsg_severe = FALSE; emsg_severe = FALSE;
#endif #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) if (!emsg_off || vim_strchr(p_debug, 't') != NULL)
{ {
#ifdef FEAT_EVAL #ifdef FEAT_EVAL

2
src/version.c
View File

@@ -714,6 +714,8 @@ static char *(features[]) =
static int included_patches[] = static int included_patches[] =
{ /* Add new patch number below this line */ { /* Add new patch number below this line */
/**/
98,
/**/ /**/
97, 97,
/**/ /**/