diff options
| author | zeertzjq <zeertzjq@outlook.com> | 2022-07-13 04:08:49 +0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-07-13 04:08:49 +0800 |
| commit | 39d51c833aed7e2ab946cd51bfff8d981269a8ef (patch) | |
| tree | 45f677120aeb74205f476f7b9ee7b1d1c93a8852 /src/nvim/screen.c | |
| parent | b1e0197a143b3cc04c6a6fe8f064671391f6c8b4 (diff) | |
| download | rneovim-39d51c833aed7e2ab946cd51bfff8d981269a8ef.tar.gz rneovim-39d51c833aed7e2ab946cd51bfff8d981269a8ef.tar.bz2 rneovim-39d51c833aed7e2ab946cd51bfff8d981269a8ef.zip | |
vim-patch:8.2.0035: saving and restoring called_emsg is clumsy (#19335)
Problem: Saving and restoring called_emsg is clumsy.
Solution: Count the number of error messages.
https://github.com/vim/vim/commit/53989554a44caca0964376d60297f08ec257c53c
Diffstat (limited to 'src/nvim/screen.c')
| -rw-r--r-- | src/nvim/screen.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/src/nvim/screen.c b/src/nvim/screen.c index 3d69d317fd..9e545fbbf5 100644 --- a/src/nvim/screen.c +++ b/src/nvim/screen.c @@ -6533,13 +6533,11 @@ static void win_redr_ruler(win_T *wp, bool always) } if (*p_ruf && p_ch > 0 && !ui_has(kUIMessages)) { - int save_called_emsg = called_emsg; - called_emsg = false; + const int called_emsg_before = called_emsg; win_redr_custom(wp, false, true); - if (called_emsg) { + if (called_emsg > called_emsg_before) { set_string_option_direct("rulerformat", -1, "", OPT_FREE, SID_ERROR); } - called_emsg |= save_called_emsg; return; } |