Mercurial > emacs
comparison src/dispnew.c @ 97646:fab72f02d115
(init_display): Remove MS-DOS specific conditions for calling
tty-set-up-initial-frame-faces.
author | Eli Zaretskii <eliz@gnu.org> |
---|---|
date | Sat, 23 Aug 2008 16:46:21 +0000 |
parents | c3512b2085a0 |
children | 2aa441279c89 |
comparison
equal
deleted
inserted
replaced
97645:229acec13840 | 97646:fab72f02d115 |
---|---|
3388 return Qnil; | 3388 return Qnil; |
3389 | 3389 |
3390 update_begin (f); | 3390 update_begin (f); |
3391 #ifdef MSDOS | 3391 #ifdef MSDOS |
3392 if (FRAME_MSDOS_P (f)) | 3392 if (FRAME_MSDOS_P (f)) |
3393 set_terminal_modes (FRAME_TERMINAL (f)); | 3393 FRAME_TERMINAL (f)->set_terminal_modes_hook (FRAME_TERMINAL (f)); |
3394 #endif | 3394 #endif |
3395 clear_frame (f); | 3395 clear_frame (f); |
3396 clear_current_matrices (f); | 3396 clear_current_matrices (f); |
3397 update_end (f); | 3397 update_end (f); |
3398 if (FRAME_TERMCAP_P (f)) | 3398 if (FRAME_TERMCAP_P (f)) |
6964 calculate_costs (XFRAME (selected_frame)); | 6964 calculate_costs (XFRAME (selected_frame)); |
6965 | 6965 |
6966 /* Set up faces of the initial terminal frame of a dumped Emacs. */ | 6966 /* Set up faces of the initial terminal frame of a dumped Emacs. */ |
6967 if (initialized | 6967 if (initialized |
6968 && !noninteractive | 6968 && !noninteractive |
6969 #ifdef MSDOS | |
6970 /* The MSDOS terminal turns on its ``window system'' relatively | |
6971 late into the startup, so we cannot do the frame faces' | |
6972 initialization just yet. It will be done later by pc-win.el | |
6973 and internal_terminal_init. */ | |
6974 && (strcmp (terminal_type, "internal") != 0 || inhibit_window_system) | |
6975 #endif | |
6976 && NILP (Vinitial_window_system)) | 6969 && NILP (Vinitial_window_system)) |
6977 { | 6970 { |
6978 /* For the initial frame, we don't have any way of knowing what | 6971 /* For the initial frame, we don't have any way of knowing what |
6979 are the foreground and background colors of the terminal. */ | 6972 are the foreground and background colors of the terminal. */ |
6980 struct frame *sf = SELECTED_FRAME(); | 6973 struct frame *sf = SELECTED_FRAME(); |