diff options
| author | Jan D <jan.h.d@swipnet.se> | 2010-06-30 13:16:01 +0200 |
|---|---|---|
| committer | Jan D <jan.h.d@swipnet.se> | 2010-06-30 13:16:01 +0200 |
| commit | bf93533944382aec92b21cd4bfed01a263fbabd0 (patch) | |
| tree | 4fc1bbc83f266c103f09f126460b6e47d269ed71 | |
| parent | 769e9d470d674ba60fcf085bccd29824657dc776 (diff) | |
| download | emacs-bf93533944382aec92b21cd4bfed01a263fbabd0.tar.gz | |
Improve doc for system font things. Return font regardless of use_system_font.
* xsettings.c (Ffont_get_system_normal_font, Ffont_get_system_font):
Improve documentation. Return font regardless of use_system_font.
(syms_of_xsettings): Improve documentation for font-use-system-font.
| -rw-r--r-- | src/ChangeLog | 6 | ||||
| -rw-r--r-- | src/xsettings.c | 13 |
2 files changed, 14 insertions, 5 deletions
diff --git a/src/ChangeLog b/src/ChangeLog index 8d5413685ce..faf4a14702e 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,3 +1,9 @@ +2010-06-30 Jan Djärv <jan.h.d@swipnet.se> + + * xsettings.c (Ffont_get_system_normal_font, Ffont_get_system_font): + Improve documentation. Return font regardless of use_system_font. + (syms_of_xsettings): Improve documentation for font-use-system-font. + 2009-06-17 Naohiro Aota <naota@elisp.net> (tiny change) * xftfont.c (xftfont_open): Check font width one by one also when diff --git a/src/xsettings.c b/src/xsettings.c index 8cfcafe126d..2760e48fe05 100644 --- a/src/xsettings.c +++ b/src/xsettings.c @@ -719,20 +719,20 @@ xsettings_get_system_normal_font () DEFUN ("font-get-system-normal-font", Ffont_get_system_normal_font, Sfont_get_system_normal_font, 0, 0, 0, - doc: /* Get the system default font. */) + doc: /* Get the system default application font. */) () { - return current_font && use_system_font + return current_font ? make_string (current_font, strlen (current_font)) : Qnil; } DEFUN ("font-get-system-font", Ffont_get_system_font, Sfont_get_system_font, 0, 0, 0, - doc: /* Get the system default monospaced font. */) + doc: /* Get the system default fixed width font. */) () { - return current_mono_font && use_system_font + return current_mono_font ? make_string (current_mono_font, strlen (current_mono_font)) : Qnil; } @@ -774,7 +774,10 @@ syms_of_xsettings () defsubr (&Sfont_get_system_normal_font); DEFVAR_BOOL ("font-use-system-font", &use_system_font, - doc: /* *Non-nil means to use the system defined font. */); + doc: /* *Non-nil means to apply the system defined font dynamically. +When this is non-nil and the system defined fixed width font changes, we +update frames dynamically. +If this variable is nil, Emacs ignores system font changes. */); use_system_font = 0; DEFVAR_LISP ("xft-settings", &Vxft_settings, |