(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.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index cca0beb894e4d534bf9f2d9d228ea004c43fba41..3cdad8fcecbad26d9194c7fd3cd076f98feffd6d 100644 (file)
--- 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 1c516930c3b7e1aadcde8289b455a5bb57bd7710..cd8c6a1c2dc8725c4ed7d0dd2f8d6701f0c0390a 100644 (file)
--- 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.