Merged from miles@gnu.org--gnu-2005 (patch 91-94)

Patches applied:

 * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-91
   Update from CVS

 * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-92
   Update from CVS

 * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-93
   Update from CVS

 * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-94
   Update from CVS

git-archimport-id: lorentey@elte.hu--2004/emacs--multi-tty--0--patch-293

3 files changed, 26 insertions, 3 deletions

diff --git a/src/ChangeLog b/src/ChangeLog
index c00c06cc358..c6ab6985ed0 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,16 @@
+2005-02-12  Dan Nicolaescu  <dann@ics.uci.edu>
+
+        * keyboard.c: If HAVE_FCNTL_H include fcntl.h.
+
+2005-02-12  Kim F. Storm  <storm@cua.dk>
+
+        * xdisp.c (expose_window): Don't fix overlaps for mode lines.
+
+2005-02-10  Kim F. Storm  <storm@cua.dk>
+
+        * xdisp.c (try_window_id): Set first_unchanged_at_end_row to NULL
+        if it moves outside window or it doesn't display text.
+
 2005-02-09  Kim F. Storm  <storm@cua.dk>
 
         * undo.c (Fprimitive_undo): Check that undo function does not
diff --git a/src/keyboard.c b/src/keyboard.c
index 24dd7f12607..f3245a59669 100644
--- a/src/keyboard.c
+++ b/src/keyboard.c
@@ -64,6 +64,10 @@ Boston, MA 02111-1307, USA.  */
 #include <unistd.h>
 #endif
 
+#ifdef HAVE_FCNTL_H
+#include <fcntl.h>
+#endif
+
 /* This is to get the definitions of the XK_ symbols.  */
 #ifdef HAVE_X_WINDOWS
 #include "xterm.h"
diff --git a/src/xdisp.c b/src/xdisp.c
index ecbd5398120..992c277c898 100644
--- a/src/xdisp.c
+++ b/src/xdisp.c
@@ -13825,7 +13825,12 @@ try_window_id (w)
                         bottom_vpos, dy);
 
   if (first_unchanged_at_end_row)
-    first_unchanged_at_end_row += dvpos;
+    {
+      first_unchanged_at_end_row += dvpos;
+      if (first_unchanged_at_end_row->y >= it.last_visible_y
+          || !MATRIX_ROW_DISPLAYS_TEXT_P (first_unchanged_at_end_row))
+        first_unchanged_at_end_row = NULL;
+    }
 
   /* If scrolling up, there may be some lines to display at the end of
      the window.  */
@@ -13882,7 +13887,6 @@ try_window_id (w)
 
   /* Update window_end_pos and window_end_vpos.  */
   if (first_unchanged_at_end_row
-      && first_unchanged_at_end_row->y < it.last_visible_y
       && !last_text_row_at_end)
     {
       /* Window end line if one of the preserved rows from the current
@@ -22088,7 +22092,9 @@ expose_window (w, fr)
               || (r.y >= y0 && r.y < y1)
               || (r.y + r.height > y0 && r.y + r.height < y1))
             {
-              if (row->overlapping_p)
+              /* A header line may be overlapping, but there is no need
+                 to fix overlapping areas for them.  KFS 2005-02-12 */
+              if (row->overlapping_p && !row->mode_line_p)
                 {
                   if (first_overlapping_row == NULL)
                     first_overlapping_row = row;