Require Compat 31externals/xelb

5 files changed, 19 insertions, 17 deletions

diff --git a/xcb-debug.el b/xcb-debug.el
index 9ea19f2..55c0bb1 100644
--- a/xcb-debug.el
+++ b/xcb-debug.el
@@ -25,6 +25,8 @@
 
 ;;; Code:
 
+(require 'compat)
+
 (defvar xcb-debug:buffer "*XELB-DEBUG*" "Buffer to write debug messages to.")
 
 (defvar xcb-debug:backtrace-start-frame 5
@@ -53,7 +55,7 @@ Here are some predefined candidates:
         (index xcb-debug:backtrace-start-frame))
     (while (setq frame (backtrace-frame index))
       (push frame frames)
-      (cl-incf index))
+      (incf index))
     (cl-remove-if-not 'car frames)))
 
 (defmacro xcb-debug:compile-time-function-name ()
diff --git a/xcb-keysyms.el b/xcb-keysyms.el
index bd88726..7eef85e 100644
--- a/xcb-keysyms.el
+++ b/xcb-keysyms.el
@@ -355,7 +355,7 @@ FIRST-KEYCODE and COUNT specify the keycode range to update."
                 (`kp-numlock
                  (setq xcb:keysyms:num-lock-mask
                        (logior xcb:keysyms:num-lock-mask mask))))))
-          (cl-incf col)))))
+          (incf col)))))
   ;; Meta fallbacks to Alt.
   (unless (/= 0 xcb:keysyms:meta-mask)
     (setq xcb:keysyms:meta-mask xcb:keysyms:alt-mask
@@ -427,7 +427,7 @@ keycode.  The caller is responsible for checking which modifiers to use."
                 (with-slots (active (mods-mask* mods-mask) level) entry
                   (when (and (= 1 active)
                              (= (logand modifiers mods-mask) mods-mask*))
-                    (cl-incf index level)
+                    (incf index level)
                     (when (= 1 hasPreserve)
                       (setq preserve (slot-value (elt preserve*
                                                       (cl-position entry map))
@@ -457,7 +457,7 @@ Return 0 if conversion fails."
                 (setq continue t)
                 (when (= keysym (elt syms index))
                   (throw 'break (+ i min-keycode))))))
-          (cl-incf index))
+          (incf index))
         0))))
 
 ;; This list is largely base on 'lispy_function_keys' in 'keyboard.c'.
diff --git a/xcb-renderutil.el b/xcb-renderutil.el
index 9cdeec4..b34d453 100644
--- a/xcb-renderutil.el
+++ b/xcb-renderutil.el
@@ -266,7 +266,7 @@ Return COUNT-th match."
                    t))
         (when (= count 0)
           (throw 'return (slot-value f 'id))
-          (cl-decf count))))))
+          (decf count))))))
 
 (defun xcb:renderutil:find-standard (formats format)
   "Search FORMATS for a standard format matching format ID FORMAT."
diff --git a/xcb.el b/xcb.el
index 676f3f5..7081254 100644
--- a/xcb.el
+++ b/xcb.el
@@ -289,7 +289,7 @@ The result would be 29 or 61 bits, depending on the machine."
                             sequence16)))
       ;; `xcb:-cache-request' ensures sequence number never wraps.
       (when (> sequence request-sequence)
-        (cl-decf sequence #x10000))
+        (decf sequence #x10000))
       sequence)))
 
 (defun xcb:-connection-filter (process message)
@@ -416,7 +416,7 @@ Concurrency is disabled as it breaks the orders of errors, replies and events."
   "Process cached events."
   (with-slots (event-lock event-queue) conn
     (unless (< 0 event-lock)
-      (cl-incf event-lock)
+      (incf event-lock)
       (unwind-protect
           (let (event data synthetic)
             (while (setq event (pop event-queue))
@@ -425,7 +425,7 @@ Concurrency is disabled as it breaks the orders of errors, replies and events."
               (dolist (listener (aref event 0))
                 (xcb-debug:backtrace-on-error
                  (funcall listener data synthetic)))))
-        (cl-decf event-lock)))))
+        (decf event-lock)))))
 
 (cl-defmethod xcb:disconnect ((obj xcb:connection))
   "Disconnect from X server."
@@ -479,11 +479,11 @@ classes of EVENT (since they have the same event number)."
   (let ((cache (slot-value obj 'request-cache)))
     (when (< 0 (length cache))
       (setf (slot-value obj 'request-cache) []) ;should be cleared ASAP
-      (cl-incf (slot-value obj 'event-lock))
+      (incf (slot-value obj 'event-lock))
       (unwind-protect
           (process-send-string (slot-value obj 'process)
                                (apply #'unibyte-string (append cache nil)))
-        (cl-decf (slot-value obj 'event-lock)))
+        (decf (slot-value obj 'event-lock)))
       (xcb:-process-events obj))))
 
 (cl-defmethod xcb:get-extension-data ((obj xcb:connection) namespace)
@@ -556,10 +556,10 @@ classes of EVENT (since they have the same event number)."
          (cache (slot-value obj 'request-cache)))
     (when extension-opcode
       (setq msg (vconcat (vector extension-opcode) msg))
-      (cl-incf len))
+      (incf len))
     (when (> 2 (length msg))   ;for short message (e.g. GetInputFocus)
       (setq msg (vconcat msg [0]))
-      (cl-incf len))
+      (incf len))
     (setq msg
           (vconcat (substring msg 0 2)
                    (funcall (if (slot-value request '~lsb) #'xcb:-pack-u2-lsb
@@ -640,14 +640,14 @@ Otherwise no error will ever be reported."
     ;; Single reply
     (let ((process (slot-value obj 'process)))
       ;; Wait until the request processed
-      (cl-incf (slot-value obj 'event-lock))
+      (incf (slot-value obj 'event-lock))
       (unwind-protect
           (with-timeout (xcb:connection-timeout
                          (warn "[XELB] Retrieve reply timeout"))
             (while (and (> sequence (slot-value obj 'last-seen-sequence))
                         (<= sequence (slot-value obj 'request-sequence)))
               (accept-process-output process 1 nil 1)))
-        (cl-decf (slot-value obj 'event-lock)))
+        (decf (slot-value obj 'event-lock)))
       (xcb:-process-events obj)))
   (let* ((reply-plist (slot-value obj 'reply-plist))
          (reply-data (plist-get reply-plist sequence))
@@ -746,14 +746,14 @@ Sync by sending a GetInputFocus request and waiting until it's processed."
         (process (slot-value obj 'process)))
     (xcb:flush obj)
     ;; Wait until request processed
-    (cl-incf (slot-value obj 'event-lock))
+    (incf (slot-value obj 'event-lock))
     (unwind-protect
         (with-timeout (xcb:connection-timeout (warn "[XELB] Sync timeout"))
           (while (and (> sequence (slot-value obj 'last-seen-sequence))
                       ;; In case the sequence number has been wrapped.
                       (<= sequence (slot-value obj 'request-sequence)))
             (accept-process-output process 1 nil 1)))
-      (cl-decf (slot-value obj 'event-lock)))
+      (decf (slot-value obj 'event-lock)))
     (xcb:-process-events obj)
     ;; Discard any reply or error.
     (cl-remf (slot-value obj 'reply-plist) sequence)
diff --git a/xelb.el b/xelb.el
index fea9304..a820ef4 100644
--- a/xelb.el
+++ b/xelb.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.22
-;; Package-Requires: ((emacs "27.1") (compat "30"))
+;; Package-Requires: ((emacs "27.1") (compat "31"))
 ;; Keywords: unix
 ;; URL: https://github.com/emacs-exwm/xelb