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

[gnu-emacs] / src / window.c

diff --git a/src/window.c b/src/window.c
index 0b0f2140a5821e757668c5b739cb0489a46f6225..2c9292d5b02de5f0f5d91370659401ea0255d59d 100644 (file)
--- 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);