Mercurial > emacs
changeset 25117:f6f34f0bc1af
(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.
| author | Eli Zaretskii <eliz@gnu.org> |
|---|---|
| date | Fri, 30 Jul 1999 08:33:50 +0000 |
| parents | 6cf131f0607e |
| children | 08ae9ffe6763 |
| files | src/frame.c |
| diffstat | 1 files changed, 10 insertions(+), 10 deletions(-) [+] |
line wrap: on
line diff
--- a/src/frame.c Fri Jul 30 08:28:18 1999 +0000 +++ b/src/frame.c Fri Jul 30 08:33:50 1999 +0000 @@ -38,6 +38,7 @@ #include "window.h" #ifdef MSDOS #include "msdos.h" +#include "dosfns.h" #endif /* Evaluate this expression to rebuild the section of syms_of_frame @@ -538,10 +539,12 @@ #ifdef MSDOS f->output_data.x = &the_only_x_display; f->output_method = output_msdos_raw; + if (!noninteractive) + init_frame_faces (f); #else /* not MSDOS */ f->output_data.nothing = 1; /* Nonzero means frame isn't deleted. */ + init_frame_faces (f); #endif - init_frame_faces (f); return f; } @@ -1948,18 +1951,15 @@ #ifdef MSDOS if (FRAME_MSDOS_P (f)) { - static char *colornames[16] = - { - "black", "blue", "green", "cyan", "red", "magenta", "brown", - "lightgray", "darkgray", "lightblue", "lightgreen", "lightcyan", - "lightred", "lightmagenta", "yellow", "white" - }; + int fg = FRAME_FOREGROUND_PIXEL (f); + int bg = FRAME_BACKGROUND_PIXEL (f); + 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"), - 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 store_in_alist (&alist, Qname, f->name); height = (FRAME_NEW_HEIGHT (f) ? FRAME_NEW_HEIGHT (f) : FRAME_HEIGHT (f));