Mercurial > emacs
changeset 83582:a6ca8e4443e4
(dissociate_if_controlling_tty) [WINDOWSNT]: Don't define function body.
(init_tty) [WINDOWSNT]: Use selected_frame for initializing.
| author | Jason Rumney <jasonr@gnu.org> |
|---|---|
| date | Tue, 15 May 2007 23:07:41 +0000 |
| parents | 29192b6da477 |
| children | c933949cdadb |
| files | src/term.c |
| diffstat | 1 files changed, 14 insertions(+), 8 deletions(-) [+] |
line wrap: on
line diff
--- a/src/term.c Tue May 15 23:07:08 2007 +0000 +++ b/src/term.c Tue May 15 23:07:41 2007 +0000 @@ -2365,6 +2365,7 @@ static void dissociate_if_controlling_tty (int fd) { +#ifndef WINDOWSNT int pgid; EMACS_GET_TTY_PGRP (fd, &pgid); /* If tcgetpgrp succeeds, fd is the ctty. */ if (pgid != -1) @@ -2389,6 +2390,7 @@ #endif /* ! TIOCNOTTY */ #endif /* ! USG */ } +#endif } static void maybe_fatal(); @@ -2509,11 +2511,17 @@ area = (char *) xmalloc (2044); - FrameRows (tty) = FRAME_LINES (f); /* XXX */ - FrameCols (tty) = FRAME_COLS (f); /* XXX */ - tty->specified_window = FRAME_LINES (f); /* XXX */ - - tty->terminal->delete_in_insert_mode = 1; + { + struct frame *f = XFRAME (selected_frame); + + FrameRows (tty) = FRAME_LINES (f); /* XXX */ + FrameCols (tty) = FRAME_COLS (f); /* XXX */ + tty->specified_window = FRAME_LINES (f); /* XXX */ + + FRAME_CAN_HAVE_SCROLL_BARS (f) = 0; /* XXX */ + FRAME_VERTICAL_SCROLL_BAR_TYPE (f) = vertical_scroll_bar_none; /* XXX */ + } + tty->delete_in_insert_mode = 1; UseTabs (tty) = 0; terminal->scroll_region_ok = 0; @@ -2526,9 +2534,7 @@ baud_rate = 19200; - FRAME_CAN_HAVE_SCROLL_BARS (f) = 0; /* XXX */ - FRAME_VERTICAL_SCROLL_BAR_TYPE (f) = vertical_scroll_bar_none; /* XXX */ - TN_max_colors = 16; /* Required to be non-zero for tty-display-color-p */ + tty->TN_max_colors = 16; /* Required to be non-zero for tty-display-color-p */ return terminal; #else /* not WINDOWSNT */