aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--src/ChangeLog4
-rw-r--r--src/xfns.c4
2 files changed, 8 insertions, 0 deletions
diff --git a/src/ChangeLog b/src/ChangeLog
index 36741dfd84..8631d2ecd6 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,7 @@
+2005-05-07 Thien-Thi Nguyen <[email protected]>
+
+ * xfns.c (start_hourglass): Do nothing when running on a tty.
+
2005-05-07 Juanma Barranquero <[email protected]>
* fns.c (Fchar_table_range): Fix typos in docstring.
diff --git a/src/xfns.c b/src/xfns.c
index 34e474c7f0..7e790e1eaa 100644
--- 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)