diff options
| author | Chong Yidong <cyd@gnu.org> | 2012-01-29 22:22:51 +0800 |
|---|---|---|
| committer | Chong Yidong <cyd@gnu.org> | 2012-01-29 22:22:51 +0800 |
| commit | 5b95ee8a9630108cb43093bb71d32efae596aa43 (patch) | |
| tree | ac376f858d809d48969e45c7534e9aa63baf3949 | |
| parent | ea1626708e5f3799f6b116f7ac50dc52fa52579c (diff) | |
| download | emacs-5b95ee8a9630108cb43093bb71d32efae596aa43.tar.gz | |
* lisp/frame.el (window-system-default-frame-alist): Doc fix.
| -rw-r--r-- | lisp/ChangeLog | 2 | ||||
| -rw-r--r-- | lisp/frame.el | 8 |
2 files changed, 8 insertions, 2 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 1d3bb0b50bf..4e9147ec6a2 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,5 +1,7 @@ 2012-01-29 Chong Yidong <cyd@gnu.org> + * frame.el (window-system-default-frame-alist): Doc fix. + * dynamic-setting.el (font-setting-change-default-font): Don't change the default face if SET-FONT argument is non-nil (Bug#9982). diff --git a/lisp/frame.el b/lisp/frame.el index 88ae712bab2..392613defd6 100644 --- a/lisp/frame.el +++ b/lisp/frame.el @@ -39,8 +39,12 @@ function to this list, which should take an alist of parameters as its argument.") (defvar window-system-default-frame-alist nil - "Alist of window-system dependent default frame parameters. -Parameters specified here supersede the values given in + "Window-system dependent default frame parameters. +The value should be an alist of elements (WINDOW-SYSTEM . ALIST), +where WINDOW-SYSTEM is a window system symbol (see `window-system') +and ALIST is a frame parameter alist like `default-frame-alist'. +Then, for frames on WINDOW-SYSTEM, any parameters specified in +ALIST supersede the corresponding parameters specified in `default-frame-alist'.") ;; The initial value given here used to ask for a minibuffer. |