aniani/vim
0
0
Fork 1
mirror of https://github.com/vim/vim.git synced 2025-09-23 03:43:49 -04:00
Code Activity

patch 8.1.1026: unused condition

Browse Source 
Problem:    Unused condition. (Coverity)
Solution:   Remove the condition.  Also remove unused #define.
This commit is contained in:
Bram Moolenaar
2019-03-20 21:42:20 +01:00
parent 64c8ed366d
commit d00e024d9f
2 changed files with 4 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files

41
src/move.c
View File

@@ -2574,7 +2574,6 @@ get_scroll_overlap(lineoff_T *lp, int dir)
return; return;
} }
/* #define KEEP_SCREEN_LINE */
/* /*
* Scroll 'scroll' lines up or down. * Scroll 'scroll' lines up or down.
*/ */
@@ -2628,14 +2627,12 @@ halfpage(int flag, linenr_T Prenum)
curwin->w_topfill = diff_check_fill(curwin, curwin->w_topline); curwin->w_topfill = diff_check_fill(curwin, curwin->w_topline);
#endif #endif
#ifndef KEEP_SCREEN_LINE
if (curwin->w_cursor.lnum < curbuf->b_ml.ml_line_count) if (curwin->w_cursor.lnum < curbuf->b_ml.ml_line_count)
{ {
++curwin->w_cursor.lnum; ++curwin->w_cursor.lnum;
curwin->w_valid &= curwin->w_valid &=
~(VALID_VIRTCOL|VALID_CHEIGHT|VALID_WCOL); ~(VALID_VIRTCOL|VALID_CHEIGHT|VALID_WCOL);
} }
#endif
} }
curwin->w_valid &= ~(VALID_CROW|VALID_WROW); curwin->w_valid &= ~(VALID_CROW|VALID_WROW);
scrolled += i; scrolled += i;
@@ -2666,7 +2663,6 @@ halfpage(int flag, linenr_T Prenum)
} }
} }
#ifndef KEEP_SCREEN_LINE
/* /*
* When hit bottom of the file: move cursor down. * When hit bottom of the file: move cursor down.
*/ */
@@ -2688,21 +2684,6 @@ halfpage(int flag, linenr_T Prenum)
curwin->w_cursor.lnum += n; curwin->w_cursor.lnum += n;
check_cursor_lnum(); check_cursor_lnum();
} }
#else
/* try to put the cursor in the same screen line */
while ((curwin->w_cursor.lnum < curwin->w_topline || scrolled > 0)
&& curwin->w_cursor.lnum < curwin->w_botline - 1)
{
scrolled -= plines(curwin->w_cursor.lnum);
if (scrolled < 0 && curwin->w_cursor.lnum >= curwin->w_topline)
break;
# ifdef FEAT_FOLDING
(void)hasFolding(curwin->w_cursor.lnum, NULL,
&curwin->w_cursor.lnum);
# endif
++curwin->w_cursor.lnum;
}
#endif
} }
else else
{ {
@@ -2715,8 +2696,7 @@ halfpage(int flag, linenr_T Prenum)
if (curwin->w_topfill < diff_check_fill(curwin, curwin->w_topline)) if (curwin->w_topfill < diff_check_fill(curwin, curwin->w_topline))
{ {
i = 1; i = 1;
if (--n < 0 && scrolled > 0) --n;
break;
++curwin->w_topfill; ++curwin->w_topfill;
} }
else else
@@ -2737,15 +2717,13 @@ halfpage(int flag, linenr_T Prenum)
curwin->w_valid &= ~(VALID_CROW|VALID_WROW| curwin->w_valid &= ~(VALID_CROW|VALID_WROW|
VALID_BOTLINE|VALID_BOTLINE_AP); VALID_BOTLINE|VALID_BOTLINE_AP);
scrolled += i; scrolled += i;
#ifndef KEEP_SCREEN_LINE
if (curwin->w_cursor.lnum > 1) if (curwin->w_cursor.lnum > 1)
{ {
--curwin->w_cursor.lnum; --curwin->w_cursor.lnum;
curwin->w_valid &= ~(VALID_VIRTCOL|VALID_CHEIGHT|VALID_WCOL); curwin->w_valid &= ~(VALID_VIRTCOL|VALID_CHEIGHT|VALID_WCOL);
} }
#endif
} }
#ifndef KEEP_SCREEN_LINE
/* /*
* When hit top of the file: move cursor up. * When hit top of the file: move cursor up.
*/ */
@@ -2768,21 +2746,6 @@ halfpage(int flag, linenr_T Prenum)
# endif # endif
curwin->w_cursor.lnum -= n; curwin->w_cursor.lnum -= n;
} }
#else
/* try to put the cursor in the same screen line */
scrolled += n; /* move cursor when topline is 1 */
while (curwin->w_cursor.lnum > curwin->w_topline
&& (scrolled > 0 || curwin->w_cursor.lnum >= curwin->w_botline))
{
scrolled -= plines(curwin->w_cursor.lnum - 1);
if (scrolled < 0 && curwin->w_cursor.lnum < curwin->w_botline)
break;
--curwin->w_cursor.lnum;
# ifdef FEAT_FOLDING
foldAdjustCursor();
# endif
}
#endif
} }
# ifdef FEAT_FOLDING # ifdef FEAT_FOLDING
/* Move cursor to first line of closed fold. */ /* Move cursor to first line of closed fold. */

2
src/version.c
View File

@@ -779,6 +779,8 @@ static char *(features[]) =
static int included_patches[] = static int included_patches[] =
{ /* Add new patch number below this line */ { /* Add new patch number below this line */
/**/
1026,
/**/ /**/
1025, 1025,
/**/ /**/