Merged in changes from CVS trunk.

Patches applied:

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

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

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

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

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

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

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

 * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-275
   Update from CVS: man/makefile.w32-in: Revert last change

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

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

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

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

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

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

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

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

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

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

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


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

1 files changed, 71 insertions, 0 deletions

diff --git a/src/ChangeLog b/src/ChangeLog
index f8a9e5fb767..cf2201e95dd 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,74 @@
+2004-05-07  Juanma Barranquero  <lektu@terra.es>
+
+        * window.c (Fset_window_buffer): Fix docstring.
+
+2004-05-06  Thien-Thi Nguyen  <ttn@gnu.org>
+
+        * emacs.c (main) [VMS]: Fix var ref.
+
+2004-05-06  Romain Francoise  <romain@orebokech.com>  (tiny change)
+
+        * data.c (Fsetq_default): Fix docstring.
+
+2004-05-06  Jason Rumney  <jasonr@gnu.org>
+
+        * image.c (Display) [HAVE_NTGUI]: Redefine while loading xpm.h
+        to avoid name clash.
+
+2004-05-04  Jan Dj,Ad(Brv  <jan.h.d@swipnet.se>
+
+        * fileio.c (barf_or_query_if_file_exists): Use lstat.
+        (Frename_file): Handle renaming of symlinks across file systems.
+        (Frename_file): Put symlink handling inside #ifdef S_IFLNK.
+
+2004-05-04  Kim F. Storm  <storm@cua.dk>
+
+        * xdisp.c (Qtotal): New var.
+        (syms_of_xdisp): Intern and staticpro it.
+        (calc_line_height_property): New arg total.  Set it if
+        line-spacing property has format (total . VALUE).
+        (x_produce_glyphs): Ignore line-spacing if line-height is 0.
+        Handle total line-spacing property.
+
+2004-05-03  Jan Dj,Ad(Brv  <jan.h.d@swipnet.se>
+
+        * gtkutil.c (xg_update_scrollbar_pos): Call XClearWindow to clear
+        "under" scroll bar when size/position changes.
+
+2004-05-03  Jason Rumney  <jasonr@gnu.org>
+
+        * makefile.nt: Remove.
+
+2004-05-02  Eli Zaretskii  <eliz@gnu.org>
+
+        * syntax.h (SET_RAW_SYNTAX_ENTRY, SYNTAX_ENTRY_INT): Avoid
+        compiler warnings.
+
+        * Makefile.in (region-cache.o): Depend on config.h.
+
+2004-05-02  Romain Francoise  <romain@orebokech.com>  (tiny change)
+
+        * indent.c (compute_motion): Save vpos in prev_vpos when dealing
+        with continuation lines, too.
+
+2004-05-02  Thien-Thi Nguyen  <ttn@gnu.org>
+
+        * syssignal.h (init_signals): Move decl outside `#ifdef POSIX_SIGNALS'.
+
+2004-05-01  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+        * xdisp.c (calc_line_height_property): YAILOM (yet another
+        int/Lisp_Object mixup).
+
+2004-05-01  Eli Zaretskii  <eliz@gnu.org>
+
+        * msdos.c (top-level): Add "#pragma pack(0)" after <dir.h>, to
+        undo bad effect of pack(4) in some versions of system headers.
+
+2004-05-01  Jason Rumney  <jasonr@gnu.org>
+
+        * w32term.c (x_draw_hollow_cursor): Sync with xterm.c
+
 2004-04-30  Kim F. Storm  <storm@cua.dk>
 
         * buffer.c (syms_of_buffer) <line-spacing>: Allow float value.