Mercurial > emacs
changeset 82325:c9f47b4c81d5
(calc-convert-temperature): Use `/' to create fractions.
| author | Jay Belanger <jay.p.belanger@gmail.com> |
|---|---|
| date | Tue, 07 Aug 2007 21:03:40 +0000 |
| parents | 5399c02bfd07 |
| children | 53b6f6eafb28 |
| files | lisp/calc/calc-units.el |
| diffstat | 1 files changed, 7 insertions(+), 7 deletions(-) [+] |
line wrap: on
line diff
--- a/lisp/calc/calc-units.el Tue Aug 07 20:30:20 2007 +0000 +++ b/lisp/calc/calc-units.el Tue Aug 07 21:03:40 2007 +0000 @@ -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 @@ (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))))