(redisplay_internal): Use `Vterminal_frame' and other

termcap frame code on MSDOS as well.
(display_text_line) [HAVE_FACES]: Support faces on MSDOS.
(decode_mode_spec): Return frame name on MSDOS like for termcap frames.

1 files changed, 9 insertions, 6 deletions

diff --git a/src/xdisp.c b/src/xdisp.c
index ed7de057d98..c68a1148da4 100644
--- a/src/xdisp.c
+++ b/src/xdisp.c
@@ -838,7 +838,7 @@ redisplay_internal (preserve_echo_area)
 #endif
 
 #ifdef MULTI_FRAME
-  if (FRAME_TERMCAP_P (selected_frame)
+  if ((FRAME_TERMCAP_P (selected_frame) || FRAME_MSDOS_P (selected_frame))
       && previous_terminal_frame != selected_frame)
     {
       /* Since frames on an ASCII terminal share the same display area,
@@ -1073,7 +1073,8 @@ redisplay_internal (preserve_echo_area)
       FOR_EACH_FRAME (tail, frame)
         {
           FRAME_PTR f = XFRAME (frame);
-          if (! FRAME_TERMCAP_P (f) || f == selected_frame)
+          if (! FRAME_TERMCAP_P (f) && ! FRAME_MSDOS_P (f)
+              || f == selected_frame)
             {
 
               /* Mark all the scroll bars to be removed; we'll redeem the ones
@@ -1122,7 +1123,8 @@ update:
 
           f = XFRAME (XCONS (tail)->car);
 
-          if ((! FRAME_TERMCAP_P (f) || f == selected_frame)
+          if (((! FRAME_TERMCAP_P (f) && ! FRAME_MSDOS_P (f))
+               || f == selected_frame)
               && FRAME_VISIBLE_P (f))
             {
               pause |= update_frame (f, 0, 0);
@@ -1156,7 +1158,7 @@ update:
         mini_frame = XFRAME (WINDOW_FRAME (XWINDOW (mini_window)));
         
         if (mini_frame != selected_frame
-            && ! FRAME_TERMCAP_P (mini_frame))
+            && ! FRAME_TERMCAP_P (mini_frame) && ! FRAME_MSDOS_P (mini_frame))
           pause |= update_frame (mini_frame, 0, 0);
       }
     }
@@ -2814,7 +2816,8 @@ display_text_line (w, start, vpos, hpos, taboffset)
           /* Did we hit a face change?  Figure out what face we should
              use now.  We also hit this the first time through the
              loop, to see what face we should start with.  */
-          if (pos >= next_face_change && (FRAME_WINDOW_P (f)))
+          if (pos >= next_face_change
+              && (FRAME_WINDOW_P (f) || FRAME_MSDOS_P (f)))
             current_face = compute_char_face (f, w, pos,
                                               region_beg, region_end,
                                               &next_face_change, pos + 50, 0);
@@ -3726,7 +3729,7 @@ decode_mode_spec (w, c, spec_width, maxwidth)
 #ifdef MULTI_FRAME
       if (!NILP (f->title))
         return (char *) XSTRING (f->title)->data;
-      if (f->explicit_name || FRAME_TERMCAP_P (f))
+      if (f->explicit_name || FRAME_TERMCAP_P (f) || FRAME_MSDOS_P (f))
         return (char *) XSTRING (f->name)->data;
 #endif
       return "Emacs";