Merge from origin/emacs-25

[gnu-emacs] / lisp / calc / calc-bin.el

diff --git a/lisp/calc/calc-bin.el b/lisp/calc/calc-bin.el
index 20b4a9db5e25622dfe0c092100fe74913b2ee3fd..eb82433db63cdea74a692bc60e984fd63ed945dc 100644 (file)
--- a/lisp/calc/calc-bin.el
+++ b/lisp/calc/calc-bin.el
@@ -1,9 +1,8 @@
 ;;; calc-bin.el --- binary functions for Calc
 
-;; Copyright (C) 1990-1993, 2001-2011 Free Software Foundation, Inc.
+;; Copyright (C) 1990-1993, 2001-2016 Free Software Foundation, Inc.
 
 ;; Author: David Gillespie <daveg@synaptics.com>
-;; Maintainer: Jay Belanger <jay.p.belanger@gmail.com>
 
 ;; This file is part of GNU Emacs.
 
@@ -291,7 +290,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 +302,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))