From fa786329aacadadc44b512fb761329123fa16c17 Mon Sep 17 00:00:00 2001 From: Jay Belanger Date: Wed, 17 Sep 2008 02:25:37 +0000 Subject: [PATCH] (calc-convert-temperature): Use default units when appropriate. --- lisp/calc/calc-units.el | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/lisp/calc/calc-units.el b/lisp/calc/calc-units.el index 9ada7e31e34..8ba6465e902 100644 --- a/lisp/calc/calc-units.el +++ b/lisp/calc/calc-units.el @@ -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) -- 2.39.5