* xdisp.c (move_it_to): When stopping at a charpos, check if that's a continued multi-char glyph; if so, advance to the actual glyph. (try_window): Check scroll margin on bottom window edge too.