Fix dependency order. sx-tab now requires sx-interaction

2 files changed, 18 insertions, 19 deletions

diff --git a/sx-interaction.el b/sx-interaction.el
index 9b63e0a..0411410 100644
--- a/sx-interaction.el
+++ b/sx-interaction.el
@@ -44,7 +44,6 @@
 (require 'sx-question-mode)
 (require 'sx-question-list)
 (require 'sx-compose)
-(require 'sx-tab)
 
 
 ;;; Using data in buffer
@@ -299,6 +298,21 @@ from context at point."
 
 
 ;;; Asking
+(defcustom sx-default-site "emacs"
+  "Name of the site to use by default when listing questions."
+  :type 'string
+  :group 'sx)
+
+(defun sx--interactive-site-prompt ()
+  "Query the user for a site."
+  (let ((default (or sx-question-list--site
+                     (sx-assoc-let sx-question-mode--data .site)
+                     sx-default-site)))
+    (funcall (if ido-mode #'ido-completing-read #'completing-read)
+      (format "Site (%s): " default)
+      (sx-site-get-api-tokens) nil t nil nil
+      default)))
+
 (defun sx-ask (site)
   "Start composing a question for SITE.
 SITE is a string, indicating where the question will be posted."
@@ -308,7 +322,7 @@ SITE is a string, indicating where the question will be posted."
      (sx-compose-create
       site nil nil
       ;; After send functions
-      (list (lambda (_ res) (sx--maybe-update-display buffer)))))))
+      (list (lambda (_b _res) (sx--maybe-update-display buffer)))))))
 
 
 ;;; Answering
diff --git a/sx-tab.el b/sx-tab.el
index f36d10f..f3ac381 100644
--- a/sx-tab.el
+++ b/sx-tab.el
@@ -26,11 +26,7 @@
 
 (require 'sx)
 (require 'sx-question-list)
-
-(defcustom sx-tab-default-site "emacs"
-  "Name of the site to use by default when listing questions."
-  :type 'string
-  :group 'sx)
+(require 'sx-interaction)
 
 (defvar sx-tab--list nil
   "List of the names of all defined tabs.")
@@ -44,17 +40,6 @@
            t)))
   (funcall (intern (format "sx-tab-%s" (downcase tab)))))
 
-(defun sx-tab--interactive-site-prompt ()
-  "Query the user for a site."
-  (let ((default (or sx-question-list--site
-                     (sx-assoc-let sx-question-mode--data
-                       .site)
-                     sx-tab-default-site)))
-    (funcall (if ido-mode #'ido-completing-read #'completing-read)
-      (format "Site (%s): " default)
-      (sx-site-get-api-tokens) nil t nil nil
-      default)))
-
 
 ;;; The main macro
 (defmacro sx-tab--define (tab pager &optional printer refresher
@@ -91,7 +76,7 @@ If SITE is nil, use `sx-tab-default-site'."
             tab)
          (interactive
           (list current-prefix-arg
-                (sx-tab--interactive-site-prompt)))
+                (sx--interactive-site-prompt)))
          (sx-initialize)
          (unless site (setq site sx-tab-default-site))
          ;; Create the buffer