From: Glenn Morris <rgm@gnu.org>
Date: Thu, 21 Feb 2008 08:13:14 +0000 (+0000)
Subject: (sit-for): Fix obsolete form for nil second argument.
X-Git-Tag: emacs-pretest-22.1.92~103
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=d66bd635bd6de3952758cc604fb431094053f524;p=emacs.git

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

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 3071fd4107e..21b008ec5f2 100644
--- 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 8420c8553dd..329c4ca2c24 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)