From 3d6089a6f96b832cb88ccb7bea9be5e1a566d15d Mon Sep 17 00:00:00 2001
From: Artur Malabarba <bruce.connor.am@gmail.com>
Date: Tue, 9 Dec 2014 15:42:35 +0000
Subject: Define up and down keys on the list.

---
 sx-question-list.el | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

(limited to 'sx-question-list.el')

diff --git a/sx-question-list.el b/sx-question-list.el
index c5c32d9..788fc2f 100644
--- a/sx-question-list.el
+++ b/sx-question-list.el
@@ -286,7 +286,11 @@ into consideration.
 (mapc
  (lambda (x) (define-key sx-question-list-mode-map
           (car x) (cadr x)))
- '(("n" sx-question-list-next)
+ '(
+   ;; S-down and S-up would collide with `windmove'.
+   ([down] sx-question-list-view-next)
+   ([up] sx-question-list-view-previous)
+   ("n" sx-question-list-next)
    ("p" sx-question-list-previous)
    ("j" sx-question-list-view-next)
    ("k" sx-question-list-view-previous)
@@ -303,7 +307,8 @@ into consideration.
    ("d" sx-toggle-downvote)
    ("h" sx-question-list-hide)
    ("m" sx-question-list-mark-read)
-   ([?\r] sx-display-question)))
+   ([?\r] sx-display-question)
+   ))
 
 (defun sx-question-list-hide (data)
   "Hide question under point.
-- 
cgit v1.2.3


From a33de03f6c9f0419d7640bce0ab203fd43607bb4 Mon Sep 17 00:00:00 2001
From: Artur Malabarba <bruce.connor.am@gmail.com>
Date: Sun, 14 Dec 2014 13:39:42 +0000
Subject: Use the header-line as a UI guide.

---
 sx-question-list.el | 14 +++++++++++++-
 1 file changed, 13 insertions(+), 1 deletion(-)

(limited to 'sx-question-list.el')

diff --git a/sx-question-list.el b/sx-question-list.el
index 788fc2f..0dfebc4 100644
--- a/sx-question-list.el
+++ b/sx-question-list.el
@@ -196,6 +196,18 @@ and thus not displayed in the list of questions.
 This is ignored if `sx-question-list--refresh-function' is set.")
 (make-variable-buffer-local 'sx-question-list--dataset)
 
+(defvar sx-question-list--header-line
+  '("    "
+    (:propertize "n p j k" face mode-line-buffer-id)
+    ": Navigate"
+    "    "
+    (:propertize "RET" face mode-line-buffer-id)
+    ": View question"
+    "    "
+    (:propertize "v" face mode-line-buffer-id)
+    ": Visit externally")
+  "Header-line used on the question list.")
+
 
 ;;; Mode Definition
 (define-derived-mode sx-question-list-mode
@@ -266,7 +278,7 @@ into consideration.
     #'sx-question-list-refresh nil t)
   (add-hook 'tabulated-list-revert-hook
     #'sx-question-list--update-mode-line nil t)
-  (tabulated-list-init-header))
+  (setq header-line-format sx-question-list--header-line))
 
 (defcustom sx-question-list-date-sort-method 'last_activity_date
   "Parameter which controls date sorting."
-- 
cgit v1.2.3


From bc2c6b72e62cbcc1540ce4154760250273e05d04 Mon Sep 17 00:00:00 2001
From: Artur Malabarba <bruce.connor.am@gmail.com>
Date: Sun, 14 Dec 2014 13:39:46 +0000
Subject: Fix up and down keys

---
 sx-question-list.el | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'sx-question-list.el')

diff --git a/sx-question-list.el b/sx-question-list.el
index 0dfebc4..69fb435 100644
--- a/sx-question-list.el
+++ b/sx-question-list.el
@@ -300,8 +300,8 @@ into consideration.
           (car x) (cadr x)))
  '(
    ;; S-down and S-up would collide with `windmove'.
-   ([down] sx-question-list-view-next)
-   ([up] sx-question-list-view-previous)
+   ([down] sx-question-list-next)
+   ([up] sx-question-list-previous)
    ("n" sx-question-list-next)
    ("p" sx-question-list-previous)
    ("j" sx-question-list-view-next)
-- 
cgit v1.2.3


From 4bcdd311b590156998ebf51a14fce31b6d0569ec Mon Sep 17 00:00:00 2001
From: Artur Malabarba <bruce.connor.am@gmail.com>
Date: Sun, 14 Dec 2014 11:49:56 -0200
Subject: Also mention q

---
 sx-question-list.el | 5 ++++-
 sx-question-mode.el | 5 ++++-
 2 files changed, 8 insertions(+), 2 deletions(-)

(limited to 'sx-question-list.el')

diff --git a/sx-question-list.el b/sx-question-list.el
index 69fb435..f23310c 100644
--- a/sx-question-list.el
+++ b/sx-question-list.el
@@ -205,7 +205,10 @@ This is ignored if `sx-question-list--refresh-function' is set.")
     ": View question"
     "    "
     (:propertize "v" face mode-line-buffer-id)
-    ": Visit externally")
+    ": Visit externally"
+    "    "
+    (:propertize "q" face mode-line-buffer-id)
+    ": Quit")
   "Header-line used on the question list.")
 
 
diff --git a/sx-question-mode.el b/sx-question-mode.el
index c45ef9f..68618bb 100644
--- a/sx-question-mode.el
+++ b/sx-question-mode.el
@@ -190,7 +190,10 @@ property."
     ": Answer"
     "    "
     (:propertize "e" face mode-line-buffer-id)
-    ": Edit")
+    ": Edit"
+    "    "
+    (:propertize "q" face mode-line-buffer-id)
+    ": Quit")
   "Header-line used on the question list.")
 
 (define-derived-mode sx-question-mode special-mode "Question"
-- 
cgit v1.2.3


From 6956c17e1e7ef2899026ad365a0acdd4ce63cb80 Mon Sep 17 00:00:00 2001
From: Artur Malabarba <bruce.connor.am@gmail.com>
Date: Mon, 15 Dec 2014 18:27:33 -0200
Subject: user-error is "not known to be defined" in emacs 24.2

---
 sx-button.el        | 2 +-
 sx-interaction.el   | 4 ++--
 sx-method.el        | 2 +-
 sx-question-list.el | 4 ++--
 sx.el               | 5 +++++
 5 files changed, 11 insertions(+), 6 deletions(-)

(limited to 'sx-question-list.el')

diff --git a/sx-button.el b/sx-button.el
index dbadc2e..1727a3d 100644
--- a/sx-button.el
+++ b/sx-button.el
@@ -96,7 +96,7 @@ code-block."
   (interactive)
   (browse-url
    (or (get-text-property (or pos (point)) 'sx-button-url)
-       (user-error "No url under point: %s" (or pos (point))))))
+       (sx-user-error "No url under point: %s" (or pos (point))))))
 
 
 ;;; Help-echo definitions
diff --git a/sx-interaction.el b/sx-interaction.el
index 38520a7..7d32094 100644
--- a/sx-interaction.el
+++ b/sx-interaction.el
@@ -85,7 +85,7 @@ If it's not a question, or if it is read, return DATA."
   ;; If we found a question, we may need to check if it's read.
   (if (and (assoc 'title data)
            (null (sx-question--read-p data)))
-      (user-error "Question not yet read. View it before acting on it")
+      (sx-user-error "Question not yet read. View it before acting on it")
     data))
 
 (defun sx--maybe-update-display (&optional buffer)
@@ -286,7 +286,7 @@ from context at point."
   ;; If we ever make an "Edit" button, first arg is a marker.
   (when (markerp data) (setq data (sx--data-here)))
   (sx-assoc-let data
-    (when .comment_id (user-error "Editing comments is not supported yet"))
+    (when .comment_id (sx-user-error "Editing comments is not supported yet"))
     (let ((buffer (current-buffer)))
       (pop-to-buffer
        (sx-compose-create
diff --git a/sx-method.el b/sx-method.el
index 4575b0f..1078014 100644
--- a/sx-method.el
+++ b/sx-method.el
@@ -90,7 +90,7 @@ Return the entire response as a complex alist."
       (cond
        ;; 1. Need auth and warn user (interactive use)
        ((and method-auth (equal 'warn auth))
-        (user-error
+        (sx-user-error
          "This request requires authentication.  Please run `M-x sx-authenticate' and try again."))
        ;; 2. Need auth to populate UI, cannot provide subset
        ((and method-auth auth)
diff --git a/sx-question-list.el b/sx-question-list.el
index f23310c..e94c689 100644
--- a/sx-question-list.el
+++ b/sx-question-list.el
@@ -331,7 +331,7 @@ Non-interactively, DATA is a question alist."
   (interactive
    (list (if (derived-mode-p 'sx-question-list-mode)
              (tabulated-list-get-id)
-           (user-error "Not in `sx-question-list-mode'"))))
+           (sx-user-error "Not in `sx-question-list-mode'"))))
   (sx-question--mark-hidden data)
   (when (called-interactively-p 'any)
     (sx-question-list-refresh 'redisplay 'noupdate)))
@@ -342,7 +342,7 @@ Non-interactively, DATA is a question alist."
   (interactive
    (list (if (derived-mode-p 'sx-question-list-mode)
              (tabulated-list-get-id)
-           (user-error "Not in `sx-question-list-mode'"))))
+           (sx-user-error "Not in `sx-question-list-mode'"))))
   (sx-question--mark-read data)
   (sx-question-list-next 1)
   (when (called-interactively-p 'any)
diff --git a/sx.el b/sx.el
index 096e20b..c8d4e5b 100644
--- a/sx.el
+++ b/sx.el
@@ -104,6 +104,11 @@ is intentionally skipped."
        (setq tail (cdr tail)))
      (setcdr tail (cons x (cdr tail)))))
 
+(defun sx-user-error (format-string &rest args)
+  "Like `user-error', but prepend FORMAT-STRING with \"[sx]\".
+See `format'."
+  (signal 'user-error (list (apply #'format (concat "[sx] " format) args))))
+
 (defun sx-message (format-string &rest args)
   "Display FORMAT-STRING as a message with ARGS.
 See `format'."
-- 
cgit v1.2.3


From 8bccdce22f50dad70232a4e902e5770576e8e830 Mon Sep 17 00:00:00 2001
From: Artur Malabarba <bruce.connor.am@gmail.com>
Date: Mon, 15 Dec 2014 18:37:09 -0200
Subject: sx-display-question is not known to be defined.

It was the wrong function to use anyway.
---
 sx-question-list.el | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

(limited to 'sx-question-list.el')

diff --git a/sx-question-list.el b/sx-question-list.el
index e94c689..94b5be4 100644
--- a/sx-question-list.el
+++ b/sx-question-list.el
@@ -447,9 +447,8 @@ Displayed in `sx-question-mode--window', replacing any question
 that may currently be there."
   (interactive "p")
   (sx-question-list-next n)
-  (sx-display-question
-   (tabulated-list-get-id)
-   nil 
+  (sx-question-mode--display
+   (tabulated-list-get-id) 
    (sx-question-list--create-question-window)))
 
 (defun sx-question-list--create-question-window ()
-- 
cgit v1.2.3


From b15813ac1a681ef075c207f1a90f3cb167653d83 Mon Sep 17 00:00:00 2001
From: Artur Malabarba <bruce.connor.am@gmail.com>
Date: Sat, 20 Dec 2014 15:08:43 -0200
Subject: Hotfix switch-tab

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

(limited to 'sx-question-list.el')

diff --git a/sx-question-list.el b/sx-question-list.el
index 94b5be4..6537d2b 100644
--- a/sx-question-list.el
+++ b/sx-question-list.el
@@ -315,7 +315,7 @@ into consideration.
    ("K" sx-question-list-previous-far)
    ("g" sx-question-list-refresh)
    (":" sx-question-list-switch-site)
-   ("t" sx-question-list-switch-tab)
+   ("t" sx-tab-switch)
    ("a" sx-ask)
    ("v" sx-visit)
    ("u" sx-toggle-upvote)
-- 
cgit v1.2.3


From abaad8b3c57355be672e13a2f5cdff3d651e91d0 Mon Sep 17 00:00:00 2001
From: Artur Malabarba <bruce.connor.am@gmail.com>
Date: Sat, 20 Dec 2014 16:59:09 -0200
Subject: Refactor sx-visit to sx-visit-externally

---
 sx-interaction.el   | 2 +-
 sx-question-list.el | 2 +-
 sx-question-mode.el | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

(limited to 'sx-question-list.el')

diff --git a/sx-interaction.el b/sx-interaction.el
index 38efe5d..ed8891b 100644
--- a/sx-interaction.el
+++ b/sx-interaction.el
@@ -106,7 +106,7 @@ Only fields contained in TO are copied."
 
 
 ;;; Visiting
-(defun sx-visit (data &optional copy-as-kill)
+(defun sx-visit-externally (data &optional copy-as-kill)
   "Visit DATA in a web browser.
 DATA can be a question, answer, or comment. Interactively, it is
 derived from point position.
diff --git a/sx-question-list.el b/sx-question-list.el
index 94b5be4..f6a82e2 100644
--- a/sx-question-list.el
+++ b/sx-question-list.el
@@ -317,7 +317,7 @@ into consideration.
    (":" sx-question-list-switch-site)
    ("t" sx-question-list-switch-tab)
    ("a" sx-ask)
-   ("v" sx-visit)
+   ("v" sx-visit-externally)
    ("u" sx-toggle-upvote)
    ("d" sx-toggle-downvote)
    ("h" sx-question-list-hide)
diff --git a/sx-question-mode.el b/sx-question-mode.el
index b376616..807eeea 100644
--- a/sx-question-mode.el
+++ b/sx-question-mode.el
@@ -224,7 +224,7 @@ Letters do not insert themselves; instead, they are commands.
    ("p" sx-question-mode-previous-section)
    ("g" sx-question-mode-refresh)
    ("c" sx-comment)
-   ("v" sx-visit)
+   ("v" sx-visit-externally)
    ("u" sx-toggle-upvote)
    ("d" sx-toggle-downvote)
    ("q" quit-window)
-- 
cgit v1.2.3


From 531d3d911990a5f9eed6646af24b2f55ae128aa3 Mon Sep 17 00:00:00 2001
From: Artur Malabarba <bruce.connor.am@gmail.com>
Date: Sat, 27 Dec 2014 16:11:57 -0200
Subject: Hotfix Mark hidden sends point to (bob)

---
 sx-question-list.el | 5 +++++
 1 file changed, 5 insertions(+)

(limited to 'sx-question-list.el')

diff --git a/sx-question-list.el b/sx-question-list.el
index 62ce032..4bd6478 100644
--- a/sx-question-list.el
+++ b/sx-question-list.el
@@ -333,6 +333,11 @@ Non-interactively, DATA is a question alist."
              (tabulated-list-get-id)
            (sx-user-error "Not in `sx-question-list-mode'"))))
   (sx-question--mark-hidden data)
+  ;; The current entry will not be present after the list is
+  ;; redisplayed. To avoid `tabulated-list-mode' getting lost (and
+  ;; sending us to the top) we move to the next entry before
+  ;; redisplaying.
+  (forward-line 1)
   (when (called-interactively-p 'any)
     (sx-question-list-refresh 'redisplay 'noupdate)))
 
-- 
cgit v1.2.3


From c37022ffbc52b900d81eee05f3c2c3d5fe6fee01 Mon Sep 17 00:00:00 2001
From: Artur Malabarba <bruce.connor.am@gmail.com>
Date: Sat, 27 Dec 2014 23:06:00 -0200
Subject: Initial implementation of sx-completing-read

---
 sx-interaction.el   | 8 ++++----
 sx-question-list.el | 3 +--
 sx-tab.el           | 8 ++++----
 sx.el               | 5 +++++
 4 files changed, 14 insertions(+), 10 deletions(-)

(limited to 'sx-question-list.el')

diff --git a/sx-interaction.el b/sx-interaction.el
index 372a5b1..9ced1ab 100644
--- a/sx-interaction.el
+++ b/sx-interaction.el
@@ -340,10 +340,10 @@ from context at point."
   (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)))
+    (sx-completing-read
+     (format "Site (%s): " default)
+     (sx-site-get-api-tokens) nil t nil nil
+     default)))
 
 ;;;###autoload
 (defun sx-ask (site)
diff --git a/sx-question-list.el b/sx-question-list.el
index 4bd6478..d84d1ea 100644
--- a/sx-question-list.el
+++ b/sx-question-list.el
@@ -559,12 +559,11 @@ This does not update `sx-question-mode--window'."
 
 (defun sx-question-list-switch-site (site)
   "Switch the current site to SITE and display its questions.
-Use `ido-completing-read' if variable `ido-mode' is active.  
 Retrieve completions from `sx-site-get-api-tokens'.
 Sets `sx-question-list--site' and then call
 `sx-question-list-refresh' with `redisplay'."
   (interactive
-   (list (funcall (if ido-mode #'ido-completing-read #'completing-read)
+   (list (sx-completing-read
            "Switch to site: " (sx-site-get-api-tokens)
            (lambda (site) (not (equal site sx-question-list--site)))
            t)))
diff --git a/sx-tab.el b/sx-tab.el
index 6c5e21e..32a7784 100644
--- a/sx-tab.el
+++ b/sx-tab.el
@@ -34,10 +34,10 @@
 (defun sx-tab-switch (tab)
   "Switch to another question-list tab."
   (interactive
-   (list (funcall (if ido-mode #'ido-completing-read #'completing-read)
-           "Switch to tab: " sx-tab--list
-           (lambda (tab) (not (equal tab sx-question-list--current-tab)))
-           t)))
+   (list (sx-completing-read
+          "Switch to tab: " sx-tab--list
+          (lambda (tab) (not (equal tab sx-question-list--current-tab)))
+          t)))
   (funcall (intern (format "sx-tab-%s" (downcase tab)))))
 
 
diff --git a/sx.el b/sx.el
index a63c155..c2d1164 100644
--- a/sx.el
+++ b/sx.el
@@ -183,6 +183,11 @@ See `sx-question-get-questions' and `sx-question-get-question'.")
 
 
 ;;; Utility Functions
+(defun sx-completing-read (&rest args)
+  "Like `completing-read', but possibly use ido.
+All ARGS are passed to `completing-read' or `ido-completing-read'."
+  (apply (if ido-mode #'ido-completing-read #'completing-read)
+    args))
 
 (defmacro sx-sorted-insert-skip-first (newelt list &optional predicate)
   "Inserted NEWELT into LIST sorted by PREDICATE.
-- 
cgit v1.2.3