Merge from emacs-23

2 files changed, 14 insertions, 9 deletions

diff --git a/doc/misc/ChangeLog b/doc/misc/ChangeLog
index 174d3015291..d7d5618ae8d 100644
--- a/doc/misc/ChangeLog
+++ b/doc/misc/ChangeLog
@@ -1,3 +1,8 @@
+2010-12-13  Glenn Morris  <rgm@gnu.org>
+
+        * cl.texi (For Clauses): Small fixes for frames and windows.
+
+2010-12-13  Glenn Morris  <rgm@gnu.org>
 2010-12-11  Carsten Dominik  <carsten.dominik@gmail.com>
 
         * org.texi (Using capture): Document using prefix arguments for
diff --git a/doc/misc/cl.texi b/doc/misc/cl.texi
index 79038792a3e..4d7ebadff34 100644
--- a/doc/misc/cl.texi
+++ b/doc/misc/cl.texi
@@ -2494,15 +2494,18 @@ term restricts the search to just the specified property.  The
 @code{of} term may specify either a buffer or a string.
 
 @item for @var{var} being the frames
-This clause iterates over all frames, i.e., X window system windows
-open on Emacs files.  The
-clause @code{screens} is a synonym for @code{frames}.  The frames
-are visited in @code{next-frame} order starting from
-@code{selected-frame}.
+This clause iterates over all Emacs frames. The clause @code{screens} is
+a synonym for @code{frames}.  The frames are visited in
+@code{next-frame} order starting from @code{selected-frame}.
 
 @item for @var{var} being the windows [of @var{frame}]
 This clause iterates over the windows (in the Emacs sense) of
-the current frame, or of the specified @var{frame}.
+the current frame, or of the specified @var{frame}.  It visits windows
+in @code{next-window} order starting from @code{selected-window}
+(or @code{frame-selected-window} if you specify @var{frame}).
+This clause treats the minibuffer window in the same way as
+@code{next-window} does.  For greater flexibility, consider using
+@code{walk-windows} instead.
 
 @item for @var{var} being the buffers
 This clause iterates over all buffers in Emacs.  It is equivalent
@@ -5322,6 +5325,3 @@ recursion.
 
 @bye
 
-@ignore
-   arch-tag: b61e7200-3bfa-4a70-a9d3-095e152696f8
-@end ignore