Merge branch 'master' into feature/igc3feature/igc3

1 files changed, 21 insertions, 12 deletions

diff --git a/src/xdisp.c b/src/xdisp.c
index fd2ce49e031..3251750cd2a 100644
--- a/src/xdisp.c
+++ b/src/xdisp.c
@@ -13665,7 +13665,7 @@ clear_garbaged_frames (void)
                      selected frame, and might leave the selected
                      frame with corrupted display, if it happens not
                      to be marked garbaged.  */
-                  && !(f != sf && (FRAME_TERMCAP_P (f) || FRAME_MSDOS_P (f))))
+                  && !(f != sf && is_tty_frame (f)))
                 redraw_frame (f);
               else
                 clear_current_matrices (f);
@@ -16653,11 +16653,8 @@ hscroll_window_tree (Lisp_Object window)
                 }
             }
           if (cursor_row->truncated_on_left_p)
-            {
-              /* On TTY frames, don't count the left truncation glyph.  */
-              struct frame *f = XFRAME (WINDOW_FRAME (w));
-              x_offset -= (FRAME_TERMCAP_P (f) || FRAME_MSDOS_P (f));
-            }
+            /* On TTY frames, don't count the left truncation glyph.  */
+            x_offset -= is_tty_frame (XFRAME (WINDOW_FRAME (w)));
 
           text_area_width = window_box_width (w, TEXT_AREA);
 
@@ -17391,7 +17388,7 @@ redisplay_internal (void)
     windows_or_buffers_changed = 47;
 
   struct frame *previous_frame;
-  if ((FRAME_TERMCAP_P (sf) || FRAME_MSDOS_P (sf))
+  if (is_tty_frame (sf)
       && (previous_frame = FRAME_TTY (sf)->previous_frame,
           previous_frame != sf))
     {
@@ -17836,8 +17833,7 @@ redisplay_internal (void)
             }
 
         retry_frame:
-          if (FRAME_WINDOW_P (f)
-              || FRAME_TERMCAP_P (f) || FRAME_MSDOS_P (f) || f == sf)
+          if (FRAME_WINDOW_P (f) || is_tty_frame (f) || f == sf)
             {
               /* Only GC scrollbars when we redisplay the whole frame.  */
               bool gcscrollbars = f->redisplay || !REDISPLAY_SOME_P ();
@@ -32864,6 +32860,8 @@ produce_special_glyphs (struct it *it, enum display_element_type what,
           /* Mirror for R2L.  */
           if (direction == R2L)
             {
+              face_id = GLYPH_CODE_FACE (gc);
+
               /* Try bidi mirroring first.  */
               int c = bidi_mirror_char (GLYPH_CODE_CHAR (gc));
 
@@ -32877,16 +32875,23 @@ produce_special_glyphs (struct it *it, enum display_element_type what,
                     {
                       c = XFIXNUM (val);
 
-                      /* If something goes wrong defaults to '/'.  */
+                      /* If something goes wrong, fall back to '/'.  */
                       if (CHAR_VALID_P (c))
                         SET_GLYPH (glyph, c, face_id);
                       else
                         SET_GLYPH (glyph, '/', face_id);
                     }
+                  else
+                    SET_GLYPH_FROM_GLYPH_CODE (glyph, gc);
                 }
               else
+                {
+                  struct face *face = FACE_FROM_ID (it->f, face_id);
+                  int id = FACE_FOR_CHAR (it->f, face, c, -1, Qnil);
+
                   /* Bidi mirroring.  */
-                  SET_GLYPH (glyph, c, face_id);
+                  SET_GLYPH (glyph, c, id);
+                }
             }
           else
             /* No mirroring.  */
@@ -32925,6 +32930,8 @@ produce_special_glyphs (struct it *it, enum display_element_type what,
           if (((it->bidi_it.paragraph_dir == R2L) && !left_edge_p) ||
               ((it->bidi_it.paragraph_dir == L2R) && left_edge_p))
             {
+              face_id = GLYPH_CODE_FACE (gc);
+
               /* Try bidi mirroring first.  */
               int c = bidi_mirror_char (GLYPH_CODE_CHAR (gc));
 
@@ -32938,12 +32945,14 @@ produce_special_glyphs (struct it *it, enum display_element_type what,
                     {
                       c = XFIXNUM (val);
 
-                      /* If something goes wrong defaults to '$'.  */
+                      /* If something goes wrong, fall back to '$'.  */
                       if (CHAR_VALID_P (c))
                           SET_GLYPH (glyph, c, face_id);
                       else
                         SET_GLYPH (glyph, '$', face_id);
                     }
+                  else
+                    SET_GLYPH_FROM_GLYPH_CODE (glyph, gc);
                 }
               else
                 {