[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] /srv/bzr/emacs/trunk r108527: Revert inadvertent commit in
From: |
Eli Zaretskii |
Subject: |
[Emacs-diffs] /srv/bzr/emacs/trunk r108527: Revert inadvertent commit in dispnew.c as part of revno 108521. |
Date: |
Fri, 08 Jun 2012 16:59:28 +0300 |
User-agent: |
Bazaar (2.5.0) |
------------------------------------------------------------
revno: 108527
committer: Eli Zaretskii <address@hidden>
branch nick: trunk
timestamp: Fri 2012-06-08 16:59:28 +0300
message:
Revert inadvertent commit in dispnew.c as part of revno 108521.
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.
modified:
src/ChangeLog
src/dispnew.c
=== modified file 'src/ChangeLog'
--- a/src/ChangeLog 2012-06-08 13:18:26 +0000
+++ b/src/ChangeLog 2012-06-08 13:59:28 +0000
@@ -1,3 +1,10 @@
+2012-06-08 Eli Zaretskii <address@hidden>
+
+ * 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 <address@hidden>
* eval.c (Fmake_var_non_special): New primitive.
=== modified file 'src/dispnew.c'
--- a/src/dispnew.c 2012-06-08 12:19:28 +0000
+++ b/src/dispnew.c 2012-06-08 13:59:28 +0000
@@ -1962,7 +1962,6 @@
/* 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 @@
}
return 0;
}
-#endif
/* In the window tree with root W, build current matrices of leaf
@@ -2175,10 +2173,7 @@
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);
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Emacs-diffs] /srv/bzr/emacs/trunk r108527: Revert inadvertent commit in dispnew.c as part of revno 108521.,
Eli Zaretskii <=