Mercurial > emacs

comparison src/frame.c @ 44890:01b93e5e53a7

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
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
comparison
equal deleted inserted replaced
44889:e3b9f45140a5 44890:01b93e5e53a7
28 #include "xterm.h" 28 #include "xterm.h"
29 #endif 29 #endif
30 #ifdef WINDOWSNT 30 #ifdef WINDOWSNT
31 #include "w32term.h" 31 #include "w32term.h"
32 #endif 32 #endif
33 #ifdef macintosh 33 #ifdef MAC_OS
34 #include "macterm.h" 34 #include "macterm.h"
35 #endif 35 #endif
36 #include "buffer.h" 36 #include "buffer.h"
37 /* These help us bind and responding to switch-frame events. */ 37 /* These help us bind and responding to switch-frame events. */
38 #include "commands.h" 38 #include "commands.h"
484 #else 484 #else
485 #ifdef WINDOWSNT 485 #ifdef WINDOWSNT
486 f->output_method = output_termcap; 486 f->output_method = output_termcap;
487 f->output_data.x = &tty_display; 487 f->output_data.x = &tty_display;
488 #else 488 #else
489 #ifdef macintosh 489 #ifdef MAC_OS8
490 make_mac_terminal_frame (f); 490 make_mac_terminal_frame (f);
491 #else 491 #else
492 f->output_data.x = &tty_display; 492 f->output_data.x = &tty_display;
493 #endif /* macintosh */ 493 #endif /* MAC_OS8 */
494 #endif /* WINDOWSNT */ 494 #endif /* WINDOWSNT */
495 #endif /* MSDOS */ 495 #endif /* MSDOS */
496 496
497 if (!noninteractive) 497 if (!noninteractive)
498 init_frame_faces (f); 498 init_frame_faces (f);
519 if (sf->output_method != output_msdos_raw 519 if (sf->output_method != output_msdos_raw
520 && sf->output_method != output_termcap) 520 && sf->output_method != output_termcap)
521 abort (); 521 abort ();
522 #else /* not MSDOS */ 522 #else /* not MSDOS */
523 523
524 #ifdef macintosh 524 #ifdef MAC_OS
525 if (sf->output_method != output_mac) 525 if (sf->output_method != output_mac)
526 error ("Not running on a Macintosh screen; cannot make a new Macintosh frame"); 526 error ("Not running on a Macintosh screen; cannot make a new Macintosh frame");
527 #else 527 #else
528 if (sf->output_method != output_termcap) 528 if (sf->output_method != output_termcap)
529 error ("Not using an ASCII terminal now; cannot make a new ASCII frame"); 529 error ("Not using an ASCII terminal now; cannot make a new ASCII frame");
1110 1110
1111 if (! FRAME_LIVE_P (f)) 1111 if (! FRAME_LIVE_P (f))
1112 return Qnil; 1112 return Qnil;
1113 1113
1114 if (NILP (force) && !other_visible_frames (f) 1114 if (NILP (force) && !other_visible_frames (f)
1115 #ifdef macintosh 1115 #ifdef MAC_OS8
1116 /* Terminal frame deleted before any other visible frames are 1116 /* Terminal frame deleted before any other visible frames are
1117 created. */ 1117 created. */
1118 && strcmp (XSTRING (f->name)->data, "F1") != 0 1118 && strcmp (XSTRING (f->name)->data, "F1") != 0
1119 #endif 1119 #endif
1120 ) 1120 )