diff lisp/calculator.el @ 110533:b799d38f522a

Merge changes from emacs-23 branch

--- a/lisp/calculator.el	Thu Sep 23 13:10:21 2010 -0400
+++ b/lisp/calculator.el	Thu Sep 23 15:00:31 2010 -0400
@@ -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)))))