*** empty log message ***

diff --git a/etc/NEWS b/etc/NEWS
index c73628cd5d913eccb6b222dfc75c1503fefd4e80..c634708250678699e22c420724a84851a01022e1 100644 (file)
--- a/etc/NEWS
+++ b/etc/NEWS
@@ -16,6 +16,10 @@ images and toolkit scrollbars.  Use the --help option to list them.
 \f
 * 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 --git a/lisp/ChangeLog b/lisp/ChangeLog
index d1d5d06f269cbc11b3a68369955c1e69ecf69f1a..1da4edfcb433cdaf3ba6107c0dda69b7f7494322 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -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