diff options
| author | Matthias Dahl | 2014-04-05 10:15:11 +0300 |
|---|---|---|
| committer | Eli Zaretskii | 2014-04-05 10:15:11 +0300 |
| commit | eb7a03cc7672f8179b9d1a403bb019e753ed907f (patch) | |
| tree | 6e38fc132dd12c1d37d9b0f3a0c6eca27d34e455 /lisp/ChangeLog | |
| parent | 3ccd4eafd3d51285b2d9eb4e5e83b3be20dbfe9f (diff) | |
| download | emacs-eb7a03cc7672f8179b9d1a403bb019e753ed907f.tar.gz emacs-eb7a03cc7672f8179b9d1a403bb019e753ed907f.zip | |
Fix bug #16694 with theme face precedence.
lisp/faces.el (face-spec-recalc): Call make-face-x-resource-internal
only when inhibit-x-resources is nil, and do that earlier in the
function. Doc fix.
Diffstat (limited to 'lisp/ChangeLog')
| -rw-r--r-- | lisp/ChangeLog | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 7ab920990b4..a74e121c6bd 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog | |||
| @@ -1,3 +1,9 @@ | |||
| 1 | 2014-04-05 Matthias Dahl <ml_emacs-lists@binary-island.eu> | ||
| 2 | |||
| 3 | * faces.el (face-spec-recalc): Call make-face-x-resource-internal | ||
| 4 | only when inhibit-x-resources is nil, and do that earlier in the | ||
| 5 | function. Doc fix. (Bug#16694) | ||
| 6 | |||
| 1 | 2014-04-04 Tassilo Horn <tsdh@gnu.org> | 7 | 2014-04-04 Tassilo Horn <tsdh@gnu.org> |
| 2 | 8 | ||
| 3 | * doc-view.el (doc-view-bookmark-jump): Use | 9 | * doc-view.el (doc-view-bookmark-jump): Use |