summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorJason Rumney <jasonr@gnu.org>2008-03-27 17:11:40 +0000
committerJason Rumney <jasonr@gnu.org>2008-03-27 17:11:40 +0000
commit30076589d34c643f3e750078fcbb5bb085eaf0c9 (patch)
treeedda545c3a4f1504c0dbf6556fa4e9c76dc27d76 /src
parentcec7f4afc060822b6fe502e20c38dfc93f245cd6 (diff)
downloademacs-30076589d34c643f3e750078fcbb5bb085eaf0c9.tar.gz
emacs-30076589d34c643f3e750078fcbb5bb085eaf0c9.tar.bz2
emacs-30076589d34c643f3e750078fcbb5bb085eaf0c9.zip
(start_hourglass): Suppress hourglass on tty frames.
Diffstat (limited to 'src')
-rw-r--r--src/ChangeLog4
-rw-r--r--src/w32fns.c4
2 files changed, 8 insertions, 0 deletions
diff --git a/src/ChangeLog b/src/ChangeLog
index 907f2c6cdc6..c04ca11131c 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,7 @@
+2008-03-27 Jason Rumney <jasonr@gnu.org>
+
+ * w32fns.c (start_hourglass): Suppress hourglass on tty frames.
+
2008-03-27 Kenichi Handa <handa@ni.aist.go.jp>
* charset.c (Fdefine_charset_internal): Change the way of
diff --git a/src/w32fns.c b/src/w32fns.c
index ed5decdc868..f314b4b4f7c 100644
--- a/src/w32fns.c
+++ b/src/w32fns.c
@@ -7280,6 +7280,10 @@ start_hourglass ()
int secs, msecs = 0;
struct frame * f = SELECTED_FRAME ();
+ /* No cursors on non GUI frames. */
+ if (!FRAME_W32_P (f))
+ return;
+
cancel_hourglass ();
if (INTEGERP (Vhourglass_delay)