emacs-diffs
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

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


From: Eli Zaretskii
Subject: [Emacs-diffs] Changes to emacs/lisp/man.el
Date: Sat, 19 Nov 2005 06:53:34 -0500

Index: emacs/lisp/man.el
diff -c emacs/lisp/man.el:1.157 emacs/lisp/man.el:1.158
*** emacs/lisp/man.el:1.157     Thu Nov 10 04:49:19 2005
--- emacs/lisp/man.el   Sat Nov 19 11:53:34 2005
***************
*** 919,953 ****
  (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."
    ;; `Man-highlight-references' is used from woman.el, too.
    ;; woman.el doesn't set `Man-arguments'.
    (unless Man-arguments
      (setq Man-arguments ""))
    (if (string-match "-k " Man-arguments)
        (progn
!       (Man-highlight-references0
!        nil Man-reference-regexp 1 nil
!        (or xref-man-type 'Man-xref-man-page))
!       (Man-highlight-references0
!        nil Man-apropos-regexp 1 (lambda () 
!                                   (format "%s(%s)"
!                                           (match-string 1)
!                                           (match-string 2)))
!        (or xref-man-type 'Man-xref-man-page))
!       )
!     (Man-highlight-references0
!      Man-see-also-regexp Man-reference-regexp 1 nil
!      (or xref-man-type 'Man-xref-man-page))
!     (Man-highlight-references0
!      Man-synopsis-regexp Man-header-regexp 0 2
!      'Man-xref-header-file)
!     (Man-highlight-references0
!      Man-files-regexp Man-normal-file-regexp 0 0
!      'Man-xref-normal-file)))
  
  (defun Man-highlight-references0 (start-section regexp button-pos target type)
    ;; Based on `Man-build-references-alist'
--- 919,948 ----
  (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 optional argument XREF-MAN-TYPE is non-nil, it used as the
! button type for items in SEE ALSO section.  If it is nil, the
! default type, `Man-xref-man-page' is used for the buttons."
    ;; `Man-highlight-references' is used from woman.el, too.
    ;; woman.el doesn't set `Man-arguments'.
    (unless Man-arguments
      (setq Man-arguments ""))
    (if (string-match "-k " Man-arguments)
        (progn
!       (Man-highlight-references0 nil Man-reference-regexp 1 nil
!                                  (or xref-man-type 'Man-xref-man-page))
!       (Man-highlight-references0 nil Man-apropos-regexp 1
!                                  (lambda ()
!                                    (format "%s(%s)"
!                                            (match-string 1)
!                                            (match-string 2)))
!                                  (or xref-man-type 'Man-xref-man-page)))
!     (Man-highlight-references0 Man-see-also-regexp Man-reference-regexp 1 nil
!                              (or xref-man-type 'Man-xref-man-page))
!     (Man-highlight-references0 Man-synopsis-regexp Man-header-regexp 0 2
!                              'Man-xref-header-file)
!     (Man-highlight-references0 Man-files-regexp Man-normal-file-regexp 0 0
!                              'Man-xref-normal-file)))
  
  (defun Man-highlight-references0 (start-section regexp button-pos target type)
    ;; Based on `Man-build-references-alist'




reply via email to

[Prev in Thread] Current Thread [Next in Thread]