[Emacs-diffs] /srv/bzr/emacs/trunk r104967: Revert last change (r104965).

[Chong Yidong]

------------------------------------------------------------
revno: 104967
committer: Chong Yidong <address@hidden>
branch nick: trunk
timestamp: Tue 2011-07-05 11:23:15 -0400
message:
  Revert last change (r104965).
modified:
  lisp/ChangeLog
  lisp/font-lock.el

=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog    2011-07-05 15:09:19 +0000
+++ b/lisp/ChangeLog    2011-07-05 15:23:15 +0000
@@ -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  <address@hidden>
-
-       * 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  <address@hidden>
 
        * obsolete/old-emacs-lock.el: Rename from emacs-lock.el.

=== modified file 'lisp/font-lock.el'
--- a/lisp/font-lock.el 2011-07-05 14:25:21 +0000
+++ b/lisp/font-lock.el 2011-07-05 15:23:15 +0000
@@ -1906,7 +1906,7 @@
     (((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)))