Merged from emacs@sv.gnu.org.

Patches applied:

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

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

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

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

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

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

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

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

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

1 files changed, 23 insertions, 0 deletions

diff --git a/src/ChangeLog b/src/ChangeLog
index f86c4c6a21c..ce3c7d1435b 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,26 @@
+2006-10-16  Jan Dj,Ad(Brv  <jan.h.d@swipnet.se>
+
+        * gtkutil.c (get_utf8_string): Remove warnings with casts.
+        (xg_tool_bar_button_cb): Ditto
+        (xg_tool_bar_callback): Ditto.
+
+2006-10-16  YAMAMOTO Mitsuharu  <mituharu@math.s.chiba-u.ac.jp>
+
+        * dispnew.c (adjust_frame_glyphs_for_frame_redisplay): Remove unused
+        variable ch_dim.
+        (adjust_frame_glyphs_for_window_redisplay): Likewise.  Don't allocate
+        menu bar window matrices on non-X systems.
+
+        * mac.c (Fmac_get_preference, Fmac_code_convert_string): Add GCPROs.
+
+        * macterm.c (mac_query_char_extents): Don't return glyph ID if layout
+        adjustment is needed.
+        (mac_load_query_font): Check if width and height are positive.
+
+2006-10-14  Richard Stallman  <rms@gnu.org>
+
+        * sysdep.c (init_sys_modes): Delete DEFVAR_LISP in the wrong place.
+
 2006-10-13  Chong Yidong  <cyd@stupidchicken.com>
 
         * xdisp.c (decode_mode_spec): Ignore %c and %l constructs in frame