(goto-address-fontify): Put `follow-link' property on mail and url overlays.

(goto-address-at-point): Use `posn-set-point' instead of `mouse-set-point'
because the latter is not fbound when configured without X.

2 files changed, 11 insertions, 1 deletions

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index f151c0933a5..14536747f03 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,11 @@
+2005-11-22  John Paul Wallington  <jpw@gnu.org>
+
+        * net/goto-addr.el (goto-address-fontify): Put `follow-link'
+        property on mail and url overlays.
+        (goto-address-at-point): Use `posn-set-point' instead of
+        `mouse-set-point' because the latter is not fbound when configured
+        without X.
+
 2005-11-22  Lars Hansen  <larsh@soem.dk>
 
         * ls-lisp.el (ls-lisp-parse-symlink): Delete.
diff --git a/lisp/net/goto-addr.el b/lisp/net/goto-addr.el
index d86a8ecdf2d..9925227619f 100644
--- a/lisp/net/goto-addr.el
+++ b/lisp/net/goto-addr.el
@@ -174,6 +174,7 @@ and `goto-address-fontify-p'."
                 (overlay-put this-overlay 'evaporate t)
                 (overlay-put this-overlay
                              'mouse-face goto-address-url-mouse-face)
+                (overlay-put this-overlay 'follow-link t)
                 (overlay-put this-overlay
                              'help-echo "mouse-2, C-c RET: follow URL")
                 (overlay-put this-overlay
@@ -189,6 +190,7 @@ and `goto-address-fontify-p'."
                 (overlay-put this-overlay 'evaporate t)
                 (overlay-put this-overlay 'mouse-face
                              goto-address-mail-mouse-face)
+                (overlay-put this-overlay 'follow-link t)
                 (overlay-put this-overlay
                              'help-echo "mouse-2, C-c RET: mail this address")
                 (overlay-put this-overlay
@@ -210,7 +212,7 @@ Send mail to address at point.  See documentation for
 there, then load the URL at or before point."
   (interactive (list last-input-event))
   (save-excursion
-    (if event (mouse-set-point event))
+    (if event (posn-set-point (event-end event)))
     (let ((address (save-excursion (goto-address-find-address-at-point))))
       (if (and address
                (save-excursion