[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] Changes to emacs/lisp/calc/calc.el
|
From: |
Jay Belanger |
|
Subject: |
[Emacs-diffs] Changes to emacs/lisp/calc/calc.el |
|
Date: |
Mon, 29 Nov 2004 01:18:34 -0500 |
Index: emacs/lisp/calc/calc.el
diff -c emacs/lisp/calc/calc.el:1.35 emacs/lisp/calc/calc.el:1.36
*** emacs/lisp/calc/calc.el:1.35 Wed Nov 24 21:43:36 2004
--- emacs/lisp/calc/calc.el Mon Nov 29 06:00:07 2004
***************
*** 203,230 ****
;;; Code:
- (provide 'calc)
(require 'calc-macs)
- ;;; The "###autoload" comment will be used by Emacs version 19 for
- ;;; maintaining the loaddefs.el file automatically.
-
- ;;;###autoload
- (defvar calc-info-filename "calc.info"
- "*File name in which to look for the Calculator's Info documentation.")
-
;;;###autoload
(defvar calc-settings-file user-init-file
"*File in which to record permanent settings; default is `user-init-file'.")
;;;###autoload
- (defvar calc-autoload-directory nil
- "Name of directory from which additional \".elc\" files for Calc should be
- loaded. Should include a trailing \"/\".
- If nil, use original installation directory.
- This can safely be nil as long as the Calc files are on the load-path.")
-
- ;;;###autoload
(defvar calc-gnuplot-name "gnuplot"
"*Name of GNUPLOT program, for calc-graph features.")
--- 203,215 ----
***************
*** 243,250 ****
"If t, scan keymaps to find all DEL-like keys.
if nil, only DEL itself is mapped to calc-pop.")
- (defvar calc-extensions-loaded nil)
-
(defvar calc-stack '((top-of-stack 1 nil))
"Calculator stack.
Entries are 3-lists: Formula, Height (in lines), Selection (or nil).")
--- 228,233 ----
***************
*** 702,715 ****
(directory-file-name
(file-name-directory
(expand-file-name
! name (car p2))))))))))
!
! ;; If calc-autoload-directory is given, use that (and hope it works!).
! (and calc-autoload-directory
! (not (equal calc-autoload-directory ""))
! (setq load-path (nconc load-path
! (list (directory-file-name
! calc-autoload-directory)))))))
;; The following modes use specially-formatted data.
(put 'calc-mode 'mode-class 'special)
--- 685,691 ----
(directory-file-name
(file-name-directory
(expand-file-name
! name (car p2))))))))))))
;; The following modes use specially-formatted data.
(put 'calc-mode 'mode-class 'special)
***************
*** 917,925 ****
( ?? . calc-dispatch-help ) ))
map))
- (autoload 'calc-extensions "calc-ext")
- (autoload 'calc-need-macros "calc-macs")
-
;;;; (Autoloads here)
(mapcar
(lambda (x) (dolist (func (cdr x)) (autoload func (car x))))
--- 893,898 ----
***************
*** 989,995 ****
(message "")
(if key
(progn
! (or (commandp key) (calc-extensions))
(call-interactively key))
(beep))))
--- 962,968 ----
(message "")
(if key
(progn
! (or (commandp key) (require 'calc-ext))
(call-interactively key))
(beep))))
***************
*** 1048,1054 ****
(lambda (v) (set-default v (symbol-value v)))) calc-local-var-list)
(kill-all-local-variables)
(use-local-map (if (eq calc-algebraic-mode 'total)
! (progn (calc-extensions) calc-alg-map) calc-mode-map))
(mapcar (function (lambda (v) (make-local-variable v))) calc-local-var-list)
(make-local-variable 'overlay-arrow-position)
(make-local-variable 'overlay-arrow-string)
--- 1021,1027 ----
(lambda (v) (set-default v (symbol-value v)))) calc-local-var-list)
(kill-all-local-variables)
(use-local-map (if (eq calc-algebraic-mode 'total)
! (progn (require 'calc-ext) calc-alg-map) calc-mode-map))
(mapcar (function (lambda (v) (make-local-variable v))) calc-local-var-list)
(make-local-variable 'overlay-arrow-position)
(make-local-variable 'overlay-arrow-string)
***************
*** 1088,1095 ****
(setq plist (cdr (cdr plist))))
(if plist
(save-excursion
! (calc-extensions)
! (calc-need-macros)
(set-buffer "*Calculator*")
(while plist
(put 'calc-define (car plist) nil)
--- 1061,1068 ----
(setq plist (cdr (cdr plist))))
(if plist
(save-excursion
! (require 'calc-ext)
! (require 'calc-macs)
(set-buffer "*Calculator*")
(while plist
(put 'calc-define (car plist) nil)
***************
*** 1135,1143 ****
(calc-mode))
(setq max-lisp-eval-depth (max max-lisp-eval-depth 1000))
(when calc-always-load-extensions
! (calc-extensions))
(when calc-language
! (calc-extensions)
(calc-set-language calc-language calc-language-option t)))
;;;###autoload
--- 1108,1116 ----
(calc-mode))
(setq max-lisp-eval-depth (max max-lisp-eval-depth 1000))
(when calc-always-load-extensions
! (require 'calc-ext))
(when calc-language
! (require 'calc-ext)
(calc-set-language calc-language calc-language-option t)))
;;;###autoload
***************
*** 1146,1152 ****
(interactive "P\ni\np")
(if arg
(unless (eq arg 0)
! (calc-extensions)
(if (= (prefix-numeric-value arg) -1)
(calc-grab-region (region-beginning) (region-end) nil)
(when (= (prefix-numeric-value arg) -2)
--- 1119,1125 ----
(interactive "P\ni\np")
(if arg
(unless (eq arg 0)
! (require 'calc-ext)
(if (= (prefix-numeric-value arg) -1)
(calc-grab-region (region-beginning) (region-end) nil)
(when (= (prefix-numeric-value arg) -2)
***************
*** 1270,1276 ****
In this mode, click on the Calc \"buttons\" using the left mouse button.
Or, position the cursor manually and do M-x calc-keypad-press."
(interactive "p")
! (calc-extensions)
(calc-do-keypad calc-full-mode interactive))
;;;###autoload
--- 1243,1249 ----
In this mode, click on the Calc \"buttons\" using the left mouse button.
Or, position the cursor manually and do M-x calc-keypad-press."
(interactive "p")
! (require 'calc-ext)
(calc-do-keypad calc-full-mode interactive))
;;;###autoload
***************
*** 1278,1284 ****
"Invoke the Calculator in full-screen \"visual keypad\" mode.
See calc-keypad for details."
(interactive "p")
! (calc-extensions)
(calc-do-keypad t interactive))
--- 1251,1257 ----
"Invoke the Calculator in full-screen \"visual keypad\" mode.
See calc-keypad for details."
(interactive "p")
! (require 'calc-ext)
(calc-do-keypad t interactive))
***************
*** 1292,1298 ****
(calc-check-defines)
(let* ((calc-command-flags nil)
(calc-start-time (and calc-timing (not calc-start-time)
! (calc-extensions)
(current-time-string)))
(gc-cons-threshold (max gc-cons-threshold
(if calc-timing 2000000 100000)))
--- 1265,1271 ----
(calc-check-defines)
(let* ((calc-command-flags nil)
(calc-start-time (and calc-timing (not calc-start-time)
! (require 'calc-ext)
(current-time-string)))
(gc-cons-threshold (max gc-cons-threshold
(if calc-timing 2000000 100000)))
***************
*** 1305,1311 ****
(calc-embedded-select-buffer)
(calc-select-buffer))
(and (eq calc-algebraic-mode 'total)
! (calc-extensions)
(use-local-map calc-alg-map))
(when (and do-slow calc-display-working-message)
(message "Working...")
--- 1278,1284 ----
(calc-embedded-select-buffer)
(calc-select-buffer))
(and (eq calc-algebraic-mode 'total)
! (require 'calc-ext)
(use-local-map calc-alg-map))
(when (and do-slow calc-display-working-message)
(message "Working...")
***************
*** 1580,1586 ****
(defun calc-normalize (val)
(if (memq calc-simplify-mode '(nil none num))
(math-normalize val)
! (calc-extensions)
(calc-normalize-fancy val)))
(defun calc-handle-whys ()
--- 1553,1559 ----
(defun calc-normalize (val)
(if (memq calc-simplify-mode '(nil none num))
(math-normalize val)
! (require 'calc-ext)
(calc-normalize-fancy val)))
(defun calc-handle-whys ()
***************
*** 1860,1866 ****
(calc-enter-result 2 name (cons (or func2 func)
(mapcar 'math-check-complete
(calc-top-list 2))))
! (calc-extensions)
(calc-binary-op-fancy name func arg ident unary)))
(defun calc-unary-op (name func arg &optional func2)
--- 1833,1839 ----
(calc-enter-result 2 name (cons (or func2 func)
(mapcar 'math-check-complete
(calc-top-list 2))))
! (require 'calc-ext)
(calc-binary-op-fancy name func arg ident unary)))
(defun calc-unary-op (name func arg &optional func2)
***************
*** 1868,1874 ****
(if (null arg)
(calc-enter-result 1 name (list (or func2 func)
(math-check-complete (calc-top 1))))
! (calc-extensions)
(calc-unary-op-fancy name func arg)))
--- 1841,1847 ----
(if (null arg)
(calc-enter-result 1 name (list (or func2 func)
(math-check-complete (calc-top 1))))
! (require 'calc-ext)
(calc-unary-op-fancy name func arg)))
***************
*** 1980,1986 ****
calc-digit-value))))))
(if (eq calc-prev-char 'dots)
(progn
! (calc-extensions)
(calc-dots)))))))
(defsubst calc-minibuffer-size ()
--- 1953,1959 ----
calc-digit-value))))))
(if (eq calc-prev-char 'dots)
(progn
! (require 'calc-ext)
(calc-dots)))))))
(defsubst calc-minibuffer-size ()
***************
*** 2104,2110 ****
(if (and (eq this-command last-command)
(eq last-command-char ?.))
(progn
! (calc-extensions)
(calc-digit-dots))
(delete-backward-char 1)
(beep)
--- 2077,2083 ----
(if (and (eq this-command last-command)
(eq last-command-char ?.))
(progn
! (require 'calc-ext)
(calc-digit-dots))
(delete-backward-char 1)
(beep)
***************
*** 2279,2289 ****
(integerp (car math-normalize-a))
(and (consp (car math-normalize-a))
(not (eq (car (car math-normalize-a)) 'lambda))))
! (calc-extensions)
(math-normalize-fancy math-normalize-a))
(t
(or (and calc-simplify-mode
! (calc-extensions)
(math-normalize-nonstandard))
(let ((args (mapcar 'math-normalize (cdr math-normalize-a))))
(or (condition-case err
--- 2252,2262 ----
(integerp (car math-normalize-a))
(and (consp (car math-normalize-a))
(not (eq (car (car math-normalize-a)) 'lambda))))
! (require 'calc-ext)
(math-normalize-fancy math-normalize-a))
(t
(or (and calc-simplify-mode
! (require 'calc-ext)
(math-normalize-nonstandard))
(let ((args (mapcar 'math-normalize (cdr math-normalize-a))))
(or (condition-case err
***************
*** 2300,2306 ****
(progn
(or (eq var-EvalRules math-eval-rules-cache-tag)
(progn
! (calc-extensions)
(math-recompile-eval-rules)))
(and (or math-eval-rules-cache-other
(assq (car math-normalize-a)
--- 2273,2279 ----
(progn
(or (eq var-EvalRules math-eval-rules-cache-tag)
(progn
! (require 'calc-ext)
(math-recompile-eval-rules)))
(and (or math-eval-rules-cache-other
(assq (car math-normalize-a)
***************
*** 2313,2320 ****
(apply (cdr func) args)
(and (or (consp (car math-normalize-a))
(fboundp (car math-normalize-a))
! (and (not calc-extensions-loaded)
! (calc-extensions)
(fboundp (car math-normalize-a))))
(apply (car math-normalize-a) args)))))
(wrong-number-of-arguments
--- 2286,2293 ----
(apply (cdr func) args)
(and (or (consp (car math-normalize-a))
(fboundp (car math-normalize-a))
! (and (not (featurep 'calc-ext))
! (require 'calc-ext)
(fboundp (car math-normalize-a))))
(apply (car math-normalize-a) args)))))
(wrong-number-of-arguments
***************
*** 2582,2588 ****
(cons 'bigpos diff))))
(cons 'bigpos (math-add-bignum (cdr a) (cdr b)))))))
(and (Math-ratp a) (Math-ratp b)
! (calc-extensions)
(calc-add-fractions a b))
(and (Math-realp a) (Math-realp b)
(progn
--- 2555,2561 ----
(cons 'bigpos diff))))
(cons 'bigpos (math-add-bignum (cdr a) (cdr b)))))))
(and (Math-ratp a) (Math-ratp b)
! (require 'calc-ext)
(calc-add-fractions a b))
(and (Math-realp a) (Math-realp b)
(progn
***************
*** 2591,2599 ****
(or (and (consp b) (eq (car b) 'float))
(setq b (math-float b)))
(math-add-float a b)))
! (and (calc-extensions)
(math-add-objects-fancy a b))))
! (and (calc-extensions)
(math-add-symb-fancy a b))))
(defun math-add-bignum (a b) ; [L L L; l l l]
--- 2564,2572 ----
(or (and (consp b) (eq (car b) 'float))
(setq b (math-float b)))
(math-add-float a b)))
! (and (require 'calc-ext)
(math-add-objects-fancy a b))))
! (and (require 'calc-ext)
(math-add-symb-fancy a b))))
(defun math-add-bignum (a b) ; [L L L; l l l]
***************
*** 2722,2733 ****
(and (Math-zerop a) (not (eq (car-safe b) 'mod))
(if (Math-scalarp b)
(if (and (math-floatp b) (Math-ratp a)) (math-float a) a)
! (calc-extensions)
(math-mul-zero a b)))
(and (Math-zerop b) (not (eq (car-safe a) 'mod))
(if (Math-scalarp a)
(if (and (math-floatp a) (Math-ratp b)) (math-float b) b)
! (calc-extensions)
(math-mul-zero b a)))
(and (Math-objvecp a) (Math-objvecp b)
(or
--- 2695,2706 ----
(and (Math-zerop a) (not (eq (car-safe b) 'mod))
(if (Math-scalarp b)
(if (and (math-floatp b) (Math-ratp a)) (math-float a) a)
! (require 'calc-ext)
(math-mul-zero a b)))
(and (Math-zerop b) (not (eq (car-safe a) 'mod))
(if (Math-scalarp a)
(if (and (math-floatp a) (Math-ratp b)) (math-float b) b)
! (require 'calc-ext)
(math-mul-zero b a)))
(and (Math-objvecp a) (Math-objvecp b)
(or
***************
*** 2743,2749 ****
(math-mul-bignum-digit (cdr a) (nth 1 b) 0))
(math-mul-bignum-digit (cdr b) (nth 1 a) 0))))))
(and (Math-ratp a) (Math-ratp b)
! (calc-extensions)
(calc-mul-fractions a b))
(and (Math-realp a) (Math-realp b)
(progn
--- 2716,2722 ----
(math-mul-bignum-digit (cdr a) (nth 1 b) 0))
(math-mul-bignum-digit (cdr b) (nth 1 a) 0))))))
(and (Math-ratp a) (Math-ratp b)
! (require 'calc-ext)
(calc-mul-fractions a b))
(and (Math-realp a) (Math-realp b)
(progn
***************
*** 2753,2761 ****
(setq b (math-float b)))
(math-make-float (math-mul (nth 1 a) (nth 1 b))
(+ (nth 2 a) (nth 2 b)))))
! (and (calc-extensions)
(math-mul-objects-fancy a b))))
! (and (calc-extensions)
(math-mul-symb-fancy a b))))
(defun math-infinitep (a &optional undir)
--- 2726,2734 ----
(setq b (math-float b)))
(math-make-float (math-mul (nth 1 a) (nth 1 b))
(+ (nth 2 a) (nth 2 b)))))
! (and (require 'calc-ext)
(math-mul-objects-fancy a b))))
! (and (require 'calc-ext)
(math-mul-symb-fancy a b))))
(defun math-infinitep (a &optional undir)
***************
*** 2911,2922 ****
(defun math-div (a b)
(or
(and (Math-zerop b)
! (calc-extensions)
(math-div-by-zero a b))
(and (Math-zerop a) (not (eq (car-safe b) 'mod))
(if (Math-scalarp b)
(if (and (math-floatp b) (Math-ratp a)) (math-float a) a)
! (calc-extensions)
(math-div-zero a b)))
(and (Math-objvecp a) (Math-objvecp b)
(or
--- 2884,2895 ----
(defun math-div (a b)
(or
(and (Math-zerop b)
! (require 'calc-ext)
(math-div-by-zero a b))
(and (Math-zerop a) (not (eq (car-safe b) 'mod))
(if (Math-scalarp b)
(if (and (math-floatp b) (Math-ratp a)) (math-float a) a)
! (require 'calc-ext)
(math-div-zero a b)))
(and (Math-objvecp a) (Math-objvecp b)
(or
***************
*** 2926,2937 ****
(car q)
(if calc-prefer-frac
(progn
! (calc-extensions)
(math-make-frac a b))
(math-div-float (math-make-float a 0)
(math-make-float b 0))))))
(and (Math-ratp a) (Math-ratp b)
! (calc-extensions)
(calc-div-fractions a b))
(and (Math-realp a) (Math-realp b)
(progn
--- 2899,2910 ----
(car q)
(if calc-prefer-frac
(progn
! (require 'calc-ext)
(math-make-frac a b))
(math-div-float (math-make-float a 0)
(math-make-float b 0))))))
(and (Math-ratp a) (Math-ratp b)
! (require 'calc-ext)
(calc-div-fractions a b))
(and (Math-realp a) (Math-realp b)
(progn
***************
*** 2940,2948 ****
(or (and (consp b) (eq (car b) 'float))
(setq b (math-float b)))
(math-div-float a b)))
! (and (calc-extensions)
(math-div-objects-fancy a b))))
! (and (calc-extensions)
(math-div-symb-fancy a b))))
(defun math-div-float (a b) ; [F F F]
--- 2913,2921 ----
(or (and (consp b) (eq (car b) 'float))
(setq b (math-float b)))
(math-div-float a b)))
! (and (require 'calc-ext)
(math-div-objects-fancy a b))))
! (and (require 'calc-ext)
(math-div-symb-fancy a b))))
(defun math-div-float (a b) ; [F F F]
***************
*** 2971,2977 ****
(memq calc-language '(nil flat unform))
(null math-comp-selected))
(math-format-number a))
! (t (calc-extensions)
(math-compose-expr a 0))))
(off (math-stack-value-offset c))
s w)
--- 2944,2950 ----
(memq calc-language '(nil flat unform))
(null math-comp-selected))
(math-format-number a))
! (t (require 'calc-ext)
(math-compose-expr a 0))))
(off (math-stack-value-offset c))
s w)
***************
*** 2994,3000 ****
c)))
(unless (or (equal calc-right-label "")
(eq a 'top-of-stack))
! (calc-extensions)
(setq c (list 'horiz c
(make-string (max (- w (math-comp-width c)
(length calc-right-label)) 0) ? )
--- 2967,2973 ----
c)))
(unless (or (equal calc-right-label "")
(eq a 'top-of-stack))
! (require 'calc-ext)
(setq c (list 'horiz c
(make-string (max (- w (math-comp-width c)
(length calc-right-label)) 0) ? )
***************
*** 3024,3030 ****
math-svo-off)
(if calc-display-just
(progn
! (calc-extensions)
(math-stack-value-offset-fancy))
(setq math-svo-off (or calc-display-origin 0))
(when (integerp calc-line-breaking)
--- 2997,3003 ----
math-svo-off)
(if calc-display-just
(progn
! (require 'calc-ext)
(math-stack-value-offset-fancy))
(setq math-svo-off (or calc-display-origin 0))
(when (integerp calc-line-breaking)
***************
*** 3044,3050 ****
(if (and (Math-scalarp a)
(memq calc-language '(nil flat unform)))
(math-format-number a)
! (calc-extensions)
(let ((calc-line-breaking nil))
(math-composition-to-string (math-compose-expr a 0) w))))
--- 3017,3023 ----
(if (and (Math-scalarp a)
(memq calc-language '(nil flat unform)))
(math-format-number a)
! (require 'calc-ext)
(let ((calc-line-breaking nil))
(math-composition-to-string (math-compose-expr a 0) w))))
***************
*** 3080,3086 ****
(calc-language nil))
(math-format-number a)))
(t
! (calc-extensions)
(math-format-flat-expr-fancy a prec))))
--- 3053,3059 ----
(calc-language nil))
(math-format-number a)))
(t
! (require 'calc-ext)
(math-format-flat-expr-fancy a prec))))
***************
*** 3090,3096 ****
(cond
((eq calc-display-raw t) (format "%s" a))
((and (nth 1 calc-frac-format) (Math-integerp a))
! (calc-extensions)
(math-format-number (math-adjust-fraction a)))
((integerp a)
(if (not (or calc-group-digits calc-leading-zeros))
--- 3063,3069 ----
(cond
((eq calc-display-raw t) (format "%s" a))
((and (nth 1 calc-frac-format) (Math-integerp a))
! (require 'calc-ext)
(math-format-number (math-adjust-fraction a)))
((integerp a)
(if (not (or calc-group-digits calc-leading-zeros))
***************
*** 3098,3104 ****
(int-to-string a)
(if (< a 0)
(concat "-" (math-format-number (- a)))
! (calc-extensions)
(if math-radix-explicit-format
(if calc-radix-formatter
(funcall calc-radix-formatter
--- 3071,3077 ----
(int-to-string a)
(if (< a 0)
(concat "-" (math-format-number (- a)))
! (require 'calc-ext)
(if math-radix-explicit-format
(if calc-radix-formatter
(funcall calc-radix-formatter
***************
*** 3193,3199 ****
str (- eadj scale)))))))
str)))
(t
! (calc-extensions)
(math-format-number-fancy a prec))))
(defun math-format-bignum (a) ; [X L]
--- 3166,3172 ----
str (- eadj scale)))))))
str)))
(t
! (require 'calc-ext)
(math-format-number-fancy a prec))))
(defun math-format-bignum (a) ; [X L]
***************
*** 3201,3207 ****
(not calc-leading-zeros)
(not calc-group-digits))
(math-format-bignum-decimal a)
! (calc-extensions)
(math-format-bignum-fancy a)))
(defun math-format-bignum-decimal (a) ; [X L]
--- 3174,3180 ----
(not calc-leading-zeros)
(not calc-group-digits))
(math-format-bignum-decimal a)
! (require 'calc-ext)
(math-format-bignum-fancy a)))
(defun math-format-bignum-decimal (a) ; [X L]
***************
*** 3243,3249 ****
;; Forms that require extensions module
((string-match "[^-+0-9eE.]" s)
! (calc-extensions)
(math-read-number-fancy s))
;; Decimal point
--- 3216,3222 ----
;; Forms that require extensions module
((string-match "[^-+0-9eE.]" s)
! (require 'calc-ext)
(math-read-number-fancy s))
;; Decimal point
***************
*** 3352,3377 ****
(defun calc-grab-region (top bot arg)
"Parse the region as a vector of numbers and push it on the Calculator
stack."
(interactive "r\nP")
! (calc-extensions)
(calc-do-grab-region top bot arg))
;;;###autoload
(defun calc-grab-rectangle (top bot arg)
"Parse a rectangle as a matrix of numbers and push it on the Calculator
stack."
(interactive "r\nP")
! (calc-extensions)
(calc-do-grab-rectangle top bot arg))
(defun calc-grab-sum-down (top bot arg)
"Parse a rectangle as a matrix of numbers and sum its columns."
(interactive "r\nP")
! (calc-extensions)
(calc-do-grab-rectangle top bot arg 'calcFunc-reduced))
(defun calc-grab-sum-across (top bot arg)
"Parse a rectangle as a matrix of numbers and sum its rows."
(interactive "r\nP")
! (calc-extensions)
(calc-do-grab-rectangle top bot arg 'calcFunc-reducea))
--- 3325,3350 ----
(defun calc-grab-region (top bot arg)
"Parse the region as a vector of numbers and push it on the Calculator
stack."
(interactive "r\nP")
! (require 'calc-ext)
(calc-do-grab-region top bot arg))
;;;###autoload
(defun calc-grab-rectangle (top bot arg)
"Parse a rectangle as a matrix of numbers and push it on the Calculator
stack."
(interactive "r\nP")
! (require 'calc-ext)
(calc-do-grab-rectangle top bot arg))
(defun calc-grab-sum-down (top bot arg)
"Parse a rectangle as a matrix of numbers and sum its columns."
(interactive "r\nP")
! (require 'calc-ext)
(calc-do-grab-rectangle top bot arg 'calcFunc-reduced))
(defun calc-grab-sum-across (top bot arg)
"Parse a rectangle as a matrix of numbers and sum its rows."
(interactive "r\nP")
! (require 'calc-ext)
(calc-do-grab-rectangle top bot arg 'calcFunc-reducea))
***************
*** 3379,3385 ****
(defun calc-embedded (arg &optional end obeg oend)
"Start Calc Embedded mode on the formula surrounding point."
(interactive "P")
! (calc-extensions)
(calc-do-embedded arg end obeg oend))
;;;###autoload
--- 3352,3358 ----
(defun calc-embedded (arg &optional end obeg oend)
"Start Calc Embedded mode on the formula surrounding point."
(interactive "P")
! (require 'calc-ext)
(calc-do-embedded arg end obeg oend))
;;;###autoload
***************
*** 3399,3405 ****
;;;###autoload
(defmacro defmath (func args &rest body) ; [Public]
! (calc-extensions)
(math-do-defmath func args body))
;;; Functions needed for Lucid Emacs support.
--- 3372,3378 ----
;;;###autoload
(defmacro defmath (func args &rest body) ; [Public]
! (require 'calc-ext)
(math-do-defmath func args body))
;;; Functions needed for Lucid Emacs support.
***************
*** 3427,3437 ****
(setq unread-command-events nil)))
(when calc-always-load-extensions
! (calc-extensions)
(calc-load-everything))
(run-hooks 'calc-load-hook)
;;; arch-tag: 0c3b170c-4ce6-4eaf-8d9b-5834d1fe938f
;;; calc.el ends here
--- 3400,3412 ----
(setq unread-command-events nil)))
(when calc-always-load-extensions
! (require 'calc-ext)
(calc-load-everything))
(run-hooks 'calc-load-hook)
+ (provide 'calc)
+
;;; arch-tag: 0c3b170c-4ce6-4eaf-8d9b-5834d1fe938f
;;; calc.el ends here