Mercurial > vim

comparison src/screen.c @ 10349:cf988222b150 v8.0.0069

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
commit https://github.com/vim/vim/commit/a1f4cb93ba50ea9e40cd4b1f5592b8a6d1398660 Author: Bram Moolenaar <Bram@vim.org> Date: Sun Nov 6 15:25:42 2016 +0100 patch 8.0.0069 Problem: Compiler warning for self-comparison. Solution: Define ONE_WINDOW and add #ifdef.
author Christian Brabandt <cb@256bit.org>
date Sun, 06 Nov 2016 15:30:05 +0100
parents f4798aebef67
children 957a1d560bda
comparison
equal deleted inserted replaced
10348:c78513465e6e 10349:cf988222b150
1508 * there is only one window it's probably faster to clear the screen 1508 * there is only one window it's probably faster to clear the screen
1509 * first. */ 1509 * first. */
1510 if (mid_start == 0) 1510 if (mid_start == 0)
1511 { 1511 {
1512 mid_end = wp->w_height; 1512 mid_end = wp->w_height;
1513 if (lastwin == firstwin) 1513 if (ONE_WINDOW)
1514 { 1514 {
1515 /* Clear the screen when it was not done by win_del_lines() or 1515 /* Clear the screen when it was not done by win_del_lines() or
1516 * win_ins_lines() above, "screen_cleared" is FALSE or MAYBE 1516 * win_ins_lines() above, "screen_cleared" is FALSE or MAYBE
1517 * then. */ 1517 * then. */
1518 if (screen_cleared != TRUE) 1518 if (screen_cleared != TRUE)
5668 5668
5669 if (screen_cur_row == screen_row - 1 5669 if (screen_cur_row == screen_row - 1
5670 #ifdef FEAT_DIFF 5670 #ifdef FEAT_DIFF
5671 && filler_todo <= 0 5671 && filler_todo <= 0
5672 #endif 5672 #endif
5673 && W_WIDTH(wp) == Columns) 5673 #ifdef FEAT_WINDOWS
5674 && W_WIDTH(wp) == Columns
5675 #endif
5676 )
5674 { 5677 {
5675 /* Remember that the line wraps, used for modeless copy. */ 5678 /* Remember that the line wraps, used for modeless copy. */
5676 LineWraps[screen_row - 1] = TRUE; 5679 LineWraps[screen_row - 1] = TRUE;
5677 5680
5678 /* 5681 /*
10522 } 10525 }
10523 /* Use fill when there is highlighting, and highlighting of current 10526 /* Use fill when there is highlighting, and highlighting of current
10524 * window differs, or the fillchars differ, or this is not the 10527 * window differs, or the fillchars differ, or this is not the
10525 * current window */ 10528 * current window */
10526 if (*attr != 0 && ((hl_attr(HLF_S) != hl_attr(HLF_SNC) 10529 if (*attr != 0 && ((hl_attr(HLF_S) != hl_attr(HLF_SNC)
10527 || !is_curwin || firstwin == lastwin) 10530 || !is_curwin || ONE_WINDOW)
10528 || (fill_stl != fill_stlnc))) 10531 || (fill_stl != fill_stlnc)))
10529 return fill; 10532 return fill;
10530 if (is_curwin) 10533 if (is_curwin)
10531 return '^'; 10534 return '^';
10532 return '='; 10535 return '=';