diff src/dispnew.c @ 96675:d45acf0c8d23

merging Emacs.app (NeXTstep port)

--- a/src/dispnew.c	Tue Jul 15 15:45:05 2008 +0000
+++ b/src/dispnew.c	Tue Jul 15 18:15:18 2008 +0000
@@ -63,6 +63,10 @@
 #include "macterm.h"
 #endif /* MAC_OS */
 
+#ifdef HAVE_NS
+#include "nsterm.h"
+#endif
+
 /* Include systime.h after xterm.h to avoid double inclusion of time.h.  */
 
 #include "systime.h"
@@ -6895,6 +6899,20 @@
     }
 #endif /* MAC_OS */
 
+#ifdef HAVE_NS
+  if (!inhibit_window_system
+#ifndef CANNOT_DUMP
+     && initialized
+#endif
+      )
+    {
+      Vinitial_window_system = intern("ns");
+      Vwindow_system_version = make_number(10);
+      adjust_frame_glyphs_initially ();
+      return;
+    }
+#endif
+
   /* If no window system has been specified, try to use the terminal.  */
   if (! isatty (0))
     {