[Emacs-diffs] Changes to emacs/doc/emacs/misc.texi,v

[Chong Yidong]

CVSROOT:        /sources/emacs
Module name:    emacs
Changes by:     Chong Yidong <cyd>      08/11/01 04:28:10

Index: misc.texi
===================================================================
RCS file: /sources/emacs/emacs/doc/emacs/misc.texi,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -b -r1.13 -r1.14
--- misc.texi   1 Nov 2008 03:27:54 -0000       1.13
+++ misc.texi   1 Nov 2008 04:28:10 -0000       1.14
@@ -1485,9 +1485,7 @@
 file name.  This connects to an Emacs server, and tells that Emacs
 process to visit @var{file} in one of its existing frames---either a
 graphical frame, or one in a text-only terminal (@pxref{Frames}).  You
-can then select that frame to begin address@hidden, if you are
-running the Emacs server's process on a separate virtual text-only
-terminal, switch to that virtual terminal.}
+can then select that frame to begin editing.
 
   If there is no Emacs server, the @command{emacsclient} program halts
 with an error message.  If the Emacs process has no existing
@@ -1496,13 +1494,25 @@
 called @command{emacsclient}, as though you had used the @samp{-t}
 option (@pxref{emacsclient Options}).
 
+  On a graphical display, switching to the Emacs server is
+straightforward---just select its (system-level) window.  If you are
+using a text-only terminal, there are two ways to switch between
address@hidden's shell and the Emacs server: (i) run the Emacs
+server and @command{emacsclient} on different virtual terminals, and
+switch to the Emacs server's virtual terminal after calling
address@hidden; or (ii) call @command{emacsclient} from within
+the Emacs server itself, using Shell mode (@pxref{Interactive Shell})
+or Term mode (@pxref{Term Mode}); @code{emacsclient} blocks only the
+subshell under Emacs, and you can still use Emacs to edit the file.
+
 @kindex C-x #
 @findex server-edit
-  When you finish editing @var{file}, type @kbd{C-x #}
-(@code{server-edit}) in its buffer.  This saves the file and sends a
-message back to the @command{emacsclient} program, telling it to exit.
-Programs that use @env{EDITOR} usually wait for the ``editor''---in
-the case @command{emacsclient}---to exit before doing something else.
+  When you finish editing @var{file} in the Emacs server, type
address@hidden #} (@code{server-edit}) in its buffer.  This saves the file
+and sends a message back to the @command{emacsclient} program, telling
+it to exit.  Programs that use @env{EDITOR} usually wait for the
+``editor''---in the case @command{emacsclient}---to exit before doing
+something else.
 
   You can also call @command{emacsclient} with multiple file name
 arguments: @samp{emacsclient @var{file1} @var{file2} ...} tells the