# HG changeset patch
# User Sam Steingold <sds@gnu.org>
# Date 942682571 0
# Node ID a74c3ac8e0d855692610b6b8964a67088e9ca3e3
# Parent  285ab8ddc1255182ff3c13536a263eb15cc262fc
* goto-addr.el (goto-address-at-mouse,
goto-address-find-address-at-point): use compose-mail.
(goto-address-mail-method): removed variable.
(goto-address-send-using-mh-e, goto-address-send-using-mhe,
goto-address-send-using-mail): removed functions.

diff -r 285ab8ddc125 -r a74c3ac8e0d8 lisp/ChangeLog
--- a/lisp/ChangeLog	Mon Nov 15 16:11:14 1999 +0000
+++ b/lisp/ChangeLog	Mon Nov 15 16:16:11 1999 +0000
@@ -1,3 +1,11 @@
+1999-02-22  Sam Steingold  <sds@goems.com>
+ 
+	* goto-addr.el (goto-address-at-mouse,
+	goto-address-find-address-at-point): use compose-mail.
+	(goto-address-mail-method): removed variable.
+	(goto-address-send-using-mh-e, goto-address-send-using-mhe,
+	goto-address-send-using-mail): removed functions.
+ 
 1998-11-03  Sam Steingold  <sds@goems.com>
  
 	* simple.el (backward-delete-char-untabify):
diff -r 285ab8ddc125 -r a74c3ac8e0d8 lisp/goto-addr.el
--- a/lisp/goto-addr.el	Mon Nov 15 16:11:14 1999 +0000
+++ b/lisp/goto-addr.el	Mon Nov 15 16:16:11 1999 +0000
@@ -36,14 +36,9 @@
 ;;
 ;; To use goto-address in a particular mode (for example, while
 ;; reading mail in mh-e), add something like this in your .emacs file:
-;; 
+;;
 ;; (add-hook 'mh-show-mode-hook 'goto-address)
 ;;
-;; By default, goto-address now sends using `mail' instead of `mh-send'.
-;; To use mh-e to send mail, add the following to your .emacs file:
-;;
-;; (setq goto-address-mail-method 'goto-address-send-using-mh-e)
-;;
 ;; The mouse click method is bound to [mouse-2] on highlighted URL's or
 ;; e-mail addresses only; it functions normally everywhere else.  To bind
 ;; another mouse click to the function, add the following to your .emacs
@@ -106,14 +101,6 @@
 	  "[-a-zA-Z0-9_=#$@~`%&*+|\\/]")
   "A regular expression probably matching a URL.")
 
-(defcustom goto-address-mail-method
-  'goto-address-send-using-mail
-  "*Function to compose mail.
-Two pre-made functions are `goto-address-send-using-mail' (sendmail);
-and `goto-address-send-using-mh-e' (MH-E)."
-  :type 'function
-  :group 'goto-address)
-
 (defvar goto-address-highlight-keymap
   (let ((m (make-sparse-keymap)))
     (define-key m [mouse-2] 'goto-address-at-mouse)
@@ -197,7 +184,7 @@
 	      (if (string-equal url "")
 		  (error "No e-mail address or URL found")
 		(browse-url url)))
-	  (funcall goto-address-mail-method address))))))
+            (compose-mail address))))))
 
 ;;;###autoload
 (defun goto-address-at-point ()
@@ -213,7 +200,7 @@
 	    (if (string-equal url "")
 		(error "No e-mail address or URL found")
 	      (browse-url url)))
-	(funcall goto-address-mail-method address)))))
+          (compose-mail address)))))
 
 (defun goto-address-find-address-at-point ()
   "Find e-mail address around or before point.
@@ -226,23 +213,7 @@
 	      (and (re-search-forward goto-address-mail-regexp eol 'lim)
 		   (goto-char (match-beginning 0)))))
 	(buffer-substring (match-beginning 0) (match-end 0))
-      "")))
-
-(defun goto-address-send-using-mh-e (to)
-  (require 'mh-comp)
-  (mh-find-path)
-  (let ((cc (mh-read-address "Cc: "))
-	(subject (read-string "Subject: "))
-	(config (current-window-configuration)))
-    (delete-other-windows)
-    (mh-send-sub to cc subject config)))
-
-(fset 'goto-address-send-using-mhe 'goto-address-send-using-mh-e)
-
-(defun goto-address-send-using-mail (to)
-  (mail-other-window nil to)
-  (and (goto-char (point-min))
-       (end-of-line 2)))
+      "")))m
 
 ;;;###autoload
 (defun goto-address ()