diff options
| author | Dmitry Gutov | 2019-12-10 02:11:15 +0200 |
|---|---|---|
| committer | Dmitry Gutov | 2019-12-10 02:16:44 +0200 |
| commit | 58fb4c3e68a4a42ad491d0fa2c084e5c39942e2b (patch) | |
| tree | efe7a9e6a1b8f76cee65ecd59eb00d9d1e0d1838 /doc | |
| parent | d8d537e17349c02d981eabd92c78f60f73354798 (diff) | |
| download | emacs-58fb4c3e68a4a42ad491d0fa2c084e5c39942e2b.tar.gz emacs-58fb4c3e68a4a42ad491d0fa2c084e5c39942e2b.zip | |
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.
Diffstat (limited to 'doc')
| -rw-r--r-- | doc/lispref/display.texi | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/doc/lispref/display.texi b/doc/lispref/display.texi index ea3fa6f9b11..48a41f53677 100644 --- a/doc/lispref/display.texi +++ b/doc/lispref/display.texi | |||
| @@ -2499,9 +2499,12 @@ space between end of line and edge of the window using this face, or | |||
| 2499 | @code{nil} to not use this face for the space between the end of the | 2499 | @code{nil} to not use this face for the space between the end of the |
| 2500 | line and the edge of the window. When Emacs merges several faces for | 2500 | line and the edge of the window. When Emacs merges several faces for |
| 2501 | displaying the empty space beyond end of line, only those faces with | 2501 | displaying the empty space beyond end of line, only those faces with |
| 2502 | @code{:extend} non-@code{nil} will be merged. By default, only | 2502 | @code{:extend} non-@code{nil} will be merged. By default, only a |
| 2503 | @code{region} and @code{hl-line} faces have this attribute set to | 2503 | small number of faces, notably, @code{region}, have this attribute |
| 2504 | @code{t}. | 2504 | set. This attribute is different from the others in that when a theme |
| 2505 | doesn't specify an explicit value for a face, the value from the | ||
| 2506 | original face definition by @code{defface} is inherited | ||
| 2507 | (@pxref{Defining Faces}). | ||
| 2505 | 2508 | ||
| 2506 | @end table | 2509 | @end table |
| 2507 | 2510 | ||