From: Jay Belanger <jay.p.belanger@gmail.com>
Date: Fri, 4 Mar 2011 06:35:49 +0000 (-0600)
Subject: * calc/calc-units.el (math-to-standard-rec): Don't treat subscripted
X-Git-Tag: emacs-pretest-24.0.90~104^2~275^2~674^2~47
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=d6ffd3f84f561dd8dd5f1e874a7ba1299bde8d02;p=emacs.git

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

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 477361b9493..47404444400 100644
--- 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 e6a6fb01132..0d58bc757f2 100644
--- 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))))))