Commit 4aec4b29 authored by Eli Zaretskii's avatar Eli Zaretskii

(make_terminal_frame) [MSDOS]: Don't call

init_frame_faces if non-interactive.
(Fframe_parameters) [MSDOS]: Replace indexing into colornames[]
array with a call to msdos_stdcolor_name.  The font name is now
"ms-dos", consistent with realize_tty_face.
parent e6a77d6c
...@@ -38,6 +38,7 @@ Boston, MA 02111-1307, USA. */ ...@@ -38,6 +38,7 @@ Boston, MA 02111-1307, USA. */
#include "window.h" #include "window.h"
#ifdef MSDOS #ifdef MSDOS
#include "msdos.h" #include "msdos.h"
#include "dosfns.h"
#endif #endif
/* Evaluate this expression to rebuild the section of syms_of_frame /* Evaluate this expression to rebuild the section of syms_of_frame
...@@ -538,10 +539,12 @@ make_terminal_frame () ...@@ -538,10 +539,12 @@ make_terminal_frame ()
#ifdef MSDOS #ifdef MSDOS
f->output_data.x = &the_only_x_display; f->output_data.x = &the_only_x_display;
f->output_method = output_msdos_raw; f->output_method = output_msdos_raw;
if (!noninteractive)
init_frame_faces (f);
#else /* not MSDOS */ #else /* not MSDOS */
f->output_data.nothing = 1; /* Nonzero means frame isn't deleted. */ f->output_data.nothing = 1; /* Nonzero means frame isn't deleted. */
#endif
init_frame_faces (f); init_frame_faces (f);
#endif
return f; return f;
} }
...@@ -1948,18 +1951,15 @@ If FRAME is omitted, return information on the currently selected frame.") ...@@ -1948,18 +1951,15 @@ If FRAME is omitted, return information on the currently selected frame.")
#ifdef MSDOS #ifdef MSDOS
if (FRAME_MSDOS_P (f)) if (FRAME_MSDOS_P (f))
{ {
static char *colornames[16] = int fg = FRAME_FOREGROUND_PIXEL (f);
{ int bg = FRAME_BACKGROUND_PIXEL (f);
"black", "blue", "green", "cyan", "red", "magenta", "brown",
"lightgray", "darkgray", "lightblue", "lightgreen", "lightcyan",
"lightred", "lightmagenta", "yellow", "white"
};
store_in_alist (&alist, intern ("foreground-color"), store_in_alist (&alist, intern ("foreground-color"),
build_string (colornames[FRAME_FOREGROUND_PIXEL (f)])); build_string (msdos_stdcolor_name (fg)));
store_in_alist (&alist, intern ("background-color"), store_in_alist (&alist, intern ("background-color"),
build_string (colornames[FRAME_BACKGROUND_PIXEL (f)])); build_string (msdos_stdcolor_name (bg)));
} }
store_in_alist (&alist, intern ("font"), build_string ("default")); store_in_alist (&alist, intern ("font"), build_string ("ms-dos"));
#endif #endif
store_in_alist (&alist, Qname, f->name); store_in_alist (&alist, Qname, f->name);
height = (FRAME_NEW_HEIGHT (f) ? FRAME_NEW_HEIGHT (f) : FRAME_HEIGHT (f)); height = (FRAME_NEW_HEIGHT (f) ? FRAME_NEW_HEIGHT (f) : FRAME_HEIGHT (f));
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment