*** empty log message ***

diff --git a/etc/NEWS b/etc/NEWS
index c4456e5c1199bd979644efdc5fdc5e3fcec20ee3..e956ab4beaffe45f452d9ad01e76362c8dd47da5 100644 (file)
--- a/etc/NEWS
+++ b/etc/NEWS
@@ -46,9 +46,10 @@ integer, it says how many columns to scroll.  If the value is a
 floating-point number, it gives the fraction of the window's width to
 scroll the window.
 
-** New display feature: focus follows mouse.
-By setting the variable x-autoselect-window to non-nil value, mouse will
-autoselect the window it is in.  It is turned off by default.
+** New display feature: focus follows mouse.  If you set the variable
+x-autoselect-window to non-nil value, moving the mouse to a different
+Emacs window will select that window.  The default is nil, so that
+this feature is not enabled.
 
 ** The new command `describe-text-at' pops up a buffer with description
 of text properties, overlays, and widgets at point, and lets you get

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 0dd8ee7c470dc86776975866838d177ebbbf824a..fed1e178e32a014b6659dd6decc868d7c45f1f7f 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2002-02-17  stanislav shalunov  <shalunov@internet2.edu>
+
+       * mail/uce.el (uce-reply-to-uce): Fix incorrect behavior when
+       invoked from Rmail with full headers displayed.
+
 2002-02-17  Kai Gro\e,A_\e(Bjohann  <Kai.Grossjohann@CS.Uni-Dortmund.DE>
 
        * emacs-lisp/lisp.el (mark-defun): Don't leave multiple marks
@@ -122,6 +127,7 @@
        * eshell/esh-ext.el (eshell-script-interpreter): Allow whitespace
        after the #! of a shell interpretor specification.
 
+>>>>>>> 1.3466
 2002-02-15  Richard M. Stallman  <rms@gnu.org>
 
        * help.el (describe-key-briefly): Make output in INSERT case