From ef1d321a157e300d29c48e461257897fca1c9aa4 Mon Sep 17 00:00:00 2001
From: Sean Allred <code@seanallred.com>
Date: Sat, 20 Dec 2014 02:01:52 -0500
Subject: Expand `let-alist' upon `sx-assoc-let' expansion

---
 sx.el | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/sx.el b/sx.el
index 6f4e7c7..97a6d61 100644
--- a/sx.el
+++ b/sx.el
@@ -313,10 +313,11 @@ with a `link' property)."
 If ALIST doesn't have a `site' property, one is created using the
 `link' property."
   (declare (indent 1) (debug t))
+  (require 'let-alist)
   `(progn
-     (require 'let-alist)
      (sx--ensure-site ,alist)
-     (let-alist ,alist ,@body)))
+     ,(macroexpand
+       `(let-alist ,alist ,@body))))
 
 (defcustom sx-init-hook nil
   "Hook run when SX initializes.
-- 
cgit v1.2.3


From 7d2cccd82cf6c658e330767d0e20e48e42ff1ac6 Mon Sep 17 00:00:00 2001
From: Sean Allred <code@seanallred.com>
Date: Sat, 20 Dec 2014 02:22:37 -0500
Subject: Fix `sx-assoc-let' tests

`require' form is no longer needed -- macro expansion is done with the
expansion of `sx-assoc-let'.
---
 test/tests.el | 16 +++++++++-------
 1 file changed, 9 insertions(+), 7 deletions(-)

diff --git a/test/tests.el b/test/tests.el
index 66d8d88..cc58105 100644
--- a/test/tests.el
+++ b/test/tests.el
@@ -121,14 +121,16 @@
 (ert-deftest macro-test--sx-assoc-let ()
   "Tests macro expansion for `sx-assoc-let'"
   (should
-   (equal '(progn (require 'let-alist)
-                  (sx--ensure-site data)
-                  (let-alist data .test))
-          (macroexpand '(sx-assoc-let data .test))))
+   (equal `(progn (sx--ensure-site data)
+                  ,(macroexpand
+                    '(let-alist data .test)))
+          (macroexpand
+           '(sx-assoc-let data .test))))
   (should
-   (equal '(progn (require 'let-alist)
-                  (sx--ensure-site data)
-                  (let-alist data (cons .test-one .test-two)))
+   (equal `(progn (sx--ensure-site data)
+                  ,(macroexpand
+                    '(let-alist data
+                       (cons .test-one .test-two))))
           (macroexpand
            '(sx-assoc-let data (cons .test-one .test-two))))))
 
-- 
cgit v1.2.3


From 35b0883d3e551c5cbc4f416082957e977d6e03eb Mon Sep 17 00:00:00 2001
From: Sean Allred <code@seanallred.com>
Date: Tue, 30 Dec 2014 18:10:39 -0500
Subject: Reapply ef1d321a157e300d29c48e461257897fca1c9aa4

It was somehow lost in the merging.
---
 sx.el | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/sx.el b/sx.el
index 508de46..8fe31ac 100644
--- a/sx.el
+++ b/sx.el
@@ -136,10 +136,11 @@ with a `link' property)."
 If ALIST doesn't have a `site' property, one is created using the
 `link' property."
   (declare (indent 1) (debug t))
+  (require 'let-alist)
   `(progn
-     (require 'let-alist)
      (sx--ensure-site ,alist)
-     (let-alist ,alist ,@body)))
+     ,(macroexpand
+       `(let-alist ,alist ,@body))))
 
 
 ;;; Browsing filter
-- 
cgit v1.2.3


From 06f7059bffa517d63c72a0815ff0779cfe5e5ce2 Mon Sep 17 00:00:00 2001
From: Sean Allred <code@seanallred.com>
Date: Tue, 30 Dec 2014 23:07:36 -0500
Subject: Test sx-assoc-let according to functionality

See http://emacs.stackexchange.com/q/5915/2264 and #151 for more
information.  This patch tests for functional equivalence rather than
symbolic equivalence.

Symbolic equivalence would be far preferable, but it does not appear to
be happening anytime soon -- perhaps when things settle down a bit for
the authors :)
---
 test/tests.el | 28 +++++++++++++++-------------
 1 file changed, 15 insertions(+), 13 deletions(-)

diff --git a/test/tests.el b/test/tests.el
index cc58105..3c275fd 100644
--- a/test/tests.el
+++ b/test/tests.el
@@ -120,19 +120,21 @@
 
 (ert-deftest macro-test--sx-assoc-let ()
   "Tests macro expansion for `sx-assoc-let'"
-  (should
-   (equal `(progn (sx--ensure-site data)
-                  ,(macroexpand
-                    '(let-alist data .test)))
-          (macroexpand
-           '(sx-assoc-let data .test))))
-  (should
-   (equal `(progn (sx--ensure-site data)
-                  ,(macroexpand
-                    '(let-alist data
-                       (cons .test-one .test-two))))
-          (macroexpand
-           '(sx-assoc-let data (cons .test-one .test-two))))))
+  (let ((prototype '((test . nil) (test-one . 1) (test-two . 2)
+                     (link . "http://meta.emacs.stackexchange.com/"))))
+    (let ((data (copy-tree prototype)))
+      (should
+       (null (let-alist data .site))))
+
+    (let ((data (copy-tree prototype)))
+      (should
+       (equal (sx-assoc-let data .site)
+              "meta.emacs")))
+
+    (let ((data (copy-tree prototype)))
+      (should
+       (equal (sx-assoc-let data (cons .test-one .test-two))
+              '(1 . 2))))))
 
 (ert-deftest sx--user-@name ()
   "Tests macro expansion for `sx-assoc-let'"
-- 
cgit v1.2.3


From b8eb3d978109c1d5bf18be8cc1e1678afb6c017a Mon Sep 17 00:00:00 2001
From: Sean Allred <code@seanallred.com>
Date: Tue, 30 Dec 2014 23:10:01 -0500
Subject: Fix typo

---
 sx-request.el | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sx-request.el b/sx-request.el
index 1031ea7..bc34f9c 100644
--- a/sx-request.el
+++ b/sx-request.el
@@ -162,7 +162,7 @@ the main content of the response is returned."
                      .method .error_id .error_name .error_message))
             (when (< (setq sx-request-remaining-api-requests .quota_remaining)
                      sx-request-remaining-api-requests-message-threshold)
-              (sx-message "%d API requests reamining"
+              (sx-message "%d API requests remaining"
                           sx-request-remaining-api-requests))
             (sx-encoding-clean-content-deep .items)))))))
 
-- 
cgit v1.2.3