Mercurial > vim

comparison src/screen.c @ 40:f1d2a58883b9 v7.0024

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
updated for version 7.0024
author vimboss
date Fri, 24 Dec 2004 14:35:23 +0000
parents 410fa1a31baf
children c75153d791d0
comparison
equal deleted inserted replaced
39:410fa1a31baf 40:f1d2a58883b9
698 if (wp->w_redr_status 698 if (wp->w_redr_status
699 # ifdef FEAT_CMDL_INFO 699 # ifdef FEAT_CMDL_INFO
700 || p_ru 700 || p_ru
701 # endif 701 # endif
702 # ifdef FEAT_STL_OPT 702 # ifdef FEAT_STL_OPT
703 || *p_stl 703 || *p_stl != NUL || *wp->w_p_stl != NUL
704 # endif 704 # endif
705 ) 705 )
706 win_redr_status(wp); 706 win_redr_status(wp);
707 #endif 707 #endif
708 708
5038 { 5038 {
5039 /* Don't redraw right now, do it later. */ 5039 /* Don't redraw right now, do it later. */
5040 wp->w_redr_status = TRUE; 5040 wp->w_redr_status = TRUE;
5041 } 5041 }
5042 #ifdef FEAT_STL_OPT 5042 #ifdef FEAT_STL_OPT
5043 else if (*p_stl) 5043 else if (*p_stl != NUL || *wp->w_p_stl != NUL)
5044 { 5044 {
5045 /* redraw custom status line */ 5045 /* redraw custom status line */
5046 win_redr_custom(wp, FALSE); 5046 win_redr_custom(wp, FALSE);
5047 } 5047 }
5048 #endif 5048 #endif
5274 5274
5275 /* setup environment for the task at hand */ 5275 /* setup environment for the task at hand */
5276 row = W_WINROW(wp) + wp->w_height; 5276 row = W_WINROW(wp) + wp->w_height;
5277 fillchar = fillchar_status(&attr, wp == curwin); 5277 fillchar = fillchar_status(&attr, wp == curwin);
5278 maxwidth = W_WIDTH(wp); 5278 maxwidth = W_WIDTH(wp);
5279 p = p_stl; 5279 if (*wp->w_p_stl != NUL)
5280 p = wp->w_p_stl;
5281 else
5282 p = p_stl;
5280 if (Ruler) 5283 if (Ruler)
5281 { 5284 {
5282 p = p_ruf; 5285 p = p_ruf;
5283 /* advance past any leading group spec - implicit in ru_col */ 5286 /* advance past any leading group spec - implicit in ru_col */
5284 if (*p == '%') 5287 if (*p == '%')
8212 int always; 8215 int always;
8213 { 8216 {
8214 if (!always && !redrawing()) 8217 if (!always && !redrawing())
8215 return; 8218 return;
8216 #if defined(FEAT_STL_OPT) && defined(FEAT_WINDOWS) 8219 #if defined(FEAT_STL_OPT) && defined(FEAT_WINDOWS)
8217 if (*p_stl && curwin->w_status_height) 8220 if ((*p_stl != NUL || *curwin->w_p_stl != NUL) && curwin->w_status_height)
8218 win_redr_custom(curwin, FALSE); 8221 win_redr_custom(curwin, FALSE);
8219 else 8222 else
8220 #endif 8223 #endif
8221 #ifdef FEAT_CMDL_INFO 8224 #ifdef FEAT_CMDL_INFO
8222 win_redr_ruler(curwin, always); 8225 win_redr_ruler(curwin, always);