aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorThien-Thi Nguyen2005-05-07 00:44:02 +0000
committerThien-Thi Nguyen2005-05-07 00:44:02 +0000
commita790bcd479bc87e78ec852a3218df7d82b6cbc8b (patch)
treebc5dd35155501200269218c578424ee4e27f5e54 /src
parent8a25d51ac55834e238bcca138e6ba782dabbbed1 (diff)
downloademacs-a790bcd479bc87e78ec852a3218df7d82b6cbc8b.tar.gz
emacs-a790bcd479bc87e78ec852a3218df7d82b6cbc8b.zip
(start_hourglass): Do nothing when running on a tty.
Diffstat (limited to 'src')
-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 @@
12005-05-07 Thien-Thi Nguyen <ttn@gnu.org>
2
3 * xfns.c (start_hourglass): Do nothing when running on a tty.
4
12005-05-07 Juanma Barranquero <lekktu@gmail.com> 52005-05-07 Juanma Barranquero <lekktu@gmail.com>
2 6
3 * fns.c (Fchar_table_range): Fix typos in docstring. 7 * 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 ()
4384 EMACS_TIME delay; 4384 EMACS_TIME delay;
4385 int secs, usecs = 0; 4385 int secs, usecs = 0;
4386 4386
4387 /* Don't bother for ttys. */
4388 if (NILP (Vwindow_system))
4389 return;
4390
4387 cancel_hourglass (); 4391 cancel_hourglass ();
4388 4392
4389 if (INTEGERP (Vhourglass_delay) 4393 if (INTEGERP (Vhourglass_delay)