Line marker too wide in Mac

[clavichord93]

When highlight_line is off, line marker exceeds into the editor. This is because the introduction of incremental diff indicator.

[kingkeith]

Issue: Account for gutter margin when drawing diff markers