summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorThien-Thi Nguyen <ttn@gnuvola.org>2005-05-07 00:44:02 +0000
committerThien-Thi Nguyen <ttn@gnuvola.org>2005-05-07 00:44:02 +0000
commita790bcd479bc87e78ec852a3218df7d82b6cbc8b (patch)
treebc5dd35155501200269218c578424ee4e27f5e54
parent8a25d51ac55834e238bcca138e6ba782dabbbed1 (diff)
downloademacs-a790bcd479bc87e78ec852a3218df7d82b6cbc8b.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 36741dfd845..8631d2ecd65 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-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 34e474c7f0c..7e790e1eaa3 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)