procyberian/emacs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

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

Browse source
This commit is contained in:
Jay Belanger 2007-08-07 21:06:29 +00:00
parent 27e813fe4b
commit e6cd99dc69
2 changed files with 12 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
lisp/ChangeLog
View file

@ -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

14
lisp/calc/calc-units.el
View file

@ -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))))