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

[Jay Belanger]

Index: emacs/lisp/calc/calc-ext.el
diff -c emacs/lisp/calc/calc-ext.el:1.26 emacs/lisp/calc/calc-ext.el:1.27
*** emacs/lisp/calc/calc-ext.el:1.26    Sat Nov 27 04:09:24 2004
--- emacs/lisp/calc/calc-ext.el Mon Nov 29 05:54:53 2004
***************
*** 26,51 ****
  
  ;;; Code:
  
- (provide 'calc-ext)
  (require 'calc)
- 
- (setq calc-extensions-loaded t)
- 
- ;;; This function is the autoload "hook" to cause this file to be loaded.
- ;;;###autoload
- (defun calc-extensions ()
-   "This function is part of the autoload linkage for parts of Calc."
-   t)
- 
- ;;; Auto-load calc.el part, in case this part was loaded first.
- (if (fboundp 'calc-dispatch)
-     (and (eq (car-safe (symbol-function 'calc-dispatch)) 'autoload)
-        (load (nth 1 (symbol-function 'calc-dispatch))))
-   (if (fboundp 'calc)
-       (and (eq (car-safe (symbol-function 'calc)) 'autoload)
-          (load (nth 1 (symbol-function 'calc))))
-     (error "Main part of Calc must be present in order to load this file")))
- 
  (require 'calc-macs)
  
  (defvar math-simplifying nil)
--- 26,32 ----
***************
*** 1674,1680 ****
  
  (defun calc-load-everything ()
    (interactive)
!   (calc-need-macros)       ; calc-macs.el
    (calc-record-list nil)   ; calc-misc.el
    (math-read-exprs "0")    ; calc-aent.el
  
--- 1655,1661 ----
  
  (defun calc-load-everything ()
    (interactive)
!   (require 'calc-macs)       ; calc-macs.el
    (calc-record-list nil)   ; calc-misc.el
    (math-read-exprs "0")    ; calc-aent.el
  
***************
*** 3371,3375 ****
--- 3352,3357 ----
  
  (run-hooks 'calc-ext-load-hook)
  
+ (provide 'calc-ext)
  ;;; arch-tag: 1814ba7f-a390-49dc-9e25-a5adc205e97e
  ;;; calc-ext.el ends here