# HG changeset patch
# User Richard M. Stallman <rms@gnu.org>
# Date 834440185 0
# Node ID 274f64e997f0db981f36a504fbd15adc5366c125
# Parent  91662157e604ca26018bc2953acec6f8752cce6f
(redisplay_internal): Use FRAME_WINDOW_P.
(decode_mode_spec): Likewise.

diff -r 91662157e604 -r 274f64e997f0 src/xdisp.c
--- a/src/xdisp.c	Mon Jun 10 20:50:01 1996 +0000
+++ b/src/xdisp.c	Mon Jun 10 20:56:25 1996 +0000
@@ -838,7 +838,7 @@
 #endif
 
 #ifdef MULTI_FRAME
-  if ((FRAME_TERMCAP_P (selected_frame) || FRAME_MSDOS_P (selected_frame))
+  if (! FRAME_WINDOW_P (selected_frame)
       && previous_terminal_frame != selected_frame)
     {
       /* Since frames on an ASCII terminal share the same display area,
@@ -1073,8 +1073,7 @@
       FOR_EACH_FRAME (tail, frame)
 	{
 	  FRAME_PTR f = XFRAME (frame);
-	  if (! FRAME_TERMCAP_P (f) && ! FRAME_MSDOS_P (f)
-	      || f == selected_frame)
+	  if (FRAME_WINDOW_P (f) || f == selected_frame)
 	    {
 
 	      /* Mark all the scroll bars to be removed; we'll redeem the ones
@@ -1123,8 +1122,7 @@
 
 	  f = XFRAME (XCONS (tail)->car);
 
-	  if (((! FRAME_TERMCAP_P (f) && ! FRAME_MSDOS_P (f))
-	       || f == selected_frame)
+	  if ((FRAME_WINDOW_P (f) || f == selected_frame)
 	      && FRAME_VISIBLE_P (f))
 	    {
 	      pause |= update_frame (f, 0, 0);
@@ -1157,8 +1155,7 @@
 	mini_window = FRAME_MINIBUF_WINDOW (selected_frame);
 	mini_frame = XFRAME (WINDOW_FRAME (XWINDOW (mini_window)));
 	
-	if (mini_frame != selected_frame
-	    && ! FRAME_TERMCAP_P (mini_frame) && ! FRAME_MSDOS_P (mini_frame))
+	if (mini_frame != selected_frame && FRAME_WINDOW_P (mini_frame))
 	  pause |= update_frame (mini_frame, 0, 0);
       }
     }
@@ -3729,7 +3726,7 @@
 #ifdef MULTI_FRAME
       if (!NILP (f->title))
 	return (char *) XSTRING (f->title)->data;
-      if (f->explicit_name || FRAME_TERMCAP_P (f) || FRAME_MSDOS_P (f))
+      if (f->explicit_name || ! FRAME_WINDOW_P (f))
 	return (char *) XSTRING (f->name)->data;
 #endif
       return "Emacs";