Merged from emacs@sv.gnu.org.

[gnu-emacs] / lisp / net / goto-addr.el

diff --git a/lisp/net/goto-addr.el b/lisp/net/goto-addr.el
index 9925227619fafb00ef277009902b979ac5ef3386..44970f7aaf3ea373884cf53514cf54af465c432c 100644 (file)
--- a/lisp/net/goto-addr.el
+++ b/lisp/net/goto-addr.el
@@ -1,7 +1,7 @@
 ;;; goto-addr.el --- click to browse URL or to send to e-mail address
 
 ;; Copyright (C) 1995, 2000, 2001, 2002, 2003, 2004,
-;;   2005 Free Software Foundation, Inc.
+;;   2005, 2006 Free Software Foundation, Inc.
 
 ;; Author: Eric Ding <ericding@alum.mit.edu>
 ;; Maintainer: FSF
@@ -129,7 +129,7 @@ A value of t means there is no limit--fontify regardless of the size."
       'goto-address-at-point)
     (define-key m (kbd "C-c RET") 'goto-address-at-point)
     m)
-  "keymap to hold goto-addr's mouse key defs under highlighted URLs.")
+  "Keymap to hold goto-addr's mouse key defs under highlighted URLs.")
 
 (defcustom goto-address-url-face 'bold
   "Face to use for URLs."
@@ -242,13 +242,15 @@ address.  If no e-mail address found, return nil."
   "Sets up goto-address functionality in the current buffer.
 Allows user to use mouse/keyboard command to click to go to a URL
 or to send e-mail.
-By default, goto-address binds to mouse-2 and C-c RET.
+By default, goto-address binds `goto-address-at-point' to mouse-2 and C-c RET
+only on URLs and e-mail addresses.
 
 Also fontifies the buffer appropriately (see `goto-address-fontify-p' and
 `goto-address-highlight-p' for more information)."
   (interactive)
   (if goto-address-highlight-p
       (goto-address-fontify)))
+;;;###autoload(put 'goto-address 'safe-local-eval-function t)
 
 (provide 'goto-addr)