(sit-for): Fix obsolete form for nil second argument.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 3071fd4107ef72c071fa55d7e6c73d947a671c7a..21b008ec5f208ea4ef7998f2a1a67844b5ad2298 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,7 @@
+2008-02-21  Glenn Morris  <rgm@gnu.org>
+
+       * subr.el (sit-for): Fix obsolete form for nil second argument.
+
 2008-02-21  Dan Nicolaescu  <dann@ics.uci.edu>
 
        * progmodes/verilog-mode.el (eval-when-compile): Don't define

diff --git a/lisp/subr.el b/lisp/subr.el
index 8420c8553dd6b7b7347e74fe8a1532bba86e7f80..329c4ca2c24ae551bbc721821545872cd0924f40 100644 (file)
--- 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)