emacs-29 7ff943044e9: Fix setting cursor when the window's op line has 'line-prefix'

[Eli Zaretskii]

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

    Fix setting cursor when the window's op line has 'line-prefix'
    
    * src/xdisp.c (set_cursor_from_row): Skip glyphs that come from a
    string if their 'avoid_cursor_p' flag is set.  (Bug#67486)
---
 src/xdisp.c | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/xdisp.c b/src/xdisp.c
index eb38ebba17b..5a56b116708 100644
--- a/src/xdisp.c
+++ b/src/xdisp.c
@@ -17859,7 +17859,8 @@ set_cursor_from_row (struct window *w, struct glyph_row 
*row,
            else if (dpos == 0)
              match_with_avoid_cursor = true;
          }
-       else if (STRINGP (glyph->object))
+       else if (STRINGP (glyph->object)
+                && !glyph->avoid_cursor_p)
          {
            Lisp_Object chprop;
            ptrdiff_t glyph_pos = glyph->charpos;
@@ -18085,7 +18086,8 @@ set_cursor_from_row (struct window *w, struct glyph_row 
*row,
              /* Any glyphs that come from the buffer are here because
                 of bidi reordering.  Skip them, and only pay
                 attention to glyphs that came from some string.  */
-             if (STRINGP (glyph->object))
+             if (STRINGP (glyph->object)
+                 && !glyph->avoid_cursor_p)
                {
                  Lisp_Object str;
                  ptrdiff_t tem;