Mercurial > emacs
changeset 83883:cbc88cef4fca
(init_tty) [WINDOWSNT]: Pass terminal to
initialize_w32_display.
(init_tty) [MULTI_KBOARD]: Include this code on WINDOWSNT too.
| author | Jason Rumney <jasonr@gnu.org> |
|---|---|
| date | Tue, 04 Sep 2007 22:31:01 +0000 |
| parents | c81c5bd99c21 |
| children | 8285466832b3 |
| files | src/term.c |
| diffstat | 1 files changed, 7 insertions(+), 4 deletions(-) [+] |
line wrap: on
line diff
--- a/src/term.c Tue Sep 04 22:30:17 2007 +0000 +++ b/src/term.c Tue Sep 04 22:31:01 2007 +0000 @@ -3272,7 +3272,7 @@ #endif #ifdef WINDOWSNT - initialize_w32_display (); + initialize_w32_display (terminal); /* XXX Can this be non-null? */ if (name) @@ -3315,7 +3315,6 @@ tty->TN_max_colors = 16; /* Required to be non-zero for tty-display-color-p */ - return terminal; #else /* not WINDOWSNT */ Wcm_clear (tty); @@ -3483,6 +3482,7 @@ tty->TF_underscore = tgetflag ("ul"); tty->TF_teleray = tgetflag ("xt"); +#endif /* !WINDOWSNT */ #ifdef MULTI_KBOARD terminal->kboard = (KBOARD *) xmalloc (sizeof (KBOARD)); init_kboard (terminal->kboard); @@ -3494,9 +3494,12 @@ prompt in the mini-buffer. */ if (current_kboard == initial_kboard) current_kboard = terminal->kboard; +#ifndef WINDOWSNT term_get_fkeys (address, terminal->kboard); #endif - +#endif + +#ifndef WINDOWSNT /* Get frame size from system, or else from termcap. */ { int height, width; @@ -3718,9 +3721,9 @@ /* Init system terminal modes (RAW or CBREAK, etc.). */ init_sys_modes (tty); +#endif /* not WINDOWSNT */ return terminal; -#endif /* not WINDOWSNT */ } /* Auxiliary error-handling function for init_tty.