Revert last change (2011-07-05T14:25:21Z!larsi@gnus.org).

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 3214ed2882638cd410cc41dfa8c991df24ad9d08..e83b65fe4e512cb06d3d97aee443d4b1332c2b13 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -4,12 +4,6 @@
        Fix check of `emacs-lock-unlockable-modes'.
        Coerce true values of `emacs-lock--try-unlocking' to t.
 
-2011-07-05  Lars Magne Ingebrigtsen  <larsi@gnus.org>
-
-       * font-lock.el (font-lock-builtin-face): Change from Orchid to
-       MediumBlue on light-coloured backgrounds to avoid confusion with
-       the doc string (bug#6693).
-
 2011-07-05  Juanma Barranquero  <lekktu@gmail.com>
 
        * obsolete/old-emacs-lock.el: Rename from emacs-lock.el.

diff --git a/lisp/font-lock.el b/lisp/font-lock.el
index 2175aee03df981c727f3170148467aaaf92e725d..3743dd54b7a25455aa8da11518c287e55dd38278 100644 (file)
--- a/lisp/font-lock.el
+++ b/lisp/font-lock.el
@@ -1906,7 +1906,7 @@ Sets various variables using `font-lock-defaults' and
     (((class grayscale) (background dark)) (:foreground "DimGray" :weight bold))
     (((class color) (min-colors 88) (background light)) (:foreground "dark slate blue"))
     (((class color) (min-colors 88) (background dark)) (:foreground "LightSteelBlue"))
-    (((class color) (min-colors 16) (background light)) (:foreground "MediumBlue"))
+    (((class color) (min-colors 16) (background light)) (:foreground "Orchid"))
     (((class color) (min-colors 16) (background dark)) (:foreground "LightSteelBlue"))
     (((class color) (min-colors 8)) (:foreground "blue" :weight bold))
     (t (:weight bold)))