diff options
Diffstat (limited to 'lisp/calc')
43 files changed, 173 insertions, 173 deletions
diff --git a/lisp/calc/calc-aent.el b/lisp/calc/calc-aent.el index 4e074d6b241..f70a6d0eb07 100644 --- a/lisp/calc/calc-aent.el +++ b/lisp/calc/calc-aent.el @@ -17,7 +17,7 @@ ;; GNU General Public License for more details. ;; You should have received a copy of the GNU General Public License -;; along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. +;; along with GNU Emacs. If not, see <https://www.gnu.org/licenses/>. ;;; Commentary: diff --git a/lisp/calc/calc-alg.el b/lisp/calc/calc-alg.el index 9db901a9753..e64308bad67 100644 --- a/lisp/calc/calc-alg.el +++ b/lisp/calc/calc-alg.el @@ -17,7 +17,7 @@ ;; GNU General Public License for more details. ;; You should have received a copy of the GNU General Public License -;; along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. +;; along with GNU Emacs. If not, see <https://www.gnu.org/licenses/>. ;;; Commentary: @@ -544,7 +544,7 @@ (if (and (eq (car-safe nn) 'frac) (eq (nth 1 nn) 1) (not n)) (unless (and (eq (car-safe math-simplify-expr) 'calcFunc-eq) (eq (car-safe (nth 1 math-simplify-expr)) 'var) - (not (math-expr-contains (nth 2 math-simplify-expr) + (not (math-expr-contains (nth 2 math-simplify-expr) (nth 1 math-simplify-expr)))) (setcar (cdr math-simplify-expr) (math-mul (nth 2 nn) (nth 1 math-simplify-expr))) diff --git a/lisp/calc/calc-arith.el b/lisp/calc/calc-arith.el index ec08ea4dd36..008d5480dd3 100644 --- a/lisp/calc/calc-arith.el +++ b/lisp/calc/calc-arith.el @@ -17,7 +17,7 @@ ;; GNU General Public License for more details. ;; You should have received a copy of the GNU General Public License -;; along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. +;; along with GNU Emacs. If not, see <https://www.gnu.org/licenses/>. ;;; Commentary: @@ -448,7 +448,7 @@ ((Math-negp a) 1) ((Math-zerop a) 2) ((eq (car a) 'intv) - (cond + (cond ((math-known-posp (nth 2 a)) 4) ((math-known-negp (nth 3 a)) 1) ((Math-zerop (nth 2 a)) 6) @@ -1436,12 +1436,12 @@ (and (math-identity-matrix-p a t) (or (and (eq (car-safe b) 'calcFunc-idn) (= (length b) 2) - (list 'calcFunc-idn (math-mul + (list 'calcFunc-idn (math-mul (nth 1 (nth 1 a)) (nth 1 b)) (1- (length a)))) (and (math-known-scalarp b) - (list 'calcFunc-idn (math-mul + (list 'calcFunc-idn (math-mul (nth 1 (nth 1 a)) b) (1- (length a)))) (and (math-known-matrixp b) @@ -1449,11 +1449,11 @@ (and (math-identity-matrix-p b t) (or (and (eq (car-safe a) 'calcFunc-idn) (= (length a) 2) - (list 'calcFunc-idn (math-mul (nth 1 a) + (list 'calcFunc-idn (math-mul (nth 1 a) (nth 1 (nth 1 b))) (1- (length b)))) (and (math-known-scalarp a) - (list 'calcFunc-idn (math-mul a (nth 1 (nth 1 b))) + (list 'calcFunc-idn (math-mul a (nth 1 (nth 1 b))) (1- (length b)))) (and (math-known-matrixp a) (math-mul a (nth 1 (nth 1 b)))))) @@ -1717,7 +1717,7 @@ (defun math-div-new-non-trig (ntr) (if math-div-non-trig - (setq math-div-non-trig + (setq math-div-non-trig (list '* ntr math-div-non-trig)) (setq math-div-non-trig ntr))) @@ -1958,7 +1958,7 @@ (not (equal a math-simplify-only))) (list '^ a b)) ((and (eq (car-safe a) '*) - (or + (or (and (math-known-matrixp (nth 1 a)) (math-known-matrixp (nth 2 a))) @@ -1970,7 +1970,7 @@ (if (and (= b -1) (math-known-square-matrixp (nth 1 a)) (math-known-square-matrixp (nth 2 a))) - (math-mul (math-pow-fancy (nth 2 a) -1) + (math-mul (math-pow-fancy (nth 2 a) -1) (math-pow-fancy (nth 1 a) -1)) (list '^ a b))) ((and (eq (car-safe a) '*) @@ -2358,7 +2358,7 @@ (defalias 'calcFunc-float 'math-float) -;; The variable math-trunc-prec is local to math-trunc in calc-misc.el, +;; The variable math-trunc-prec is local to math-trunc in calc-misc.el, ;; but used by math-trunc-fancy which is called by math-trunc. (defvar math-trunc-prec) diff --git a/lisp/calc/calc-bin.el b/lisp/calc/calc-bin.el index ffca7c37e61..3a7807bae5e 100644 --- a/lisp/calc/calc-bin.el +++ b/lisp/calc/calc-bin.el @@ -17,7 +17,7 @@ ;; GNU General Public License for more details. ;; You should have received a copy of the GNU General Public License -;; along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. +;; along with GNU Emacs. If not, see <https://www.gnu.org/licenses/>. ;;; Commentary: @@ -32,7 +32,7 @@ (defconst math-bignum-logb-digit-size (logb math-bignum-digit-size) "The logb of the size of a bignum digit. -This is the largest value of B such that 2^B is less than +This is the largest value of B such that 2^B is less than the size of a Calc bignum digit.") (defconst math-bignum-digit-power-of-two @@ -171,7 +171,7 @@ the size of a Calc bignum digit.") (calc-wrapper (if (and (>= n 2) (<= n 36)) (progn - (calc-change-mode + (calc-change-mode (list 'calc-number-radix 'calc-twos-complement-mode) (list n (or arg (calc-is-option))) t) ;; also change global value so minibuffer sees it @@ -424,7 +424,7 @@ the size of a Calc bignum digit.") (math-mul-bignum-digit (math-not-bignum (math-norm-bignum (car q)) (- w math-bignum-logb-digit-size)) math-bignum-digit-power-of-two - (logxor (cdr q) + (logxor (cdr q) (1- math-bignum-digit-power-of-two)))))) (defun calcFunc-lsh (a &optional n w) ; [I I] [Public] @@ -845,7 +845,7 @@ the size of a Calc bignum digit.") (setq num (concat (make-string (- digs len) ?0) num)))) (when calc-group-digits (setq num (math-group-float num))) - (concat + (concat (number-to-string calc-number-radix) "##" num))) diff --git a/lisp/calc/calc-comb.el b/lisp/calc/calc-comb.el index 91fbb7b2b8a..20b24060fc1 100644 --- a/lisp/calc/calc-comb.el +++ b/lisp/calc/calc-comb.el @@ -17,7 +17,7 @@ ;; GNU General Public License for more details. ;; You should have received a copy of the GNU General Public License -;; along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. +;; along with GNU Emacs. If not, see <https://www.gnu.org/licenses/>. ;;; Commentary: diff --git a/lisp/calc/calc-cplx.el b/lisp/calc/calc-cplx.el index a00adc00992..06c9dc9d108 100644 --- a/lisp/calc/calc-cplx.el +++ b/lisp/calc/calc-cplx.el @@ -17,7 +17,7 @@ ;; GNU General Public License for more details. ;; You should have received a copy of the GNU General Public License -;; along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. +;; along with GNU Emacs. If not, see <https://www.gnu.org/licenses/>. ;;; Commentary: diff --git a/lisp/calc/calc-embed.el b/lisp/calc/calc-embed.el index 14ab97fbed8..bc88401752a 100644 --- a/lisp/calc/calc-embed.el +++ b/lisp/calc/calc-embed.el @@ -17,7 +17,7 @@ ;; GNU General Public License for more details. ;; You should have received a copy of the GNU General Public License -;; along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. +;; along with GNU Emacs. If not, see <https://www.gnu.org/licenses/>. ;;; Commentary: diff --git a/lisp/calc/calc-ext.el b/lisp/calc/calc-ext.el index d93a86ac06f..7973fc182bd 100644 --- a/lisp/calc/calc-ext.el +++ b/lisp/calc/calc-ext.el @@ -17,7 +17,7 @@ ;; GNU General Public License for more details. ;; You should have received a copy of the GNU General Public License -;; along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. +;; along with GNU Emacs. If not, see <https://www.gnu.org/licenses/>. ;;; Commentary: diff --git a/lisp/calc/calc-fin.el b/lisp/calc/calc-fin.el index 647574684e4..92ef8f3a440 100644 --- a/lisp/calc/calc-fin.el +++ b/lisp/calc/calc-fin.el @@ -17,7 +17,7 @@ ;; GNU General Public License for more details. ;; You should have received a copy of the GNU General Public License -;; along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. +;; along with GNU Emacs. If not, see <https://www.gnu.org/licenses/>. ;;; Commentary: diff --git a/lisp/calc/calc-forms.el b/lisp/calc/calc-forms.el index 6aa421ec205..338967159d6 100644 --- a/lisp/calc/calc-forms.el +++ b/lisp/calc/calc-forms.el @@ -17,7 +17,7 @@ ;; GNU General Public License for more details. ;; You should have received a copy of the GNU General Public License -;; along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. +;; along with GNU Emacs. If not, see <https://www.gnu.org/licenses/>. ;;; Commentary: diff --git a/lisp/calc/calc-frac.el b/lisp/calc/calc-frac.el index d98cdda4ea4..3aa9eb8b97e 100644 --- a/lisp/calc/calc-frac.el +++ b/lisp/calc/calc-frac.el @@ -17,7 +17,7 @@ ;; GNU General Public License for more details. ;; You should have received a copy of the GNU General Public License -;; along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. +;; along with GNU Emacs. If not, see <https://www.gnu.org/licenses/>. ;;; Commentary: @@ -206,7 +206,7 @@ (defun calcFunc-fdiv (a b) ; [R I I] [Public] (cond ((Math-num-integerp a) - (cond + (cond ((Math-num-integerp b) (if (Math-zerop b) (math-reject-arg a "*Division by zero") @@ -217,7 +217,7 @@ (math-make-frac (math-mul (math-trunc a) (nth 2 b)) (nth 1 b)))) (t (math-reject-arg b 'integerp)))) ((eq (car-safe a) 'frac) - (cond + (cond ((Math-num-integerp b) (if (Math-zerop b) (math-reject-arg a "*Division by zero") @@ -227,7 +227,7 @@ (math-reject-arg a "*Division by zero") (math-make-frac (math-mul (nth 1 a) (nth 2 b)) (math-mul (nth 2 a) (nth 1 b))))) (t (math-reject-arg b 'integerp)))) - (t + (t (math-reject-arg a 'integerp)))) (provide 'calc-frac) diff --git a/lisp/calc/calc-funcs.el b/lisp/calc/calc-funcs.el index 2bb460df3c9..1dde2ede878 100644 --- a/lisp/calc/calc-funcs.el +++ b/lisp/calc/calc-funcs.el @@ -17,7 +17,7 @@ ;; GNU General Public License for more details. ;; You should have received a copy of the GNU General Public License -;; along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. +;; along with GNU Emacs. If not, see <https://www.gnu.org/licenses/>. ;;; Commentary: @@ -564,7 +564,7 @@ ((Math-lessp '(float 8 0) (math-abs-approx x)) (let* ((z (math-div '(float 8 0) x)) (y (math-sqr z)) - (xx (math-add x + (xx (math-add x (math-read-number-simple "-0.785398164"))) (a1 (math-poly-eval y (list @@ -633,7 +633,7 @@ (setq sc (cons (math-neg (cdr sc)) (car sc))) (if (math-negp x) (setq sc (cons (math-neg (car sc)) (math-neg (cdr sc)))))) - (math-mul (math-sqrt (math-div + (math-mul (math-sqrt (math-div (math-read-number-simple "0.636619722") x)) (math-sub (math-mul (cdr sc) a1) @@ -813,39 +813,39 @@ (defvar math-bernoulli-b-cache (list - (list 'frac + (list 'frac -174611 (math-read-number-simple "802857662698291200000")) - (list 'frac - 43867 + (list 'frac + 43867 (math-read-number-simple "5109094217170944000")) - (list 'frac - -3617 + (list 'frac + -3617 (math-read-number-simple "10670622842880000")) - (list 'frac - 1 + (list 'frac + 1 (math-read-number-simple "74724249600")) - (list 'frac - -691 + (list 'frac + -691 (math-read-number-simple "1307674368000")) - (list 'frac - 1 + (list 'frac + 1 (math-read-number-simple "47900160")) - (list 'frac - -1 + (list 'frac + -1 (math-read-number-simple "1209600")) - (list 'frac - 1 - 30240) - (list 'frac - -1 + (list 'frac + 1 + 30240) + (list 'frac + -1 720) - (list 'frac - 1 - 12) + (list 'frac + 1 + 12) 1 )) -(defvar math-bernoulli-B-cache +(defvar math-bernoulli-B-cache '((frac -174611 330) (frac 43867 798) (frac -3617 510) (frac 7 6) (frac -691 2730) (frac 5 66) (frac -1 30) (frac 1 42) diff --git a/lisp/calc/calc-graph.el b/lisp/calc/calc-graph.el index bc05ffe427e..c0598e6015a 100644 --- a/lisp/calc/calc-graph.el +++ b/lisp/calc/calc-graph.el @@ -17,7 +17,7 @@ ;; GNU General Public License for more details. ;; You should have received a copy of the GNU General Public License -;; along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. +;; along with GNU Emacs. If not, see <https://www.gnu.org/licenses/>. ;;; Commentary: diff --git a/lisp/calc/calc-help.el b/lisp/calc/calc-help.el index 356e571c99c..3f957992842 100644 --- a/lisp/calc/calc-help.el +++ b/lisp/calc/calc-help.el @@ -17,7 +17,7 @@ ;; GNU General Public License for more details. ;; You should have received a copy of the GNU General Public License -;; along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. +;; along with GNU Emacs. If not, see <https://www.gnu.org/licenses/>. ;;; Commentary: diff --git a/lisp/calc/calc-incom.el b/lisp/calc/calc-incom.el index 59b591510dd..1ff50e20446 100644 --- a/lisp/calc/calc-incom.el +++ b/lisp/calc/calc-incom.el @@ -17,7 +17,7 @@ ;; GNU General Public License for more details. ;; You should have received a copy of the GNU General Public License -;; along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. +;; along with GNU Emacs. If not, see <https://www.gnu.org/licenses/>. ;;; Commentary: diff --git a/lisp/calc/calc-keypd.el b/lisp/calc/calc-keypd.el index dc49f2888cf..cc3bfcf2cd0 100644 --- a/lisp/calc/calc-keypd.el +++ b/lisp/calc/calc-keypd.el @@ -17,7 +17,7 @@ ;; GNU General Public License for more details. ;; You should have received a copy of the GNU General Public License -;; along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. +;; along with GNU Emacs. If not, see <https://www.gnu.org/licenses/>. ;;; Commentary: diff --git a/lisp/calc/calc-lang.el b/lisp/calc/calc-lang.el index ce1ddb56956..50a7eec1dae 100644 --- a/lisp/calc/calc-lang.el +++ b/lisp/calc/calc-lang.el @@ -17,7 +17,7 @@ ;; GNU General Public License for more details. ;; You should have received a copy of the GNU General Public License -;; along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. +;; along with GNU Emacs. If not, see <https://www.gnu.org/licenses/>. ;;; Commentary: diff --git a/lisp/calc/calc-macs.el b/lisp/calc/calc-macs.el index b2cd580c2ee..394c2e298e7 100644 --- a/lisp/calc/calc-macs.el +++ b/lisp/calc/calc-macs.el @@ -17,7 +17,7 @@ ;; GNU General Public License for more details. ;; You should have received a copy of the GNU General Public License -;; along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. +;; along with GNU Emacs. If not, see <https://www.gnu.org/licenses/>. ;;; Commentary: diff --git a/lisp/calc/calc-map.el b/lisp/calc/calc-map.el index 76a58f4e9c1..6f60d2eca77 100644 --- a/lisp/calc/calc-map.el +++ b/lisp/calc/calc-map.el @@ -17,7 +17,7 @@ ;; GNU General Public License for more details. ;; You should have received a copy of the GNU General Public License -;; along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. +;; along with GNU Emacs. If not, see <https://www.gnu.org/licenses/>. ;;; Commentary: @@ -795,8 +795,8 @@ ;;; Do substitutions in parallel to avoid crosstalk. -;; The variables math-ms-temp and math-ms-args are local to -;; math-multi-subst, but are used by math-multi-subst-rec, which +;; The variables math-ms-temp and math-ms-args are local to +;; math-multi-subst, but are used by math-multi-subst-rec, which ;; is called by math-multi-subst. (defvar math-ms-temp) (defvar math-ms-args) @@ -811,7 +811,7 @@ (math-multi-subst-rec expr))) (defun math-multi-subst-rec (expr) - (cond ((setq math-ms-temp (assoc expr math-ms-args)) + (cond ((setq math-ms-temp (assoc expr math-ms-args)) (cdr math-ms-temp)) ((Math-primp expr) expr) ((and (eq (car expr) 'calcFunc-lambda) (> (length expr) 2)) @@ -820,7 +820,7 @@ (while (cdr (setq expr (cdr expr))) (setq new (cons (car expr) new)) (if (assoc (car expr) math-ms-args) - (setq math-ms-args (cons (cons (car expr) (car expr)) + (setq math-ms-args (cons (cons (car expr) (car expr)) math-ms-args)))) (nreverse (cons (math-multi-subst-rec (car expr)) new)))) (t diff --git a/lisp/calc/calc-math.el b/lisp/calc/calc-math.el index 2590761d539..6d51536ac7a 100644 --- a/lisp/calc/calc-math.el +++ b/lisp/calc/calc-math.el @@ -17,7 +17,7 @@ ;; GNU General Public License for more details. ;; You should have received a copy of the GNU General Public License -;; along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. +;; along with GNU Emacs. If not, see <https://www.gnu.org/licenses/>. ;;; Commentary: @@ -44,15 +44,15 @@ (1- n)) "The number of digits in an Emacs float.") -;;; Find the largest power of 10 which is an Emacs float, -;;; then back off by one so that any float d.dddd...eN +;;; Find the largest power of 10 which is an Emacs float, +;;; then back off by one so that any float d.dddd...eN ;;; is an Emacs float, for acceptable d.dddd.... (defvar math-largest-emacs-expt (let ((x 1) (pow 1e2)) - ;; The following loop is for efficiency; it should stop when - ;; 10^(2x) is too large. This could be indicated by a range + ;; The following loop is for efficiency; it should stop when + ;; 10^(2x) is too large. This could be indicated by a range ;; error when computing 10^(2x) or an infinite value for 10^(2x). (while (and pow @@ -102,9 +102,9 @@ If this can't be done, return NIL." (condition-case nil (math-read-number (number-to-string - (funcall fn - (string-to-number - (let + (funcall fn + (string-to-number + (let ((calc-number-radix 10) (calc-twos-complement-mode nil) (calc-float-format (list 'float calc-internal-prec)) @@ -948,7 +948,7 @@ If this can't be done, return NIL." (math-mul xs (car sc)) (math-sqr (cdr sc))))))) (math-make-sdev (calcFunc-sec (nth 1 x)) - (math-div + (math-div (math-mul (nth 2 x) (calcFunc-sin (nth 1 x))) (math-sqr (calcFunc-cos (nth 1 x))))))) @@ -1010,7 +1010,7 @@ If this can't be done, return NIL." (math-mul xs (cdr sc)) (math-sqr (car sc))))))) (math-make-sdev (calcFunc-csc (nth 1 x)) - (math-div + (math-div (math-mul (nth 2 x) (calcFunc-cos (nth 1 x))) (math-sqr (calcFunc-sin (nth 1 x))))))) @@ -1114,7 +1114,7 @@ If this can't be done, return NIL." (sh (math-mul-float (math-sub-float expx expmx) '(float 5 -1))) (ch (math-mul-float (math-add-float expx expmx) '(float 5 -1))) (sc (math-sin-cos-raw (nth 1 x))) - (d (math-add-float + (d (math-add-float (math-mul-float (math-sqr (car sc)) (math-sqr sh)) (math-mul-float (math-sqr (cdr sc)) @@ -1139,7 +1139,7 @@ If this can't be done, return NIL." (sh (math-mul-float (math-sub-float expx expmx) '(float 5 -1))) (ch (math-mul-float (math-add-float expx expmx) '(float 5 -1))) (sc (math-sin-cos-raw (nth 1 x))) - (d (math-add-float + (d (math-add-float (math-mul-float (math-sqr (car sc)) (math-sqr ch)) (math-mul-float (math-sqr (cdr sc)) @@ -1164,17 +1164,17 @@ If this can't be done, return NIL." (sh (math-mul-float (math-sub-float expx expmx) '(float 5 -1))) (ch (math-mul-float (math-add-float expx expmx) '(float 5 -1))) (sc (math-sin-cos-raw (nth 1 x))) - (d (math-add-float + (d (math-add-float (math-sqr (car sc)) (math-sqr sh)))) (and (not (eq (nth 1 d) 0)) (list 'cplx - (math-div-float + (math-div-float (math-mul-float (car sc) (cdr sc)) d) (math-neg - (math-div-float - (math-mul-float sh ch) + (math-div-float + (math-mul-float sh ch) d)))))) ((eq (car x) 'polar) (math-polar (math-cot-raw (math-complex x)))) @@ -1223,7 +1223,7 @@ If this can't be done, return NIL." (math-cos-raw-2 xmpo2 orgx)) ((math-lessp-float x (math-neg (math-pi-over-4))) (math-neg (math-cos-raw-2 (math-add (math-pi-over-2) x) orgx))) - ((math-with-extra-prec -1 (math-nearly-zerop-float x orgx)) + ((math-with-extra-prec -1 (math-nearly-zerop-float x orgx)) '(float 0 0)) ((math-use-emacs-fn 'sin x)) (calc-symbolic-mode (signal 'inexact-result nil)) @@ -1765,7 +1765,7 @@ If this can't be done, return NIL." '(float 0 0)) (calc-symbolic-mode (signal 'inexact-result nil)) ((math-posp (nth 1 x)) ; positive and real - (cond + (cond ((math-use-emacs-fn 'log x)) (t (let ((xdigs (1- (math-numdigs (nth 1 x))))) @@ -1818,7 +1818,7 @@ If this can't be done, return NIL." (defconst math-approx-ln-10 (math-read-number-simple "2.302585092994045684018") "An approximation for ln(10).") - + (math-defcache math-ln-10 math-approx-ln-10 (math-ln-raw-2 '(float 1 1))) @@ -1963,7 +1963,7 @@ If this can't be done, return NIL." (math-div '(float 2 0) (math-add expx (math-div -1 expx)))))) ((eq (car-safe x) 'sdev) (math-make-sdev (calcFunc-csch (nth 1 x)) - (math-mul (nth 2 x) + (math-mul (nth 2 x) (math-mul (calcFunc-csch (nth 1 x)) (calcFunc-coth (nth 1 x)))))) ((eq (car x) 'intv) diff --git a/lisp/calc/calc-menu.el b/lisp/calc/calc-menu.el index e0305e36e24..546e65091fc 100644 --- a/lisp/calc/calc-menu.el +++ b/lisp/calc/calc-menu.el @@ -15,7 +15,7 @@ ;; GNU General Public License for more details. ;; You should have received a copy of the GNU General Public License -;; along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. +;; along with GNU Emacs. If not, see <https://www.gnu.org/licenses/>. ;;; Commentary: diff --git a/lisp/calc/calc-misc.el b/lisp/calc/calc-misc.el index e6af0920639..a3e41cae8a6 100644 --- a/lisp/calc/calc-misc.el +++ b/lisp/calc/calc-misc.el @@ -17,7 +17,7 @@ ;; GNU General Public License for more details. ;; You should have received a copy of the GNU General Public License -;; along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. +;; along with GNU Emacs. If not, see <https://www.gnu.org/licenses/>. ;;; Commentary: diff --git a/lisp/calc/calc-mode.el b/lisp/calc/calc-mode.el index 3b378815992..4a87281a39a 100644 --- a/lisp/calc/calc-mode.el +++ b/lisp/calc/calc-mode.el @@ -17,7 +17,7 @@ ;; GNU General Public License for more details. ;; You should have received a copy of the GNU General Public License -;; along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. +;; along with GNU Emacs. If not, see <https://www.gnu.org/licenses/>. ;;; Commentary: diff --git a/lisp/calc/calc-mtx.el b/lisp/calc/calc-mtx.el index dc97c45766f..77769e47daf 100644 --- a/lisp/calc/calc-mtx.el +++ b/lisp/calc/calc-mtx.el @@ -17,7 +17,7 @@ ;; GNU General Public License for more details. ;; You should have received a copy of the GNU General Public License -;; along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. +;; along with GNU Emacs. If not, see <https://www.gnu.org/licenses/>. ;;; Commentary: diff --git a/lisp/calc/calc-nlfit.el b/lisp/calc/calc-nlfit.el index 684d0f17b79..b3335bbb007 100644 --- a/lisp/calc/calc-nlfit.el +++ b/lisp/calc/calc-nlfit.el @@ -15,7 +15,7 @@ ;; GNU General Public License for more details. ;; You should have received a copy of the GNU General Public License -;; along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. +;; along with GNU Emacs. If not, see <https://www.gnu.org/licenses/>. ;;; Commentary: diff --git a/lisp/calc/calc-poly.el b/lisp/calc/calc-poly.el index a36213077f4..b2f69bc2331 100644 --- a/lisp/calc/calc-poly.el +++ b/lisp/calc/calc-poly.el @@ -17,7 +17,7 @@ ;; GNU General Public License for more details. ;; You should have received a copy of the GNU General Public License -;; along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. +;; along with GNU Emacs. If not, see <https://www.gnu.org/licenses/>. ;;; Commentary: diff --git a/lisp/calc/calc-prog.el b/lisp/calc/calc-prog.el index 6e9322fc04c..610e4dc5ba9 100644 --- a/lisp/calc/calc-prog.el +++ b/lisp/calc/calc-prog.el @@ -17,7 +17,7 @@ ;; GNU General Public License for more details. ;; You should have received a copy of the GNU General Public License -;; along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. +;; along with GNU Emacs. If not, see <https://www.gnu.org/licenses/>. ;;; Commentary: diff --git a/lisp/calc/calc-rewr.el b/lisp/calc/calc-rewr.el index e50f8e1566e..4f0d71a2760 100644 --- a/lisp/calc/calc-rewr.el +++ b/lisp/calc/calc-rewr.el @@ -17,7 +17,7 @@ ;; GNU General Public License for more details. ;; You should have received a copy of the GNU General Public License -;; along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. +;; along with GNU Emacs. If not, see <https://www.gnu.org/licenses/>. ;;; Commentary: @@ -30,7 +30,7 @@ (defvar math-rewrite-default-iters 100) -;; The variable calc-rewr-sel is local to calc-rewrite-selection and +;; The variable calc-rewr-sel is local to calc-rewrite-selection and ;; calc-rewrite, but is used by calc-locate-selection-marker. (defvar calc-rewr-sel) @@ -219,7 +219,7 @@ (not (equal math-rewrite-whole-expr save-expr)))) (if (symbolp (car sched)) (progn - (setq math-rewrite-whole-expr + (setq math-rewrite-whole-expr (math-normalize (list (car sched) math-rewrite-whole-expr))) (if trace-buffer (let ((fmt (math-format-stack-value @@ -490,13 +490,13 @@ ;; The variable math-import-list is local to part of math-compile-rewrites, ;; but is also used in a different part, and so the local version could -;; be affected by the non-local version when math-compile-rewrites calls itself. +;; be affected by the non-local version when math-compile-rewrites calls itself. (defvar math-import-list nil) -;; The variables math-regs, math-num-regs, math-prog-last, math-bound-vars, +;; The variables math-regs, math-num-regs, math-prog-last, math-bound-vars, ;; math-conds, math-copy-neg, math-rhs, math-pattern, math-remembering and -;; math-aliased-vars are local to math-compile-rewrites, -;; but are used by many functions math-rwcomp-*, which are called by +;; math-aliased-vars are local to math-compile-rewrites, +;; but are used by many functions math-rwcomp-*, which are called by ;; math-compile-rewrites. (defvar math-regs) (defvar math-num-regs) @@ -753,8 +753,8 @@ (list expr))) ;; The variables math-rewrite-heads-heads (i.e.; heads for math-rewrite-heads) -;; math-rewrite-heads-blanks and math-rewrite-heads-skips are local to -;; math-rewrite-heads, but used by math-rewrite-heads-rec, which is called by +;; math-rewrite-heads-blanks and math-rewrite-heads-skips are local to +;; math-rewrite-heads, but used by math-rewrite-heads-rec, which is called by ;; math-rewrite-heads. (defvar math-rewrite-heads-heads) (defvar math-rewrite-heads-skips) @@ -844,7 +844,7 @@ (cond ((equal expr math-rwcomp-subst-old) math-rwcomp-subst-new) ((Math-primp expr) expr) (t (if (eq (car expr) math-rwcomp-subst-old-func) - (math-build-call math-rwcomp-subst-new-func + (math-build-call math-rwcomp-subst-new-func (mapcar 'math-rwcomp-subst-rec (cdr expr))) (cons (car expr) @@ -1489,12 +1489,12 @@ (progn (terpri) (princ (car pc)) (if (and (natnump (nth 1 (car pc))) (< (nth 1 (car pc)) (length math-apply-rw-regs))) - (princ + (princ (format "\n part = %s" (aref math-apply-rw-regs (nth 1 (car pc)))))))) (cond ((eq (setq op (car (setq inst (car pc)))) 'func) - (if (and (consp + (if (and (consp (setq part (aref math-apply-rw-regs (car (cdr inst))))) (eq (car part) (car (setq inst (cdr (cdr inst))))) @@ -1533,7 +1533,7 @@ (aset mark 2 0)) ((eq op 'try) - (if (and (consp (setq part + (if (and (consp (setq part (aref math-apply-rw-regs (car (cdr inst))))) (memq (car part) (nth 2 inst)) (= (length part) 3) @@ -1658,7 +1658,7 @@ op (aref mark 2)) (cond ((eq op 0) (if (setq op (cdr (aref mark 1))) - (aset math-apply-rw-regs (nth 4 inst) + (aset math-apply-rw-regs (nth 4 inst) (car (aset mark 1 op))) (if (nth 5 inst) (progn @@ -1668,7 +1668,7 @@ (math-rwfail t)))) ((eq op 1) (if (setq op (cdr (aref mark 1))) - (aset math-apply-rw-regs (nth 4 inst) + (aset math-apply-rw-regs (nth 4 inst) (car (aset mark 1 op))) (if (= (aref mark 3) 1) (if (nth 5 inst) @@ -1725,7 +1725,7 @@ (t (math-rwfail t)))) ((eq op 'integer) - (if (Math-integerp (setq part + (if (Math-integerp (setq part (aref math-apply-rw-regs (nth 1 inst)))) (setq pc (cdr pc)) (if (Math-primp part) @@ -1756,7 +1756,7 @@ (math-rwfail))))) ((eq op 'negative) - (if (math-looks-negp (setq part + (if (math-looks-negp (setq part (aref math-apply-rw-regs (nth 1 inst)))) (setq pc (cdr pc)) (if (Math-primp part) @@ -1774,7 +1774,7 @@ (setq part (math-rweval (math-simplify (calcFunc-sign - (math-sub + (math-sub (aref math-apply-rw-regs (nth 1 inst)) (aref math-apply-rw-regs (nth 3 inst)))))))) (if (cond ((eq op 'calcFunc-eq) @@ -1793,7 +1793,7 @@ (math-rwfail))) ((eq op 'func-def) - (if (and + (if (and (consp (setq part (aref math-apply-rw-regs (car (cdr inst))))) (eq (car part) (car (setq inst (cdr (cdr inst)))))) @@ -1815,8 +1815,8 @@ (math-rwfail))) ((eq op 'func-opt) - (if (or (not - (and + (if (or (not + (and (consp (setq part (aref math-apply-rw-regs (car (cdr inst))))) (eq (car part) (nth 2 inst)))) @@ -1833,7 +1833,7 @@ (setq pc (cdr pc)))) ((eq op 'mod) - (if (if (Math-zerop + (if (if (Math-zerop (setq part (aref math-apply-rw-regs (nth 1 inst)))) (Math-zerop (nth 3 inst)) (and (not (Math-zerop (nth 2 inst))) @@ -1847,7 +1847,7 @@ (math-rwfail))) ((eq op 'apply) - (if (and (consp + (if (and (consp (setq part (aref math-apply-rw-regs (car (cdr inst))))) (not (Math-objvecp part)) (not (eq (car part) 'var))) @@ -1860,19 +1860,19 @@ (math-rwfail))) ((eq op 'cons) - (if (and (consp + (if (and (consp (setq part (aref math-apply-rw-regs (car (cdr inst))))) (eq (car part) 'vec) (cdr part)) (progn (aset math-apply-rw-regs (nth 2 inst) (nth 1 part)) - (aset math-apply-rw-regs (nth 3 inst) + (aset math-apply-rw-regs (nth 3 inst) (cons 'vec (cdr (cdr part)))) (setq pc (cdr pc))) (math-rwfail))) ((eq op 'rcons) - (if (and (consp + (if (and (consp (setq part (aref math-apply-rw-regs (car (cdr inst))))) (eq (car part) 'vec) (cdr part)) @@ -1898,7 +1898,7 @@ (setq pc (cdr pc))) ((eq op 'copy) - (aset math-apply-rw-regs (nth 2 inst) + (aset math-apply-rw-regs (nth 2 inst) (aref math-apply-rw-regs (nth 1 inst))) (setq pc (cdr pc))) diff --git a/lisp/calc/calc-rules.el b/lisp/calc/calc-rules.el index bcace468168..b29e5bf349b 100644 --- a/lisp/calc/calc-rules.el +++ b/lisp/calc/calc-rules.el @@ -17,7 +17,7 @@ ;; GNU General Public License for more details. ;; You should have received a copy of the GNU General Public License -;; along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. +;; along with GNU Emacs. If not, see <https://www.gnu.org/licenses/>. ;;; Commentary: diff --git a/lisp/calc/calc-sel.el b/lisp/calc/calc-sel.el index d7f87f49108..a363469450f 100644 --- a/lisp/calc/calc-sel.el +++ b/lisp/calc/calc-sel.el @@ -17,7 +17,7 @@ ;; GNU General Public License for more details. ;; You should have received a copy of the GNU General Public License -;; along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. +;; along with GNU Emacs. If not, see <https://www.gnu.org/licenses/>. ;;; Commentary: @@ -140,8 +140,8 @@ (calc-change-current-selection sel) (error "%d is not a valid sub-formula index" num))))) -;; The variables calc-fnp-op and calc-fnp-num are local to -;; calc-find-nth-part (and calc-select-previous) but used by +;; The variables calc-fnp-op and calc-fnp-num are local to +;; calc-find-nth-part (and calc-select-previous) but used by ;; calc-find-nth-part-rec, which is called by them. (defvar calc-fnp-op) (defvar calc-fnp-num) @@ -650,7 +650,7 @@ alg) (let ((calc-dollar-values (list sel)) (calc-dollar-used 0)) - (setq alg (calc-do-alg-entry "" "Replace selection with: " nil + (setq alg (calc-do-alg-entry "" "Replace selection with: " nil 'calc-selection-history)) (and alg (progn diff --git a/lisp/calc/calc-stat.el b/lisp/calc/calc-stat.el index 2b79712f301..d70d4cd40ef 100644 --- a/lisp/calc/calc-stat.el +++ b/lisp/calc/calc-stat.el @@ -17,7 +17,7 @@ ;; GNU General Public License for more details. ;; You should have received a copy of the GNU General Public License -;; along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. +;; along with GNU Emacs. If not, see <https://www.gnu.org/licenses/>. ;;; Commentary: diff --git a/lisp/calc/calc-store.el b/lisp/calc/calc-store.el index 67931a74472..16d35f28ec0 100644 --- a/lisp/calc/calc-store.el +++ b/lisp/calc/calc-store.el @@ -17,7 +17,7 @@ ;; GNU General Public License for more details. ;; You should have received a copy of the GNU General Public License -;; along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. +;; along with GNU Emacs. If not, see <https://www.gnu.org/licenses/>. ;;; Commentary: diff --git a/lisp/calc/calc-stuff.el b/lisp/calc/calc-stuff.el index 48e3a3404d3..afdeac1b6f6 100644 --- a/lisp/calc/calc-stuff.el +++ b/lisp/calc/calc-stuff.el @@ -17,7 +17,7 @@ ;; GNU General Public License for more details. ;; You should have received a copy of the GNU General Public License -;; along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. +;; along with GNU Emacs. If not, see <https://www.gnu.org/licenses/>. ;;; Commentary: diff --git a/lisp/calc/calc-trail.el b/lisp/calc/calc-trail.el index a9e294354bc..9f949675b2e 100644 --- a/lisp/calc/calc-trail.el +++ b/lisp/calc/calc-trail.el @@ -17,7 +17,7 @@ ;; GNU General Public License for more details. ;; You should have received a copy of the GNU General Public License -;; along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. +;; along with GNU Emacs. If not, see <https://www.gnu.org/licenses/>. ;;; Commentary: diff --git a/lisp/calc/calc-undo.el b/lisp/calc/calc-undo.el index 06181f8c5c2..17e1633c989 100644 --- a/lisp/calc/calc-undo.el +++ b/lisp/calc/calc-undo.el @@ -17,7 +17,7 @@ ;; GNU General Public License for more details. ;; You should have received a copy of the GNU General Public License -;; along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. +;; along with GNU Emacs. If not, see <https://www.gnu.org/licenses/>. ;;; Commentary: @@ -75,7 +75,7 @@ (let ((v (intern (nth 1 action)))) (calc-record-undo (list 'store (nth 1 action) (and (boundp v) (symbol-value v)))) - (if (y-or-n-p (format "Un-store variable %s? " + (if (y-or-n-p (format "Un-store variable %s? " (calc-var-name (nth 1 action)))) (progn (if (nth 2 action) diff --git a/lisp/calc/calc-units.el b/lisp/calc/calc-units.el index a8074eaeb20..b7b43acefcc 100644 --- a/lisp/calc/calc-units.el +++ b/lisp/calc/calc-units.el @@ -17,7 +17,7 @@ ;; GNU General Public License for more details. ;; You should have received a copy of the GNU General Public License -;; along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. +;; along with GNU Emacs. If not, see <https://www.gnu.org/licenses/>. ;;; Commentary: diff --git a/lisp/calc/calc-vec.el b/lisp/calc/calc-vec.el index 0ce0d422f2f..c049933eeb5 100644 --- a/lisp/calc/calc-vec.el +++ b/lisp/calc/calc-vec.el @@ -17,7 +17,7 @@ ;; GNU General Public License for more details. ;; You should have received a copy of the GNU General Public License -;; along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. +;; along with GNU Emacs. If not, see <https://www.gnu.org/licenses/>. ;;; Commentary: diff --git a/lisp/calc/calc-yank.el b/lisp/calc/calc-yank.el index e97d8789414..fec2512266b 100644 --- a/lisp/calc/calc-yank.el +++ b/lisp/calc/calc-yank.el @@ -17,7 +17,7 @@ ;; GNU General Public License for more details. ;; You should have received a copy of the GNU General Public License -;; along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. +;; along with GNU Emacs. If not, see <https://www.gnu.org/licenses/>. ;;; Commentary: diff --git a/lisp/calc/calc.el b/lisp/calc/calc.el index 6a9af44181d..d9e8cff16a5 100644 --- a/lisp/calc/calc.el +++ b/lisp/calc/calc.el @@ -18,7 +18,7 @@ ;; GNU General Public License for more details. ;; You should have received a copy of the GNU General Public License -;; along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. +;; along with GNU Emacs. If not, see <https://www.gnu.org/licenses/>. ;;; Commentary: diff --git a/lisp/calc/calcalg2.el b/lisp/calc/calcalg2.el index bb4c30e1235..53e02572064 100644 --- a/lisp/calc/calcalg2.el +++ b/lisp/calc/calcalg2.el @@ -17,7 +17,7 @@ ;; GNU General Public License for more details. ;; You should have received a copy of the GNU General Public License -;; along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. +;; along with GNU Emacs. If not, see <https://www.gnu.org/licenses/>. ;;; Commentary: diff --git a/lisp/calc/calcalg3.el b/lisp/calc/calcalg3.el index dc6ac93e20a..11e6342be28 100644 --- a/lisp/calc/calcalg3.el +++ b/lisp/calc/calcalg3.el @@ -17,7 +17,7 @@ ;; GNU General Public License for more details. ;; You should have received a copy of the GNU General Public License -;; along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. +;; along with GNU Emacs. If not, see <https://www.gnu.org/licenses/>. ;;; Commentary: @@ -120,7 +120,7 @@ (defvar calc-curve-fit-history nil "History for calc-curve-fit.") -(defun calc-curve-fit (arg &optional calc-curve-model +(defun calc-curve-fit (arg &optional calc-curve-model calc-curve-coefnames calc-curve-varnames) (interactive "P") (calc-slow-wrapper @@ -148,7 +148,7 @@ "P prefix = plot result" "' = alg entry, $ = stack, u = Model1, U = Model2"))) (while (not calc-curve-model) - (message + (message "Fit to model: %s:%s%s" (nth which msgs) (if plot "P" " ") @@ -194,27 +194,27 @@ calc-curve-varnames nil) nil)) ((= key ?1) ; linear or multilinear - (calc-get-fit-variables calc-curve-nvars + (calc-get-fit-variables calc-curve-nvars (1+ calc-curve-nvars) (and homog 0)) - (setq calc-curve-model + (setq calc-curve-model (math-mul calc-curve-coefnames (cons 'vec (cons 1 (cdr calc-curve-varnames)))))) ((and (>= key ?2) (<= key ?9)) ; polynomial (calc-get-fit-variables 1 (- key ?0 -1) (and homog 0)) - (setq calc-curve-model + (setq calc-curve-model (math-build-polynomial-expr (cdr calc-curve-coefnames) (nth 1 calc-curve-varnames)))) ((= key ?i) ; exact polynomial (calc-get-fit-variables 1 (1- (length (nth 1 data))) (and homog 0)) - (setq calc-curve-model + (setq calc-curve-model (math-build-polynomial-expr (cdr calc-curve-coefnames) (nth 1 calc-curve-varnames)))) ((= key ?p) ; power law - (calc-get-fit-variables calc-curve-nvars + (calc-get-fit-variables calc-curve-nvars (1+ calc-curve-nvars) (and homog 1)) - (setq calc-curve-model - (math-mul + (setq calc-curve-model + (math-mul (nth 1 calc-curve-coefnames) (calcFunc-reduce '(var mul var-mul) @@ -223,9 +223,9 @@ calc-curve-varnames (cons 'vec (cdr (cdr calc-curve-coefnames)))))))) ((= key ?^) ; exponential law - (calc-get-fit-variables calc-curve-nvars + (calc-get-fit-variables calc-curve-nvars (1+ calc-curve-nvars) (and homog 1)) - (setq calc-curve-model + (setq calc-curve-model (math-mul (nth 1 calc-curve-coefnames) (calcFunc-reduce '(var mul var-mul) @@ -258,9 +258,9 @@ (cdr (nth 1 plot))))))) (calc-fit-hubbert-linear-curve func)) ((memq key '(?e ?E)) - (calc-get-fit-variables calc-curve-nvars + (calc-get-fit-variables calc-curve-nvars (1+ calc-curve-nvars) (and homog 1)) - (setq calc-curve-model + (setq calc-curve-model (math-mul (nth 1 calc-curve-coefnames) (calcFunc-reduce '(var mul var-mul) @@ -275,18 +275,18 @@ (cons 'vec (cdr (cdr calc-curve-coefnames))) calc-curve-varnames)))))) ((memq key '(?x ?X)) - (calc-get-fit-variables calc-curve-nvars + (calc-get-fit-variables calc-curve-nvars (1+ calc-curve-nvars) (and homog 0)) - (setq calc-curve-model + (setq calc-curve-model (math-mul calc-curve-coefnames (cons 'vec (cons 1 (cdr calc-curve-varnames))))) (setq calc-curve-model (if (eq key ?x) (list 'calcFunc-exp calc-curve-model) (list '^ 10 calc-curve-model)))) ((memq key '(?l ?L)) - (calc-get-fit-variables calc-curve-nvars + (calc-get-fit-variables calc-curve-nvars (1+ calc-curve-nvars) (and homog 0)) - (setq calc-curve-model + (setq calc-curve-model (math-mul calc-curve-coefnames (cons 'vec (cons 1 (cdr (calcFunc-map @@ -296,7 +296,7 @@ var-log10)) calc-curve-varnames))))))) ((= key ?q) - (calc-get-fit-variables calc-curve-nvars + (calc-get-fit-variables calc-curve-nvars (1+ (* 2 calc-curve-nvars)) (and homog 0)) (let ((c calc-curve-coefnames) (v calc-curve-varnames)) @@ -310,15 +310,15 @@ (list '- (car v) (nth 1 c)) 2))))))) ((= key ?g) - (setq - calc-curve-model - (math-read-expr + (setq + calc-curve-model + (math-read-expr "(AFit / BFit sqrt(2 pi)) exp(-0.5 * ((XFit - CFit) / BFit)^2)") calc-curve-varnames '(vec (var XFit var-XFit)) calc-curve-coefnames '(vec (var AFit var-AFit) (var BFit var-BFit) (var CFit var-CFit))) - (calc-get-fit-variables 1 (1- (length calc-curve-coefnames)) + (calc-get-fit-variables 1 (1- (length calc-curve-coefnames)) (and homog 1))) ((memq key '(?\$ ?\' ?u ?U)) (let* ((defvars nil) @@ -327,7 +327,7 @@ (let* ((calc-dollar-values calc-arg-values) (calc-dollar-used 0) (calc-hashes-used 0)) - (setq calc-curve-model + (setq calc-curve-model (calc-do-alg-entry "" "Model formula: " nil 'calc-curve-fit-history)) (if (/= (length calc-curve-model) 1) @@ -358,19 +358,19 @@ (or (null (nth 3 calc-curve-model)) (math-vectorp (nth 3 calc-curve-model)))) (setq calc-curve-varnames (nth 2 calc-curve-model) - calc-curve-coefnames + calc-curve-coefnames (or (nth 3 calc-curve-model) (cons 'vec (math-all-vars-but - calc-curve-model + calc-curve-model calc-curve-varnames))) calc-curve-model (nth 1 calc-curve-model)) (error "Incorrect model specifier"))))) (or calc-curve-varnames - (let ((with-y + (let ((with-y (eq (car-safe calc-curve-model) 'calcFunc-eq))) (if calc-curve-coefnames - (calc-get-fit-variables + (calc-get-fit-variables (if with-y (1+ calc-curve-nvars) calc-curve-nvars) (1- (length calc-curve-coefnames)) (math-all-vars-but @@ -378,9 +378,9 @@ nil with-y) (let* ((coefs (math-all-vars-but calc-curve-model nil)) (vars nil) - (n (- - (length coefs) - calc-curve-nvars + (n (- + (length coefs) + calc-curve-nvars (if with-y 2 1))) p) (if (< n 0) @@ -388,12 +388,12 @@ (setq p (nthcdr n coefs)) (setq vars (cdr p)) (setcdr p nil) - (calc-get-fit-variables + (calc-get-fit-variables (if with-y (1+ calc-curve-nvars) calc-curve-nvars) (length coefs) vars coefs with-y))))) (if record-entry - (calc-record (list 'vec calc-curve-model + (calc-record (list 'vec calc-curve-model calc-curve-varnames calc-curve-coefnames) "modl")))) (t (beep)))) @@ -422,7 +422,7 @@ (calc-graph-set-styles nil nil) (calc-graph-point-style nil)) (setq plot (cdr (nth 1 plot))) - (setq plot + (setq plot (list 'intv 3 (math-sub @@ -1446,7 +1446,7 @@ ;;; Open Romberg method; "qromo" in section 4.4. ;; The variable math-ninteg-temp is local to math-ninteg-romberg, -;; but is used by math-ninteg-midpoint, which is used by +;; but is used by math-ninteg-midpoint, which is used by ;; math-ninteg-romberg. (defvar math-ninteg-temp) @@ -1564,7 +1564,7 @@ ;; The variables math-fit-first-var, math-fit-first-coef and ;; math-fit-new-coefs are local to math-general-fit, but are used by -;; calcFunc-fitvar, calcFunc-fitparam and calcFunc-fitdummy +;; calcFunc-fitvar, calcFunc-fitparam and calcFunc-fitdummy ;; (respectively), which are used by math-general-fit. (defvar math-fit-first-var) (defvar math-fit-first-coef) @@ -1903,7 +1903,7 @@ (function (lambda (x y) (string< (nth 1 x) (nth 1 y))))))) ;; The variables math-all-vars-vars (the vars for math-all-vars) and -;; math-all-vars-found are local to math-all-vars-in, but are used by +;; math-all-vars-found are local to math-all-vars-in, but are used by ;; math-all-vars-rec which is called by math-all-vars-in. (defvar math-all-vars-vars) (defvar math-all-vars-found) diff --git a/lisp/calc/calccomp.el b/lisp/calc/calccomp.el index 7c8013aa907..fe0a882cfb9 100644 --- a/lisp/calc/calccomp.el +++ b/lisp/calc/calccomp.el @@ -17,7 +17,7 @@ ;; GNU General Public License for more details. ;; You should have received a copy of the GNU General Public License -;; along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. +;; along with GNU Emacs. If not, see <https://www.gnu.org/licenses/>. ;;; Commentary: diff --git a/lisp/calc/calcsel2.el b/lisp/calc/calcsel2.el index 73497f049f1..2299cd3da2a 100644 --- a/lisp/calc/calcsel2.el +++ b/lisp/calc/calcsel2.el @@ -17,7 +17,7 @@ ;; GNU General Public License for more details. ;; You should have received a copy of the GNU General Public License -;; along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. +;; along with GNU Emacs. If not, see <https://www.gnu.org/licenses/>. ;;; Commentary: |