Revision: miles@gnu.org--gnu-2004/emacs--unicode--0--patch-43

Merge from emacs--cvs-trunk--0

Patches applied:

 * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-553
 - miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-557
   Update from CVS

 * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-558
   Merge from gnus--rel--5.10

 * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-559
 - miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-561
   Update from CVS

 * miles@gnu.org--gnu-2004/gnus--rel--5.10--patch-30
   Update from CVS

5 files changed, 65 insertions, 11 deletions

diff --git a/src/ChangeLog b/src/ChangeLog
index 955c8929f92..e71a0e3217d 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,15 @@
+2004-09-18  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+        * xterm.c (x_term_init): Work around a bug in some X servers.
+
+2004-09-18  Richard M. Stallman  <rms@gnu.org>
+
+        * buffer.c (syms_of_buffer) <default-major-mode>: Doc fix.
+
+        * xdisp.c (try_window_reusing_current_matrix):
+        Handle the case where we reach the old displayed text,
+        out of sync with the old line boundary.
+
 2004-09-14  Stefan  <monnier@iro.umontreal.ca>
 
         * fileio.c (Finsert_file_contents): Fix case of replacement in a
diff --git a/src/alloc.c b/src/alloc.c
index 4b31ec7897e..e783ba581e0 100644
--- a/src/alloc.c
+++ b/src/alloc.c
@@ -186,8 +186,11 @@ Lisp_Object Vmemory_full;
 
 #ifndef HAVE_SHM
 
-/* Force it into data space!  Initialize it to a nonzero value;
-   otherwise some compilers put it into BSS.  */
+/* Initialize it to a nonzero value to force it into data space
+   (rather than bss space).  That way unexec will remap it into text
+   space (pure), on some systems.  We have not implemented the
+   remapping on more recent systems because this is less important
+   nowadays than in the days of small memories and timesharing.  */
 
 EMACS_INT pure[PURESIZE / sizeof (EMACS_INT)] = {1,};
 #define PUREBEG (char *) pure
diff --git a/src/buffer.c b/src/buffer.c
index 2084d80049a..75339c4fc85 100644
--- a/src/buffer.c
+++ b/src/buffer.c
@@ -5446,7 +5446,14 @@ Decimal digits after the % specify field width to which to pad.  */);
 
   DEFVAR_LISP_NOPRO ("default-major-mode", &buffer_defaults.major_mode,
                      doc: /* *Major mode for new buffers.  Defaults to `fundamental-mode'.
-nil here means use current buffer's major mode.  */);
+nil here means use current buffer's major mode, provided it is not
+marked as "special".
+
+When a mode is used by default, `find-file' switches to it
+before it reads the contents into the buffer and before
+it finishes setting up the buffer.  Thus, the mode and
+its hooks should not expect certain variables such as
+`buffer-read-only' and `buffer-file-coding-system' to be set up.  */);
 
   DEFVAR_PER_BUFFER ("major-mode", &current_buffer->major_mode,
                      make_number (Lisp_Symbol),
diff --git a/src/xdisp.c b/src/xdisp.c
index a756b99577c..d8166a30df5 100644
--- a/src/xdisp.c
+++ b/src/xdisp.c
@@ -12504,10 +12504,36 @@ try_window_reusing_current_matrix (w)
       last_text_row = last_reused_text_row = NULL;
 
       while (it.current_y < it.last_visible_y
-             && IT_CHARPOS (it) < CHARPOS (start)
              && !fonts_changed_p)
-        if (display_line (&it))
-          last_text_row = it.glyph_row - 1;
+        {
+          /* If we have reached into the characters in the START row,
+             that means the line boundaries have changed.  So we
+             can't start copying with the row START.  Maybe it will
+             work to start copying with the following row.  */
+          while (IT_CHARPOS (it) > CHARPOS (start))
+            {
+              /* Advance to the next row as the "start".  */
+              start_row++;
+              start = start_row->start.pos;
+              /* If there are no more rows to try, or just one, give up.  */
+              if (start_row == MATRIX_MODE_LINE_ROW (w->current_matrix) - 1
+                  || w->vscroll || MATRIX_ROW_PARTIALLY_VISIBLE_P (start_row)
+                  || CHARPOS (start) == ZV)
+                {
+                  clear_glyph_matrix (w->desired_matrix);
+                  return 0;
+                }
+
+              start_vpos = MATRIX_ROW_VPOS (start_row, w->current_matrix);
+            }
+          /* If we have reached alignment,
+             we can copy the rest of the rows.  */
+          if (IT_CHARPOS (it) == CHARPOS (start))
+            break;
+
+          if (display_line (&it))
+            last_text_row = it.glyph_row - 1;
+        }
 
       /* A value of current_y < last_visible_y means that we stopped
          at the previous window start, which in turn means that we
@@ -12515,12 +12541,12 @@ try_window_reusing_current_matrix (w)
       if (it.current_y < it.last_visible_y)
         {
           /* IT.vpos always starts from 0; it counts text lines.  */
-          nrows_scrolled = it.vpos;
+          nrows_scrolled = it.vpos - (start_row - MATRIX_FIRST_TEXT_ROW (w->current_matrix));
 
           /* Find PT if not already found in the lines displayed.  */
           if (w->cursor.vpos < 0)
             {
-              int dy = it.current_y - first_row_y;
+              int dy = it.current_y - start_row->y;
 
               row = MATRIX_FIRST_TEXT_ROW (w->current_matrix);
               row = row_containing_pos (w, PT, row, NULL, dy);
@@ -12540,7 +12566,7 @@ try_window_reusing_current_matrix (w)
              scroll_run_hook will clear the cursor, and use the
              current matrix to get the height of the row the cursor is
              in.  */
-          run.current_y = first_row_y;
+          run.current_y = start_row->y;
           run.desired_y = it.current_y;
           run.height = it.last_visible_y - it.current_y;
 
@@ -15435,6 +15461,10 @@ display_mode_element (it, depth, field_width, precision, elt, props, risky)
             Lisp_Object oprops, aelt;
             oprops = Ftext_properties_at (make_number (0), elt);
 
+            /* If the starting string's properties are not what
+               we want, translate the string.  Also, if the string
+               is risky, do that anyway.  */
+
             if (NILP (Fequal (props, oprops)) || risky)
               {
                 /* If the starting string has properties,
diff --git a/src/xterm.c b/src/xterm.c
index e7fb798eb60..cf7ec09cf46 100644
--- a/src/xterm.c
+++ b/src/xterm.c
@@ -10611,10 +10611,12 @@ x_term_init (display_name, xrm_option, resource_name)
     int screen_number = XScreenNumberOfScreen (dpyinfo->screen);
     double pixels = DisplayHeight (dpyinfo->display, screen_number);
     double mm = DisplayHeightMM (dpyinfo->display, screen_number);
-    dpyinfo->resy = pixels * 25.4 / mm;
+    /* Mac OS X 10.3's Xserver sometimes reports 0.0mm.  */
+    dpyinfo->resy = (mm < 1) ? 100 : pixels * 25.4 / mm;
     pixels = DisplayWidth (dpyinfo->display, screen_number);
+    /* Mac OS X 10.3's Xserver sometimes reports 0.0mm.  */
     mm = DisplayWidthMM (dpyinfo->display, screen_number);
-    dpyinfo->resx = pixels * 25.4 / mm;
+    dpyinfo->resx = (mm < 1) ? 100 : pixels * 25.4 / mm;
   }
 
   dpyinfo->Xatom_wm_protocols