Merged from miles@gnu.org--gnu-2005 (patch 133-141, 596-609)

Patches applied:

 * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-596
   Update from CVS

 * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-597
   Merge from gnus--rel--5.10

 * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-598
   Update from CVS

 * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-599
   Update from CVS

 * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-600
   Update from CVS

 * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-601
   Update from CVS

 * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-602
   Update from CVS

 * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-603
   Update from CVS

 * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-604
   Update from CVS

 * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-605
   Update from CVS

 * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-606
   Remove lisp/toolbar directory

 * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-607
   Update from CVS

 * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-608
   Update from CVS

 * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-609
   Update from CVS

 * miles@gnu.org--gnu-2005/gnus--rel--5.10--patch-133
   Update from CVS

 * miles@gnu.org--gnu-2005/gnus--rel--5.10--patch-134
   Update from CVS

 * miles@gnu.org--gnu-2005/gnus--rel--5.10--patch-135
   Update from CVS

 * miles@gnu.org--gnu-2005/gnus--rel--5.10--patch-136
   Merge from emacs--cvs-trunk--0

 * miles@gnu.org--gnu-2005/gnus--rel--5.10--patch-137
   Update from CVS

 * miles@gnu.org--gnu-2005/gnus--rel--5.10--patch-138
   Update from CVS: texi/gnus.texi (RSS): Fix key description.

 * miles@gnu.org--gnu-2005/gnus--rel--5.10--patch-139
   Merge from emacs--cvs-trunk--0

 * miles@gnu.org--gnu-2005/gnus--rel--5.10--patch-140
   Update from CVS

 * miles@gnu.org--gnu-2005/gnus--rel--5.10--patch-141
   Update from CVS: texi/gnus.texi (Document Server Internals): Addition.

git-archimport-id: lorentey@elte.hu--2004/emacs--multi-tty--0--patch-426

1 files changed, 17 insertions, 6 deletions

diff --git a/lisp/man.el b/lisp/man.el
index 6c8a5a18b44..c54a00d3663 100644
--- a/lisp/man.el
+++ b/lisp/man.el
@@ -415,10 +415,18 @@ Otherwise, the value is whatever the function
   (define-key Man-mode-map "?"    'describe-mode))
 
 ;; buttons
-(define-button-type 'Man-xref-man-page
-  'action (lambda (button) (man-follow (button-label button)))
+(define-button-type 'Man-abstract-xref-man-page
   'follow-link t
-  'help-echo "mouse-2, RET: display this man page")
+  'help-echo "mouse-2, RET: display this man page"
+  'func nil
+  'action (lambda (button) (funcall 
+			    (button-get button 'func)
+			    (button-label button))))
+
+(define-button-type 'Man-xref-man-page 
+  :supertype 'Man-abstract-xref-man-page
+  'func 'man-follow)
+
 
 (define-button-type 'Man-xref-header-file
     'action (lambda (button)
@@ -903,14 +911,17 @@ Same for the ANSI bold and normal escape sequences."
 			 'face Man-overstrike-face)))
   (message "%s man page formatted" Man-arguments))
 
-(defun Man-highlight-references ()
+(defun Man-highlight-references (&optional xref-man-type)
   "Highlight the references on mouse-over.
 References include items in the SEE ALSO section,
-header file (#include <foo.h>) and files in FILES."
+header file (#include <foo.h>) and files in FILES.
+If XREF-MAN-TYPE is used as the button type for items
+in SEE ALSO section. If it is nil, default type, 
+`Man-xref-man-page' is used."
   (let ((dummy 0))
     (Man-highlight-references0
      Man-see-also-regexp Man-reference-regexp 1 dummy
-     'Man-xref-man-page)
+     (or xref-man-type 'Man-xref-man-page))
     (Man-highlight-references0
      Man-synopsis-regexp Man-header-regexp 0 2
      'Man-xref-header-file)