Mercurial > emacs
comparison lisp/calc/calc-arith.el @ 90286:5b7d410e31f9
Revision: emacs@sv.gnu.org/emacs--unicode--0--patch-7
Merge from emacs--devo--0
Patches applied:
* emacs--devo--0 (patch 4-14)
- Update from CVS
- Merge from gnus--rel--5.10
* gnus--rel--5.10 (base, patch 1-7)
- tag of miles@gnu.org--gnu-2005/gnus--rel--5.10--patch-187
- Update from CVS
- Merge from emacs--devo--0
* miles@gnu.org--gnu-2005/gnus--rel--5.10 (patch 187)
- Update from CVS
| author | Miles Bader <miles@gnu.org> |
|---|---|
| date | Wed, 25 Jan 2006 07:10:04 +0000 |
| parents | 7beb78bc1f8e 1da5034b091b |
| children | c5406394f567 |
comparison
equal
deleted
inserted
replaced
| 90285:5251b70632c4 | 90286:5b7d410e31f9 |
|---|---|
| 1199 (and (math-square-matrixp b) | 1199 (and (math-square-matrixp b) |
| 1200 (math-add (math-mimic-ident (nth 1 a) b) b)) | 1200 (math-add (math-mimic-ident (nth 1 a) b) b)) |
| 1201 (and (math-known-scalarp b) | 1201 (and (math-known-scalarp b) |
| 1202 (math-add (nth 1 a) b)))) | 1202 (math-add (nth 1 a) b)))) |
| 1203 (and (eq (car-safe b) 'calcFunc-idn) | 1203 (and (eq (car-safe b) 'calcFunc-idn) |
| 1204 (= (length a) 2) | 1204 (= (length b) 2) |
| 1205 (or (and (math-square-matrixp a) | 1205 (or (and (math-square-matrixp a) |
| 1206 (math-add a (math-mimic-ident (nth 1 b) a))) | 1206 (math-add a (math-mimic-ident (nth 1 b) a))) |
| 1207 (and (math-known-scalarp a) | 1207 (and (math-known-scalarp a) |
| 1208 (math-add a (nth 1 b))))) | 1208 (math-add a (nth 1 b))))) |
| 1209 (list '+ a b))) | 1209 (list '+ a b))) |