summaryrefslogtreecommitdiff
path: root/lisp
diff options
context:
space:
mode:
Diffstat (limited to 'lisp')
-rw-r--r--lisp/ChangeLog4
-rw-r--r--lisp/faces.el1
2 files changed, 4 insertions, 1 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 9a2086976e7..c55666a0cad 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,7 @@
+2013-06-24 Juanma Barranquero <lekktu@gmail.com>
+
+ * faces.el (face-spec-recalc): Revert part of 2013-06-23T20:29:18Z!lekktu@gmail.com (bug#14705).
+
2013-06-24 Lars Magne Ingebrigtsen <larsi@gnus.org>
* net/shr.el (shr-browse-url): Use an external browser if given a
diff --git a/lisp/faces.el b/lisp/faces.el
index 65039c095e5..0a3f0551325 100644
--- a/lisp/faces.el
+++ b/lisp/faces.el
@@ -1627,7 +1627,6 @@ the face's attributes on existing frames."
"Reset the face attributes of FACE on FRAME according to its specs.
This applies the defface/custom spec first, then the custom theme specs,
then the override spec."
- (check-face face)
(while (get face 'face-alias)
(setq face (get face 'face-alias)))
(face-spec-reset-face face frame)