From: Jay Belanger <jay.p.belanger@gmail.com>
Date: Fri, 8 Jul 2005 04:32:51 +0000 (+0000)
Subject: (math-apply-units):  Change the places in which units are simplified.
X-Git-Tag: emacs-pretest-22.0.90~8293
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=2e2b4fbe92ca08a1502278d8b070b722c68f97df;p=emacs.git

(math-apply-units):  Change the places in which units are simplified.
---

diff --git a/lisp/calc/calc-units.el b/lisp/calc/calc-units.el
index 0983b807fde..3857d930902 100644
--- a/lisp/calc/calc-units.el
+++ b/lisp/calc/calc-units.el
@@ -810,10 +810,10 @@ Entries are (SYMBOL EXPR DOC-STRING TEMP-TYPE BASE-UNITS).")
 	    (mapcar 'math-to-standard-rec (cdr expr))))))
 
 (defun math-apply-units (expr units ulist &optional pure)
+  (setq expr (math-simplify-units expr))
   (if ulist
       (let ((new 0)
 	    value)
-	(setq expr (math-simplify-units expr))
 	(or (math-numberp expr)
 	    (error "Incompatible units"))
 	(while (cdr ulist)
@@ -826,9 +826,9 @@ Entries are (SYMBOL EXPR DOC-STRING TEMP-TYPE BASE-UNITS).")
 		ulist (cdr ulist)))
 	(math-add new (math-mul (math-div expr (nth 1 (car ulist)))
 				(car (car ulist)))))
-    (math-simplify-units (if pure
-			     expr
-			   (list '* expr units)))))
+    (if pure
+        expr
+      (math-simplify-units (list '* expr units)))))
 
 (defvar math-decompose-units-cache nil)
 (defun math-decompose-units (units)