(calc-user-define-formula, calc-do-defmath): Replace calc-need-macros by

appropriate require.

diff --git a/lisp/calc/calc-prog.el b/lisp/calc/calc-prog.el
index 9325029..7e403f3 100644 (file)
--- a/lisp/calc/calc-prog.el
+++ b/lisp/calc/calc-prog.el
@@ -271,7 +271,7 @@
                                    x))) calc-user-formula-alist))
      (if cmd
         (progn
-          (calc-need-macros)
+          (require 'calc-macs)
           (fset cmd
                 (list 'lambda
                       '()
@@ -1711,7 +1711,7 @@
 ;;; Compiling Lisp-like forms to use the math library.
 
 (defun math-do-defmath (func args body)
-  (calc-need-macros)
+  (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))