Sync to HEAD

[bpt/emacs.git] / lisp / find-dired.el

diff --git a/lisp/find-dired.el b/lisp/find-dired.el
index 8ea6bbc..5bef4d6 100644 (file)
--- a/lisp/find-dired.el
+++ b/lisp/find-dired.el
@@ -121,8 +121,14 @@ as the final argument."
                           ""
                         (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)))
+      (set-keymap-parent map (current-local-map))
+      (define-key map "\C-c\C-k" 'kill-find)
+      (use-local-map map))
     (make-local-variable 'dired-sort-inhibit)
     (setq dired-sort-inhibit t)
     (set (make-local-variable 'revert-buffer-function)
@@ -144,14 +150,24 @@ as the final argument."
     ;; Make second line a ``find'' line in analogy to the ``total'' or
     ;; ``wildcard'' line.
     (insert "  " args "\n")
-    ;; Start the find process.
-    (let ((proc (start-process-shell-command find-dired-find-program (current-buffer) args)))
+    (setq buffer-read-only t)
+    (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.
       (move-marker (process-mark proc) 1 (current-buffer)))
     (setq mode-line-process '(":%s"))))
 
+(defun kill-find ()
+  "Kill the `find' process running in the current buffer."
+  (interactive)
+  (let ((find (get-buffer-process (current-buffer))))
+    (and find (eq (process-status find) 'run)
+        (eq (process-filter find) (function find-dired-filter))
+        (condition-case nil
+            (delete-process find)
+          (error nil)))))
+
 ;;;###autoload
 (defun find-name-dired (dir pattern)
   "Search DIR recursively for files matching the globbing pattern PATTERN,
@@ -192,7 +208,8 @@ Thus ARG can also contain additional grep options."
 
 (defun find-dired-filter (proc string)
   ;; Filter for \\[find-dired] processes.
-  (let ((buf (process-buffer proc)))
+  (let ((buf (process-buffer proc))
+       (inhibit-read-only t))
     (if (buffer-name buf)              ; not killed?
        (save-excursion
          (set-buffer buf)
@@ -229,7 +246,8 @@ Thus ARG can also contain additional grep options."
 
 (defun find-dired-sentinel (proc state)
   ;; Sentinel for \\[find-dired] processes.
-  (let ((buf (process-buffer proc)))
+  (let ((buf (process-buffer proc))
+       (inhibit-read-only t))
     (if (buffer-name buf)
        (save-excursion
          (set-buffer buf)
@@ -252,4 +270,5 @@ Thus ARG can also contain additional grep options."
 \f
 (provide 'find-dired)
 
+;;; arch-tag: 8edece95-af00-4221-bc74-a4bd2f75f9b0
 ;;; find-dired.el ends here