summaryrefslogtreecommitdiff
path: root/src/drawscreen.c
diff options
context:
space:
mode:
authorBram Moolenaar <Bram@vim.org>2019-12-23 22:59:18 +0100
committerBram Moolenaar <Bram@vim.org>2019-12-23 22:59:18 +0100
commit53989554a44caca0964376d60297f08ec257c53c (patch)
tree34d2140d4201e015661344b05ffb4c2d9aed97ff /src/drawscreen.c
parent70188f5b23ea7efec7adaf74e0af797d1bb1afe8 (diff)
downloadvim-git-53989554a44caca0964376d60297f08ec257c53c.tar.gz
patch 8.2.0035: saving and restoring called_emsg is clumsyv8.2.0035
Problem: Saving and restoring called_emsg is clumsy. Solution: Count the number of error messages.
Diffstat (limited to 'src/drawscreen.c')
-rw-r--r--src/drawscreen.c6
1 files changed, 2 insertions, 4 deletions
diff --git a/src/drawscreen.c b/src/drawscreen.c
index 3a88ee979..6b755c8c9 100644
--- a/src/drawscreen.c
+++ b/src/drawscreen.c
@@ -650,14 +650,12 @@ win_redr_ruler(win_T *wp, int always, int ignore_pum)
#ifdef FEAT_STL_OPT
if (*p_ruf)
{
- int save_called_emsg = called_emsg;
+ int called_emsg_before = called_emsg;
- called_emsg = FALSE;
win_redr_custom(wp, TRUE);
- if (called_emsg)
+ if (called_emsg > called_emsg_before)
set_string_option_direct((char_u *)"rulerformat", -1,
(char_u *)"", OPT_FREE, SID_ERROR);
- called_emsg |= save_called_emsg;
return;
}
#endif