[Emacs-diffs] Changes to emacs/lisp/calc/calc-alg.el [emacs-unicode-2]

[Miles Bader]

Index: emacs/lisp/calc/calc-alg.el
diff -c emacs/lisp/calc/calc-alg.el:1.7.4.2 emacs/lisp/calc/calc-alg.el:1.7.4.3
*** emacs/lisp/calc/calc-alg.el:1.7.4.2 Fri Nov 19 06:55:08 2004
--- emacs/lisp/calc/calc-alg.el Wed Dec  8 05:02:18 2004
***************
*** 27,38 ****
  ;;; Code:
  
  ;; This file is autoloaded from calc-ext.el.
- (require 'calc-ext)
  
  (require 'calc-macs)
  
- (defun calc-Need-calc-alg () nil)
- 
  ;;; Algebra commands.
  
  (defun calc-alg-evaluate (arg)
--- 27,36 ----
  ;;; Code:
  
  ;; This file is autoloaded from calc-ext.el.
  
+ (require 'calc-ext)
  (require 'calc-macs)
  
  ;;; Algebra commands.
  
  (defun calc-alg-evaluate (arg)
***************
*** 333,341 ****
        aa)))
  
  
! ;; Placeholder, to synchronize autoloading.
! (defun math-need-std-simps ()
!   nil)
  
  ;; The function created by math-defsimplify uses the variable
  ;; math-simplify-expr, and so is used by functions in math-defsimplify
--- 331,349 ----
        aa)))
  
  
! (defmacro math-defsimplify (funcs &rest code)
!   (append '(progn)
!           (mapcar (function
!                    (lambda (func)
!                      (list 'put (list 'quote func) ''math-simplify
!                            (list 'nconc
!                                  (list 'get (list 'quote func) 
''math-simplify)
!                                  (list 'list
!                                        (list 'function
!                                              (append '(lambda 
(math-simplify-expr))
!                                                      code)))))))
!                   (if (symbolp funcs) (list funcs) funcs))))
! (put 'math-defsimplify 'lisp-indent-hook 1)
  
  ;; The function created by math-defsimplify uses the variable
  ;; math-simplify-expr, and so is used by functions in math-defsimplify
***************
*** 1587,1600 ****
  (defvar math-poly-base-const-ok)
  (defvar math-poly-base-pred)
  
! (defun math-polynomial-base (mpb-top-expr &optional math-poly-base-pred)
    (or math-poly-base-pred
        (setq math-poly-base-pred (function (lambda (base) (math-polynomial-p
!                                              mpb-top-expr base)))))
    (or (let ((math-poly-base-const-ok nil))
!       (math-polynomial-base-rec mpb-top-expr))
        (let ((math-poly-base-const-ok t))
!       (math-polynomial-base-rec mpb-top-expr))))
  
  (defun math-polynomial-base-rec (mpb-expr)
    (and (not (Math-objvecp mpb-expr))
--- 1595,1612 ----
  (defvar math-poly-base-const-ok)
  (defvar math-poly-base-pred)
  
! ;; The variable math-poly-base-top-expr is local to math-polynomial-base,
! ;; but is used by math-polynomial-p1 in calc-poly.el, which is called
! ;; by math-polynomial-base.
! 
! (defun math-polynomial-base (math-poly-base-top-expr &optional 
math-poly-base-pred)
    (or math-poly-base-pred
        (setq math-poly-base-pred (function (lambda (base) (math-polynomial-p
!                                              math-poly-base-top-expr base)))))
    (or (let ((math-poly-base-const-ok nil))
!       (math-polynomial-base-rec math-poly-base-top-expr))
        (let ((math-poly-base-const-ok t))
!       (math-polynomial-base-rec math-poly-base-top-expr))))
  
  (defun math-polynomial-base-rec (mpb-expr)
    (and (not (Math-objvecp mpb-expr))
***************
*** 1688,1692 ****
--- 1700,1706 ----
                                    (math-scale-int 1 (- (nth 2 f)))))))
        f))
  
+ (provide 'calc-alg)
+ 
  ;;; arch-tag: 52e7dcdf-9688-464d-a02b-4bbe789348d0
  ;;; calc-alg.el ends here