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)))