diff options
| author | Chong Yidong | 2012-01-29 22:22:51 +0800 |
|---|---|---|
| committer | Chong Yidong | 2012-01-29 22:22:51 +0800 |
| commit | 5b95ee8a9630108cb43093bb71d32efae596aa43 (patch) | |
| tree | ac376f858d809d48969e45c7534e9aa63baf3949 | |
| parent | ea1626708e5f3799f6b116f7ac50dc52fa52579c (diff) | |
| download | emacs-5b95ee8a9630108cb43093bb71d32efae596aa43.tar.gz emacs-5b95ee8a9630108cb43093bb71d32efae596aa43.zip | |
* 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 @@ | |||
| 1 | 2012-01-29 Chong Yidong <cyd@gnu.org> | 1 | 2012-01-29 Chong Yidong <cyd@gnu.org> |
| 2 | 2 | ||
| 3 | * frame.el (window-system-default-frame-alist): Doc fix. | ||
| 4 | |||
| 3 | * dynamic-setting.el (font-setting-change-default-font): Don't | 5 | * dynamic-setting.el (font-setting-change-default-font): Don't |
| 4 | change the default face if SET-FONT argument is non-nil (Bug#9982). | 6 | change the default face if SET-FONT argument is non-nil (Bug#9982). |
| 5 | 7 | ||
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 | |||
| 39 | as its argument.") | 39 | as its argument.") |
| 40 | 40 | ||
| 41 | (defvar window-system-default-frame-alist nil | 41 | (defvar window-system-default-frame-alist nil |
| 42 | "Alist of window-system dependent default frame parameters. | 42 | "Window-system dependent default frame parameters. |
| 43 | Parameters specified here supersede the values given in | 43 | The value should be an alist of elements (WINDOW-SYSTEM . ALIST), |
| 44 | where WINDOW-SYSTEM is a window system symbol (see `window-system') | ||
| 45 | and ALIST is a frame parameter alist like `default-frame-alist'. | ||
| 46 | Then, for frames on WINDOW-SYSTEM, any parameters specified in | ||
| 47 | ALIST supersede the corresponding parameters specified in | ||
| 44 | `default-frame-alist'.") | 48 | `default-frame-alist'.") |
| 45 | 49 | ||
| 46 | ;; The initial value given here used to ask for a minibuffer. | 50 | ;; The initial value given here used to ask for a minibuffer. |