Require Compat 31externals/exwm

5 files changed, 17 insertions, 17 deletions

diff --git a/exwm-core.el b/exwm-core.el
index afecc8d..240a6bf 100644
--- a/exwm-core.el
+++ b/exwm-core.el
@@ -130,8 +130,8 @@ FORMAT-STRING is a string specifying the message to output, as in
         (let* ((window (window-normalize-window window t))
                (edges (window-inside-absolute-pixel-edges window))
                (tab-line-height (window-tab-line-height window)))
-          (cl-incf (elt edges 1) tab-line-height)
-          (cl-incf (elt edges 3) tab-line-height)
+          (incf (elt edges 1) tab-line-height)
+          (incf (elt edges 3) tab-line-height)
           edges))
     #'window-inside-absolute-pixel-edges)
   "A fixed implementation of `window-inside-absolute-pixel-edges'.
@@ -143,8 +143,8 @@ This version correctly handles tab-lines on Emacs prior to v31.1.")
         (let* ((window (window-normalize-window window t))
                (edges (window-inside-pixel-edges window))
                (tab-line-height (window-tab-line-height window)))
-          (cl-incf (elt edges 1) tab-line-height)
-          (cl-incf (elt edges 3) tab-line-height)
+          (incf (elt edges 1) tab-line-height)
+          (incf (elt edges 3) tab-line-height)
           edges))
     #'window-inside-pixel-edges)
   "A fixed implementation of `window-inside-pixel-edges'.
diff --git a/exwm-layout.el b/exwm-layout.el
index 0e72f1b..a789527 100644
--- a/exwm-layout.el
+++ b/exwm-layout.el
@@ -452,13 +452,13 @@ windows."
            (margin (- width inner-width)))
       (if (> delta 0)
           (if (not exwm--normal-hints-max-width)
-              (cl-incf width delta)
+              (incf width delta)
             (if (>= inner-width exwm--normal-hints-max-width)
                 (setq width nil)
               (setq width (min (+ exwm--normal-hints-max-width margin)
                                (+ width delta)))))
         (if (not exwm--normal-hints-min-width)
-            (cl-incf width delta)
+            (incf width delta)
           (if (<= inner-width exwm--normal-hints-min-width)
               (setq width nil)
             (setq width (max (+ exwm--normal-hints-min-width margin)
@@ -485,13 +485,13 @@ windows."
            (margin (- height inner-height)))
       (if (> delta 0)
           (if (not exwm--normal-hints-max-height)
-              (cl-incf height delta)
+              (incf height delta)
             (if (>= inner-height exwm--normal-hints-max-height)
                 (setq height nil)
               (setq height (min (+ exwm--normal-hints-max-height margin)
                                 (+ height delta)))))
         (if (not exwm--normal-hints-min-height)
-            (cl-incf height delta)
+            (incf height delta)
           (if (<= inner-height exwm--normal-hints-min-height)
               (setq height nil)
             (setq height (max (+ exwm--normal-hints-min-height margin)
diff --git a/exwm-workspace.el b/exwm-workspace.el
index 1389fd6..5f30229 100644
--- a/exwm-workspace.el
+++ b/exwm-workspace.el
@@ -387,7 +387,7 @@ Show PROMPT to the user if non-nil."
                           (or (not position)
                               (< (max beg y)
                                  (min end (+ y height)))))
-                 (cl-decf width delta)
+                 (decf width delta)
                  (setf x size)))
               ('right
                (setq delta (- size (- root-width x width)))
@@ -396,7 +396,7 @@ Show PROMPT to the user if non-nil."
                           (or (not position)
                               (< (max beg y)
                                  (min end (+ y height)))))
-                 (cl-decf width delta)))
+                 (decf width delta)))
               ('top
                (setq delta (- size y))
                (when (and (< 0 delta)
@@ -404,7 +404,7 @@ Show PROMPT to the user if non-nil."
                           (or (not position)
                               (< (max beg x)
                                  (min end (+ x width)))))
-                 (cl-decf height delta)
+                 (decf height delta)
                  (setf y size)))
               ('bottom
                (setq delta (- size (- root-height y height)))
@@ -413,7 +413,7 @@ Show PROMPT to the user if non-nil."
                           (or (not position)
                               (< (max beg x)
                                  (min end (+ x width)))))
-                 (cl-decf height delta))))))))
+                 (decf height delta))))))))
     ;; Save the result.
     (setq exwm-workspace--workareas workareas)
     (xcb:flush exwm--connection))
@@ -453,7 +453,7 @@ ACTIVE indicates whether to set the frame active or inactive."
       (xcb:flush exwm--connection)))
   ;; This is only used for workspace initialization.
   (when exwm-workspace--fullscreen-frame-count
-    (cl-incf exwm-workspace--fullscreen-frame-count)))
+    (incf exwm-workspace--fullscreen-frame-count)))
 
 (defun exwm-workspace--resize-minibuffer-frame ()
   "Resize minibuffer (and its container) to fit the size of workspace."
@@ -1027,7 +1027,7 @@ INDEX must not exceed the current number of workspaces."
     (while (and (setq tmp (or (get-buffer newname)
                               (get-buffer (concat " " newname))))
                 (not (eq tmp (current-buffer))))
-      (setq newname (format "%s<%d>" basename (cl-incf counter))))
+      (setq newname (format "%s<%d>" basename (incf counter))))
     (let ((buffer-list-update-hook
            (remq #'exwm-input--on-buffer-list-update
                  buffer-list-update-hook)))
diff --git a/exwm-xim.el b/exwm-xim.el
index 680fd2b..828376e 100644
--- a/exwm-xim.el
+++ b/exwm-xim.el
@@ -623,7 +623,7 @@ the request data or where to fetch the data."
       ;; Send long requests with properties.
       (setq property (exwm--intern-atom (format "_EXWM_XIM_%x"
                                                 exwm-xim--property-index)))
-      (cl-incf exwm-xim--property-index)
+      (incf exwm-xim--property-index)
       (xcb:+request conn
           (make-instance 'xcb:ChangeProperty
                          :mode xcb:PropMode:Append
diff --git a/exwm.el b/exwm.el
index a358300..20584a6 100644
--- a/exwm.el
+++ b/exwm.el
@@ -5,7 +5,7 @@
 ;; Author: Chris Feng <chris.w.feng@gmail.com>
 ;; Maintainer: Adrián Medraño Calvo <adrian@medranocalvo.com>, Steven Allen <steven@stebalien.com>, Daniel Mendler <mail@daniel-mendler.de>
 ;; Version: 0.34
-;; Package-Requires: ((emacs "27.1") (xelb "0.22") (compat "30"))
+;; Package-Requires: ((emacs "27.1") (xelb "0.22") (compat "31"))
 ;; Keywords: unix
 ;; URL: https://github.com/emacs-exwm/exwm
 
@@ -761,7 +761,7 @@ DATA contains unmarshalled PropertyNotify event data."
     (cond ((= type xcb:Atom:_NET_WM_PING)
              (when-let* (((eq id exwm--root))
                          (buf (exwm--id->buffer client)))
-               (cl-incf (buffer-local-value 'exwm--ping buf))))
+               (incf (buffer-local-value 'exwm--ping buf))))
           (t (exwm--log "Unhandled WM_PROTOCOLS of type: %d" type)))))
 
 (defun exwm--on-wm-change-state (id data)