Only disable window system features for dispextern.h

(initialize_w32_display): Build a display info for the console.

diff --git a/src/w32console.c b/src/w32console.c
index f067501f71be4d0a036928adf51c0fba63e0a1c6..ac33abd650170b778ee32be9cb852a426b1fa876 100644 (file)
--- a/src/w32console.c
+++ b/src/w32console.c
@@ -30,15 +30,14 @@ Boston, MA 02111-1307, USA.
 #include <windows.h>
 #include <string.h>
 
-/* Disable features in headers that require a Window System for
-   console mode.  */
-#undef HAVE_WINDOW_SYSTEM
 #include "lisp.h"
 #include "charset.h"
 #include "coding.h"
-#include "frame.h"
 #include "disptab.h"
 #include "termhooks.h"
+/* Disable features in dispextern.h that require a Window System.  */
+#undef HAVE_WINDOW_SYSTEM
+#include "frame.h"
 #include "w32inevt.h"
 #include "dispextern.h"
 
@@ -724,6 +723,11 @@ initialize_w32_display (void)
       SET_FRAME_WIDTH (SELECTED_FRAME (), 1 + info.srWindow.Right - 
                       info.srWindow.Left);
     }
+
+  /* Setup w32_display_info structure for this frame. */
+
+  w32_initialize_display_info (build_string ("Console"));
+
 }
 
 DEFUN ("set-screen-color", Fset_screen_color, Sset_screen_color, 2, 2, 0,