comparison src/xdisp.c @ 108821:d54e74c34f05

Prevent unnecessary scrolling in bidi-reordered buffers. xdisp.c (try_cursor_movement): back up to non-continuation line only after finding point's row..

108815:93729e1f822d

	  row = MATRIX_ROW (w->current_matrix, w->last_cursor.vpos);
	  if (row->mode_line_p)
	    ++row;
	  if (!row->enabled_p)
	    rc = CURSOR_MOVEMENT_MUST_SCROLL;
	  /* If rows are bidi-reordered, back up until we find a row
	     that does not belong to a continuation line.  This is
	     because we must consider all rows of a continued line as
	     candidates for cursor positioning, since row start and
	     end positions change non-linearly with vertical position
	     in such rows.  */
	  /* FIXME: Revisit this when glyph ``spilling'' in
	     continuation lines' rows is implemented for
	     bidi-reordered rows.  */
	  if (!NILP (XBUFFER (w->buffer)->bidi_display_reordering))
	    {
	      while (MATRIX_ROW_CONTINUATION_LINE_P (row))
		{
		  xassert (row->enabled_p);
		  --row;
		  /* If we hit the beginning of the displayed portion
		     without finding the first row of a continued
		     line, give up.  */
		  if (row <= w->current_matrix->rows)
		    {
		      rc = CURSOR_MOVEMENT_MUST_SCROLL;
		      break;
		    }

		}
	    }
	}

      if (rc == CURSOR_MOVEMENT_CANNOT_BE_USED)
	{
	  int scroll_p = 0;

	    {
	      /* if PT is not in the glyph row, give up.  */
	      rc = CURSOR_MOVEMENT_MUST_SCROLL;
	    }
	  else if (rc != CURSOR_MOVEMENT_SUCCESS
		   && MATRIX_ROW_PARTIALLY_VISIBLE_P (w, row)
		   && make_cursor_line_fully_visible_p)
	    {
	      if (PT == MATRIX_ROW_END_CHARPOS (row)
		  && !row->ends_at_zv_p
		  && !MATRIX_ROW_ENDS_IN_MIDDLE_OF_CHAR_P (row))

108821:d54e74c34f05

	  row = MATRIX_ROW (w->current_matrix, w->last_cursor.vpos);
	  if (row->mode_line_p)
	    ++row;
	  if (!row->enabled_p)
	    rc = CURSOR_MOVEMENT_MUST_SCROLL;
	}

      if (rc == CURSOR_MOVEMENT_CANNOT_BE_USED)
	{
	  int scroll_p = 0;

	    {
	      /* if PT is not in the glyph row, give up.  */
	      rc = CURSOR_MOVEMENT_MUST_SCROLL;
	    }
	  else if (rc != CURSOR_MOVEMENT_SUCCESS
		   && !NILP (XBUFFER (w->buffer)->bidi_display_reordering))
	    {
	      /* If rows are bidi-reordered and point moved, back up
		 until we find a row that does not belong to a
		 continuation line.  This is because we must consider
		 all rows of a continued line as candidates for the
		 new cursor positioning, since row start and end
		 positions change non-linearly with vertical position
		 in such rows.  */
	      /* FIXME: Revisit this when glyph ``spilling'' in
		 continuation lines' rows is implemented for
		 bidi-reordered rows.  */
	      while (MATRIX_ROW_CONTINUATION_LINE_P (row))
		{
		  xassert (row->enabled_p);
		  --row;
		  /* If we hit the beginning of the displayed portion
		     without finding the first row of a continued
		     line, give up.  */
		  if (row <= w->current_matrix->rows)
		    {
		      rc = CURSOR_MOVEMENT_CANNOT_BE_USED;
		      break;
		    }

		}
	    }
	  if (rc == CURSOR_MOVEMENT_SUCCESS
	      || rc == CURSOR_MOVEMENT_CANNOT_BE_USED)
	    ;
	  else if (MATRIX_ROW_PARTIALLY_VISIBLE_P (w, row)
		   && make_cursor_line_fully_visible_p)
	    {
	      if (PT == MATRIX_ROW_END_CHARPOS (row)
		  && !row->ends_at_zv_p
		  && !MATRIX_ROW_ENDS_IN_MIDDLE_OF_CHAR_P (row))