2 files changed, 9 insertions, 2 deletions

diff --git a/src/ChangeLog b/src/ChangeLog
index 4531cee8dba..c2c6a72d43f 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,9 @@
+2012-10-08  Daniel Colascione  <dancol@dancol.org>
+
+        * xdisp.c (start_hourglass): Call w32_note_current_window when
+        HAVE_NTGUI but not WINDOWSNT, resolving a problem that caused
+        Emacs to display the hourglass cursor forever.
+
 2012-10-08  Jan Djärv  <jan.h.d@swipnet.se>
         * nsfont.m (Vfonts_in_cache): New variable.
         (nsfont_open): Use unsignedLongLongValue for cache in case wide ints
diff --git a/src/xdisp.c b/src/xdisp.c
index 2047c0e78c1..1e61a74068b 100644
--- a/src/xdisp.c
+++ b/src/xdisp.c
@@ -29379,9 +29379,10 @@ start_hourglass (void)
   else
     delay = make_emacs_time (DEFAULT_HOURGLASS_DELAY, 0);
 
-#ifdef WINDOWSNT
+#ifdef HAVE_NTGUI
+  extern void w32_note_current_window (void);
   w32_note_current_window ();
-#endif
+#endif /* HAVE_NTGUI */
 
   hourglass_atimer = start_atimer (ATIMER_RELATIVE, delay,
                                    show_hourglass, NULL);