(hs-set-up-overlay): New user var.

[gnu-emacs] / lisp / find-dired.el

diff --git a/lisp/find-dired.el b/lisp/find-dired.el
index 9407afc3862cb77324a852df74e7b442905ee615..2f499f243d72993c72841326def3b3f0c723eb6b 100644 (file)
--- a/lisp/find-dired.el
+++ b/lisp/find-dired.el
@@ -54,6 +54,16 @@ LS-SWITCHES is a list of `ls' switches to tell dired how to parse the output."
               (string :tag "Ls Switches"))
   :group 'find-dired)
 
+;;;###autoload
+(defcustom find-ls-subdir-switches "-al"
+  "`ls' switches for inserting subdirectories in `*Find*' buffers.
+This should contain the \"-l\" switch.
+Use the \"-F\" or \"-b\" switches if and only if you also use
+them for `find-ls-option'."
+  :type 'string
+  :group 'find-dired
+  :version "21.4")
+
 ;;;###autoload
 (defcustom find-grep-options
   (if (or (eq system-type 'berkeley-unix)
@@ -89,8 +99,7 @@ as the final argument."
   (let ((dired-buffers dired-buffers))
     ;; Expand DIR ("" means default-directory), and make sure it has a
     ;; trailing slash.
-    (setq dir (abbreviate-file-name
-              (file-name-as-directory (expand-file-name dir))))
+    (setq dir (file-name-as-directory (expand-file-name dir)))
     ;; Check that it's really a directory.
     (or (file-directory-p dir)
        (error "find-dired needs a directory: %s" dir))
@@ -115,12 +124,14 @@ as the final argument."
     (setq buffer-read-only nil)
     (erase-buffer)
     (setq default-directory dir
-         find-args args                ; save for next interactive call
+         find-args args              ; save for next interactive call
          args (concat find-dired-find-program " . "
                       (if (string= args "")
                           ""
                         (concat "\\( " args " \\) "))
                       (car find-ls-option)))
+    ;; Start the find process.
+    (shell-command (concat args "&") (current-buffer))
     ;; The next statement will bomb in classic dired (no optional arg allowed)
     (dired-mode dir (cdr find-ls-option))
     (let ((map (make-sparse-keymap)))
@@ -141,6 +152,7 @@ as the final argument."
       ;; this does no harm)
       (set (make-local-variable 'dired-subdir-alist)
           (list (cons default-directory (point-min-marker)))))
+    (set (make-local-variable 'dired-subdir-switches) find-ls-subdir-switches)
     (setq buffer-read-only nil)
     ;; Subdir headlerline must come first because the first marker in
     ;; subdir-alist points there.
@@ -149,8 +161,7 @@ as the final argument."
     ;; ``wildcard'' line.
     (insert "  " args "\n")
     (setq buffer-read-only t)
-    ;; Start the find process.
-    (let ((proc (start-process-shell-command find-dired-find-program (current-buffer) args)))
+    (let ((proc (get-buffer-process (current-buffer))))
       (set-process-filter proc (function find-dired-filter))
       (set-process-sentinel proc (function find-dired-sentinel))
       ;; Initialize the process marker; it is used by the filter.
@@ -266,6 +277,7 @@ Thus ARG can also contain additional grep options."
              (delete-process proc)
              (force-mode-line-update)))
          (message "find-dired %s finished." (current-buffer))))))
+
 \f
 (provide 'find-dired)