diff src/xdisp.c @ 96674:ff312a846b25 before-merge-emacs-app-to-trunk

* w32fns.c (Fx_create_frame): Remove duplicate unwind_protect. (w32_show_hourglass): Rename from show_hourglass. (w32_hide_hourglass): Rename from hide_hourglass. (DEFAULT_HOURGLASS_DELAY): Revert from last change. (Vhourglass_delay): Declare extern. (hourglass_started): Remove. * xdisp.c (Vhourglass_delay): Remove static. (hourglass_started, start_hourglass, cancel_hourglass): Don't include these versions on WINDOWSNT.

--- a/src/xdisp.c	Tue Jul 15 15:29:24 2008 +0000
+++ b/src/xdisp.c	Tue Jul 15 15:45:05 2008 +0000
@@ -865,7 +865,7 @@
 struct atimer *hourglass_atimer;
 
 /* Number of seconds to wait before displaying an hourglass cursor.  */
-static Lisp_Object Vhourglass_delay;
+Lisp_Object Vhourglass_delay;
 
 /* Default number of seconds to wait before displaying an hourglass
    cursor.  */
@@ -25229,6 +25229,10 @@
   help_echo_showing_p = 0;
 }
 
+/* Since w32 does not support atimers, it defines its own implementation of
+   the following three functions in w32fns.c.  */
+#ifndef WINDOWSNT
+
 /* Platform-independent portion of hourglass implementation. */
 
 /* Return non-zero if houglass timer has been started or hourglass is shown.  */
@@ -25238,7 +25242,6 @@
   return hourglass_shown_p || hourglass_atimer != NULL;
 }
 
-
 /* Cancel a currently active hourglass timer, and start a new one.  */
 void
 start_hourglass ()
@@ -25286,7 +25289,7 @@
     hide_hourglass ();
 #endif
 }
-
+#endif /* ! WINDOWSNT  */
 
 /* arch-tag: eacc864d-bb6a-4b74-894a-1a4399a1358b
    (do not change this comment) */