procyberian/emacs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge from emacs-23; up to 2010-06-11T18:51:00Z!juri@jurta.org.

Browse source
This commit is contained in:
Glenn Morris 2011-05-20 19:15:34 -07:00
commit a57471f935
2 changed files with 23 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
src/ChangeLog
View file

@ -1,3 +1,8 @@
2011-05-21 YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
* dispnew.c (scrolling_window): Don't exclude the case that the
last enabled row in the desired matrix touches the bottom boundary.
2011-05-21 Glenn Morris <rgm@gnu.org>
* Makefile.in ($(etc)/DOC): Make second command line even shorter.

30
src/dispnew.c
View file

@ -4330,23 +4330,29 @@ scrolling_window (struct window *w, int header_line_p)
first_old = first_new = i;
/* Set last_new to the index + 1 of the last enabled row in the
desired matrix. */
/* Set last_new to the index + 1 of the row that reaches the
bottom boundary in the desired matrix. Give up if we find a
disabled row before we reach the bottom boundary. */
i = first_new + 1;
while (i < desired_matrix->nrows - 1
&& MATRIX_ROW (desired_matrix, i)->enabled_p
&& MATRIX_ROW_BOTTOM_Y (MATRIX_ROW (desired_matrix, i)) <= yb)
++i;
while (i < desired_matrix->nrows - 1)
{
int bottom;
if (!MATRIX_ROW (desired_matrix, i)->enabled_p)
return 0;
if (!MATRIX_ROW (desired_matrix, i)->enabled_p)
return 0;
bottom = MATRIX_ROW_BOTTOM_Y (MATRIX_ROW (desired_matrix, i));
if (bottom <= yb)
++i;
if (bottom >= yb)
break;
}
last_new = i;
/* Set last_old to the index + 1 of the last enabled row in the
current matrix. We don't look at the enabled flag here because
we plan to reuse part of the display even if other parts are
disabled. */
/* Set last_old to the index + 1 of the row that reaches the bottom
boundary in the current matrix. We don't look at the enabled
flag here because we plan to reuse part of the display even if
other parts are disabled. */
i = first_old + 1;
while (i < current_matrix->nrows - 1)
{