diff options
| author | Johan Bockgård <bojohan@gnu.org> | 2011-08-28 22:45:55 +0200 |
|---|---|---|
| committer | Johan Bockgård <bojohan@gnu.org> | 2011-08-28 22:45:55 +0200 |
| commit | 6bc8cd6546ad666b4d2ef3cbbbcbd8b904f5f34f (patch) | |
| tree | dfc1922bd10d77a86a63f4e69b8f4cf090c3dd46 /src | |
| parent | 04e2ce72d02518fd32f71e494c00313d4f86e9ee (diff) | |
* src/term.c (init_tty) [HAVE_GPM]: Move mouse settings after set_tty_hooks.
Diffstat (limited to 'src')
| -rw-r--r-- | src/ChangeLog | 5 | ||||
| -rw-r--r-- | src/term.c | 10 |
2 files changed, 10 insertions, 5 deletions
diff --git a/src/ChangeLog b/src/ChangeLog index 8f77f6a4fd9..8bbfe4ee2c9 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,3 +1,8 @@ +2011-08-28 Johan Bockgård <bojohan@gnu.org> + + * term.c (init_tty) [HAVE_GPM]: Move mouse settings after + set_tty_hooks. + 2011-08-27 Eli Zaretskii <eliz@gnu.org> * xdisp.c (move_it_to): Don't bail out early when reaching diff --git a/src/term.c b/src/term.c index f3bf3a947cb..8672a2417c8 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; |