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

[Jay Belanger]

Index: emacs/lisp/calc/calc-prog.el
diff -c emacs/lisp/calc/calc-prog.el:1.10 emacs/lisp/calc/calc-prog.el:1.11
*** emacs/lisp/calc/calc-prog.el:1.10   Sun Nov 21 05:52:41 2004
--- emacs/lisp/calc/calc-prog.el        Mon Nov 29 05:58:45 2004
***************
*** 271,277 ****
                                     x))) calc-user-formula-alist))
       (if cmd
         (progn
!          (calc-need-macros)
           (fset cmd
                 (list 'lambda
                       '()
--- 271,277 ----
                                     x))) calc-user-formula-alist))
       (if cmd
         (progn
!          (require 'calc-macs)
           (fset cmd
                 (list 'lambda
                       '()
***************
*** 1711,1717 ****
  ;;; Compiling Lisp-like forms to use the math library.
  
  (defun math-do-defmath (func args body)
!   (calc-need-macros)
    (let* ((fname (intern (concat "calcFunc-" (symbol-name func))))
         (doc (if (stringp (car body)) (list (car body))))
         (clargs (mapcar 'math-clean-arg args))
--- 1711,1717 ----
  ;;; Compiling Lisp-like forms to use the math library.
  
  (defun math-do-defmath (func args body)
!   (require 'calc-macs)
    (let* ((fname (intern (concat "calcFunc-" (symbol-name func))))
         (doc (if (stringp (car body)) (list (car body))))
         (clargs (mapcar 'math-clean-arg args))