Merged in changes from CVS HEAD

Patches applied:

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

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

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

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

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

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

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

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

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

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

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

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


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

1 files changed, 55 insertions, 0 deletions

diff --git a/src/ChangeLog b/src/ChangeLog
index 5f65301a7cd..ce03ac5ccda 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,58 @@
+2004-03-26  Masatake YAMATO  <jet@gyve.org>
+
+        * insdel.c (adjust_markers_for_insert): Call
+        fix_start_end_in_overlays.
+
+        * buffer.c (fix_start_end_in_overlays): Rename
+        fix_overlays_in_range.
+
+        * editfns.c (Ftranspose_regions): Likewise.
+
+        * lisp.h (top_level): Likewise.
+
+2004-03-20  Jan Dj,Ad(Brv  <jan.h.d@swipnet.se>
+
+        * xterm.c (handle_one_xevent): Do not pass key press events to
+        GTK.
+
+2004-03-19  Richard M. Stallman  <rms@gnu.org>
+
+        * s/sol2-6.h: Delete previous change.
+
+2004-03-19  Kim F. Storm  <storm@cua.dk>
+
+        * xdisp.c (move_it_in_display_line_to): Fix MOVE_TO_POS case when
+        to_charpos corresponds to newline in right fringe.  Use local
+        BUFFER_POS_REACHED_P macro.
+
+2004-03-19  Jan Dj,Ad(Brv  <jan.h.d@swipnet.se>
+
+        * xdisp.c (calc_pixel_width_or_height): Add ifdef HAVE_WINDOW_SYSTEM
+        to compile on non-window system.
+
+2004-03-19  Kim F. Storm  <storm@cua.dk>
+
+        * dispextern.h (calc_pixel_width_or_height): Add prototype.
+
+        * image.c (Qcenter): Move to xdisp.c.
+
+        * xdisp.c (Qcenter): Declare here.
+        (syms_of_xdisp): intern and staticpro it.
+        (handle_single_display_prop): Allow space display property on all
+        platforms.
+        (display_mode_line): Set mode_line_p before displaying line.
+        (calc_pixel_width_or_height): Declare extern.  Add separate :align-to
+        handling.  Remove complex cases for fringes and scroll-bars.
+        Add left, right, and center alignment positions. Add text (area)
+        width/height.  Return width or height for image specs.
+        (produce_stretch_glyph): Improve handling of :align-to.  Is now
+        relative to left of text area by default, but other base offsets
+        can be specified -- also for text lines.
+
+        * term.c (produce_glyphs): Handle IT_STRETCH.
+        (produce_stretch_glyph): New function to handle space width and
+        align-to display properties on non-window systems.
+
 2004-03-17  Stefan Monnier  <monnier@iro.umontreal.ca>
 
         * fileio.c (Fread_file_name): Set completion-ignore-case for