4 files changed, 11 insertions, 11 deletions

diff --git a/lisp/calc/calc-bin.el b/lisp/calc/calc-bin.el
index c05a71a2d7f..a61cecf357c 100644
--- a/lisp/calc/calc-bin.el
+++ b/lisp/calc/calc-bin.el
@@ -420,7 +420,7 @@ the size of a Calc bignum digit.")
   (let ((q (math-div-bignum-digit a math-bignum-digit-power-of-two)))
     (if (<= w math-bignum-logb-digit-size)
         (list (logand (lognot (cdr q))
-                      (1- (lsh 1 w))))
+                      (1- (ash 1 w))))
       (math-mul-bignum-digit (math-not-bignum (math-norm-bignum (car q))
                                                (- w math-bignum-logb-digit-size))
                               math-bignum-digit-power-of-two
@@ -529,7 +529,7 @@ the size of a Calc bignum digit.")
         ((and (integerp a) (< a math-small-integer-size))
          (if (> w (logb math-small-integer-size))
              a
-           (logand a (1- (lsh 1 w)))))
+           (logand a (1- (ash 1 w)))))
         (t
          (math-normalize
           (cons 'bigpos
@@ -542,7 +542,7 @@ the size of a Calc bignum digit.")
   (let ((q (math-div-bignum-digit a math-bignum-digit-power-of-two)))
     (if (<= w math-bignum-logb-digit-size)
         (list (logand (cdr q)
-                      (1- (lsh 1 w))))
+                      (1- (ash 1 w))))
       (math-mul-bignum-digit (math-clip-bignum (math-norm-bignum (car q))
                                                 (- w math-bignum-logb-digit-size))
                               math-bignum-digit-power-of-two
diff --git a/lisp/calc/calc-comb.el b/lisp/calc/calc-comb.el
index 7c88230f86a..f1d3daeed93 100644
--- a/lisp/calc/calc-comb.el
+++ b/lisp/calc/calc-comb.el
@@ -580,7 +580,7 @@
     ;; deduce a better value for RAND_MAX.
     (let ((i 0))
       (while (< (setq i (1+ i)) 30)
-        (if (> (lsh (math-abs (random)) math-random-shift) 4095)
+        (if (> (ash (math-abs (random)) math-random-shift) 4095)
             (setq math-random-shift (1- math-random-shift))))))
   (setq math-last-RandSeed var-RandSeed
         math-gaussian-cache nil))
@@ -592,11 +592,11 @@
                                    (cdr math-random-table))
               math-random-ptr2 (or (cdr math-random-ptr2)
                                    (cdr math-random-table)))
-        (logand (lsh (setcar math-random-ptr1
+        (logand (ash (setcar math-random-ptr1
                              (logand (- (car math-random-ptr1)
                                         (car math-random-ptr2)) 524287))
                      -6) 1023))
-    (logand (lsh (random) math-random-shift) 1023)))
+    (logand (ash (random) math-random-shift) 1023)))
 
 
 ;;; Produce a random digit in the range 0..999.
diff --git a/lisp/calc/calc-ext.el b/lisp/calc/calc-ext.el
index 5feff23f72d..f983ebe414d 100644
--- a/lisp/calc/calc-ext.el
+++ b/lisp/calc/calc-ext.el
@@ -2294,14 +2294,14 @@ calc-kill calc-kill-region calc-yank))))
          (let ((a (math-trunc a)))
            (if (integerp a)
                a
-             (if (or (Math-lessp (lsh -1 -1) a)
-                     (Math-lessp a (- (lsh -1 -1))))
+             (if (or (Math-lessp most-positive-fixnum a)
+                     (Math-lessp a (- most-positive-fixnum)))
                  (math-reject-arg a 'fixnump)
                (math-fixnum a)))))
         ((and allow-inf (equal a '(var inf var-inf)))
-         (lsh -1 -1))
+         most-positive-fixnum)
         ((and allow-inf (equal a '(neg (var inf var-inf))))
-         (- (lsh -1 -1)))
+         (- most-positive-fixnum))
         (t (math-reject-arg a 'fixnump))))
 
 ;;; Verify that A is an integer >= 0 and return A in integer form.  [I N; - x]
diff --git a/lisp/calc/calc-math.el b/lisp/calc/calc-math.el
index 4b8abbf4f85..483907a325d 100644
--- a/lisp/calc/calc-math.el
+++ b/lisp/calc/calc-math.el
@@ -1697,7 +1697,7 @@ If this can't be done, return NIL."
     (while (not (Math-lessp x pow))
       (setq pows (cons pow pows)
             pow (math-sqr pow)))
-    (setq n (lsh 1 (1- (length pows)))
+    (setq n (ash 1 (1- (length pows)))
           sum n
           pow (car pows))
     (while (and (setq pows (cdr pows))