From: Chong Yidong <cyd@gnu.org>
Date: Sun, 29 Jan 2012 14:22:51 +0000 (+0800)
Subject: * lisp/frame.el (window-system-default-frame-alist): Doc fix.
X-Git-Tag: emacs-pretest-24.0.93~1
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=5b95ee8a9630108cb43093bb71d32efae596aa43;p=emacs.git

* lisp/frame.el (window-system-default-frame-alist): Doc fix.
---

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.