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

[Jay Belanger]

Index: emacs/lisp/calc/calc-misc.el
diff -c emacs/lisp/calc/calc-misc.el:1.15 emacs/lisp/calc/calc-misc.el:1.16
*** emacs/lisp/calc/calc-misc.el:1.15   Fri Nov 26 22:33:19 2004
--- emacs/lisp/calc/calc-misc.el        Mon Nov 29 05:57:46 2004
***************
*** 245,251 ****
                        (and (eq (car (car calc-why)) '*)
                             calc-auto-why)))
        (progn
!       (calc-extensions)
        (calc-explain-why (car calc-why)
                          (if (eq calc-auto-why t)
                              (cdr calc-why)
--- 245,251 ----
                        (and (eq (car (car calc-why)) '*)
                             calc-auto-why)))
        (progn
!       (require 'calc-ext)
        (calc-explain-why (car calc-why)
                          (if (eq calc-auto-why t)
                              (cdr calc-why)
***************
*** 331,344 ****
  
  (defun calc-last-args-stub (arg)
    (interactive "p")
!   (calc-extensions)
    (calc-last-args arg))
  
  
  (defun calc-power (arg)
    (interactive "P")
    (calc-slow-wrapper
!    (if (and calc-extensions-loaded
            (calc-is-inverse))
         (calc-binary-op "root" 'calcFunc-nroot arg nil nil)
       (calc-binary-op "^" 'calcFunc-pow arg nil nil '^))))
--- 331,344 ----
  
  (defun calc-last-args-stub (arg)
    (interactive "p")
!   (require 'calc-ext)
    (calc-last-args arg))
  
  
  (defun calc-power (arg)
    (interactive "P")
    (calc-slow-wrapper
!    (if (and (featurep 'calc-ext)
            (calc-is-inverse))
         (calc-binary-op "root" 'calcFunc-nroot arg nil nil)
       (calc-binary-op "^" 'calcFunc-pow arg nil nil '^))))
***************
*** 420,426 ****
  When this key is used, calc-ext (the Calculator extensions module) will be
  loaded and the keystroke automatically re-typed."
    (interactive "P")
!   (calc-extensions)
    (if (keymapp (key-binding (char-to-string last-command-char)))
        (message "%s%c-" (calc-num-prefix-name n) last-command-char))
    (calc-unread-command)
--- 420,426 ----
  When this key is used, calc-ext (the Calculator extensions module) will be
  loaded and the keystroke automatically re-typed."
    (interactive "P")
!   (require 'calc-ext)
    (if (keymapp (key-binding (char-to-string last-command-char)))
        (message "%s%c-" (calc-num-prefix-name n) last-command-char))
    (calc-unread-command)
***************
*** 428,434 ****
  
  (defun calc-shift-Y-prefix-help ()
    (interactive)
!   (calc-extensions)
    (calc-do-prefix-help calc-Y-help-msgs "other" ?Y))
  
  
--- 428,434 ----
  
  (defun calc-shift-Y-prefix-help ()
    (interactive)
!   (require 'calc-ext)
    (calc-do-prefix-help calc-Y-help-msgs "other" ?Y))
  
  
***************
*** 467,473 ****
  (defun math-concat (v1 v2)
    (if (stringp v1)
        (concat v1 v2)
!     (calc-extensions)
      (if (and (or (math-objvecp v1) (math-known-scalarp v1))
             (or (math-objvecp v2) (math-known-scalarp v2)))
        (append (if (and (math-vectorp v1)
--- 467,473 ----
  (defun math-concat (v1 v2)
    (if (stringp v1)
        (concat v1 v2)
!     (require 'calc-ext)
      (if (and (or (math-objvecp v1) (math-known-scalarp v1))
             (or (math-objvecp v2) (math-known-scalarp v2)))
        (append (if (and (math-vectorp v1)
***************
*** 601,614 ****
  
  (defun math-trunc (a &optional math-trunc-prec)
    (cond (math-trunc-prec
!        (calc-extensions)
         (math-trunc-special a math-trunc-prec))
        ((Math-integerp a) a)
        ((Math-looks-negp a)
         (math-neg (math-trunc (math-neg a))))
        ((eq (car a) 'float)
         (math-scale-int (nth 1 a) (nth 2 a)))
!       (t (calc-extensions)
           (math-trunc-fancy a))))
  (defalias 'calcFunc-trunc 'math-trunc)
  
--- 601,614 ----
  
  (defun math-trunc (a &optional math-trunc-prec)
    (cond (math-trunc-prec
!        (require 'calc-ext)
         (math-trunc-special a math-trunc-prec))
        ((Math-integerp a) a)
        ((Math-looks-negp a)
         (math-neg (math-trunc (math-neg a))))
        ((eq (car a) 'float)
         (math-scale-int (nth 1 a) (nth 2 a)))
!       (t (require 'calc-ext)
           (math-trunc-fancy a))))
  (defalias 'calcFunc-trunc 'math-trunc)
  
***************
*** 619,625 ****
  
  (defun math-floor (a &optional math-floor-prec)    ;  [Public]
    (cond (math-floor-prec
!        (calc-extensions)
         (math-floor-special a math-floor-prec))
        ((Math-integerp a) a)
        ((Math-messy-integerp a) (math-trunc a))
--- 619,625 ----
  
  (defun math-floor (a &optional math-floor-prec)    ;  [Public]
    (cond (math-floor-prec
!        (require 'calc-ext)
         (math-floor-special a math-floor-prec))
        ((Math-integerp a) a)
        ((Math-messy-integerp a) (math-trunc a))
***************
*** 627,633 ****
         (if (Math-negp a)
             (math-add (math-trunc a) -1)
           (math-trunc a)))
!       (t (calc-extensions)
           (math-floor-fancy a))))
  (defalias 'calcFunc-floor 'math-floor)
  
--- 627,633 ----
         (if (Math-negp a)
             (math-add (math-trunc a) -1)
           (math-trunc a)))
!       (t (require 'calc-ext)
           (math-floor-fancy a))))
  (defalias 'calcFunc-floor 'math-floor)
  
***************
*** 643,649 ****
  (defun calcFunc-inv (m)
    (if (Math-vectorp m)
        (progn
!       (calc-extensions)
        (if (math-square-matrixp m)
            (or (math-with-extra-prec 2 (math-matrix-inv-raw m))
                (math-reject-arg m "*Singular matrix"))
--- 643,649 ----
  (defun calcFunc-inv (m)
    (if (Math-vectorp m)
        (progn
!       (require 'calc-ext)
        (if (math-square-matrixp m)
            (or (math-with-extra-prec 2 (math-matrix-inv-raw m))
                (math-reject-arg m "*Singular matrix"))
***************
*** 673,679 ****
         (math-imod a b))
        ((and (Math-anglep a) (Math-anglep b))
         (math-sub a (math-mul (math-floor (math-div a b)) b)))
!       (t (calc-extensions)
           (math-mod-fancy a b))))
  
  
--- 673,679 ----
         (math-imod a b))
        ((and (Math-anglep a) (Math-anglep b))
         (math-sub a (math-mul (math-floor (math-div a b)) b)))
!       (t (require 'calc-ext)
           (math-mod-fancy a b))))
  
  
***************
*** 686,692 ****
        ((Math-zerop a)
         (if (and (Math-scalarp b) (Math-posp b))
             (if (math-floatp b) (math-float a) a)
!          (calc-extensions)
           (math-pow-of-zero a b)))
        ((or (eq a 1) (eq b 1)) a)
        ((or (equal a '(float 1 0)) (equal b '(float 1 0))) a)
--- 686,692 ----
        ((Math-zerop a)
         (if (and (Math-scalarp b) (Math-posp b))
             (if (math-floatp b) (math-float a) a)
!          (require 'calc-ext)
           (math-pow-of-zero a b)))
        ((or (eq a 1) (eq b 1)) a)
        ((or (equal a '(float 1 0)) (equal b '(float 1 0))) a)
***************
*** 694,700 ****
         (if (Math-scalarp a)
             (if (or (math-floatp a) (math-floatp b))
                 '(float 1 0) 1)
!          (calc-extensions)
           (math-pow-zero a b)))
        ((and (Math-integerp b) (or (Math-numberp a) (Math-vectorp a)))
         (if (and (equal a '(float 1 1)) (integerp b))
--- 694,700 ----
         (if (Math-scalarp a)
             (if (or (math-floatp a) (math-floatp b))
                 '(float 1 0) 1)
!          (require 'calc-ext)
           (math-pow-zero a b)))
        ((and (Math-integerp b) (or (Math-numberp a) (Math-vectorp a)))
         (if (and (equal a '(float 1 1)) (integerp b))
***************
*** 702,708 ****
           (math-with-extra-prec 2
             (math-ipow a b))))
        (t
!        (calc-extensions)
         (math-pow-fancy a b))))
  
  (defun math-ipow (a n)   ; [O O I] [Public]
--- 702,708 ----
           (math-with-extra-prec 2
             (math-ipow a b))))
        (t
!        (require 'calc-ext)
         (math-pow-fancy a b))))
  
  (defun math-ipow (a n)   ; [O O I] [Public]