]> git.eshelyaron.com Git - emacs.git/commitdiff
Fix display of R2L text
authorEli Zaretskii <eliz@gnu.org>
Sat, 16 Nov 2019 19:37:41 +0000 (21:37 +0200)
committerEli Zaretskii <eliz@gnu.org>
Sat, 16 Nov 2019 19:37:41 +0000 (21:37 +0200)
* src/xdisp.c (extend_face_to_end_of_line): Fix padding of R2L
screen lines with stretch glyph on the left.  (Bug#38233)

src/xdisp.c

index 8aefab964a8ddb4171b8b24addadc98b8386b0df..c5676b3e17422e7b804eabaf2ab4f96cea403d53 100644 (file)
@@ -21719,13 +21719,17 @@ extend_face_to_end_of_line (struct it *it)
                }
            }
 
-         /* Fill space until window edge with the merged face.  */
-         const int stretch_width = it->last_visible_x - it->current_x;
+         /* Fill space until window edge with the merged face.  Do that
+            only for L2R rows, as R2L rows are handled specially below.  */
+         if (!it->glyph_row->reversed_p)
+           {
+             const int stretch_width = it->last_visible_x - it->current_x;
 
-         if (stretch_width > 0)
-             append_stretch_glyph (it, Qnil, stretch_width,
-                                   it->ascent + it->descent,
-                                   stretch_ascent);
+             if (stretch_width > 0)
+               append_stretch_glyph (it, Qnil, stretch_width,
+                                     it->ascent + it->descent,
+                                     stretch_ascent);
+           }
 
          it->char_to_display = saved_char;
          it->position = saved_pos;