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

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 9aa623acaa6b76bc4401695b1bc3fca0493cb73a..ab6e97dc9e22fd373d3596444eba5871dcda99c1 100644 (file)
--- 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 c16735088971b99a4ddfe77a2d6624a61142a24a..c4b1127a5c5ab1f4f37d0233f1029e65abbe687e 100644 (file)
--- 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)))