From: Jay Belanger Date: Wed, 7 Apr 2010 01:43:23 +0000 (-0500) Subject: (calcFunc-fdiv): Use `nth' to choose elements from list. X-Git-Tag: emacs-pretest-24.0.90~104^2~275^2~438^2~575 X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=cfd4160dba90f61c9e2c311e0ac79b6ee988fb2e;p=emacs.git (calcFunc-fdiv): Use `nth' to choose elements from list. --- diff --git a/lisp/calc/calc-frac.el b/lisp/calc/calc-frac.el index d1164bec3c5..265f0b325b9 100644 --- a/lisp/calc/calc-frac.el +++ b/lisp/calc/calc-frac.el @@ -214,20 +214,20 @@ (math-reject-arg a "*Division by zero") (math-make-frac (math-trunc a) (math-trunc b)))) ((eq (car-safe b) 'frac) - (if (Math-zerop (cadr b)) + (if (Math-zerop (nth 1 b)) (math-reject-arg a "*Division by zero") - (math-make-frac (math-mul (math-trunc a) (caddr b)) (cadr b)))) + (math-make-frac (math-mul (math-trunc a) (nth 2 b)) (nth 1 b)))) (t (math-reject-arg b 'integerp)))) ((eq (car-safe a) 'frac) (cond ((Math-num-integerp b) (if (Math-zerop b) (math-reject-arg a "*Division by zero") - (math-make-frac (cadr a) (math-mul (caddr a) (math-trunc b))))) + (math-make-frac (cadr a) (math-mul (nth 2 a) (math-trunc b))))) ((eq (car-safe b) 'frac) - (if (Math-zerop (cadr b)) + (if (Math-zerop (nth 1 b)) (math-reject-arg a "*Division by zero") - (math-make-frac (math-mul (cadr a) (caddr b)) (math-mul (caddr a) (cadr b))))) + (math-make-frac (math-mul (nth 1 a) (nth 2 b)) (math-mul (nth 2 a) (nth 1 b))))) (t (math-reject-arg b 'integerp)))) (t (math-reject-arg a 'integerp))))