summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorThien-Thi Nguyen <ttn@gnuvola.org>2005-05-07 00:51:31 +0000
committerThien-Thi Nguyen <ttn@gnuvola.org>2005-05-07 00:51:31 +0000
commitd46f23e8c3efd682630efe1274e456b814cf68cc (patch)
treed290d3eb5fe644c8a8c5302097ee259b9e5014c6
parenta7b68a973becd66e46fd9a9afbad855cca15965d (diff)
downloademacs-d46f23e8c3efd682630efe1274e456b814cf68cc.tar.gz
(start_hourglass): Do nothing when running on a tty.
-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 a937094290b..7b595335761 100644
--- 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 dd57716239c..8c586c766b9 100644
--- a/src/xfns.c
+++ b/src/xfns.c
@@ -10341,6 +10341,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)