aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorEli Zaretskii2008-10-09 17:35:27 +0000
committerEli Zaretskii2008-10-09 17:35:27 +0000
commit02ab7130d5184c9fe7371fd1a4546d72ca779668 (patch)
tree6daf5e793dd5bbb76e1f81c13555f3999244aa33 /src
parent91d227d92ddbc4b43b3f17c61f1301e48a83c248 (diff)
downloademacs-02ab7130d5184c9fe7371fd1a4546d72ca779668.tar.gz
emacs-02ab7130d5184c9fe7371fd1a4546d72ca779668.zip
(make_terminal_frame) [MSDOS]: Remove unused #ifdef'ed away code.
Diffstat (limited to 'src')
-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 65a46f4de33..6cb78a23766 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,8 @@
12008-10-09 Eli Zaretskii <eliz@gnu.org>
2
3 * frame.c (make_terminal_frame) [MSDOS]: Remove unused #ifdef'ed
4 away code.
5
12008-10-09 Chong Yidong <cyd@stupidchicken.com> 62008-10-09 Chong Yidong <cyd@stupidchicken.com>
2 7
3 * dispnew.c (update_text_area): Avoid looping due to large glyph 8 * dispnew.c (update_text_area): Avoid looping due to large glyph
diff --git a/src/frame.c b/src/frame.c
index 92edcc06206..f92eeaf6288 100644
--- a/src/frame.c
+++ b/src/frame.c
@@ -592,25 +592,7 @@ make_terminal_frame (struct terminal *terminal)
592 if (!inhibit_window_system 592 if (!inhibit_window_system
593 && (!FRAMEP (selected_frame) || !FRAME_LIVE_P (XFRAME (selected_frame)) 593 && (!FRAMEP (selected_frame) || !FRAME_LIVE_P (XFRAME (selected_frame))
594 || XFRAME (selected_frame)->output_method == output_msdos_raw)) 594 || XFRAME (selected_frame)->output_method == output_msdos_raw))
595 { 595 f->output_method = output_msdos_raw;
596 f->output_method = output_msdos_raw;
597#if 0
598 /* This initialization of foreground and background pixels is
599 only important for the initial frame created in temacs. If
600 we don't do that, we get black background and foreground in
601 the dumped Emacs because the_only_display_info is a static
602 variable, hence it is born all-zeroes, and zero is the code
603 for the black color. Other frames all inherit their pixels
604 from what's already in the_only_display_info. */
605 if ((!FRAMEP (selected_frame) || !FRAME_LIVE_P (XFRAME (selected_frame)))
606 && FRAME_BACKGROUND_PIXEL (f) == 0
607 && FRAME_FOREGROUND_PIXEL (f) == 0)
608 {
609 FRAME_BACKGROUND_PIXEL (f) = FACE_TTY_DEFAULT_BG_COLOR;
610 FRAME_FOREGROUND_PIXEL (f) = FACE_TTY_DEFAULT_FG_COLOR;
611 }
612#endif
613 }
614 else 596 else
615 f->output_method = output_termcap; 597 f->output_method = output_termcap;
616#else 598#else