Skip to content

Commit f538ee3

Browse files
author
René Köcher
committed
Add additional redraw checks for macligatures.
1 parent 0563b55 commit f538ee3

File tree

1 file changed

+29
-0
lines changed

1 file changed

+29
-0
lines changed

src/move.c

Lines changed: 29 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -107,6 +107,9 @@ comp_botline(wp)
107107
wp->w_cline_folded = folded;
108108
#endif
109109
redraw_for_cursorline(wp);
110+
#ifdef FEATU_GUI_MACVIM
111+
redraw_for_ligatures(wp);
112+
#endif
110113
wp->w_valid |= (VALID_CROW|VALID_CHEIGHT);
111114
}
112115
if (done + n > wp->w_height)
@@ -145,6 +148,29 @@ redraw_for_cursorline(wp)
145148
redraw_win_later(wp, SOME_VALID);
146149
}
147150

151+
#ifdef FEAT_GUI_MACVIM
152+
/*
153+
* Redraw when 'macliguters' is set.
154+
* This is basically the same as when 'cursorline'
155+
* or 'relativenumber' is set but unconditional.
156+
*/
157+
static void
158+
redraw_for_ligatures(wp)
159+
win_T *wp;
160+
{
161+
/* Only if ligatures are on but neither
162+
* 'cursorline' nor 'relativenumber'.
163+
*/
164+
if (p_macligatures
165+
&& (wp->w_p_rnu == 0
166+
#ifdef FEAT_SYN_HL
167+
|| wp->w_p_cul == 0
168+
#endif
169+
))
170+
redraw_win_later(wp, CLEAR);
171+
}
172+
#endif
173+
148174
/*
149175
* Update curwin->w_topline and redraw if necessary.
150176
* Used to update the screen before printing a message.
@@ -793,6 +819,9 @@ curs_rows(wp)
793819
}
794820

795821
redraw_for_cursorline(curwin);
822+
#ifdef FEAT_GUI_MACVIM
823+
redraw_for_ligatures(curwin);
824+
#endif
796825
wp->w_valid |= VALID_CROW|VALID_CHEIGHT;
797826

798827
}

0 commit comments

Comments
 (0)