Comment change.

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

diff --git a/lisp/find-dired.el b/lisp/find-dired.el
index 9fa2148..43246c0 100644 (file)
--- a/lisp/find-dired.el
+++ b/lisp/find-dired.el
@@ -4,6 +4,7 @@
 
 ;; Author: Roland McGrath <roland@gnu.ai.mit.edu>,
 ;;        Sebastian Kremer <sk@thp.uni-koeln.de>
+;; Maintainer: FSF
 ;; Keywords: unix
 
 ;; This file is part of GNU Emacs.
@@ -27,25 +28,36 @@
 
 (require 'dired)
 
+(defgroup find-dired nil
+  "Run a `find' command and dired the output."
+  :group 'dired
+  :prefix "find-")
+
 ;; find's -ls corresponds to these switches.
 ;; Note -b, at least GNU find quotes spaces etc. in filenames
 ;;;###autoload
-(defvar find-ls-option (if (eq system-type 'berkeley-unix) '("-ls" . "-gilsb")
-                        '("-exec ls -ld {} \\;" . "-ld"))
+(defcustom find-ls-option
+  (if (eq system-type 'berkeley-unix) '("-ls" . "-gilsb")
+    '("-exec ls -ld {} \\;" . "-ld"))
   "*Description of the option to `find' to produce an `ls -l'-type listing.
 This is a cons of two strings (FIND-OPTION . LS-SWITCHES).  FIND-OPTION
 gives the option (or options) to `find' that produce the desired output.
-LS-SWITCHES is a list of `ls' switches to tell dired how to parse the output.")
+LS-SWITCHES is a list of `ls' switches to tell dired how to parse the output."
+  :type '(cons (string :tag "Find Option")
+              (string :tag "Ls Switches"))
+  :group 'find-dired)
 
 ;;;###autoload
-(defvar find-grep-options
+(defcustom find-grep-options
   (if (or (eq system-type 'berkeley-unix)
          (string-match "solaris2" system-configuration)
          (string-match "irix" system-configuration))
       "-s" "-q")
   "*Option to grep to be as silent as possible.
 On Berkeley systems, this is `-s'; on Posix, and with GNU grep, `-q' does it.
-On other systems, the closest you can come is to use `-l'.")
+On other systems, the closest you can come is to use `-l'."
+  :type 'string
+  :group 'find-dired)
 
 (defvar find-args nil
   "Last arguments given to `find' by \\[find-dired].")
@@ -58,7 +70,10 @@ On other systems, the closest you can come is to use `-l'.")
   "Run `find' and go into dired-mode on a buffer of the output.
 The command run (after changing into DIR) is
 
-    find . \\( ARGS \\) -ls"
+    find . \\( ARGS \\) -ls
+
+except that the variable `find-ls-option' specifies what to use
+as the final argument."
   (interactive (list (read-file-name "Run find in directory: " nil "" t)
                     (read-string "Run find (with args): " find-args
                                  '(find-args-history . 1))))
@@ -140,8 +155,11 @@ Thus ARG can also contain additional grep options."
   (interactive "DFind-grep (directory): \nsFind-grep (grep regexp): ")
   ;; find -exec doesn't allow shell i/o redirections in the command,
   ;; or we could use `grep -l >/dev/null'
+  ;; We use -type f, not ! -type d, to avoid getting screwed
+  ;; by FIFOs and devices.  I'm not sure what's best to do
+  ;; about symlinks, so as far as I know this is not wrong.
   (find-dired dir
-             (concat "! -type d -exec grep " find-grep-options " "
+             (concat "-type f -exec grep " find-grep-options " "
                      args " {} \\\; ")))
 
 (defun find-dired-filter (proc string)