From: Jay Belanger <jay.p.belanger@gmail.com>
Date: Wed, 9 Nov 2005 06:02:54 +0000 (+0000)
Subject: (math-convert-units):  Replace any composite unit by its definition.
X-Git-Tag: emacs-pretest-22.0.90~6008
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=65b62d0acb7efe8012127fa5124c663fa475ce44;p=emacs.git

(math-convert-units):  Replace any composite unit by its definition.
---

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 9aa623acaa6..ab6e97dc9e2 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2005-11-08  Jay Belanger  <belanger@truman.edu>
+
+	* calc/calc-units.el (math-convert-units):  Replace any composite
+	unit by its definition.
+
 2005-11-08 Lars Hansen <larsh@soem.dk>
 	* emacs-lisp/autoload.el (update-directory-autoloads): Add
 	obsolete function alias.
diff --git a/lisp/calc/calc-units.el b/lisp/calc/calc-units.el
index c1673508897..c4b1127a5c5 100644
--- a/lisp/calc/calc-units.el
+++ b/lisp/calc/calc-units.el
@@ -911,6 +911,11 @@ Entries are (SYMBOL EXPR DOC-STRING TEMP-TYPE BASE-UNITS).")
 (defvar math-cu-pure)
 
 (defun math-convert-units (expr math-cu-new-units &optional math-cu-pure)
+  (if (eq (car-safe math-cu-new-units) 'var)
+      (let ((unew (assq (nth 1 math-cu-new-units)
+                        (math-build-units-table))))
+        (if (eq (car-safe (nth 1 unew)) '+)
+            (setq math-cu-new-units (nth 1 unew)))))
   (math-with-extra-prec 2
     (let ((compat (and (not math-cu-pure) 
                        (math-find-compatible-unit expr math-cu-new-units)))