commit 53989554a44caca0964376d60297f08ec257c53c
author Bram Moolenaar <Bram@vim.org> Mon Dec 23 22:59:18 2019 +0100
committer Bram Moolenaar <Bram@vim.org> Mon Dec 23 22:59:18 2019 +0100
tree 34d2140d4201e015661344b05ffb4c2d9aed97ff
parent 70188f5b23ea7efec7adaf74e0af797d1bb1afe8

patch 8.2.0035: saving and restoring called_emsg is clumsy

Problem:    Saving and restoring called_emsg is clumsy.
Solution:   Count the number of error messages.

src/drawscreen.c

diff --git a/src/drawscreen.c b/src/drawscreen.c
index 3a88ee9..6b755c8 100644
--- a/src/drawscreen.c
+++ b/src/drawscreen.c
@@ -650,14 +650,12 @@
 #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