From: Juanma Barranquero <lekktu@gmail.com>
Date: Wed, 22 Jun 2005 13:55:32 +0000 (+0000)
Subject: (help-make-xrefs): If a symbol representing a face name is not followed by the
X-Git-Tag: emacs-pretest-22.0.90~8741
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=a1ef2eabbfc147671bb3eb5c403fc91d8e127e6c;p=emacs.git

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