*** empty log message ***

2 files changed, 17 insertions, 1 deletions

diff --git a/etc/NEWS b/etc/NEWS
index 8a54f136355..f798b93479a 100644
--- a/etc/NEWS
+++ b/etc/NEWS
@@ -1712,6 +1712,8 @@ to view diffs or log entries directly from vc-annotate-mode:
 
 * New modes and packages in Emacs 21.4
 
+** The new python.el package is used to edit Python and Jython programs.
+
 ** The URL package (which had been part of W3) is now part of Emacs.
 
 +++
diff --git a/src/ChangeLog b/src/ChangeLog
index 32a7d73252d..4a971341870 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,17 @@
+2004-04-12  Joe Buehler  <jbuehler@hekimian.com>
+
+        * s/cygwin.h: Changes for Cygwin unexec() support, changes in
+        Cygwin itself.  Add support for Xaw3d scrollbars.
+
+        * puresize.h: Set up PURE_P() for Cygwin unexec() support.
+
+        * lastfile.c: Define my_endbss[] for Cygwin unexec() support.
+
+        * gmalloc.c (__default_morecore): Use bss_sbrk(), not __sbrk(),
+        before Cygwin unexec.
+
+        * Makefile.in: Link changes for Cygwin unexec() support.
+
 2004-04-12  Andreas Schwab  <schwab@suse.de>
 
         * buffer.c (Fmake_indirect_buffer): Check that NAME is a string.
@@ -9,7 +23,7 @@
 
 2004-04-11  Masatake YAMATO  <jet@gyve.org>
 
-        * buffer.c (fix_start_end_in_overlays): make overlays
+        * buffer.c (fix_start_end_in_overlays): Make overlays
         empty if they are backwards.
 
 2004-04-07  Stefan Monnier  <monnier@iro.umontreal.ca>