Merge remote-tracking branch 'origin/trunk' into xwidget

1 files changed, 7 insertions, 2 deletions

diff --git a/src/ChangeLog b/src/ChangeLog
index b1f13e62b40..4b1281c17e6 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,8 @@
+2013-05-29  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+        * fileio.c (Finsert_file_contents): Preserve undo info when reverting
+        a buffer (bug#8447).
+
 2013-05-27  Eli Zaretskii  <eliz@gnu.org>
 
         * xdisp.c (pos_visible_p): When CHARPOS is displayed frrom a
@@ -25,8 +30,8 @@
         (struct MonitorInfo): New struct.
         (free_monitors, make_monitor_attribute_list): Declare.
 
-        * frame.c (Qgeometry, Qworkarea, Qmm_size, Qframes, Qsource): New
-        Lisp_Object:s.
+        * frame.c (Qgeometry, Qworkarea, Qmm_size, Qframes, Qsource):
+        New Lisp_Object:s.
         (free_monitors, make_monitor_attribute_list): New functions.
         (syms_of_frame): DEFSYM Qgeometry, Qworkarea, Qmm_size, Qframes,
         Qsource.