Merge branch 'master' into 2.6-rc

This commit is contained in:
Nicholas Marriott 2017-08-29 22:06:22 +01:00
commit 72488b526b

View File

@ -1508,10 +1508,17 @@ window_copy_update_selection(struct window_pane *wp, int may_redraw)
* of lines, and redraw just past that in both directions * of lines, and redraw just past that in both directions
*/ */
cy = data->cy; cy = data->cy;
if (data->cursordrag == CURSORDRAG_ENDSEL) {
if (sy < cy) if (sy < cy)
window_copy_redraw_lines(wp, sy, cy - sy + 1); window_copy_redraw_lines(wp, sy, cy - sy + 1);
else else
window_copy_redraw_lines(wp, cy, sy - cy + 1); window_copy_redraw_lines(wp, cy, sy - cy + 1);
} else {
if (endsy < cy)
window_copy_redraw_lines(wp, endsy, cy - endsy + 1);
else
window_copy_redraw_lines(wp, cy, endsy - cy + 1);
}
} }
return (1); return (1);