Fix vertical layout calculations when newline has line-height property

[gnu-emacs] / src / xdisp.c

diff --git a/src/xdisp.c b/src/xdisp.c
index bcb283f8faa33892b51b29b9af76c9a3f49487f2..da0e84f00432247cee74fd5e108e24403bc56de6 100644 (file)
--- 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;
        }