diff options
| author | Paul Eggert <eggert@cs.ucla.edu> | 2011-08-29 13:06:52 -0700 |
|---|---|---|
| committer | Paul Eggert <eggert@cs.ucla.edu> | 2011-08-29 13:06:52 -0700 |
| commit | 1a091fbc08faa3bab85e74f7fac72a955600a8f6 (patch) | |
| tree | e3f3a5700086aef93d027590c497ccac14b0e696 /src/term.c | |
| parent | c43c8a6af9f6877b97c1f9a88e361456775cb88b (diff) | |
| parent | b31b81a53a0908e16360003c0218dadba897f449 (diff) | |
| download | emacs-1a091fbc08faa3bab85e74f7fac72a955600a8f6.tar.gz | |
Merge from trunk.
Diffstat (limited to 'src/term.c')
| -rw-r--r-- | src/term.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/term.c b/src/term.c index 48d4069e20e..fb07fc4490e 100644 --- a/src/term.c +++ b/src/term.c @@ -3138,11 +3138,6 @@ init_tty (const char *name, const char *terminal_type, int must_succeed) encode_terminal_src_size = 0; encode_terminal_dst_size = 0; -#ifdef HAVE_GPM - terminal->mouse_position_hook = term_mouse_position; - tty->mouse_highlight.mouse_face_window = Qnil; -#endif - #ifndef DOS_NT set_tty_hooks (terminal); @@ -3402,6 +3397,11 @@ use the Bourne shell command `TERM=... export TERM' (C-shell:\n\ tty->TN_max_colors = 16; /* Required to be non-zero for tty-display-color-p */ #endif /* DOS_NT */ +#ifdef HAVE_GPM + terminal->mouse_position_hook = term_mouse_position; + tty->mouse_highlight.mouse_face_window = Qnil; +#endif + terminal->kboard = (KBOARD *) xmalloc (sizeof (KBOARD)); init_kboard (terminal->kboard); KVAR (terminal->kboard, Vwindow_system) = Qnil; |