(font-lock-keywords): Add defvar.

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

diff --git a/lisp/find-dired.el b/lisp/find-dired.el
index 5bef4d6bf3a9cbe4bccd6172e29ddf517abee15e..8347e68c58efeb31c7dbc26015a704f7e532db99 100644 (file)
--- a/lisp/find-dired.el
+++ b/lisp/find-dired.el
@@ -1,6 +1,7 @@
 ;;; find-dired.el --- run a `find' command and dired the output
 
-;; Copyright (C) 1992, 1994, 1995, 2000, 2002 Free Software Foundation, Inc.
+;; Copyright (C) 1992, 1994, 1995, 2000, 2002, 2003, 2004,
+;;   2005 Free Software Foundation, Inc.
 
 ;; Author: Roland McGrath <roland@gnu.org>,
 ;;        Sebastian Kremer <sk@thp.uni-koeln.de>
@@ -21,8 +22,8 @@
 
 ;; You should have received a copy of the GNU General Public License
 ;; along with GNU Emacs; see the file COPYING.  If not, write to the
-;; Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-;; Boston, MA 02111-1307, USA.
+;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+;; Boston, MA 02110-1301, USA.
 
 ;;; Commentary:
 
@@ -54,6 +55,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 "22.1")
+
 ;;;###autoload
 (defcustom find-grep-options
   (if (or (eq system-type 'berkeley-unix)
@@ -89,8 +100,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,7 +125,7 @@ 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 "")
                           ""
@@ -143,6 +153,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.
@@ -267,6 +278,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)