[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] Changes to emacs/src/frame.c,v
From: |
Dan Nicolaescu |
Subject: |
[Emacs-diffs] Changes to emacs/src/frame.c,v |
Date: |
Sun, 13 Jan 2008 00:43:59 +0000 |
CVSROOT: /cvsroot/emacs
Module name: emacs
Changes by: Dan Nicolaescu <dann> 08/01/13 00:43:56
Index: src/frame.c
===================================================================
RCS file: /cvsroot/emacs/emacs/src/frame.c,v
retrieving revision 1.361
retrieving revision 1.362
diff -u -b -r1.361 -r1.362
--- src/frame.c 8 Jan 2008 20:44:16 -0000 1.361
+++ src/frame.c 13 Jan 2008 00:43:54 -0000 1.362
@@ -593,9 +593,6 @@
else
f->output_method = output_termcap;
#else
-#ifdef MAC_OS8
- make_mac_terminal_frame (f);
-#else
{
f->output_method = output_termcap;
f->terminal = terminal;
@@ -620,7 +617,6 @@
FRAME_FOREGROUND_PIXEL(f) = FACE_TTY_DEFAULT_FG_COLOR;
FRAME_BACKGROUND_PIXEL(f) = FACE_TTY_DEFAULT_BG_COLOR;
#endif
-#endif /* MAC_OS8 */
#endif /* MSDOS */
if (!noninteractive)
@@ -687,7 +683,7 @@
abort ();
#else /* not MSDOS */
-#if 0 /* #ifdef MAC_OS8 */
+#if 0
/* This can happen for multi-tty when using both terminal frames and
Carbon frames. */
if (sf->output_method != output_mac)
@@ -1359,13 +1355,7 @@
if (! FRAME_LIVE_P (f))
return Qnil;
- if (NILP (force) && !other_visible_frames (f)
-#ifdef MAC_OS8
- /* Terminal frame deleted before any other visible frames are
- created. */
- && strcmp (SDATA (f->name), "F1") != 0
-#endif
- )
+ if (NILP (force) && !other_visible_frames (f))
error ("Attempt to delete the sole visible or iconified frame");
#if 0