diff options
| author | Johan Bockgård | 2011-08-28 22:45:55 +0200 |
|---|---|---|
| committer | Johan Bockgård | 2011-08-28 22:45:55 +0200 |
| commit | 6bc8cd6546ad666b4d2ef3cbbbcbd8b904f5f34f (patch) | |
| tree | dfc1922bd10d77a86a63f4e69b8f4cf090c3dd46 /src/term.c | |
| parent | 04e2ce72d02518fd32f71e494c00313d4f86e9ee (diff) | |
| download | emacs-6bc8cd6546ad666b4d2ef3cbbbcbd8b904f5f34f.tar.gz emacs-6bc8cd6546ad666b4d2ef3cbbbcbd8b904f5f34f.zip | |
* src/term.c (init_tty) [HAVE_GPM]: Move mouse settings after set_tty_hooks.
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 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) | |||
| 3138 | encode_terminal_src_size = 0; | 3138 | encode_terminal_src_size = 0; |
| 3139 | encode_terminal_dst_size = 0; | 3139 | encode_terminal_dst_size = 0; |
| 3140 | 3140 | ||
| 3141 | #ifdef HAVE_GPM | ||
| 3142 | terminal->mouse_position_hook = term_mouse_position; | ||
| 3143 | tty->mouse_highlight.mouse_face_window = Qnil; | ||
| 3144 | #endif | ||
| 3145 | |||
| 3146 | 3141 | ||
| 3147 | #ifndef DOS_NT | 3142 | #ifndef DOS_NT |
| 3148 | set_tty_hooks (terminal); | 3143 | set_tty_hooks (terminal); |
| @@ -3402,6 +3397,11 @@ use the Bourne shell command `TERM=... export TERM' (C-shell:\n\ | |||
| 3402 | tty->TN_max_colors = 16; /* Required to be non-zero for tty-display-color-p */ | 3397 | tty->TN_max_colors = 16; /* Required to be non-zero for tty-display-color-p */ |
| 3403 | #endif /* DOS_NT */ | 3398 | #endif /* DOS_NT */ |
| 3404 | 3399 | ||
| 3400 | #ifdef HAVE_GPM | ||
| 3401 | terminal->mouse_position_hook = term_mouse_position; | ||
| 3402 | tty->mouse_highlight.mouse_face_window = Qnil; | ||
| 3403 | #endif | ||
| 3404 | |||
| 3405 | terminal->kboard = (KBOARD *) xmalloc (sizeof (KBOARD)); | 3405 | terminal->kboard = (KBOARD *) xmalloc (sizeof (KBOARD)); |
| 3406 | init_kboard (terminal->kboard); | 3406 | init_kboard (terminal->kboard); |
| 3407 | KVAR (terminal->kboard, Vwindow_system) = Qnil; | 3407 | KVAR (terminal->kboard, Vwindow_system) = Qnil; |