Merge from emacs-24; up to 2014-07-26T11:58:24Z!schwab@linux-m68k.org

4 files changed, 23 insertions, 5 deletions

diff --git a/src/ChangeLog b/src/ChangeLog
index b47fb4c9d0f..add43dc4b07 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,5 +1,15 @@
 2014-10-12  Paul Eggert  <eggert@cs.ucla.edu>
 
+        Fix port to Debian GNU/kFreeBSD 7 (wheezy) (Bug#18666).
+        * process.c (accept4) [!HAVE_ACCEPT4]: New macro.
+
+2014-10-12  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+        * frame.c (Fmouse_pixel_position): Call Vmouse_position_function
+        (bug#18638).
+
+2014-10-12  Paul Eggert  <eggert@cs.ucla.edu>
+
         * editfns.c (dump_tz_string): No longer const.
         It might be modified.
 
diff --git a/src/ChangeLog.11 b/src/ChangeLog.11
index ac886d38966..fc6ff1fda6a 100644
--- a/src/ChangeLog.11
+++ b/src/ChangeLog.11
@@ -2241,7 +2241,7 @@
         * xdisp.c (try_scrolling): Avoid infloop if the first line is
         obscured due to a vscroll (Bug#7537).
 
-2010-12-13  Jan Djärv  <jhd@zeplinf.localdomain>
+2010-12-13  Jan Djärv  <jan.h.d@swipnet.se>
 
         * nsterm.h (FRAME_NS_TOOLBAR_HEIGHT): Rename to FRAME_TOOLBAR_HEIGHT.
 
diff --git a/src/frame.c b/src/frame.c
index d0527bf2a9c..a3139173655 100644
--- a/src/frame.c
+++ b/src/frame.c
@@ -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;
 
   f = SELECTED_FRAME ();
   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);
+  RETURN_UNGCPRO (retval);
 }
 
 #ifdef HAVE_WINDOW_SYSTEM
@@ -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;
diff --git a/src/process.c b/src/process.c
index 0c36f8e18c3..06fc918cf54 100644
--- a/src/process.c
+++ b/src/process.c
@@ -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)
 {