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

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

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 6c2a4ea2471..ce1d263b0ae 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  <handa@ni.aist.go.jp>
 
 	* composite.el (compose-chars-after): Fix arguments for a function
diff --git a/lisp/subr.el b/lisp/subr.el
index 8c7d89591d9..6980bf69959 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)