Mercurial > emacs
diff src/frame.c @ 44890:01b93e5e53a7
Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,
lisp/ChangeLog, and src/ChangeLog for list of changes.
author | Andrew Choi <akochoi@shaw.ca> |
---|---|
date | Fri, 26 Apr 2002 23:39:06 +0000 |
parents | a459b58a6d95 |
children | 3988483dc2b7 |
line wrap: on
line diff
--- a/src/frame.c Fri Apr 26 22:33:33 2002 +0000 +++ b/src/frame.c Fri Apr 26 23:39:06 2002 +0000 @@ -30,7 +30,7 @@ #ifdef WINDOWSNT #include "w32term.h" #endif -#ifdef macintosh +#ifdef MAC_OS #include "macterm.h" #endif #include "buffer.h" @@ -486,11 +486,11 @@ f->output_method = output_termcap; f->output_data.x = &tty_display; #else -#ifdef macintosh +#ifdef MAC_OS8 make_mac_terminal_frame (f); #else f->output_data.x = &tty_display; -#endif /* macintosh */ +#endif /* MAC_OS8 */ #endif /* WINDOWSNT */ #endif /* MSDOS */ @@ -521,7 +521,7 @@ abort (); #else /* not MSDOS */ -#ifdef macintosh +#ifdef MAC_OS if (sf->output_method != output_mac) error ("Not running on a Macintosh screen; cannot make a new Macintosh frame"); #else @@ -1112,7 +1112,7 @@ return Qnil; if (NILP (force) && !other_visible_frames (f) -#ifdef macintosh +#ifdef MAC_OS8 /* Terminal frame deleted before any other visible frames are created. */ && strcmp (XSTRING (f->name)->data, "F1") != 0