summaryrefslogtreecommitdiff
path: root/lisp
diff options
context:
space:
mode:
authorChong Yidong <cyd@stupidchicken.com>2011-07-05 11:23:15 -0400
committerChong Yidong <cyd@stupidchicken.com>2011-07-05 11:23:15 -0400
commit73fed7aeda408ab0e9d67ca3c44a4c7711e5b490 (patch)
treee0a38bed47709eef7f337fd450e5be67d68cc217 /lisp
parentb27640fef2c099a5c2191ee6ada5d29737faa68a (diff)
downloademacs-73fed7aeda408ab0e9d67ca3c44a4c7711e5b490.tar.gz
Revert last change (2011-07-05T14:25:21Z!larsi@gnus.org).
Diffstat (limited to 'lisp')
-rw-r--r--lisp/ChangeLog6
-rw-r--r--lisp/font-lock.el2
2 files changed, 1 insertions, 7 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 3214ed28826..e83b65fe4e5 100644
--- 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 2175aee03df..3743dd54b7a 100644
--- 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)))