Initial check-in: changes for building Emacs under Mac OS.

[bpt/emacs.git] / src / dispnew.c

diff --git a/src/dispnew.c b/src/dispnew.c
index be01f67..14e4d96 100644 (file)
--- a/src/dispnew.c
+++ b/src/dispnew.c
@@ -60,6 +60,10 @@ Boston, MA 02111-1307, USA.  */
 #include "w32term.h"
 #endif /* HAVE_NTGUI */
 
+#ifdef macintosh
+#include "macterm.h"
+#endif /* macintosh */
+
 /* Include systime.h after xterm.h to avoid double inclusion of time.h.  */
 
 #include "systime.h"
@@ -6087,6 +6091,16 @@ init_display ()
     }
 #endif /* HAVE_NTGUI */
 
+#ifdef macintosh
+  if (!inhibit_window_system) 
+    {
+      Vwindow_system = intern ("mac");
+      Vwindow_system_version = make_number (1);
+      adjust_frame_glyphs_initially ();
+      return;
+    }
+#endif /* macintosh */
+
   /* If no window system has been specified, try to use the terminal.  */
   if (! isatty (0))
     {