emacs-29 6ea3c105ab1: Fix cursor motion when there's line-prefix and display string at BOL

[Eli Zaretskii]

branch: emacs-29
commit 6ea3c105ab1377030e470afd02eabbf3e6570c6c
Author: Eli Zaretskii <eliz@gnu.org>
Commit: Eli Zaretskii <eliz@gnu.org>

    Fix cursor motion when there's line-prefix and display string at BOL
    
    * src/xdisp.c (move_it_in_display_line_to): Handle 'line-prefix' and
    'wrap-prefix' when the screen line has a display string at its
    beginning.  (Bug#61580)
---
 src/xdisp.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/xdisp.c b/src/xdisp.c
index 1f630de7586..f5d54974b13 100644
--- a/src/xdisp.c
+++ b/src/xdisp.c
@@ -9609,8 +9609,8 @@ move_it_in_display_line_to (struct it *it,
          else
            line_number_pending = true;
        }
-      /* If there's a line-/wrap-prefix, handle it.  */
-      if (it->method == GET_FROM_BUFFER)
+      /* If there's a line-/wrap-prefix, handle it, if we didn't already.  */
+      if (it->area == TEXT_AREA && !it->string_from_prefix_prop_p)
        handle_line_prefix (it);
     }