; Follows up

3 files changed, 69 insertions, 69 deletions

diff --git a/exwm-floating.el b/exwm-floating.el
index 7ac2c2714b35..c478e75c77a3 100644
--- a/exwm-floating.el
+++ b/exwm-floating.el
@@ -486,91 +486,91 @@ This is also used by X window containers.")
           (cond ((= type xcb:ewmh:_NET_WM_MOVERESIZE_MOVE)
                  (setq cursor exwm-floating--cursor-move
                        exwm-floating--moveresize-calculate
-                       `(lambda (x y)
-                          (vector ,buffer-or-id
-                                  ,(eval-when-compile
-                                     (logior xcb:ConfigWindow:X
-                                             xcb:ConfigWindow:Y))
-                                  (- x ,win-x) (- y ,win-y) 0 0))))
+                       (lambda (x y)
+                         (vector buffer-or-id
+                                 (eval-when-compile
+                                   (logior xcb:ConfigWindow:X
+                                           xcb:ConfigWindow:Y))
+                                 (- x win-x) (- y win-y) 0 0))))
                 ((= type xcb:ewmh:_NET_WM_MOVERESIZE_SIZE_TOPLEFT)
                  (setq cursor exwm-floating--cursor-top-left
                        exwm-floating--moveresize-calculate
-                       `(lambda (x y)
-                          (vector ,buffer-or-id
-                                  ,(eval-when-compile
-                                     (logior xcb:ConfigWindow:X
-                                             xcb:ConfigWindow:Y
-                                             xcb:ConfigWindow:Width
-                                             xcb:ConfigWindow:Height))
-                                  (- x ,win-x) (- y ,win-y)
-                                  (- ,(+ root-x width) x)
-                                  (- ,(+ root-y height) y)))))
+                       (lambda (x y)
+                         (vector buffer-or-id
+                                 (eval-when-compile
+                                   (logior xcb:ConfigWindow:X
+                                           xcb:ConfigWindow:Y
+                                           xcb:ConfigWindow:Width
+                                           xcb:ConfigWindow:Height))
+                                 (- x win-x) (- y win-y)
+                                 (- (+ root-x width) x)
+                                 (- (+ root-y height) y)))))
                 ((= type xcb:ewmh:_NET_WM_MOVERESIZE_SIZE_TOP)
                  (setq cursor exwm-floating--cursor-top
                        exwm-floating--moveresize-calculate
-                       `(lambda (x y)
-                          (vector ,buffer-or-id
-                                  ,(eval-when-compile
-                                     (logior xcb:ConfigWindow:Y
-                                             xcb:ConfigWindow:Height))
-                                  0 (- y ,win-y) 0 (- ,(+ root-y height) y)))))
+                       (lambda (_x y)
+                         (vector buffer-or-id
+                                 (eval-when-compile
+                                   (logior xcb:ConfigWindow:Y
+                                           xcb:ConfigWindow:Height))
+                                 0 (- y win-y) 0 (- (+ root-y height) y)))))
                 ((= type xcb:ewmh:_NET_WM_MOVERESIZE_SIZE_TOPRIGHT)
                  (setq cursor exwm-floating--cursor-top-right
                        exwm-floating--moveresize-calculate
-                       `(lambda (x y)
-                          (vector ,buffer-or-id
-                                  ,(eval-when-compile
-                                     (logior xcb:ConfigWindow:Y
-                                             xcb:ConfigWindow:Width
-                                             xcb:ConfigWindow:Height))
-                                  0 (- y ,win-y) (- x ,(- root-x width))
-                                  (- ,(+ root-y height) y)))))
+                       (lambda (x y)
+                         (vector buffer-or-id
+                                 (eval-when-compile
+                                   (logior xcb:ConfigWindow:Y
+                                           xcb:ConfigWindow:Width
+                                           xcb:ConfigWindow:Height))
+                                 0 (- y win-y) (- x (- root-x width))
+                                 (- (+ root-y height) y)))))
                 ((= type xcb:ewmh:_NET_WM_MOVERESIZE_SIZE_RIGHT)
                  (setq cursor exwm-floating--cursor-right
                        exwm-floating--moveresize-calculate
-                       `(lambda (x y)
-                          (vector ,buffer-or-id
-                                  ,xcb:ConfigWindow:Width
-                                  0 0 (- x ,(- root-x width)) 0))))
+                       (lambda (x _y)
+                         (vector buffer-or-id
+                                 xcb:ConfigWindow:Width
+                                 0 0 (- x (- root-x width)) 0))))
                 ((= type xcb:ewmh:_NET_WM_MOVERESIZE_SIZE_BOTTOMRIGHT)
                  (setq cursor exwm-floating--cursor-bottom-right
                        exwm-floating--moveresize-calculate
-                       `(lambda (x y)
-                          (vector ,buffer-or-id
-                                  ,(eval-when-compile
-                                     (logior xcb:ConfigWindow:Width
-                                             xcb:ConfigWindow:Height))
-                                  0 0 (- x ,(- root-x width))
-                                  (- y ,(- root-y height))))))
+                       (lambda (x y)
+                         (vector buffer-or-id
+                                 (eval-when-compile
+                                   (logior xcb:ConfigWindow:Width
+                                           xcb:ConfigWindow:Height))
+                                 0 0 (- x (- root-x width))
+                                 (- y (- root-y height))))))
                 ((= type xcb:ewmh:_NET_WM_MOVERESIZE_SIZE_BOTTOM)
                  (setq cursor exwm-floating--cursor-bottom
                        exwm-floating--moveresize-calculate
-                       `(lambda (x y)
-                          (vector ,buffer-or-id
-                                  ,xcb:ConfigWindow:Height
-                                  0 0 0 (- y ,(- root-y height))))))
+                       (lambda (_x y)
+                         (vector buffer-or-id
+                                 xcb:ConfigWindow:Height
+                                 0 0 0 (- y (- root-y height))))))
                 ((= type xcb:ewmh:_NET_WM_MOVERESIZE_SIZE_BOTTOMLEFT)
                  (setq cursor exwm-floating--cursor-bottom-left
                        exwm-floating--moveresize-calculate
-                       `(lambda (x y)
-                          (vector ,buffer-or-id
-                                  ,(eval-when-compile
-                                     (logior xcb:ConfigWindow:X
-                                             xcb:ConfigWindow:Width
-                                             xcb:ConfigWindow:Height))
-                                  (- x ,win-x)
-                                  0
-                                  (- ,(+ root-x width) x)
-                                  (- y ,(- root-y height))))))
+                       (lambda (x y)
+                         (vector buffer-or-id
+                                 (eval-when-compile
+                                   (logior xcb:ConfigWindow:X
+                                           xcb:ConfigWindow:Width
+                                           xcb:ConfigWindow:Height))
+                                 (- x win-x)
+                                 0
+                                 (- (+ root-x width) x)
+                                 (- y (- root-y height))))))
                 ((= type xcb:ewmh:_NET_WM_MOVERESIZE_SIZE_LEFT)
                  (setq cursor exwm-floating--cursor-left
                        exwm-floating--moveresize-calculate
-                       `(lambda (x y)
-                          (vector ,buffer-or-id
-                                  ,(eval-when-compile
-                                     (logior xcb:ConfigWindow:X
-                                             xcb:ConfigWindow:Width))
-                                  (- x ,win-x) 0 (- ,(+ root-x width) x) 0)))))
+                       (lambda (x _y)
+                         (vector buffer-or-id
+                                 (eval-when-compile
+                                   (logior xcb:ConfigWindow:X
+                                           xcb:ConfigWindow:Width))
+                                 (- x win-x) 0 (- (+ root-x width) x) 0)))))
           ;; Select events and change cursor (should always succeed)
           (xcb:+request-unchecked+reply exwm--connection
               (make-instance 'xcb:GrabPointer
diff --git a/exwm-input.el b/exwm-input.el
index 9b9816e9753b..eeea36e5a256 100644
--- a/exwm-input.el
+++ b/exwm-input.el
@@ -720,15 +720,15 @@ button event."
       (line-mode
        (setq mode "line"
              help-echo "mouse-1: Switch to char-mode"
-             cmd `(lambda ()
-                    (interactive)
-                    (exwm-input-release-keyboard ,id))))
+             cmd (lambda ()
+                   (interactive)
+                   (exwm-input-release-keyboard id))))
       (char-mode
        (setq mode "char"
              help-echo "mouse-1: Switch to line-mode"
-             cmd `(lambda ()
-                    (interactive)
-                    (exwm-input-grab-keyboard ,id)))))
+             cmd (lambda ()
+                   (interactive)
+                   (exwm-input-grab-keyboard id)))))
     (with-current-buffer (exwm--id->buffer id)
       (setq mode-line-process
             `(": "
diff --git a/exwm-manage.el b/exwm-manage.el
index 5c32284e4732..8f8f6e44b83e 100644
--- a/exwm-manage.el
+++ b/exwm-manage.el
@@ -540,8 +540,8 @@ Would you like to kill it? "
       (signal-process pid 'SIGKILL)
       ;; Ensure it's dead
       (run-with-timer exwm-manage-ping-timeout nil
-                      `(lambda ()
-                         (xcb:+request exwm--connection ,request))))
+                      (lambda ()
+                        (xcb:+request exwm--connection request))))
     (xcb:flush exwm--connection)))
 
 (defun exwm-manage--add-frame (frame)