4 files changed, 12 insertions, 7 deletions

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index d359fa927bc..cd5ec46128b 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,5 +1,8 @@
 2011-01-09  Chong Yidong  <cyd@stupidchicken.com>
 
+        * progmodes/idlw-help.el (idlwave-help-link): Inherit from link
+        face.  Suggested by Joakim Verona.
+
         * comint.el (comint-highlight-prompt): Inherit minibuffer-prompt.
 
         * wid-edit.el (visibility): Replace :on-image and :off-image
diff --git a/lisp/org/ChangeLog b/lisp/org/ChangeLog
index 9bf07deeffe..e8531be05f8 100644
--- a/lisp/org/ChangeLog
+++ b/lisp/org/ChangeLog
@@ -1,3 +1,8 @@
+2011-01-09  Chong Yidong  <cyd@stupidchicken.com>
+
+        * org-faces.el (org-link): Inherit from link face.
+        Suggested by Joakim Verona.
+
 2010-12-11  Tassilo Horn  <tassilo@member.fsf.org>
 
         * org-footnote.el (org-footnote-create-definition): Place
diff --git a/lisp/org/org-faces.el b/lisp/org/org-faces.el
index 3f8245758f7..d4f458232ce 100644
--- a/lisp/org/org-faces.el
+++ b/lisp/org/org-faces.el
@@ -1,6 +1,6 @@
 ;;; org-faces.el --- Face definitions for Org-mode.
 
-;; Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009, 2010
+;; Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011
 ;;   Free Software Foundation, Inc.
 
 ;; Author: Carsten Dominik <carsten at orgmode dot org>
@@ -247,9 +247,7 @@ column view defines special faces for each outline level.  See the file
   :group 'org-faces)
 
 (defface org-link
-  '((((class color) (background light)) (:foreground "Purple" :underline t))
-    (((class color) (background dark)) (:foreground "Cyan" :underline t))
-    (t (:underline t)))
+  '((t :inherit link))
   "Face for links."
   :group 'org-faces)
 
diff --git a/lisp/progmodes/idlw-help.el b/lisp/progmodes/idlw-help.el
index 0674ccf730a..f8121beb231 100644
--- a/lisp/progmodes/idlw-help.el
+++ b/lisp/progmodes/idlw-help.el
@@ -1,7 +1,7 @@
 ;;; idlw-help.el --- HTML Help code for IDLWAVE
 
 ;; Copyright (C) 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008,
-;;   2009, 2010  Free Software Foundation, Inc.
+;;   2009, 2010, 2011  Free Software Foundation, Inc.
 ;;
 ;; Authors: J.D. Smith <jdsmith@as.arizona.edu>
 ;;          Carsten Dominik <dominik@science.uva.nl>
@@ -195,8 +195,7 @@ support."
   :type 'string)
 
 (defface idlwave-help-link
-  '((((class color)) (:foreground "Blue"))
-    (t (:weight bold)))
+  '((t :inherit link))
   "Face for highlighting links into IDLWAVE online help."
   :group 'idlwave-online-help)