(find-ls-subdir-switches): New user option.

(find-dired): No longer call `abbreviate-file-name' on DIR.
Set `dired-subdir-switches' buffer-locally.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 3dd496838e2d65829bc2ee1350adf51f5258ff71..077a25d6ef4b0f5fc4a1aa0662489de0627e86e3 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,40 @@
+2004-06-05  Luc Teirlinck  <teirllm@auburn.edu>
+
+       * find-dired.el (find-ls-subdir-switches): New user option.
+       (find-dired): No longer call `abbreviate-file-name' on DIR.
+       Set `dired-subdir-switches' buffer-locally.
+
+       * locate.el: Merge the two `Commentary' sections.
+       (locate-ls-subdir-switches): New user option.
+       (locate): Update for other changes.
+       (locate-mode-map): Restore Dired binding for mouse-2.
+       Bind `locate-mouse-view-file' to M-mouse-2.
+       Bind `l' to `locate-do-redisplay'.
+       (locate-main-listing-line-p, locate-do-redisplay): New functions.
+       (locate-mouse-view-file, locate-tags, locate-find-directory):
+       Print message if used outside main listing.
+       (locate-mode): Update docstring.  Make `*Locate*' buffer read-only.
+       Various changes to support inserted subdirectories.
+       (locate-insert-header): Change header of *Locate* buffer.
+
+       * dired-aux.el (dired-do-redisplay, dired-maybe-insert-subdir):
+       Change interactive default switches.
+       (dired-rename-subdir-2): Update `dired-switches-alist'.
+       (dired-insert-subdir, dired-kill-subdir):
+       Handle `dired-switches-alist'.  Do not mark buffer modified.
+       (dired-insert-subdir-validate): Handle `dired-subdir-switches'.
+       (dired-insert-subdir-doinsert): Omit messages.
+       Handle `dired-subdir-switches'.
+       (dired-hide-subdir, dired-hide-all): Do not mark buffer modified.
+
+       * dired.el (dired-subdir-switches, dired-switches-alist):
+       New vars.
+       (dired-insert-old-subdirs): Do not repeatedly delete and reinsert
+       subdirs if -R switch is used for a subdir.
+       (dired-mode): Set `dired-switches-alist'.
+       (dired-build-subdir-alist): Only print number of directories in
+       echo area when invoked interactively.
+
 2004-06-05  Lars Hansen  <larsh@math.ku.dk>
 
        * dired-x.el (dired-omit-mode): Rename from

diff --git a/lisp/find-dired.el b/lisp/find-dired.el
index 5bef4d6bf3a9cbe4bccd6172e29ddf517abee15e..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,7 +124,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 +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.
@@ -267,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)