* xdisp.c (draw_glyphs): Set clipping to highlight boundaries.  [Backport]
* xdisp.c (erase_phys_cursor): Fix confusion between window-relative and text area-relative x-coordinates.  [Backport]