aniani/vim
0
0
Fork 1
mirror of https://github.com/vim/vim.git synced 2025-09-29 04:34:16 -04:00
Code Activity

patch 8.1.1747: compiler warning for unused variables

Browse Source 
Problem:    Compiler warning for unused variables. (Tony Mechelynck)
Solution:   Add #ifdef.
This commit is contained in:
Bram Moolenaar
2019-07-25 20:53:03 +02:00
parent 94f82cbacf
commit fbfb757d4c
2 changed files with 14 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
src/screen.c
View File

@@ -1091,8 +1091,7 @@ win_update(win_T *wp)
int scrolled_down = FALSE; /* TRUE when scrolled down when int scrolled_down = FALSE; /* TRUE when scrolled down when
w_topline got smaller a bit */ w_topline got smaller a bit */
#ifdef FEAT_SEARCH_EXTRA #ifdef FEAT_SEARCH_EXTRA
matchitem_T *cur; /* points to the match list */ int top_to_mod = FALSE; // redraw above mod_top
int top_to_mod = FALSE; /* redraw above mod_top */
#endif #endif
int row; /* current window row to display */ int row; /* current window row to display */
@@ -1222,18 +1221,18 @@ win_update(win_T *wp)
mod_bot = buf->b_mod_bot; mod_bot = buf->b_mod_bot;
#ifdef FEAT_SEARCH_EXTRA #ifdef FEAT_SEARCH_EXTRA
/* When 'hlsearch' is on and using a multi-line search pattern, a // When 'hlsearch' is on and using a multi-line search pattern, a
* change in one line may make the Search highlighting in a // change in one line may make the Search highlighting in a
* previous line invalid. Simple solution: redraw all visible // previous line invalid. Simple solution: redraw all visible
* lines above the change. // lines above the change.
* Same for a match pattern. // Same for a match pattern.
*/
if (search_hl.rm.regprog != NULL if (search_hl.rm.regprog != NULL
&& re_multiline(search_hl.rm.regprog)) && re_multiline(search_hl.rm.regprog))
top_to_mod = TRUE; top_to_mod = TRUE;
else else
{ {
cur = wp->w_match_head; matchitem_T *cur = wp->w_match_head;
while (cur != NULL) while (cur != NULL)
{ {
if (cur->match.regprog != NULL if (cur->match.regprog != NULL
@@ -3315,7 +3314,9 @@ win_line(
#endif #endif
int screen_line_flags = 0; int screen_line_flags = 0;
#if defined(FEAT_CONCEAL) || defined(FEAT_SEARCH_EXTRA)
int match_conc = 0; // cchar for match functions int match_conc = 0; // cchar for match functions
#endif
#ifdef FEAT_CONCEAL #ifdef FEAT_CONCEAL
int syntax_flags = 0; int syntax_flags = 0;
int syntax_seqnr = 0; int syntax_seqnr = 0;
@@ -3859,7 +3860,9 @@ win_line(
*/ */
for (;;) for (;;)
{ {
#if defined(FEAT_CONCEAL) || defined(FEAT_SEARCH_EXTRA)
int has_match_conc = 0; // match wants to conceal int has_match_conc = 0; // match wants to conceal
#endif
#ifdef FEAT_CONCEAL #ifdef FEAT_CONCEAL
int did_decrement_ptr = FALSE; int did_decrement_ptr = FALSE;
#endif #endif

2
src/version.c
View File

@@ -777,6 +777,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 */
/**/
1747,
/**/ /**/
1746, 1746,
/**/ /**/