diff options
| author | Matthias Dahl | 2014-04-05 10:25:52 +0300 |
|---|---|---|
| committer | Eli Zaretskii | 2014-04-05 10:25:52 +0300 |
| commit | fdafd487a90fbd4febe853971f238c5395c12542 (patch) | |
| tree | c9bdfaa3aee04e2cd021d093ab30b46b4a80ebf0 /lisp/ChangeLog | |
| parent | eb7a03cc7672f8179b9d1a403bb019e753ed907f (diff) | |
| download | emacs-fdafd487a90fbd4febe853971f238c5395c12542.tar.gz emacs-fdafd487a90fbd4febe853971f238c5395c12542.zip | |
Fix bug #16378 with mishandling of empty faces.
lisp/faces.el (face-spec-choose): Accept additional optional argument,
whose value is returned if no matching attributes are found.
(face-spec-recalc): Use the new optional argument when calling
face-spec-choose.
Diffstat (limited to 'lisp/ChangeLog')
| -rw-r--r-- | lisp/ChangeLog | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog index a74e121c6bd..bb283ab84df 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog | |||
| @@ -3,6 +3,10 @@ | |||
| 3 | * faces.el (face-spec-recalc): Call make-face-x-resource-internal | 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 | 4 | only when inhibit-x-resources is nil, and do that earlier in the |
| 5 | function. Doc fix. (Bug#16694) | 5 | function. Doc fix. (Bug#16694) |
| 6 | (face-spec-choose): Accept additional optional argument, whose | ||
| 7 | value is returned if no matching attributes are found. | ||
| 8 | (face-spec-recalc): Use the new optional argument when calling | ||
| 9 | face-spec-choose. (Bug#16378) | ||
| 6 | 10 | ||
| 7 | 2014-04-04 Tassilo Horn <tsdh@gnu.org> | 11 | 2014-04-04 Tassilo Horn <tsdh@gnu.org> |
| 8 | 12 | ||