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.

2 files changed, 14 insertions, 14 deletions

diff --git a/lisp/obsolete/levents.el b/lisp/obsolete/levents.el
index 7fb3be83ee2..48afe7551de 100644
--- a/lisp/obsolete/levents.el
+++ b/lisp/obsolete/levents.el
@@ -145,7 +145,7 @@ It will be the next event read after all pending events."
 The value is an ASCII printing character (not upper case) or a symbol."
   (if (symbolp event)
       (car (get event 'event-symbol-elements))
-    (let ((base (logand event (1- (lsh 1 18)))))
+    (let ((base (logand event (1- (ash 1 18)))))
       (downcase (if (< base 32) (logior base 64) base)))))
 
 (defun event-object (event)
diff --git a/lisp/obsolete/pgg-parse.el b/lisp/obsolete/pgg-parse.el
index 34ec96ec12c..a7470246492 100644
--- a/lisp/obsolete/pgg-parse.el
+++ b/lisp/obsolete/pgg-parse.el
@@ -116,9 +116,9 @@
   )
 
 (defmacro pgg-parse-time-field (bytes)
-  `(list (logior (lsh (car ,bytes) 8)
+  `(list (logior (ash (car ,bytes) 8)
                  (nth 1 ,bytes))
-         (logior (lsh (nth 2 ,bytes) 8)
+         (logior (ash (nth 2 ,bytes) 8)
                  (nth 3 ,bytes))
          0))
 
@@ -184,21 +184,21 @@
       (ccl-execute-on-string pgg-parse-crc24 h string)
       (format "%c%c%c"
               (logand (aref h 1) 255)
-              (logand (lsh (aref h 2) -8) 255)
+              (logand (ash (aref h 2) -8) 255)
               (logand (aref h 2) 255)))))
 
 (defmacro pgg-parse-length-type (c)
   `(cond
     ((< ,c 192) (cons ,c 1))
     ((< ,c 224)
-     (cons (+ (lsh (- ,c 192) 8)
+     (cons (+ (ash (- ,c 192) 8)
               (pgg-byte-after (+ 2 (point)))
               192)
            2))
     ((= ,c 255)
-     (cons (cons (logior (lsh (pgg-byte-after (+ 2 (point))) 8)
+     (cons (cons (logior (ash (pgg-byte-after (+ 2 (point))) 8)
                          (pgg-byte-after (+ 3 (point))))
-                 (logior (lsh (pgg-byte-after (+ 4 (point))) 8)
+                 (logior (ash (pgg-byte-after (+ 4 (point))) 8)
                          (pgg-byte-after (+ 5 (point)))))
            5))
     (t;partial body length
@@ -210,13 +210,13 @@
     (if (zerop (logand 64 ptag));Old format
         (progn
           (setq length-type (logand ptag 3)
-                length-type (if (= 3 length-type) 0 (lsh 1 length-type))
-                content-tag (logand 15 (lsh ptag -2))
+                length-type (if (= 3 length-type) 0 (ash 1 length-type))
+                content-tag (logand 15 (ash ptag -2))
                 packet-bytes 0
                 header-bytes (1+ length-type))
           (dotimes (i length-type)
             (setq packet-bytes
-                  (logior (lsh packet-bytes 8)
+                  (logior (ash packet-bytes 8)
                           (pgg-byte-after (+ 1 i (point)))))))
       (setq content-tag (logand 63 ptag)
             length-type (pgg-parse-length-type
@@ -317,10 +317,10 @@
            (let ((name-bytes (pgg-read-bytes 2))
                  (value-bytes (pgg-read-bytes 2)))
              (cons (pgg-read-bytes-string
-                    (logior (lsh (car name-bytes) 8)
+                    (logior (ash (car name-bytes) 8)
                             (nth 1 name-bytes)))
                    (pgg-read-bytes-string
-                    (logior (lsh (car value-bytes) 8)
+                    (logior (ash (car value-bytes) 8)
                             (nth 1 value-bytes)))))))
     (21 ;preferred hash algorithms
      (cons 'preferred-hash-algorithm
@@ -380,7 +380,7 @@
       (pgg-set-alist result
                      'hash-algorithm (pgg-read-byte))
       (when (>= 10000 (setq n (pgg-read-bytes 2)
-                            n (logior (lsh (car n) 8)
+                            n (logior (ash (car n) 8)
                                       (nth 1 n))))
         (save-restriction
           (narrow-to-region (point)(+ n (point)))
@@ -391,7 +391,7 @@
                           #'pgg-parse-signature-subpacket)))
           (goto-char (point-max))))
       (when (>= 10000 (setq n (pgg-read-bytes 2)
-                            n (logior (lsh (car n) 8)
+                            n (logior (ash (car n) 8)
                                       (nth 1 n))))
         (save-restriction
           (narrow-to-region (point)(+ n (point)))