2 files changed, 7 insertions, 8 deletions

diff --git a/src/ChangeLog b/src/ChangeLog
index 3afd5ee6e20..53353ffc096 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,5 +1,8 @@
 2014-09-27  Stefan Monnier  <monnier@iro.umontreal.ca>
 
+        * keyboard.c (track-mouse): Rename to internal--track-mouse.
+        Make it into a function and change arg to be a function.
+
         * lisp.mk (lisp): Add elisp-mode.elc.
 
 2014-09-26  Paul Eggert  <eggert@cs.ucla.edu>
diff --git a/src/keyboard.c b/src/keyboard.c
index e242a886f05..fcba475e5ee 100644
--- a/src/keyboard.c
+++ b/src/keyboard.c
@@ -1287,13 +1287,9 @@ tracking_off (Lisp_Object old_value)
     }
 }
 
-DEFUN ("track-mouse", Ftrack_mouse, Strack_mouse, 0, UNEVALLED, 0,
-       doc: /* Evaluate BODY with mouse movement events enabled.
-Within a `track-mouse' form, mouse motion generates input events that
-you can read with `read-event'.
-Normally, mouse motion is ignored.
-usage: (track-mouse BODY...)  */)
-  (Lisp_Object args)
+DEFUN ("internal--track-mouse", Ftrack_mouse, Strack_mouse, 1, 1, 0,
+       doc: /* Call BODYFUN with mouse movement events enabled.  */)
+  (Lisp_Object bodyfun)
 {
   ptrdiff_t count = SPECPDL_INDEX ();
   Lisp_Object val;
@@ -1302,7 +1298,7 @@ usage: (track-mouse BODY...)  */)
 
   do_mouse_tracking = Qt;
 
-  val = Fprogn (args);
+  val = call0 (bodyfun);
   return unbind_to (count, val);
 }