Mercurial > emacs

diff src/xfns.c @ 83302:5ae8a8b0a308

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merged from miles@gnu.org--gnu-2005 (patch 292-295) Patches applied: * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-292 Update from CVS * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-293 Update from CVS * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-294 Update from CVS * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-295 Update from CVS git-archimport-id: lorentey@elte.hu--2004/emacs--multi-tty--0--patch-342
author Karoly Lorentey <lorentey@elte.hu>
date Mon, 09 May 2005 16:13:15 +0000
parents ed09a89e2b25 19e471e1a080
children 108e45fdcdbd
line wrap: on
line diff
--- a/src/xfns.c	Fri May 06 21:06:31 2005 +0000
+++ b/src/xfns.c	Mon May 09 16:13:15 2005 +0000
@@ -4388,6 +4388,10 @@
   EMACS_TIME delay;
   int secs, usecs = 0;
 
+  /* Don't bother for ttys.  */
+  if (NILP (Vwindow_system))
+    return;
+
   cancel_hourglass ();
 
   if (INTEGERP (Vhourglass_delay)