Mercurial > vim
diff src/screen.c @ 8872:4d4de770f970 v7.4.1723
commit https://github.com/vim/vim/commit/f73d3bc253fa79ad220f52f04b93e782e95a9d43
Author: Bram Moolenaar <Bram@vim.org>
Date: Mon Apr 11 21:55:15 2016 +0200
patch 7.4.1723
Problem: When using try/catch in 'tabline' it is still considered an
error and the tabline will be disabled.
Solution: Check did_emsg instead of called_emsg. (haya14busa, closes https://github.com/vim/vim/issues/746)
| author | Christian Brabandt <cb@256bit.org> |
|---|---|
| date | Mon, 11 Apr 2016 22:00:05 +0200 |
| parents | 470ea7526cc6 |
| children | 5deb9e8f4292 |
line wrap: on
line diff
--- a/src/screen.c +++ b/src/screen.c @@ -10266,16 +10266,16 @@ draw_tabline(void) /* Use the 'tabline' option if it's set. */ if (*p_tal != NUL) { - int save_called_emsg = called_emsg; + int saved_did_emsg = did_emsg; /* Check for an error. If there is one we would loop in redrawing the * screen. Avoid that by making 'tabline' empty. */ - called_emsg = FALSE; + did_emsg = FALSE; win_redr_custom(NULL, FALSE); - if (called_emsg) + if (did_emsg) set_string_option_direct((char_u *)"tabline", -1, (char_u *)"", OPT_FREE, SID_ERROR); - called_emsg |= save_called_emsg; + did_emsg |= saved_did_emsg; } else #endif