[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] master 6cf8f0b: Fix vertical layout calculations when newl
From: |
Eli Zaretskii |
Subject: |
[Emacs-diffs] master 6cf8f0b: Fix vertical layout calculations when newline has line-height property |
Date: |
Tue, 21 Jun 2016 13:16:16 +0000 (UTC) |
branch: master
commit 6cf8f0b74e45cec12756e99d3735e3906c515c5c
Author: Eli Zaretskii <address@hidden>
Commit: Eli Zaretskii <address@hidden>
Fix vertical layout calculations when newline has line-height property
* src/xdisp.c (move_it_in_display_line_to): Reset the iterator's
'constrain_row_ascent_descent_p' flag after processing the
newline, similar to what 'display_line' does. Without this, the
flag remains set once set by x_produce_glyphs, and causes the
vertical layout calculations to go awry, because Emacs thinks the
screen lines have zero height. (Bug#23850)
---
src/xdisp.c | 5 +++++
1 file changed, 5 insertions(+)
diff --git a/src/xdisp.c b/src/xdisp.c
index bcb283f..da0e84f 100644
--- a/src/xdisp.c
+++ b/src/xdisp.c
@@ -9038,6 +9038,11 @@ move_it_in_display_line_to (struct it *it,
}
else
result = MOVE_NEWLINE_OR_CR;
+ /* If we've processed the newline, make sure this flag is
+ reset, as it must only be set when the newline itself is
+ processed. */
+ if (result == MOVE_NEWLINE_OR_CR)
+ it->constrain_row_ascent_descent_p = false;
break;
}
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Emacs-diffs] master 6cf8f0b: Fix vertical layout calculations when newline has line-height property,
Eli Zaretskii <=