Merge from emacs--devo--0

Patches applied:

 * emacs--devo--0  (patch 765-770)

   - Update from CVS
   - Merge from emacs--rel--22
   - Merge from gnus--rel--5.10

 * emacs--rel--22  (patch 24-25)
 * gnus--rel--5.10  (patch 222-223)

   - Update from CVS

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

1 files changed, 2 insertions, 2 deletions

diff --git a/src/keyboard.c b/src/keyboard.c
index 4658fdcca51..576afd29843 100644
--- a/src/keyboard.c
+++ b/src/keyboard.c
@@ -6189,7 +6189,7 @@ make_lispy_event (event)
     }
 }
 
-#ifdef HAVE_MOUSE
+#if defined(HAVE_MOUSE) || defined(HAVE_GPM)
 
 static Lisp_Object
 make_lispy_movement (frame, bar_window, part, x, y, time)
@@ -6228,7 +6228,7 @@ make_lispy_movement (frame, bar_window, part, x, y, time)
     }
 }
 
-#endif /* HAVE_MOUSE */
+#endif /* HAVE_MOUSE || HAVE GPM */
 
 /* Construct a switch frame event.  */
 static Lisp_Object