Merge from emacs--devo--0

Patches applied:

 * emacs--devo--0  (patch 662-669)

   - Update from CVS
   - Fix read-only prompt problem in isearch
   - Merge from gnus--rel--5.10

 * gnus--rel--5.10  (patch 207-208)

   - Merge from emacs--devo--0
   - Update from CVS

Revision: emacs@sv.gnu.org/emacs--unicode--0--patch-184

1 files changed, 6 insertions, 5 deletions

diff --git a/src/window.c b/src/window.c
index 8a25992d783..508ddadae9a 100644
--- a/src/window.c
+++ b/src/window.c
@@ -3612,11 +3612,12 @@ The variables `special-display-buffer-names',
 `same-window-regexps' customize how certain buffer names are handled.
 The latter two take effect only if NOT-THIS-WINDOW is nil.
 
-If optional argument FRAME is `visible', search all visible frames.
-If FRAME is 0, search all visible and iconified frames.
-If FRAME is t, search all frames.
-If FRAME is a frame, search only that frame.
-If FRAME is nil, search only the selected frame
+If optional argument FRAME is `visible', check all visible frames
+for a window to use.
+If FRAME is 0, check all visible and iconified frames.
+If FRAME is t, check all frames.
+If FRAME is a frame, check only that frame.
+If FRAME is nil, check only the selected frame
  (actually the last nonminibuffer frame),
  unless `pop-up-frames' or `display-buffer-reuse-frames' is non-nil,
  which means search visible and iconified frames.