Revert inadvertent commit in dispnew.c as part of 2012-06-08T08:44:45Z!eliz@gnu.org.

 src/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.

diff --git a/src/ChangeLog b/src/ChangeLog
index dd66821261568fa140bb2fd5573a0fd4e177edbb..a05f6a3a4b5cb4883bd8a8ec9165559b0db0e2e6 100644 (file)
--- 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.

diff --git a/src/dispnew.c b/src/dispnew.c
index fa9154bb6cc6dfdeb7b90b1cff918c7973aa765b..a23f2b9a9594a2a081ab3f844f481bab67232b15 100644 (file)
--- a/src/dispnew.c
+++ b/src/dispnew.c
@@ -1962,7 +1962,6 @@ adjust_frame_glyphs (struct frame *f)
 
 /* Return 1 if any window in the tree has nonzero window margins.  See
    the hack at the end of adjust_frame_glyphs_for_frame_redisplay.  */
-#if 0
 static int
 showing_window_margins_p (struct window *w)
 {
@@ -1986,7 +1985,6 @@ showing_window_margins_p (struct window *w)
     }
   return 0;
 }
-#endif
 
 
 /* In the window tree with root W, build current matrices of leaf
@@ -2175,10 +2173,7 @@ adjust_frame_glyphs_for_frame_redisplay (struct frame *f)
             any of the windows contain margins.  I haven't been able
             to hunt down the reason, but for the moment this prevents
             the problem from manifesting. -- cyd  */
-#if 0
-         && !showing_window_margins_p (XWINDOW (FRAME_ROOT_WINDOW (f)))
-#endif
-         )
+         && !showing_window_margins_p (XWINDOW (FRAME_ROOT_WINDOW (f))))
        {
          struct glyph_matrix *copy = save_current_matrix (f);
          adjust_glyph_matrix (NULL, f->desired_matrix, 0, 0, matrix_dim);