aniani/vim
0
0
Fork 1
mirror of https://github.com/vim/vim.git synced 2025-07-26 11:04:33 -04:00
Code

patch 8.2.4812: unused struct item

Browse Source 
Problem:    Unused struct item.
Solution:   Remove "lines" match_T.  Simplify the code. (closes #10256)
This commit is contained in:
zeertzjq 2022-04-23 12:05:51 +01:00 committed by Bram Moolenaar
parent 0de7369fd4
commit 8279cfe499
3 changed files with 4 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/match.c
View File

@ -624,10 +624,10 @@ prepare_search_hl(win_T *wp, match_T *search_hl, linenr_T lnum)
static void static void
check_cur_search_hl(win_T *wp, match_T *shl) check_cur_search_hl(win_T *wp, match_T *shl)
{ {
long linecount = shl->rm.endpos[0].lnum - shl->rm.startpos[0].lnum; linenr_T linecount = shl->rm.endpos[0].lnum - shl->rm.startpos[0].lnum;
if (wp->w_cursor.lnum >= shl->lnum if (wp->w_cursor.lnum >= shl->lnum
&& wp->w_cursor.lnum <= shl->lnum + shl->rm.endpos[0].lnum && wp->w_cursor.lnum <= shl->lnum + linecount
&& (wp->w_cursor.lnum > shl->lnum && (wp->w_cursor.lnum > shl->lnum
|| wp->w_cursor.col >= shl->rm.startpos[0].col) || wp->w_cursor.col >= shl->rm.startpos[0].col)
&& (wp->w_cursor.lnum < shl->lnum + linecount && (wp->w_cursor.lnum < shl->lnum + linecount
@ -673,7 +673,6 @@ prepare_search_hl_line(
shl = &cur->hl; shl = &cur->hl;
shl->startcol = MAXCOL; shl->startcol = MAXCOL;
shl->endcol = MAXCOL; shl->endcol = MAXCOL;
shl->lines = 0;
shl->attr_cur = 0; shl->attr_cur = 0;
shl->is_addpos = FALSE; shl->is_addpos = FALSE;
shl->has_cursor = FALSE; shl->has_cursor = FALSE;
@ -697,9 +696,6 @@ prepare_search_hl_line(
shl->endcol = shl->rm.endpos[0].col; shl->endcol = shl->rm.endpos[0].col;
else else
shl->endcol = MAXCOL; shl->endcol = MAXCOL;
shl->lines = shl->rm.endpos[0].lnum - shl->rm.startpos[0].lnum;
if (shl->lines == 0)
shl->lines = 1;
// check if the cursor is in the match before changing the columns // check if the cursor is in the match before changing the columns
if (shl == search_hl) if (shl == search_hl)

1
src/structs.h
View File

@ -3331,7 +3331,6 @@ typedef struct
// found match (may continue in next line) // found match (may continue in next line)
buf_T *buf; // the buffer to search for a match buf_T *buf; // the buffer to search for a match
linenr_T lnum; // the line to search for a match linenr_T lnum; // the line to search for a match
linenr_T lines; // number of lines starting from lnum
int attr; // attributes to be used for a match int attr; // attributes to be used for a match
int attr_cur; // attributes currently active in win_line() int attr_cur; // attributes currently active in win_line()
linenr_T first_lnum; // first lnum to search for multi-line pat linenr_T first_lnum; // first lnum to search for multi-line pat

2
src/version.c
View File

@ -746,6 +746,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 */
/**/
4812,
/**/ /**/
4811, 4811,
/**/ /**/