diff options
author | Miles Bader <miles@gnu.org> | 2005-05-20 04:22:05 +0000 |
---|---|---|
committer | Miles Bader <miles@gnu.org> | 2005-05-20 04:22:05 +0000 |
commit | 64e9342958694825be1664890dcd22fffcd50d3a (patch) | |
tree | a43e1796f5a49ae7eeec671447d10ac3731a1834 /lisp/calc/calc-poly.el | |
parent | 5447510256e5a1b371407b751ddcc461044da5df (diff) | |
parent | a18ff9886771c41186eebf8d7984fee2120dbe36 (diff) | |
download | emacs-64e9342958694825be1664890dcd22fffcd50d3a.tar.gz |
Revision: miles@gnu.org--gnu-2005/emacs--unicode--0--patch-53
Merge from emacs--cvs-trunk--0
Patches applied:
* emacs--cvs-trunk--0 (patch 302-319)
- Update from CVS
- Merge from gnus--rel--5.10
* gnus--rel--5.10 (patch 69)
- Update from CVS
Diffstat (limited to 'lisp/calc/calc-poly.el')
-rw-r--r-- | lisp/calc/calc-poly.el | 15 |
1 files changed, 8 insertions, 7 deletions
diff --git a/lisp/calc/calc-poly.el b/lisp/calc/calc-poly.el index e887e77030e..89d8273d6d6 100644 --- a/lisp/calc/calc-poly.el +++ b/lisp/calc/calc-poly.el @@ -1,6 +1,6 @@ ;;; calc-poly.el --- polynomial functions for Calc -;; Copyright (C) 1990, 1991, 1992, 1993, 2001, 2004 Free Software Foundation, Inc. +;; Copyright (C) 1990, 1991, 1992, 1993, 2001, 2005 Free Software Foundation, Inc. ;; Author: David Gillespie <daveg@synaptics.com> ;; Maintainer: Jay Belanger <belanger@truman.edu> @@ -692,12 +692,13 @@ ;; Check if linear in math-fet-x. ((not (cdr (cdr p))) - (math-add (math-factor-protect - (math-sort-terms - (math-factor-expr (car p)))) - (math-mul math-fet-x (math-factor-protect - (math-sort-terms - (math-factor-expr (nth 1 p))))))) + (math-sort-terms + (math-add (math-factor-protect + (math-sort-terms + (math-factor-expr (car p)))) + (math-mul math-fet-x (math-factor-protect + (math-sort-terms + (math-factor-expr (nth 1 p)))))))) ;; If symbolic coefficients, use FactorRules. ((let ((pp p)) |