2 files changed, 15 insertions, 2 deletions

diff --git a/src/ChangeLog b/src/ChangeLog
index 2c72e97b7f7..07b0418b399 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,12 @@
+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)
+        (move_it_vertically_backward): Don't look for character position
+        immediately after the newline when in a continuation line.
+        (Bug#9771, part 1)
+
 2011-10-15  Martin Rudalics  <rudalics@gmx.at>
 
         * window.c (coordinates_in_window): Rewrite and delabelize
diff --git a/src/xdisp.c b/src/xdisp.c
index 09de9e4b539..1f4c98f8388 100644
--- a/src/xdisp.c
+++ b/src/xdisp.c
@@ -8822,7 +8822,10 @@ move_it_vertically_backward (struct it *it, int dy)
          reordering.  We want to get to the character position
          that is immediately after the newline of the previous
          line.  */
-      if (it->bidi_p && IT_CHARPOS (*it) > BEGV
+      if (it->bidi_p
+          && !it->continuation_lines_width
+          && !STRINGP (it->string)
+          && IT_CHARPOS (*it) > BEGV
           && FETCH_BYTE (IT_BYTEPOS (*it) - 1) != '\n')
         {
           EMACS_INT nl_pos =
@@ -18532,9 +18535,10 @@ static int
 push_display_prop (struct it *it, Lisp_Object prop)
 {
   struct text_pos pos =
-    (it->method == GET_FROM_STRING) ? it->current.string_pos : it->current.pos;
+    STRINGP (it->string) ? it->current.string_pos : it->current.pos;
 
   xassert (it->method == GET_FROM_BUFFER
+           || it->method == GET_FROM_DISPLAY_VECTOR
            || it->method == GET_FROM_STRING);
 
   /* We need to save the current buffer/string position, so it will be