* mh-alias.el (mh-address-mail-regexp)

(mh-goto-address-find-address-at-point): Delete copies from
goto-addr.el. (mh-alias-suggest-alias): Use goto-address-mail-regexp
instead of mh-address-mail-regexp.
(mh-alias-add-address-under-point): Use
goto-address-find-address-at-point instead of
mh-goto-address-find-address-at-point.

* mh-e.el (mh-show-use-goto-addr-flag): Delete.

* mh-show.el (mh-show-mode): Mention goto-address-highlight-p in
docstring.
(mh-show-addr): Call goto-address unconditionally. User should use
goto-address-highlight-p instead of mh-show-use-goto-addr-flag.

4 files changed, 32 insertions, 42 deletions

diff --git a/lisp/mh-e/ChangeLog b/lisp/mh-e/ChangeLog
index ae122bca29d..f484912d490 100644
--- a/lisp/mh-e/ChangeLog
+++ b/lisp/mh-e/ChangeLog
@@ -1,3 +1,21 @@
+2006-02-19  Bill Wohler  <wohler@newt.com>
+
+        * mh-alias.el (mh-address-mail-regexp)
+        (mh-goto-address-find-address-at-point): Delete copies from
+        goto-addr.el.
+        (mh-alias-suggest-alias): Use goto-address-mail-regexp instead of
+        mh-address-mail-regexp.
+        (mh-alias-add-address-under-point): Use
+        goto-address-find-address-at-point instead of
+        mh-goto-address-find-address-at-point.
+
+        * mh-e.el (mh-show-use-goto-addr-flag): Delete.
+
+        * mh-show.el (mh-show-mode): Mention goto-address-highlight-p in
+        docstring.
+        (mh-show-addr): Call goto-address unconditionally. User should use
+        goto-address-highlight-p instead of mh-show-use-goto-addr-flag.
+
 2006-02-18  Bill Wohler  <wohler@newt.com>
 
         * mh-e.el (Version, mh-version): Add +cvs to version.
diff --git a/lisp/mh-e/mh-alias.el b/lisp/mh-e/mh-alias.el
index 9dc2871241f..6dba65d69df 100644
--- a/lisp/mh-e/mh-alias.el
+++ b/lisp/mh-e/mh-alias.el
@@ -35,6 +35,8 @@
 
 (mh-require-cl)
 
+(require 'goto-addr)
+
 (defvar mh-alias-alist 'not-read
   "Alist of MH aliases.")
 (defvar mh-alias-blind-alist nil
@@ -62,11 +64,6 @@ alias files listed in your \"Aliasfile:\" MH profile component are
 automatically included. You can update the alias list manually using
 \\[mh-alias-reload].")
 
-;; Copy of `goto-address-mail-regexp'.
-(defvar mh-address-mail-regexp
-  "[-a-zA-Z0-9._]+@\\([-a-zA-z0-9_]+\\.\\)+[a-zA-Z0-9]+"
-  "A regular expression probably matching an e-mail address.")
-
 
 
 ;;; Alias Loading
@@ -343,7 +340,7 @@ NO-COMMA-SWAP is non-nil."
    ((string-match "^\\(.*\\) +<.*>$" string)
     ;; Some name <somename@foo.bar>  -> recurse -> Some name
     (mh-alias-suggest-alias (match-string 1 string) no-comma-swap))
-   ((string-match (concat mh-address-mail-regexp " +(\\(.*\\))$") string)
+   ((string-match (concat goto-address-mail-regexp " +(\\(.*\\))$") string)
     ;; somename@foo.bar (Some name)  -> recurse -> Some name
     (mh-alias-suggest-alias (match-string 1 string) no-comma-swap))
    ((string-match "^\\(Dr\\|Prof\\)\\.? +\\(.*\\)" string)
@@ -595,24 +592,11 @@ filing messages."
 (defun mh-alias-add-address-under-point ()
   "Insert an alias for address under point."
   (interactive)
-  (let ((address (mh-goto-address-find-address-at-point)))
+  (let ((address (goto-address-find-address-at-point)))
     (if address
         (mh-alias-add-alias nil address)
       (message "No email address found under point"))))
 
-;; From goto-addr.el, which we don't want to force-load on users.
-(defun mh-goto-address-find-address-at-point ()
-  "Find e-mail address around or before point.
-
-Then search backwards to beginning of line for the start of an
-e-mail address. If no e-mail address found, return nil."
-  (re-search-backward "[^-_A-z0-9.@]" (mh-line-beginning-position) 'lim)
-  (if (or (looking-at mh-address-mail-regexp) ; already at start
-          (and (re-search-forward mh-address-mail-regexp
-                                  (mh-line-end-position) 'lim)
-               (goto-char (match-beginning 0))))
-      (mh-match-string-no-properties 0)))
-
 (defun mh-alias-apropos (regexp)
   "Show all aliases or addresses that match a regular expression REGEXP."
   (interactive "sAlias regexp: ")
diff --git a/lisp/mh-e/mh-e.el b/lisp/mh-e/mh-e.el
index f6b737c26f7..3dc509c09f0 100644
--- a/lisp/mh-e/mh-e.el
+++ b/lisp/mh-e/mh-e.el
@@ -2615,22 +2615,6 @@ message are shown regardless of size."
   :type 'integer
   :group 'mh-show)
 
-(defcustom mh-show-use-goto-addr-flag (and (boundp 'goto-address-highlight-p)
-                                           goto-address-highlight-p)
-  "*Non-nil means highlight URLs and email addresses\\<goto-address-highlight-keymap>.
-
-To send a message using the highlighted email address or to view
-the web page for the highlighted URL, use the middle mouse button
-or \\[goto-address-at-point].
-
-See Info node `(mh-e)Sending Mail' to see how to configure Emacs
-to send the message using MH-E.
-
-The default value of this option comes from the value of
-`goto-address-highlight-p'."
-  :type 'boolean
-  :group 'mh-show)
-
 (defcustom mh-show-use-xface-flag (>= emacs-major-version 21)
   "*Non-nil means display face images in MH-show buffers.
 
diff --git a/lisp/mh-e/mh-show.el b/lisp/mh-e/mh-show.el
index ab636ae8ab6..3ae609d9204 100644
--- a/lisp/mh-e/mh-show.el
+++ b/lisp/mh-e/mh-show.el
@@ -36,13 +36,13 @@
 (require 'mh-e)
 (require 'mh-scan)
 
+(require 'font-lock)
 (require 'gnus-cite)
 (require 'gnus-util)
+(require 'goto-addr)
 
 (autoload 'mh-make-buffer-data "mh-mime") ;can't be automatically generated
 
-(require 'font-lock)
-
 
 
 ;;; MH-Folder Commands
@@ -818,6 +818,13 @@ operation."
 (define-derived-mode mh-show-mode text-mode "MH-Show"
   "Major mode for showing messages in MH-E.\\<mh-show-mode-map>
 
+Email addresses and URLs in the message are highlighted if the
+option `goto-address-highlight-p' is on, which it is by default.
+To view the web page for a highlighted URL or to send a message
+using a highlighted email address, use the middle mouse button or
+\\[goto-address-at-point]. See Info node `(mh-e)Sending Mail' to
+see how to configure Emacs to send the message using MH-E.
+
 The hook `mh-show-mode-hook' is called upon entry to this mode.
 
 See also `mh-folder-mode'.
@@ -877,10 +884,7 @@ See also `mh-folder-mode'.
 ;;;###mh-autoload
 (defun mh-show-addr ()
   "Use `goto-address'."
-  (when mh-show-use-goto-addr-flag
-    (mh-require 'goto-addr nil t)
-    (if (fboundp 'goto-address)
-        (goto-address))))
+  (goto-address))
 
 ;;;###mh-autoload
 (defun mh-gnus-article-highlight-citation ()