Mercurial > emacs
comparison src/dispnew.c @ 83314:d07fdd5d7d4e
Merged from miles@gnu.org--gnu-2005 (patch 441-446)
Patches applied:
* miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-441
Update reference to renamed Buffer-menu-buffer face
* miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-442
Update from CVS
* miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-443
Update from CVS
* miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-444
Update from CVS
* miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-445
Update from CVS
* miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-446
Update from CVS
git-archimport-id: lorentey@elte.hu--2004/emacs--multi-tty--0--patch-354
author | Karoly Lorentey <lorentey@elte.hu> |
---|---|
date | Sat, 25 Jun 2005 15:00:08 +0000 |
parents | bdcbdec78dd3 98563021d2e3 |
children | 61487e73bbc2 |
comparison
equal
deleted
inserted
replaced
83313:bdcbdec78dd3 | 83314:d07fdd5d7d4e |
---|---|
6372 usec += (duration - sec) * 1000000; | 6372 usec += (duration - sec) * 1000000; |
6373 } | 6373 } |
6374 | 6374 |
6375 #ifndef EMACS_HAS_USECS | 6375 #ifndef EMACS_HAS_USECS |
6376 if (sec == 0 && usec != 0) | 6376 if (sec == 0 && usec != 0) |
6377 error ("millisecond `sleep-for' not supported on %s", SYSTEM_TYPE); | 6377 error ("Millisecond `sleep-for' not supported on %s", SYSTEM_TYPE); |
6378 #endif | 6378 #endif |
6379 | 6379 |
6380 /* Assure that 0 <= usec < 1000000. */ | 6380 /* Assure that 0 <= usec < 1000000. */ |
6381 if (usec < 0) | 6381 if (usec < 0) |
6382 { | 6382 { |
6472 usec += (duration - sec) * 1000000; | 6472 usec += (duration - sec) * 1000000; |
6473 } | 6473 } |
6474 | 6474 |
6475 #ifndef EMACS_HAS_USECS | 6475 #ifndef EMACS_HAS_USECS |
6476 if (usec != 0 && sec == 0) | 6476 if (usec != 0 && sec == 0) |
6477 error ("millisecond `sit-for' not supported on %s", SYSTEM_TYPE); | 6477 error ("Millisecond `sit-for' not supported on %s", SYSTEM_TYPE); |
6478 #endif | 6478 #endif |
6479 | 6479 |
6480 return sit_for (sec, usec, 0, NILP (nodisp), NILP (nodisp)); | 6480 return sit_for (sec, usec, 0, NILP (nodisp), NILP (nodisp)); |
6481 } | 6481 } |
6482 | 6482 |