From: Gerd Moellmann <gerd@gnu.org>
Date: Wed, 6 Dec 2000 14:22:46 +0000 (+0000)
Subject: *** empty log message ***
X-Git-Tag: emacs-pretest-21.0.93~164
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=eb1b0c74887fa18d2551c9df7e9ae0ae0af9c40d;p=emacs.git

*** empty log message ***
---

diff --git a/etc/NEWS b/etc/NEWS
index ae1254a079d..0f375d869a1 100644
--- a/etc/NEWS
+++ b/etc/NEWS
@@ -43,6 +43,10 @@ description of aspects specific to the Mac.
 
 * 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 531df897ada..e193d4bbc9f 100644
--- 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.