[Emacs-diffs] /srv/bzr/emacs/trunk r105746: * doc/emacs/frames.texi (Frame Commands): Doc fix for delete-other-frames.

[Chong Yidong]

------------------------------------------------------------
revno: 105746
author: Eric Hanchrow <address@hidden>
committer: Chong Yidong <address@hidden>
branch nick: trunk
timestamp: Mon 2011-09-12 10:48:34 -0400
message:
  * doc/emacs/frames.texi (Frame Commands): Doc fix for delete-other-frames.
  Note that it only deletes frames on current terminal.
modified:
  doc/emacs/ChangeLog
  doc/emacs/frames.texi

=== modified file 'doc/emacs/ChangeLog'
--- a/doc/emacs/ChangeLog       2011-09-10 08:26:12 +0000
+++ b/doc/emacs/ChangeLog       2011-09-12 14:48:34 +0000
@@ -1,3 +1,8 @@
+2011-09-12  Eric Hanchrow  <address@hidden>
+
+       * frames.texi (Frame Commands): Note that delete-other-frames only
+       deletes frames on current terminal.
+
 2011-09-10  Eli Zaretskii  <address@hidden>
 
        * sending.texi (Mail Misc): Document mail-add-attachment.

=== modified file 'doc/emacs/frames.texi'
--- a/doc/emacs/frames.texi     2011-08-27 12:10:24 +0000
+++ b/doc/emacs/frames.texi     2011-09-12 14:48:34 +0000
@@ -448,17 +448,23 @@
 @item C-x 5 1
 @kindex C-x 5 1
 @findex delete-other-frames
-Delete all frames except the selected one.
+Delete all frames on the current terminal, except the selected one.
 @end table
 
-  The @kbd{C-x 5 0} (@code{delete-frame}) command will never delete
-the last frame, to prevent you from losing the ability to interact
+  The @kbd{C-x 5 0} (@code{delete-frame}) command never deletes the
+last frame.  This prevents you from losing the ability to interact
 with the Emacs process.  Note that when Emacs is run as a daemon
 (@pxref{Emacs Server}), there is always a ``virtual frame'' that
 remains after all the ordinary, interactive frames are deleted.  In
 this case, @kbd{C-x 5 0} can delete the last interactive frame; you
 can use @command{emacsclient} to reconnect to the Emacs session.
 
+  The @kbd{C-x 5 1} (@code{delete-other-frames}) command only deletes
+frames on the current terminal.  For example, if you call it from an X
+frame, it deletes the other frames on that X display; if the Emacs
+process has frames open on other X displays or text terminals, those
+are not deleted.
+
 @vindex focus-follows-mouse
   On X, you may have to tell Emacs how the window manager handles
 focus-switching between windows, in order for @kbd{C-x 5 o}