Merge pull request #216 from vermiculus/improve-comments

Improve comments

1 files changed, 16 insertions, 35 deletions

diff --git a/sx-question-print.el b/sx-question-print.el
index 737844a..9a51efb 100644
--- a/sx-question-print.el
+++ b/sx-question-print.el
@@ -26,6 +26,7 @@
 (require 'sx)
 (require 'sx-question)
 (require 'sx-babel)
+(require 'sx-user)
 
 (defgroup sx-question-mode nil
   "Customization group for sx-question-mode."
@@ -33,20 +34,15 @@
   :tag "SX Question Mode"
   :group 'sx)
 
-(defgroup sx-question-mode-faces nil
-  "Customization group for the faces of `sx-question-mode'."
+(defgroup sx-question-mode-faces '((sx-user custom-group))
+  "Customization group for the faces of `sx-question-mode'.
+Some faces of this mode might be defined in the `sx-user' group."
   :prefix "sx-question-mode-"
   :tag "SX Question Mode Faces"
   :group 'sx-question-mode)
 
 
 ;;; Faces and Variables
-(defcustom sx-question-mode-deleted-user
-  '((display_name . "(deleted user)"))
-  "The structure used to represent a deleted account."
-  :type '(alist :options ((display_name string)))
-  :group 'sx-question-mode)
-
 (defface sx-question-mode-header
   '((t :inherit font-lock-variable-name-face))
   "Face used on the question headers in the question buffer."
@@ -67,13 +63,9 @@
   :type 'string
   :group 'sx-question-mode)
 
-(defface sx-question-mode-author
-  '((t :inherit font-lock-string-face))
-  "Face used on the question author in the question buffer."
-  :group 'sx-question-mode-faces)
-
-(defcustom sx-question-mode-header-author "\nAuthor:   "
-  "String used before the question author at the header."
+(defcustom sx-question-mode-header-author-format "\nAuthor:   %d %r"
+  "String used to display the question author at the header.
+% constructs have special meaning here.  See `sx-user--format'."
   :type 'string
   :group 'sx-question-mode)
 
@@ -92,11 +84,6 @@
   "Face used on the question tags in the question buffer."
   :group 'sx-question-mode-faces)
 
-(defface sx-question-mode-author
-  '((t :inherit font-lock-variable-name-face))
-  "Face used for author names in the question buffer."
-  :group 'sx-question-mode-faces)
-
 (defface sx-question-mode-score
   '((t))
   "Face used for the score in the question buffer."
@@ -209,11 +196,13 @@ DATA can represent a question or an answer."
       ;; Sections can be hidden with overlays
       (sx--wrap-in-overlay
           '(sx-question-mode--section-content t)
+        ;; Author
+        (insert
+         (sx-user--format
+          (propertize sx-question-mode-header-author-format
+                      'face 'sx-question-mode-header)
+          .owner))
         (sx-question-mode--insert-header
-         ;; Author
-         sx-question-mode-header-author
-         (sx-question-mode--propertize-display-name .owner)
-         'sx-question-mode-author
          ;; Date
          sx-question-mode-header-date
          (concat
@@ -221,8 +210,7 @@ DATA can represent a question or an answer."
           (when .last_edit_date
             (format sx-question-mode-last-edit-format
               (sx-time-since .last_edit_date)
-              (sx-question-mode--propertize-display-name
-               (or .last_editor sx-question-mode-deleted-user)))))
+              (sx-user--format "%d" .last_editor))))
          'sx-question-mode-date)
         (sx-question-mode--insert-header
          sx-question-mode-header-score
@@ -278,12 +266,6 @@ DATA can represent a question or an answer."
                             :type 'sx-button-comment)
         (insert "\n")))))
 
-(defun sx-question-mode--propertize-display-name (author)
-  "Return display_name of AUTHOR with `sx-question-mode-author' face."
-  (sx-assoc-let author
-    (propertize (or .display_name "??")
-                'face 'sx-question-mode-author)))
-
 (defun sx-question-mode--print-comment (comment-data)
   "Print the comment described by alist COMMENT-DATA.
 The comment is indented, filled, and then printed according to
@@ -296,9 +278,8 @@ The comment is indented, filled, and then printed according to
                 (if (eq .upvoted t) "^" "")
                 " "))
       (insert
-       (format
-           sx-question-mode-comments-format
-         (sx-question-mode--propertize-display-name .owner)
+       (format sx-question-mode-comments-format
+         (sx-user--format "%d" .owner)
          (substring
           ;; We fill with three spaces at the start, so the comment is
           ;; slightly indented.