# HG changeset patch # User Gerd Moellmann # Date 951149844 0 # Node ID da774b48eb7f83ecbdcc212d4c4d3c2e866bcb1e # Parent 1cd9f06b5f217cfcf4541654da39bd228b449a16 (Fmouse_position): GCPRO retval instead of x and y. diff -r 1cd9f06b5f21 -r da774b48eb7f src/frame.c --- a/src/frame.c Mon Feb 21 13:50:14 2000 +0000 +++ b/src/frame.c Mon Feb 21 16:17:24 2000 +0000 @@ -1387,6 +1387,7 @@ Lisp_Object x, y, retval; int col, row; unsigned long long_dummy; + struct gcpro gcpro1; f = SELECTED_FRAME (); x = y = Qnil; @@ -1409,13 +1410,10 @@ #endif XSETFRAME (lispy_dummy, f); retval = Fcons (lispy_dummy, Fcons (x, y)); + GCPRO1 (retval); if (!NILP (Vmouse_position_function)) - { - struct gcpro gcpro1, gcpro2; - GCPRO2 (x, y); - RETURN_UNGCPRO (call1 (Vmouse_position_function, retval)); - } - return retval; + retval = call1 (Vmouse_position_function, retval); + RETURN_UNGCPRO (retval); } DEFUN ("mouse-pixel-position", Fmouse_pixel_position,