From: Gerd Moellmann <gerd@gnu.org>
Date: Thu, 22 Jun 2000 22:06:37 +0000 (+0000)
Subject: *** empty log message ***
X-Git-Tag: emacs-pretest-21.0.90~3130
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=16cf31f7820f9bfd7d54aacc4f7d0c591b0bf373;p=emacs.git

*** empty log message ***
---

diff --git a/ChangeLog b/ChangeLog
index 4e9e17a7239..e970ec8df3b 100644
--- 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 092c58cb58b..f7ecf019999 100644
--- 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.