(goto-address-at-point): Deal with URLs

part of which look like email addresses.

1 files changed, 6 insertions, 1 deletions

diff --git a/lisp/net/goto-addr.el b/lisp/net/goto-addr.el
index 986489bdd62..bb75508935f 100644
--- a/lisp/net/goto-addr.el
+++ b/lisp/net/goto-addr.el
@@ -201,7 +201,12 @@ there, then load the URL at or before point."
   (interactive)
   (save-excursion
     (let ((address (save-excursion (goto-address-find-address-at-point))))
-      (if address
+      (if (and address 
+               (save-excursion
+                 (goto-char (previous-single-char-property-change
+                             (point) 'goto-address nil
+                             (line-beginning-position)))
+                 (not (looking-at goto-address-url-regexp))))
           (compose-mail address)
         (let ((url (browse-url-url-at-point)))
           (if url