diff options
author | Sean Whitton <spwhitton@spwhitton.name> | 2021-08-19 16:48:59 -0700 |
---|---|---|
committer | Sean Whitton <spwhitton@spwhitton.name> | 2021-08-19 16:48:59 -0700 |
commit | 07fcbb558d797272b9f43547da60beda485873a3 (patch) | |
tree | 77d5da14e9f9d9d8b1d877c70c01296fd3893796 /lisp/calc/calc-ext.el | |
parent | c9bdeff3e45a7ac84a74a81bb048046f82dddc91 (diff) | |
parent | fb81c8c3adf8633f2f617c82f6019aef630860c7 (diff) | |
download | emacs-07fcbb558d797272b9f43547da60beda485873a3.tar.gz |
Merge remote-tracking branch 'origin/master' into athena/unstable
Diffstat (limited to 'lisp/calc/calc-ext.el')
-rw-r--r-- | lisp/calc/calc-ext.el | 32 |
1 files changed, 16 insertions, 16 deletions
diff --git a/lisp/calc/calc-ext.el b/lisp/calc/calc-ext.el index f4ddb840b50..45337e187be 100644 --- a/lisp/calc/calc-ext.el +++ b/lisp/calc/calc-ext.el @@ -2565,9 +2565,9 @@ If X is not an error form, return 1." ;;; True if A is numerically equal to the integer B. [P N S] [Public] ;;; B must not be a multiple of 10. (defun math-equal-int (a b) - (or (eq a b) + (or (eql a b) (and (eq (car-safe a) 'float) - (eq (nth 1 a) b) + (eql (nth 1 a) b) (= (nth 2 a) 0)))) @@ -2784,23 +2784,23 @@ If X is not an error form, return 1." (declare (indent 1) (debug (sexp body))) (setq math-integral-cache nil) (cons 'progn - (mapcar #'(lambda (func) - `(put ',func 'math-integral - (nconc - (get ',func 'math-integral) - (list - #'(lambda (u) ,@code))))) + (mapcar (lambda (func) + `(put ',func 'math-integral + (nconc + (get ',func 'math-integral) + (list + (lambda (u) ,@code))))) (if (symbolp funcs) (list funcs) funcs)))) (defmacro math-defintegral-2 (funcs &rest code) (declare (indent 1) (debug (sexp body))) (setq math-integral-cache nil) (cons 'progn - (mapcar #'(lambda (func) - `(put ',func 'math-integral-2 - (nconc - (get ',func 'math-integral-2) - (list #'(lambda (u v) ,@code))))) + (mapcar (lambda (func) + `(put ',func 'math-integral-2 + (nconc + (get ',func 'math-integral-2) + (list (lambda (u v) ,@code))))) (if (symbolp funcs) (list funcs) funcs)))) (defvar var-IntegAfterRules 'calc-IntegAfterRules) @@ -3088,7 +3088,7 @@ If X is not an error form, return 1." (math-read-big-err-msg nil) math-read-big-baseline math-read-big-h2 new-pos p) - (while (setq new-pos (string-match "\n" str pos)) + (while (setq new-pos (string-search "\n" str pos)) (setq math-read-big-lines (cons (substring str pos new-pos) math-read-big-lines) pos (1+ new-pos))) @@ -3249,7 +3249,7 @@ If X is not an error form, return 1." (t (let ((str (math-format-flat-expr x 0)) (pos 0) p) - (or (string-match "\"" str) + (or (string-search "\"" str) (while (<= (setq p (+ pos w)) (length str)) (while (and (> (setq p (1- p)) pos) (not (= (aref str p) ? )))) @@ -3278,7 +3278,7 @@ If X is not an error form, return 1." (math-format-radix-float a prec)) (format "%d#%s" calc-number-radix (math-format-radix-float a prec))))) - (if (and prec (> prec 191) (string-match "\\*" str)) + (if (and prec (> prec 191) (string-search "*" str)) (concat "(" str ")") str)))) ((eq (car a) 'frac) |