diff options
| author | Jay Belanger <jay.p.belanger@gmail.com> | 2007-08-07 21:06:29 +0000 |
|---|---|---|
| committer | Jay Belanger <jay.p.belanger@gmail.com> | 2007-08-07 21:06:29 +0000 |
| commit | e6cd99dc691dce64e1878b426c59c58e31185627 (patch) | |
| tree | 90f79fd63167ff4e1eca28ed81bfb9dc6a5fb7ad /lisp/calc | |
| parent | 27e813fe4b976963ebc8851febc7902bbc869a51 (diff) | |
| download | emacs-e6cd99dc691dce64e1878b426c59c58e31185627.tar.gz | |
(calc-convert-temperature): Use `/' to create fractions.
Diffstat (limited to 'lisp/calc')
| -rw-r--r-- | lisp/calc/calc-units.el | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/lisp/calc/calc-units.el b/lisp/calc/calc-units.el index 82769a66b13..e823a57aef0 100644 --- 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)))) |