(window_scroll_pixel_based): Move outside a

multi-glyph character before setting new window start.

(window_scroll_pixel_based): Fix check for reaching BEGV.
Don't try to make last line fully visible if it is past end of window.

(window_scroll_pixel_based): Don't call Fbolp;
instead, see if the new start pos is at beginning of line.

(window_scroll_pixel_based): Exit the move_it_by_lines
loop whenever it stops making progress.

diff --git a/src/ChangeLog b/src/ChangeLog
index 2e45a7bd01d0889c3f14e343574b8c65aff2ecea..e75688eb078c2accffe2aa7ce8e1ee776e8f1c0e 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,19 @@
+2003-06-10  Andreas Schwab  <schwab@suse.de>
+
+       * window.c (window_scroll_pixel_based): Move outside a
+       multi-glyph character before setting new window start.
+
+2003-06-10  Richard M. Stallman  <rms@gnu.org>
+
+       * window.c (window_scroll_pixel_based): Fix check for reaching BEGV.
+       Don't try to make last line fully visible if it is past end of window.
+
+       * window.c (window_scroll_pixel_based): Don't call Fbolp;
+       instead, see if the new start pos is at beginning of line.
+
+       * window.c (window_scroll_pixel_based): Exit the move_it_by_lines
+       loop whenever it stops making progress.
+
 2003-06-04  Kenichi Handa  <handa@m17n.org>
 
        * coding.c (encoding_buffer_size): If coding->type is

diff --git a/src/window.c b/src/window.c
index 744cfd8cd3a50c421b3e6afac7aba6f9d4e26169..e773290226ac590fb15e14dd0d763d3eae667744 100644 (file)
--- a/src/window.c
+++ b/src/window.c
@@ -4049,14 +4049,17 @@ window_scroll_pixel_based (window, n, whole, noerror)
   else
     move_it_by_lines (&it, n, 1);
 
-  /* End if we end up at ZV or BEGV.  */
+  /* We failed if we find ZV is already on the screen (scrolling up,
+     means there's nothing past the end), or if we can't start any
+     earlier (scrolling down, means there's nothing past the top).  */
   if ((n > 0 && IT_CHARPOS (it) == ZV)
       || (n < 0 && IT_CHARPOS (it) == CHARPOS (start)))
     {
       if (IT_CHARPOS (it) == ZV)
        {
-         if (it.current_y + it.max_ascent + it.max_descent
-             > it.last_visible_y)
+         if (it.current_y < it.last_visible_y
+             && (it.current_y + it.max_ascent + it.max_descent
+                 >= it.last_visible_y))
            {
              /* The last line was only partially visible, make it fully
                 visible.  */
@@ -4091,10 +4094,23 @@ window_scroll_pixel_based (window, n, whole, noerror)
 
   if (! vscrolled)
     {
+      int pos = IT_CHARPOS (it);
+      int bytepos;
+
+      /* If in the middle of a multi-glyph character move forward to
+        the next character.  */
+      if (in_display_vector_p (&it))
+       {
+         ++pos;
+         move_it_to (&it, pos, -1, -1, -1, MOVE_TO_POS);
+       }
+
       /* Set the window start, and set up the window for redisplay.  */
-      set_marker_restricted (w->start, make_number (IT_CHARPOS (it)),
+      set_marker_restricted (w->start, make_number (pos),
                             w->buffer);
-      w->start_at_line_beg = Fbolp ();
+      bytepos = XMARKER (w->start)->bytepos;
+      w->start_at_line_beg = ((pos == BEGV || FETCH_BYTE (bytepos - 1) == '\n')
+                             ? Qt : Qnil);
       w->update_mode_line = Qt;
       XSETFASTINT (w->last_modified, 0);
       XSETFASTINT (w->last_overlay_modified, 0);
@@ -4124,7 +4140,12 @@ window_scroll_pixel_based (window, n, whole, noerror)
             in the scroll margin at the top.  */
          move_it_to (&it, PT, -1, -1, -1, MOVE_TO_POS);
          while (it.current_y < this_scroll_margin)
-           move_it_by_lines (&it, 1, 1);
+           {
+             int prev = it.current_y;
+             move_it_by_lines (&it, 1, 1);
+             if (prev == it.current_y)
+               break;
+           }
          SET_PT_BOTH (IT_CHARPOS (it), IT_BYTEPOS (it));
        }
       else if (n < 0)