summaryrefslogtreecommitdiff
path: root/lisp/cus-start.el
diff options
context:
space:
mode:
authorJan Djärv <jan.h.d@swipnet.se>2009-11-17 20:17:46 +0000
committerJan Djärv <jan.h.d@swipnet.se>2009-11-17 20:17:46 +0000
commitdfb3c4c6403a4199e2479ef9a06713b3cdc504d1 (patch)
tree25ce5cc1a9fb929b243ccf7861ead2eec4e0d970 /lisp/cus-start.el
parent25fe851a7c3c37ba537e5c08af2b0396ccb5ad60 (diff)
downloademacs-dfb3c4c6403a4199e2479ef9a06713b3cdc504d1.tar.gz
xsettings.c didn't check font-use-system-font, fix that.
* xsettings.c (something_changedCB, Ffont_get_system_font): Check use_system_font. (syms_of_xsettings): DEFVAR font-use-system-font. * font-setting.el (font-use-system-font): Moved ... * cus-start.el (all): ... to here.
Diffstat (limited to 'lisp/cus-start.el')
-rw-r--r--lisp/cus-start.el4
1 files changed, 3 insertions, 1 deletions
diff --git a/lisp/cus-start.el b/lisp/cus-start.el
index 970431d46cd..76acd7e92cb 100644
--- a/lisp/cus-start.el
+++ b/lisp/cus-start.el
@@ -351,7 +351,9 @@ since it could result in memory overflow and make Emacs crash."
;; xterm.c
(x-use-underline-position-properties display boolean "22.1")
(x-underline-at-descent-line display boolean "22.1")
- (x-stretch-cursor display boolean "21.1")))
+ (x-stretch-cursor display boolean "21.1")
+ ;; xsettings.c
+ (font-use-system-font font-selection boolean "23.2")))
this symbol group type standard version native-p
;; This function turns a value
;; into an expression which produces that value.