[Emacs-diffs] Changes to emacs/lisp/calc/calcalg2.el

[Jay Belanger]

Index: emacs/lisp/calc/calcalg2.el
diff -c emacs/lisp/calc/calcalg2.el:1.19 emacs/lisp/calc/calcalg2.el:1.20
*** emacs/lisp/calc/calcalg2.el:1.19    Thu Jul 14 20:03:21 2005
--- emacs/lisp/calc/calcalg2.el Tue Oct 11 19:41:48 2005
***************
*** 52,70 ****
         (setq expr (list func expr var)))
       (calc-enter-result n "derv" expr))))
  
! (defun calc-integral (var)
!   (interactive "sIntegration variable: ")
!   (calc-slow-wrapper
!    (if (or (equal var "") (equal var "$"))
!        (calc-enter-result 2 "intg" (list 'calcFunc-integ
!                                        (calc-top-n 2)
!                                        (calc-top-n 1)))
!      (let ((var (math-read-expr var)))
!        (if (eq (car-safe var) 'error)
!          (error "Bad format in expression: %s" (nth 1 var)))
!        (calc-enter-result 1 "intg" (list 'calcFunc-integ
!                                        (calc-top-n 1)
!                                        var))))))
  
  (defun calc-num-integral (&optional varname lowname highname)
    (interactive "sIntegration variable: ")
--- 52,72 ----
         (setq expr (list func expr var)))
       (calc-enter-result n "derv" expr))))
  
! (defun calc-integral (var &optional arg)
!   (interactive "sIntegration variable: \nP")
!   (if arg
!       (calc-tabular-command 'calcFunc-integ "Integration" "intg" nil var nil 
nil)
!     (calc-slow-wrapper
!      (if (or (equal var "") (equal var "$"))
!          (calc-enter-result 2 "intg" (list 'calcFunc-integ
!                                            (calc-top-n 2)
!                                            (calc-top-n 1)))
!        (let ((var (math-read-expr var)))
!          (if (eq (car-safe var) 'error)
!              (error "Bad format in expression: %s" (nth 1 var)))
!          (calc-enter-result 1 "intg" (list 'calcFunc-integ
!                                            (calc-top-n 1)
!                                            var)))))))
  
  (defun calc-num-integral (&optional varname lowname highname)
    (interactive "sIntegration variable: ")