From: Stefan Kangas <stefankangas@gmail.com>
Date: Sun, 23 Feb 2025 23:55:16 +0000 (+0100)
Subject: Use cl-with-gensyms in with-sqlite-transaction
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=a7fabe1c983519adc93c68fe71f430f488be0098;p=emacs.git

Use cl-with-gensyms in with-sqlite-transaction

* lisp/sqlite.el (cl-lib): Require at compile-time.
(with-sqlite-transaction): Use cl-with-gensyms.

(cherry picked from commit 637c73d3a804f7e64736b87994e8974892529b00)
---

diff --git a/lisp/sqlite.el b/lisp/sqlite.el
index 140b79ced0a..f4840d46f07 100644
--- a/lisp/sqlite.el
+++ b/lisp/sqlite.el
@@ -23,6 +23,8 @@
 
 ;;; Code:
 
+(eval-when-compile (require 'cl-lib))
+
 (declare-function sqlite-transaction "sqlite.c")
 (declare-function sqlite-commit "sqlite.c")
 (declare-function sqlite-rollback "sqlite.c")
@@ -35,10 +37,7 @@ If BODY signals an error, or transaction commit fails, roll
 back the transaction changes before allowing the signal to
 propagate."
   (declare (indent 1) (debug (form body)))
-  (let ((db-var (gensym))
-        (func-var (gensym))
-        (res-var (gensym))
-        (commit-var (gensym)))
+  (cl-with-gensyms (db-var func-var res-var commit-var)
     `(let ((,db-var ,db)
            (,func-var (lambda () ,@body))
            ,res-var ,commit-var)