Fix part 4 of bug#9771 with assertion violation when wrap-prefix is used

for a line that begins with control characters.

 src/xdisp.c (push_display_prop): Determine whether to record string
 or buffer position by IT->string, not by IT->method.  Allow
 GET_FROM_DISPLAY_VECTOR as IT->method on entry.

1 files changed, 6 insertions, 0 deletions

diff --git a/src/ChangeLog b/src/ChangeLog
index 2c72e97b7f7..53e67a30c38 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,9 @@
+2011-10-17  Eli Zaretskii  <eliz@gnu.org>
+
+        * xdisp.c (push_display_prop): Determine whether to record string
+        or buffer position by IT->string, not by IT->method.  Allow
+        GET_FROM_DISPLAY_VECTOR as IT->method on entry.  (Bug#9771, part 4)
+
 2011-10-15  Martin Rudalics  <rudalics@gmx.at>
 
         * window.c (coordinates_in_window): Rewrite and delabelize