(init_sys_modes) [!HAVE_X_WINDOWS (MSDOS)]: Always call set_terminal_modes.

(reset_sys_modes) [MSDOS]: Do not look at EMACSCOLORS.

diff --git a/src/sysdep.c b/src/sysdep.c
index 0b46d965f25e239ade1c5b45e12480f8c02eb890..dc47a4a2a0f152e925c37f01e86db444cf33b4fc 100644 (file)
--- a/src/sysdep.c
+++ b/src/sysdep.c
@@ -1469,7 +1469,11 @@ init_sys_modes ()
 #else
   setbuf (stdout, _sobuf);
 #endif
+#ifdef HAVE_X_WINDOWS
+  /* Emacs' window system on MSDOG uses the `internal terminal' and therefore
+     needs the initialization code below.  */
   if (! read_socket_hook && EQ (Vwindow_system, Qnil))
+#endif
     set_terminal_modes ();
 
   if (term_initted && no_redraw_on_reenter)
@@ -1615,19 +1619,6 @@ reset_sys_modes ()
     return;
 #endif
   cursor_to (FRAME_HEIGHT (selected_frame) - 1, 0);
-#ifdef MSDOS
-  if (!EQ (Vwindow_system, Qnil))
-    {
-      char *colors = getenv("EMACSCOLORS");
-      int color = 0x07;      /* Change to white on black  */
-      if (colors && strlen (colors) >= 5 && colors[2] == ';')
-       color = ((colors[4] & 0x07) << 4) || (colors[3] & 0x07);
-      if ((stdout)->_cnt < 3) fflush(stdout); /* avoid call to _flsbuf */
-      putchar ('\e');
-      putchar ('A');
-      putchar (color);
-    }
-#endif
   clear_end_of_line (FRAME_WIDTH (selected_frame));
   /* clear_end_of_line may move the cursor */
   cursor_to (FRAME_HEIGHT (selected_frame) - 1, 0);