[Emacs-diffs] Changes to emacs/lisp/man.el

[Masatake YAMATO]

Index: emacs/lisp/man.el
diff -c emacs/lisp/man.el:1.154 emacs/lisp/man.el:1.155
*** emacs/lisp/man.el:1.154     Sat Sep 24 13:44:02 2005
--- emacs/lisp/man.el   Tue Oct 18 04:21:51 2005
***************
*** 415,424 ****
    (define-key Man-mode-map "?"    'describe-mode))
  
  ;; buttons
! (define-button-type 'Man-xref-man-page
!   'action (lambda (button) (man-follow (button-label button)))
    'follow-link t
!   'help-echo "mouse-2, RET: display this man page")
  
  (define-button-type 'Man-xref-header-file
      'action (lambda (button)
--- 415,432 ----
    (define-key Man-mode-map "?"    'describe-mode))
  
  ;; buttons
! (define-button-type 'Man-abstract-xref-man-page
    'follow-link t
!   '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,916 ****
                         'face Man-overstrike-face)))
    (message "%s man page formatted" Man-arguments))
  
! (defun Man-highlight-references ()
    "Highlight the references on mouse-over.
  References include items in the SEE ALSO section,
! header file (#include <foo.h>) and files in FILES."
    (let ((dummy 0))
      (Man-highlight-references0
       Man-see-also-regexp Man-reference-regexp 1 dummy
!      'Man-xref-man-page)
      (Man-highlight-references0
       Man-synopsis-regexp Man-header-regexp 0 2
       'Man-xref-header-file)
--- 911,927 ----
                         'face Man-overstrike-face)))
    (message "%s man page formatted" Man-arguments))
  
! (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.
! 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
!      (or xref-man-type 'Man-xref-man-page))
      (Man-highlight-references0
       Man-synopsis-regexp Man-header-regexp 0 2
       'Man-xref-header-file)