Mercurial > vim
comparison src/screen.c @ 540:2df7f3a5eb96
updated for version 7.0153
author | vimboss |
---|---|
date | Mon, 03 Oct 2005 22:02:18 +0000 |
parents | c6296b0ad9ea |
children | f43150a669dc |
comparison
equal
deleted
inserted
replaced
539:b13dbb7b797c | 540:2df7f3a5eb96 |
---|---|
5294 if (wp->w_status_height == 0) | 5294 if (wp->w_status_height == 0) |
5295 { | 5295 { |
5296 /* no status line, can only be last window */ | 5296 /* no status line, can only be last window */ |
5297 redraw_cmdline = TRUE; | 5297 redraw_cmdline = TRUE; |
5298 } | 5298 } |
5299 else if (!redrawing()) | 5299 else if (!redrawing() |
5300 #ifdef FEAT_INS_EXPAND | |
5301 /* don't update status line when popup menu is visible and may be | |
5302 * drawn over it */ | |
5303 || pum_visible() | |
5304 #endif | |
5305 ) | |
5300 { | 5306 { |
5301 /* Don't redraw right now, do it later. */ | 5307 /* Don't redraw right now, do it later. */ |
5302 wp->w_redr_status = TRUE; | 5308 wp->w_redr_status = TRUE; |
5303 } | 5309 } |
5304 #ifdef FEAT_STL_OPT | 5310 #ifdef FEAT_STL_OPT |
8532 # ifdef FEAT_WINDOWS | 8538 # ifdef FEAT_WINDOWS |
8533 if (wp == lastwin && lastwin->w_status_height == 0) | 8539 if (wp == lastwin && lastwin->w_status_height == 0) |
8534 # endif | 8540 # endif |
8535 if (edit_submode != NULL) | 8541 if (edit_submode != NULL) |
8536 return; | 8542 return; |
8543 /* Don't draw the ruler when the popup menu is visible, it may overlap. */ | |
8544 if (pum_visible()) | |
8545 return; | |
8537 #endif | 8546 #endif |
8538 | 8547 |
8539 #ifdef FEAT_STL_OPT | 8548 #ifdef FEAT_STL_OPT |
8540 if (*p_ruf) | 8549 if (*p_ruf) |
8541 { | 8550 { |