diff options
Diffstat (limited to 'lisp/calc')
| -rw-r--r-- | lisp/calc/calc-bin.el | 6 | ||||
| -rw-r--r-- | lisp/calc/calc-misc.el | 4 | ||||
| -rw-r--r-- | lisp/calc/calc-poly.el | 2 | ||||
| -rw-r--r-- | lisp/calc/calc.el | 3 |
4 files changed, 8 insertions, 7 deletions
diff --git a/lisp/calc/calc-bin.el b/lisp/calc/calc-bin.el index 20b4a9db5e2..44354f0822f 100644 --- a/lisp/calc/calc-bin.el +++ b/lisp/calc/calc-bin.el @@ -291,7 +291,7 @@ the size of a Calc bignum digit.") (if (eq (car-safe b) 'mod) (if (equal mod (nth 2 b)) (setq b (nth 1 b)) - (math-reject-arg b "*Inconsistent modulos")))) + (math-reject-arg b "*Inconsistent modulus")))) (setq mod (nth 2 b) b (nth 1 b))) (if (Math-messy-integerp mod) @@ -303,9 +303,9 @@ the size of a Calc bignum digit.") (if w (if (/= w bits) (calc-record-why - "*Warning: Modulo inconsistent with word size")) + "*Warning: Modulus inconsistent with word size")) (setq w bits)) - (calc-record-why "*Warning: Modulo is not a power of 2")) + (calc-record-why "*Warning: Modulus is not a power of 2")) (math-make-mod (if b (funcall f a b w) (funcall f a w)) diff --git a/lisp/calc/calc-misc.el b/lisp/calc/calc-misc.el index db86c08422e..6d034927ae0 100644 --- a/lisp/calc/calc-misc.el +++ b/lisp/calc/calc-misc.el @@ -260,13 +260,13 @@ Calc user interface as before (either C-x * C or C-x * K; initially C-x * C). (length msg)) 32) " [?=MORE]") "")))))))) - + ;;;; Stack and buffer management. -;; The variable calc-last-why-command is set in calc-do-handly-whys +;; The variable calc-last-why-command is set in calc-do-handle-whys ;; and used in calc-why (in calc-stuff.el). (defvar calc-last-why-command) diff --git a/lisp/calc/calc-poly.el b/lisp/calc/calc-poly.el index e16c26eaa19..97d955eb07d 100644 --- a/lisp/calc/calc-poly.el +++ b/lisp/calc/calc-poly.el @@ -419,7 +419,7 @@ (list 'frac 1 denom)) 1)) -;;; Compute the GCD of two monovariate polynomial lists. +;;; Compute the GCD of two univariate polynomial lists. ;;; Knuth section 4.6.1, algorithm C. (defun math-poly-gcd-coefs (u v) (let ((d (math-poly-gcd (math-poly-gcd-list u) diff --git a/lisp/calc/calc.el b/lisp/calc/calc.el index 60a84bdff35..626d2462b4f 100644 --- a/lisp/calc/calc.el +++ b/lisp/calc/calc.el @@ -1235,7 +1235,8 @@ Used by `calc-user-invocation'.") (glob (current-global-map)) (loc (current-local-map))) (or (input-pending-p) (message "%s" prompt)) - (let ((key (calc-read-key t))) + (let ((key (calc-read-key t)) + (input-method-function nil)) (calc-unread-command (cdr key)) (unwind-protect (progn |