diff options
| author | Bram Moolenaar <Bram@vim.org> | 2011-01-04 19:25:50 +0100 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2011-01-04 19:25:50 +0100 |
| commit | fd0e75683f248070496b0e315052ccfcfe7dee26 (patch) | |
| tree | 58eb8d30822f84d62d2aea10e2d85e3d0a6c3170 /src | |
| parent | 6d0efdaab5d97684056598f0a38cc98d2568f8d7 (diff) | |
| download | vim-git-fd0e75683f248070496b0e315052ccfcfe7dee26.tar.gz | |
updated for version 7.3.098v7.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)
Diffstat (limited to 'src')
| -rw-r--r-- | src/message.c | 8 | ||||
| -rw-r--r-- | src/version.c | 2 |
2 files changed, 6 insertions, 4 deletions
diff --git a/src/message.c b/src/message.c index ac81948f2..930fca117 100644 --- a/src/message.c +++ b/src/message.c @@ -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 diff --git a/src/version.c b/src/version.c index 05e50df55..3c12b2fa1 100644 --- a/src/version.c +++ b/src/version.c @@ -715,6 +715,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 98, +/**/ 97, /**/ 96, |