(help-make-xrefs): If a symbol representing a face name is not followed by the

word "face", it could still be a function or variable name, so don't bypass
other checks.

2 files changed, 10 insertions, 3 deletions

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index cca0beb894e..3cdad8fcecb 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,9 @@
+2005-06-22  Juanma Barranquero  <lekktu@gmail.com>
+
+        * help-mode.el (help-make-xrefs): If a symbol representing a face
+        name is not followed by the word "face", it could still be a
+        function or variable name, so don't bypass other checks.
+
 2005-06-22  Juri Linkov  <juri@jurta.org>
 
         * ps-print.el (ps-face-foreground-name, ps-face-background-name):
diff --git a/lisp/help-mode.el b/lisp/help-mode.el
index 1c516930c3b..cd8c6a1c2dc 100644
--- a/lisp/help-mode.el
+++ b/lisp/help-mode.el
@@ -388,9 +388,10 @@ 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
+                           (facep sym)
+                           (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.