diff options
| author | Matthias Dahl | 2014-04-28 22:14:17 +0300 |
|---|---|---|
| committer | Eli Zaretskii | 2014-04-28 22:14:17 +0300 |
| commit | bc6953b32f993be10ff3429af5bacb7e18b08ae7 (patch) | |
| tree | 42748ef8286f9392853416097c8340fa2d1715bd /lisp/ChangeLog | |
| parent | 4f5fa75591973935b59beb0b66ffbfcbc9ee63cc (diff) | |
| download | emacs-bc6953b32f993be10ff3429af5bacb7e18b08ae7.tar.gz emacs-bc6953b32f993be10ff3429af5bacb7e18b08ae7.zip | |
Fix bug 16694 with applying X resources to faces too early.
lisp/faces.el (face-spec-recalc): Apply X resources only after the
defface spec has been applied. Thus, X resources are no longer
overriden by the defface spec which also fixes issues on win32 where
the toolbar coloring was wrong because it is set through X resources
and was (wrongfully) overriden.
Diffstat (limited to 'lisp/ChangeLog')
| -rw-r--r-- | lisp/ChangeLog | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog index e27d7b1c6a0..26516fd2cd3 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog | |||
| @@ -1,3 +1,11 @@ | |||
| 1 | 2014-04-27 Matthias Dahl <matthias.dahl@binary-island.eu> | ||
| 2 | |||
| 3 | * faces.el (face-spec-recalc): Apply X resources only after the | ||
| 4 | the defface spec has been applied. Thus, X resources are no longer | ||
| 5 | overriden by the defface spec which also fixes issues on win32 where | ||
| 6 | the toolbar coloring was wrong because it is set through X resources | ||
| 7 | and was (wrongfully) overriden. (Bug#16694) | ||
| 8 | |||
| 1 | 2014-04-28 Stefan Monnier <monnier@iro.umontreal.ca> | 9 | 2014-04-28 Stefan Monnier <monnier@iro.umontreal.ca> |
| 2 | 10 | ||
| 3 | * textmodes/rst.el (electric-pair-pairs): Declare. | 11 | * textmodes/rst.el (electric-pair-pairs): Declare. |