*** empty log message ***

diff --git a/etc/NEWS b/etc/NEWS
index d3108b8c3b30d1989b4d07ade3134c146340694b..dc9ad42938c45a5436e43597c27a064dc18e52d5 100644 (file)
--- a/etc/NEWS
+++ b/etc/NEWS
@@ -2056,10 +2056,14 @@ is automatically converted to Emacs' form.
 
 ** 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 --git a/man/emacs.texi b/man/emacs.texi
index 2f050f4346e0326e59f2c9d40b095cfc28010ef8..64a4684cc246598ef9d7d69fdd113691c147d0d6 100644 (file)
--- a/man/emacs.texi
+++ b/man/emacs.texi
@@ -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 @@ Software Foundation raise funds for GNU development.''
 @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 @@ Copyright @copyright{} 1985, 1986, 1987, 1993, 1994, 1995, 1996, 1997, 1998, 199
    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 --git a/src/ChangeLog b/src/ChangeLog
index ce905803944351f7f52047ae457358ce3f0519cd..a88fc35df915f955d9209cbc6d802b26ac9f3fef 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -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.