mirror/emacs
1
0
Fork 0
mirror of https://git.savannah.gnu.org/git/emacs.git synced 2025-01-04 11:40:22 +00:00
Code Issues Releases Activity

Fix an instance of dynamic-setting.el clobbering the default face.

Browse Source 
* lisp/dynamic-setting.el (font-setting-change-default-font): Don't
change the default face if SET-FONT argument is non-nil.

Fixes: debbugs:9982
This commit is contained in:
Chong Yidong 2012-01-29 21:55:09 +08:00
parent bdbc1c4e3e
commit ea1626708e
2 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
lisp/ChangeLog
View File

@ -1,3 +1,8 @@
2012-01-29 Chong Yidong <cyd@gnu.org>
* dynamic-setting.el (font-setting-change-default-font): Don't
change the default face if SET-FONT argument is non-nil (Bug#9982).
2012-01-29 Samuel Bronson <naesten@gmail.com> (tiny change)
* custom.el (defcustom): Add doc link to Lisp manual (Bug#10635).

7
lisp/dynamic-setting.el
View File

@ -74,9 +74,10 @@ current form for the frame (i.e. hinting or somesuch changed)."
:font font-to-set))))))
;; Set for future frames.
(set-face-attribute 'default t :font new-font)
(let ((spec (list (list t (face-attr-construct 'default)))))
(progn
(when set-font
;; FIXME: this is not going to play well with Custom themes.
(set-face-attribute 'default t :font new-font)
(let ((spec (list (list t (face-attr-construct 'default)))))
(put 'default 'customized-face spec)
(custom-push-theme 'theme-face 'default 'user 'set spec)
(put 'default 'face-modified nil))))))