* calc/calc-units.el (math-to-standard-rec): Don't treat subscripted

  variables as units.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 477361b9493b031aa80e30cc6db1aed6a3142543..47404444400921fbcb9e7b54df3a3805a787e706 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2011-03-04  Jay Belanger  <jay.p.belanger@gmail.com>
+
+       * calc/calc-units.el (math-to-standard-rec): Don't treat subscripted
+       variables as units.
+
 2011-03-04  Bob Rogers  <rogers@rgrjr.dyndns.org>
 
        * emacs-lisp/ewoc.el (ewoc-goto-next): Give a more explicit error

diff --git a/lisp/calc/calc-units.el b/lisp/calc/calc-units.el
index e6a6fb01132ec94271c909c48ebffad0ee7bce10..0d58bc757f26a2b5eddbff9b1eddcc0df2b5c6e1 100644 (file)
--- a/lisp/calc/calc-units.el
+++ b/lisp/calc/calc-units.el
@@ -960,7 +960,10 @@ If EXPR is nil, return nil."
          (if (eq base 'pi)
              (math-pi)
            expr)))
-    (if (Math-primp expr)
+    (if (or
+         (Math-primp expr)
+         (and (eq (car-safe expr) 'calcFunc-subscr)
+              (eq (car-safe (nth 1 expr)) 'var)))
        expr
       (cons (car expr)
            (mapcar 'math-to-standard-rec (cdr expr))))))