diff options
| -rw-r--r-- | lisp/ChangeLog | 4 | ||||
| -rw-r--r-- | lisp/subr.el | 7 |
2 files changed, 8 insertions, 3 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 3071fd4107..21b008ec5f 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,7 @@ +2008-02-21 Glenn Morris <[email protected]> + + * subr.el (sit-for): Fix obsolete form for nil second argument. + 2008-02-21 Dan Nicolaescu <[email protected]> * progmodes/verilog-mode.el (eval-when-compile): Don't define diff --git a/lisp/subr.el b/lisp/subr.el index 8420c8553d..329c4ca2c2 100644 --- a/lisp/subr.el +++ b/lisp/subr.el @@ -1763,9 +1763,10 @@ in milliseconds; this was useful when Emacs was built without 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) |