Merged from

Patches applied:

 * emacs@sv.gnu.org/emacs--devo--0--patch-116
   Update from CVS

 * emacs@sv.gnu.org/emacs--devo--0--patch-117
   Update from CVS

 * emacs@sv.gnu.org/emacs--devo--0--patch-118
   Merge from gnus--rel--5.10

 * emacs@sv.gnu.org/emacs--devo--0--patch-119
   Update from CVS

 * emacs@sv.gnu.org/gnus--rel--5.10--patch-38
   Update from CVS

 * emacs@sv.gnu.org/gnus--rel--5.10--patch-39
   Update from CVS

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

1 files changed, 17 insertions, 0 deletions

diff --git a/src/ChangeLog b/src/ChangeLog
index 2630efe73b7..d8e0b6fb4e1 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,20 @@
+2006-02-24  Kenichi Handa  <handa@m17n.org>
+
+        * fileio.c (Finsert_file_contents): When a text is replaced
+        partially, be sure to set point before the inserted characters.
+
+2006-02-23  Zhang Wei  <id.brep@gmail.com>  (tiny change)
+
+        * xfns.c (Fx_file_dialog): Return a decoded file name.
+
+2006-02-23  YAMAMOTO Mitsuharu  <mituharu@math.s.chiba-u.ac.jp>
+
+        * dispnew.c (update_text_area): Avoid needless redraw of rightmost
+        glyph whose face is extended to the text area end.
+
+        * macterm.c (x_set_toolkit_scroll_bar_thumb): Don't set control
+        values if control is not visible or values are not changed.
+
 2006-02-22  Stefan Monnier  <monnier@iro.umontreal.ca>
 
         * window.c (Fwindow_list): Check `window' before doing XWINDOW.