Merge from emacs-24; up to 2014-08-07T11:49:36Z!rrt@sc3d.org

1 files changed, 2 insertions, 2 deletions

diff --git a/src/window.c b/src/window.c
index 0b0f2140a58..2c9292d5b02 100644
--- a/src/window.c
+++ b/src/window.c
@@ -4930,8 +4930,8 @@ window_scroll_pixel_based (Lisp_Object window, int n, bool whole, int noerror)
       /* The function move_iterator_vertically may move over more than
          the specified y-distance.  If it->w is small, e.g. a
          mini-buffer window, we may end up in front of the window's
-         display area.  This is the case when Start displaying at the
-         start of the line containing PT in this case.  */
+         display area.  Start displaying at the start of the line
+         containing PT in this case.  */
       if (it.current_y <= 0)
         {
           init_iterator (&it, w, PT, PT_BYTE, NULL, DEFAULT_FACE_ID);