diff options
| author | Jay Belanger | 2004-11-29 05:58:45 +0000 |
|---|---|---|
| committer | Jay Belanger | 2004-11-29 05:58:45 +0000 |
| commit | 537a762d4b093cd58c296cab2b166d8b39fe1699 (patch) | |
| tree | 8b721f07b3a0d377b3dfcc84118823473359a798 | |
| parent | c6d32405298a96622723483112e2f09a79ce6fe5 (diff) | |
| download | emacs-537a762d4b093cd58c296cab2b166d8b39fe1699.tar.gz emacs-537a762d4b093cd58c296cab2b166d8b39fe1699.zip | |
(calc-user-define-formula, calc-do-defmath): Replace calc-need-macros by
appropriate require.
| -rw-r--r-- | lisp/calc/calc-prog.el | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/lisp/calc/calc-prog.el b/lisp/calc/calc-prog.el index 93250299f73..7e403f31793 100644 --- a/lisp/calc/calc-prog.el +++ b/lisp/calc/calc-prog.el | |||
| @@ -271,7 +271,7 @@ | |||
| 271 | x))) calc-user-formula-alist)) | 271 | x))) calc-user-formula-alist)) |
| 272 | (if cmd | 272 | (if cmd |
| 273 | (progn | 273 | (progn |
| 274 | (calc-need-macros) | 274 | (require 'calc-macs) |
| 275 | (fset cmd | 275 | (fset cmd |
| 276 | (list 'lambda | 276 | (list 'lambda |
| 277 | '() | 277 | '() |
| @@ -1711,7 +1711,7 @@ | |||
| 1711 | ;;; Compiling Lisp-like forms to use the math library. | 1711 | ;;; Compiling Lisp-like forms to use the math library. |
| 1712 | 1712 | ||
| 1713 | (defun math-do-defmath (func args body) | 1713 | (defun math-do-defmath (func args body) |
| 1714 | (calc-need-macros) | 1714 | (require 'calc-macs) |
| 1715 | (let* ((fname (intern (concat "calcFunc-" (symbol-name func)))) | 1715 | (let* ((fname (intern (concat "calcFunc-" (symbol-name func)))) |
| 1716 | (doc (if (stringp (car body)) (list (car body)))) | 1716 | (doc (if (stringp (car body)) (list (car body)))) |
| 1717 | (clargs (mapcar 'math-clean-arg args)) | 1717 | (clargs (mapcar 'math-clean-arg args)) |