# HG changeset patch
# User Jay Belanger <jay.p.belanger@gmail.com>
# Date 1101707925 0
# Node ID eba1cd703531b2c74d3a5e0220e9585b72556244
# Parent  3eb7a394510dc1af7c35b368b3f95917561b46ef
(calc-user-define-formula, calc-do-defmath): Replace calc-need-macros by
appropriate require.

diff -r 3eb7a394510d -r eba1cd703531 lisp/calc/calc-prog.el
--- a/lisp/calc/calc-prog.el	Mon Nov 29 05:57:46 2004 +0000
+++ b/lisp/calc/calc-prog.el	Mon Nov 29 05:58:45 2004 +0000
@@ -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))