Audit use of lsh and fix glitches

I audited use of lsh in the Lisp source code, and fixed the
glitches that I found.  While I was at it, I replaced uses of lsh
with ash when either will do.  Replacement is OK when either
argument is known to be nonnegative, or when only the low-order
bits of the result matter, and is a (minor) win since ash is a bit
more solid than lsh nowadays, and is a bit faster.
* lisp/calc/calc-ext.el (math-check-fixnum):
Prefer most-positive-fixnum to (lsh -1 -1).
* lisp/vc/vc-hg.el (vc-hg-state-fast): When testing fixnum width,
prefer (zerop (ash most-positive-fixnum -32)) to (zerop (lsh -1
32)) (Bug#32485#11).
* lisp/emacs-lisp/bytecomp.el (byte-compile-lapcode):
Tighten sanity-check for bytecode overflow, by checking that the
result of (ash pc -8) is nonnegative.  Formerly this check was not
needed since lsh was used and the number overflowed differently.
* lisp/net/dns.el (dns-write): Fix some obvious sign typos in
shift counts.  Evidently this part of the code has never been
exercised.
* lisp/progmodes/hideif.el (hif-shiftleft, hif-shiftright):
* lisp/term/common-win.el (x-setup-function-keys):
Simplify.
* admin/unidata/unidata-gen.el, admin/unidata/uvs.el:
* doc/lispref/keymaps.texi, doc/lispref/syntax.texi:
* doc/misc/calc.texi, doc/misc/cl.texi, etc/NEWS.19:
* lisp/arc-mode.el, lisp/calc/calc-bin.el, lisp/calc/calc-comb.el:
* lisp/calc/calc-ext.el, lisp/calc/calc-math.el:
* lisp/cedet/semantic/wisent/comp.el, lisp/composite.el:
* lisp/disp-table.el, lisp/dos-fns.el, lisp/edmacro.el:
* lisp/emacs-lisp/bindat.el, lisp/emacs-lisp/byte-opt.el:
* lisp/emacs-lisp/bytecomp.el, lisp/emacs-lisp/cl-extra.el:
* lisp/erc/erc-dcc.el, lisp/facemenu.el, lisp/gnus/message.el:
* lisp/gnus/nndoc.el, lisp/gnus/nnmaildir.el, lisp/image.el:
* lisp/international/ccl.el, lisp/international/fontset.el:
* lisp/international/mule-cmds.el, lisp/international/mule.el:
* lisp/json.el, lisp/mail/binhex.el, lisp/mail/rmail.el:
* lisp/mail/uudecode.el, lisp/md4.el, lisp/net/dns.el:
* lisp/net/ntlm.el, lisp/net/sasl.el, lisp/net/socks.el:
* lisp/net/tramp.el, lisp/obsolete/levents.el:
* lisp/obsolete/pgg-parse.el, lisp/org/org.el:
* lisp/org/ox-publish.el, lisp/progmodes/cc-defs.el:
* lisp/progmodes/ebnf2ps.el, lisp/progmodes/hideif.el:
* lisp/ps-bdf.el, lisp/ps-print.el, lisp/simple.el:
* lisp/tar-mode.el, lisp/term/common-win.el:
* lisp/term/tty-colors.el, lisp/term/xterm.el, lisp/vc/vc-git.el:
* lisp/vc/vc-hg.el, lisp/x-dnd.el, test/src/data-tests.el:
Prefer ash to lsh when either will do.

3 files changed, 17 insertions, 17 deletions

diff --git a/lisp/mail/binhex.el b/lisp/mail/binhex.el
index 299fc0b2341..fa2ea3d8471 100644
--- a/lisp/mail/binhex.el
+++ b/lisp/mail/binhex.el
@@ -136,9 +136,9 @@ input and write the converted data to its standard output."
 (defun binhex-update-crc (crc char &optional count)
   (if (null count) (setq count 1))
   (while (> count 0)
-    (setq crc (logxor (logand (lsh crc 8) 65280)
+    (setq crc (logxor (logand (ash crc 8) 65280)
                       (aref binhex-crc-table
-                            (logxor (logand (lsh crc -8) 255)
+                            (logxor (logand (ash crc -8) 255)
                                     char)))
           count (1- count)))
   crc)
@@ -156,14 +156,14 @@ input and write the converted data to its standard output."
 (defun binhex-string-big-endian (string)
   (let ((ret 0) (i 0) (len (length string)))
     (while (< i len)
-      (setq ret (+ (lsh ret 8) (binhex-char-int (aref string i)))
+      (setq ret (+ (ash ret 8) (binhex-char-int (aref string i)))
             i (1+ i)))
     ret))
 
 (defun binhex-string-little-endian (string)
   (let ((ret 0) (i 0) (shift 0) (len (length string)))
     (while (< i len)
-      (setq ret (+ ret (lsh (binhex-char-int (aref string i)) shift))
+      (setq ret (+ ret (ash (binhex-char-int (aref string i)) shift))
             i (1+ i)
             shift (+ shift 8)))
     ret))
@@ -239,13 +239,13 @@ If HEADER-ONLY is non-nil only decode header and return filename."
                       counter (1+ counter)
                       inputpos (1+ inputpos))
                 (cond ((= counter 4)
-                       (binhex-push-char (lsh bits -16) nil work-buffer)
-                       (binhex-push-char (logand (lsh bits -8) 255) nil
+                       (binhex-push-char (ash bits -16) nil work-buffer)
+                       (binhex-push-char (logand (ash bits -8) 255) nil
                                          work-buffer)
                        (binhex-push-char (logand bits 255) nil
                                          work-buffer)
                        (setq bits 0 counter 0))
-                      (t (setq bits (lsh bits 6)))))
+                      (t (setq bits (ash bits 6)))))
               (if (null file-name-length)
                   (with-current-buffer work-buffer
                     (setq file-name-length (char-after (point-min))
@@ -261,12 +261,12 @@ If HEADER-ONLY is non-nil only decode header and return filename."
               (setq tmp (and tmp (not (eq inputpos end)))))
             (cond
              ((= counter 3)
-              (binhex-push-char (logand (lsh bits -16) 255) nil
+              (binhex-push-char (logand (ash bits -16) 255) nil
                                 work-buffer)
-              (binhex-push-char (logand (lsh bits -8) 255) nil
+              (binhex-push-char (logand (ash bits -8) 255) nil
                                 work-buffer))
              ((= counter 2)
-              (binhex-push-char (logand (lsh bits -10) 255) nil
+              (binhex-push-char (logand (ash bits -10) 255) nil
                                 work-buffer))))
           (if header-only nil
             (binhex-verify-crc work-buffer
diff --git a/lisp/mail/rmail.el b/lisp/mail/rmail.el
index 12a58b293d0..9416d049028 100644
--- a/lisp/mail/rmail.el
+++ b/lisp/mail/rmail.el
@@ -4515,7 +4515,7 @@ encoded string (and the same mask) will decode the string."
      (if (= curmask 0)
          (setq curmask mask))
      (setq charmask (% curmask 256))
-     (setq curmask (lsh curmask -8))
+     (setq curmask (ash curmask -8))
      (aset string-vector i (logxor charmask (aref string-vector i)))
      (setq i (1+ i)))
    (concat string-vector)))
diff --git a/lisp/mail/uudecode.el b/lisp/mail/uudecode.el
index 0cdceca6ff5..b8f74e3a839 100644
--- a/lisp/mail/uudecode.el
+++ b/lisp/mail/uudecode.el
@@ -171,12 +171,12 @@ If FILE-NAME is non-nil, save the result to FILE-NAME."
               (cond ((= counter 4)
                      (setq result (cons
                                    (concat
-                                    (char-to-string (lsh bits -16))
-                                    (char-to-string (logand (lsh bits -8) 255))
+                                    (char-to-string (ash bits -16))
+                                    (char-to-string (logand (ash bits -8) 255))
                                     (char-to-string (logand bits 255)))
                                    result))
                      (setq bits 0 counter 0))
-                    (t (setq bits (lsh bits 6)))))))
+                    (t (setq bits (ash bits 6)))))))
           (cond
            (done)
            ((> 0 remain)
@@ -188,12 +188,12 @@ If FILE-NAME is non-nil, save the result to FILE-NAME."
            ((= counter 3)
             (setq result (cons
                           (concat
-                           (char-to-string (logand (lsh bits -16) 255))
-                           (char-to-string (logand (lsh bits -8) 255)))
+                           (char-to-string (logand (ash bits -16) 255))
+                           (char-to-string (logand (ash bits -8) 255)))
                           result)))
            ((= counter 2)
             (setq result (cons
-                          (char-to-string (logand (lsh bits -10) 255))
+                          (char-to-string (logand (ash bits -10) 255))
                           result))))
           (skip-chars-forward non-data-chars end))
         (if file-name