Make "C-h o" show faces as well as variables

* lisp/faces.el (describe-face): Return (buffer-string).  Reorder
the placement of variables/faces in describe-symbol, to put more
emphasis on the variable entry rather than the face.  (Bug#24543)

2 files changed, 3 insertions, 3 deletions

diff --git a/lisp/faces.el b/lisp/faces.el
index c0c1c7b59f0..5ed11d11cef 100644
--- a/lisp/faces.el
+++ b/lisp/faces.el
@@ -1454,7 +1454,7 @@ If FRAME is omitted or nil, use the selected frame."
         (setq face (list face)))
     (with-help-window (help-buffer)
       (with-current-buffer standard-output
-        (dolist (f face)
+        (dolist (f face (buffer-string))
           (if (stringp f) (setq f (intern f)))
           ;; We may get called for anonymous faces (i.e., faces
           ;; expressed using prop-value plists).  Those can't be
diff --git a/lisp/help-mode.el b/lisp/help-mode.el
index 3fb793e7aa5..24dfb9120bf 100644
--- a/lisp/help-mode.el
+++ b/lisp/help-mode.el
@@ -393,12 +393,12 @@ it does not already exist."
 
 (defvar describe-symbol-backends
   `((nil ,#'fboundp ,(lambda (s _b _f) (describe-function s)))
-    ("face" ,#'facep ,(lambda (s _b _f) (describe-face s)))
     (nil
      ,(lambda (symbol)
         (or (and (boundp symbol) (not (keywordp symbol)))
             (get symbol 'variable-documentation)))
-     ,#'describe-variable)))
+     ,#'describe-variable)
+    ("face" ,#'facep ,(lambda (s _b _f) (describe-face s)))))
 
 ;;;###autoload
 (defun help-make-xrefs (&optional buffer)