aboutsummaryrefslogtreecommitdiffstats
path: root/lisp
diff options
context:
space:
mode:
authorJuanma Barranquero2013-06-24 18:06:47 +0200
committerJuanma Barranquero2013-06-24 18:06:47 +0200
commitae36ca55cd1656c43a048946c1dd3efe599bafd5 (patch)
treee3479fe664d81f2c217de72396c301d3caebc2c8 /lisp
parentbdaa086b7769c48ea9813e283478d826a09762a4 (diff)
downloademacs-ae36ca55cd1656c43a048946c1dd3efe599bafd5.tar.gz
emacs-ae36ca55cd1656c43a048946c1dd3efe599bafd5.zip
lisp/faces.el (face-spec-recalc): Revert part of 2013-06-23T20:29:18Z!lekktu@gmail.com.
Fixes: debbugs:14705
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 @@
12013-06-24 Juanma Barranquero <lekktu@gmail.com>
2
3 * faces.el (face-spec-recalc): Revert part of 2013-06-23T20:29:18Z!lekktu@gmail.com (bug#14705).
4
12013-06-24 Lars Magne Ingebrigtsen <larsi@gnus.org> 52013-06-24 Lars Magne Ingebrigtsen <larsi@gnus.org>
2 6
3 * net/shr.el (shr-browse-url): Use an external browser if given a 7 * 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."
1627 "Reset the face attributes of FACE on FRAME according to its specs. 1627 "Reset the face attributes of FACE on FRAME according to its specs.
1628This applies the defface/custom spec first, then the custom theme specs, 1628This applies the defface/custom spec first, then the custom theme specs,
1629then the override spec." 1629then the override spec."
1630 (check-face face)
1631 (while (get face 'face-alias) 1630 (while (get face 'face-alias)
1632 (setq face (get face 'face-alias))) 1631 (setq face (get face 'face-alias)))
1633 (face-spec-reset-face face frame) 1632 (face-spec-reset-face face frame)