Merge from emacs-23

1 files changed, 23 insertions, 0 deletions

diff --git a/src/ChangeLog b/src/ChangeLog
index 5a0d859ac27..985a07c4ea3 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,26 @@
+2010-11-09  Eli Zaretskii  <eliz@gnu.org>
+
+        * xfns.c (x_real_positions): Fix declaration-after-statement
+        problem.
+
+2010-11-09  Chong Yidong  <cyd@stupidchicken.com>
+
+        * image.c (free_image): Don't garbage the frame here, since this
+        function can be called while redisplaying (Bug#7210).
+        (uncache_image): Garbage the frame here (Bug#6426).
+
+2010-11-09  Jan Djärv  <jan.h.d@swipnet.se>
+
+        * xfns.c (x_real_positions): Only use _NET_FRAME_EXTENTS if our
+        parent is the root window.  Check this after traversing window tree.
+
+        * xterm.c (x_term_init): Initialize Xatom_net_frame_extents.
+
+        * xterm.h (struct x_display_info): Xatom_net_frame_extents is new.
+
+        * xfns.c (x_real_positions): Try to get _NET_FRAME_EXTENTS first
+        before traversing window tree (Bug#5721).
+
 2010-11-07  Jan Djärv  <jan.h.d@swipnet.se>
 
         * xfns.c (set_machine_and_pid_properties): Let X set WM_CLIENT_MACHINE.