merge from upstream

1 files changed, 29 insertions, 0 deletions

diff --git a/src/ChangeLog b/src/ChangeLog
index 5d26db96634..5b44cc8f34c 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,32 @@
+2010-08-20  Eli Zaretskii  <eliz@gnu.org>
+
+        * emacs.c <emacs_version>: Add a comment regarding
+        msdos/mainmake.v2's dependency on the syntax of this declaration.
+
+2010-08-20  Eli Zaretskii  <eliz@gnu.org>
+
+        * dispnew.c (buffer_posn_from_coords): Fix calculation of buffer
+        position for R2L lines by mirroring the pixel position wrt the
+        text are box.  Improve commentary.
+
+2010-08-20  Andreas Schwab  <schwab@linux-m68k.org>
+
+        * image.c (imagemagick_clear_image): Remove debugging output.
+
+2010-08-19  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+        * cmds.c (Vself_insert_face, Vself_insert_face_command): Remove.
+        (Qpost_self_insert_hook, Vpost_self_insert_hook): New vars.
+        (internal_self_insert): Run Qpost_self_insert_hook rather than handle
+        self-insert-face.
+        (syms_of_cmds): Initialize the new vars.
+
+2010-08-19  Jason Rumney  <jasonr@gnu.org>
+
+        * w32menu.c (set_frame_menubar): Remove call to undefined function.
+
+        * w32fns.c (w32_wnd_proc): Don't check context before initializing.
+
 2010-08-19  Jan Djärv  <jan.h.d@swipnet.se>
 
         * nsselect.m (nxatoms_of_nsselect): Use "Selection" and "Secondary".