[Emacs-diffs] /srv/bzr/emacs/emacs-23 r100049: * lisp/emacs-lisp/float-sup.el (float-pi): New name for `pi'.

[Stefan Monnier]

------------------------------------------------------------
revno: 100049
committer: Stefan Monnier <address@hidden>
branch nick: emacs-23
timestamp: Sun 2010-09-19 11:49:21 +0200
message:
  * 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.
modified:
  etc/NEWS
  lisp/ChangeLog
  lisp/calculator.el
  lisp/calendar/solar.el
  lisp/emacs-lisp/float-sup.el
  lisp/play/bubbles.el
  lisp/textmodes/artist.el

=== modified file 'etc/NEWS'
--- a/etc/NEWS  2010-09-14 11:11:44 +0000
+++ b/etc/NEWS  2010-09-19 09:49:21 +0000
@@ -40,6 +40,8 @@
 
 * 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.

=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog    2010-09-19 04:23:57 +0000
+++ b/lisp/ChangeLog    2010-09-19 09:49:21 +0000
@@ -1,9 +1,19 @@
+2010-09-19  Stefan Monnier  <address@hidden>
+
+       * 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  <address@hidden>
 
        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.

=== modified file 'lisp/calculator.el'
--- a/lisp/calculator.el        2010-03-06 18:23:23 +0000
+++ b/lisp/calculator.el        2010-09-19 09:49:21 +0000
@@ -369,7 +369,8 @@
 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 @@
                       (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)))))

=== modified file 'lisp/calendar/solar.el'
--- a/lisp/calendar/solar.el    2010-01-13 08:35:10 +0000
+++ b/lisp/calendar/solar.el    2010-09-19 09:49:21 +0000
@@ -752,12 +752,12 @@
                                     (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)))
 

=== modified file 'lisp/emacs-lisp/float-sup.el'
--- a/lisp/emacs-lisp/float-sup.el      2010-01-13 08:35:10 +0000
+++ b/lisp/emacs-lisp/float-sup.el      2010-09-19 09:49:21 +0000
@@ -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...).")
-
-;; 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 degrees-to-radians (/ pi 180.0)
+(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.")
+
+(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 (/ 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)
 

=== modified file 'lisp/play/bubbles.el'
--- a/lisp/play/bubbles.el      2010-01-13 08:35:10 +0000
+++ b/lisp/play/bubbles.el      2010-09-19 09:49:21 +0000
@@ -1377,7 +1377,7 @@
                                    (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))

=== modified file 'lisp/textmodes/artist.el'
--- a/lisp/textmodes/artist.el  2010-03-30 21:41:01 +0000
+++ b/lisp/textmodes/artist.el  2010-09-19 09:49:21 +0000
@@ -2939,7 +2939,7 @@
 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))))))