branch: elpa/emacsql
commit 770120b674fe1ebd7968bfb3f17871629a4bcd11
Author: Jonas Bernoulli <jo...@bernoul.li>
Commit: Jonas Bernoulli <jo...@bernoul.li>

    Cosmetics
---
 emacsql.el | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/emacsql.el b/emacsql.el
index b59771a383..47d58f310f 100644
--- a/emacsql.el
+++ b/emacsql.el
@@ -132,8 +132,8 @@ MESSAGE should not have a newline on the end."
 
 (defun emacsql-compile (connection sql &rest args)
   "Compile s-expression SQL for CONNECTION into a string."
-  (let* ((mask (and connection (emacsql-types connection)))
-         (emacsql-type-map (or mask emacsql-type-map)))
+  (let ((emacsql-type-map (or (and connection (emacsql-types connection))
+                              emacsql-type-map)))
     (concat (apply #'emacsql-format (emacsql-prepare sql) args) ";")))
 
 (cl-defgeneric emacsql (connection sql &rest args)
@@ -178,10 +178,10 @@ specific error conditions."
     (goto-char (point-min))
     (let* ((standard-input (current-buffer))
            (value (read)))
-      (if (eql value 'error)
+      (if (eq value 'error)
           (emacsql-handle connection (read) (read))
         (prog1 value
-          (unless (eq 'success (read))
+          (unless (eq (read) 'success)
             (emacsql-handle connection (read) (read))))))))
 
 (provide 'emacsql) ; end of generic function declarations
@@ -279,7 +279,7 @@ Each column must be a plain symbol, no expressions allowed 
here."
         (args (and (not (vectorp sql-and-args)) (cdr sql-and-args))))
     (cl-assert (eq :select (elt sql 0)))
     (let ((vars (elt sql 1)))
-      (when (eq '* vars)
+      (when (eq vars '*)
         (error "Must explicitly list columns in `emacsql-with-bind'"))
       (cl-assert (cl-every #'symbolp vars))
       `(let ((emacsql--results (emacsql ,connection ,sql ,@args))

Reply via email to