summaryrefslogtreecommitdiff
path: root/src/screen.c
diff options
context:
space:
mode:
authorBram Moolenaar <Bram@vim.org>2016-11-06 15:25:42 +0100
committerBram Moolenaar <Bram@vim.org>2016-11-06 15:25:42 +0100
commita1f4cb93ba50ea9e40cd4b1f5592b8a6d1398660 (patch)
treef2b42367e5ced2e5c070683fafb1a75b360086c4 /src/screen.c
parent25de4c232d580583feadae11ab34e3cc6333c350 (diff)
downloadvim-a1f4cb93ba50ea9e40cd4b1f5592b8a6d1398660.zip
patch 8.0.0069
Problem: Compiler warning for self-comparison. Solution: Define ONE_WINDOW and add #ifdef.
Diffstat (limited to 'src/screen.c')
-rw-r--r--src/screen.c9
1 files changed, 6 insertions, 3 deletions
diff --git a/src/screen.c b/src/screen.c
index c98d5670b..621f25c0d 100644
--- a/src/screen.c
+++ b/src/screen.c
@@ -1510,7 +1510,7 @@ win_update(win_T *wp)
if (mid_start == 0)
{
mid_end = wp->w_height;
- if (lastwin == firstwin)
+ if (ONE_WINDOW)
{
/* Clear the screen when it was not done by win_del_lines() or
* win_ins_lines() above, "screen_cleared" is FALSE or MAYBE
@@ -5670,7 +5670,10 @@ win_line(
#ifdef FEAT_DIFF
&& filler_todo <= 0
#endif
- && W_WIDTH(wp) == Columns)
+#ifdef FEAT_WINDOWS
+ && W_WIDTH(wp) == Columns
+#endif
+ )
{
/* Remember that the line wraps, used for modeless copy. */
LineWraps[screen_row - 1] = TRUE;
@@ -10524,7 +10527,7 @@ fillchar_status(int *attr, int is_curwin)
* window differs, or the fillchars differ, or this is not the
* current window */
if (*attr != 0 && ((hl_attr(HLF_S) != hl_attr(HLF_SNC)
- || !is_curwin || firstwin == lastwin)
+ || !is_curwin || ONE_WINDOW)
|| (fill_stl != fill_stlnc)))
return fill;
if (is_curwin)