Mercurial > emacs
comparison lisp/calc/calc-ext.el @ 58610:903d22ed0208
Move require to end of file.
Remove redundant loading of calc.
(calc-extensions-loaded): Remove unnecessary variable.
(calc-extensions): Remove unnecessary function.
(calc-load-everything): Replace calc-need-macros by appropriate require.
| author | Jay Belanger <jay.p.belanger@gmail.com> |
|---|---|
| date | Mon, 29 Nov 2004 05:54:53 +0000 |
| parents | b651e7e3f5f8 |
| children | 5f04991ece3d |
comparison
equal
deleted
inserted
replaced
| 58609:d6d7c44e2b68 | 58610:903d22ed0208 |
|---|---|
| 24 | 24 |
| 25 ;;; Commentary: | 25 ;;; Commentary: |
| 26 | 26 |
| 27 ;;; Code: | 27 ;;; Code: |
| 28 | 28 |
| 29 (provide 'calc-ext) | |
| 30 (require 'calc) | 29 (require 'calc) |
| 31 | |
| 32 (setq calc-extensions-loaded t) | |
| 33 | |
| 34 ;;; This function is the autoload "hook" to cause this file to be loaded. | |
| 35 ;;;###autoload | |
| 36 (defun calc-extensions () | |
| 37 "This function is part of the autoload linkage for parts of Calc." | |
| 38 t) | |
| 39 | |
| 40 ;;; Auto-load calc.el part, in case this part was loaded first. | |
| 41 (if (fboundp 'calc-dispatch) | |
| 42 (and (eq (car-safe (symbol-function 'calc-dispatch)) 'autoload) | |
| 43 (load (nth 1 (symbol-function 'calc-dispatch)))) | |
| 44 (if (fboundp 'calc) | |
| 45 (and (eq (car-safe (symbol-function 'calc)) 'autoload) | |
| 46 (load (nth 1 (symbol-function 'calc)))) | |
| 47 (error "Main part of Calc must be present in order to load this file"))) | |
| 48 | |
| 49 (require 'calc-macs) | 30 (require 'calc-macs) |
| 50 | 31 |
| 51 (defvar math-simplifying nil) | 32 (defvar math-simplifying nil) |
| 52 (defvar math-living-dangerously nil) ; true if unsafe simplifications are okay. | 33 (defvar math-living-dangerously nil) ; true if unsafe simplifications are okay. |
| 53 (defvar math-integrating nil) | 34 (defvar math-integrating nil) |
| 1672 | 1653 |
| 1673 | 1654 |
| 1674 | 1655 |
| 1675 (defun calc-load-everything () | 1656 (defun calc-load-everything () |
| 1676 (interactive) | 1657 (interactive) |
| 1677 (calc-need-macros) ; calc-macs.el | 1658 (require 'calc-macs) ; calc-macs.el |
| 1678 (calc-record-list nil) ; calc-misc.el | 1659 (calc-record-list nil) ; calc-misc.el |
| 1679 (math-read-exprs "0") ; calc-aent.el | 1660 (math-read-exprs "0") ; calc-aent.el |
| 1680 | 1661 |
| 1681 ;;;; (Loads here) | 1662 ;;;; (Loads here) |
| 1682 (calc-Need-calc-alg-2) | 1663 (calc-Need-calc-alg-2) |
| 3369 list containing a numeric entry string, or nil. | 3350 list containing a numeric entry string, or nil. |
| 3370 A key may contain additional specs for Inverse, Hyperbolic, and Inv+Hyp.") | 3351 A key may contain additional specs for Inverse, Hyperbolic, and Inv+Hyp.") |
| 3371 | 3352 |
| 3372 (run-hooks 'calc-ext-load-hook) | 3353 (run-hooks 'calc-ext-load-hook) |
| 3373 | 3354 |
| 3355 (provide 'calc-ext) | |
| 3374 ;;; arch-tag: 1814ba7f-a390-49dc-9e25-a5adc205e97e | 3356 ;;; arch-tag: 1814ba7f-a390-49dc-9e25-a5adc205e97e |
| 3375 ;;; calc-ext.el ends here | 3357 ;;; calc-ext.el ends here |