(woman-xref): Removed.

(woman-mode): Use `Man-highlight-references' instead of `WoMan-highlight-references'.
(WoMan-highlight-references): Removed.

2 files changed, 25 insertions, 23 deletions

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 3837bb7aebf..9f52e873dd6 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,27 @@
+2003-04-02  Masatake YAMATO  <jet@gyve.org>
+
+        * woman.el (woman-xref): Removed.
+        (woman-mode): Use `Man-highlight-references' instead of
+        `WoMan-highlight-references'.
+        (WoMan-highlight-references): Removed.
+
+        * man.el (toplevel): Require button.
+        (Man-header-file-path): New option.
+        (Man-synopsis-regexp, Man-files-regexp, Man-include-regexp)
+        (Man-file-name-regexp, Man-normal-file-prefix-regexp)
+        (Man-header-regexp, Man-normal-file-regexp): New variables.
+        (Man-mode-map): Inherited from `button-buffer-map'.  Don't define
+        "\r" and mouse-2 directly.  These key are defined in
+        `button-buffer-map'.
+        (Man-xref-man-page, Man-xref-header-file, Man-xref-normal-file): New
+        buttons.  `Man-xref-man-page' comes from woman.el.
+        (man-follow-mouse): Removed.
+        (Man-fontify-manpage): Use `Man-highlight-references' instead of
+        calling `add-text-properties' directly.
+        (Man-highlight-references, Man-highlight-references0): New
+        functions.
+        (Man-view-header-file): New function.
+
 2003-04-02  Stefan Monnier  <monnier@cs.yale.edu>
 
         * progmodes/asm-mode.el (asm-calculate-indentation, asm-indent-line):
diff --git a/lisp/woman.el b/lisp/woman.el
index c3becb5186e..06eeb6c56e6 100644
--- a/lisp/woman.el
+++ b/lisp/woman.el
@@ -1059,13 +1059,6 @@ Should include ?e, ?o (page even/odd) and either ?n (nroff) or ?t (troff).
 Default is '(?n ?e ?o).  Set via `woman-emulation'.")
 
 
-;;; Button types:
-
-(define-button-type 'woman-xref
-  'action (lambda (button) (woman (button-label button)))
-  'help-echo "RET, mouse-2: display this man page")
-
-
 ;;; Specialized utility functions:
 
 ;;; Fast deletion without saving on the kill ring (cf. simple.el):
@@ -1869,7 +1862,7 @@ See `Man-mode' for additional details."
     (setq woman-imenu-done nil)
     (if woman-imenu (woman-imenu))
     (setq buffer-read-only nil)
-    (WoMan-highlight-references)
+    (Man-highlight-references)
     (setq buffer-read-only t)
     (set-buffer-modified-p nil)))
 
@@ -1964,21 +1957,6 @@ Otherwise use Man and record start of formatting time."
                   (- (cadr time) (cadr WoMan-Man-start-time)))))
     (message "Man formatting done in %d seconds" time)))
 
-(defun WoMan-highlight-references ()
-  "Highlight the references (in the SEE ALSO section) on mouse-over."
-  ;; Based on `Man-build-references-alist' in `man'.
-  (when (Man-find-section Man-see-also-regexp)
-    (forward-line 1)
-    (let ((end (save-excursion
-                 (Man-next-section 1)
-                 (point))))
-      (back-to-indentation)
-      (while (re-search-forward Man-reference-regexp end t)
-        ;; Highlight reference when mouse is over it.
-        ;; (NB: WoMan does not hyphenate!)
-        (make-text-button (match-beginning 1) (match-end 1)
-                          'type 'woman-xref)))))
-
 
 ;;; Buffer handling: