Merged from miles@gnu.org--gnu-2005 (patch 66, 266-268)

Patches applied:

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

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

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

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

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

1 files changed, 52 insertions, 1 deletions

diff --git a/src/ChangeLog b/src/ChangeLog
index 3483a2c5905..ac7d5fb07f3 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,55 @@
+2005-04-18  Kim F. Storm  <storm@cua.dk>
+
+        * dispextern.h (struct glyph_row): New member overlay_arrow_bitmap.
+        It replaces the corresponding member from struct window, as a
+        window may now show multiple overlay arrows.
+        Remove member overlay_arrow_p, superseeded by overlay_arrow_bitmap.
+
+        * dispnew.c (row_equal_p, update_window_line, scrolling_window):
+        Compare overlay_arrow_bitmap than overlay_arrow_p members.
+
+        * fringe.c (draw_fringe_bitmap): Use overlay_arrow_bitmap from row
+        rather than from window.
+        (update_window_fringes): Compare overlay_arrow_bitmap rather than
+        overlay_arrow_p members.
+        (Ffringe_bitmaps_at_pos): Return fringe overlay_arrow_bitmap name
+        if not default.
+
+        * window.h (struct window): Remove member overlay_arrow_bitmap.
+
+        * window.c (make_window): Don't initialize overlay_arrow_bitmap.
+
+        * xdisp.c (overlay_arrow_string_or_property): Remove PBITMAP arg.
+        Calls changed.  Don't check for overlay-arrow-bitmap property here.
+        (overlay_arrow_at_row): Remove PBITMAP arg.  Instead, if left
+        fringe is present, return Lisp integer for bitmap (or -1 for default).
+        Fix value of overlay-arrow-bitmap property to be a symbol, use
+        lookup_fringe_bitmap to parse it.
+        (display_line): Change call to overlay_arrow_at_row.  Store integer
+        return value as overlay bitmap in row rather than window.
+        Only show overlay arrow if row displays text, or if no other overlay
+        arrow is seen in window (if overlay marker is at point-max).
+
+2005-04-18  Thien-Thi Nguyen  <ttn@gnu.org>
+
+        * xfaces.c (realize_x_face) [!HAVE_WINDOW_SYSTEM]: Return NULL.
+
+2005-04-18  Lute Kamstra  <lute@gnu.org>
+
+        * lread.c (Vloads_in_progress): Static.
+        * fns.c (Vloads_in_progress): Remove extern.
+        (load_in_progress): Add extern.
+        (Frequire): Use load_in_progress instead of Vloads_in_progress.
+
+2005-04-18  Thien-Thi Nguyen  <ttn@gnu.org>
+
+        * xmenu.c (Fx_popup_menu): Initialize error_name to NULL.
+
+2005-04-18  YAMAMOTO Mitsuharu  <mituharu@math.s.chiba-u.ac.jp>
+
+        * macterm.c (XTread_socket): Don't beep on keyboard input even if
+        no frame is visible.
+
 2005-04-16  Dan Nicolaescu  <dann@ics.uci.edu>
 
         * term.c (struct keys): Add support for shifted keys.
@@ -110,7 +162,6 @@
         into "(any string)".
 
         * lread.c (Vloads_in_progress): Not static.
-
         * fns.c (Vloads_in_progress): Add extern.
         (Frequire): Don't do LOADHIST_ATTACH if Vloads_in_progress is nil.