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

[Masatake YAMATO]

Index: emacs/lisp/man.el
diff -c emacs/lisp/man.el:1.155 emacs/lisp/man.el:1.156
*** emacs/lisp/man.el:1.155     Tue Oct 18 04:21:51 2005
--- emacs/lisp/man.el   Sun Nov  6 18:01:34 2005
***************
*** 286,294 ****
  This regular expression should start with a `^' character.")
  
  (defvar Man-reference-regexp
!   (concat "\\(" Man-name-regexp "\\)(\\(" Man-section-regexp "\\))")
    "Regular expression describing a reference to another manpage.")
  
  (defvar Man-synopsis-regexp "SYNOPSIS"
    "Regular expression for SYNOPSIS heading (or your equivalent).
  This regexp should not start with a `^' character.")
--- 286,298 ----
  This regular expression should start with a `^' character.")
  
  (defvar Man-reference-regexp
!   (concat "\\(" Man-name-regexp "\\)[ \t]*(\\(" Man-section-regexp "\\))")
    "Regular expression describing a reference to another manpage.")
  
+ (defvar Man-apropos-regexp
+   (concat "\\\[\\(" Man-name-regexp "\\)\\\][ \t]*(\\(" Man-section-regexp 
"\\))")
+   "Regular expression describing a reference to manpages in \"man -k 
output\".")
+ 
  (defvar Man-synopsis-regexp "SYNOPSIS"
    "Regular expression for SYNOPSIS heading (or your equivalent).
  This regexp should not start with a `^' character.")
***************
*** 421,427 ****
    '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
--- 425,432 ----
    'func nil
    'action (lambda (button) (funcall 
                            (button-get button 'func)
!                           (or (button-get button 'Man-target-string)
!                               (button-label button)))))
  
  (define-button-type 'Man-xref-man-page 
    :supertype 'Man-abstract-xref-man-page
***************
*** 918,926 ****
  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
--- 923,942 ----
  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."
!   (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
***************
*** 929,949 ****
       Man-files-regexp Man-normal-file-regexp 0 0
       'Man-xref-normal-file)))
  
! (defun Man-highlight-references0 (start-section regexp button-pos target-pos 
type)
    ;; Based on `Man-build-references-alist'
!   (when (Man-find-section start-section)
!     (forward-line 1)
!     (let ((end (save-excursion
!                  (Man-next-section 1)
!                  (point))))
!       (back-to-indentation)
        (while (re-search-forward regexp end t)
        (make-text-button
         (match-beginning button-pos)
         (match-end button-pos)
         'type type
!        'Man-target-string (match-string target-pos)
!        )))))
  
  (defun Man-cleanup-manpage (&optional interactive)
    "Remove overstriking and underlining from the current buffer.
--- 945,974 ----
       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'
!   (when (or (null start-section)
!           (Man-find-section start-section))
!     (let ((end (if start-section
!                  (progn
!                    (forward-line 1)
!                    (back-to-indentation)
!                    (save-excursion
!                      (Man-next-section 1)
!                      (point)))
!                (goto-char (point-min))
!                (point-max))))
        (while (re-search-forward regexp end t)
        (make-text-button
         (match-beginning button-pos)
         (match-end button-pos)
         'type type
!        'Man-target-string (cond
!                            ((numberp target) 
!                             (match-string target))
!                            ((functionp target)
!                             (funcall target))
!                            (t nil)))))))
  
  (defun Man-cleanup-manpage (&optional interactive)
    "Remove overstriking and underlining from the current buffer.