# HG changeset patch
# User Gerd Moellmann <gerd@gnu.org>
# Date 976112566 0
# Node ID 52c06c998aacecefc9e40e8c40311a31cff34e21
# Parent  773e6aa2ec385b7cab01a701b4577e90ca1e3ffd
*** empty log message ***

diff -r 773e6aa2ec38 -r 52c06c998aac etc/NEWS
--- a/etc/NEWS	Wed Dec 06 14:22:15 2000 +0000
+++ b/etc/NEWS	Wed Dec 06 14:22:46 2000 +0000
@@ -44,6 +44,10 @@
 * 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
 with mice that don't report their number of buttons correctly.  One
@@ -2044,6 +2048,10 @@
 (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 -r 773e6aa2ec38 -r 52c06c998aac src/ChangeLog
--- a/src/ChangeLog	Wed Dec 06 14:22:15 2000 +0000
+++ b/src/ChangeLog	Wed Dec 06 14:22:46 2000 +0000
@@ -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.