[Emacs-diffs] emacs/doc/emacs ChangeLog misc.texi

[Chong Yidong]

CVSROOT:        /sources/emacs
Module name:    emacs
Changes by:     Chong Yidong <cyd>      09/09/13 19:41:53

Modified files:
        doc/emacs      : ChangeLog misc.texi 

Log message:
        * misc.texi (Invoking emacsclient): Minor clarifications (Bug#4419).

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/emacs/doc/emacs/ChangeLog?cvsroot=emacs&r1=1.363&r2=1.364
http://cvs.savannah.gnu.org/viewcvs/emacs/doc/emacs/misc.texi?cvsroot=emacs&r1=1.24&r2=1.25

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/emacs/emacs/doc/emacs/ChangeLog,v
retrieving revision 1.363
retrieving revision 1.364
diff -u -b -r1.363 -r1.364
--- ChangeLog   31 Aug 2009 03:50:12 -0000      1.363
+++ ChangeLog   13 Sep 2009 19:41:52 -0000      1.364
@@ -1,3 +1,7 @@
+2009-09-13  Chong Yidong  <address@hidden>
+
+       * misc.texi (Invoking emacsclient): Minor clarifications (Bug#4419).
+
 2009-08-31  Nick Roberts  <address@hidden>
 
        * building.texi (Threads Buffer, Multithreaded Debugging): 

Index: misc.texi
===================================================================
RCS file: /sources/emacs/emacs/doc/emacs/misc.texi,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -b -r1.24 -r1.25
--- misc.texi   15 Jul 2009 03:11:01 -0000      1.24
+++ misc.texi   13 Sep 2009 19:41:53 -0000      1.25
@@ -1499,19 +1499,21 @@
 with an error message.  If the Emacs process has no existing
 frame---which can happen if it was started as a daemon (@pxref{Emacs
 Server})---then Emacs opens a frame on the terminal in which you
-called @command{emacsclient}, as though you had used the @samp{-t}
-option (@pxref{emacsclient Options}).
+called @command{emacsclient}.
 
-  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.
+  You can also force @command{emacsclient} to open a new frame on a
+graphical display, or on a text-only terminal, using the @samp{-c} and
address@hidden options.  @xref{emacsclient Options}.
+
+  If you are running on a single text-only terminal, you can switch
+between @command{emacsclient}'s shell and the Emacs server using one
+of two methods: (i) run the Emacs server and @command{emacsclient} on
+different virtual terminals, and switch to the Emacs server's virtual
+terminal after calling @command{emacsclient}; or (ii) call
address@hidden from within the Emacs server itself, using Shell
+mode (@pxref{Interactive Shell}) or Term mode (@pxref{Term Mode});
address@hidden blocks only the subshell under Emacs, and you can
+still use Emacs to edit the file.
 
 @kindex C-x #
 @findex server-edit
@@ -1548,9 +1550,9 @@
 @command{emacsclient} that you are finished.
 
 @vindex server-window
-  If you set the variable @code{server-window} to a window or a frame,
address@hidden #} always displays the next server buffer in that window or
-in that frame.
+  If you set the value of the variable @code{server-window} to a
+window or a frame, @kbd{C-x #} always displays the next server buffer
+in that window or in that frame.
 
 @node emacsclient Options
 @subsection @code{emacsclient} Options