# HG changeset patch # User Glenn Morris # Date 1203581499 0 # Node ID 0fade0cf29133cb56fbb9d9431c8b0f279489502 # Parent 7d8f871582502ce39270f560c3acd42fb75f41d7 (sit-for): Fix obsolete form for nil second argument. diff -r 7d8f87158250 -r 0fade0cf2913 lisp/subr.el --- 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)