aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEli Zaretskii <[email protected]>2008-10-09 17:35:27 +0000
committerEli Zaretskii <[email protected]>2008-10-09 17:35:27 +0000
commit02ab7130d5184c9fe7371fd1a4546d72ca779668 (patch)
tree6daf5e793dd5bbb76e1f81c13555f3999244aa33
parent91d227d92ddbc4b43b3f17c61f1301e48a83c248 (diff)
(make_terminal_frame) [MSDOS]: Remove unused #ifdef'ed away code.
-rw-r--r--src/ChangeLog5
-rw-r--r--src/frame.c20
2 files changed, 6 insertions, 19 deletions
diff --git a/src/ChangeLog b/src/ChangeLog
index 65a46f4de3..6cb78a2376 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,8 @@
+2008-10-09 Eli Zaretskii <[email protected]>
+
+ * frame.c (make_terminal_frame) [MSDOS]: Remove unused #ifdef'ed
+ away code.
+
2008-10-09 Chong Yidong <[email protected]>
* dispnew.c (update_text_area): Avoid looping due to large glyph
diff --git a/src/frame.c b/src/frame.c
index 92edcc0620..f92eeaf628 100644
--- a/src/frame.c
+++ b/src/frame.c
@@ -592,25 +592,7 @@ make_terminal_frame (struct terminal *terminal)
if (!inhibit_window_system
&& (!FRAMEP (selected_frame) || !FRAME_LIVE_P (XFRAME (selected_frame))
|| XFRAME (selected_frame)->output_method == output_msdos_raw))
- {
- f->output_method = output_msdos_raw;
-#if 0
- /* This initialization of foreground and background pixels is
- only important for the initial frame created in temacs. If
- we don't do that, we get black background and foreground in
- the dumped Emacs because the_only_display_info is a static
- variable, hence it is born all-zeroes, and zero is the code
- for the black color. Other frames all inherit their pixels
- from what's already in the_only_display_info. */
- if ((!FRAMEP (selected_frame) || !FRAME_LIVE_P (XFRAME (selected_frame)))
- && FRAME_BACKGROUND_PIXEL (f) == 0
- && FRAME_FOREGROUND_PIXEL (f) == 0)
- {
- FRAME_BACKGROUND_PIXEL (f) = FACE_TTY_DEFAULT_BG_COLOR;
- FRAME_FOREGROUND_PIXEL (f) = FACE_TTY_DEFAULT_FG_COLOR;
- }
-#endif
- }
+ f->output_method = output_msdos_raw;
else
f->output_method = output_termcap;
#else