aboutsummaryrefslogtreecommitdiffstats
path: root/src/frame.c
diff options
context:
space:
mode:
Diffstat (limited to 'src/frame.c')
-rw-r--r--src/frame.c14
1 files changed, 2 insertions, 12 deletions
diff --git a/src/frame.c b/src/frame.c
index 0a3a910934f..30c5e5e9d36 100644
--- a/src/frame.c
+++ b/src/frame.c
@@ -604,9 +604,6 @@ make_terminal_frame (struct terminal *terminal)
604 else 604 else
605 f->output_method = output_termcap; 605 f->output_method = output_termcap;
606#else 606#else
607#ifdef MAC_OS8
608 make_mac_terminal_frame (f);
609#else
610 { 607 {
611 f->output_method = output_termcap; 608 f->output_method = output_termcap;
612 f->terminal = terminal; 609 f->terminal = terminal;
@@ -631,7 +628,6 @@ make_terminal_frame (struct terminal *terminal)
631 FRAME_FOREGROUND_PIXEL(f) = FACE_TTY_DEFAULT_FG_COLOR; 628 FRAME_FOREGROUND_PIXEL(f) = FACE_TTY_DEFAULT_FG_COLOR;
632 FRAME_BACKGROUND_PIXEL(f) = FACE_TTY_DEFAULT_BG_COLOR; 629 FRAME_BACKGROUND_PIXEL(f) = FACE_TTY_DEFAULT_BG_COLOR;
633#endif 630#endif
634#endif /* MAC_OS8 */
635#endif /* MSDOS */ 631#endif /* MSDOS */
636 632
637 if (!noninteractive) 633 if (!noninteractive)
@@ -698,7 +694,7 @@ affects all frames on the same terminal device. */)
698 abort (); 694 abort ();
699#else /* not MSDOS */ 695#else /* not MSDOS */
700 696
701#if 0 /* #ifdef MAC_OS8 */ 697#if 0
702 /* This can happen for multi-tty when using both terminal frames and 698 /* This can happen for multi-tty when using both terminal frames and
703 Carbon frames. */ 699 Carbon frames. */
704 if (sf->output_method != output_mac) 700 if (sf->output_method != output_mac)
@@ -1370,13 +1366,7 @@ The functions are run with one arg, the frame to be deleted. */)
1370 if (! FRAME_LIVE_P (f)) 1366 if (! FRAME_LIVE_P (f))
1371 return Qnil; 1367 return Qnil;
1372 1368
1373 if (NILP (force) && !other_visible_frames (f) 1369 if (NILP (force) && !other_visible_frames (f))
1374#ifdef MAC_OS8
1375 /* Terminal frame deleted before any other visible frames are
1376 created. */
1377 && strcmp (SDATA (f->name), "F1") != 0
1378#endif
1379 )
1380 error ("Attempt to delete the sole visible or iconified frame"); 1370 error ("Attempt to delete the sole visible or iconified frame");
1381 1371
1382#if 0 1372#if 0