Mercurial > vim
comparison src/screen.c @ 694:07d199fe02ed v7.0209
updated for version 7.0209
author | vimboss |
---|---|
date | Mon, 27 Feb 2006 23:58:35 +0000 |
parents | bcd2edc4539e |
children | 2af8de31a3a8 |
comparison
equal
deleted
inserted
replaced
693:05dc93b9c61f | 694:07d199fe02ed |
---|---|
5467 int save_called_emsg = called_emsg; | 5467 int save_called_emsg = called_emsg; |
5468 | 5468 |
5469 called_emsg = FALSE; | 5469 called_emsg = FALSE; |
5470 win_redr_custom(wp, FALSE); | 5470 win_redr_custom(wp, FALSE); |
5471 if (called_emsg) | 5471 if (called_emsg) |
5472 { | |
5473 set_string_option_direct((char_u *)"statusline", -1, | 5472 set_string_option_direct((char_u *)"statusline", -1, |
5474 (char_u *)"", OPT_FREE | (*wp->w_p_stl != NUL | 5473 (char_u *)"", OPT_FREE | (*wp->w_p_stl != NUL |
5475 ? OPT_LOCAL : OPT_GLOBAL)); | 5474 ? OPT_LOCAL : OPT_GLOBAL), SID_ERROR); |
5476 # ifdef FEAT_EVAL | |
5477 set_option_scriptID((char_u *)"statusline", SID_ERROR); | |
5478 # endif | |
5479 } | |
5480 called_emsg |= save_called_emsg; | 5475 called_emsg |= save_called_emsg; |
5481 } | 5476 } |
5482 #endif | 5477 #endif |
5483 | 5478 |
5484 # ifdef FEAT_VERTSPLIT | 5479 # ifdef FEAT_VERTSPLIT |
8608 /* Check for an error. If there is one we would loop in redrawing the | 8603 /* Check for an error. If there is one we would loop in redrawing the |
8609 * screen. Avoid that by making 'tabline' empty. */ | 8604 * screen. Avoid that by making 'tabline' empty. */ |
8610 called_emsg = FALSE; | 8605 called_emsg = FALSE; |
8611 win_redr_custom(NULL, FALSE); | 8606 win_redr_custom(NULL, FALSE); |
8612 if (called_emsg) | 8607 if (called_emsg) |
8613 { | |
8614 set_string_option_direct((char_u *)"tabline", -1, | 8608 set_string_option_direct((char_u *)"tabline", -1, |
8615 (char_u *)"", OPT_FREE); | 8609 (char_u *)"", OPT_FREE, SID_ERROR); |
8616 # ifdef FEAT_EVAL | |
8617 set_option_scriptID((char_u *)"tabline", SID_ERROR); | |
8618 # endif | |
8619 } | |
8620 called_emsg |= save_called_emsg; | 8610 called_emsg |= save_called_emsg; |
8621 } | 8611 } |
8622 else | 8612 else |
8623 #endif | 8613 #endif |
8624 { | 8614 { |
8913 int save_called_emsg = called_emsg; | 8903 int save_called_emsg = called_emsg; |
8914 | 8904 |
8915 called_emsg = FALSE; | 8905 called_emsg = FALSE; |
8916 win_redr_custom(wp, TRUE); | 8906 win_redr_custom(wp, TRUE); |
8917 if (called_emsg) | 8907 if (called_emsg) |
8918 { | |
8919 set_string_option_direct((char_u *)"rulerformat", -1, | 8908 set_string_option_direct((char_u *)"rulerformat", -1, |
8920 (char_u *)"", OPT_FREE); | 8909 (char_u *)"", OPT_FREE, SID_ERROR); |
8921 # ifdef FEAT_EVAL | |
8922 set_option_scriptID((char_u *)"rulerformat", SID_ERROR); | |
8923 # endif | |
8924 } | |
8925 called_emsg |= save_called_emsg; | 8910 called_emsg |= save_called_emsg; |
8926 return; | 8911 return; |
8927 } | 8912 } |
8928 #endif | 8913 #endif |
8929 | 8914 |