From: Eli Zaretskii <eliz@gnu.org>
Date: Sat, 31 Mar 2012 09:52:20 +0000 (+0300)
Subject: Fix bug #11091 with inaccurate docs of emacsclient on MS-Windows.
X-Git-Tag: emacs-pretest-24.0.05~22
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=1d265f9f09835fbbfc5a512e19165fee7459015f;p=emacs.git

Fix bug #11091 with inaccurate docs of emacsclient on MS-Windows.

 doc/emacs/misc.texi (emacsclient Options): Document peculiarities of new
 frame creation on MS-Windows under -c or -t options.
---

diff --git a/doc/emacs/ChangeLog b/doc/emacs/ChangeLog
index 85e3054f293..00922658ec7 100644
--- a/doc/emacs/ChangeLog
+++ b/doc/emacs/ChangeLog
@@ -1,3 +1,8 @@
+2012-03-31  Eli Zaretskii  <eliz@gnu.org>
+
+	* misc.texi (emacsclient Options): Document peculiarities of new
+	frame creation on MS-Windows under -c or -t options.  (Bug#11091)
+
 2012-03-30  Chong Yidong  <cyd@gnu.org>
 
 	* files.texi (File Conveniences): Clarify Imagemagick discussion.
diff --git a/doc/emacs/misc.texi b/doc/emacs/misc.texi
index 93dd5e3b8ce..9bb89e7d44a 100644
--- a/doc/emacs/misc.texi
+++ b/doc/emacs/misc.texi
@@ -1506,10 +1506,12 @@ precedence.
 Create a new graphical frame, instead of using an existing Emacs
 frame.  Emacs can create a graphical frame even if it was started in a
 text-only terminal, provided it is able to connect to a graphical
-display.  If no graphical display is available, Emacs creates a new
-text-only terminal frame (@pxref{Frames}).  If you omit a filename
-argument while supplying the @samp{-c} option, the new frame displays
-the @samp{*scratch*} buffer (@pxref{Buffers}).
+display, and provided it can create graphical frames when started from
+a text-only terminal.  Otherwise@footnote{
+This is what happens on MS-Windows.
+}, Emacs creates a new text-only terminal frame (@pxref{Frames}).  If
+you omit a filename argument while supplying the @samp{-c} option, the
+new frame displays the @samp{*scratch*} buffer (@pxref{Buffers}).
 
 @item -F @var{alist}
 @itemx --frame-parameters=@var{alist}
@@ -1592,11 +1594,15 @@ server it finds.  (This option is not supported on MS-Windows.)
 @itemx --tty
 @itemx -nw
 Create a new Emacs frame on the current text-only terminal, instead of
-using an existing Emacs frame.  Emacs can open a text-only terminal
+using an existing Emacs frame.  If Emacs can open a text-only terminal
 even if it was started in another text-only terminal, or on a
-graphical display.  If you omit a filename argument while supplying
-this option, the new frame displays the @samp{*scratch*} buffer.
-@xref{Buffers}.
+graphical display, it will create a text-only frame on the current
+terminal.  Otherwise@footnote{
+This is what happens on MS-Windows.
+}, it will create a new frame, either GUI or text-only, on the
+same terminal where Emacs was started.  If you omit a filename
+argument while supplying this option, the new frame displays the
+@samp{*scratch*} buffer.  @xref{Buffers}.
 @end table
 
   If you type @kbd{C-x C-c} (@code{save-buffers-kill-terminal}) in an