Merge changes from emacs-23 branch

1 files changed, 36 insertions, 0 deletions

diff --git a/src/ChangeLog b/src/ChangeLog
index 8c98b52e6aa..b1d67c9c31f 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,39 @@
+2010-11-27  Kenichi Handa  <handa@m17n.org>
+
+        * charset.c (emacs_mule_charset): Make it an array of charset ID;
+        i.e. integer.
+        (Fdefine_charset_internal): Adjusted for the above change.
+        (init_charset_once): Likewise.
+
+        * charset.h (emacs_mule_charset): Adjust the prototype.  Delete
+        duplicated extern.
+
+        * coding.c (emacs_mule_char): Adjust for the change of
+        emacs_mule_charset.
+
+        * lread.c (read_emacs_mule_char): Adjust for the change of
+        emacs_mule_charset.
+
+2010-11-27  Eli Zaretskii  <eliz@gnu.org>
+
+        * w32.c (_PROCESS_MEMORY_COUNTERS_EX): Don't define with versions
+        of w32api >= 3.15.  (Bug#6989)  (Bug#7452)
+
+2010-11-27  YAMAMOTO Mitsuharu  <mituharu@math.s.chiba-u.ac.jp>
+
+        * alloc.c (mark_terminals): Ensure that the image cache is marked
+        even if the terminal object was marked earlier (Bug#6301).
+
+2010-11-21  Chong Yidong  <cyd@stupidchicken.com>
+
+        * editfns.c (Fbyte_to_string): Signal an error arg is not a byte.
+
+2010-11-27  Jan Djärv  <jan.h.d@swipnet.se>
+
+        * gtkutil.c (menubar_map_cb): New function (Bug#7425).
+        (xg_update_frame_menubar): Connect signal map to menubar_map_cb.
+        Use 23 as menubar height if 0. (Bug#7425).
+
 2010-11-26  Eli Zaretskii  <eliz@gnu.org>
 
         * xdisp.c (set_message_1): Force paragraph direction in echo area