]> git.eshelyaron.com Git - emacs.git/commit
Make ':extend' inherited from default spec unless overridden
authorDmitry Gutov <dgutov@yandex.ru>
Tue, 10 Dec 2019 00:11:15 +0000 (02:11 +0200)
committerDmitry Gutov <dgutov@yandex.ru>
Tue, 10 Dec 2019 00:16:44 +0000 (02:16 +0200)
commit58fb4c3e68a4a42ad491d0fa2c084e5c39942e2b
treeefe7a9e6a1b8f76cee65ecd59eb00d9d1e0d1838
parentd8d537e17349c02d981eabd92c78f60f73354798
Make ':extend' inherited from default spec unless overridden

* lisp/faces.el (face-spec-recalc): Handle the :extend attribute
specially and always inherit it from the default spec unless
overwritten in a theme (bug#37774).

* test/lisp/faces-tests.el (faces--test-data-dir): New variable.
(faces--test-extend-with-themes): Use test themes instead of ones
from etc/themes.  Update expected values.

* test/data/themes/faces-test-dark-theme.el: New file.

* test/data/themes/faces-test-light-theme.el: New file.

* doc/lispref/display.texi (Face Attributes):
Update the description of ':extend'.

* etc/NEWS: Update the entry for ':extend'.

* etc/themes/adwaita-theme.el:
* etc/themes/deeper-blue-theme.el:
* etc/themes/dichromacy-theme.el:
* etc/themes/leuven-theme.el:
* etc/themes/light-blue-theme.el:
* etc/themes/manoj-dark-theme.el:
* etc/themes/misterioso-theme.el:
* etc/themes/tango-dark-theme.el:
* etc/themes/tango-theme.el:
* etc/themes/tsdh-dark-theme.el:
* etc/themes/tsdh-light-theme.el:
* etc/themes/wheatgrass-theme.el:
* etc/themes/wombat-theme.el: Remove the now-redundant ':extend'
attribute in all the themes.
19 files changed:
doc/lispref/display.texi
etc/NEWS
etc/themes/adwaita-theme.el
etc/themes/deeper-blue-theme.el
etc/themes/dichromacy-theme.el
etc/themes/leuven-theme.el
etc/themes/light-blue-theme.el
etc/themes/manoj-dark-theme.el
etc/themes/misterioso-theme.el
etc/themes/tango-dark-theme.el
etc/themes/tango-theme.el
etc/themes/tsdh-dark-theme.el
etc/themes/tsdh-light-theme.el
etc/themes/wheatgrass-theme.el
etc/themes/wombat-theme.el
lisp/faces.el
test/data/themes/faces-test-dark-theme.el [new file with mode: 0644]
test/data/themes/faces-test-light-theme.el [new file with mode: 0644]
test/lisp/faces-tests.el