# HG changeset patch
# User Gerd Moellmann <gerd@gnu.org>
# Date 951400554 0
# Node ID 99588191815440383f80f4c75a89ac1fa9870857
# Parent  72e15185eeb5d95c6ef9a2a995f48db9e2d93b71
*** empty log message ***

diff -r 72e15185eeb5 -r 995881918154 etc/NEWS
--- a/etc/NEWS	Thu Feb 24 13:54:08 2000 +0000
+++ b/etc/NEWS	Thu Feb 24 13:55:54 2000 +0000
@@ -16,6 +16,10 @@
 
 * Changes in Emacs 21.1
 
+** The variable `cursor-in-non-selected-windows' controls how to
+display the cursor in non-selected windows.  If nil, no cursor is
+shown, if non-nil a hollow box cursor is shown.
+
 ** The variable `echo-keystrokes' may now have a floating point value.
 
 ** C-x 5 1 runs the new command delete-other-frames which deletes
diff -r 72e15185eeb5 -r 995881918154 lisp/ChangeLog
--- a/lisp/ChangeLog	Thu Feb 24 13:54:08 2000 +0000
+++ b/lisp/ChangeLog	Thu Feb 24 13:55:54 2000 +0000
@@ -1,3 +1,8 @@
+2000-02-24  Edward M. Reingold  <reingold@emr.cs.uiuc.edu>
+
+	* diary-lib.el (include-other-diary-files): Undo the selective
+	display in any included file and don't kill it.
+
 2000-02-24  Eli Zaretskii  <eliz@is.elta.co.il>
 
 	* dired.el (dired-mode-map): Don't remove "Edit" from the menu