[Emacs-diffs] Changes to emacs/src/frame.c,v

[Eli Zaretskii]

CVSROOT:        /cvsroot/emacs
Module name:    emacs
Changes by:     Eli Zaretskii <eliz>    08/08/24 20:11:46

Index: frame.c
===================================================================
RCS file: /cvsroot/emacs/emacs/src/frame.c,v
retrieving revision 1.389
retrieving revision 1.390
diff -u -b -r1.389 -r1.390
--- frame.c     23 Aug 2008 16:56:59 -0000      1.389
+++ frame.c     24 Aug 2008 20:11:46 -0000      1.390
@@ -585,6 +585,8 @@
 
   f->visible = 1;              /* FRAME_SET_VISIBLE wd set frame_garbaged. */
   f->async_visible = 1;                /* Don't let visible be cleared later. 
*/
+  f->terminal = terminal;
+  f->terminal->reference_count++;
 #ifdef MSDOS
   f->output_data.tty->display_info = &the_only_display_info;
   if (!inhibit_window_system
@@ -614,12 +616,17 @@
 #else
   {
     f->output_method = output_termcap;
-    f->terminal = terminal;
-    f->terminal->reference_count++;
     create_tty_output (f);
 
     FRAME_FOREGROUND_PIXEL (f) = FACE_TTY_DEFAULT_FG_COLOR;
     FRAME_BACKGROUND_PIXEL (f) = FACE_TTY_DEFAULT_BG_COLOR;
+  }
+
+#ifdef CANNOT_DUMP
+  FRAME_FOREGROUND_PIXEL(f) = FACE_TTY_DEFAULT_FG_COLOR;
+  FRAME_BACKGROUND_PIXEL(f) = FACE_TTY_DEFAULT_BG_COLOR;
+#endif
+#endif /* MSDOS */
 
     FRAME_CAN_HAVE_SCROLL_BARS (f) = 0;
     FRAME_VERTICAL_SCROLL_BAR_TYPE (f) = vertical_scroll_bar_none;
@@ -630,13 +637,6 @@
       XFRAME (FRAME_TTY (f)->top_frame)->async_visible = 2; /* obscured */
 
     FRAME_TTY (f)->top_frame = frame;
-  }
-
-#ifdef CANNOT_DUMP
-  FRAME_FOREGROUND_PIXEL(f) = FACE_TTY_DEFAULT_FG_COLOR;
-  FRAME_BACKGROUND_PIXEL(f) = FACE_TTY_DEFAULT_BG_COLOR;
-#endif
-#endif /* MSDOS */
 
   if (!noninteractive)
     init_frame_faces (f);
@@ -717,14 +717,17 @@
         terminal = XCDR (terminal);
         t = get_terminal (terminal, 1);
       }
+#ifdef MSDOS
+    if (t && t != the_only_display_info.terminal)
+      /* msdos.c assumes a single tty_display_info object.  */
+      error ("Multiple terminals are not supported on this platform");
+    if (!t)
+      t = the_only_display_info.terminal;
+#endif
   }
 
   if (!t)
     {
-#ifdef MSDOS
-      /* msdos.c assumes a single tty_display_info object.  */
-      error ("Multiple terminals are not supported on this platform");
-#else  /* !MSDOS */
       char *name = 0, *type = 0;
       Lisp_Object tty, tty_type;
 
@@ -751,7 +754,6 @@
         }
 
       t = init_tty (name, type, 0); /* Errors are not fatal. */
-#endif /* !MSDOS */
     }
 
   f = make_terminal_frame (t);