[Emacs-diffs] Changes to emacs/src/xdisp.c,v

[Jason Rumney]

CVSROOT:        /sources/emacs
Module name:    emacs
Changes by:     Jason Rumney <jasonr>   08/07/15 15:45:07

Index: xdisp.c
===================================================================
RCS file: /sources/emacs/emacs/src/xdisp.c,v
retrieving revision 1.1232
retrieving revision 1.1233
diff -u -b -r1.1232 -r1.1233
--- xdisp.c     15 Jul 2008 13:04:00 -0000      1.1232
+++ xdisp.c     15 Jul 2008 15:45:05 -0000      1.1233
@@ -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) */