Mercurial > emacs
changeset 100825:aa7072ec5fe2
(make_terminal_frame): Remove redundant code and useless
block.
| author | Dan Nicolaescu <dann@ics.uci.edu> |
|---|---|
| date | Thu, 01 Jan 2009 19:58:00 +0000 |
| parents | e5aa6a069f40 |
| children | dd451a5b1d77 |
| files | src/ChangeLog src/frame.c |
| diffstat | 2 files changed, 12 insertions(+), 15 deletions(-) [+] |
line wrap: on
line diff
--- a/src/ChangeLog Thu Jan 01 15:58:38 2009 +0000 +++ b/src/ChangeLog Thu Jan 01 19:58:00 2009 +0000 @@ -1,3 +1,8 @@ +2009-01-01 Dan Nicolaescu <dann@ics.uci.edu> + + * frame.c (make_terminal_frame): Remove redundant code and useless + block. + 2009-01-01 Andreas Schwab <schwab@suse.de> * process.c (conv_sockaddr_to_lisp): Add workaround for
--- a/src/frame.c Thu Jan 01 15:58:38 2009 +0000 +++ b/src/frame.c Thu Jan 01 19:58:00 2009 +0000 @@ -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 @@ 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;