Mercurial > emacs
changeset 80173:0fade0cf2913
(sit-for): Fix obsolete form for nil second argument.
author | Glenn Morris <rgm@gnu.org> |
---|---|
date | Thu, 21 Feb 2008 08:11:39 +0000 |
parents | 7d8f87158250 |
children | 16574b6b2586 |
files | lisp/subr.el |
diffstat | 1 files changed, 4 insertions(+), 3 deletions(-) [+] |
line wrap: on
line diff
--- a/lisp/subr.el Thu Feb 21 07:41:21 2008 +0000 +++ b/lisp/subr.el Thu Feb 21 08:11:39 2008 +0000 @@ -1763,9 +1763,10 @@ floating point support. \(fn SECONDS &optional NODISP)" - (when (or obsolete (numberp nodisp)) - (setq seconds (+ seconds (* 1e-3 nodisp))) - (setq nodisp obsolete)) + (if (numberp nodisp) + (setq seconds (+ seconds (* 1e-3 nodisp)) + nodisp obsolete) + (if obsolete (setq nodisp obsolete))) (cond (noninteractive (sleep-for seconds)