summaryrefslogtreecommitdiff
path: root/src/screen.c
diff options
context:
space:
mode:
authorBram Moolenaar <Bram@vim.org>2004-12-24 14:35:23 +0000
committerBram Moolenaar <Bram@vim.org>2004-12-24 14:35:23 +0000
commitb5bf5b8fae9ff5e2f7704686efae2814be1e18f7 (patch)
treefcaa6e0f52dfd691d0c4796d34e402d46ce7c293 /src/screen.c
parent1cd871b5341bf43ee99e136844e3131014880f92 (diff)
downloadvim-git-b5bf5b8fae9ff5e2f7704686efae2814be1e18f7.tar.gz
updated for version 7.0024v7.0024
Diffstat (limited to 'src/screen.c')
-rw-r--r--src/screen.c11
1 files changed, 7 insertions, 4 deletions
diff --git a/src/screen.c b/src/screen.c
index abd9be7e6..e986a223b 100644
--- a/src/screen.c
+++ b/src/screen.c
@@ -700,7 +700,7 @@ updateWindow(wp)
|| p_ru
# endif
# ifdef FEAT_STL_OPT
- || *p_stl
+ || *p_stl != NUL || *wp->w_p_stl != NUL
# endif
)
win_redr_status(wp);
@@ -5040,7 +5040,7 @@ win_redr_status(wp)
wp->w_redr_status = TRUE;
}
#ifdef FEAT_STL_OPT
- else if (*p_stl)
+ else if (*p_stl != NUL || *wp->w_p_stl != NUL)
{
/* redraw custom status line */
win_redr_custom(wp, FALSE);
@@ -5276,7 +5276,10 @@ win_redr_custom(wp, Ruler)
row = W_WINROW(wp) + wp->w_height;
fillchar = fillchar_status(&attr, wp == curwin);
maxwidth = W_WIDTH(wp);
- p = p_stl;
+ if (*wp->w_p_stl != NUL)
+ p = wp->w_p_stl;
+ else
+ p = p_stl;
if (Ruler)
{
p = p_ruf;
@@ -8214,7 +8217,7 @@ showruler(always)
if (!always && !redrawing())
return;
#if defined(FEAT_STL_OPT) && defined(FEAT_WINDOWS)
- if (*p_stl && curwin->w_status_height)
+ if ((*p_stl != NUL || *curwin->w_p_stl != NUL) && curwin->w_status_height)
win_redr_custom(curwin, FALSE);
else
#endif