Make with-sqlite-transaction mode code efficient

* lisp/sqlite.el (with-sqlite-transaction): Rewrite to only
include BODY once.

diff --git a/lisp/sqlite.el b/lisp/sqlite.el
index dccdda16ac09be13d09a5c026babce0a17d02489..6d32a0468f3dc3cb416e8a3e227c36ad6738aee8 100644 (file)
--- a/lisp/sqlite.el
+++ b/lisp/sqlite.el
@@ -26,16 +26,17 @@
 (defmacro with-sqlite-transaction (db &rest body)
   "Execute BODY while holding a transaction for DB."
   (declare (indent 1) (debug (form body)))
-  (let ((db-var (gensym)))
-    `(let ((,db-var ,db))
+  (let ((db-var (gensym))
+        (func-var (gensym)))
+    `(let ((,db-var ,db)
+           (,func-var (lambda () ,@body)))
        (if (sqlite-available-p)
            (unwind-protect
                (progn
                  (sqlite-transaction ,db-var)
-                 ,@body)
+                 (funcall ,func-var))
              (sqlite-commit ,db-var))
-         (progn
-           ,@body)))))
+         (funcall ,func-var)))))
 
 (provide 'sqlite)