2 files changed, 14 insertions, 5 deletions

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 6e36e788d6a..c49a5fbfcf8 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -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
diff --git a/lisp/dired.el b/lisp/dired.el
index f8d5fc03883..de414e0fdc5 100644
--- a/lisp/dired.el
+++ b/lisp/dired.el
@@ -2248,11 +2248,13 @@ Command symbols are `byte-compile', `chgrp', `chmod', `chown', `compress',
 `uncompress'.")
 
 (defun dired-mark-pop-up (bufname op-symbol files function &rest args)
-  "Return FUNCTION's result on ARGS after popping up a window
-\(in a buffer named BUFNAME, nil gives \" *Marked Files*\") showing the marked
-files.  Uses function `dired-pop-to-buffer' to do that.
- FUNCTION should not manipulate files.
- It should only read input (an argument or confirmation).
+  "Return FUNCTION's result on ARGS after showing which files are marked.
+Displays the file names in a buffer named BUFNAME;
+ nil gives \" *Marked Files*\".
+This uses function `dired-pop-to-buffer' to do that.
+
+FUNCTION should not manipulate files, just read input
+ (an argument or confirmation).
 The window is not shown if there is just one file or
  OP-SYMBOL is a member of the list in `dired-no-confirm'.
 FILES is the list of marked files."