(calc-convert-temperature): Use `/' to create fractions.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 96cb0151619c5fb3f2edb21c30bdd0444aadd63d..fead2048372815b6f696075c003a5899874545fb 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2007-08-07  Jay Belanger  <jay.p.belanger@gmail.com>
+
+       * calc/calc-units.el (calc-convert-temperature):
+       Use `/' to create fractions.
+
 2007-08-07  Michael Albinus  <michael.albinus@gmx.de>
 
        * net/tramp.el (tramp-wrong-passwd-regexp): Make the regexp more

diff --git a/lisp/calc/calc-units.el b/lisp/calc/calc-units.el
index 82769a66b13e83a4012916716b39173a28841d2e..e823a57aef0473ed80547ddd5fde4cd82495eb19 100644 (file)
--- a/lisp/calc/calc-units.el
+++ b/lisp/calc/calc-units.el
@@ -49,7 +49,7 @@
 (defvar math-standard-units
   '( ;; Length
     ( m       nil                    "*Meter" )
-    ( in      "2.54 cm"           "Inch" )
+    ( in      "2.54 cm"              "Inch" )
     ( ft      "12 in"                "Foot" )
     ( yd      "3 ft"                 "Yard" )
     ( mi      "5280 ft"              "Mile" )
@@ -971,17 +971,17 @@ Entries are (SYMBOL EXPR DOC-STRING TEMP-TYPE BASE-UNITS).")
                                                     (symbol-name v)))))))
     (or (eq (nth 3 uold) (nth 3 unew))
        (cond ((eq (nth 3 uold) 'K)
-              (setq expr (list '- expr '(float 27315 -2)))
+              (setq expr (list '- expr '(/ 27315 100)))
               (if (eq (nth 3 unew) 'F)
-                  (setq expr (list '+ (list '* expr '(frac 9 5)) 32))))
+                  (setq expr (list '+ (list '* expr '(/ 9 5)) 32))))
              ((eq (nth 3 uold) 'C)
               (if (eq (nth 3 unew) 'F)
-                  (setq expr (list '+ (list '* expr '(frac 9 5)) 32))
-                (setq expr (list '+ expr '(float 27315 -2)))))
+                  (setq expr (list '+ (list '* expr '(/ 9 5)) 32))
+                (setq expr (list '+ expr '(/ 27315 100)))))
              (t
-              (setq expr (list '* (list '- expr 32) '(frac 5 9)))
+              (setq expr (list '* (list '- expr 32) '(/ 5 9)))
               (if (eq (nth 3 unew) 'K)
-                  (setq expr (list '+ expr '(float 27315 -2)))))))
+                  (setq expr (list '+ expr '(/ 27315 100)))))))
     (if pure
        expr
       (list '* expr new))))