[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] Changes to emacs/src/dispnew.c
From: |
Stefan Monnier |
Subject: |
[Emacs-diffs] Changes to emacs/src/dispnew.c |
Date: |
Mon, 14 Apr 2003 12:29:19 -0400 |
Index: emacs/src/dispnew.c
diff -c emacs/src/dispnew.c:1.314 emacs/src/dispnew.c:1.315
*** emacs/src/dispnew.c:1.314 Fri Mar 21 08:49:31 2003
--- emacs/src/dispnew.c Mon Apr 14 12:29:18 2003
***************
*** 6256,6273 ****
DEFUN ("sit-for", Fsit_for, Ssit_for, 1, 3, 0,
doc: /* Perform redisplay, then wait for SECONDS seconds or until
input is available.
SECONDS may be a floating-point value, meaning that you can wait for a
! fraction of a second. Optional second arg MILLISECONDS specifies an
! additional wait period, in milliseconds; this may be useful if your
! Emacs was built without floating point support.
\(Not all operating systems support waiting for a fraction of a second.)
! Optional third arg NODISP non-nil means don't redisplay, just wait for input.
Redisplay is preempted as always if input arrives, and does not happen
if input is available before it starts.
! Value is t if waited the full time with no input arriving. */)
(seconds, milliseconds, nodisp)
Lisp_Object seconds, milliseconds, nodisp;
{
int sec, usec;
if (NILP (milliseconds))
XSETINT (milliseconds, 0);
--- 6256,6284 ----
DEFUN ("sit-for", Fsit_for, Ssit_for, 1, 3, 0,
doc: /* Perform redisplay, then wait for SECONDS seconds or until
input is available.
SECONDS may be a floating-point value, meaning that you can wait for a
! fraction of a second.
\(Not all operating systems support waiting for a fraction of a second.)
! Optional arg NODISP non-nil means don't redisplay, just wait for input.
Redisplay is preempted as always if input arrives, and does not happen
if input is available before it starts.
! Value is t if waited the full time with no input arriving.
!
! An obsolete but still supported form is
! \(sit-for SECONDS &optional MILLISECONDS NODISP)
! Where the optional arg MILLISECONDS specifies an additional wait period,
! in milliseconds; this was useful when Emacs was built without
! floating point support.
! usage: (sit-for SECONDS &optional NODISP) */)
(seconds, milliseconds, nodisp)
Lisp_Object seconds, milliseconds, nodisp;
{
int sec, usec;
+
+ if (NILP (nodisp) && !NUMBERP (milliseconds))
+ { /* New style. */
+ nodisp = milliseconds;
+ milliseconds = Qnil;
+ }
if (NILP (milliseconds))
XSETINT (milliseconds, 0);