aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorChong Yidong2008-10-30 15:59:50 +0000
committerChong Yidong2008-10-30 15:59:50 +0000
commit8b72835cb3ac00f42db998d4e6a192ae1fd50738 (patch)
treedf4bd003faf1407001bcdd592807ad8b3bd7f15b
parent4e0a096809b2a10ed8b4e1460bdb8bce197677f3 (diff)
downloademacs-8b72835cb3ac00f42db998d4e6a192ae1fd50738.tar.gz
emacs-8b72835cb3ac00f42db998d4e6a192ae1fd50738.zip
(Invoking emacsclient): If Emacs has no available frame, it now uses
emacsclient's terminal.
-rw-r--r--doc/emacs/misc.texi6
1 files changed, 3 insertions, 3 deletions
diff --git a/doc/emacs/misc.texi b/doc/emacs/misc.texi
index 04c8b1963e6..0bfaa11c3c5 100644
--- a/doc/emacs/misc.texi
+++ b/doc/emacs/misc.texi
@@ -1338,9 +1338,9 @@ terminal, switch to that virtual terminal.}
1338 If there is no Emacs server, the @command{emacsclient} program halts 1338 If there is no Emacs server, the @command{emacsclient} program halts
1339with an error message. If the Emacs process has no existing 1339with an error message. If the Emacs process has no existing
1340frame---which can happen if it was started as a daemon (@pxref{Emacs 1340frame---which can happen if it was started as a daemon (@pxref{Emacs
1341Server})---the above usage does not work; you need to use the 1341Server})---then Emacs opens a frame on the terminal in which you
1342@samp{-c} or @samp{-t} option to tell Emacs to create a new frame. 1342called @command{emacsclient}, as though you had used the @samp{-t}
1343@xref{emacsclient Options}. 1343option (@pxref{emacsclient Options}).
1344 1344
1345@kindex C-x # 1345@kindex C-x #
1346@findex server-edit 1346@findex server-edit