diff options
| author | Glenn Morris <[email protected]> | 2008-02-21 08:13:45 +0000 |
|---|---|---|
| committer | Glenn Morris <[email protected]> | 2008-02-21 08:13:45 +0000 |
| commit | 000b06df1172f9e20e7e8a21951da65c08163d46 (patch) | |
| tree | 2d097426c188d34597f696db59ca4cb4d372005f /lisp/subr.el | |
| parent | 424c157fc59dd4719224b632dc640d861e8af5ab (diff) | |
(sit-for): Fix obsolete form for nil second argument.
Diffstat (limited to 'lisp/subr.el')
| -rw-r--r-- | lisp/subr.el | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/lisp/subr.el b/lisp/subr.el index 8c7d89591d..6980bf6995 100644 --- a/lisp/subr.el +++ b/lisp/subr.el @@ -1831,9 +1831,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) |