[Emacs-diffs] /srv/bzr/emacs/trunk r110469: * xdisp.c (start_hourglass): Call w32_note_current_window when

[Daniel Colascione]

------------------------------------------------------------
revno: 110469
committer: Daniel Colascione <address@hidden>
branch nick: cyg
timestamp: Mon 2012-10-08 11:22:42 -0800
message:
  * 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.
modified:
  src/ChangeLog
  src/xdisp.c

=== modified file 'src/ChangeLog'
--- a/src/ChangeLog     2012-10-08 18:47:29 +0000
+++ b/src/ChangeLog     2012-10-08 19:22:42 +0000
@@ -1,3 +1,9 @@
+2012-10-08  Daniel Colascione  <address@hidden>
+
+       * 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  <address@hidden>
        * nsfont.m (Vfonts_in_cache): New variable.
        (nsfont_open): Use unsignedLongLongValue for cache in case wide ints

=== modified file 'src/xdisp.c'
--- a/src/xdisp.c       2012-10-07 22:31:58 +0000
+++ b/src/xdisp.c       2012-10-08 19:22:42 +0000
@@ -29379,9 +29379,10 @@
   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);