*** empty log message ***

[gnu-emacs] / lisp / dired.el

diff --git a/lisp/dired.el b/lisp/dired.el
index f8d5fc03883206f3c70448a52c2c25d3689edcba..71e4dd35d1932495f4810693c94e983b687fbd0b 100644 (file)
--- a/lisp/dired.el
+++ b/lisp/dired.el
@@ -677,8 +677,7 @@ If HDR is non-nil, insert a header line with the directory name."
   (let ((opoint (point))
        (process-environment (copy-sequence process-environment))
        end)
-    (if (and dired-use-ls-dired
-            (not (file-remote-p dir)))
+    (if (or dired-use-ls-dired (file-remote-p dir))
        (setq switches (concat "--dired " switches)))
     ;; We used to specify the C locale here, to force English month names;
     ;; but this should not be necessary any more,
@@ -2248,11 +2247,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."