aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorNick Roberts2007-06-03 01:03:22 +0000
committerNick Roberts2007-06-03 01:03:22 +0000
commit67f6e31c6e692b1246057994c25c2957a2898493 (patch)
tree2d6a8a882d569ea88958804ee213dff515378235 /src
parente416374c96c398f9e77363ea06f26d0fd86b75bc (diff)
downloademacs-67f6e31c6e692b1246057994c25c2957a2898493.tar.gz
emacs-67f6e31c6e692b1246057994c25c2957a2898493.zip
(Fmouse_position, Fmouse_pixel_position):
Condition on HAVE_GPM too.
Diffstat (limited to 'src')
-rw-r--r--src/frame.c11
1 files changed, 9 insertions, 2 deletions
diff --git a/src/frame.c b/src/frame.c
index ab91af264dc..0e24ad59627 100644
--- a/src/frame.c
+++ b/src/frame.c
@@ -1450,7 +1450,7 @@ and returns whatever that function returns. */)
1450 f = SELECTED_FRAME (); 1450 f = SELECTED_FRAME ();
1451 x = y = Qnil; 1451 x = y = Qnil;
1452 1452
1453#ifdef HAVE_MOUSE 1453#if defined (HAVE_MOUSE) || defined (HAVE_GPM)
1454 /* It's okay for the hook to refrain from storing anything. */ 1454 /* It's okay for the hook to refrain from storing anything. */
1455 if (mouse_position_hook) 1455 if (mouse_position_hook)
1456 (*mouse_position_hook) (&f, -1, 1456 (*mouse_position_hook) (&f, -1,
@@ -1494,7 +1494,7 @@ and nil for X and Y. */)
1494 f = SELECTED_FRAME (); 1494 f = SELECTED_FRAME ();
1495 x = y = Qnil; 1495 x = y = Qnil;
1496 1496
1497#ifdef HAVE_MOUSE 1497#if defined (HAVE_MOUSE) || defined (HAVE_GPM)
1498 /* It's okay for the hook to refrain from storing anything. */ 1498 /* It's okay for the hook to refrain from storing anything. */
1499 if (mouse_position_hook) 1499 if (mouse_position_hook)
1500 (*mouse_position_hook) (&f, -1, 1500 (*mouse_position_hook) (&f, -1,
@@ -1581,6 +1581,13 @@ before calling this function on it, like this.
1581 Fselect_frame (frame); 1581 Fselect_frame (frame);
1582 mouse_moveto (XINT (x), XINT (y)); 1582 mouse_moveto (XINT (x), XINT (y));
1583 } 1583 }
1584#else
1585#ifdef HAVE_GPM
1586 {
1587 Fselect_frame (frame);
1588 term_mouse_moveto (XINT (x), XINT (y));
1589 }
1590#endif
1584#endif 1591#endif
1585#endif 1592#endif
1586 1593