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

(calc-convert-temperature): Use default units when appropriate.

Browse source
This commit is contained in:
Jay Belanger 2008-09-17 02:25:37 +00:00
parent f768e8e8c9
commit fa786329aa
1 changed files with 13 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -473,19 +473,19 @@ If EXPR is nil, return nil."
(setq expr (math-mul expr uold)))
(setq defunits (math-get-default-units expr))
(setq unew (or new-units
(math-read-expr
(read-string
(concat
(if uoldname
(concat "Old temperature units: "
uoldname
", new units")
"New temperature units")
(if defunits
(concat " (default "
defunits
"): ")
": "))))))
(read-string
(concat
(if uoldname
(concat "Old temperature units: "
uoldname
", new units")
"New temperature units")
(if defunits
(concat " (default "
defunits
"): ")
": ")))))
(setq unew (math-read-expr (if (string= unew "") defunits unew)))
(when (eq (car-safe unew) 'error)
(error "Bad format in units expression: %s" (nth 2 unew)))
(math-put-default-units unew)