From: Luc Teirlinck <teirllm@auburn.edu>
Date: Mon, 20 Oct 2003 21:33:34 +0000 (+0000)
Subject: (help-make-xrefs): Make sure that if a symbol is followed by the word
X-Git-Tag: ttn-vms-21-2-B4~8509
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=b1664339f4c1adac3f5d1e9a99c3850a28346100;p=emacs.git

(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 bcf15c54f77..087e4f159df 100644
--- 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