From 000b06df1172f9e20e7e8a21951da65c08163d46 Mon Sep 17 00:00:00 2001 From: Glenn Morris Date: Thu, 21 Feb 2008 08:13:45 +0000 Subject: (sit-for): Fix obsolete form for nil second argument. --- lisp/ChangeLog | 2 ++ lisp/subr.el | 7 ++++--- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 6c2a4ea247..ce1d263b0a 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -3,6 +3,8 @@ * composite.el (encode-composition-rule): Fix typo in error message. (composition-function-table, auto-composition-mode): Doc fixes. + * subr.el (sit-for): Fix obsolete form for nil second argument. + 2008-02-21 Kenichi Handa * composite.el (compose-chars-after): Fix arguments for a function 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) -- cgit v1.2.3