* xdisp.c (try_scrolling): Use iterator to find the scroll margin, instead of window-end which does the wrong thing at eob. (try_cursor_movement): Minor optimization. (redisplay_window): If scroll margin is defined, don't assume window doesn't need scrolling.