Merge from emacs-23; up to 2010-06-11T18:51:00Z!juri@jurta.org.

[bpt/emacs.git] / lisp / net / goto-addr.el

diff --git a/lisp/net/goto-addr.el b/lisp/net/goto-addr.el
index e2556bd..4e78a7d 100644 (file)
--- a/lisp/net/goto-addr.el
+++ b/lisp/net/goto-addr.el
@@ -1,7 +1,6 @@
 ;;; goto-addr.el --- click to browse URL or to send to e-mail address
 
-;; Copyright (C) 1995, 2000, 2001, 2002, 2003, 2004,
-;;   2005, 2006, 2007, 2008 Free Software Foundation, Inc.
+;; Copyright (C) 1995, 2000-2011 Free Software Foundation, Inc.
 
 ;; Author: Eric Ding <ericding@alum.mit.edu>
 ;; Maintainer: FSF
@@ -76,7 +75,7 @@
 (defgroup goto-address nil
   "Click to browse URL or to send to e-mail address."
   :group 'mouse
-  :group 'hypermedia)
+  :group 'comm)
 
 
 ;; I don't expect users to want fontify'ing without highlighting.
@@ -129,7 +128,7 @@ A value of t means there is no limit--fontify regardless of the size."
     m)
   "Keymap to hold goto-addr's mouse key defs under highlighted URLs.")
 
-(defcustom goto-address-url-face 'bold
+(defcustom goto-address-url-face 'link
   "Face to use for URLs."
   :type 'face
   :group 'goto-address)
@@ -302,5 +301,4 @@ Also fontifies the buffer appropriately (see `goto-address-fontify-p' and
 
 (provide 'goto-addr)
 
-;; arch-tag: ca47c505-5661-425d-a471-62bc6e75cf0a
 ;;; goto-addr.el ends here