diff options
| author | Karoly Lorentey <lorentey@elte.hu> | 2005-06-25 15:00:08 +0000 |
|---|---|---|
| committer | Karoly Lorentey <lorentey@elte.hu> | 2005-06-25 15:00:08 +0000 |
| commit | 0d0358be7e741898e363d02dbff01b35c662413c (patch) | |
| tree | e6bdb6ae792a8be712780a5cfad4eeddb09c4f43 /lisp/help-mode.el | |
| parent | f4d9bf3a9be50a17c2e2f7569b88f3606ab273d9 (diff) | |
| parent | b93e3c3ba1644f5e746c7486bd609ba9fc7ec583 (diff) | |
| download | emacs-0d0358be7e741898e363d02dbff01b35c662413c.tar.gz emacs-0d0358be7e741898e363d02dbff01b35c662413c.tar.bz2 emacs-0d0358be7e741898e363d02dbff01b35c662413c.zip | |
Merged from miles@gnu.org--gnu-2005 (patch 441-446)
Patches applied:
* miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-441
Update reference to renamed Buffer-menu-buffer face
* miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-442
Update from CVS
* miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-443
Update from CVS
* miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-444
Update from CVS
* miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-445
Update from CVS
* miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-446
Update from CVS
git-archimport-id: lorentey@elte.hu--2004/emacs--multi-tty--0--patch-354
Diffstat (limited to 'lisp/help-mode.el')
| -rw-r--r-- | lisp/help-mode.el | 7 |
1 files changed, 4 insertions, 3 deletions
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. |