*** empty log message ***

diff --git a/etc/NEWS b/etc/NEWS
index a237261220c98f03128bb04cc38d94c4b5099e28..3575456699708562320ef0e30d23163592579801 100644 (file)
--- a/etc/NEWS
+++ b/etc/NEWS
@@ -93,6 +93,13 @@ on.
 set to suppress warnings ``X and Y are the same file'' when visiting a
 file that is already visited under a different name.
 
+** The new user-option `electric-help-shrink-window' can be set to
+nil to prevent adjusting the help window size to the buffer size.
+
+** Emacs now checks for recursive loads of Lisp files.  If the
+recursion depth exceeds `recursive-load-depth-limit', an error is
+signaled.
+
 ** The Strokes package has been updated.  If your Emacs has XPM
 support, you can use it for pictographic editing.  In Strokes mode,
 use C-mouse-2 to compose a complex stoke and insert it into the

diff --git a/src/ChangeLog b/src/ChangeLog
index deb65d088d2c0877def233d58b54753aadc09a9d..26b9bf3d754ddf838c450a4a4ada93a639d5f624 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,5 +1,10 @@
 2000-09-21  Gerd Moellmann  <gerd@gnu.org>
 
+       * process.c (process_sent_to): New variable.
+       (send_process): Workaround for a crash on sparc-sun-solaris-2.6
+       with GCC 2.95.2 caused by a parameter being clobbered by longjmp.
+       Declare more parameters volatile.
+
        * lread.c (Vrecursive_load_depth_limit): New variable.
        (Fload): Check recursive loads whose recursion depth exceeds
        Vrecursive_load_depth_limit.