diff options
| -rw-r--r-- | src/message.c | 14 | ||||
| -rw-r--r-- | src/version.c | 2 |
2 files changed, 12 insertions, 4 deletions
diff --git a/src/message.c b/src/message.c index e438211fa1..8992de013f 100644 --- a/src/message.c +++ b/src/message.c @@ -522,6 +522,12 @@ get_emsg_lnum(void) msg_source(int attr) { char_u *p; + static int recursive = FALSE; + + // Bail out if something called here causes an error. + if (recursive) + return; + recursive = TRUE; ++no_wait_return; p = get_emsg_source(); @@ -541,13 +547,13 @@ msg_source(int attr) // remember the last sourcing name printed, also when it's empty if (SOURCING_NAME == NULL || other_sourcing_name()) { - vim_free(last_sourcing_name); - if (SOURCING_NAME == NULL) - last_sourcing_name = NULL; - else + VIM_CLEAR(last_sourcing_name); + if (SOURCING_NAME != NULL) last_sourcing_name = vim_strsave(SOURCING_NAME); } --no_wait_return; + + recursive = FALSE; } /* diff --git a/src/version.c b/src/version.c index 6d96d43247..07d93d98b7 100644 --- a/src/version.c +++ b/src/version.c @@ -758,6 +758,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 3675, +/**/ 3674, /**/ 3673, |