1 files changed, 7 insertions, 0 deletions

diff --git a/src/ChangeLog b/src/ChangeLog
index dd668212615..a05f6a3a4b5 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,10 @@
+2012-06-08  Eli Zaretskii  <eliz@gnu.org>
+
+        * dispnew.c (showing_window_margins_p): Undo last change, which
+        was done due to an inadvertent commit.
+        (adjust_frame_glyphs_for_frame_redisplay): Do call
+        showing_window_margins_p.
+
 2012-06-08  Stefan Monnier  <monnier@iro.umontreal.ca>
 
         * eval.c (Fmake_var_non_special): New primitive.