diff options
| author | Chong Yidong | 2012-08-17 17:10:31 +0800 |
|---|---|---|
| committer | Chong Yidong | 2012-08-17 17:10:31 +0800 |
| commit | 383dcbf97748f1a4ef57f8af4f5780501ba78216 (patch) | |
| tree | d21e24ab76f120c7f47cb6fc42b23f828a1fd902 /lisp/ChangeLog | |
| parent | 0df648f9869d11681df46502f7eef2bee1c7ae39 (diff) | |
| download | emacs-383dcbf97748f1a4ef57f8af4f5780501ba78216.tar.gz emacs-383dcbf97748f1a4ef57f8af4f5780501ba78216.zip | |
Allow face-remapping using :font, and use it in mouse-appearance-menu.
* mouse.el (mouse-appearance-menu): If x-select-font returns a
font spec, set the font directly.
* xfaces.c (merge_face_vectors): If the target font specfies a
font spec, make the font's attributes take precedence over
directly-specified attributes.
(merge_face_ref): Recognize :font.
Fixes: debbugs:3228
Diffstat (limited to 'lisp/ChangeLog')
| -rw-r--r-- | lisp/ChangeLog | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 2bc154b1610..8fa6b4c6b47 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog | |||
| @@ -1,3 +1,8 @@ | |||
| 1 | 2012-08-17 Chong Yidong <cyd@gnu.org> | ||
| 2 | |||
| 3 | * mouse.el (mouse-appearance-menu): If x-select-font returns a | ||
| 4 | font spec, set the font directly (Bug#3228). | ||
| 5 | |||
| 1 | 2012-08-17 Martin Rudalics <rudalics@gmx.at> | 6 | 2012-08-17 Martin Rudalics <rudalics@gmx.at> |
| 2 | 7 | ||
| 3 | * window.el (delete-window): Fix last fix. | 8 | * window.el (delete-window): Fix last fix. |