HCoop
/
bpt
/
emacs.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Teach sql-mode's imenu about IF NOT EXISTS
[bpt/emacs.git]
/
lisp
/
calc
/
calc-frac.el
diff --git
a/lisp/calc/calc-frac.el
b/lisp/calc/calc-frac.el
index
d1164be
..
5b7c2cb
100644
(file)
--- a/
lisp/calc/calc-frac.el
+++ b/
lisp/calc/calc-frac.el
@@
-1,7
+1,6
@@
;;; calc-frac.el --- fraction functions for Calc
;;; calc-frac.el --- fraction functions for Calc
-;; Copyright (C) 1990, 1991, 1992, 1993, 2001, 2002, 2003, 2004,
-;; 2005, 2006, 2007, 2008, 2009, 2010 Free Software Foundation, Inc.
+;; Copyright (C) 1990-1993, 2001-2012 Free Software Foundation, Inc.
;; Author: David Gillespie <daveg@synaptics.com>
;; Maintainer: Jay Belanger <jay.p.belanger@gmail.com>
;; Author: David Gillespie <daveg@synaptics.com>
;; Maintainer: Jay Belanger <jay.p.belanger@gmail.com>
@@
-214,25
+213,24
@@
(math-reject-arg a "*Division by zero")
(math-make-frac (math-trunc a) (math-trunc b))))
((eq (car-safe b) 'frac)
(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-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")
(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)
((eq (car-safe b) 'frac)
- (if (Math-zerop (
cadr
b))
+ (if (Math-zerop (
nth 1
b))
(math-reject-arg a "*Division by zero")
(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))))
(provide 'calc-frac)
(t (math-reject-arg b 'integerp))))
(t
(math-reject-arg a 'integerp))))
(provide 'calc-frac)
-;; arch-tag: 89d65274-0b3b-42d8-aacd-eaf86da5b4ea
;;; calc-frac.el ends here
;;; calc-frac.el ends here