diff options
| author | Eli Zaretskii | 2012-04-01 20:44:17 +0300 |
|---|---|---|
| committer | Eli Zaretskii | 2012-04-01 20:44:17 +0300 |
| commit | 0d224826228ee15f0ab60a138a1c01f735c48c29 (patch) | |
| tree | f7221aba05d110a41b3c1ef0317e4f3331c402f4 /doc | |
| parent | 8bc53d00e3a4ffff5220adf51b269468fce8c931 (diff) | |
| download | emacs-0d224826228ee15f0ab60a138a1c01f735c48c29.tar.gz emacs-0d224826228ee15f0ab60a138a1c01f735c48c29.zip | |
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
Diffstat (limited to 'doc')
| -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 @@ | |||
| 1 | 2012-04-01 Eli Zaretskii <eliz@gnu.org> | ||
| 2 | |||
| 3 | * misc.texi (emacsclient Options): More clarifications about -t | ||
| 4 | and -c on MS-Windows. (Bug#11091) | ||
| 5 | |||
| 1 | 2012-03-31 Eli Zaretskii <eliz@gnu.org> | 6 | 2012-03-31 Eli Zaretskii <eliz@gnu.org> |
| 2 | 7 | ||
| 3 | * misc.texi (emacsclient Options): Document peculiarities of new | 8 | * 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. | |||
| 1506 | Create a new graphical frame, instead of using an existing Emacs | 1506 | Create a new graphical frame, instead of using an existing Emacs |
| 1507 | frame. Emacs can create a graphical frame even if it was started in a | 1507 | frame. Emacs can create a graphical frame even if it was started in a |
| 1508 | text-only terminal, provided it is able to connect to a graphical | 1508 | text-only terminal, provided it is able to connect to a graphical |
| 1509 | display, and provided it can create graphical frames when started from | 1509 | display. If Emacs is unable to connect to a graphical display, and on |
| 1510 | a text-only terminal. Otherwise@footnote{ | 1510 | systems, such as MS-Windows, where it cannot create graphical frames |
| 1511 | This is what happens on MS-Windows. | 1511 | when started from a text-only terminal, it creates a new text-only |
| 1512 | }, Emacs creates a new text-only terminal frame (@pxref{Frames}). If | 1512 | terminal frame (@pxref{Frames}). If you omit a filename argument |
| 1513 | you omit a filename argument while supplying the @samp{-c} option, the | 1513 | while supplying the @samp{-c} option, the new frame displays the |
| 1514 | new frame displays the @samp{*scratch*} buffer (@pxref{Buffers}). | 1514 | @samp{*scratch*} buffer (@pxref{Buffers}). |
| 1515 | 1515 | ||
| 1516 | @item -F @var{alist} | 1516 | @item -F @var{alist} |
| 1517 | @itemx --frame-parameters=@var{alist} | 1517 | @itemx --frame-parameters=@var{alist} |
| @@ -1594,13 +1594,11 @@ server it finds. (This option is not supported on MS-Windows.) | |||
| 1594 | @itemx --tty | 1594 | @itemx --tty |
| 1595 | @itemx -nw | 1595 | @itemx -nw |
| 1596 | Create a new Emacs frame on the current text-only terminal, instead of | 1596 | Create a new Emacs frame on the current text-only terminal, instead of |
| 1597 | using an existing Emacs frame. If Emacs can open a text-only terminal | 1597 | using an existing Emacs frame. Emacs can open a text-only terminal |
| 1598 | even if it was started in another text-only terminal, or on a | 1598 | even if it was started in another text-only terminal, or on a |
| 1599 | graphical display, it will create a text-only frame on the current | 1599 | graphical display. On systems, such as MS-Windows, where this is |
| 1600 | terminal. Otherwise@footnote{ | 1600 | impossible, Emacs will create a new frame, either GUI or text-only, on |
| 1601 | This is what happens on MS-Windows. | 1601 | the same terminal where it was started. If you omit a filename |
| 1602 | }, it will create a new frame, either GUI or text-only, on the | ||
| 1603 | same terminal where Emacs was started. If you omit a filename | ||
| 1604 | argument while supplying this option, the new frame displays the | 1602 | argument while supplying this option, the new frame displays the |
| 1605 | @samp{*scratch*} buffer. @xref{Buffers}. | 1603 | @samp{*scratch*} buffer. @xref{Buffers}. |
| 1606 | @end table | 1604 | @end table |