From 5bbdf7aab531a1027644aaed452a0cb6a068917a Mon Sep 17 00:00:00 2001 From: Dan Nicolaescu Date: Thu, 1 Jan 2009 19:58:00 +0000 Subject: [PATCH] (make_terminal_frame): Remove redundant code and useless block. --- src/ChangeLog | 5 +++++ src/frame.c | 22 +++++++--------------- 2 files changed, 12 insertions(+), 15 deletions(-) diff --git a/src/ChangeLog b/src/ChangeLog index 577051aaedc..9008d580c33 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,3 +1,8 @@ +2009-01-01 Dan Nicolaescu + + * frame.c (make_terminal_frame): Remove redundant code and useless + block. + 2009-01-01 Andreas Schwab * process.c (conv_sockaddr_to_lisp): Add workaround for diff --git a/src/frame.c b/src/frame.c index badff9c66ef..6de8372181f 100644 --- a/src/frame.c +++ b/src/frame.c @@ -1,6 +1,6 @@ /* Generic frame functions. Copyright (C) 1993, 1994, 1995, 1997, 1999, 2000, 2001, 2002, 2003, - 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. + 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, Inc. This file is part of GNU Emacs. @@ -594,20 +594,12 @@ make_terminal_frame (struct terminal *terminal) f->output_method = output_msdos_raw; else f->output_method = output_termcap; -#else - { - f->output_method = output_termcap; - create_tty_output (f); - - FRAME_FOREGROUND_PIXEL (f) = FACE_TTY_DEFAULT_FG_COLOR; - FRAME_BACKGROUND_PIXEL (f) = FACE_TTY_DEFAULT_BG_COLOR; - } - -#ifdef CANNOT_DUMP - FRAME_FOREGROUND_PIXEL(f) = FACE_TTY_DEFAULT_FG_COLOR; - FRAME_BACKGROUND_PIXEL(f) = FACE_TTY_DEFAULT_BG_COLOR; -#endif -#endif /* MSDOS */ +#else /* not MSDOS */ + f->output_method = output_termcap; + create_tty_output (f); + FRAME_FOREGROUND_PIXEL (f) = FACE_TTY_DEFAULT_FG_COLOR; + FRAME_BACKGROUND_PIXEL (f) = FACE_TTY_DEFAULT_BG_COLOR; +#endif /* not MSDOS */ FRAME_CAN_HAVE_SCROLL_BARS (f) = 0; FRAME_VERTICAL_SCROLL_BAR_TYPE (f) = vertical_scroll_bar_none; -- 2.39.2