Merged from miles@gnu.org--gnu-2005 (patch 31-33, 129-141)

Patches applied:

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

 * miles@gnu.org--gnu-2005/gnus--rel--5.10--patch-33
   Update from CVS

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

5 files changed, 37 insertions, 20 deletions

diff --git a/src/ChangeLog b/src/ChangeLog
index 23074668343..56833a341a4 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,19 @@
+2005-02-27  Jan Dj,Ad(Brv  <jan.h.d@swipnet.se>
+
+        * gtkutil.c (xg_resize_outer_widget): Removed unneeded call to
+        gtk_window_resize and x_wm_set_size_hint.
+
+2005-02-25  Kim F. Storm  <storm@cua.dk>
+
+        * dispextern.h (OVERLAY_STRING_CHUNK_SIZE): Increase from 3 to 16.
+
+        * xdisp.c (init_from_display_pos): Don't read past end of
+        it->overlay_strings array.
+
+2005-02-25  Stephan Stahl <stahl@eos.franken.de>  (tiny change)
+
+        * buffer.c (syms_of_buffer): Fix typo.
+
 2005-02-23  Lute Kamstra  <lute@gnu.org>
 
         * buffer.c (Foverlay_buffer): Doc fix.
diff --git a/src/buffer.c b/src/buffer.c
index 3394e1dead2..8738466abd1 100644
--- a/src/buffer.c
+++ b/src/buffer.c
@@ -5673,7 +5673,7 @@ arrow bitmaps.
 
 If value is a symbol `left' or `right', both angle and arrow bitmaps
 are displayed in the left or right fringe, resp.  Any other value
-that doesn't look like an alist means displat the angle bitmaps in
+that doesn't look like an alist means display the angle bitmaps in
 the left fringe but no arrows.
 
 You can exercise more precise control by using an alist as the
diff --git a/src/dispextern.h b/src/dispextern.h
index 77dba7bb09e..5401fecedd5 100644
--- a/src/dispextern.h
+++ b/src/dispextern.h
@@ -1882,7 +1882,7 @@ struct it
 
   /* Vector of overlays to process.  Overlay strings are processed
      OVERLAY_STRING_CHUNK_SIZE at a time.  */
-#define OVERLAY_STRING_CHUNK_SIZE 3
+#define OVERLAY_STRING_CHUNK_SIZE 16
   Lisp_Object overlay_strings[OVERLAY_STRING_CHUNK_SIZE];
 
   /* Total number of overlay strings to process.  This can be >
diff --git a/src/gtkutil.c b/src/gtkutil.c
index c291b44f5a2..6dcba3036c0 100644
--- a/src/gtkutil.c
+++ b/src/gtkutil.c
@@ -556,12 +556,6 @@ xg_resize_outer_widget (f, columns, rows)
      int columns;
      int rows;
 {
-  gtk_window_resize (GTK_WINDOW (FRAME_GTK_OUTER_WIDGET (f)),
-                     FRAME_PIXEL_WIDTH (f), FRAME_TOTAL_PIXEL_HEIGHT (f));
-
-  /* base_height is now changed.  */
-  x_wm_set_size_hint (f, 0, 0);
-
   /* If we are not mapped yet, set geometry once again, as window
      height now have changed.  */
   if (! GTK_WIDGET_MAPPED (FRAME_GTK_OUTER_WIDGET (f)))
diff --git a/src/xdisp.c b/src/xdisp.c
index 671b20683e8..5e17a7e3ca5 100644
--- a/src/xdisp.c
+++ b/src/xdisp.c
@@ -2534,7 +2534,10 @@ init_from_display_pos (it, w, pos)
      after-string.  */
   init_iterator (it, w, charpos, bytepos, NULL, DEFAULT_FACE_ID);
 
-  for (i = 0; i < it->n_overlay_strings; ++i)
+  /* This only scans the current chunk -- it should scan all chunks.
+     However, OVERLAY_STRING_CHUNK_SIZE has been increased from 3 in 21.1
+     to 16 in 22.1 to make this a lesser problem.  */
+  for (i = 0; i < it->n_overlay_strings && i < OVERLAY_STRING_CHUNK_SIZE; ++i)
     {
       const char *s = SDATA (it->overlay_strings[i]);
       const char *e = s + SBYTES (it->overlay_strings[i]);
@@ -5841,9 +5844,9 @@ move_it_in_display_line_to (it, to_charpos, to_x, op)
   ((op & MOVE_TO_POS) != 0                                      \
    && BUFFERP (it->object)                                      \
    && IT_CHARPOS (*it) >= to_charpos                            \
-   && (it->method == GET_FROM_BUFFER ||                         \
-       (it->method == GET_FROM_DISPLAY_VECTOR &&                \
-        it->dpvec + it->current.dpvec_index + 1 >= it->dpend)))
+   && (it->method == GET_FROM_BUFFER                            \
+       || (it->method == GET_FROM_DISPLAY_VECTOR                \
+           && it->dpvec + it->current.dpvec_index + 1 >= it->dpend)))
 
 
   while (1)
@@ -20772,8 +20775,10 @@ fast_find_position (w, charpos, hpos, vpos, x, y, stop)
 
   /* If whole rows or last part of a row came from a display overlay,
      row_containing_pos will skip over such rows because their end pos
-     equals the start pos of the overlay or interval.  Backtrack if we
-     have a STOP object and previous row's end glyph came from STOP.  */
+     equals the start pos of the overlay or interval.
+
+     Move back if we have a STOP object and previous row's
+     end glyph came from STOP.  */
   if (!NILP (stop))
     {
       struct glyph_row *prev;
@@ -20781,11 +20786,11 @@ fast_find_position (w, charpos, hpos, vpos, x, y, stop)
              && MATRIX_ROW_END_CHARPOS (prev) == charpos
              && prev->used[TEXT_AREA] > 0)
         {
-          end = prev->glyphs[TEXT_AREA];
-          glyph = end + prev->used[TEXT_AREA];
-          while (--glyph >= end
+          struct glyph *beg = prev->glyphs[TEXT_AREA];
+          glyph = beg + prev->used[TEXT_AREA];
+          while (--glyph >= beg
                  && INTEGERP (glyph->object));
-          if (glyph < end
+          if (glyph < beg
               || !EQ (stop, glyph->object))
             break;
           row = prev;
@@ -22814,8 +22819,10 @@ Bind this around calls to `message' to let it take effect.  */);
   message_truncate_lines = 0;
 
   DEFVAR_LISP ("menu-bar-update-hook",  &Vmenu_bar_update_hook,
-    doc: /* Normal hook run for clicks on menu bar, before displaying a submenu.
-Can be used to update submenus whose contents should vary.  */);
+    doc: /* Normal hook run to update the menu bar definitions.
+Redisplay runs this hook before it redisplays the menu bar.
+This is used to update submenus such as Buffers,
+whose contents depend on various data.  */);
   Vmenu_bar_update_hook = Qnil;
 
   DEFVAR_BOOL ("inhibit-menubar-update", &inhibit_menubar_update,