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

diff --git a/src/ChangeLog b/src/ChangeLog
index 36741dfd845ee71cba8bc9a69d56f44efd8d868b..8631d2ecd65e15c5861aa02361052251b5e7fa14 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-07  Juanma Barranquero  <lekktu@gmail.com>
 
        * fns.c (Fchar_table_range): Fix typos in docstring.

diff --git a/src/xfns.c b/src/xfns.c
index 34e474c7f0ce8553848c08c2609b6eb535eccb96..7e790e1eaa3b0507174ad164725ad4d846db7523 100644 (file)
--- a/src/xfns.c
+++ b/src/xfns.c
@@ -4384,6 +4384,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)