aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorArtur Malabarba <bruce.connor.am@gmail.com>2014-11-14 14:31:36 +0000
committerArtur Malabarba <bruce.connor.am@gmail.com>2014-11-14 14:31:36 +0000
commit131c1552ba1ee6006801480b4e8c18a592c56b62 (patch)
tree7ebfcb641301f2edae2592ac02f581db088dd96c
parent2d3b595a2f1a3f5c63d04c9353fe7ed4cc129df7 (diff)
parent8d14a6b425d27b7b942f3922d583877ec8b00690 (diff)
Merge branch 'sx-question-mode' into font-lock
-rw-r--r--sx-question-mode.el17
-rw-r--r--sx-question.el4
2 files changed, 10 insertions, 11 deletions
diff --git a/sx-question-mode.el b/sx-question-mode.el
index d170d41..b25d00c 100644
--- a/sx-question-mode.el
+++ b/sx-question-mode.el
@@ -26,7 +26,6 @@
(require 'markdown-mode)
(require 'sx)
-(require 'sx-filter)
(require 'sx-question)
(defgroup sx-question-mode nil
@@ -168,11 +167,18 @@ editor's name."
:type 'string
:group 'sx-question-mode)
-(defcustom sx-question-mode-comments-title " Comments"
+(defcustom sx-question-mode-comments-title " Comments"
"Title used at the start of \"Comments\" sections."
:type 'string
:group 'sx-question-mode)
+(defcustom sx-question-mode-comments-format "%s: %s\n"
+ "Format used to display comments.
+First \"%s\" is replaced with user name.
+Second \"%s\" is replaced with the comment."
+ :type 'string
+ :group 'sx-question-mode)
+
;;; Printing a question's content
;;;; Functions
@@ -284,13 +290,6 @@ DATA can represent a question or an answer."
(propertize .display_name
'face 'sx-question-mode-author)))
-(defcustom sx-question-mode-comments-format " %s: %s\n"
- "Format used to display comments.
-First \"%s\" is replaced with user name.
-Second \"%s\" is replaced with the comment."
- :type 'string
- :group 'sx-question-mode)
-
(defun sx-question-mode--print-comment (data)
"Print the comment described by alist DATA."
(sx-assoc-let data
diff --git a/sx-question.el b/sx-question.el
index 69a4d7f..d15cc80 100644
--- a/sx-question.el
+++ b/sx-question.el
@@ -54,13 +54,13 @@
(defun sx-question-get-question (site id)
"Get the question ID from SITE."
- (let ((res (sx-request-make
+ (let ((res (sx-method-call
(format "questions/%s" id)
`((site . ,site))
sx-question-browse-filter)))
(if (vectorp res)
(elt res 0)
- (error "Couldn't find question %s in %s" id site))))
+ (error "Couldn't find question %S in %S" id site))))
;;; Question Properties