procyberian/emacs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

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

Browse source
This commit is contained in:
Glenn Morris 2008-02-21 08:13:45 +00:00
parent 424c157fc5
commit 000b06df11
2 changed files with 6 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
lisp/ChangeLog
View file

@ -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

7
lisp/subr.el
View file

@ -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)