]> git.eshelyaron.com Git - emacs.git/commit
Allow face-remapping using :font, and use it in mouse-appearance-menu.
authorChong Yidong <cyd@gnu.org>
Fri, 17 Aug 2012 09:10:31 +0000 (17:10 +0800)
committerChong Yidong <cyd@gnu.org>
Fri, 17 Aug 2012 09:10:31 +0000 (17:10 +0800)
commit383dcbf97748f1a4ef57f8af4f5780501ba78216
treed21e24ab76f120c7f47cb6fc42b23f828a1fd902
parent0df648f9869d11681df46502f7eef2bee1c7ae39
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
lisp/ChangeLog
lisp/mouse.el
src/ChangeLog
src/xfaces.c