# HG changeset patch
# User Richard M. Stallman <rms@gnu.org>
# Date 1010470488 0
# Node ID 32e40100d0dee907b8548512f448df5464ea7997
# Parent  a49b37e22b382013b49ab406db719f4770e051c0
*** empty log message ***

diff -r a49b37e22b38 -r 32e40100d0de etc/NEWS
--- a/etc/NEWS	Tue Jan 08 06:12:37 2002 +0000
+++ b/etc/NEWS	Tue Jan 08 06:14:48 2002 +0000
@@ -77,8 +77,9 @@
 will now be extended each time, so you can mark the next two sexps with
 M-C-SPC M-C-SPC, for example.
 
-** In the *Occur* buffer, C-o displays the current line's occurrence
-in another window without switching to it.
+** In the *Occur* buffer, `o' switches to it in another window, and
+C-o displays the current line's occurrence in another window without
+switching to it.
 
 ** When you specify a frame size with --geometry, the size applies to
 all frames you create.  A position specified with --geometry only
diff -r a49b37e22b38 -r 32e40100d0de lisp/ChangeLog
--- a/lisp/ChangeLog	Tue Jan 08 06:12:37 2002 +0000
+++ b/lisp/ChangeLog	Tue Jan 08 06:14:48 2002 +0000
@@ -1,3 +1,8 @@
+2002-01-08  Richard M. Stallman  <rms@gnu.org>
+
+	* replace.el (occur-mode-goto-occurrence-other-window): New command.
+	(occur-mode-map): Bind `o' to that.
+
 2002-01-07  Michael Kifer  <kifer@cs.stonybrook.edu>
 	
 	* viper-init.el (viper-cond-compile-for-xemacs-or-emacs):
diff -r a49b37e22b38 -r 32e40100d0de src/ChangeLog
--- a/src/ChangeLog	Tue Jan 08 06:12:37 2002 +0000
+++ b/src/ChangeLog	Tue Jan 08 06:14:48 2002 +0000
@@ -1,3 +1,8 @@
+2002-01-08  Richard M. Stallman  <rms@gnu.org>
+
+	* window.c (delete_window): Rewrite the code for changing the
+	selected window to handle the case where WINDOW is not a leaf.
+
 2002-01-07  Eli Zaretskii  <eliz@is.elta.co.il>
 
 	* process.c (send_process): Set src_multibyte to 1 after the call