diff src/ChangeLog @ 109891:373abedd1f02

merge from upstream

--- a/src/ChangeLog	Fri Aug 20 21:55:21 2010 +0200
+++ b/src/ChangeLog	Fri Aug 20 22:00:00 2010 +0200
@@ -1,3 +1,32 @@
[phone]  Eli Zaretskii  <[e-mail]>
+
+	* emacs.c <emacs_version>: Add a comment regarding
+	msdos/mainmake.v2's dependency on the syntax of this declaration.
+
[phone]  Eli Zaretskii  <[e-mail]>
+
+	* 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.
+
[phone]  Andreas Schwab  <[e-mail]>
+
+	* image.c (imagemagick_clear_image): Remove debugging output.
+
[phone]  Stefan Monnier  <[e-mail]>
+
+	* 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.
+
[phone]  Jason Rumney  <[e-mail]>
+
+	* 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  <[e-mail]>
 
 	* nsselect.m (nxatoms_of_nsselect): Use "Selection" and "Secondary".