(make_terminal_frame): Remove redundant code and useless

block.

(make_terminal_frame): Remove redundant code and useless
block.
5bbdf7aa · Dan Nicolaescu · 63136da6 · 5bbdf7aa · 5bbdf7aa
Commit 5bbdf7aa authored Jan 01, 2009 by Dan Nicolaescu
Hide whitespace changes
Inline Side-by-side

Showing with 12 additions and 15 deletions

src/ChangeLog src/ChangeLog +5 -0

src/frame.c src/frame.c +7 -15

No files found.
--- a/src/ChangeLog
+++ b/src/ChangeLog
+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
+++ b/src/frame.c
 /* 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;