diff options
| author | Juanma Barranquero <lekktu@gmail.com> | 2013-06-24 18:06:47 +0200 |
|---|---|---|
| committer | Juanma Barranquero <lekktu@gmail.com> | 2013-06-24 18:06:47 +0200 |
| commit | ae36ca55cd1656c43a048946c1dd3efe599bafd5 (patch) | |
| tree | e3479fe664d81f2c217de72396c301d3caebc2c8 | |
| parent | bdaa086b7769c48ea9813e283478d826a09762a4 (diff) | |
| download | emacs-ae36ca55cd1656c43a048946c1dd3efe599bafd5.tar.gz | |
lisp/faces.el (face-spec-recalc): Revert part of 2013-06-23T20:29:18Z!lekktu@gmail.com.
Fixes: debbugs:14705
| -rw-r--r-- | lisp/ChangeLog | 4 | ||||
| -rw-r--r-- | lisp/faces.el | 1 |
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) |