[Emacs-diffs] /srv/bzr/emacs/trunk r103510: * calc/calc-units.el (math-to-standard-rec): Don't treat subscripted

[Jay Belanger]

------------------------------------------------------------
revno: 103510
committer: Jay Belanger <address@hidden>
branch nick: trunk
timestamp: Fri 2011-03-04 00:35:49 -0600
message:
  * calc/calc-units.el (math-to-standard-rec): Don't treat subscripted
    variables as units.
modified:
  lisp/ChangeLog
  lisp/calc/calc-units.el

=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog    2011-03-04 05:16:56 +0000
+++ b/lisp/ChangeLog    2011-03-04 06:35:49 +0000
@@ -1,3 +1,8 @@
+2011-03-04  Jay Belanger  <address@hidden>
+
+       * calc/calc-units.el (math-to-standard-rec): Don't treat subscripted
+       variables as units.
+
 2011-03-04  Bob Rogers  <address@hidden>
 
        * emacs-lisp/ewoc.el (ewoc-goto-next): Give a more explicit error

=== modified file 'lisp/calc/calc-units.el'
--- a/lisp/calc/calc-units.el   2011-03-02 03:07:34 +0000
+++ b/lisp/calc/calc-units.el   2011-03-04 06:35:49 +0000
@@ -960,7 +960,10 @@
          (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))))))