*** empty log message ***

diff --git a/ChangeLog b/ChangeLog
index 4e9e17a72393ed6178c3a77afa9c47e902c157dc..e970ec8df3b19685655f80a92f5a738282a8b63c 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2000-06-23  Gerd Moellmann  <gerd@gnu.org>
+
+       * configure.in (HAVE_LIBXP): Change test for libXp.
+
 2000-06-21  Dave Love  <fx@gnu.org>
 
        * configure.in: Check for fcntl.h.  Use AC_FUNC_GETLOADAVG, not

diff --git a/src/ChangeLog b/src/ChangeLog
index 092c58cb58be255b78e80d2f7f1a77311fa2c1df..f7ecf0199990801c81b430434a9f7c73a765cd33 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,5 +1,15 @@
 2000-06-22  Gerd Moellmann  <gerd@gnu.org>
 
+       * xrdb.c (x_load_resources): Add default resource for scroll bar's
+       trough color and main window's background color.
+
+       * xfns.c (Fx_file_dialog) [HAVE_MOTIF_2_1]: Handle events 
+       differently.
+
+       * xterm.h (Xt_app_con): External declaration.
+
+       * widget.c (EmacsFrameRealize): Fix typo.
+       
        * widget.c (EmacsFrameRealize): Remove SubstructureRedirectMask.
 
        * xdisp.c (handle_stop): Initialize it->add_overlay_start to zero.