From 9e0d4f9ef1cd4d7149c84475df5cef4d408743b6 Mon Sep 17 00:00:00 2001 From: Stefan Monnier Date: Sun, 19 Sep 2010 11:49:21 +0200 Subject: [PATCH] * lisp/emacs-lisp/float-sup.el (float-pi): New name for `pi'. (float-e): New name for `e'. (degrees-to-radians, radians-to-degrees): * lisp/calendar/solar.el (solar-longitude): * lisp/calculator.el (calculator-registers, calculator-funcall): * lisp/textmodes/artist.el (artist-spray-random-points): * lisp/play/bubbles.el (bubbles--initialize-images): Use new names. --- etc/NEWS | 2 ++ lisp/ChangeLog | 16 +++++++++++++--- lisp/calculator.el | 5 +++-- lisp/calendar/solar.el | 6 +++--- lisp/emacs-lisp/float-sup.el | 16 ++++++++-------- lisp/play/bubbles.el | 2 +- lisp/textmodes/artist.el | 2 +- 7 files changed, 31 insertions(+), 18 deletions(-) diff --git a/etc/NEWS b/etc/NEWS index e63767d891..bee89d368b 100644 --- a/etc/NEWS +++ b/etc/NEWS @@ -40,6 +40,8 @@ This can be used in place of the default appt-message-warning-time. * Lisp changes in Emacs 23.3 +** `e' and `pi' are now called `float-e' and `float-pi'. + The old names are obsolete. ** The use of unintern without an obarray arg is declared obsolete. ** New function byte-to-string, like char-to-string but for bytes. diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 647ccd42ad..a411d7e9c7 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,9 +1,19 @@ +2010-09-19 Stefan Monnier + + * emacs-lisp/float-sup.el (float-pi): New name for `pi'. + (float-e): New name for `e'. + (degrees-to-radians, radians-to-degrees): + * calendar/solar.el (solar-longitude): + * calculator.el (calculator-registers, calculator-funcall): + * textmodes/artist.el (artist-spray-random-points): + * play/bubbles.el (bubbles--initialize-images): Use new names. + 2010-09-19 Eric M. Ludlam Update to CEDET 1.0's version of EIEIO. - * emacs-lisp/eieio.el (eieio-specialized-key-to-generic-key): New - function. + * emacs-lisp/eieio.el (eieio-specialized-key-to-generic-key): + New function. (eieio-defmethod, eieio-generic-form, eieio-generic-call): Use it. (eieio-default-eval-maybe): Eval val instead of unquoting only. (class-precedence-list): If class is nil, return nil. @@ -25,7 +35,7 @@ dfs algorithm. (eieio-class-precedence-bfs): Compute class precedence list using bfs algorithm. - (eieio-class-precedence-c3): compute class precedence list using + (eieio-class-precedence-c3): Compute class precedence list using c3 algorithm. (class-precedence-list): New function. (eieiomt-method-list, eieiomt-sym-optimize): Use it. diff --git a/lisp/calculator.el b/lisp/calculator.el index d1b9b517e5..3d865fba0e 100644 --- a/lisp/calculator.el +++ b/lisp/calculator.el @@ -369,7 +369,8 @@ documentation for an example.") Used for repeating operations in calculator-repR/L.") (defvar calculator-registers ; use user-bindings first - (append calculator-user-registers (list (cons ?e e) (cons ?p pi))) + (append calculator-user-registers + (list (cons ?e float-e) (cons ?p float-pi))) "The association list of calculator register values.") (defvar calculator-saved-global-map nil @@ -1300,7 +1301,7 @@ arguments." (calculator-funcall __f__ x y)))) (fset 'D (function (lambda (x) - (if calculator-deg (/ (* x 180) pi) x)))) + (if calculator-deg (/ (* x 180) float-pi) x)))) (unwind-protect (eval f) (if Fbound (fset 'F Fsave) (fmakunbound 'F)) (if Dbound (fset 'D Dsave) (fmakunbound 'D))))) diff --git a/lisp/calendar/solar.el b/lisp/calendar/solar.el index 3d6ab73e77..8116597ad0 100644 --- a/lisp/calendar/solar.el +++ b/lisp/calendar/solar.el @@ -752,12 +752,12 @@ The values of `calendar-daylight-savings-starts', (sin (mod (+ (cadr x) (* (nth 2 x) U)) - (* 2 pi))))) + (* 2 float-pi))))) solar-data-list))))) (aberration (* 0.0000001 (- (* 17 (cos (+ 3.10 (* 62830.14 U)))) 973))) - (A1 (mod (+ 2.18 (* U (+ -3375.70 (* 0.36 U)))) (* 2 pi))) - (A2 (mod (+ 3.51 (* U (+ 125666.39 (* 0.10 U)))) (* 2 pi))) + (A1 (mod (+ 2.18 (* U (+ -3375.70 (* 0.36 U)))) (* 2 float-pi))) + (A2 (mod (+ 3.51 (* U (+ 125666.39 (* 0.10 U)))) (* 2 float-pi))) (nutation (* -0.0000001 (+ (* 834 (sin A1)) (* 64 (sin A2)))))) (mod (radians-to-degrees (+ longitude aberration nutation)) 360.0))) diff --git a/lisp/emacs-lisp/float-sup.el b/lisp/emacs-lisp/float-sup.el index 6a05bda82a..f98e452e34 100644 --- a/lisp/emacs-lisp/float-sup.el +++ b/lisp/emacs-lisp/float-sup.el @@ -34,25 +34,25 @@ ;; provide an easy hook to tell if we are running with floats or not. ;; define pi and e via math-lib calls. (much less prone to killer typos.) -(defconst pi (* 4 (atan 1)) "The value of Pi (3.1415926...).") +(defconst float-pi (* 4 (atan 1)) "The value of Pi (3.1415926...).") +(defconst pi float-pi "Obsolete since Emacs-23.3. Use `float-pi' instead.") -;; It's too inconvenient to make `e' a constant because it's used as -;; a temporary variable all the time. -(defvar e (exp 1) "The value of e (2.7182818...).") +(defconst float-e (exp 1) "The value of e (2.7182818...).") +(defvar e float-e "Obsolete since Emacs-23.3. Use `float-e' instead.") -(defconst degrees-to-radians (/ pi 180.0) +(defconst degrees-to-radians (/ float-pi 180.0) "Degrees to radian conversion constant.") -(defconst radians-to-degrees (/ 180.0 pi) +(defconst radians-to-degrees (/ 180.0 float-pi) "Radian to degree conversion constant.") ;; these expand to a single multiply by a float when byte compiled (defmacro degrees-to-radians (x) "Convert ARG from degrees to radians." - (list '* (/ pi 180.0) x)) + (list '* degrees-to-radians x)) (defmacro radians-to-degrees (x) "Convert ARG from radians to degrees." - (list '* (/ 180.0 pi) x)) + (list '* radians-to-degrees x)) (provide 'lisp-float-type) diff --git a/lisp/play/bubbles.el b/lisp/play/bubbles.el index 91968b02bc..69620aeaca 100644 --- a/lisp/play/bubbles.el +++ b/lisp/play/bubbles.el @@ -1377,7 +1377,7 @@ Return t if new char is non-empty." (g (nth 1 crgb)) (b (nth 2 crgb)) (brightness (/ (+ r g b) 3.0 256 256)) - (val (sin (* brightness (/ pi 2)))) + (val (sin (* brightness (/ float-pi 2)))) (rr (* red val)) (gg (* green val)) (bb (* blue val)) diff --git a/lisp/textmodes/artist.el b/lisp/textmodes/artist.el index 41145afb76..bca7eed00d 100644 --- a/lisp/textmodes/artist.el +++ b/lisp/textmodes/artist.el @@ -2939,7 +2939,7 @@ Blanks in the rendered text overwrite any text in the buffer." Returns a list of points. Each point is on the form (X1 . Y1)." (let ((points)) (while (> n 0) - (let* ((angle (* (random 359) (/ pi 180))) + (let* ((angle (* (random 359) (/ float-pi 180))) (dist (random radius)) (point (cons (round (* dist (cos angle))) (round (* dist (sin angle)))))) -- 2.20.1