# HG changeset patch
# User Richard M. Stallman <rms@gnu.org>
# Date 1032397423 0
# Node ID e5f44a2250886ab99220e9f93cfae544881b0ba9
# Parent  55087a54b990e4e4b3dbbe4469968509ddbddf49
*** empty log message ***

diff -r 55087a54b990 -r e5f44a225088 lisp/ChangeLog
--- a/lisp/ChangeLog	Thu Sep 19 01:02:52 2002 +0000
+++ b/lisp/ChangeLog	Thu Sep 19 01:03:43 2002 +0000
@@ -1,3 +1,10 @@
+2002-09-18  Richard M. Stallman  <rms@gnu.org>
+
+	* dired.el (dired-mark-pop-up): Doc fix.
+
+	* ediff-hook.el (ediff-cond-compile-for-xemacs-or-emacs): Put the
+	definition straight into loaddefs.el as well as executing it here.
+
 2002-09-18  Colin Walters  <walters@debian.org>
 
 	* calc/calc.el (calc-mode): Add font-lock-defontify to