From 475fa73641cc51c72b3c41c0334e62c290b7b2c5 Mon Sep 17 00:00:00 2001
From: Andreas Gerler <baron@bundesbrandschatzamt.de>
Date: Wed, 24 Dec 2025 14:49:56 +0100
Subject: [PATCH] update closql

---
 .../closql-autoloads.el                       |  0
 .../closql-pkg.el                             | 12 +++---
 .../closql.el                                 | 41 ++++++++-----------
 3 files changed, 22 insertions(+), 31 deletions(-)
 rename elpa/{closql-20250301.2221 => closql-20250913.1926}/closql-autoloads.el (100%)
 rename elpa/{closql-20250301.2221 => closql-20250913.1926}/closql-pkg.el (62%)
 rename elpa/{closql-20250301.2221 => closql-20250913.1926}/closql.el (95%)

diff --git a/elpa/closql-20250301.2221/closql-autoloads.el b/elpa/closql-20250913.1926/closql-autoloads.el
similarity index 100%
rename from elpa/closql-20250301.2221/closql-autoloads.el
rename to elpa/closql-20250913.1926/closql-autoloads.el
diff --git a/elpa/closql-20250301.2221/closql-pkg.el b/elpa/closql-20250913.1926/closql-pkg.el
similarity index 62%
rename from elpa/closql-20250301.2221/closql-pkg.el
rename to elpa/closql-20250913.1926/closql-pkg.el
index c312f6c5..cecf4a96 100644
--- a/elpa/closql-20250301.2221/closql-pkg.el
+++ b/elpa/closql-20250913.1926/closql-pkg.el
@@ -1,12 +1,12 @@
 ;; -*- no-byte-compile: t; lexical-binding: nil -*-
-(define-package "closql" "20250301.2221"
+(define-package "closql" "20250913.1926"
   "Store EIEIO objects using EmacSQL."
-  '((emacs   "26.1")
-    (compat  "30.0.2.0")
-    (emacsql "4.2.0"))
+  '((emacs   "28.1")
+    (compat  "30.1")
+    (emacsql "4.3"))
   :url "https://github.com/emacscollective/closql"
-  :commit "dc7924c1d206483a2555a98470c96fadf419f32d"
-  :revdesc "dc7924c1d206"
+  :commit "f5dd024c47b792dac499dac94c906af60044d2ad"
+  :revdesc "f5dd024c47b7"
   :keywords '("extensions")
   :authors '(("Jonas Bernoulli" . "emacs.closql@jonas.bernoulli.dev"))
   :maintainers '(("Jonas Bernoulli" . "emacs.closql@jonas.bernoulli.dev")))
diff --git a/elpa/closql-20250301.2221/closql.el b/elpa/closql-20250913.1926/closql.el
similarity index 95%
rename from elpa/closql-20250301.2221/closql.el
rename to elpa/closql-20250913.1926/closql.el
index a02dfde9..c107e051 100644
--- a/elpa/closql-20250301.2221/closql.el
+++ b/elpa/closql-20250913.1926/closql.el
@@ -6,12 +6,12 @@
 ;; Homepage: https://github.com/emacscollective/closql
 ;; Keywords: extensions
 
-;; Package-Version: 20250301.2221
-;; Package-Revision: dc7924c1d206
+;; Package-Version: 20250913.1926
+;; Package-Revision: f5dd024c47b7
 ;; Package-Requires: (
-;;     (emacs "26.1")
-;;     (compat "30.0.2.0")
-;;     (emacsql "4.2.0"))
+;;     (emacs "28.1")
+;;     (compat "30.1")
+;;     (emacsql "4.3"))
 
 ;; SPDX-License-Identifier: GPL-3.0-or-later
 
@@ -46,10 +46,6 @@
 
 (eval-when-compile (require 'subr-x))
 
-(eval-and-compile
-  (unless (boundp 'eieio--unbound) ; New name since Emacs 28.1.
-    (defvaralias 'eieio--unbound 'eieio-unbound nil)))
-
 (eval-when-compile
   (cl-pushnew 'connection eieio--known-slot-names))
 
@@ -278,7 +274,7 @@
     (:after (cname _superclasses slots _options) closql-object)
   "Handle additional slot properties used by `closql-object' derived classes."
   (when-let* ((class (cl--find-class cname))
-              ((child-of-class-p class 'closql-object)))
+              (_(child-of-class-p class 'closql-object)))
     (pcase-dolist (`(,name . ,slot) slots)
       (let ((desc (cl-find name
                            (cl-coerce (eieio--class-slots class) 'list)
@@ -399,11 +395,7 @@
                (pcase-let ((`(,class ,_db . ,values)
                             (closql--intern-unbound
                              (closql--coerce obj 'list))))
-                 (vconcat (cons (closql--abbrev-class
-                                 (if (eieio--class-p class)    ; see 7db24ab
-                                     (eieio--class-name class) ; Emacs 26
-                                   class))                     ; Emacs 27+
-                                values))))
+                 (vconcat (cons (closql--abbrev-class class) values))))
       (pcase-dolist (`(,slot . ,value) alist)
         (closql-dset obj slot value))))
   obj)
@@ -592,16 +584,15 @@
 
 (cl-defmethod closql--list-subabbrevs ((class (subclass closql-object))
                                        &optional wildcards)
-  (cl-labels
-      ((types (class)
-         (let ((children (eieio--class-children (cl--find-class class)))
-               ;; An abstract base-class may violate its own naming rules.
-               (abbrev (ignore-errors (closql--abbrev-class class))))
-           (nconc (and (not (class-abstract-p class)) (list abbrev))
-                  (and wildcards children
-                       (list (if abbrev (intern (format "%s*" abbrev)) '*)))
-                  (mapcan #'types children)))))
-    (sort (types class) #'string<)))
+  (sort (named-let types ((class class))
+          (let ((children (eieio--class-children (cl--find-class class)))
+                ;; An abstract base-class may violate its own naming rules.
+                (abbrev (ignore-errors (closql--abbrev-class class))))
+            (nconc (and (not (class-abstract-p class)) (list abbrev))
+                   (and wildcards children
+                        (list (if abbrev (intern (format "%s*" abbrev)) '*)))
+                   (mapcan #'types children))))
+        #'string<))
 
 (cl-defmethod closql--set-object-class ((db closql-database) obj class)
   (let* ((table (oref-default obj closql-table))
-- 
2.47.3