summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChong Yidong <cyd@gnu.org>2012-11-05 22:30:58 +0800
committerChong Yidong <cyd@gnu.org>2012-11-05 22:30:58 +0800
commita9a3835c2671e24dc3b41c6b9bc9469ee66b7510 (patch)
tree6ed907bc1607b4cf5e54d81704a619c7d82020e5
parent766376c674822a81e1d8f5a481d1390dfa5b78a1 (diff)
downloademacs-a9a3835c2671e24dc3b41c6b9bc9469ee66b7510.tar.gz
* frames.texi (Initial Parameters): Doc fix.
Fixes: debbugs:12144
-rw-r--r--doc/lispref/ChangeLog4
-rw-r--r--doc/lispref/frames.texi14
2 files changed, 11 insertions, 7 deletions
diff --git a/doc/lispref/ChangeLog b/doc/lispref/ChangeLog
index 17bd43fc0d9..8057089cf68 100644
--- a/doc/lispref/ChangeLog
+++ b/doc/lispref/ChangeLog
@@ -1,3 +1,7 @@
+2012-11-05 Chong Yidong <cyd@gnu.org>
+
+ * frames.texi (Initial Parameters): Doc fix (Bug#12144).
+
2012-11-03 Chong Yidong <cyd@gnu.org>
* objects.texi (General Escape Syntax): Clarify the explanation of
diff --git a/doc/lispref/frames.texi b/doc/lispref/frames.texi
index f58d62675e5..27d55c4fdb9 100644
--- a/doc/lispref/frames.texi
+++ b/doc/lispref/frames.texi
@@ -419,16 +419,16 @@ the initial frame, specify the same parameters in
@code{initial-frame-alist} with values that match the X resources.
@end defopt
-If these parameters specify a separate @dfn{minibuffer-only frame} with
-@code{(minibuffer . nil)}, and you have not created one, Emacs creates
-one for you.
-
@cindex minibuffer-only frame
+If these parameters include @code{(minibuffer . nil)}, that indicates
+that the initial frame should have no minibuffer. In this case, Emacs
+creates a separate @dfn{minibuffer-only frame} as well.
+
@defopt minibuffer-frame-alist
This variable's value is an alist of parameter values used when
-creating an initial minibuffer-only frame. This is the
-minibuffer-only frame that Emacs creates if @code{initial-frame-alist}
-specifies a frame with no minibuffer.
+creating an initial minibuffer-only frame (i.e.@: the minibuffer-only
+frame that Emacs creates if @code{initial-frame-alist} specifies a
+frame with no minibuffer).
@end defopt
@defopt default-frame-alist