# HG changeset patch
# User Gerd Moellmann <gerd@gnu.org>
# Date 974647807 0
# Node ID 62859e71806efabbfdfd6a0449e13e91fd2264be
# Parent  d0482eab29e19d842b39b46007b0fb600d079b06
*** empty log message ***

diff -r d0482eab29e1 -r 62859e71806e etc/NEWS
--- a/etc/NEWS	Sun Nov 19 15:20:27 2000 +0000
+++ b/etc/NEWS	Sun Nov 19 15:30:07 2000 +0000
@@ -2056,10 +2056,14 @@
 
 ** The new function `window-list' has been defined
 
-- Function: window-list &optional WINDOW MINIBUF ALL-FRAMES
-
-Return a list of windows in canonical order.  The parameters WINDOW,
-MINIBUF and ALL-FRAMES are defined like for `next-window'.
+- Function: window-list &optional FRAME WINDOW MINIBUF
+
+Return a list of windows on FRAME, starting with WINDOW.  FRAME nil or
+omitted means use the selected frame.  WINDOW nil or omitted means use
+the selected window.  MINIBUF t means include the minibuffer window,
+even if it isn't active.  MINIBUF nil or omitted means include the
+minibuffer window only if it's active.  MINIBUF neither nil nor t
+means never include the minibuffer window.
 
 ** There's a new function `some-window' defined as follows
 
diff -r d0482eab29e1 -r 62859e71806e man/emacs.texi
--- a/man/emacs.texi	Sun Nov 19 15:20:27 2000 +0000
+++ b/man/emacs.texi	Sun Nov 19 15:30:07 2000 +0000
@@ -8,7 +8,7 @@
 @ifnottex
 @c The edition number appears in several places in this file
 This is the fourteenth edition of the @cite{GNU Emacs Manual},
-updated for Emacs version 21.1
+updated for Emacs version 21.0.90.
 @c Please REMEMBER to update edition number in *three* places in this file.
 
 @dircategory Emacs
@@ -52,7 +52,7 @@
 @sp 6
 @center @titlefont{GNU Emacs Manual}
 @sp 4
-@center Fourteenth Edition, Updated for Emacs Version 21.1
+@center Fourteenth Edition, Updated for Emacs Version 21.0.90.
 @sp 5
 @center Richard Stallman
 @page
@@ -61,7 +61,7 @@
    Free Software Foundation, Inc.
 @sp 2
 Fourteenth Edition @*
-Updated for Emacs Version 21.1, @*
+Updated for Emacs Version 21.0.90, @*
 August 2000
 
 ISBN 1-882114-06-X
diff -r d0482eab29e1 -r 62859e71806e src/ChangeLog
--- a/src/ChangeLog	Sun Nov 19 15:20:27 2000 +0000
+++ b/src/ChangeLog	Sun Nov 19 15:30:07 2000 +0000
@@ -1,5 +1,10 @@
 2000-11-19  Gerd Moellmann  <gerd@gnu.org>
 
+	* window.c (Fwindow_list): Change parameter list to be XEmacs
+	compatible.
+	(window_list_1): New function.
+	(window_loop): Use it instead of Fwindow_list.
+
 	* sysdep.c (emacs_ospeed): New variable.
 	(toplevel): Don't declare ospeed extern.
 	(init_baud_rate): Use emacs_ospeed instead of ospeed.