diff options
author | Jim Blandy <jimb@redhat.com> | 1993-05-22 22:09:25 +0000 |
---|---|---|
committer | Jim Blandy <jimb@redhat.com> | 1993-05-22 22:09:25 +0000 |
commit | 758c80c0f394209f07624fe2342b11c1d1031cb2 (patch) | |
tree | d47e279c28b5baaf2c8304dfc48726adb38994f4 /lisp | |
parent | 2d6e26196ef3a2d49cea410b385a0fcbb20b330d (diff) | |
download | emacs-758c80c0f394209f07624fe2342b11c1d1031cb2.tar.gz |
* cl.el (cl-floor, cl-ceiling, cl-truncate, cl-round): Renamed
from floor, ceiling, truncate, and round; the old names conflict
with built-in functions.
Diffstat (limited to 'lisp')
-rw-r--r-- | lisp/cl.el | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/lisp/cl.el b/lisp/cl.el index b897603ab47..2d2179b78bc 100644 --- a/lisp/cl.el +++ b/lisp/cl.el @@ -1724,7 +1724,7 @@ equal to the real square root of the argument." done (or (= new approx) (= new (+ approx 1))) approx new))))) -(defun floor (number &optional divisor) +(defun cl-floor (number &optional divisor) "Divide DIVIDEND by DIVISOR, rounding toward minus infinity. DIVISOR defaults to 1. The remainder is produced as a second value." (cond ((and (null divisor) ; trivial case @@ -1744,7 +1744,7 @@ DIVISOR defaults to 1. The remainder is produced as a second value." (let ((q (- (+ q 1)))) (values q (- number (* q divisor))))))))))) -(defun ceiling (number &optional divisor) +(defun cl-ceiling (number &optional divisor) "Divide DIVIDEND by DIVISOR, rounding toward plus infinity. DIVISOR defaults to 1. The remainder is produced as a second value." (cond ((and (null divisor) ; trivial case @@ -1761,7 +1761,7 @@ DIVISOR defaults to 1. The remainder is produced as a second value." (t (values (- q) (+ number (* q divisor))))))))) -(defun truncate (number &optional divisor) +(defun cl-truncate (number &optional divisor) "Divide DIVIDEND by DIVISOR, rounding toward zero. DIVISOR defaults to 1. The remainder is produced as a second value." (cond ((and (null divisor) ; trivial case @@ -1778,7 +1778,7 @@ DIVISOR defaults to 1. The remainder is produced as a second value." (t ;same as ceiling (values (- q) (+ number (* q divisor))))))))) -(defun round (number &optional divisor) +(defun cl-round (number &optional divisor) "Divide DIVIDEND by DIVISOR, rounding to nearest integer. DIVISOR defaults to 1. The remainder is produced as a second value." (cond ((and (null divisor) ; trivial case |