[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] /srv/bzr/emacs/trunk r104304: Merge from emacs-23; up to r
From: |
Glenn Morris |
Subject: |
[Emacs-diffs] /srv/bzr/emacs/trunk r104304: Merge from emacs-23; up to r100582. |
Date: |
Fri, 20 May 2011 19:15:34 -0700 |
User-agent: |
Bazaar (2.3.1) |
------------------------------------------------------------
revno: 104304 [merge]
committer: Glenn Morris <address@hidden>
branch nick: trunk
timestamp: Fri 2011-05-20 19:15:34 -0700
message:
Merge from emacs-23; up to r100582.
modified:
src/ChangeLog
src/dispnew.c
=== modified file 'src/ChangeLog'
--- a/src/ChangeLog 2011-05-21 02:04:48 +0000
+++ b/src/ChangeLog 2011-05-21 02:15:34 +0000
@@ -1,3 +1,8 @@
+2011-05-21 YAMAMOTO Mitsuharu <address@hidden>
+
+ * 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 <address@hidden>
* Makefile.in ($(etc)/DOC): Make second command line even shorter.
=== modified file 'src/dispnew.c'
--- a/src/dispnew.c 2011-05-12 07:07:06 +0000
+++ b/src/dispnew.c 2011-05-21 02:15:34 +0000
@@ -4330,23 +4330,29 @@
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)
{
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Emacs-diffs] /srv/bzr/emacs/trunk r104304: Merge from emacs-23; up to r100582.,
Glenn Morris <=