Merged from miles@gnu.org--gnu-2005 (patch 116-117, 544-550)

Patches applied:

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

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

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

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

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

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

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

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

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

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

1 files changed, 44 insertions, 0 deletions

diff --git a/src/ChangeLog b/src/ChangeLog
index 29f3929ccd8..c0f1ceee87e 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,47 @@
+2005-09-15  Richard M. Stallman  <rms@gnu.org>
+
+        * xdisp.c (overlay_arrow_at_row): Add HAVE_WINDOW_SYSTEM conditional.
+        (display_mode_element): Instead of `lisp_string' and `this',
+        record `offset' and increment that.
+        `last_offset' replaces `last'.
+
+        * Makefile.in (XMENU_OBJ): Variable deleted.
+        (obj): Use xmenu.o unconditionally.
+        (SOME_MACHINE_OBJECTS): Delete xmenu.o.
+
+        * emacs.c (main): Don't conditionalize syms_of_xmenu on HAVE_XMENU.
+
+2005-09-15  Kim F. Storm  <storm@cua.dk>
+
+        * xdisp.c (move_it_vertically): Don't try to fetch byte BEGV-1.
+        (reseat_at_next_visible_line_start): Likewise (in xassert).
+
+2005-09-14  Romain Francoise  <romain@orebokech.com>
+
+        * fileio.c (write_region_inhibit_fsync): New variable.
+        (Fwrite_region): Use it to skip call to fsync.
+        (syms_of_fileio): Initialize it.
+
+2005-09-14  Kenichi Handa  <handa@m17n.org>
+
+        * coding.c (code_convert_region_unwind): Argument format changed.
+        (run_pre_post_conversion_on_str): If pre-write-conversion function
+        changed the current buffer, delete the new buffer.
+        (run_pre_write_conversin_on_c_str): Likewise.
+
+        * fileio.c (Fexpand_file_name): Check multibyteness of
+        default_directory.
+
+2005-09-13  Kenichi Handa  <handa@m17n.org>
+
+        * composite.c (compose_chars_in_text): Delete it.
+
+        * composite.h (compose_chars_in_text): Delete extern.
+
+2005-09-13  Kim F. Storm  <storm@cua.dk>
+
+        * print.c (print_error_message): Fix last change.
+
 2005-09-12  Kim F. Storm  <storm@cua.dk>
 
         * composite.c (compose_chars_in_text): Fix setup of `pend'.