[Emacs-diffs] Changes to emacs/lisp/calc/calc-units.el,v

[Jay Belanger]

CVSROOT:        /cvsroot/emacs
Module name:    emacs
Changes by:     Jay Belanger <jpb>      07/08/07 21:03:40

Index: calc-units.el
===================================================================
RCS file: /cvsroot/emacs/emacs/lisp/calc/calc-units.el,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -b -r1.26 -r1.27
--- calc-units.el       26 Jul 2007 05:26:41 -0000      1.26
+++ calc-units.el       7 Aug 2007 21:03:40 -0000       1.27
@@ -971,17 +971,17 @@
                                                     (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))))