diff options
| author | Eli Zaretskii | 2012-03-31 12:52:20 +0300 |
|---|---|---|
| committer | Eli Zaretskii | 2012-03-31 12:52:20 +0300 |
| commit | 1d265f9f09835fbbfc5a512e19165fee7459015f (patch) | |
| tree | 3b3003f26bbc207cb4e33326fd3eb88a550fe8e3 | |
| parent | 8427ddd200656d210b73881607adddc5f87078b0 (diff) | |
| download | emacs-1d265f9f09835fbbfc5a512e19165fee7459015f.tar.gz emacs-1d265f9f09835fbbfc5a512e19165fee7459015f.zip | |
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.
| -rw-r--r-- | doc/emacs/ChangeLog | 5 | ||||
| -rw-r--r-- | doc/emacs/misc.texi | 22 |
2 files changed, 19 insertions, 8 deletions
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 @@ | |||
| 1 | 2012-03-31 Eli Zaretskii <eliz@gnu.org> | ||
| 2 | |||
| 3 | * misc.texi (emacsclient Options): Document peculiarities of new | ||
| 4 | frame creation on MS-Windows under -c or -t options. (Bug#11091) | ||
| 5 | |||
| 1 | 2012-03-30 Chong Yidong <cyd@gnu.org> | 6 | 2012-03-30 Chong Yidong <cyd@gnu.org> |
| 2 | 7 | ||
| 3 | * files.texi (File Conveniences): Clarify Imagemagick discussion. | 8 | * 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. | |||
| 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. If no graphical display is available, Emacs creates a new | 1509 | display, and provided it can create graphical frames when started from |
| 1510 | text-only terminal frame (@pxref{Frames}). If you omit a filename | 1510 | a text-only terminal. Otherwise@footnote{ |
| 1511 | argument while supplying the @samp{-c} option, the new frame displays | 1511 | This is what happens on MS-Windows. |
| 1512 | the @samp{*scratch*} buffer (@pxref{Buffers}). | 1512 | }, Emacs creates a new text-only terminal frame (@pxref{Frames}). If |
| 1513 | you omit a filename argument while supplying the @samp{-c} option, the | ||
| 1514 | new frame displays the @samp{*scratch*} buffer (@pxref{Buffers}). | ||
| 1513 | 1515 | ||
| 1514 | @item -F @var{alist} | 1516 | @item -F @var{alist} |
| 1515 | @itemx --frame-parameters=@var{alist} | 1517 | @itemx --frame-parameters=@var{alist} |
| @@ -1592,11 +1594,15 @@ server it finds. (This option is not supported on MS-Windows.) | |||
| 1592 | @itemx --tty | 1594 | @itemx --tty |
| 1593 | @itemx -nw | 1595 | @itemx -nw |
| 1594 | 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 |
| 1595 | using an existing Emacs frame. Emacs can open a text-only terminal | 1597 | using an existing Emacs frame. If Emacs can open a text-only terminal |
| 1596 | 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 |
| 1597 | graphical display. If you omit a filename argument while supplying | 1599 | graphical display, it will create a text-only frame on the current |
| 1598 | this option, the new frame displays the @samp{*scratch*} buffer. | 1600 | terminal. Otherwise@footnote{ |
| 1599 | @xref{Buffers}. | 1601 | This is what happens on MS-Windows. |
| 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 | ||
| 1605 | @samp{*scratch*} buffer. @xref{Buffers}. | ||
| 1600 | @end table | 1606 | @end table |
| 1601 | 1607 | ||
| 1602 | If you type @kbd{C-x C-c} (@code{save-buffers-kill-terminal}) in an | 1608 | If you type @kbd{C-x C-c} (@code{save-buffers-kill-terminal}) in an |