(start_hourglass): Do nothing when running on a tty.

diff --git a/src/ChangeLog b/src/ChangeLog
index 07ec33b0f3e5a738d23674517e6a7fbe04215352..57e2835beccdbf3d7dc27fe7f27062e724954b72 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,7 @@
+2005-05-07  Thien-Thi Nguyen  <ttn@gnu.org>
+
+       * xfns.c (start_hourglass): Do nothing when running on a tty.
+
 2005-05-01  Thien-Thi Nguyen  <ttn@gnu.org>
 
        * sysdep.c (get_frame_size) [VMS]: Use a fresh i/o channel.

diff --git a/src/xfns.c b/src/xfns.c
index 7bf4b6654d0a65b5a61bb0b17d0d58e866f8d86f..c86f780b70bf742b6a5b498b65ba9ed18ee74240 100644 (file)
--- a/src/xfns.c
+++ b/src/xfns.c
@@ -10338,6 +10338,10 @@ start_hourglass ()
   EMACS_TIME delay;
   int secs, usecs = 0;
 
+  /* Don't bother for ttys.  */
+  if (NILP (Vwindow_system))
+    return;
+
   cancel_hourglass ();
 
   if (INTEGERP (Vhourglass_delay)