3 files changed, 25 insertions, 25 deletions

diff --git a/lisp/term/common-win.el b/lisp/term/common-win.el
index 6ef686a996f..a482067ef39 100644
--- a/lisp/term/common-win.el
+++ b/lisp/term/common-win.el
@@ -59,20 +59,20 @@
         (setq system-key-alist
               (list
                ;; These are special "keys" used to pass events from C to lisp.
-               (cons (logior (lsh 0 16)   1) 'ns-power-off)
-               (cons (logior (lsh 0 16)   2) 'ns-open-file)
-               (cons (logior (lsh 0 16)   3) 'ns-open-temp-file)
-               (cons (logior (lsh 0 16)   4) 'ns-drag-file)
-               (cons (logior (lsh 0 16)   5) 'ns-drag-color)
-               (cons (logior (lsh 0 16)   6) 'ns-drag-text)
-               (cons (logior (lsh 0 16)   7) 'ns-change-font)
-               (cons (logior (lsh 0 16)   8) 'ns-open-file-line)
-;;;            (cons (logior (lsh 0 16)   9) 'ns-insert-working-text)
-;;;            (cons (logior (lsh 0 16)  10) 'ns-delete-working-text)
-               (cons (logior (lsh 0 16)  11) 'ns-spi-service-call)
-               (cons (logior (lsh 0 16)  12) 'ns-new-frame)
-               (cons (logior (lsh 0 16)  13) 'ns-toggle-toolbar)
-               (cons (logior (lsh 0 16)  14) 'ns-show-prefs)
+               (cons  1 'ns-power-off)
+               (cons  2 'ns-open-file)
+               (cons  3 'ns-open-temp-file)
+               (cons  4 'ns-drag-file)
+               (cons  5 'ns-drag-color)
+               (cons  6 'ns-drag-text)
+               (cons  7 'ns-change-font)
+               (cons  8 'ns-open-file-line)
+;;;            (cons  9 'ns-insert-working-text)
+;;;            (cons 10 'ns-delete-working-text)
+               (cons 11 'ns-spi-service-call)
+               (cons 12 'ns-new-frame)
+               (cons 13 'ns-toggle-toolbar)
+               (cons 14 'ns-show-prefs)
                ))))
     (set-terminal-parameter frame 'x-setup-function-keys t)))
 
diff --git a/lisp/term/tty-colors.el b/lisp/term/tty-colors.el
index a776c830a25..d9b272693b0 100644
--- a/lisp/term/tty-colors.el
+++ b/lisp/term/tty-colors.el
@@ -830,10 +830,10 @@ DISPLAY can be a display name or a frame, and defaults to the
 selected frame's display.
 If DISPLAY is not on a 24-but TTY terminal, return nil."
   (when (and rgb (= (display-color-cells display) 16777216))
-    (let ((r (lsh (car rgb) -8))
-          (g (lsh (cadr rgb) -8))
-          (b (lsh (nth 2 rgb) -8)))
-      (logior (lsh r 16) (lsh g 8) b))))
+    (let ((r (ash (car rgb) -8))
+          (g (ash (cadr rgb) -8))
+          (b (ash (nth 2 rgb) -8)))
+      (logior (ash r 16) (ash g 8) b))))
 
 (defun tty-color-define (name index &optional rgb frame)
   "Specify a tty color by its NAME, terminal INDEX and RGB values.
@@ -895,9 +895,9 @@ FRAME defaults to the selected frame."
         ;; never consider it for approximating another color.
         (if try-rgb
             (progn
-              (setq try-r (lsh (car try-rgb) -8)
-                    try-g (lsh (cadr try-rgb) -8)
-                    try-b (lsh (nth 2 try-rgb) -8))
+              (setq try-r (ash (car try-rgb) -8)
+                    try-g (ash (cadr try-rgb) -8)
+                    try-b (ash (nth 2 try-rgb) -8))
               (setq dif-r (- r try-r)
                     dif-g (- g try-g)
                     dif-b (- b try-b))
@@ -938,13 +938,13 @@ should be the same regardless of what display is being used."
                   (i2 (+ i1 ndig))
                   (i3 (+ i2 ndig)))
              (list
-              (lsh
+              (ash
                (string-to-number (substring color i1 i2) 16)
                (* 4 (- 4 ndig)))
-              (lsh
+              (ash
                (string-to-number (substring color i2 i3) 16)
                (* 4 (- 4 ndig)))
-              (lsh
+              (ash
                (string-to-number (substring color i3) 16)
                (* 4 (- 4 ndig))))))
           ((and (>= len 9) ;; X-style RGB:xx/yy/zz color spec
diff --git a/lisp/term/xterm.el b/lisp/term/xterm.el
index ce4e18efff8..00747afbdce 100644
--- a/lisp/term/xterm.el
+++ b/lisp/term/xterm.el
@@ -1009,7 +1009,7 @@ hitting screen's max DCS length."
 
 (defun xterm-rgb-convert-to-16bit (prim)
   "Convert an 8-bit primary color value PRIM to a corresponding 16-bit value."
-  (logior prim (lsh prim 8)))
+  (logior prim (ash prim 8)))
 
 (defun xterm-register-default-colors (colors)
   "Register the default set of colors for xterm or compatible emulator.