(help-make-xrefs): Make sure that if a symbol is followed by the word

`face', it gets treated as a face, even if it is also defined as a
variable or a function.

diff --git a/lisp/help-mode.el b/lisp/help-mode.el
index bcf15c54f77e354381c2e0d5b4adab9874dfa0ab..087e4f159df11699fe17b547f680691be364035e 100644 (file)
--- a/lisp/help-mode.el
+++ b/lisp/help-mode.el
@@ -365,6 +365,9 @@ that."
 ;;;                            (pop-to-buffer (car location))
 ;;;                            (goto-char (cdr location))))
                          (help-xref-button 8 'help-function-def sym))
+                        ((facep sym)
+                         (if (save-match-data (looking-at "[ \t\n]+face\\W"))
+                             (help-xref-button 8 'help-face sym)))
                          ((and (boundp sym) (fboundp sym))
                           ;; We can't intuit whether to use the
                           ;; variable or function doc -- supply both.
@@ -375,10 +378,7 @@ that."
                                                   'variable-documentation))
                          (help-xref-button 8 'help-variable sym))
                         ((fboundp sym)
-                         (help-xref-button 8 'help-function sym))
-                        ((facep sym)
-                         (if (save-match-data (looking-at "[ \t\n]+face\\W"))
-                             (help-xref-button 8 'help-face sym))))))))
+                         (help-xref-button 8 'help-function sym)))))))
               ;; An obvious case of a key substitution:
               (save-excursion
                 (while (re-search-forward