From: Eli Zaretskii Date: Sat, 19 Nov 2005 11:54:08 +0000 (+0000) Subject: (Man-highlight-references): Doc fix. Reformat code in a more Lisp-ish way. X-Git-Tag: emacs-pretest-22.0.90~5777 X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=7172607266399e60ee83d0c303784dec1b4c99f3;p=emacs.git (Man-highlight-references): Doc fix. Reformat code in a more Lisp-ish way. --- diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 434fb78185d..dd264bca5a6 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,8 @@ +2005-11-19 Eli Zaretskii + + * man.el (Man-highlight-references): Doc fix. Reformat code in a + more Lisp-ish way. + 2005-11-19 Slawomir Nowaczyk (tiny change) * ls-lisp.el (ls-lisp-format-file-size): Format file size with 9 diff --git a/lisp/man.el b/lisp/man.el index 5b5096f157d..52645db16f5 100644 --- a/lisp/man.el +++ b/lisp/man.el @@ -919,35 +919,30 @@ Same for the ANSI bold and normal escape sequences." (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 ) 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." +header file (#include ), 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))) + (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'