Commit b1d5ab03 authored by Glenn Morris's avatar Glenn Morris
Browse files

Merge from emacs-24; up to 2014-07-26T11:58:24Z!

parents ec11ab9b e175fabc
......@@ -1850,7 +1850,8 @@ and nil for X and Y. */)
struct frame *f;
Lisp_Object lispy_dummy;
Lisp_Object x, y;
Lisp_Object x, y, retval;
struct gcpro gcpro1;
x = y = Qnil;
......@@ -1867,7 +1868,11 @@ and nil for X and Y. */)
XSETFRAME (lispy_dummy, f);
return Fcons (lispy_dummy, Fcons (x, y));
retval = Fcons (lispy_dummy, Fcons (x, y));
GCPRO1 (retval);
if (!NILP (Vmouse_position_function))
retval = call1 (Vmouse_position_function, retval);
......@@ -4869,8 +4874,8 @@ is visible. In this case you can not overscroll. */);
DEFVAR_LISP ("mouse-position-function", Vmouse_position_function,
doc: /* If non-nil, function to transform normal value of `mouse-position'.
`mouse-position' calls this function, passing its usual return value as
argument, and returns whatever this function returns.
`mouse-position' and `mouse-pixel-position' call this function, passing their
usual return value as argument, and return whatever this function returns.
This abnormal hook exists for the benefit of packages like `xt-mouse.el'
which need to do mouse handling at the Lisp level. */);
Vmouse_position_function = Qnil;
......@@ -173,6 +173,9 @@ close_on_exec (int fd)
return fd;
# undef accept4
# define accept4(sockfd, addr, addrlen, flags) \
process_accept4 (sockfd, addr, addrlen, flags)
static int
accept4 (int sockfd, struct sockaddr *addr, socklen_t *addrlen, int flags)
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment