From: Miles Bader <miles@gnu.org>
Date: Wed, 30 May 2007 14:44:47 +0000 (+0000)
Subject: Merge from emacs--devo--0
X-Git-Tag: emacs-pretest-23.0.90~11236^2~80
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=34c6724464237db4bfd5b3fa57e8b0f66a92f618;p=emacs.git

Merge from emacs--devo--0

Patches applied:

 * emacs--devo--0  (patch 771-780)

   - Update from CVS
   - Merge from emacs--rel--22
   - Merge from emacs--rel--22, gnus--rel--5.10
   - Fix tq.el edge case

 * emacs--rel--22  (patch 26-32)

   - Update from CVS
   - lisp/vc-hooks.el (vc-find-root): Fix file attribute test

 * gnus--rel--5.10  (patch 224-225)

   - Merge from emacs--devo--0, emacs--rel--22
   - Update from CVS

Revision: emacs@sv.gnu.org/emacs--multi-tty--0--patch-18
---

34c6724464237db4bfd5b3fa57e8b0f66a92f618
diff --cc src/term.c
index 1d8e885ade9,6a39544c00c..f6b9306dc6b
--- a/src/term.c
+++ b/src/term.c
@@@ -3899,10 -3510,12 +3906,12 @@@ bigger, or it may make it blink, or it 
  #ifdef HAVE_GPM
    defsubr (&Sterm_open_connection);
    defsubr (&Sterm_close_connection);
+ 
+   staticpro (&Qmouse_face_window);
  #endif /* HAVE_GPM */
 -
 -  fullscreen_hook = NULL;
  }
  
 +
 +
  /* arch-tag: 498e7449-6f2e-45e2-91dd-b7d4ca488193
     (do not change this comment) */
diff --cc src/termhooks.h
index 373d1e34987,ee6e707e6b5..1ca9234cac2
--- a/src/termhooks.h
+++ b/src/termhooks.h
@@@ -296,7 -452,8 +296,8 @@@ enum 
  
  #ifdef HAVE_GPM
  #include <gpm.h>
 -extern int handle_one_term_event (Gpm_Event *, struct input_event *);
 +extern int handle_one_term_event (struct tty_display_info *, Gpm_Event *, struct input_event *);
+ extern void term_mouse_moveto (int, int);
  
  /* Nonzero means mouse is enabled on Linux console */
  extern int term_gpm;