Use `ash` instead of `lsh`

* lisp/files.el (file-modes-number-to-symbolic):
* lisp/image/exif.el (exif--direct-ascii-value):
* lisp/term/haiku-win.el (defun):
* lisp/x-dnd.el (x-dnd-handle-xdnd, x-dnd-handle-motif):
`lsh` is slower and has confusing semantics; avoid.

diff --git a/lisp/files.el b/lisp/files.el
index 25b584236495f8213fcae17a61d29f53a61d79f4..bc74dfa7381467dd0f9a0df7ac0dcf833b5338f3 100644 (file)
--- a/lisp/files.el
+++ b/lisp/files.el
@@ -8337,7 +8337,7 @@ such as `?d' for a directory, or `?l' for a symbolic link and will override
 the leading `-' char."
   (string
    (or filetype
-       (pcase (lsh mode -12)
+       (pcase (ash mode -12)
          ;; POSIX specifies that the file type is included in st_mode
          ;; and provides names for the file types but values only for
          ;; the permissions (e.g., S_IWOTH=2).

diff --git a/lisp/image/exif.el b/lisp/image/exif.el
index fd4673dc1b6cd675ef611e6a5e0f2b9ffcd3a497..b25968af53682af46146e09ae5171c0ef26bc2b8 100644 (file)
--- a/lisp/image/exif.el
+++ b/lisp/image/exif.el
@@ -261,9 +261,9 @@ VALUE is an integer representing BYTES characters."
     (set-buffer-multibyte nil)
     (if le
         (dotimes (i bytes)
-          (insert (logand (lsh value (* i -8)) 255)))
+          (insert (logand (ash value (* i -8)) 255)))
       (dotimes (i bytes)
-        (insert (logand (lsh value (* (- (1- bytes) i) -8)) 255))))
+        (insert (logand (ash value (* (- (1- bytes) i) -8)) 255))))
     (insert 0)
     (buffer-string)))
 

diff --git a/lisp/term/haiku-win.el b/lisp/term/haiku-win.el
index abcef773180b735abcb3b9cb0b8a5c53e678f19d..ec1e2f384a9d7db757d9d625e71a63992390354b 100644 (file)
--- a/lisp/term/haiku-win.el
+++ b/lisp/term/haiku-win.el
@@ -188,7 +188,7 @@ VALUE as a unibyte string, or nil if VALUE was not a string."
                           (error "Out of range octet: %d" octet))
                         (setq value
                               (logior value
-                                      (lsh octet
+                                      (ash octet
                                            (- (* (1- (length string)) 8)
                                               offset))))
                         (setq offset (+ offset 8))))

diff --git a/lisp/x-dnd.el b/lisp/x-dnd.el
index 62a5bbdfc3dde4f5e5887359ededbe1fbcd16e0c..a06563946c65e22bda4e786855302b3776040148 100644 (file)
--- a/lisp/x-dnd.el
+++ b/lisp/x-dnd.el
@@ -825,8 +825,8 @@ MESSAGE is the type of the ClientMessage that was sent."
            (when (windowp (posn-window (event-start event)))
              (let ((flags (aref data 1))
                    (version (aref state 6)))
-               (when (not (zerop (logand (lsh flags -10) 1)))
-                 (let* ((button (+ 4 (logand (lsh flags -8) #x3)))
+               (when (not (zerop (logand (ash flags -10) 1)))
+                 (let* ((button (+ 4 (logand (ash flags -8) #x3)))
                         (count (or (and (>= version 1)
                                         (x-dnd-note-click button
                                                           (aref data 3)))
@@ -1086,7 +1086,7 @@ Return a vector of atoms containing the selection targets."
 (defun x-dnd-handle-motif (event frame window _message-atom _format data)
   (let* ((message-type (cdr (assoc (logand (aref data 0) #x3f)
                                    x-dnd-motif-message-types)))
-         (initiator-p (eq (lsh (aref data 0) -7) 0))
+         (initiator-p (eq (ash (aref data 0) -7) 0))
         (source-byteorder (aref data 1))
         (my-byteorder (byteorder))
         (source-flags (x-dnd-get-motif-value data 2 2 source-byteorder))