Fix another part of bug #18035 with redisplay of line-prefix and linum-mode.

 src/xdisp.c (display_line): If called with iterator set up to write
 to a marginal area, delay the call to handle_line_prefix until we
 switch back to the text area.

1 files changed, 4 insertions, 0 deletions

diff --git a/src/ChangeLog b/src/ChangeLog
index 619efb479e6..090ed55bf92 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,5 +1,9 @@
 2014-07-28  Eli Zaretskii  <eliz@gnu.org>
 
+        * xdisp.c (display_line): If called with iterator set up to write
+        to a marginal area, delay the call to handle_line_prefix until we
+        switch back to the text area.  (Bug#18035)
+
         * .gdbinit (xwindow): The members total_cols, total_lines,
         left_col, and top_line are C integers (and has been so for the
         last 1.5 years).