diff options
author | Eli Zaretskii <eliz@gnu.org> | 2012-04-01 20:44:17 +0300 |
---|---|---|
committer | Eli Zaretskii <eliz@gnu.org> | 2012-04-01 20:44:17 +0300 |
commit | 0d224826228ee15f0ab60a138a1c01f735c48c29 (patch) | |
tree | f7221aba05d110a41b3c1ef0317e4f3331c402f4 | |
parent | 8bc53d00e3a4ffff5220adf51b269468fce8c931 (diff) | |
download | emacs-0d224826228ee15f0ab60a138a1c01f735c48c29.tar.gz |
Improve documentation of emacsclient -c and -t on MS-Windows.
doc/emacs/misc.texi (emacsclient Options): More clarifications about -t
and -c on MS-Windows.
Fixes: debbugs:11091
-rw-r--r-- | doc/emacs/ChangeLog | 5 | ||||
-rw-r--r-- | doc/emacs/misc.texi | 22 |
2 files changed, 15 insertions, 12 deletions
diff --git a/doc/emacs/ChangeLog b/doc/emacs/ChangeLog index 00922658ec7..0b30f4b2e84 100644 --- a/doc/emacs/ChangeLog +++ b/doc/emacs/ChangeLog @@ -1,3 +1,8 @@ +2012-04-01 Eli Zaretskii <eliz@gnu.org> + + * misc.texi (emacsclient Options): More clarifications about -t + and -c on MS-Windows. (Bug#11091) + 2012-03-31 Eli Zaretskii <eliz@gnu.org> * misc.texi (emacsclient Options): Document peculiarities of new diff --git a/doc/emacs/misc.texi b/doc/emacs/misc.texi index 9bb89e7d44a..5f00fa5e6ea 100644 --- a/doc/emacs/misc.texi +++ b/doc/emacs/misc.texi @@ -1506,12 +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, 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}). +display. If Emacs is unable to connect to a graphical display, and on +systems, such as MS-Windows, where it cannot create graphical frames +when started from a text-only terminal, it 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} @@ -1594,13 +1594,11 @@ 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. If Emacs can open a text-only terminal +using an existing Emacs frame. Emacs can open a text-only terminal even if it was started in another text-only terminal, or on a -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 +graphical display. On systems, such as MS-Windows, where this is +impossible, Emacs will create a new frame, either GUI or text-only, on +the same terminal where it was started. If you omit a filename argument while supplying this option, the new frame displays the @samp{*scratch*} buffer. @xref{Buffers}. @end table |