[Emacs-diffs] /srv/bzr/emacs/trunk r105604: * src/term.c (init_tty) [HAVE_GPM]: Move mouse settings after set_tty_hooks.

[Johan Bockgård]

------------------------------------------------------------
revno: 105604
committer: Johan Bockgård <address@hidden>
branch nick: trunk
timestamp: Sun 2011-08-28 22:45:55 +0200
message:
  * src/term.c (init_tty) [HAVE_GPM]: Move mouse settings after set_tty_hooks.
modified:
  src/ChangeLog
  src/term.c

=== modified file 'src/ChangeLog'
--- a/src/ChangeLog     2011-08-27 18:11:49 +0000
+++ b/src/ChangeLog     2011-08-28 20:45:55 +0000
@@ -1,3 +1,8 @@
+2011-08-28  Johan Bockgård  <address@hidden>
+
+       * term.c (init_tty) [HAVE_GPM]: Move mouse settings after
+       set_tty_hooks.
+
 2011-08-27  Eli Zaretskii  <address@hidden>
 
        * xdisp.c (move_it_to): Don't bail out early when reaching

=== modified file 'src/term.c'
--- a/src/term.c        2011-08-05 02:15:35 +0000
+++ b/src/term.c        2011-08-28 20:45:55 +0000
@@ -3138,11 +3138,6 @@
   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 @@
   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;