*** empty log message ***

diff --git a/etc/NEWS b/etc/NEWS
index ae1254a079dca4e6b40f09a085ec5c222038eb4e..0f375d869a1469f3e5c308d64369f0e87e795482 100644 (file)
--- a/etc/NEWS
+++ b/etc/NEWS
@@ -43,6 +43,10 @@ description of aspects specific to the Mac.
 \f
 * Changes in Emacs 21.1
 
++++
+** The new user-option `even-window-heights' can be set to nil
+to prevent `display-buffer' from evening out window heights.
+
 +++
 ** The new command `msdos-set-mouse-buttons' forces Emacs to behave
 as if the mouse had a specified number of buttons.  This comes handy
@@ -2043,6 +2047,10 @@ appropriate for reading truly binary files.
 * Lisp changes made after edition 2.6 of the Emacs Lisp Manual,
 (Display-related features are described in a page of their own below.)
 
++++
+** The new user-option `even-window-heights' can be set to nil
+to prevent `display-buffer' from evening out window heights.
+
 +++
 ** The user-option `face-font-registry-alternatives' specifies
 alternative font registry names to try when looking for a font.

diff --git a/src/ChangeLog b/src/ChangeLog
index 531df897adabd8e0b6d680e6e72b77f7a78f39c2..e193d4bbc9f9ef9fd50f27d24be41b9b9d29c23a 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,5 +1,8 @@
 2000-12-06  Gerd Moellmann  <gerd@gnu.org>
 
+       * alloc.c (Fgarbage_collect): Dox fix.  Return a list as
+       advertized by the function documentation.
+
        * window.c (syms_of_window): Doc fix.
 
        * sound.c (vox_configure): Set volume for left and right channel.