Minor fixes for text of help-echo in some options.

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

diff --git a/lisp/find-dired.el b/lisp/find-dired.el
index 824cdbf013a9486585e1fcf2ff4eac3bbcd656b9..a58d510f20ce045745aee7c16efcd6c26350d449 100644 (file)
--- a/lisp/find-dired.el
+++ b/lisp/find-dired.el
@@ -1,6 +1,6 @@
 ;;; find-dired.el --- run a `find' command and dired the output
 
-;; Copyright (C) 1992, 1994, 1995 Free Software Foundation, Inc.
+;; Copyright (C) 1992, 1994, 1995, 2000 Free Software Foundation, Inc.
 
 ;; Author: Roland McGrath <roland@gnu.org>,
 ;;        Sebastian Kremer <sk@thp.uni-koeln.de>
@@ -24,6 +24,8 @@
 ;; Free Software Foundation, Inc., 59 Temple Place - Suite 330,
 ;; Boston, MA 02111-1307, USA.
 
+;;; Commentary:
+
 ;;; Code:
 
 (require 'dired)
@@ -33,6 +35,11 @@
   :group 'dired
   :prefix "find-")
 
+(defcustom find-dired-find-program "find"
+  "Program used to find files."
+  :group 'dired
+  :type 'file)
+
 ;; find's -ls corresponds to these switches.
 ;; Note -b, at least GNU find quotes spaces etc. in filenames
 ;;;###autoload
@@ -86,13 +93,28 @@ as the final argument."
     (or (file-directory-p dir)
        (error "find-dired needs a directory: %s" dir))
     (switch-to-buffer (get-buffer-create "*Find*"))
+
+    ;; See if there's still a `find' running, and offer to kill
+    ;; it first, if it is.
+    (let ((find (get-buffer-process (current-buffer))))
+      (when find
+       (if (or (not (eq (process-status find) 'run))
+               (yes-or-no-p "A `find' process is running; kill it? "))
+           (condition-case nil
+               (progn
+                 (interrupt-process find)
+                 (sit-for 1)
+                 (delete-process find))
+             (error nil))
+         (error "Cannot have two processes in `%s' at once" (buffer-name)))))
+      
     (widen)
     (kill-all-local-variables)
     (setq buffer-read-only nil)
     (erase-buffer)
     (setq default-directory dir
          find-args args                ; save for next interactive call
-         args (concat "find . "
+         args (concat find-dired-find-program " . "
                       (if (string= args "")
                           ""
                         (concat "\\( " args " \\) "))
@@ -120,7 +142,7 @@ as the final argument."
     ;; ``wildcard'' line. 
     (insert "  " args "\n")
     ;; Start the find process.
-    (let ((proc (start-process-shell-command "find" (current-buffer) args)))
+    (let ((proc (start-process-shell-command find-dired-find-program (current-buffer) args)))
       (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.