[Emacs-diffs] /srv/bzr/emacs/trunk r109199: calc-alg.el (math-simplify-divide): Don't cross multiply

[Jay Belanger]

------------------------------------------------------------
revno: 109199
committer: Jay Belanger <address@hidden>
branch nick: trunk
timestamp: Tue 2012-07-24 21:38:36 -0500
message:
  calc-alg.el (math-simplify-divide): Don't cross multiply 
  in an equation when the lhs is a variable.
modified:
  lisp/ChangeLog
  lisp/calc/calc-alg.el

=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog    2012-07-24 22:17:17 +0000
+++ b/lisp/ChangeLog    2012-07-25 02:38:36 +0000
@@ -1,3 +1,8 @@
+2012-07-25  Jay Belanger  <address@hidden>
+
+       * calc-alg.el (math-simplify-divide): Don't cross multiply
+       in an equation when the lhs is a variable.
+
 2012-07-24  Julien Danjou  <address@hidden>
 
        * net/netrc.el (netrc-find-service-number, netrc-store-data):

=== modified file 'lisp/calc/calc-alg.el'
--- a/lisp/calc/calc-alg.el     2012-01-19 07:21:25 +0000
+++ b/lisp/calc/calc-alg.el     2012-07-25 02:38:36 +0000
@@ -530,7 +530,10 @@
                            (not (Math-realp (nth 1 math-simplify-expr))))
                       (math-common-constant-factor (nth 1 
math-simplify-expr))))
          (if (and (eq (car-safe nn) 'frac) (eq (nth 1 nn) 1) (not n))
-             (progn
+             (unless (and (eq (car-safe math-simplify-expr) 'calcFunc-eq)
+                           (eq (car-safe (nth 1 math-simplify-expr)) 'var)
+                           (not (math-expr-contains (nth 2 math-simplify-expr) 
+                                                    (nth 1 
math-simplify-expr))))
                (setcar (cdr math-simplify-expr)
                         (math-mul (nth 2 nn) (nth 1 math-simplify-expr)))
                (setcar (cdr (cdr math-simplify-expr))